]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en-GB.yml
Merge remote-tracking branch 'upstream/pull/1704'
[rails.git] / config / locales / en-GB.yml
index c3eca7447d930f9244741fb60785b9e18ce0a2f5..a2429a22274c20d52d64ee5764d4eeb22d77e185 100644 (file)
@@ -17,6 +17,7 @@
 # Author: Meno25
 # Author: Sampablokuper
 # Author: Shirayuki
+# Author: Smsm1
 # Author: ديفيد
 ---
 en-GB:
@@ -398,7 +399,6 @@ en-GB:
     search:
       title:
         latlon: Results from <a href="http://openstreetmap.org/">Internal</a>
-        us_postcode: Results from <a href="http://geocoder.us/">Geocoder.us</a>
         uk_postcode: Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>
         ca_postcode: Results from <a href="http://geocoder.ca/">Geocoder.CA</a>
@@ -452,37 +452,30 @@ en-GB:
           clock: Clock
           college: College
           community_centre: Community Centre
-          courthouse: Courthouse
+          courthouse: Court
           crematorium: Crematorium
           dentist: Dentist
           doctors: Doctors
-          dormitory: Dormitory
           drinking_water: Drinking Water
           driving_school: Driving School
           embassy: Embassy
-          emergency_phone: Emergency Phone
           fast_food: Fast Food
           ferry_terminal: Ferry Terminal
-          fire_hydrant: Fire Hydrant
           fire_station: Fire Station
           food_court: Food Court
           fountain: Fountain
           fuel: Fuel
           gambling: Gambling
           grave_yard: Graveyard
-          gym: Fitness Centre/Gym
-          health_centre: Health Centre
           hospital: Hospital
           hunting_stand: Hunting Stand
           ice_cream: Ice Cream
           kindergarten: Nursery School
           library: Library
-          market: Market
           marketplace: Marketplace
           monastery: Monastery
           motorcycle_parking: Motorcycle Parking
           nightclub: Night Club
-          nursery: Nursery School
           nursing_home: Nursing Home
           office: Office
           parking: Parking
@@ -496,7 +489,6 @@ en-GB:
           prison: Prison
           pub: Pub
           public_building: Public Building
-          reception_area: Reception Area
           recycling: Recycling Point
           restaurant: Restaurant
           retirement_home: Retirement Home
@@ -519,7 +511,7 @@ en-GB:
           vending_machine: Vending Machine
           veterinary: Veterinary Surgery
           village_hall: Village Hall
-          waste_basket: bin
+          waste_basket: Waste Bin
           waste_disposal: Waste Disposal
           youth_centre: Youth Centre
         boundary:
@@ -592,7 +584,6 @@ en-GB:
           trunk: Trunk Road
           trunk_link: Trunk Road
           unclassified: Unclassified Road
-          unsurfaced: Unsurfaced Road
           "yes": Road
         historic:
           archaeological_site: Archaeological Site
@@ -657,7 +648,6 @@ en-GB:
         leisure:
           beach_resort: Beach Resort
           bird_hide: Bird Hide
-          club: Club
           common: Common Land
           dog_park: Dog Park
           fishing: Fishing Area
@@ -750,8 +740,6 @@ en-GB:
           "yes": Office
         place:
           allotments: Allotments
-          block: Block
-          airport: Airport
           city: City
           country: Country
           county: County
@@ -763,7 +751,6 @@ en-GB:
           islet: Islet
           isolated_dwelling: Isolated Dwelling
           locality: Locality
-          moor: Moor
           municipality: Municipality
           neighbourhood: Neighbourhood
           postcode: Postcode
@@ -780,10 +767,8 @@ en-GB:
           abandoned: Abandoned Railway
           construction: Railway under construction
           disused: Disused Railway
-          disused_station: Disused Railway Station
           funicular: Funicular Railway
           halt: Train Stop
-          historic_station: Historic Railway Station
           junction: Railway Junction
           level_crossing: Level Crossing
           light_rail: Light Rail
@@ -847,7 +832,6 @@ en-GB:
           hairdresser: Hairdresser
           hardware: Hardware Store
           hifi: Hi-Fi
-          insurance: Insurance
           jewelry: Jewellers
           kiosk: Kiosk Shop
           laundry: Laundry
@@ -863,10 +847,8 @@ en-GB:
           pet: Pet Shop
           pharmacy: Pharmacy
           photo: Photo Shop
-          salon: Salon
           second_hand: Second-hand Shop
           shoes: Shoe Shop
-          shopping_centre: Shopping Centre
           sports: Sports Shop
           stationery: Stationers
           supermarket: Supermarket
@@ -969,7 +951,7 @@ en-GB:
     intro_2_create_account: Create a user account
     partners_html: Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other
       %{partners}.
-    partners_ucl: the UCL VR Centre
+    partners_ucl: UCL
     partners_ic: Imperial College London
     partners_bytemark: Bytemark Hosting
     partners_partners: partners
@@ -1047,11 +1029,12 @@ en-GB:
         href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
-      more_2_html: Although OpenStreetMap is open data, we cannot provide a free-of-charge
-        map API for third-party developers. See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API
-        Usage Policy</a>, <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile
-        Usage Policy</a> and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim
-        Usage Policy</a>.
+      more_2_html: |-
+        Although OpenStreetMap is open data, we cannot provide a
+        free-of-charge map API for third-parties.
+        See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
+        <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
+        and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.
       contributors_title_html: Our contributors
       contributors_intro_html: |-
         Our contributors are thousands of individuals. We also include
@@ -1241,16 +1224,19 @@ en-GB:
     legal_title: Legal
     legal_html: "This site and many other related services are formally operated by
       the  \n<a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
-      \non behalf of the community.\n<br> \nPlease <a href='http://osmfoundation.org/Contact'>contact
+      \non behalf of the community. Use of all OSMF operated services is subject \nto
+      our <a href=\"http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nAcceptable
+      Use Policies</a> and our <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privacy
+      Policy</a>\n<br> \nPlease <a href='http://osmfoundation.org/Contact'>contact
       the OSMF</a> \nif you have licensing, copyright or other legal questions and
       issues."
     partners_title: Partners
   notifier:
     diary_comment_notification:
-      subject: '[OpenStreetMap] %{user} commented on your diary entry'
+      subject: '[OpenStreetMap] %{user} commented on a diary entry'
       hi: Hi %{to_user},
-      header: '%{from_user} has commented on your recent OpenStreetMap diary entry
-        with the subject %{subject}:'
+      header: '%{from_user} has commented on the OpenStreetMap diary entry with the
+        subject %{subject}:'
       footer: You can also read the comment at %{readurl} and you can comment at %{commenturl}
         or reply at %{replyurl}
     message_notification:
@@ -1261,6 +1247,7 @@ en-GB:
       footer_html: You can also read the message at %{readurl} and you can reply at
         %{replyurl}
     friend_notification:
+      hi: Hi %{to_user},
       subject: '[OpenStreetMap] %{user} added you as a friend'
       had_added_you: '%{user} has added you as a friend on OpenStreetMap.'
       see_their_profile: You can see their profile at %{userurl}.
@@ -1340,6 +1327,7 @@ en-GB:
           on. The note is near %{place}.'
       details: More details about the note can be found at %{url}.
     changeset_comment_notification:
+      hi: Hi %{to_user},
       greeting: Hi,
       commented:
         subject_own: '[OpenStreetMap] %{commenter} has commented on one of your changesets'
@@ -1352,6 +1340,8 @@ en-GB:
         partial_changeset_with_comment: with comment '%{changeset_comment}'
         partial_changeset_without_comment: without comment
       details: More details about the changeset can be found at %{url}.
+      unsubscribe: To unsubscribe from updates to this changeset, visit %{url} and
+        click "Unsubscribe".
   message:
     inbox:
       title: Inbox
@@ -1414,6 +1404,7 @@ en-GB:
       date: Date
       reply_button: Reply
       unread_button: Mark as unread
+      delete_button: Delete
       back: Back
       to: To
       wrong_user: You are logged in as `%{user}' but the message you have asked to
@@ -1683,6 +1674,8 @@ en-GB:
     require_moderator:
       not_a_moderator: You need to be a moderator to perform that action.
     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
@@ -1713,6 +1706,8 @@ en-GB:
       invalid: The authorisation token is not valid.
     revoke:
       flash: You've revoked the token for %{application}
+    permissions:
+      missing: You have not permitted the application access to this facility
   oauth_clients:
     new:
       title: Register a new application
@@ -1818,6 +1813,9 @@ en-GB:
         github:
           title: Login with GitHub
           alt: Login with a GitHub Account
+        wikipedia:
+          title: Login with Wikipedia
+          alt: Login with a Wikipedia Account
         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID
@@ -1866,8 +1864,9 @@ en-GB:
         terms</a>.
       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'
-      not displayed publicly: Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy"
-        title="wiki privacy policy including section on email addresses">privacy policy</a>)
+      not displayed publicly: Your address is not displayed publicly, see our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy"
+        title="OSMF privacy policy including section on email addresses">privacy policy</a>
+        for more information
       display name: 'Display Name:'
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
@@ -2222,6 +2221,7 @@ en-GB:
     helper:
       time_future: 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} ago.
     blocks_on:
       title: Blocks on %{name}
@@ -2306,7 +2306,7 @@ en-GB:
     key:
       title: Map Key
       tooltip: Legend
-      tooltip_disabled: Legend available only for Standard layer
+      tooltip_disabled: Map Key not available for this layer
     map:
       zoom:
         in: Zoom In
@@ -2323,6 +2323,7 @@ en-GB:
         header: Map Layers
         notes: Map Notes
         data: Map Data
+        gps: Public GPS Traces
         overlays: Enable overlays for troubleshooting the map
         title: Layers
       copyright: © <a href='%{copyright_url}'>OpenStreetMap contributors</a>
@@ -2361,16 +2362,16 @@ en-GB:
     edit_help: Move the map and zoom in on a location you want to edit, then click
       here.
     directions:
+      ascend: Ascend
       engines:
         graphhopper_bicycle: Bicycle (GraphHopper)
+        graphhopper_car: Car (GraphHopper)
         graphhopper_foot: Foot (GraphHopper)
         mapquest_bicycle: Bicycle (MapQuest)
         mapquest_car: Car (MapQuest)
         mapquest_foot: Foot (MapQuest)
         osrm_car: Car (OSRM)
-        mapzen_bicycle: Bicycle (Mapzen)
-        mapzen_car: Car (Mapzen)
-        mapzen_foot: Foot (Mapzen)
+      descend: Descend
       directions: Directions
       distance: Distance
       errors:
@@ -2405,6 +2406,11 @@ en-GB:
         against_oneway_without_exit: Go against one-way on %{name}
         end_oneway_without_exit: End of one-way on %{name}
         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
+        turn_left_with_exit: At roundabout turn left onto %{name}
+        slight_left_with_exit: At roundabout slight left onto %{name}
+        turn_right_with_exit: At roundabout turn right onto %{name}
+        slight_right_with_exit: At roundabout slight right onto %{name}
+        continue_with_exit: At roundabout continue straight onto %{name}
         unnamed: unnamed road
         courtesy: Directions courtesy of %{link}
       time: Time
@@ -2415,6 +2421,13 @@ en-GB:
       nothing_found: No features found
       error: 'Error contacting %{server}: %{error}'
       timeout: Timeout contacting %{server}
+    context:
+      directions_from: Directions from here
+      directions_to: Directions to here
+      add_note: Add a note here
+      show_address: Show address
+      query_features: Query features
+      centre_map: Centre map here
   redaction:
     edit:
       description: Description