Test that mismatched passwords are rejected

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 5858dd57c7aa018d2760f847d7d9f9721f00da4e..e07c9aaab8cb854bfc86c1e523eba033ca4cbed0 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


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


@@ -1265,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'


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


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


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


@@ -1584,34 +1595,24 @@ 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
-          apron:
-          - Airport apron
-          - terminal
+          cable_car: Cable car
+          chair_lift: chairlift
+          runway_only: Airport Runway
+          taxiway: taxiway
+          apron_only: Airport apron

           admin: Administrative boundary
           admin: Administrative boundary

-          forest: Forest
+          forest_only: Forest

           wood: Wood
           golf: Golf course
           park: Park
           wood: Wood
           golf: Golf course
           park: Park

+          common_only: Common

           resident: Residential area
           resident: Residential area

-          common:
-          - Common
-          - meadow

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

-          lake:
-          - Lake
-          - reservoir
+          lake_only: Lake
+          reservoir: reservoir

           farm: Farm
           brownfield: Brownfield site
           cemetery: Cemetery
           farm: Farm
           brownfield: Brownfield site
           cemetery: Cemetery


@@ -1620,14 +1621,12 @@ en-GB:
           centre: Sports centre
           reserve: Nature reserve
           military: Military area
           centre: Sports centre
           reserve: Nature reserve
           military: Military area

-          school:
-          - School
-          - university
+          school_only: School
+          university: university

           building: Significant building
           station: Railway station
           building: Significant building
           station: Railway station

-          summit:
-          - Summit
-          - peak
+          summit_only: Summit
+          peak: peak

           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access