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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3a82aab3909b280ce105f7bf34ec78862d6d4500..b56fb6410c6af3c6460180e2d7921518d247ce7c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2905,6 +2905,7 @@ en:
           confirmed: Confirmed
           suspended: Suspended
           deleted: Deleted
           confirmed: Confirmed
           suspended: Suspended
           deleted: Deleted

+        name_or_email: Name or Email

         ip_address: IP Address
         search: Search
       page:
         ip_address: IP Address
         search: Search
       page:


@@ -3103,6 +3104,7 @@ en:
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
       description_when_author_is_deleted: "deleted"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
       description_when_author_is_deleted: "deleted"

+      description_when_there_is_no_opening_comment: "unknown"

       event_opened_by_html: "Created by %{user} %{time_ago}"
       event_opened_by_anonymous_html: "Created by anonymous %{time_ago}"
       event_commented_by_html: "Comment from %{user} %{time_ago}"
       event_opened_by_html: "Created by %{user} %{time_ago}"
       event_opened_by_anonymous_html: "Created by anonymous %{time_ago}"
       event_commented_by_html: "Comment from %{user} %{time_ago}"