Localisation updates from https://translatewiki.net.

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 722c4d1fcff54e38ec260d021db1b41cc629763d..18760b30b019d0b88cbfb9abc0e0727dff888b4d 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -27,6 +27,7 @@
 # Author: Samwilson
 # Author: Shirayuki
 # Author: Smsm1
 # Author: Samwilson
 # Author: Shirayuki
 # Author: Smsm1

+# Author: Tlubenov

 # Author: TomH
 # Author: ديفيد
 ---
 # Author: TomH
 # Author: ديفيد
 ---


@@ -38,6 +39,8 @@ en-GB:
       friendly: '%e %B %Y at %H:%M'
       blog: '%e %B %Y'
   helpers:
       friendly: '%e %B %Y at %H:%M'
       blog: '%e %B %Y'
   helpers:

+    file:
+      prompt: Choose file

     submit:
       diary_comment:
         create: Save
     submit:
       diary_comment:
         create: Save


@@ -73,6 +76,7 @@ en-GB:
       diary_comment: Diary Comment
       diary_entry: Diary Entry
       friend: Friend
       diary_comment: Diary Comment
       diary_entry: Diary Entry
       friend: Friend

+      issue: Issue

       language: Language
       message: Message
       node: Node
       language: Language
       message: Message
       node: Node


@@ -89,6 +93,7 @@ en-GB:
       relation: Relation
       relation_member: Relation Member
       relation_tag: Relation Tag
       relation: Relation
       relation_member: Relation Member
       relation_tag: Relation Tag

+      report: Report

       session: Session
       trace: Trace
       tracepoint: Trace Point
       session: Session
       trace: Trace
       tracepoint: Trace Point


@@ -103,6 +108,9 @@ en-GB:
       client_application:
         callback_url: Callback URL
         support_url: Support URL
       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:
       diary_comment:
         body: Body
       diary_entry:


@@ -197,6 +205,14 @@ en-GB:
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)
     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:
   api:
     notes:
       comment:


@@ -238,6 +254,8 @@ en-GB:
     view_history: View History
     view_details: View Details
     location: 'Location:'
     view_history: View History
     view_details: View Details
     location: 'Location:'

+    common_details:
+      coordinates_html: '%{latitude}, %{longitude}'

     changeset:
       title: 'Changeset: %{id}'
       belongs_to: Author
     changeset:
       title: 'Changeset: %{id}'
       belongs_to: Author


@@ -339,6 +357,7 @@ en-GB:
       reopened_by_anonymous: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Report this note
       reopened_by_anonymous: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
       hidden_by: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Report this note

+      coordinates_html: '%{latitude}, %{longitude}'

     query:
       title: Query Features
       introduction: Click on the map to find nearby features.
     query:
       title: Query Features
       introduction: Click on the map to find nearby features.


@@ -555,11 +574,14 @@ en-GB:
           hospital: Hospital
           hunting_stand: Hunting Stand
           ice_cream: Ice Cream
           hospital: Hospital
           hunting_stand: Hunting Stand
           ice_cream: Ice Cream

+          internet_cafe: Internet Cafe

           kindergarten: Nursery School
           kindergarten: Nursery School

+          language_school: Language school

           library: Library
           marketplace: Marketplace
           monastery: Monastery
           motorcycle_parking: Motorcycle Parking
           library: Library
           marketplace: Marketplace
           monastery: Monastery
           motorcycle_parking: Motorcycle Parking

+          music_school: Music School

           nightclub: Night Club
           nursing_home: Nursing Home
           parking: Parking
           nightclub: Night Club
           nursing_home: Nursing Home
           parking: Parking


@@ -599,6 +621,7 @@ en-GB:
           census: Census Boundary
           national_park: National Park
           protected_area: Protected Area
           census: Census Boundary
           national_park: National Park
           protected_area: Protected Area

+          "yes": Boundary

         bridge:
           aqueduct: Aqueduct
           boardwalk: Promenade
         bridge:
           aqueduct: Aqueduct
           boardwalk: Promenade


@@ -607,6 +630,17 @@ en-GB:
           viaduct: Viaduct
           "yes": Bridge
         building:
           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
           "yes": Building
         craft:
           brewery: Brewery


@@ -1054,6 +1088,9 @@ en-GB:
     results:
       no_results: No results found
       more_results: More results
     results:
       no_results: No results found
       more_results: More results

+  issues:
+    index:
+      reports: Reports

   layouts:
     project_name:
       title: OpenStreetMap
   layouts:
     project_name:
       title: OpenStreetMap


@@ -1975,8 +2012,6 @@ en-GB:
     reset_password:
       title: Reset password
       heading: Reset Password for %{user}
     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?
       reset: Reset Password
       flash changed: Your password has been changed.
       flash token bad: Did not find that token, check the URL maybe?


@@ -2507,6 +2542,17 @@ en-GB:
         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
         unnamed: unnamed road
         courtesy: Directions courtesy of %{link}
         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
       time: Time
     query:
       node: Node


@@ -2552,4 +2598,6 @@ en-GB:
         this redaction before destroying it.
       flash: Redaction destroyed.
       error: There was an error destroying this redaction.
         this redaction before destroying it.
       flash: Redaction destroyed.
       error: There was an error destroying this redaction.

+  validations:
+    invalid_characters: contains invalid characters

 ...
 ...