Merge remote-tracking branch 'upstream/pull/3117'

[rails.git] / config / locales / en-GB.yml

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 831d127c921e1a6c2e0029af16af39567c69e9f2..0939470fbf555d0b06bb05cda30e485763548db2 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Abijeet Patro

+# Author: Alefar

 # Author: Andibing
 # Author: BEANS
 # Author: Bjh21
 # Author: Andibing
 # Author: BEANS
 # Author: Bjh21


@@ -20,6 +21,7 @@
 # Author: Jlrb+
 # Author: Kosovastar
 # Author: Macofe
 # Author: Jlrb+
 # Author: Kosovastar
 # Author: Macofe

+# Author: Maro21

 # Author: Meno25
 # Author: Michel Bakni
 # Author: Mvolz
 # Author: Meno25
 # Author: Michel Bakni
 # Author: Mvolz


@@ -106,11 +108,17 @@ en-GB:
       way_tag: Way Tag
     attributes:
       client_application:
       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
         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_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:
       diary_comment:
         body: Body
       diary_entry:


@@ -139,16 +147,29 @@ en-GB:
         title: Subject
         body: Body
         recipient: Recipient
         title: Subject
         body: Body
         recipient: Recipient

+      redaction:
+        description: Description
+      report:
+        category: 'Select a reason for your report:'
+        details: Please provide some more details about the problem (required).

       user:
         email: E-mail
       user:
         email: E-mail

+        new_email: New Email Address

         active: Active
         display_name: Display Name
         active: Active
         display_name: Display Name

-        description: Description
-        languages: Languages
+        description: Profile Description
+        home_lat: Latitude
+        home_lon: Longitude
+        languages: Preferred Languages

         pass_crypt: Password
         pass_crypt: Password

+        pass_crypt_confirmation: Confirm Password

     help:
       trace:
         tagstring: comma delimited
     help:
       trace:
         tagstring: comma delimited

+      user_block:
+        needs_view: Does the user need to log in before this block will be cleared?
+      user:
+        new_email: (never displayed publicly)

   datetime:
     distance_in_words_ago:
       about_x_hours:
   datetime:
     distance_in_words_ago:
       about_x_hours:


@@ -193,20 +214,15 @@ en-GB:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Default (currently %{name})
     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)
     id:
       name: iD
       description: iD (in-browser editor)

-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (in-browser editor)

     remote:
       name: Remote Control
     remote:
       name: Remote Control

-      description: Remote Control (JOSM or Merkaartor)
+      description: Remote Control (JOSM, Potlatch, Merkaartor)

   auth:
     providers:
   auth:
     providers:

+      none: None

       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook


@@ -302,6 +318,7 @@ en-GB:
       entry_html: Relation %{relation_name}
       entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       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
       sorry: 'Sorry, %{type} #%{id} could not be found.'
       type:
         node: node


@@ -310,6 +327,7 @@ en-GB:
         changeset: changeset
         note: note
     timeout:
         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
       sorry: Sorry, the data for the %{type} with the id %{id}, took too long to retrieve.
       type:
         node: node


@@ -408,13 +426,8 @@ en-GB:
     new:
       title: New Diary Entry
     form:
     new:
       title: New Diary Entry
     form:

-      subject: 'Subject:'
-      body: 'Body:'
-      language: 'Language:'
-      location: 'Location:'
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
-      use_map_link: use map
+      location: Location
+      use_map_link: Use map

     index:
       title: Users' diaries
       title_friends: Friends' diaries
     index:
       title: Users' diaries
       title_friends: Friends' diaries


@@ -423,6 +436,7 @@ en-GB:
       in_language_title: Diary Entries in %{language}
       new: New Diary Entry
       new_title: Compose a new entry in my user diary
       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
       no_entries: No diary entries
       recent_entries: Recent diary entries
       older_entries: Older Entries


@@ -442,7 +456,8 @@ en-GB:
       body: Sorry, there is no diary entry or comment with the id %{id}. Please check
         your spelling, or maybe the link you clicked is wrong.
     diary_entry:
       body: Sorry, there is no diary entry or comment with the id %{id}. Please check
         your spelling, or maybe the link you clicked is wrong.
     diary_entry:

-      posted_by_html: Posted by %{link_user} on %{created} in %{language_link}
+      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:
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:


@@ -512,6 +527,7 @@ en-GB:
           chair_lift: Chairlift
           drag_lift: Drag Lift
           gondola: Gondola Lift
           chair_lift: Chairlift
           drag_lift: Drag Lift
           gondola: Gondola Lift

+          magic_carpet: Magic Carpet Lift

           platter: Platter Lift
           pylon: Pylon
           station: Aerialway Station
           platter: Platter Lift
           pylon: Pylon
           station: Aerialway Station


@@ -538,7 +554,9 @@ en-GB:
           bench: Bench
           bicycle_parking: Cycle Parking
           bicycle_rental: Cycle Rental
           bench: Bench
           bicycle_parking: Cycle Parking
           bicycle_rental: Cycle Rental

+          bicycle_repair_station: Bicycle Repair Station

           biergarten: Beer Garden
           biergarten: Beer Garden

+          blood_bank: Blood Bank

           boat_rental: Boat Rental
           brothel: Brothel
           bureau_de_change: Bureau de Change
           boat_rental: Boat Rental
           brothel: Brothel
           bureau_de_change: Bureau de Change


@@ -555,6 +573,7 @@ en-GB:
           clock: Clock
           college: College
           community_centre: Community Centre
           clock: Clock
           college: College
           community_centre: Community Centre

+          conference_centre: Conference Centre

           courthouse: Court
           crematorium: Crematorium
           dentist: Dentist
           courthouse: Court
           crematorium: Crematorium
           dentist: Dentist


@@ -562,6 +581,7 @@ en-GB:
           drinking_water: Drinking Water
           driving_school: Driving School
           embassy: Embassy
           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
           fast_food: Fast Food
           ferry_terminal: Ferry Terminal
           fire_station: Fire Station


@@ -578,8 +598,11 @@ en-GB:
           kindergarten: Nursery School
           language_school: Language school
           library: Library
           kindergarten: Nursery School
           language_school: Language school
           library: Library

+          loading_dock: Loading Dock
+          love_hotel: Love Hotel

           marketplace: Marketplace
           monastery: Monastery
           marketplace: Marketplace
           monastery: Monastery

+          money_transfer: Money Transfer

           motorcycle_parking: Motorcycle Parking
           music_school: Music School
           nightclub: Night Club
           motorcycle_parking: Motorcycle Parking
           music_school: Music School
           nightclub: Night Club


@@ -594,6 +617,7 @@ en-GB:
           post_office: Post Office
           prison: Prison
           pub: Pub
           post_office: Post Office
           prison: Prison
           pub: Pub

+          public_bath: Public Bath

           public_building: Public Building
           recycling: Recycling Point
           restaurant: Restaurant
           public_building: Public Building
           recycling: Recycling Point
           restaurant: Restaurant


@@ -632,12 +656,17 @@ en-GB:
         building:
           apartment: Apartment
           apartments: Apartments
         building:
           apartment: Apartment
           apartments: Apartments

+          bungalow: Bungalow

           cabin: Cabin
           cabin: Cabin

+          chapel: Chapel
+          church: Church

           college: College Building
           commercial: Commercial Building
           construction: Building under Construction
           garage: Garage
           garages: Garages
           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
           house: House
           industrial: Industrial Building
           roof: Roof


@@ -784,6 +813,7 @@ en-GB:
           miniature_golf: Miniature Golf
           nature_reserve: Nature Reserve
           park: Park
           miniature_golf: Miniature Golf
           nature_reserve: Nature Reserve
           park: Park

+          picnic_table: Picnic Table

           pitch: Sports Pitch
           playground: Playground
           recreation_ground: Recreation Ground
           pitch: Sports Pitch
           playground: Playground
           recreation_ground: Recreation Ground


@@ -798,13 +828,21 @@ en-GB:
           "yes": Leisure
         man_made:
           adit: Adit
           "yes": Leisure
         man_made:
           adit: Adit

+          advertising: Advertising
+          antenna: Antenna/Antennae
+          avalanche_protection: Avalanche Protection

           beacon: Beacon
           beacon: Beacon

+          beam: Beam

           beehive: Bee Hive
           breakwater: Breakwater
           bridge: Bridge
           bunker_silo: Bunker
           beehive: Bee Hive
           breakwater: Breakwater
           bridge: Bridge
           bunker_silo: Bunker

+          cairn: Cairn

           chimney: Chimney
           chimney: Chimney

+          clearcut: Clearcut
+          communications_tower: Communications Tower

           crane: Crane
           crane: Crane

+          cross: Cross

           dolphin: Mooring Post
           dyke: Dyke
           embankment: Embankment
           dolphin: Mooring Post
           dyke: Dyke
           embankment: Embankment


@@ -813,6 +851,7 @@ en-GB:
           groyne: Groyne
           kiln: Kiln
           lighthouse: Lighthouse
           groyne: Groyne
           kiln: Kiln
           lighthouse: Lighthouse

+          manhole: Manhole

           mast: Mast
           mine: Mine
           mineshaft: Mine Shaft
           mast: Mast
           mine: Mine
           mineshaft: Mine Shaft


@@ -1472,17 +1511,6 @@ en-GB:
       user_page_link: user page
       anon_edits_html: (%{link})
       anon_edits_link_text: Find out why this is the case.
       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.
       id_not_configured: iD has not been configured
       no_iframe_support: Your browser doesn't support HTML iframes, which are necessary
         for this feature.


@@ -2003,15 +2031,10 @@ en-GB:
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'

-      not_displayed_publicly_html: Your address is not displayed publicly, see our
-        <a href="https://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.
       external auth: 'Third Party Authentication:'
       display name: 'Display Name:'
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
       external auth: 'Third Party Authentication:'

-      password: 'Password:'
-      confirm password: 'Confirm Password:'

       use external auth: Alternatively, use a third party to login
       auth no password: With third party authentication a password is not required,
         but some extra tools or server may still need one.
       use external auth: Alternatively, use a third party to login
       auth no password: With third party authentication a password is not required,
         but some extra tools or server may still need one.


@@ -2114,15 +2137,13 @@ en-GB:
     account:
       title: Edit account
       my settings: My settings
     account:
       title: Edit account
       my settings: My settings

-      current email address: 'Current Email Address:'
-      new email address: 'New Email Address:'
-      email never displayed publicly: (never displayed publicly)
-      external auth: 'External Authentication:'
+      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:
       openid:
         link: https://wiki.openstreetmap.org/wiki/OpenID
         link text: what is this?
       public editing:

-        heading: '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?
         enabled: Enabled. Not anonymous and can edit data.
         enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: what is this?


@@ -2138,7 +2159,7 @@ en-GB:
           public.</li><li>This action cannot be reversed and all new users are now
           public by default.</li></ul>
       contributor terms:
           public.</li><li>This action cannot be reversed and all new users are now
           public by default.</li></ul>
       contributor terms:

-        heading: 'Contributor Terms:'
+        heading: Contributor Terms

         agreed: You have agreed to the new Contributor Terms.
         not yet agreed: You have not yet agreed to the new Contributor Terms.
         review link text: Please follow this link at your convenience to review and
         agreed: You have agreed to the new Contributor Terms.
         not yet agreed: You have not yet agreed to the new Contributor Terms.
         review link text: Please follow this link at your convenience to review and


@@ -2147,14 +2168,10 @@ en-GB:
           in the Public Domain.
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: what is this?
           in the Public Domain.
         link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: what is this?

-      profile description: 'Profile Description:'
-      preferred languages: 'Preferred Languages:'
-      preferred editor: 'Preferred Editor:'
-      image: 'Image:'
+      image: Image

       gravatar:
         gravatar: Use Gravatar
         link: https://wiki.openstreetmap.org/wiki/Gravatar
       gravatar:
         gravatar: Use Gravatar
         link: https://wiki.openstreetmap.org/wiki/Gravatar

-        link text: what is this?

         disabled: Gravatar has been disabled.
         enabled: Display of your Gravatar has been enabled.
       new image: Add an image
         disabled: Gravatar has been disabled.
         enabled: Display of your Gravatar has been enabled.
       new image: Add an image


@@ -2162,10 +2179,8 @@ en-GB:
       delete image: Remove the current image
       replace image: Replace the current image
       image size hint: (square images at least 100x100 work best)
       delete image: Remove the current image
       replace image: Replace the current image
       image size hint: (square images at least 100x100 work best)

-      home location: 'Home Location:'
+      home location: Home Location

       no home location: You have not entered your home location.
       no home location: You have not entered your home location.

-      latitude: 'Latitude:'
-      longitude: 'Longitude:'

       update home location on click: Update home location when I click on the map?
       save changes button: Save Changes
       make edits public button: Make all my edits public
       update home location on click: Update home location when I click on the map?
       save changes button: Save Changes
       make edits public button: Make all my edits public


@@ -2272,27 +2287,17 @@ en-GB:
     new:
       title: Creating block on %{name}
       heading_html: Creating block on %{name}
     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.
       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}
       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
       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
     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


@@ -2387,7 +2392,6 @@ en-GB:
       custom_dimensions: Set custom dimensions
       format: 'Format:'
       scale: 'Scale:'
       custom_dimensions: Set custom dimensions
       format: 'Format:'
       scale: 'Scale:'

-      image_size: Image will show standard layer at

       download: Download
       short_url: Short URL
       include_marker: Include marker
       download: Download
       short_url: Short URL
       include_marker: Include marker


@@ -2543,7 +2547,6 @@ en-GB:
       centre_map: Centre map here
   redactions:
     edit:
       centre_map: Centre map here
   redactions:
     edit:

-      description: Description

       heading: Edit redaction
       title: Edit redaction
     index:
       heading: Edit redaction
       title: Edit redaction
     index:


@@ -2551,7 +2554,6 @@ en-GB:
       heading: List of redactions
       title: List of redactions
     new:
       heading: List of redactions
       title: List of redactions
     new:

-      description: Description

       heading: Enter information for new redaction
       title: Creating new redaction
     show:
       heading: Enter information for new redaction
       title: Creating new redaction
     show: