X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/650ecfa7df483a9ba4a6959554fb77b9cfdd2144..8e443649f374f14e522749949d6012eca1c6a973:/config/locales/en-GB.yml?ds=sidebyside
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index bc169cd8e..df4ba9d42 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
@@ -388,22 +387,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 +538,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 +557,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 +606,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 +787,6 @@ en-GB:
brownfield: Brownfield Land
cemetery: Cemetery
commercial: Commercial Area
- conservation: Conservation
- construction: Construction
farmland: Farmland
farmyard: Farmyard
forest: Forest
@@ -831,7 +805,6 @@ en-GB:
reservoir: Reservoir
reservoir_watershed: Reservoir Watershed
residential: Residential Area
- retail: Retail
village_green: Village Green
vineyard: Vineyard
"yes": Landuse
@@ -1051,7 +1024,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 +1041,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 +1081,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 +1455,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,20 +1511,6 @@ 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
- 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:
@@ -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
@@ -1740,7 +1690,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:
@@ -1981,8 +1930,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
@@ -2311,6 +2258,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 +2351,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: