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 e9bcdb560abce6737178ea666de8a182f44b50eb..6feab9c34433fc18cf33468ccd08c9e999a8319f 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -205,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:


@@ -246,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


@@ -347,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.


@@ -619,17 +630,17 @@ en-GB:
           viaduct: Viaduct
           "yes": Bridge
         building:
           viaduct: Viaduct
           "yes": Bridge
         building:

-          apartment: Апартамент
-          apartments: Апартаменти
-          cabin: Кабина
-          college: Сграда Колеж
+          apartment: Apartment
+          apartments: Apartments
+          cabin: Cabin
+          college: College Building

           commercial: Търговска Сграда
           commercial: Търговска Сграда

-          construction: Сграда в строеж
-          garage: Гараж
+          construction: Building under Construction
+          garage: Garage

           garages: Гаражи
           garages: Гаражи

-          house: Къща
+          house: House

           industrial: Индустриална сграда
           industrial: Индустриална сграда

-          roof: Покрив
+          roof: Roof

           "yes": Building
         craft:
           brewery: Brewery
           "yes": Building
         craft:
           brewery: Brewery


@@ -2001,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?


@@ -2534,15 +2543,15 @@ en-GB:
         unnamed: unnamed road
         courtesy: Directions courtesy of %{link}
         exit_counts:
         unnamed: unnamed road
         courtesy: Directions courtesy of %{link}
         exit_counts:

-          first: 1ви
-          second: 2ри
-          third: 3ти
-          fourth: 4ти
-          fifth: 5ти
-          sixth: 6ти
-          seventh: 7ми
-          eighth: 8ми
-          ninth: 9ти
+          first: 1st
+          second: 2nd
+          third: 3rd
+          fourth: 4th
+          fifth: 5th
+          sixth: 6th
+          seventh: 7th
+          eighth: 8th
+          ninth: 9th

           tenth: 10ти
       time: Time
     query:
           tenth: 10ти
       time: Time
     query: