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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3900f9fba97449b64e36d55073f07450a7641167..9c7ab2b4978ca0380a1ada6e0c1611d3c5718b7a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2202,8 +2202,8 @@ en:
       showing_page: "Page %{page}"
       next: "Next »"
       previous: "« Previous"
-  note:
-    description:
+  notes:
+    comment:
       opened_at_html: "Created %{when} ago"
       opened_at_by_html: "Created %{when} ago by %{user}"
       commented_at_html: "Updated %{when} ago"