X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0658820d4e05d6d7b2bf7a77462abe54089bd8a5..4f2789c73c3ac9c3af3e4a4ae08f2f37cb78ddf1:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 99dcb6347..e784df5dd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -427,10 +427,6 @@ en:
       timeout:
         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)"
@@ -535,8 +531,6 @@ en:
       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
@@ -604,8 +598,6 @@ en:
       post: Post
       when: When
       comment: Comment
-      newer_comments: "Newer Comments"
-      older_comments: "Older Comments"
     new:
       heading: Add a comment to the following diary entry discussion?
   doorkeeper:
@@ -1482,8 +1474,6 @@ en:
         ignored: Ignored
         open: Open
         resolved: Resolved
-      older_issues: Older Issues
-      newer_issues: Newer Issues
     show:
       title: "%{status} Issue #%{issue_id}"
       reports:
@@ -1895,6 +1885,25 @@ en:
       edit: Edit
       preview: Preview
       help: Help
+    pagination:
+      diary_comments:
+        older: Older Comments
+        newer: Newer Comments
+      diary_entries:
+        older: Older Entries
+        newer: Newer Entries
+      issues:
+        older: Older Issues
+        newer: Newer Issues
+      traces:
+        older: Older Traces
+        newer: Newer Traces
+      user_blocks:
+        older: Older Blocks
+        newer: Newer Blocks
+      users:
+        older: Older Users
+        newer: Newer Users
   site:
     about:
       heading_html: "%{copyright}OpenStreetMap %{br} contributors"
@@ -2366,6 +2375,9 @@ en:
           hospital: "Hospital"
           building: "Significant building"
           station: "Railway station"
+          railway_halt: "Railway halt"
+          subway_station: "Subway station"
+          tram_stop: "Tram stop"
           summit: "Summit"
           peak: "Peak"
           tunnel: "Dashed casing = tunnel"
@@ -2485,8 +2497,6 @@ en:
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
     update:
       updated: Trace updated
-    trace_optionals:
-      tags: "Tags"
     show:
       title: "Viewing Trace %{name}"
       heading: "Viewing Trace %{name}"
@@ -2539,13 +2549,8 @@ en:
       my_traces: "My Traces"
       traces_from: "Public Traces from %{user}"
       remove_tag_filter: "Remove Tag Filter"
-    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:
@@ -2797,8 +2802,6 @@ en:
       summary_no_ip_html: "%{name} created on %{date}"
       empty: No matching users found
     page:
-      older: "Older Users"
-      newer: "Newer Users"
       found_users:
         one: "%{count} user found"
         other: "%{count} users found"
@@ -2833,15 +2836,9 @@ en:
       doesnt_have_role: "The user does not have role %{role}."
       not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
     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."
@@ -2927,14 +2924,12 @@ en:
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"
-    blocks:
+    page:
       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"
       status: "Status"
       revoker_name: "Revoked by"
-      older: "Older Blocks"
-      newer: "Newer Blocks"
     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"
@@ -3015,6 +3010,10 @@ en:
       anonymous_warning_sign_up: "sign up"
       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}"
+      next: "Next"
+      previous: "Previous"
   javascripts:
     close: Close
     share:
@@ -3202,6 +3201,7 @@ en:
       empty: "No redactions to show."
       heading: "List of Redactions"
       title: "List of Redactions"
+      new: "New Redaction"
     new:
       heading: "Enter Information for New Redaction"
       title: "Creating New Redaction"