X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/550c4a3a45814fde5c809334c85f1ebc47659a82..72c7d202a8325b4e9054ffc98e8db3928ac4347a:/config/locales/en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index ac0710885..254b39da2 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -32,15 +32,13 @@
# Author: Smsm1
# Author: Tlubenov
# Author: TomH
+# Author: Wehwei
# Author: دÙÙÙد
---
en-GB:
- html:
- dir: ltr
time:
formats:
friendly: '%e %B %Y at %H:%M'
- blog: '%e %B %Y'
helpers:
file:
prompt: Choose file
@@ -57,6 +55,9 @@ en-GB:
client_application:
create: Register
update: Update
+ doorkeeper_application:
+ create: Register
+ update: Update
redaction:
create: Create redaction
update: Save redaction
@@ -128,6 +129,8 @@ en-GB:
latitude: Latitude
longitude: Longitude
language: Language
+ doorkeeper/application:
+ name: Name
friend:
user: User
friend: Friend
@@ -210,9 +213,6 @@ en-GB:
x_years:
one: 1 year ago
other: '%{count} years ago'
- printable_name:
- with_version: '%{id}, v%{version}'
- with_name_html: '%{name} (%{id})'
editor:
default: Default (currently %{name})
id:
@@ -260,12 +260,10 @@ en-GB:
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
enabled: Enabled. Not anonymous and can edit data.
- enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
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?
@@ -286,7 +284,6 @@ en-GB:
accept the new Contributor Terms.
agreed_with_pd: You have also declared that you consider your edits to be
in the Public Domain.
- link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
link text: what is this?
save changes button: Save Changes
make edits public button: Make all my edits public
@@ -312,8 +309,6 @@ 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
@@ -350,7 +345,6 @@ en-GB:
history_title_html: 'Relation History: %{name}'
members: Members
relation_member:
- entry_html: '%{type} %{name}'
entry_role_html: '%{type} %{name} as %{role}'
type:
node: Node
@@ -416,8 +410,6 @@ en-GB:
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.
@@ -577,7 +569,6 @@ en-GB:
Nominatim
geonames_reverse_html: Results from GeoNames
search_osm_nominatim:
- prefix_format: '%{name}'
prefix:
aerialway:
cable_car: Cable Car
@@ -592,15 +583,15 @@ en-GB:
aeroway:
aerodrome: Aerodrome
airstrip: Airstrip
- apron: Apron
- gate: Gate
+ apron: Airport Apron
+ gate: Airport Gate
hangar: Hangar
helipad: Helipad
holding_position: Holding Position
parking_position: Parking Position
runway: Runway
taxiway: Taxiway
- terminal: Terminal
+ terminal: Airport Terminal
amenity:
animal_shelter: Animal Shelter
arts_centre: Arts Centre
@@ -644,7 +635,7 @@ en-GB:
fire_station: Fire Station
food_court: Food Court
fountain: Fountain
- fuel: Fuel
+ fuel: Filling Station
gambling: Gambling
grave_yard: Graveyard
grit_bin: Grit Bin
@@ -826,9 +817,8 @@ en-GB:
brownfield: Brownfield Land
cemetery: Cemetery
commercial: Commercial Area
- conservation: Conservation
- construction: Construction
- farm: Farm
+ conservation: Conservation Area
+ construction: Construction Area
farmland: Farmland
farmyard: Farmyard
forest: Forest
@@ -847,7 +837,7 @@ en-GB:
reservoir: Reservoir
reservoir_watershed: Reservoir Watershed
residential: Residential Area
- retail: Retail
+ retail: Retail Area
village_green: Village Green
vineyard: Vineyard
"yes": Landuse
@@ -1067,7 +1057,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
@@ -1084,7 +1074,7 @@ en-GB:
grocery: Grocery Shop
hairdresser: Hairdresser
hardware: Hardware Store
- hifi: Hi-Fi
+ hifi: Hi-Fi Shop
houseware: Houseware Shop
interior_decoration: Interior Decoration
jewelry: Jewellers
@@ -1125,7 +1115,7 @@ en-GB:
artwork: Artwork
attraction: Attraction
bed_and_breakfast: Bed and Breakfast
- cabin: Cabin
+ cabin: Tourist Cabin
camp_site: Camp Site
caravan_site: Caravan Site
chalet: Chalet
@@ -1181,9 +1171,6 @@ en-GB:
index:
reports: Reports
layouts:
- project_name:
- title: OpenStreetMap
- h1: OpenStreetMap
logo:
alt_text: OpenStreetMap logo
home: Go to Home Location
@@ -1251,7 +1238,6 @@ en-GB:
befriend_them: You can also add them as a friend at %{befriendurl}.
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:
@@ -1469,9 +1455,6 @@ en-GB:
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 support 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:
@@ -1507,8 +1490,8 @@ 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'
+ used_by_html: '%{name} provides map data for thousands of websites, 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.
@@ -1565,20 +1548,13 @@ 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_1_html: 'Where you use OpenStreetMap data, you are required to do the
+ following two things:'
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.
+
- Sorry, your account has been automatically suspended due to suspicious activity. -
-- This decision will be reviewed by an administrator shortly, or you may contact %{webmaster} if you wish to discuss this. -
auth_failure: connection_failed: Connection to authentication provider failed invalid_credentials: Invalid authentication credentials