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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8b60b094cbbdf4a5a76ce0a0a6e0cca3de92a655..b73be94ad4c3ac0c86fbbce3c85ec8db663133bd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -476,8 +476,12 @@ en:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:
     changeset:
-      no_edits: "(no edits)"
-      view_changeset_details: "View changeset details"
+      comments:
+        one: "%{count} comment"
+        other: "%{count} comments"
+      changes:
+        one: "%{count} change"
+        other: "%{count} changes"
     index:
       title: "Changesets"
       title_user: "Changesets by %{user}"
@@ -547,6 +551,8 @@ en:
       km away: "%{count}km away"
       m away: "%{count}m away"
       latest_edit_html: "Latest edit (%{ago}):"
+      no_edits: "(no edits)"
+      view_changeset_details: "View changeset details"
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"
@@ -1503,14 +1509,17 @@ en:
     results:
       no_results: "No results found"
       more_results: "More results"
+  directions:
+    search:
+      title: Directions
   issues:
     index:
       title: Issues
       select_status: Select Status
       select_type: Select Type
-      select_last_updated_by: Select Last Updated By
+      select_last_managed_by: Select Last Managed By
       reported_user: Reported User
-      not_updated: Not Updated
+      not_managed: Not Managed
       search: Search
       search_guidance: "Search Issues:"
       states:
@@ -1524,12 +1533,11 @@ en:
       status: Status
       reports: Reports
       last_updated: Last Updated
-      last_updated_time_ago_user_html: "%{time_ago} by %{user}"
+      last_managed: Last Managed
       reporting_users: Reporting Users
       reports_count:
         one: "%{count} Report"
         other: "%{count} Reports"
-      more_reporters: "and %{count} more"
       reported_item: Reported Item
       states:
         ignored: Ignored
@@ -1572,6 +1580,11 @@ en:
       reportable_title:
         diary_comment: "%{entry_title}, comment #%{comment_id}"
         note: "Note #%{note_id}"
+    reporters:
+      index:
+        title: "Issue #%{issue_id} Reporters"
+      reporters:
+        more_reporters: "and %{count} more"
   issue_comments:
     create:
       comment_created: Your comment was successfully created
@@ -3239,7 +3252,6 @@ en:
     directions:
       ascend: "Ascend"
       descend: "Descend"
-      directions: "Directions"
       distance: "Distance"
       distance_m: "%{distance}m"
       distance_km: "%{distance}km"