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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 30d0da09279a0f1b4dff7d7a685336cbb3ad9dd4..d2cda9abebc55134b3831ee620c0f4c0e95c2b1b 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -394,6 +394,11 @@ en-GB:
       join_discussion: Log in to join the discussion
       still_open: Changeset still open - discussion will open once the changeset is
         closed.
+      subscribe: Subscribe
+      unsubscribe: Unsubscribe
+      hide_comment: hide
+      unhide_comment: unhide
+      comment: Comment
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -500,7 +505,8 @@ en-GB:
       all:
         title: OpenStreetMap diary entries
         description: Recent diary entries from users of OpenStreetMap
-    comments:
+  diary_comments:
+    index:
       post: Post
       when: When
       comment: Comment
@@ -1365,7 +1371,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
@@ -1373,34 +1379,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
@@ -1421,6 +1400,7 @@ en-GB:
       legal_title: Legal
       partners_title: Partners
     copyright:
+      title: Copyright and Licence
       foreign:
         title: About this translation
         html: In the event of a conflict between this translated page and %{english_original_link},
@@ -1434,7 +1414,6 @@ en-GB:
         native_link: British English version
         mapping_link: start mapping
       legal_babble:
-        title_html: Copyright and Licence
         credit_title_html: How to credit OpenStreetMap
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
@@ -1455,9 +1434,6 @@ en-GB:
     index:
       js_1: You are either using a browser that does not support JavaScript, or you
         have disabled JavaScript.
-      permalink: Permalink
-      shortlink: Shortlink
-      createnote: Add a note
       license:
         copyright: Copyright OpenStreetMap and contributors, under an open licence
       remote_failed: Editing failed - make sure JOSM or Merkaartor is loaded and that
@@ -1720,6 +1696,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
@@ -1801,11 +1803,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
@@ -1991,7 +1991,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:
@@ -2005,9 +2004,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}
@@ -2093,13 +2089,6 @@ en-GB:
       map_data_zoom_in_tooltip: Zoom in to see map data
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features
-    changesets:
-      show:
-        comment: Comment
-        subscribe: Subscribe
-        unsubscribe: Unsubscribe
-        hide_comment: hide
-        unhide_comment: unhide
     edit_help: Move the map and zoom in on a location you want to edit, then click
       here.
     directions: