]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en-GB.yml
Merge branch 'pull/3035'
[rails.git] / config / locales / en-GB.yml
index 1f1794127a7c0363e96a09b6860525757e0b7cb7..2ea39365aab466d7b143aa5ee0a51aed361bc44a 100644 (file)
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Abijeet Patro
+# Author: Alefar
 # Author: Andibing
 # Author: BEANS
 # Author: Bjh21
@@ -20,6 +21,7 @@
 # Author: Jlrb+
 # Author: Kosovastar
 # Author: Macofe
+# Author: Maro21
 # Author: Meno25
 # Author: Michel Bakni
 # Author: Mvolz
@@ -106,11 +108,17 @@ en-GB:
       way_tag: Way Tag
     attributes:
       client_application:
-        callback_url: Callback URL
+        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:
@@ -139,6 +147,9 @@ en-GB:
         title: Subject
         body: Body
         recipient: Recipient
+      report:
+        category: 'Select a reason for your report:'
+        details: Please provide some more details about the problem (required).
       user:
         email: E-mail
         active: Active
@@ -146,6 +157,7 @@ en-GB:
         description: Description
         languages: Languages
         pass_crypt: Password
+        pass_crypt_confirmation: Confirm Password
     help:
       trace:
         tagstring: comma delimited
@@ -207,6 +219,7 @@ en-GB:
       description: Remote Control (JOSM or Merkaartor)
   auth:
     providers:
+      none: None
       openid: OpenID
       google: Google
       facebook: Facebook
@@ -266,8 +279,8 @@ en-GB:
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
       comment: Comments (%{count})
-      hidden_commented_by: Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_commented_by_html: Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
       feed:
@@ -302,6 +315,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
@@ -310,6 +324,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
@@ -347,15 +362,15 @@ 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} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous: Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous: Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by: Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous: Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by: Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_html: Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Report this note
       coordinates_html: '%{latitude}, %{longitude}'
     query:
@@ -408,13 +423,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
+      use_map_link: Use map
     index:
       title: Users' diaries
       title_friends: Friends' diaries
@@ -423,6 +433,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
@@ -443,6 +454,7 @@ en-GB:
         your spelling, or maybe the link you clicked is wrong.
     diary_entry:
       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: Send a message to the author
       comment_count:
@@ -512,6 +524,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
@@ -538,7 +551,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
@@ -555,6 +570,7 @@ en-GB:
           clock: Clock
           college: College
           community_centre: Community Centre
+          conference_centre: Conference Centre
           courthouse: Court
           crematorium: Crematorium
           dentist: Dentist
@@ -562,6 +578,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
@@ -578,8 +595,11 @@ en-GB:
           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
@@ -594,6 +614,7 @@ en-GB:
           post_office: Post Office
           prison: Prison
           pub: Pub
+          public_bath: Public Bath
           public_building: Public Building
           recycling: Recycling Point
           restaurant: Restaurant
@@ -632,12 +653,17 @@ en-GB:
         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
@@ -784,6 +810,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
@@ -798,13 +825,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
@@ -813,6 +848,7 @@ en-GB:
           groyne: Groyne
           kiln: Kiln
           lighthouse: Lighthouse
+          manhole: Manhole
           mast: Mast
           mine: Mine
           mineshaft: Mine Shaft
@@ -1076,11 +1112,6 @@ en-GB:
         level8: City Boundary
         level9: Village Boundary
         level10: Suburb Boundary
-    description:
-      title:
-        osm_nominatim: Location from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames: Location from <a href="http://www.geonames.org/">GeoNames</a>
       types:
         cities: Cities
         towns: Towns
@@ -1149,7 +1180,6 @@ en-GB:
       footer: You can also read the comment at %{readurl} and you can comment at %{commenturl}
         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}:'
@@ -1161,24 +1191,16 @@ en-GB:
       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:
-          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.
+    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!
@@ -1189,28 +1211,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,
@@ -2027,9 +2037,6 @@ en-GB:
         html: |-
           <p>Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.</p>
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
-      license_agreement: When you confirm your account you will need to agree to the
-        <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor
-        terms</a>.
       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'
       not_displayed_publicly_html: Your address is not displayed publicly, see our
@@ -2215,10 +2222,11 @@ en-GB:
       reconfirm_html: If you need us to resend the confirmation email, <a href="%{reconfirm}">click
         here</a>.
     confirm_resend:
-      success: We've sent a new confirmation note to %{email} and as soon as you confirm
-        your account you'll be able to get mapping.<br /><br />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.
+      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.<br /><br />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
@@ -2347,10 +2355,11 @@ en-GB:
       revoke: Revoke!
       flash: This block has been revoked.
     helper:
-      time_future: Ends in %{time}.
+      time_future_html: Ends in %{time}.
       until_login: Active until the user logs in.
-      time_future_and_until_login: Ends in %{time} and after the user has logged in.
-      time_past: Ended %{time}.
+      time_future_and_until_login_html: Ends in %{time} and after the user has logged
+        in.
+      time_past_html: Ended %{time}.
       block_duration:
         hours:
           one: 1 hour