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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 516dad37abe2b65386d7316e7f541e7a56487a33..6426ee56bbac8c8d89908f6156f0c94f14ddf8b0 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -331,11 +331,13 @@ en:
         other: "%{count} comments"
       edit_link: Edit this entry
       hide_link: Hide this entry
+      unhide_link: Unhide this entry
       confirm: Confirm
       report: Report this entry
     diary_comment:
       comment_from: "Comment from %{link_user} on %{comment_created_at}"
       hide_link: Hide this comment
+      unhide_link: Unhide this comment
       confirm: Confirm
       report: Report this comment
     location: