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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0b7027f80fe970ec7cbe6c20f8105110a76b8066..4a103b21e685fce85f095420e214269b4e723afd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -472,10 +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."
       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_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:
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
     paging_nav:


@@ -545,6 +548,8 @@ en:
       title: "%{user}'s Diary | %{title}"
       user_title: "%{user}'s Diary"
       discussion: "Discussion"
       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"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       login: "Log in"


@@ -3171,11 +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
       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"

     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
       ascend: "Ascend"
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
       ascend: "Ascend"