Create a report_link helper, and use text instead of a flag icon

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6b70afea7e9c03950731b8b30cf16aaf6c6fccda..f5fe7c325680adceeac0ae763101b87646b80f7d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -207,7 +207,7 @@ en:
       reopened_by: "Reactivated by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
       reopened_by_anonymous: "Reactivated by anonymous <abbr title='%{exact_time}'>%{when} ago</abbr>"
       hidden_by: "Hidden by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>"
-      report: Report this note?
+      report: Report this note
     query:
       title: "Query Features"
       introduction: "Click on the map to find nearby features."
@@ -298,12 +298,12 @@ en:
       edit_link: Edit this entry
       hide_link: Hide this entry
       confirm: Confirm
-      report: Report this entry?
+      report: Report this entry
     diary_comment:
       comment_from: "Comment from %{link_user} on %{comment_created_at}"
       hide_link: Hide this comment
       confirm: Confirm
-      report: Report this comment?
+      report: Report this comment
     location:
       location: "Location:"
       view: "View"
@@ -980,8 +980,9 @@ en:
       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:
@@ -992,7 +993,7 @@ en:
       successful_report: Your report has been registered sucessfully
       provide_details: Please provide the required details
     update:
-      new_report: Your report been registered sucessfully
+      new_report: Your report has been registered sucessfully
       successful_update: Your report has been updated successfully
       provide_details: Please provide the required details
     new:
@@ -1026,9 +1027,8 @@ en:
     comments:
       created_at: "On %{datetime}"
     reports:
-      category: "Category: %{category}"
       updated_at: "On %{datetime}"
-      reported_by_html: "Reported by <a href=\"%{user_url}\">%{user_name}</a>"
+      reported_by_html: "Reported as %{category} by %{user}"
     resolved: Issue status has been set to 'Resolved'
     ignored: Issue status has been set to 'Ignored'
     reopened: Issue status has been set to 'Open'
@@ -1039,26 +1039,26 @@ en:
   reports:
     new:
       title_html: "Report %{link}"
+      missing_params: "Cannot create a new report"
     categories:
-      DiaryEntry:
-        spam: This Diary Entry is/contains spam
-        offensive: This Diary Entry is obscene/offensive
-        threat: This Diary Entry contains a threat
+      diary_entry:
+        spam: This diary entry is/contains spam
+        offensive: This diary entry is obscene/offensive
+        threat: This diary entry contains a threat
         other: Other
-      DiaryComment:
-        spam: This Diary Comment is/contains spam
-        offensive: This Diary Comment is obscene/offensive
-        threat: This Diary Comment contains a threat
+      diary_comment:
+        spam: This diary comment is/contains spam
+        offensive: This diary comment is obscene/offensive
+        threat: This diary comment contains a threat
         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
+      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
         other: Other
-      Note:
+      note:
         spam: This note is spam
-        vandalism: This note is vandalism
         personal: This note contains personal data
         abusive: This note is abusive
         other: Other
@@ -1790,6 +1790,8 @@ en:
       not_an_admin: You need to be an admin to perform that action.
     require_moderator:
       not_a_moderator: "You need to be a moderator to perform that action."
+    require_moderator_or_admin:
+      not_a_moderator_or_admin: You need to be a moderator or an admin to perform that action
     setup_user_auth:
       blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
@@ -2059,7 +2061,7 @@ en:
       friends_diaries: "friends' diary entries"
       nearby_changesets: "nearby user changesets"
       nearby_diaries: "nearby user diary entries"
-      report: "Report this user?"
+      report: Report this User
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"