X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/928465764e52407884b35e31a08bf9241e651269..90360df6d76627d29eeaee7f1d1c2819e5d206b2:/config/locales/en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 8c7ef6cbb..730ab9b14 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -2,8 +2,10 @@
# Exported from translatewiki.net
# Export driver: phpyaml
# Author: Abijeet Patro
+# Author: Alefar
# Author: Andibing
# Author: BEANS
+# Author: Bjh21
# Author: Bpfhjquevaps
# Author: Bruce89
# Author: Caliburn
@@ -19,11 +21,15 @@
# Author: Jlrb+
# Author: Kosovastar
# Author: Macofe
+# Author: Maro21
# Author: Meno25
+# Author: Michel Bakni
# Author: Mvolz
# Author: Sampablokuper
+# Author: Samwilson
# Author: Shirayuki
# Author: Smsm1
+# Author: Tlubenov
# Author: TomH
# Author: دÙÙÙد
---
@@ -35,6 +41,8 @@ en-GB:
friendly: '%e %B %Y at %H:%M'
blog: '%e %B %Y'
helpers:
+ file:
+ prompt: Choose file
submit:
diary_comment:
create: Save
@@ -47,7 +55,7 @@ en-GB:
create: Send
client_application:
create: Register
- update: Edit
+ update: Update
redaction:
create: Create redaction
update: Save redaction
@@ -70,6 +78,7 @@ en-GB:
diary_comment: Diary Comment
diary_entry: Diary Entry
friend: Friend
+ issue: Issue
language: Language
message: Message
node: Node
@@ -86,6 +95,7 @@ en-GB:
relation: Relation
relation_member: Relation Member
relation_tag: Relation Tag
+ report: Report
session: Session
trace: Trace
tracepoint: Trace Point
@@ -97,6 +107,18 @@ en-GB:
way_node: Way Node
way_tag: Way Tag
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:
@@ -111,24 +133,43 @@ en-GB:
trace:
user: User
visible: Visible
- name: Name
+ name: Filename
size: Size
latitude: Latitude
longitude: Longitude
public: Public
description: Description
+ gpx_file: Upload GPX File
+ visibility: Visibility
+ tagstring: Tags
message:
sender: Sender
title: Subject
body: Body
recipient: Recipient
+ redaction:
+ description: Description
+ report:
+ category: 'Select a reason for your report:'
+ details: Please provide some more details about the problem (required).
user:
email: E-mail
+ new_email: New Email Address
active: Active
display_name: Display Name
- description: Description
- languages: Languages
+ description: Profile Description
+ home_lat: Latitude
+ home_lon: Longitude
+ languages: Preferred Languages
pass_crypt: Password
+ pass_crypt_confirmation: Confirm Password
+ help:
+ trace:
+ tagstring: comma delimited
+ user_block:
+ needs_view: Does the user need to log in before this block will be cleared?
+ user:
+ new_email: (never displayed publicly)
datetime:
distance_in_words_ago:
about_x_hours:
@@ -173,18 +214,21 @@ en-GB:
with_name_html: '%{name} (%{id})'
editor:
default: Default (currently %{name})
- potlatch:
- name: Potlatch 1
- description: Potlatch 1 (in-browser editor)
id:
name: iD
description: iD (in-browser editor)
- potlatch2:
- name: Potlatch 2
- description: Potlatch 2 (in-browser editor)
remote:
name: Remote Control
- description: Remote Control (JOSM or Merkaartor)
+ description: Remote Control (JOSM, Potlatch, Merkaartor)
+ auth:
+ providers:
+ none: None
+ openid: OpenID
+ google: Google
+ facebook: Facebook
+ windowslive: Windows Live
+ github: GitHub
+ wikipedia: Wikipedia
api:
notes:
comment:
@@ -226,6 +270,8 @@ en-GB:
view_history: View History
view_details: View Details
location: 'Location:'
+ common_details:
+ coordinates_html: '%{latitude}, %{longitude}'
changeset:
title: 'Changeset: %{id}'
belongs_to: Author
@@ -236,8 +282,8 @@ en-GB:
relation: Relations (%{count})
relation_paginated: Relations (%{x}-%{y} of %{count})
comment: Comments (%{count})
- hidden_commented_by: Hidden comment from %{user} %{when}
- commented_by: Comment from %{user} %{when}
+ hidden_commented_by_html: Hidden comment from %{user} %{when}
+ commented_by_html: Comment from %{user} %{when}
changesetxml: Changeset XML
osmchangexml: osmChange XML
feed:
@@ -272,6 +318,7 @@ en-GB:
entry_html: Relation %{relation_name}
entry_role_html: Relation %{relation_name} (as %{relation_role})
not_found:
+ title: Not Found
sorry: 'Sorry, %{type} #%{id} could not be found.'
type:
node: node
@@ -280,6 +327,7 @@ en-GB:
changeset: changeset
note: note
timeout:
+ title: Timeout Error
sorry: Sorry, the data for the %{type} with the id %{id}, took too long to retrieve.
type:
node: node
@@ -317,16 +365,17 @@ en-GB:
open_title: 'Unresolved note #%{note_name}'
closed_title: 'Resolved note #%{note_name}'
hidden_title: 'Hidden note #%{note_name}'
- opened_by: Created by %{user} %{when}
- opened_by_anonymous: Created by anonymous %{when}
- commented_by: Comment from %{user} %{when}
- commented_by_anonymous: Comment from anonymous %{when}
- closed_by: Resolved by %{user} %{when}
- closed_by_anonymous: Resolved by anonymous %{when}
- reopened_by: Reactivated by %{user} %{when}
- reopened_by_anonymous: Reactivated by anonymous %{when}
- hidden_by: Hidden by %{user} %{when}
+ opened_by_html: Created by %{user} %{when}
+ opened_by_anonymous_html: Created by anonymous %{when}
+ commented_by_html: Comment from %{user} %{when}
+ commented_by_anonymous_html: Comment from anonymous %{when}
+ closed_by_html: Resolved by %{user} %{when}
+ closed_by_anonymous_html: Resolved by anonymous %{when}
+ reopened_by_html: Reactivated by %{user} %{when}
+ reopened_by_anonymous_html: Reactivated by anonymous %{when}
+ hidden_by_html: Hidden by %{user} %{when}
report: Report this note
+ coordinates_html: '%{latitude}, %{longitude}'
query:
title: Query Features
introduction: Click on the map to find nearby features.
@@ -377,13 +426,8 @@ en-GB:
new:
title: New Diary Entry
form:
- subject: 'Subject:'
- body: 'Body:'
- language: 'Language:'
- location: 'Location:'
- latitude: 'Latitude:'
- longitude: 'Longitude:'
- use_map_link: use map
+ location: Location
+ use_map_link: Use map
index:
title: Users' diaries
title_friends: Friends' diaries
@@ -392,6 +436,7 @@ en-GB:
in_language_title: Diary Entries in %{language}
new: New Diary Entry
new_title: Compose a new entry in my user diary
+ my_diary: My Diary
no_entries: No diary entries
recent_entries: Recent diary entries
older_entries: Older Entries
@@ -411,9 +456,10 @@ en-GB:
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.
diary_entry:
- posted_by_html: Posted by %{link_user} on %{created} in %{language_link}
+ posted_by_html: Posted by %{link_user} on %{created} in %{language_link}.
+ updated_at_html: Last updated on %{updated}.
comment_link: Comment on this entry
- reply_link: Reply to this entry
+ reply_link: Send a message to the author
comment_count:
zero: No comments
one: '%{count} comment'
@@ -450,6 +496,18 @@ en-GB:
comment: Comment
newer_comments: Newer Comments
older_comments: Older Comments
+ friendships:
+ make_friend:
+ heading: Add %{user} as a friend?
+ button: Add as friend
+ success: '%{name} is now your friend!'
+ failed: Sorry, failed to add %{name} as a friend.
+ already_a_friend: You are already friends with %{name}.
+ remove_friend:
+ heading: Unfriend %{user}?
+ button: Unfriend
+ success: '%{name} was removed from your friends.'
+ not_a_friend: '%{name} is not one of your friends.'
geocoder:
search:
title:
@@ -469,6 +527,7 @@ en-GB:
chair_lift: Chairlift
drag_lift: Drag Lift
gondola: Gondola Lift
+ magic_carpet: Magic Carpet Lift
platter: Platter Lift
pylon: Pylon
station: Aerialway Station
@@ -495,7 +554,9 @@ en-GB:
bench: Bench
bicycle_parking: Cycle Parking
bicycle_rental: Cycle Rental
+ bicycle_repair_station: Bicycle Repair Station
biergarten: Beer Garden
+ blood_bank: Blood Bank
boat_rental: Boat Rental
brothel: Brothel
bureau_de_change: Bureau de Change
@@ -512,6 +573,7 @@ en-GB:
clock: Clock
college: College
community_centre: Community Centre
+ conference_centre: Conference Centre
courthouse: Court
crematorium: Crematorium
dentist: Dentist
@@ -519,6 +581,7 @@ en-GB:
drinking_water: Drinking Water
driving_school: Driving School
embassy: Embassy
+ events_venue: Events Venue
fast_food: Fast Food
ferry_terminal: Ferry Terminal
fire_station: Fire Station
@@ -531,14 +594,19 @@ en-GB:
hospital: Hospital
hunting_stand: Hunting Stand
ice_cream: Ice Cream
+ internet_cafe: Internet Cafe
kindergarten: Nursery School
+ language_school: Language school
library: Library
+ loading_dock: Loading Dock
+ love_hotel: Love Hotel
marketplace: Marketplace
monastery: Monastery
+ money_transfer: Money Transfer
motorcycle_parking: Motorcycle Parking
+ music_school: Music School
nightclub: Night Club
nursing_home: Nursing Home
- office: Office
parking: Parking
parking_entrance: Parking Entrance
parking_space: Parking Space
@@ -547,20 +615,16 @@ en-GB:
police: Police
post_box: Post Box
post_office: Post Office
- preschool: Pre-School
prison: Prison
pub: Pub
+ public_bath: Public Bath
public_building: Public Building
recycling: Recycling Point
restaurant: Restaurant
- retirement_home: Retirement Home
- sauna: Sauna
school: School
shelter: Shelter
- shop: Shop
shower: Shower
social_centre: Social Centre
- social_club: Social Club
social_facility: Social Facility
studio: Studio
swimming_pool: Swimming Pool
@@ -576,12 +640,12 @@ en-GB:
waste_basket: Waste Bin
waste_disposal: Waste Disposal
water_point: Water Point
- youth_centre: Youth Centre
boundary:
administrative: Administrative Boundary
census: Census Boundary
national_park: National Park
protected_area: Protected Area
+ "yes": Boundary
bridge:
aqueduct: Aqueduct
boardwalk: Promenade
@@ -590,6 +654,22 @@ en-GB:
viaduct: Viaduct
"yes": Bridge
building:
+ apartment: Apartment
+ apartments: Apartments
+ bungalow: Bungalow
+ cabin: Cabin
+ chapel: Chapel
+ church: Church
+ college: College Building
+ commercial: Commercial Building
+ construction: Building under Construction
+ garage: Garage
+ garages: Garages
+ hospital: Hospital
+ hotel: Hotel
+ house: House
+ industrial: Industrial Building
+ roof: Roof
"yes": Building
craft:
brewery: Brewery
@@ -651,7 +731,6 @@ en-GB:
tertiary_link: Tertiary Road
track: Track
traffic_signals: Traffic Signals
- trail: Trail
trunk: Trunk Road
trunk_link: Trunk Road
turning_loop: Turning Loop
@@ -670,7 +749,6 @@ en-GB:
fort: Fort
heritage: Heritage Site
house: House
- icon: Icon
manor: Manor
memorial: Memorial
mine: Mine
@@ -715,7 +793,6 @@ en-GB:
reservoir_watershed: Reservoir Watershed
residential: Residential Area
retail: Retail
- road: Road Area
village_green: Village Green
vineyard: Vineyard
"yes": Landuse
@@ -736,6 +813,7 @@ en-GB:
miniature_golf: Miniature Golf
nature_reserve: Nature Reserve
park: Park
+ picnic_table: Picnic Table
pitch: Sports Pitch
playground: Playground
recreation_ground: Recreation Ground
@@ -750,13 +828,21 @@ en-GB:
"yes": Leisure
man_made:
adit: Adit
+ advertising: Advertising
+ antenna: Antenna/Antennae
+ avalanche_protection: Avalanche Protection
beacon: Beacon
+ beam: Beam
beehive: Bee Hive
breakwater: Breakwater
bridge: Bridge
bunker_silo: Bunker
+ cairn: Cairn
chimney: Chimney
+ clearcut: Clearcut
+ communications_tower: Communications Tower
crane: Crane
+ cross: Cross
dolphin: Mooring Post
dyke: Dyke
embankment: Embankment
@@ -765,6 +851,7 @@ en-GB:
groyne: Groyne
kiln: Kiln
lighthouse: Lighthouse
+ manhole: Manhole
mast: Mast
mine: Mine
mineshaft: Mine Shaft
@@ -872,7 +959,6 @@ en-GB:
subdivision: Subdivision
suburb: Suburb
town: Town
- unincorporated_area: Unincorporated Area
village: Village
"yes": Place
railway:
@@ -898,6 +984,7 @@ en-GB:
switch: Railway Points
tram: Tramway
tram_stop: Tram Stop
+ yard: Railway Yard
shop:
alcohol: Off Licence
antiques: Antiques
@@ -931,12 +1018,10 @@ en-GB:
estate_agent: Estate Agent
farm: Farm Shop
fashion: Fashion Shop
- fish: Fishmonger
florist: Florist
food: Food Shop
funeral_directors: Funeral Directors
furniture: Furniture
- gallery: Gallery
garden_centre: Garden Centre
general: General Store
gift: Gift Shop
@@ -953,7 +1038,6 @@ en-GB:
laundry: Laundry
lottery: Lottery
mall: Mall
- market: Market
massage: Massage
mobile_phone: Mobile Phone Shop
motorcycle: Motorcycle Shop
@@ -965,7 +1049,6 @@ en-GB:
paint: Paint Shop
pawnbroker: Pawnbroker
pet: Pet Shop
- pharmacy: Pharmacy
photo: Photo Shop
seafood: Seafood
second_hand: Second-hand Shop
@@ -1032,11 +1115,6 @@ en-GB:
level8: City Boundary
level9: Village Boundary
level10: Suburb Boundary
- description:
- title:
- osm_nominatim: Location from OpenStreetMap
- Nominatim
- geonames: Location from GeoNames
types:
cities: Cities
towns: Towns
@@ -1044,6 +1122,9 @@ en-GB:
results:
no_results: No results found
more_results: More results
+ issues:
+ index:
+ reports: Reports
layouts:
project_name:
title: OpenStreetMap
@@ -1093,43 +1174,36 @@ en-GB:
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},
header: '%{from_user} has commented on the OpenStreetMap diary entry with the
subject %{subject}:'
footer: You can also read the comment at %{readurl} and you can comment at %{commenturl}
- or reply at %{replyurl}
+ or send a message to the author at %{replyurl}
message_notification:
- subject_header: '[OpenStreetMap] %{subject}'
hi: Hi %{to_user},
header: '%{from_user} has sent you a message through OpenStreetMap with the
subject %{subject}:'
- footer_html: You can also read the message at %{readurl} and you can reply at
- %{replyurl}
- friend_notification:
+ footer_html: You can also read the message at %{readurl} and you can send a
+ message to the author at %{replyurl}
+ friendship_notification:
hi: Hi %{to_user},
subject: '[OpenStreetMap] %{user} added you as a friend'
had_added_you: '%{user} has added you as a friend on OpenStreetMap.'
see_their_profile: You can see their profile at %{userurl}.
befriend_them: You can also add them as a friend at %{befriendurl}.
- gpx_notification:
- greeting: Hi,
- your_gpx_file: It looks like your GPX file
- with_description: with the description
- and_the_tags: 'and the following tags:'
- and_no_tags: and no tags.
- failure:
- subject: '[OpenStreetMap] GPX Import failure'
- failed_to_import: 'failed to import. Here is the error:'
- more_info_1: More information about GPX import failures and how to avoid
- more_info_2: 'them can be found at:'
- import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures
- success:
- subject: '[OpenStreetMap] GPX Import success'
- loaded_successfully: loaded successfully with %{trace_points} out of a possible
- %{possible_points} points.
+ gpx_failure:
+ failed_to_import: 'failed to import. Here is the error:'
+ import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures
+ subject: '[OpenStreetMap] GPX Import failure'
+ gpx_success:
+ loaded_successfully:
+ one: loaded successfully with %{trace_points} out of a possible 1 point.
+ other: loaded successfully with %{trace_points} out of a possible %{possible_points}
+ points.
+ subject: '[OpenStreetMap] GPX Import success'
signup_confirm:
subject: '[OpenStreetMap] Welcome to OpenStreetMap'
greeting: Hi there!
@@ -1140,28 +1214,16 @@ en-GB:
information to get you started.
email_confirm:
subject: '[OpenStreetMap] Confirm your e-mail address'
- email_confirm_plain:
- greeting: Hi,
- hopefully_you: Someone (hopefully you) would like to change their email address
- over at %{server_url} to %{new_address}.
- click_the_link: If this is you, please click the link below to confirm the change.
- email_confirm_html:
greeting: Hi,
hopefully_you: Someone (hopefully you) would like to change their email address
over at %{server_url} to %{new_address}.
click_the_link: If this is you, please click the link below to confirm the change.
lost_password:
subject: '[OpenStreetMap] Password reset request'
- lost_password_plain:
greeting: Hi,
hopefully_you: Someone (possibly you) has asked for the password to be reset
on this email address's openstreetmap.org account.
click_the_link: If this is you, please click the link below to reset your password.
- lost_password_html:
- greeting: Hi,
- hopefully_you: Someone (possibly you) has asked for the password to be reset
- on this e-mail address's openstreetmap.org account.
- click_the_link: If this is you, please click the link below to reset your password.
note_comment_notification:
anonymous: An anonymous user
greeting: Hi,
@@ -1203,11 +1265,38 @@ en-GB:
details: More details about the changeset can be found at %{url}.
unsubscribe: To unsubscribe from updates to this changeset, visit %{url} and
click "Unsubscribe".
+ confirmations:
+ confirm:
+ heading: Check your email!
+ introduction_1: We sent you a confirmation email.
+ introduction_2: Confirm your account by clicking on the link in the email and
+ you'll be able to start mapping.
+ press confirm button: Press the confirm button below to activate your account.
+ button: Confirm
+ success: Confirmed your account, thanks for signing up!
+ already active: This account has already been confirmed.
+ unknown token: That confirmation code has expired or does not exist.
+ reconfirm_html: If you need us to resend the confirmation email, click
+ here.
+ confirm_resend:
+ success_html: We've sent a new confirmation note to %{email} and as soon as
+ you confirm your account you'll be able to get mapping.
If you
+ use an antispam system which sends confirmation requests then please make
+ sure you whitelist %{sender} as we are unable to reply to any confirmation
+ requests.
+ failure: User %{name} not found.
+ confirm_email:
+ heading: Confirm a change of e-mail address
+ press confirm button: Press the confirm button below to confirm your new e-mail
+ address.
+ button: Confirm
+ success: Confirmed your change of email address!
+ failure: An e-mail address has already been confirmed with this token.
+ unknown_token: That confirmation code has expired or does not exist.
messages:
inbox:
title: Inbox
my_inbox: My Inbox
- outbox: outbox
messages: You have %{new_messages} and %{old_messages}
new_messages:
one: '%{count} new message'
@@ -1242,9 +1331,6 @@ en-GB:
body: Sorry, there is no message with that id.
outbox:
title: Outbox
- my_inbox_html: My %{inbox_link}
- inbox: inbox
- outbox: outbox
messages:
one: You have %{count} sent message
other: You have %{count} sent messages
@@ -1278,12 +1364,85 @@ en-GB:
as_unread: Message marked as unread
destroy:
destroyed: Message deleted
+ passwords:
+ lost_password:
+ title: Lost password
+ heading: Forgotten Password?
+ email address: E-mail address
+ new password button: Reset password
+ help_text: Enter the e-mail address you used to sign up, we will send a link
+ to it that you can use to reset your password.
+ notice email on way: Sorry you lost it :-( but an email is on its way so you
+ can reset it soon.
+ notice email cannot find: Could not find that email address, sorry.
+ reset_password:
+ title: Reset password
+ heading: Reset Password for %{user}
+ reset: Reset Password
+ flash changed: Your password has been changed.
+ flash token bad: Did not find that token, check the URL maybe?
+ sessions:
+ new:
+ title: Login
+ heading: Login
+ email or username: 'E-mail Address or Username:'
+ password: 'Password:'
+ openid_html: '%{logo} OpenID:'
+ remember: Remember me
+ lost password link: Lost your password?
+ login_button: Login
+ register now: Register now
+ with username: 'Already have an OpenStreetMap account? Please login with your
+ username and password:'
+ with external: 'Alternatively, use a third party to login:'
+ new to osm: New to OpenStreetMap?
+ to make changes: To make changes to the OpenStreetMap data, you must have an
+ account.
+ create account minute: Create an account. It only takes a minute.
+ no account: Don't have an account?
+ account not active: Sorry, your account is not active yet.
Please use the
+ link in the account confirmation email to activate your account, or request
+ a new confirmation email.
+ account is suspended: Sorry, your account has been suspended due to suspicious
+ activity.
Please contact the webmaster if
+ you wish to discuss this.
+ auth failure: Sorry, could not log in with those details.
+ openid_logo_alt: Log in with an OpenID
+ auth_providers:
+ openid:
+ title: Login with OpenID
+ alt: Login with an OpenID URL
+ google:
+ title: Login with Google
+ alt: Login with a Google OpenID
+ facebook:
+ title: Login with Facebook
+ alt: Login with a Facebook Account
+ windowslive:
+ title: Login with Windows Live
+ alt: Login with a Windows Live Account
+ github:
+ title: Login with GitHub
+ alt: Login with a GitHub Account
+ wikipedia:
+ title: Login with Wikipedia
+ alt: Login with a Wikipedia Account
+ wordpress:
+ title: Login with Wordpress
+ alt: Login with a Wordpress OpenID
+ aol:
+ title: Login with AOL
+ alt: Login with an AOL OpenID
+ destroy:
+ title: Logout
+ heading: Logout of OpenStreetMap
+ logout_button: Logout
site:
about:
next: Next
copyright_html: ©OpenStreetMap
contributors
- used_by_html: '%{name} powers map data on thousands of web sites, mobile apps,
- and hardware devices'
+ used_by_html: '%{name} provides map data for thousands of web sites, mobile
+ apps, and hardware devices'
lede_text: 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.
@@ -1304,16 +1463,13 @@ en-GB:
under the same licence. See the Copyright and
Licence page for details.
legal_title: Legal
- legal_html: "This site and many other related services are formally operated
+ legal_1_html: "This site and many other related services are formally operated
by the \nOpenStreetMap Foundation
(OSMF) \non behalf of the community. Use of all OSMF operated services is
subject \nto our Terms
of Use, \nAcceptable
Use Policies and our Privacy
- Policy\n
\nPlease contact
- the OSMF \nif you have licensing, copyright or other legal questions.\n
\nOpenStreetMap,
- the magnifying glass logo and State of the Map are registered
- trademarks of the OSMF."
+ Policy."
partners_title: Partners
copyright:
foreign:
@@ -1340,18 +1496,16 @@ en-GB:
build upon our data, you may distribute the result only under the same licence.
The full legal
code explains your rights and responsibilities.
- intro_3_html: |-
- The cartography in our map tiles, and our documentation, are
- licenced under the Creative
- Commons Attribution-ShareAlike 2.0 licence (CC BY-SA).
+ intro_3_1_html: "Our documentation is licensed under the \nCreative\nCommons
+ Attribution-ShareAlike 2.0 licence (CC BY-SA 2.0)."
credit_title_html: How to credit OpenStreetMap
credit_1_html: |-
We require that you use the credit “© OpenStreetMap
contributors”.
- credit_2_html: |-
+ credit_2_1_html: |-
You must also make it clear that the data is available under the Open
Database Licence, and if using our map tiles, that the cartography is
- licenced as CC BY-SA. You may do this by linking to
+ licensed as CC BY-SA. You may do this by linking to
this copyright page.
Alternatively, and as a requirement if you are distributing OSM in a
data form, you can name and link directly to the licence(s). In media
@@ -1359,7 +1513,7 @@ en-GB:
direct your readers to openstreetmap.org (perhaps by expanding
'OpenStreetMap' to this full address), to opendatacommons.org, and
if relevant, to creativecommons.org.
- credit_3_html: |-
+ credit_4_html: |-
For a browsable electronic map, the credit should appear in the corner of the map.
For example:
attribution_example:
@@ -1454,17 +1608,6 @@ en-GB:
user_page_link: user page
anon_edits_html: (%{link})
anon_edits_link_text: Find out why this is the case.
- flash_player_required_html: You need a Flash player to use Potlatch, the OpenStreetMap
- Flash editor. You can download
- Flash Player from Adobe.com. Several
- other options are also available for editing OpenStreetMap.
- potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you
- should deselect the current way or point, if editing in live mode, or click
- save if you have a save button.)
- potlatch2_not_configured: Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
- for more information
- potlatch2_unsaved_changes: You have unsaved changes. (To save in Potlatch 2,
- you should click save.)
id_not_configured: iD has not been configured
no_iframe_support: Your browser doesn't support HTML iframes, which are necessary
for this feature.
@@ -1654,23 +1797,6 @@ en-GB:
bicycle_shop: Bicycle shop
bicycle_parking: Bicycle parking
toilets: Toilets
- richtext_area:
- edit: Edit
- preview: Preview
- markdown_help:
- title_html: Parsed with kramdown
- headings: Headings
- heading: Heading
- subheading: Subheading
- unordered: Unordered list
- ordered: Ordered list
- first: First item
- second: Second item
- link: Link
- text: Text
- image: Image
- alt: Alt text
- url: URL
welcome:
title: Welcome!
introduction_html: Welcome to OpenStreetMap, the free and editable map of the
@@ -1727,11 +1853,6 @@ en-GB:
identifiable: Identifiable (shown in trace list and as identifiable, ordered
points with timestamps)
new:
- upload_gpx: 'Upload GPX File:'
- description: 'Description:'
- tags: 'Tags:'
- tags_help: comma delimited
- visibility: 'Visibility:'
visibility_help: what does this mean?
visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
help: Help
@@ -1751,18 +1872,6 @@ en-GB:
edit:
title: Editing trace %{name}
heading: Editing trace %{name}
- filename: 'Filename:'
- download: download
- uploaded_at: 'Uploaded:'
- points: 'Points:'
- start_coord: 'Start coordinate:'
- map: map
- edit: edit
- owner: 'Owner:'
- description: 'Description:'
- tags: 'Tags:'
- tags_help: comma delimited
- visibility: 'Visibility:'
visibility_help: what does this mean?
visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
trace_optionals:
@@ -1798,7 +1907,6 @@ en-GB:
more: more
trace_details: View Trace Details
view_map: View Map
- edit: edit
edit_map: Edit Map
public: PUBLIC
identifiable: IDENTIFIABLE
@@ -1806,7 +1914,6 @@ en-GB:
trackable: TRACKABLE
by: by
in: in
- map: map
index:
public_traces: Public GPS traces
public_traces_from: Public GPS traces from %{user}
@@ -1816,7 +1923,6 @@ en-GB:
or learn more about GPS tracing on the wiki
page.
upload_trace: Upload a trace
- see_all_traces: See all traces
destroy:
scheduled_for_deletion: Trace scheduled for deletion
make_public:
@@ -1889,13 +1995,6 @@ en-GB:
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
@@ -1911,19 +2010,7 @@ en-GB:
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:
@@ -1933,82 +2020,6 @@ en-GB:
destroy:
flash: Destroyed the client application registration
users:
- login:
- title: Login
- heading: Login
- email or username: 'E-mail Address or Username:'
- password: 'Password:'
- openid_html: '%{logo} OpenID:'
- remember: Remember me
- lost password link: Lost your password?
- login_button: Login
- register now: Register now
- with username: 'Already have an OpenStreetMap account? Please login with your
- username and password:'
- with external: 'Alternatively, use a third party to login:'
- new to osm: New to OpenStreetMap?
- to make changes: To make changes to the OpenStreetMap data, you must have an
- account.
- create account minute: Create an account. It only takes a minute.
- no account: Don't have an account?
- account not active: Sorry, your account is not active yet.
Please use the
- link in the account confirmation email to activate your account, or request
- a new confirmation email.
- account is suspended: Sorry, your account has been suspended due to suspicious
- activity.
Please contact the webmaster if
- you wish to discuss this.
- auth failure: Sorry, could not log in with those details.
- openid_logo_alt: Log in with an OpenID
- auth_providers:
- openid:
- title: Login with OpenID
- alt: Login with an OpenID URL
- google:
- title: Login with Google
- alt: Login with a Google OpenID
- facebook:
- title: Login with Facebook
- alt: Login with a Facebook Account
- windowslive:
- title: Login with Windows Live
- alt: Login with a Windows Live Account
- github:
- title: Login with GitHub
- alt: Login with a GitHub Account
- wikipedia:
- title: Login with Wikipedia
- alt: Login with a Wikipedia Account
- yahoo:
- title: Login with Yahoo
- alt: Login with a Yahoo OpenID
- wordpress:
- title: Login with Wordpress
- alt: Login with a Wordpress OpenID
- aol:
- title: Login with AOL
- alt: Login with an AOL OpenID
- logout:
- title: Logout
- heading: Logout of OpenStreetMap
- logout_button: Logout
- lost_password:
- title: Lost password
- heading: Forgotten Password?
- email address: E-mail address
- new password button: Reset password
- help_text: Enter the e-mail address you used to sign up, we will send a link
- to it that you can use to reset your password.
- notice email on way: Sorry you lost it :-( but an email is on its way so you
- can reset it soon.
- notice email cannot find: Could not find that email address, sorry.
- 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?
new:
title: Sign Up
no_auto_account_create: Unfortunately we are not currently able to create an
@@ -2021,20 +2032,12 @@ en-GB:
html: |-
Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.
Sign up to get started contributing. We'll send an email to confirm your account.
- license_agreement: When you confirm your account you will need to agree to the - contributor - terms. email address: 'Email Address:' confirm email address: 'Confirm Email Address:' - not_displayed_publicly_html: Your address is not displayed publicly, see our - privacy policy for more information display name: 'Display Name:' display name description: Your publicly displayed username. You can change this later in the preferences. external auth: 'Third Party Authentication:' - password: 'Password:' - confirm password: 'Confirm Password:' use external auth: Alternatively, use a third party to login auth no password: With third party authentication a password is not required, but some extra tools or server may still need one. @@ -2137,15 +2140,13 @@ en-GB: account: title: Edit account my settings: My settings - current email address: 'Current Email Address:' - new email address: 'New Email Address:' - email never displayed publicly: (never displayed publicly) - external auth: 'External Authentication:' + current email address: Current Email Address + external auth: External Authentication openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: what is this? public editing: - heading: 'Public editing:' + heading: Public editing enabled: Enabled. Not anonymous and can edit data. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: what is this? @@ -2161,7 +2162,7 @@ en-GB: public.