SOTMEU 2024 banner

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7b463421036030b059fb757657dbc1631d27100f..e8dde9521375e9f8c92cc278c1275c431637f3d5 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -472,8 +472,13 @@ en:
       discussion: Discussion
       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"
       comment_by_html: "Comment from %{user} %{time_ago}"
       hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
+      hide_comment: "hide"
+      unhide_comment: "unhide"
+      comment: "Comment"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
     paging_nav:
@@ -543,6 +548,8 @@ en:
       title: "%{user}'s Diary | %{title}"
       user_title: "%{user}'s Diary"
       discussion: "Discussion"
+      subscribe: "Subscribe"
+      unsubscribe: "Unsubscribe"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       login: "Log in"
@@ -585,7 +592,14 @@ en:
       all:
         title: "OpenStreetMap diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
-    comments:
+    subscribe:
+      heading: Subscribe to the following diary entry discussion?
+      button: Subscribe to discussion
+    unsubscribe:
+      heading: Unsubscribe from the following diary entry discussion?
+      button: Unsubscribe from discussion
+  diary_comments:
+    index:
       title: "Diary Comments added by %{user}"
       heading: "%{user}'s Diary Comments"
       subheading_html: "Diary Comments added by %{user}"
@@ -595,12 +609,6 @@ en:
       comment: Comment
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
-    subscribe:
-      heading: Subscribe to the following diary entry discussion?
-      button: Subscribe to discussion
-    unsubscribe:
-      heading: Unsubscribe from the following diary entry discussion?
-      button: Unsubscribe from discussion
   doorkeeper:
     errors:
       messages:
@@ -2166,9 +2174,6 @@ en:
     index:
       js_1: "You are either using a browser that does not support JavaScript, or you have disabled JavaScript."
       js_2: "OpenStreetMap uses JavaScript for its slippy map."
-      permalink: Permalink
-      shortlink: Shortlink
-      createnote: Add a note
       license:
         copyright: "Copyright OpenStreetMap and contributors, under an open license"
         license_url: "https://openstreetmap.org/copyright"
@@ -2821,6 +2826,8 @@ en:
       remove as friend: Unfriend
       add as friend: Add Friend
       mapper since: "Mapper since:"
+      last map edit: "Last map edit:"
+      no activity yet: "No activity yet"
       uid: "User id:"
       ct status: "Contributor terms:"
       ct undecided: Undecided
@@ -3169,13 +3176,6 @@ en:
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features
       embed_html_disabled: HTML embedding is not available for this map layer
-    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:
       ascend: "Ascend"