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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 47b53b774583a3edc2a974e8f5b7dafa81494ab2..2ea67992daaa83e52ddb3cf7009f5d030ed748b0 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -368,10 +368,6 @@ en-GB:
         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)
@@ -451,8 +447,6 @@ en-GB:
       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
@@ -504,8 +498,6 @@ en-GB:
       post: Post
       when: When
       comment: Comment
-      newer_comments: Newer Comments
-      older_comments: Older Comments
   doorkeeper:
     errors:
       messages:
@@ -1349,6 +1341,17 @@ en-GB:
       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
@@ -1599,8 +1602,6 @@ en-GB:
       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}
@@ -1639,13 +1640,8 @@ en-GB:
       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
-    make_public:
-      made_public: Trace made public
     offline_warning:
       message: The GPX file upload system is currently unavailable
     offline:
@@ -1784,17 +1780,11 @@ en-GB:
       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}'?
-      confirm: Confirm
     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}'?
-      confirm: Confirm
   user_blocks:
     model:
       non_moderator_update: Must be a moderator to create or update a block.
@@ -1855,7 +1845,7 @@ en-GB:
       not_revoked: (not revoked)
       show: Show
       edit: Edit
-    blocks:
+    page:
       display_name: Blocked User
       creator_name: Creator
       reason: Reason for block
@@ -1892,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
+    notes_paging_nav:
+      showing_page: Page %{page}
   javascripts:
     close: Close
     share: