Disallow username changes to user_n if n isn't their id

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b192b0528a1d67333d5bcec79e545b1b3e992df2..406cf67525a6ed7d5b80317ef1845bb7b0a05d8d 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: Back ache
 # Author: Bjh21
 # Author: Bpfhjquevaps
 # Author: Bruce89
@@ -421,6 +422,7 @@ en-GB:
     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
@@ -506,6 +508,14 @@ en-GB:
       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?
@@ -1327,22 +1337,24 @@ en-GB:
     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.
+    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.
-    reset_password:
+    edit:
       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?
+    update:
+      flash changed: Your password has been changed.
   profiles:
     edit:
       image: Image
@@ -1383,7 +1395,7 @@ en-GB:
         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:
@@ -1583,27 +1595,23 @@ en-GB:
           footway: Footway
           rail: Railway
           subway: Subway
-          tram:
-          - Light rail
-          - tram
           cable:
           - Cable car
           - chairlift
           runway:
           - Airport Runway
           - taxiway
-          apron:
-          - Airport apron
-          - terminal
+          apron_only: Airport apron
           admin: Administrative boundary
-          forest: Forest
-          wood: Wood
+          forest:
+          - Forest
+          - Wood
           golf: Golf course
           park: Park
-          resident: Residential area
           common:
           - Common
           - meadow
+          resident: Residential 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
-      latest edit: 'Latest edit (%{ago}):'
       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}
-      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.