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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 47b53b774583a3edc2a974e8f5b7dafa81494ab2..1e2b06a31d49f54cc8d0c33f0b8a91636ac43dba 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -66,10 +66,6 @@ en-GB:
         create: Create block
         update: Update block
   activerecord:
         create: Create block
         update: Update block
   activerecord:

-    errors:
-      messages:
-        invalid_email_address: does not appear to be a valid e-mail address
-        email_address_not_routable: is not routable

     models:
       acl: Access Control List
       changeset: Changeset
     models:
       acl: Access Control List
       changeset: Changeset


@@ -368,10 +364,6 @@ en-GB:
         sorry: Sorry, the list of changeset comments you requested took too long to
           retrieve.
   changesets:
         sorry: Sorry, the list of changeset comments you requested took too long to
           retrieve.
   changesets:

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

     changeset:
       anonymous: Anonymous
       no_edits: (no edits)
     changeset:
       anonymous: Anonymous
       no_edits: (no edits)


@@ -451,8 +443,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


@@ -504,8 +494,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:


@@ -1110,10 +1098,6 @@ en-GB:
         level8: City Boundary
         level9: Village Boundary
         level10: Suburb Boundary
         level8: City Boundary
         level9: Village Boundary
         level10: Suburb Boundary

-      types:
-        cities: Cities
-        towns: Towns
-        places: Places

     results:
       no_results: No results found
       more_results: More results
     results:
       no_results: No results found
       more_results: More results


@@ -1219,7 +1203,6 @@ en-GB:
           on. The note is near %{place}.'
     changeset_comment_notification:
       hi: Hi %{to_user},
           on. The note is near %{place}.'
     changeset_comment_notification:
       hi: Hi %{to_user},

-      greeting: Hi,

       commented:
         subject_own: '[OpenStreetMap] %{commenter} has commented on one of your changesets'
         subject_other: '[OpenStreetMap] %{commenter} has commented on a changeset
       commented:
         subject_own: '[OpenStreetMap] %{commenter} has commented on one of your changesets'
         subject_other: '[OpenStreetMap] %{commenter} has commented on a changeset


@@ -1349,6 +1332,17 @@ 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:
       lede_text: OpenStreetMap is built by a community of mappers that contribute
   site:
     about:
       lede_text: OpenStreetMap is built by a community of mappers that contribute


@@ -1599,8 +1593,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}


@@ -1639,13 +1631,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:


@@ -1681,7 +1668,6 @@ en-GB:
         account for you automatically.
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
         account for you automatically.
       display name description: Your publicly displayed username. You can change this
         later in the preferences.

-      external auth: 'Third Party Authentication:'

       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!
     terms:
       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!
     terms:


@@ -1784,17 +1770,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

     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

   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.


@@ -1855,7 +1835,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


@@ -1892,6 +1872,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: