Merge branch 'pull/5031'

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b2d20128faeac3bf5836c81265383532b550475a..73e8191bdae7719463aedd32d1243d987110c895 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.
       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:
       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
       all:
         title: OpenStreetMap diary entries
         description: Recent diary entries from users of OpenStreetMap

-    comments:
+  diary_comments:
+    index:

       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment


@@ -1394,6 +1400,7 @@ en-GB:
       legal_title: Legal
       partners_title: Partners
     copyright:
       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},
       foreign:
         title: About this translation
         html: In the event of a conflict between this translated page and %{english_original_link},


@@ -1407,7 +1414,6 @@ en-GB:
         native_link: British English version
         mapping_link: start mapping
       legal_babble:
         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
         credit_title_html: How to credit OpenStreetMap
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage


@@ -1428,9 +1434,6 @@ en-GB:
     index:
       js_1: You are either using a browser that does not support JavaScript, or you
         have disabled JavaScript.
     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
       license:
         copyright: Copyright OpenStreetMap and contributors, under an open licence
       remote_failed: Editing failed - make sure JOSM or Merkaartor is loaded and that


@@ -1694,7 +1697,6 @@ en-GB:
         to the web interface to view the Contributor Terms. You do not need to agree,
         but you must view them.
     auth_providers:
         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
       openid:
         title: Login with OpenID
         alt: Login with an OpenID URL


@@ -1713,12 +1715,6 @@ en-GB:
       wikipedia:
         title: Login with Wikipedia
         alt: Login with a Wikipedia 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
   oauth:
     authorize:
       title: Authorise access to your account


@@ -1940,7 +1936,6 @@ en-GB:
       show: View this block
       back: View all blocks
     filter:
       show: View this block
       back: View all blocks
     filter:

-      block_expired: The block has already expired and cannot be edited.

       block_period: The blocking period must be one of the values selectable in the
         drop-down list.
     create:
       block_period: The blocking period must be one of the values selectable in the
         drop-down list.
     create:


@@ -2086,13 +2081,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
       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:
     edit_help: Move the map and zoom in on a location you want to edit, then click
       here.
     directions: