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 064020397b8a7142051c4fa9ac6d80d7ba84f01b..b73be94ad4c3ac0c86fbbce3c85ec8db663133bd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -476,8 +476,6 @@ 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"
@@ -553,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"
@@ -1538,7 +1538,6 @@ en:
       reports_count:
         one: "%{count} Report"
         other: "%{count} Reports"
-      more_reporters: "and %{count} more"
       reported_item: Reported Item
       states:
         ignored: Ignored
@@ -1581,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