Use bootstrap utility class instead of custom css

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index e9bcdb560abce6737178ea666de8a182f44b50eb..8016960c4fefaa4dd7e01caa3b1806159a03aa97 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -76,7 +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: Issue

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


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


@@ -256,8 +266,8 @@ en-GB:
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
       comment: Comments (%{count})
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
       comment: Comments (%{count})

-      hidden_commented_by: Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_commented_by_html: Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       changesetxml: Changeset XML
       osmchangexml: osmChange XML
       feed:
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
       feed:


@@ -337,16 +347,17 @@ en-GB:
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'

-      opened_by: Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous: Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous: Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by: Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous: Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by: Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_html: Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       report: Report this note
       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.


@@ -563,14 +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: Internet Cafe

           kindergarten: Nursery School
           kindergarten: Nursery School

-          language_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: Music School

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


@@ -610,7 +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": Граница
+          "yes": Boundary

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


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

-          apartment: Апартамент
-          apartments: Апартаменти
-          cabin: Кабина
-          college: Сграда Колеж
-          commercial: Търговска Сграда
-          construction: Сграда в строеж
-          garage: Гараж
-          garages: Гаражи
-          house: Къща
-          industrial: Индустриална сграда
-          roof: Покрив
+          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


@@ -1065,11 +1076,6 @@ en-GB:
         level8: City Boundary
         level9: Village Boundary
         level10: Suburb Boundary
         level8: City Boundary
         level9: Village Boundary
         level10: Suburb Boundary

-    description:
-      title:
-        osm_nominatim: Location from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames: Location from <a href="http://www.geonames.org/">GeoNames</a>

       types:
         cities: Cities
         towns: Towns
       types:
         cities: Cities
         towns: Towns


@@ -1079,7 +1085,7 @@ en-GB:
       more_results: More results
   issues:
     index:
       more_results: More results
   issues:
     index:

-      reports: Отчети
+      reports: Reports

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


@@ -1129,7 +1135,7 @@ en-GB:
       text: Make a Donation
     learn_more: Learn More
     more: More
       text: Make a Donation
     learn_more: Learn More
     more: More

-  notifier:
+  user_mailer:

     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} commented on a diary entry'
       hi: Hi %{to_user},
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} commented on a diary entry'
       hi: Hi %{to_user},


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


@@ -2018,9 +2022,6 @@ en-GB:
         html: |-
           <p>Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.</p>
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
         html: |-
           <p>Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.</p>
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>

-      license_agreement: When you confirm your account you will need to agree to the
-        <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor
-        terms</a>.

       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'
       not_displayed_publicly_html: Your address is not displayed publicly, see our
       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'
       not_displayed_publicly_html: Your address is not displayed publicly, see our


@@ -2206,10 +2207,11 @@ en-GB:
       reconfirm_html: If you need us to resend the confirmation email, <a href="%{reconfirm}">click
         here</a>.
     confirm_resend:
       reconfirm_html: If you need us to resend the confirmation email, <a href="%{reconfirm}">click
         here</a>.
     confirm_resend:

-      success: We've sent a new confirmation note to %{email} and as soon as you confirm
-        your account you'll be able to get mapping.<br /><br />If you use an antispam
-        system which sends confirmation requests then please make sure you whitelist
-        %{sender} as we are unable to reply to any confirmation requests.
+      success_html: We've sent a new confirmation note to %{email} and as soon as
+        you confirm your account you'll be able to get mapping.<br /><br />If you
+        use an antispam system which sends confirmation requests then please make
+        sure you whitelist %{sender} as we are unable to reply to any confirmation
+        requests.

       failure: User %{name} not found.
     confirm_email:
       heading: Confirm a change of e-mail address
       failure: User %{name} not found.
     confirm_email:
       heading: Confirm a change of e-mail address


@@ -2338,10 +2340,11 @@ en-GB:
       revoke: Revoke!
       flash: This block has been revoked.
     helper:
       revoke: Revoke!
       flash: This block has been revoked.
     helper:

-      time_future: Ends in %{time}.
+      time_future_html: Ends in %{time}.

       until_login: Active until the user logs in.
       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}.
+      time_future_and_until_login_html: Ends in %{time} and after the user has logged
+        in.
+      time_past_html: Ended %{time}.

       block_duration:
         hours:
           one: 1 hour
       block_duration:
         hours:
           one: 1 hour


@@ -2534,16 +2537,16 @@ 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ти
-          tenth: 10ти
+          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


@@ -2590,5 +2593,5 @@ en-GB:
       flash: Redaction destroyed.
       error: There was an error destroying this redaction.
   validations:
       flash: Redaction destroyed.
       error: There was an error destroying this redaction.
   validations:

-    invalid_characters: съдържа невалидни символи
+    invalid_characters: contains invalid characters

 ...
 ...