]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en-GB.yml
Localisation updates from https://translatewiki.net.
[rails.git] / config / locales / en-GB.yml
index 831d127c921e1a6c2e0029af16af39567c69e9f2..4b091a97b6a5d41affbd587c05de0b4696cce815 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,9 +157,12 @@ en-GB:
         description: Description
         languages: Languages
         pass_crypt: Password
+        pass_crypt_confirmation: Confirm Password
     help:
       trace:
         tagstring: comma delimited
+      user_block:
+        needs_view: Does the user need to log in before this block will be cleared?
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -193,20 +207,15 @@ en-GB:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Default (currently %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (in-browser editor)
     id:
       name: iD
       description: iD (in-browser editor)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (in-browser editor)
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)
   auth:
     providers:
+      none: None
       openid: OpenID
       google: Google
       facebook: Facebook
@@ -302,6 +311,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 +320,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
@@ -408,13 +419,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 +429,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 +450,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 +520,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 +547,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 +566,7 @@ en-GB:
           clock: Clock
           college: College
           community_centre: Community Centre
+          conference_centre: Conference Centre
           courthouse: Court
           crematorium: Crematorium
           dentist: Dentist
@@ -562,6 +574,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 +591,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 +610,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 +649,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 +806,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 +821,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 +844,7 @@ en-GB:
           groyne: Groyne
           kiln: Kiln
           lighthouse: Lighthouse
+          manhole: Manhole
           mast: Mast
           mine: Mine
           mineshaft: Mine Shaft
@@ -1472,17 +1504,6 @@ en-GB:
       user_page_link: user page
       anon_edits_html: (%{link})
       anon_edits_link_text: Find out why this is the case.
-      flash_player_required_html: You need a Flash player to use Potlatch, the OpenStreetMap
-        Flash editor. You can <a href="https://get.adobe.com/flashplayer/">download
-        Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Several
-        other options</a> are also available for editing OpenStreetMap.
-      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you
-        should deselect the current way or point, if editing in live mode, or click
-        save if you have a save button.)
-      potlatch2_not_configured: Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        for more information
-      potlatch2_unsaved_changes: You have unsaved changes. (To save in Potlatch 2,
-        you should click save.)
       id_not_configured: iD has not been configured
       no_iframe_support: Your browser doesn't support HTML iframes, which are necessary
         for this feature.
@@ -2272,27 +2293,17 @@ en-GB:
     new:
       title: Creating block on %{name}
       heading_html: Creating block on %{name}
-      reason: The reason why %{name} is being blocked. Please be as calm and as reasonable
-        as possible, giving as much detail as you can about the situation, remembering
-        that the message will be publicly visible. Bear in mind that not all users
-        understand the community jargon, so please try to use laymans terms.
       period: How long, starting now, the user will be blocked from the API for.
       tried_contacting: I have contacted the user and asked them to stop.
       tried_waiting: I have given a reasonable amount of time for the user to respond
         to those communications.
-      needs_view: User needs to log in before this block will be cleared
       back: View all blocks
     edit:
       title: Editing block on %{name}
       heading_html: Editing block on %{name}
-      reason: The reason why %{name} is being blocked. Please be as calm and as reasonable
-        as possible, giving as much detail as you can about the situation. Bear in
-        mind that not all users understand the community jargon, so please try to
-        use laymans terms.
       period: How long, starting now, the user will be blocked from the API for.
       show: View this block
       back: View all blocks
-      needs_view: Does the user need to log in before this block will be cleared?
     filter:
       block_expired: The block has already expired and cannot be edited.
       block_period: The blocking period must be one of the values selectable in the