Combine last_updated_by and last_updated_at columns on issues index

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7e4d0131903aef9b49006b0422438281eea0d761..65c490e8dcffe8d9dcff12ad966ec5ee04f9aedd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -980,8 +980,9 @@ en:
       issues_not_found: No such issues found
       status: Status
       reports: Reports
       issues_not_found: No such issues found
       status: Status
       reports: Reports

-      last_updated_at: Last Updated At
-      last_updated_by: Last Updated By
+      last_updated: Last Updated
+      last_updated_time_html: "<abbr title='%{title}'>%{time} ago</abbr>"
+      last_updated_time_user_html: "<abbr title='%{title}'>%{time} ago</abbr> by %{user}"

       link_to_reports: View Reports
       reported_user: Reported User
       reports_count:
       link_to_reports: View Reports
       reported_user: Reported User
       reports_count:


@@ -1026,9 +1027,8 @@ en:
     comments:
       created_at: "On %{datetime}"
     reports:
     comments:
       created_at: "On %{datetime}"
     reports:

-      category: "Category: %{category}"

       updated_at: "On %{datetime}"
       updated_at: "On %{datetime}"

-      reported_by_html: "Reported by <a href=\"%{user_url}\">%{user_name}</a>"
+      reported_by_html: "Reported as %{category} by <a href=\"%{user_url}\">%{user_name}</a>"

     resolved: Issue status has been set to 'Resolved'
     ignored: Issue status has been set to 'Ignored'
     reopened: Issue status has been set to 'Open'
     resolved: Issue status has been set to 'Resolved'
     ignored: Issue status has been set to 'Ignored'
     reopened: Issue status has been set to 'Open'


@@ -1041,24 +1041,23 @@ en:
       title_html: "Report %{link}"
     categories:
       diary_entry:
       title_html: "Report %{link}"
     categories:
       diary_entry:

-        spam: This Diary Entry is/contains spam
-        offensive: This Diary Entry is obscene/offensive
-        threat: This Diary Entry contains a threat
+        spam: This diary entry is/contains spam
+        offensive: This diary entry is obscene/offensive
+        threat: This diary entry contains a threat

         other: Other
       diary_comment:
         other: Other
       diary_comment:

-        spam: This Diary Comment is/contains spam
-        offensive: This Diary Comment is obscene/offensive
-        threat: This Diary Comment contains a threat
+        spam: This diary comment is/contains spam
+        offensive: This diary comment is obscene/offensive
+        threat: This diary comment contains a threat

         other: Other
       user:
         other: Other
       user:

-        spam: This User profile is/contains spam
-        offensive: This User profile is obscene/offensive
-        threat: This User profile contains a threat
-        vandal: This User is a vandal
+        spam: This user profile is/contains spam
+        offensive: This user profile is obscene/offensive
+        threat: This user profile contains a threat
+        vandal: This user is a vandal

         other: Other
       note:
         spam: This note is spam
         other: Other
       note:
         spam: This note is spam

-        vandalism: This note is vandalism

         personal: This note contains personal data
         abusive: This note is abusive
         other: Other
         personal: This note contains personal data
         abusive: This note is abusive
         other: Other