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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b192b0528a1d67333d5bcec79e545b1b3e992df2..b8b9a0ffce8158084bb2adf321e6368bbf6fc5c1 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -5,6 +5,7 @@
 # Author: Alefar
 # Author: Andibing
 # Author: BEANS
 # Author: Alefar
 # Author: Andibing
 # Author: BEANS

+# Author: Back ache

 # Author: Bjh21
 # Author: Bpfhjquevaps
 # Author: Bruce89
 # Author: Bjh21
 # Author: Bpfhjquevaps
 # Author: Bruce89


@@ -421,6 +422,7 @@ en-GB:
     contact:
       km away: '%{count}km away'
       m away: '%{count}m away'
     contact:
       km away: '%{count}km away'
       m away: '%{count}m away'

+      latest_edit_html: 'Latest edit (%{ago}):'

     popup:
       your location: Your location
       nearby mapper: Nearby mapper
     popup:
       your location: Your location
       nearby mapper: Nearby mapper


@@ -506,6 +508,14 @@ en-GB:
       comment: Comment
       newer_comments: Newer Comments
       older_comments: Older Comments
       comment: Comment
       newer_comments: Newer Comments
       older_comments: Older Comments

+  doorkeeper:
+    errors:
+      messages:
+        account_selection_required: The authorisation server requires end-user account
+          selection
+        consent_required: The authorisation server requires end-user consent
+        interaction_required: The authorisation server requires end-user interaction
+        login_required: The authorisation server requires end-user authentication

   friendships:
     make_friend:
       heading: Add %{user} as a friend?
   friendships:
     make_friend:
       heading: Add %{user} as a friend?


@@ -1264,7 +1274,6 @@ en-GB:
   messages:
     inbox:
       title: Inbox
   messages:
     inbox:
       title: Inbox

-      my_inbox: My Inbox

       messages: You have %{new_messages} and %{old_messages}
       new_messages:
         one: '%{count} new message'
       messages: You have %{new_messages} and %{old_messages}
       new_messages:
         one: '%{count} new message'


@@ -1272,12 +1281,14 @@ en-GB:
       old_messages:
         one: '%{count} old message'
         other: '%{count} old messages'
       old_messages:
         one: '%{count} old message'
         other: '%{count} old messages'

-      from: From
-      subject: Subject
-      date: Date

       no_messages_yet_html: You have no messages yet. Why not get in touch with some
         of the %{people_mapping_nearby_link}?
       people_mapping_nearby: people mapping nearby
       no_messages_yet_html: You have no messages yet. Why not get in touch with some
         of the %{people_mapping_nearby_link}?
       people_mapping_nearby: people mapping nearby

+    messages_table:
+      from: From
+      to: To
+      subject: Subject
+      date: Date

     message_summary:
       unread_button: Mark as unread
       read_button: Mark as read
     message_summary:
       unread_button: Mark as unread
       read_button: Mark as read


@@ -1300,9 +1311,6 @@ en-GB:
       messages:
         one: You have %{count} sent message
         other: You have %{count} sent messages
       messages:
         one: You have %{count} sent message
         other: You have %{count} sent messages

-      to: To
-      subject: Subject
-      date: Date

       no_sent_messages_html: You have no sent messages yet. Why not get in touch with
         some of the %{people_mapping_nearby_link}?
       people_mapping_nearby: people mapping nearby
       no_sent_messages_html: You have no sent messages yet. Why not get in touch with
         some of the %{people_mapping_nearby_link}?
       people_mapping_nearby: people mapping nearby


@@ -1321,28 +1329,32 @@ en-GB:
         order to read it.
     sent_message_summary:
       destroy_button: Delete
         order to read it.
     sent_message_summary:
       destroy_button: Delete

+    heading:
+      my_inbox: My Inbox

     mark:
       as_read: Message marked as read
       as_unread: Message marked as unread
     destroy:
       destroyed: Message deleted
   passwords:
     mark:
       as_read: Message marked as read
       as_unread: Message marked as unread
     destroy:
       destroyed: Message deleted
   passwords:

-    lost_password:
+    new:

       title: Lost password
       heading: Forgotten Password?
       email address: E-mail address
       new password button: Reset password
       help_text: Enter the e-mail address you used to sign up, we will send a link
         to it that you can use to reset your password.
       title: Lost password
       heading: Forgotten Password?
       email address: E-mail address
       new password button: Reset password
       help_text: Enter the e-mail address you used to sign up, we will send a link
         to it that you can use to reset your password.

+    create:

       notice email on way: Sorry you lost it :-( but an email is on its way so you
         can reset it soon.
       notice email cannot find: Could not find that email address, sorry.
       notice email on way: Sorry you lost it :-( but an email is on its way so you
         can reset it soon.
       notice email cannot find: Could not find that email address, sorry.

-    reset_password:
+    edit:

       title: Reset password
       heading: Reset Password for %{user}
       reset: Reset Password
       title: Reset password
       heading: Reset Password for %{user}
       reset: Reset Password

-      flash changed: Your password has been changed.

       flash token bad: Did not find that token, check the URL maybe?
       flash token bad: Did not find that token, check the URL maybe?

+    update:
+      flash changed: Your password has been changed.

   profiles:
     edit:
       image: Image
   profiles:
     edit:
       image: Image


@@ -1383,7 +1395,7 @@ en-GB:
         facebook:
           title: Login with Facebook
           alt: Login with a Facebook Account
         facebook:
           title: Login with Facebook
           alt: Login with a Facebook Account

-        windowslive:
+        microsoft:

           title: Login with Windows Live
           alt: Login with a Windows Live Account
         github:
           title: Login with Windows Live
           alt: Login with a Windows Live Account
         github:


@@ -1583,27 +1595,23 @@ en-GB:
           footway: Footway
           rail: Railway
           subway: Subway
           footway: Footway
           rail: Railway
           subway: Subway

-          tram:
-          - Light rail
-          - tram

           cable:
           - Cable car
           - chairlift
           runway:
           - Airport Runway
           - taxiway
           cable:
           - Cable car
           - chairlift
           runway:
           - Airport Runway
           - taxiway

-          apron:
-          - Airport apron
-          - terminal
+          apron_only: Airport apron

           admin: Administrative boundary
           admin: Administrative boundary

-          forest: Forest
-          wood: Wood
+          forest:
+          - Forest
+          - Wood

           golf: Golf course
           park: Park
           golf: Golf course
           park: Park

-          resident: Residential area

           common:
           - Common
           - meadow
           common:
           - Common
           - meadow

+          resident: Residential area

           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area
           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area


@@ -1883,7 +1891,6 @@ en-GB:
       ct status: 'Contributor terms:'
       ct undecided: Undecided
       ct declined: Declined
       ct status: 'Contributor terms:'
       ct undecided: Undecided
       ct declined: Declined

-      latest edit: 'Latest edit (%{ago}):'

       email address: 'Email address:'
       created from: 'Created from:'
       status: 'Status:'
       email address: 'Email address:'
       created from: 'Created from:'
       status: 'Status:'


@@ -1993,8 +2000,8 @@ en-GB:
     revoke:
       title: Revoking block on %{block_on}
       heading_html: Revoking block on %{block_on} by %{block_by}
     revoke:
       title: Revoking block on %{block_on}
       heading_html: Revoking block on %{block_on} by %{block_by}

-      time_future: This block will end in %{time}.
-      past: This block ended %{time} and cannot be revoked now.
+      time_future_html: This block will end in %{time}.
+      past_html: This block ended %{time} and cannot be revoked now.

       confirm: Are you sure you wish to revoke this block?
       revoke: Revoke!
       flash: This block has been revoked.
       confirm: Are you sure you wish to revoke this block?
       revoke: Revoke!
       flash: This block has been revoked.