X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c9b891ce0a5c109e678a173309056c9586daec4b..e6ed4f6190305c60acd280825e7dac1e79c195ae:/config/locales/en-GB.yml

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 67dce974e..b2d20128f 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -277,8 +277,6 @@ en-GB:
         for a note to confirm your new email address.
       success: User information updated successfully.
   browse:
-    created: Created
-    closed: Closed
     version: Version
     in_changeset: Changeset
     anonymous: anonymous
@@ -288,25 +286,6 @@ en-GB:
     view_history: View History
     view_details: View Details
     location: 'Location:'
-    changeset:
-      title: 'Changeset: %{id}'
-      belongs_to: Author
-      node: Nodes (%{count})
-      node_paginated: Nodes (%{x}-%{y} of %{count})
-      way: Ways (%{count})
-      way_paginated: Ways (%{x}-%{y} of %{count})
-      relation: Relations (%{count})
-      relation_paginated: Relations (%{x}-%{y} of %{count})
-      comment: Comments (%{count})
-      changesetxml: Changeset XML
-      osmchangexml: osmChange XML
-      feed:
-        title: Changeset %{id}
-        title_comment: Changeset %{id} - %{comment}
-      join_discussion: Log in to join the discussion
-      discussion: Discussion
-      still_open: Changeset still open - discussion will open once the changeset is
-        closed.
     node:
       title_html: 'Node: %{name}'
       history_title_html: 'Node History: %{name}'
@@ -403,6 +382,27 @@ en-GB:
       no_more_area: No more changesets in this area.
       no_more_user: No more changesets by this user.
       load_more: Load more
+      feed:
+        title: Changeset %{id}
+        title_comment: Changeset %{id} - %{comment}
+        created: Created
+        closed: Closed
+        belongs_to: Author
+    show:
+      title: 'Changeset: %{id}'
+      discussion: Discussion
+      join_discussion: Log in to join the discussion
+      still_open: Changeset still open - discussion will open once the changeset is
+        closed.
+      changesetxml: Changeset XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Nodes (%{count})
+      nodes_paginated: Nodes (%{x}-%{y} of %{count})
+      ways: Ways (%{count})
+      ways_paginated: Ways (%{x}-%{y} of %{count})
+      relations: Relations (%{count})
+      relations_paginated: Relations (%{x}-%{y} of %{count})
     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.
   changeset_comments:
@@ -1143,8 +1143,6 @@ en-GB:
     intro_text: OpenStreetMap is a map of the world, created by people like you and
       free to use under an open licence.
     intro_2_create_account: Create a user account
-    partners_ucl: UCL
-    partners_bytemark: Bytemark Hosting
     partners_partners: partners
     osm_offline: The OpenStreetMap database is currently offline while essential database
       maintenance work is carried out.
@@ -1342,10 +1340,6 @@ en-GB:
       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.
     edit:
       title: Reset password
       heading: Reset Password for %{user}
@@ -1371,7 +1365,7 @@ en-GB:
   sessions:
     new:
       title: Login
-      heading: Login
+      tab_title: Login
       email or username: E-mail Address or Username
       password: Password
       remember: Remember me
@@ -1379,34 +1373,7 @@ en-GB:
       login_button: Login
       register now: Register now
       with external: 'Alternatively, use a third party to login:'
-      no account: Don't have an account?
       auth failure: Sorry, could not log in with those details.
-      openid_logo_alt: Log in with an OpenID
-      auth_providers:
-        openid:
-          title: Login with OpenID
-          alt: Login with an OpenID URL
-        google:
-          title: Login with Google
-          alt: Login with a Google OpenID
-        facebook:
-          title: Login with Facebook
-          alt: Login with a Facebook Account
-        microsoft:
-          title: Login with Microsoft
-          alt: Login with a Microsoft Account
-        github:
-          title: Login with GitHub
-          alt: Login with a GitHub Account
-        wikipedia:
-          title: Login with Wikipedia
-          alt: Login with a Wikipedia Account
-        wordpress:
-          title: Login with Wordpress
-          alt: Login with a Wordpress OpenID
-        aol:
-          title: Login with AOL
-          alt: Login with an AOL OpenID
     destroy:
       title: Logout
       heading: Logout of OpenStreetMap
@@ -1694,8 +1661,6 @@ en-GB:
       identifiable: IDENTIFIABLE
       private: PRIVATE
       trackable: TRACKABLE
-      by: by
-      in: in
     index:
       public_traces: Public GPS traces
       public_traces_from: Public GPS traces from %{user}
@@ -1728,6 +1693,32 @@ en-GB:
       need_to_see_terms: Your access to the API is temporarily suspended. Please log-in
         to the web interface to view the Contributor Terms. You do not need to agree,
         but you must view them.
+    auth_providers:
+      openid_logo_alt: Log in with an OpenID
+      openid:
+        title: Login with OpenID
+        alt: Login with an OpenID URL
+      google:
+        title: Login with Google
+        alt: Login with a Google OpenID
+      facebook:
+        title: Login with Facebook
+        alt: Login with a Facebook Account
+      microsoft:
+        title: Login with Microsoft
+        alt: Login with a Microsoft Account
+      github:
+        title: Login with GitHub
+        alt: Login with a GitHub Account
+      wikipedia:
+        title: Login with Wikipedia
+        alt: Login with a Wikipedia Account
+      wordpress:
+        title: Login with Wordpress
+        alt: Login with a Wordpress OpenID
+      aol:
+        title: Login with AOL
+        alt: Login with an AOL OpenID
   oauth:
     authorize:
       title: Authorise access to your account
@@ -1809,11 +1800,9 @@ en-GB:
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
       external auth: 'Third Party Authentication:'
-      use external auth: Alternatively, use a third party to login
-      auth no password: With third party authentication a password is not required,
-        but some extra tools or server may still need one.
       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!
+      use external auth: Alternatively, use a third party to login
     terms:
       title: Terms
       heading: Terms
@@ -1888,9 +1877,6 @@ en-GB:
     index:
       title: Users
       heading: Users
-      showing:
-        one: Page %{page} (%{first_item} of %{items})
-        other: Page %{page} (%{first_item}-%{last_item} of %{items})
       summary_html: '%{name} created from %{ip_address} on %{date}'
       summary_no_ip_html: '%{name} created on %{date}'
       confirm: Confirm Selected Users
@@ -2002,7 +1988,6 @@ en-GB:
       revoke: Revoke!
       confirm: Are you sure?
       reason: 'Reason for block:'
-      back: View all blocks
       revoker: 'Revoker:'
       needs_view: The user needs to log in before this block will be cleared.
     block:
@@ -2016,9 +2001,6 @@ en-GB:
       reason: Reason for block
       status: Status
       revoker_name: Revoked by
-      showing_page: Page %{page}
-      next: Next »
-      previous: « Previous
   notes:
     index:
       title: Notes submitted or commented on by %{user}