X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/650ecfa7df483a9ba4a6959554fb77b9cfdd2144..a0eb071b800afc182b48f757f32d44cd33a6251c:/config/locales/en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index bc169cd8e..0acbd5082 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -32,6 +32,7 @@
# Author: Smsm1
# Author: Tlubenov
# Author: TomH
+# Author: Wehwei
# Author: دÙÙÙد
---
en-GB:
@@ -42,8 +43,6 @@ en-GB:
file:
prompt: Choose file
submit:
- diary_comment:
- create: Save
diary_entry:
create: Publish
update: Update
@@ -124,7 +123,7 @@ en-GB:
title: Subject
latitude: Latitude
longitude: Longitude
- language: Language
+ language_code: Language
friend:
user: User
friend: Friend
@@ -261,15 +260,6 @@ en-GB:
enabled link text: what is this?
disabled: Disabled and cannot edit data, all previous edits are anonymous.
disabled link text: why can't I edit?
- public editing note:
- heading: Public editing
- html: Currently your edits are anonymous and people cannot send you messages
- or see your location. To show what you edited and allow people to contact
- you through the website, click the button below. Since the 0.6 API changeover,
- only public users can edit map data. (find
- out why).
- Your e-mail address will not be revealed by becoming
- public.
- This action cannot be reversed and all new users are now
- public by default.
contributor terms:
heading: Contributor Terms
agreed: You have agreed to the new Contributor Terms.
@@ -280,7 +270,9 @@ en-GB:
in the Public Domain.
link text: what is this?
save changes button: Save Changes
- make edits public button: Make all my edits public
+ go_public:
+ heading: Public editing
+ make_edits_public_button: Make all my edits public
update:
success_confirm_needed: User information updated successfully. Check your email
for a note to confirm your new email address.
@@ -388,22 +380,6 @@ en-GB:
wikimedia_commons_link: The %{page} item on Wikimedia Commons
telephone_link: Call %{phone_number}
colour_preview: Colour %{colour_value} preview
- note:
- title: 'Note: %{id}'
- new_note: New Note
- description: Description
- open_title: 'Unresolved note #%{note_name}'
- closed_title: 'Resolved note #%{note_name}'
- hidden_title: 'Hidden note #%{note_name}'
- 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}
query:
title: Query Features
introduction: Click on the map to find nearby features.
@@ -555,13 +531,10 @@ en-GB:
search:
title:
latlon_html: Results from Internal
- ca_postcode_html: Results from Geocoder.CA
osm_nominatim_html: Results from OpenStreetMap
Nominatim
- geonames_html: Results from GeoNames
osm_nominatim_reverse_html: Results from OpenStreetMap
Nominatim
- geonames_reverse_html: Results from GeoNames
search_osm_nominatim:
prefix:
aerialway:
@@ -577,15 +550,12 @@ en-GB:
aeroway:
aerodrome: Aerodrome
airstrip: Airstrip
- apron: Apron
- gate: Gate
hangar: Hangar
helipad: Helipad
holding_position: Holding Position
parking_position: Parking Position
runway: Runway
taxiway: Taxiway
- terminal: Terminal
amenity:
animal_shelter: Animal Shelter
arts_centre: Arts Centre
@@ -629,7 +599,6 @@ en-GB:
fire_station: Fire Station
food_court: Food Court
fountain: Fountain
- fuel: Fuel
gambling: Gambling
grave_yard: Graveyard
grit_bin: Grit Bin
@@ -811,8 +780,6 @@ en-GB:
brownfield: Brownfield Land
cemetery: Cemetery
commercial: Commercial Area
- conservation: Conservation
- construction: Construction
farmland: Farmland
farmyard: Farmyard
forest: Forest
@@ -831,7 +798,6 @@ en-GB:
reservoir: Reservoir
reservoir_watershed: Reservoir Watershed
residential: Residential Area
- retail: Retail
village_green: Village Green
vineyard: Vineyard
"yes": Landuse
@@ -1051,7 +1017,7 @@ en-GB:
deli: Delicatessen
department_store: Department Store
discount: Discount Items Shop
- doityourself: DIY store
+ doityourself: DIY Shop
dry_cleaning: Dry Cleaning
electronics: Electronics Shop
estate_agent: Estate Agent
@@ -1068,7 +1034,6 @@ en-GB:
grocery: Grocery Shop
hairdresser: Hairdresser
hardware: Hardware Store
- hifi: Hi-Fi
houseware: Houseware Shop
interior_decoration: Interior Decoration
jewelry: Jewellers
@@ -1109,7 +1074,6 @@ en-GB:
artwork: Artwork
attraction: Attraction
bed_and_breakfast: Bed and Breakfast
- cabin: Cabin
camp_site: Camp Site
caravan_site: Caravan Site
chalet: Chalet
@@ -1484,8 +1448,6 @@ en-GB:
about:
next: Next
copyright_html: ©OpenStreetMap
contributors
- 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.
@@ -1542,23 +1504,16 @@ en-GB:
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_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
- licensed as CC BY-SA. You may do this by linking to
+ credit_4_html: |-
+ To make clear that the data is available under the Open
+ Database License, you may link 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
where links are not possible (e.g. printed works), we suggest you
direct your readers to openstreetmap.org (perhaps by expanding
- 'OpenStreetMap' to this full address), to opendatacommons.org, and
- if relevant, to creativecommons.org.
- credit_4_html: |-
- For a browsable electronic map, the credit should appear in the corner of the map.
- For example:
+ 'OpenStreetMap' to this full address) and to opendatacommons.org.
+ In this example, the credit appears in the corner of the map.
attribution_example:
alt: Example of how to attribute OpenStreetMap on a webpage
title: Attribution example
@@ -1623,11 +1578,6 @@ en-GB:
infringement_1_html: OSM contributors are reminded never to add data from
any copyrighted sources (e.g. Google Maps or printed maps) without explicit
permission from the copyright holders.
- infringement_2_html: If you believe that copyrighted material has been inappropriately
- added to the OpenStreetMap database or this site, please refer to our takedown
- procedure or file directly at our on-line
- filing page.
trademarks_title_html: Trademarks
trademarks_1_html: OpenStreetMap, the magnifying glass logo, and State of
the Map are registered trademarks of the OpenStreetMap Foundation. If you
@@ -1636,7 +1586,7 @@ en-GB:
index:
js_1: You are either using a browser that does not support JavaScript, or you
have disabled JavaScript.
- js_2: OpenStreetMap uses JavaScript for its slippery map.
+ js_2: OpenStreetMap uses JavaScript for its slippy map.
permalink: Permalink
shortlink: Shortlink
createnote: Add a note
@@ -1662,8 +1612,6 @@ en-GB:
map_image: Map Image (shows standard layer)
embeddable_html: Embeddable HTML
licence: Licence
- export_details_html: OpenStreetMap data is licenced under the Open
- Data Commons Open Database Licence (ODbL).
too_large:
advice: 'If the above export fails, please consider using one of the sources
listed below:'
@@ -1740,7 +1688,6 @@ en-GB:
description: Ask a question or discuss interesting matters on a wide range
of topical or regional mailing lists.
forums:
- title: Forums
description: Questions and discussions for those that prefer a bulletin board
style interface.
irc:
@@ -1753,6 +1700,8 @@ en-GB:
wiki:
title: OpenStreetMap Wiki
description: Browse the wiki for in-depth OpenStreetMap documentation.
+ any_questions:
+ title: Any questions?
sidebar:
search_results: Search Results
close: Close
@@ -1838,52 +1787,22 @@ en-GB:
toilets: Toilets
welcome:
title: Welcome!
- introduction_html: Welcome to OpenStreetMap, the free and editable map of the
- world. Now that you're signed up, you're all set to get started mapping. Here's
- a quick guide with the most important things you need to know.
+ introduction: Welcome to OpenStreetMap, the free and editable map of the world.
+ Now that you're signed up, you're all set to get started mapping. Here's a
+ quick guide with the most important things you need to know.
whats_on_the_map:
title: What's on the Map
- on_html: OpenStreetMap is a place for mapping things that are both real
- and current - it includes millions of buildings, roads, and other details
- about places. You can map whatever real-world features are interesting to
- you.
- off_html: What it doesn't include is opinionated data like ratings,
- historical or hypothetical features, and data from copyrighted sources.
- Unless you have special permission, don't copy from online or paper maps.
basic_terms:
title: Basic Terms For Mapping
- paragraph_1_html: OpenStreetMap has some of its own lingo. Here are a few
- key words that'll come in handy.
- editor_html: An editor is a program or website you can use
- to edit the map.
- node_html: A node is a point on the map, like a single restaurant
- or a tree.
- way_html: A way is a line or area, like a road, stream, lake
- or building.
- tag_html: A tag is a bit of data about a node or way, like
- a restaurant's name or a road's speed limit.
+ paragraph_1: OpenStreetMap has some of its own lingo. Here are a few key words
+ that'll come in handy.
rules:
title: Rules!
- paragraph_1_html: "OpenStreetMap has few formal rules but we expect all participants
- to collaborate\nwith, and communicate with, the community. If you are considering\nany
- activities other than editing by hand, please read and follow the guidelines
- on \nImports
- and \nAutomated
- Edits."
- questions:
- title: Any questions?
- paragraph_1_html: |-
- OpenStreetMap has several resources for learning about the project, asking and answering questions, and collaboratively discussing and documenting mapping topics.
- Get help here. With an organization making plans for OpenStreetMap? Check out the Welcome Mat.
start_mapping: Start Mapping
add_a_note:
title: No Time To Edit? Add a Note!
- paragraph_1_html: If you just want something small fixed and don't have the
- time to sign up and learn how to edit, it's easy to add a note.
- paragraph_2_html: 'Just go to the map and click
- the note icon: . This will add a marker
- to the map, which you can move by dragging. Add your message, then click
- save, and other mappers will investigate.'
+ para_1: If you just want something small fixed and don't have the time to
+ sign up and learn how to edit, it's easy to add a note.
traces:
visibility:
private: Private (only shared as anonymous, unordered points)
@@ -1956,9 +1875,6 @@ en-GB:
public_traces_from: Public GPS traces from %{user}
description: Browse recent GPS track uploads
tagged_with: ' tagged with %{tags}'
- empty_html: Nothing here yet. Upload a new trace
- or learn more about GPS tracing on the wiki
- page.
upload_trace: Upload a trace
destroy:
scheduled_for_deletion: Trace scheduled for deletion
@@ -1981,8 +1897,6 @@ en-GB:
cookies_needed: You appear to have cookies disabled - please enable cookies
in your browser before continuing.
setup_user_auth:
- blocked_zero_hour: You have an urgent message on the OpenStreetMap web site.
- You need to read the message before you will be able to save your edits.
blocked: Your access to the API has been blocked. Please log-in to the web interface
to find out more.
need_to_see_terms: Your access to the API is temporarily suspended. Please log-in
@@ -2066,9 +1980,6 @@ en-GB:
account for you automatically.
about:
header: Free and editable
- 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.
email address: 'Email Address:'
confirm email address: 'Confirm Email Address:'
display name: 'Display Name:'
@@ -2311,6 +2222,36 @@ en-GB:
description: Description
created_at: Created at
last_changed: Last changed
+ show:
+ title: 'Note: %{id}'
+ description: Description
+ open_title: 'Unresolved note #%{note_name}'
+ closed_title: 'Resolved note #%{note_name}'
+ hidden_title: 'Hidden note #%{note_name}'
+ 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}
+ anonymous_warning: This note includes comments from anonymous users which should
+ be independently verified.
+ hide: Hide
+ resolve: Resolve
+ reactivate: Reactivate
+ comment_and_resolve: Comment & Resolve
+ comment: Comment
+ new:
+ title: New Note
+ intro: Spotted a mistake or something missing? Let other mappers know so we
+ can fix it. Move the marker to the correct position and type a note to explain
+ the problem.
+ advice: Your note is public and may be used to update the map, so don't enter
+ personal information or information from copyrighted maps or directory listings.
+ add: Add Note
javascripts:
close: Close
share:
@@ -2374,22 +2315,6 @@ en-GB:
unsubscribe: Unsubscribe
hide_comment: hide
unhide_comment: unhide
- notes:
- new:
- intro: Spotted a mistake or something missing? Let other mappers know so we
- can fix it. Move the marker to the correct position and type a note to explain
- the problem.
- advice: Your note is public and may be used to update the map, so don't enter
- personal information or information from copyrighted maps or directory listings.
- add: Add Note
- show:
- anonymous_warning: This note includes comments from anonymous users which
- should be independently verified.
- hide: Hide
- resolve: Resolve
- reactivate: Reactivate
- comment_and_resolve: Comment & Resolve
- comment: Comment
edit_help: Move the map and zoom in on a location you want to edit, then click
here.
directions: