X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f17a83992d44dc0dcf373c27552bc66bd9bca17d..790ffed9b84d47991194dd22a68cf74e09f4f3bc:/config/locales/en-GB.yml
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 67e779264..1f1794127 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -27,6 +27,7 @@
# Author: Samwilson
# Author: Shirayuki
# Author: Smsm1
+# Author: Tlubenov
# Author: TomH
# Author: دÙÙÙد
---
@@ -38,6 +39,8 @@ en-GB:
friendly: '%e %B %Y at %H:%M'
blog: '%e %B %Y'
helpers:
+ file:
+ prompt: Choose file
submit:
diary_comment:
create: Save
@@ -50,7 +53,7 @@ en-GB:
create: Send
client_application:
create: Register
- update: Edit
+ update: Update
redaction:
create: Create redaction
update: Save redaction
@@ -73,6 +76,7 @@ en-GB:
diary_comment: Diary Comment
diary_entry: Diary Entry
friend: Friend
+ issue: Issue
language: Language
message: Message
node: Node
@@ -89,6 +93,7 @@ en-GB:
relation: Relation
relation_member: Relation Member
relation_tag: Relation Tag
+ report: Report
session: Session
trace: Trace
tracepoint: Trace Point
@@ -100,6 +105,12 @@ en-GB:
way_node: Way Node
way_tag: Way Tag
attributes:
+ client_application:
+ callback_url: Callback URL
+ support_url: Support URL
+ allow_write_api: modify the map
+ allow_read_gpx: read their private GPS traces
+ allow_write_gpx: upload GPS traces
diary_comment:
body: Body
diary_entry:
@@ -114,12 +125,15 @@ 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
@@ -132,6 +146,9 @@ en-GB:
description: Description
languages: Languages
pass_crypt: Password
+ help:
+ trace:
+ tagstring: comma delimited
datetime:
distance_in_words_ago:
about_x_hours:
@@ -188,6 +205,14 @@ en-GB:
remote:
name: Remote Control
description: Remote Control (JOSM or Merkaartor)
+ auth:
+ providers:
+ openid: OpenID
+ google: Google
+ facebook: Facebook
+ windowslive: Windows Live
+ github: GitHub
+ wikipedia: Wikipedia
api:
notes:
comment:
@@ -229,6 +254,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
@@ -330,6 +357,7 @@ en-GB:
reopened_by_anonymous: Reactivated by anonymous %{when}
hidden_by: 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.
@@ -546,14 +574,16 @@ 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
marketplace: Marketplace
monastery: Monastery
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
@@ -562,20 +592,15 @@ en-GB:
police: Police
post_box: Post Box
post_office: Post Office
- preschool: Pre-School
prison: Prison
pub: Pub
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
@@ -591,12 +616,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
@@ -605,6 +630,17 @@ en-GB:
viaduct: Viaduct
"yes": Bridge
building:
+ apartment: Apartment
+ apartments: Apartments
+ cabin: Cabin
+ college: College Building
+ commercial: Commercial Building
+ construction: Building under Construction
+ garage: Garage
+ garages: Garages
+ house: House
+ industrial: Industrial Building
+ roof: Roof
"yes": Building
craft:
brewery: Brewery
@@ -666,7 +702,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
@@ -685,7 +720,6 @@ en-GB:
fort: Fort
heritage: Heritage Site
house: House
- icon: Icon
manor: Manor
memorial: Memorial
mine: Mine
@@ -730,7 +764,6 @@ en-GB:
reservoir_watershed: Reservoir Watershed
residential: Residential Area
retail: Retail
- road: Road Area
village_green: Village Green
vineyard: Vineyard
"yes": Landuse
@@ -887,7 +920,6 @@ en-GB:
subdivision: Subdivision
suburb: Suburb
town: Town
- unincorporated_area: Unincorporated Area
village: Village
"yes": Place
railway:
@@ -913,6 +945,7 @@ en-GB:
switch: Railway Points
tram: Tramway
tram_stop: Tram Stop
+ yard: Railway Yard
shop:
alcohol: Off Licence
antiques: Antiques
@@ -946,12 +979,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
@@ -968,7 +999,6 @@ en-GB:
laundry: Laundry
lottery: Lottery
mall: Mall
- market: Market
massage: Massage
mobile_phone: Mobile Phone Shop
motorcycle: Motorcycle Shop
@@ -980,7 +1010,6 @@ en-GB:
paint: Paint Shop
pawnbroker: Pawnbroker
pet: Pet Shop
- pharmacy: Pharmacy
photo: Photo Shop
seafood: Seafood
second_hand: Second-hand Shop
@@ -1059,6 +1088,9 @@ en-GB:
results:
no_results: No results found
more_results: More results
+ issues:
+ index:
+ reports: Reports
layouts:
project_name:
title: OpenStreetMap
@@ -1108,7 +1140,7 @@ 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},
@@ -1739,11 +1771,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
@@ -1763,18 +1790,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:
@@ -1901,13 +1916,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
@@ -1923,19 +1931,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:
@@ -2016,8 +2012,6 @@ en-GB:
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?
@@ -2548,6 +2542,17 @@ en-GB:
roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
unnamed: unnamed road
courtesy: Directions courtesy of %{link}
+ exit_counts:
+ first: 1st
+ second: 2nd
+ third: 3rd
+ fourth: 4th
+ fifth: 5th
+ sixth: 6th
+ seventh: 7th
+ eighth: 8th
+ ninth: 9th
+ tenth: 10th
time: Time
query:
node: Node
@@ -2593,4 +2598,6 @@ en-GB:
this redaction before destroying it.
flash: Redaction destroyed.
error: There was an error destroying this redaction.
+ validations:
+ invalid_characters: contains invalid characters
...