Add social sharing functionality

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 997e68373c7912bf828fb43f14403a5282ad048f..2ea67992daaa83e52ddb3cf7009f5d030ed748b0 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -354,21 +354,24 @@ en-GB:
       introduction: Click on the map to find nearby features.
       nearby: Nearby features
       enclosing: Enclosing features
       introduction: Click on the map to find nearby features.
       nearby: Nearby features
       enclosing: Enclosing features

+  changeset_comments:
+    feeds:
+      comment:
+        comment: 'New comment on changeset #%{changeset_id} by %{author}'
+        commented_at_by_html: Updated %{when} by %{user}
+      comments:
+        comment: 'New comment on changeset #%{changeset_id} by %{author}'
+      show:
+        title_all: OpenStreetMap changeset discussion
+        title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'
+      timeout:
+        sorry: Sorry, the list of changeset comments you requested took too long to
+          retrieve.

   changesets:
   changesets:

-    changeset_paging_nav:
-      showing_page: Page %{page}
-      next: Next »
-      previous: « Previous

     changeset:
       anonymous: Anonymous
       no_edits: (no edits)
       view_changeset_details: View changeset details
     changeset:
       anonymous: Anonymous
       no_edits: (no edits)
       view_changeset_details: View changeset details

-    changesets:
-      id: ID
-      saved_at: Saved at
-      user: User
-      comment: Comment
-      area: Area

     index:
       title: Changesets
       title_user: Changesets by %{user}
     index:
       title: Changesets
       title_user: Changesets by %{user}


@@ -409,18 +412,6 @@ en-GB:
       relations_paginated: Relations (%{x}-%{y} of %{count})
     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.
       relations_paginated: Relations (%{x}-%{y} of %{count})
     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.

-  changeset_comments:
-    comment:
-      comment: 'New comment on changeset #%{changeset_id} by %{author}'
-      commented_at_by_html: Updated %{when} by %{user}
-    comments:
-      comment: 'New comment on changeset #%{changeset_id} by %{author}'
-    index:
-      title_all: OpenStreetMap changeset discussion
-      title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'
-    timeout:
-      sorry: Sorry, the list of changeset comments you requested took too long to
-        retrieve.

   dashboards:
     contact:
       km away: '%{count}km away'
   dashboards:
     contact:
       km away: '%{count}km away'


@@ -456,8 +447,6 @@ en-GB:
       no_entries: No diary entries
     page:
       recent_entries: Recent diary entries
       no_entries: No diary entries
     page:
       recent_entries: Recent diary entries

-      older_entries: Older Entries
-      newer_entries: Newer Entries

     edit:
       title: Edit diary entry
       marker_text: Diary entry location
     edit:
       title: Edit diary entry
       marker_text: Diary entry location


@@ -509,8 +498,6 @@ en-GB:
       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment

-      newer_comments: Newer Comments
-      older_comments: Older Comments

   doorkeeper:
     errors:
       messages:
   doorkeeper:
     errors:
       messages:


@@ -1123,7 +1110,7 @@ en-GB:
       no_results: No results found
       more_results: More results
   issues:
       no_results: No results found
       more_results: More results
   issues:

-    index:
+    page:

       reports: Reports
   layouts:
     logo:
       reports: Reports
   layouts:
     logo:


@@ -1136,33 +1123,20 @@ en-GB:
     edit: Edit
     history: History
     export: Export
     edit: Edit
     history: History
     export: Export

-    data: Data
-    export_data: Export Data

     gps_traces: GPS Traces
     gps_traces: GPS Traces

-    gps_traces_tooltip: Manage GPS traces

     user_diaries: User Diaries
     user_diaries: User Diaries

-    user_diaries_tooltip: View user diaries

     edit_with: Edit with %{editor}
     edit_with: Edit with %{editor}

-    tag_line: The Free Wiki World Map

     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and
       free to use under an open licence.
     intro_header: Welcome to OpenStreetMap!
     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_partners: partners
     osm_offline: The OpenStreetMap database is currently offline while essential database
       maintenance work is carried out.
     osm_read_only: The OpenStreetMap database is currently in read-only mode while
       essential database maintenance work is carried out.
     partners_partners: partners
     osm_offline: The OpenStreetMap database is currently offline while essential database
       maintenance work is carried out.
     osm_read_only: The OpenStreetMap database is currently in read-only mode while
       essential database maintenance work is carried out.

-    donate: Support OpenStreetMap by %{link} to the Hardware Upgrade Fund.

     help: Help
     about: About
     copyright: Copyright
     help: Help
     about: About
     copyright: Copyright

-    community: Community
-    community_blogs: Community Blogs
-    community_blogs_title: Blogs from members of the OpenStreetMap community
-    make_a_donation:
-      title: Support OpenStreetMap with a monetary donation
-      text: Make a Donation

     learn_more: Learn More
     more: More
   user_mailer:
     learn_more: Learn More
     more: More
   user_mailer:


@@ -1289,7 +1263,6 @@ en-GB:
     message_summary:
       unread_button: Mark as unread
       read_button: Mark as read
     message_summary:
       unread_button: Mark as unread
       read_button: Mark as read

-      reply_button: Reply

       destroy_button: Delete
     new:
       title: Send message
       destroy_button: Delete
     new:
       title: Send message


@@ -1368,9 +1341,19 @@ en-GB:
       title: Logout
       heading: Logout of OpenStreetMap
       logout_button: Logout
       title: Logout
       heading: Logout of OpenStreetMap
       logout_button: Logout

+  shared:
+    pagination:
+      diary_comments:
+        older: Older Comments
+        newer: Newer Comments
+      diary_entries:
+        older: Older Entries
+        newer: Newer Entries
+      traces:
+        older: Older Traces
+        newer: Newer Traces

   site:
     about:
   site:
     about:

-      next: Next

       lede_text: OpenStreetMap is built by a community of mappers that contribute
         and maintain data about roads, trails, cafés, railway stations, and much more,
         all over the world.
       lede_text: OpenStreetMap is built by a community of mappers that contribute
         and maintain data about roads, trails, cafés, railway stations, and much more,
         all over the world.


@@ -1440,8 +1423,6 @@ en-GB:
       user_page_link: user page
       anon_edits_link_text: Find out why this is the case.
       id_not_configured: iD has not been configured
       user_page_link: user page
       anon_edits_link_text: Find out why this is the case.
       id_not_configured: iD has not been configured

-      no_iframe_support: Your browser doesn't support HTML iframes, which are necessary
-        for this feature.

     export:
       title: Export
       manually_select: Manually select a different area
     export:
       title: Export
       manually_select: Manually select a different area


@@ -1511,7 +1492,6 @@ en-GB:
       close: Close
     search:
       search: Search
       close: Close
     search:
       search: Search

-      get_directions: Get directions

       get_directions_title: Find directions between two points
       from: From
       to: To
       get_directions_title: Find directions between two points
       from: From
       to: To


@@ -1622,8 +1602,6 @@ en-GB:
       title: Editing trace %{name}
       heading: Editing trace %{name}
       visibility_help: what does this mean?
       title: Editing trace %{name}
       heading: Editing trace %{name}
       visibility_help: what does this mean?

-    trace_optionals:
-      tags: Tags

     show:
       title: Viewing trace %{name}
       heading: Viewing trace %{name}
     show:
       title: Viewing trace %{name}
       heading: Viewing trace %{name}


@@ -1662,13 +1640,8 @@ en-GB:
       description: Browse recent GPS track uploads
       tagged_with: ' tagged with %{tags}'
       upload_trace: Upload a trace
       description: Browse recent GPS track uploads
       tagged_with: ' tagged with %{tags}'
       upload_trace: Upload a trace

-    page:
-      older: Older Traces
-      newer: Newer Traces

     destroy:
       scheduled_for_deletion: Trace scheduled for deletion
     destroy:
       scheduled_for_deletion: Trace scheduled for deletion

-    make_public:
-      made_public: Trace made public

     offline_warning:
       message: The GPX file upload system is currently unavailable
     offline:
     offline_warning:
       message: The GPX file upload system is currently unavailable
     offline:


@@ -1692,73 +1665,8 @@ en-GB:
         to the web interface to view the Contributor Terms. You do not need to agree,
         but you must view them.
   oauth:
         to the web interface to view the Contributor Terms. You do not need to agree,
         but you must view them.
   oauth:

-    authorize:
-      title: Authorise access to your account
-      request_access_html: The application %{app_name} is requesting access to your
-        account, %{user}. Please check whether you would like the application to have
-        the following capabilities. You may choose as many or as few as you like.
-      allow_to: 'Allow the client application to:'
-      allow_read_prefs: read your user preferences.
-      allow_write_prefs: modify your user preferences.
-      allow_write_diary: create diary entries, comments and make friends.
-      allow_write_api: modify the map.
-      allow_read_gpx: read your private GPS traces.
-      allow_write_gpx: upload GPS traces.
-      allow_write_notes: modify notes.
-      grant_access: Grant Access
-    authorize_success:
-      title: Authorisation request allowed
-      allowed_html: You have granted application %{app_name} access to your account.
-      verification: The verification code is %{code}.
-    authorize_failure:
-      title: Authorisation request failed
-      denied: You have denied application %{app_name} access to your account.
-      invalid: The authorisation token is not valid.
-    revoke:
-      flash: You've revoked the token for %{application}

     permissions:
       missing: You have not permitted the application access to this facility
     permissions:
       missing: You have not permitted the application access to this facility

-  oauth_clients:
-    new:
-      title: Register a new application
-    edit:
-      title: Edit your application
-    show:
-      title: OAuth details for %{app_name}
-      key: 'Consumer Key:'
-      secret: 'Consumer Secret:'
-      url: 'Request Token URL:'
-      access_url: 'Access Token URL:'
-      authorize_url: 'Authorise URL:'
-      support_notice: We support HMAC-SHA1 (recommended) and RSA-SHA1 signatures.
-      edit: Edit Details
-      delete: Delete Client
-      confirm: Are you sure?
-      requests: 'Requesting the following permissions from the user:'
-    index:
-      title: My OAuth Details
-      my_tokens: My Authorised Applications
-      list_tokens: 'The following tokens have been issued to applications in your
-        name:'
-      application: Application Name
-      issued_at: Issued At
-      revoke: Revoke!
-      my_apps: My Client Applications
-      no_apps_html: Do you have an application you would like to register for use
-        with us using the %{oauth} standard? You must register your web application
-        before it can make OAuth requests to this service.
-      registered_apps: 'You have the following client applications registered:'
-      register_new: Register your application
-    form:
-      requests: 'Request the following permissions from the user:'
-    not_found:
-      sorry: Sorry, that %{type} could not be found.
-    create:
-      flash: Registered the information successfully
-    update:
-      flash: Updated the client information successfully
-    destroy:
-      flash: Destroyed the client application registration

   oauth2_applications:
     new:
       title: Register a new application
   oauth2_applications:
     new:
       title: Register a new application


@@ -1872,21 +1780,11 @@ en-GB:
       already_has_role: The user already has role %{role}.
       doesnt_have_role: The user does not have role %{role}.
     grant:
       already_has_role: The user already has role %{role}.
       doesnt_have_role: The user does not have role %{role}.
     grant:

-      title: Confirm role granting
-      heading: Confirm role granting

       are_you_sure: Are you sure you want to grant the role `%{role}' to the user
         `%{name}'?
       are_you_sure: Are you sure you want to grant the role `%{role}' to the user
         `%{name}'?

-      confirm: Confirm
-      fail: Could not grant role `%{role}' to user `%{name}'. Please check that the
-        user and role are both valid.

     revoke:
     revoke:

-      title: Confirm role revoking
-      heading: Confirm role revoking

       are_you_sure: Are you sure you want to revoke the role `%{role}' from the user
         `%{name}'?
       are_you_sure: Are you sure you want to revoke the role `%{role}' from the user
         `%{name}'?

-      confirm: Confirm
-      fail: Could not revoke role `%{role}' from user `%{name}'. Please check that
-        the user and role are both valid.

   user_blocks:
     model:
       non_moderator_update: Must be a moderator to create or update a block.
   user_blocks:
     model:
       non_moderator_update: Must be a moderator to create or update a block.


@@ -1947,7 +1845,7 @@ en-GB:
       not_revoked: (not revoked)
       show: Show
       edit: Edit
       not_revoked: (not revoked)
       show: Show
       edit: Edit

-    blocks:
+    page:

       display_name: Blocked User
       creator_name: Creator
       reason: Reason for block
       display_name: Blocked User
       creator_name: Creator
       reason: Reason for block


@@ -1984,6 +1882,8 @@ en-GB:
       advice: Your note is public and may be used to update the map, so don't enter
         personal information or information from copyrighted maps or directory listings.
       add: Add Note
       advice: Your note is public and may be used to update the map, so don't enter
         personal information or information from copyrighted maps or directory listings.
       add: Add Note

+    notes_paging_nav:
+      showing_page: Page %{page}

   javascripts:
     close: Close
     share:
   javascripts:
     close: Close
     share: