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 a40f1571978a44023071bee0e3960be77e2a5333..65c490e8dcffe8d9dcff12ad966ec5ee04f9aedd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -371,7 +371,6 @@ en:
     search:
       title:
         latlon: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
-        uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="https://geocoder.ca/">Geocoder.CA</a>'
         osm_nominatim: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
@@ -981,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:
@@ -993,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:
@@ -1027,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 <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'
@@ -1041,25 +1040,24 @@ en:
     new:
       title_html: "Report %{link}"
     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
@@ -1765,7 +1763,7 @@ en:
       public_traces: "Public GPS traces"
       your_traces: "Your GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
-      description: "Browse recent GPS track uploads"
+      description: "Browse recent GPS trace uploads"
       tagged_with: " tagged with %{tags}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
     delete:
@@ -2437,13 +2435,17 @@ en:
       instructions:
         continue_without_exit: Continue on %{name}
         slight_right_without_exit: Slight right onto %{name}
-        offramp_right_without_exit: Take the ramp on the right onto %{name}
+        offramp_right: Take the ramp on the right
+        offramp_right_with_exit: Take exit %{exit} on the right
+        offramp_right_with_exit_name: Take exit %{exit} on the right onto %{name}
+        offramp_right_with_exit_directions: Take exit %{exit} on the right towards %{directions}
+        offramp_right_with_exit_name_directions: Take exit %{exit} on the right onto %{name}, towards %{directions}
+        offramp_right_with_name: Take the ramp on the right onto %{name}
         offramp_right_with_directions: Take the ramp on the right towards %{directions}
-        offramp_right_with_name_and_directions: Take the ramp on the right onto %{name}, towards %{directions}
-        offramp_right_without_directions: Take the ramp on the right
+        offramp_right_with_name_directions: Take the ramp on the right onto %{name}, towards %{directions}
         onramp_right_without_exit: Turn right on the ramp onto %{name}
         onramp_right_with_directions: Turn right onto the ramp towards %{directions}
-        onramp_right_with_name_and_directions: Turn right on the ramp onto %{name}, towards %{directions}
+        onramp_right_with_name_directions: Turn right on the ramp onto %{name}, towards %{directions}
         onramp_right_without_directions: Turn right onto the ramp
         endofroad_right_without_exit: At the end of the road turn right onto %{name}
         merge_right_without_exit: Merge right onto %{name}
@@ -2453,13 +2455,17 @@ en:
         uturn_without_exit: U-turn along %{name}
         sharp_left_without_exit: Sharp left onto %{name}
         turn_left_without_exit: Turn left onto %{name}
-        offramp_left_without_exit: Take the ramp on the left onto %{name}
+        offramp_left: Take the ramp on the left
+        offramp_left_with_exit: Take exit %{exit} on the left
+        offramp_left_with_exit_name: Take exit %{exit} on the left onto %{name}
+        offramp_left_with_exit_directions: Take exit %{exit} on the left towards %{directions}
+        offramp_left_with_exit_name_directions: Take exit %{exit} on the left onto %{name}, towards %{directions}
+        offramp_left_with_name: Take the ramp on the left onto %{name}
         offramp_left_with_directions: Take the ramp on the left towards %{directions}
-        offramp_left_with_name_and_directions: Take the ramp on the left onto %{name}, towards %{directions}
-        offramp_left_without_directions: Take the ramp on the left
+        offramp_left_with_name_directions: Take the ramp on the left onto %{name}, towards %{directions}
         onramp_left_without_exit: Turn left on the ramp onto %{name}
         onramp_left_with_directions: Turn left onto the ramp towards %{directions}
-        onramp_left_with_name_and_directions: Turn left on the ramp onto %{name}, towards %{directions}
+        onramp_left_with_name_directions: Turn left on the ramp onto %{name}, towards %{directions}
         onramp_left_without_directions: Turn left onto the ramp
         endofroad_left_without_exit: At the end of the road turn left onto %{name}
         merge_left_without_exit: Merge left onto %{name}