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

diff --combined config/locales/en.yml
index b73be94ad4c3ac0c86fbbce3c85ec8db663133bd,f7db08da5907d8b4160666fbb64f0b6c2417f2a7..2d68755e42a66d2519139fce38c6b082d1413795
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -476,6 -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"
@@@ -551,8 -553,6 +551,8 @@@
        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"
@@@ -1496,16 -1496,43 +1496,43 @@@
            weir: "Weir"
            "yes": "Waterway"
        admin_levels:
-         level2: "Country Boundary"
-         level3: "Region Boundary"
-         level4: "State Boundary"
-         level5: "Region Boundary"
-         level6: "County Boundary"
-         level7: "Municipality Boundary"
-         level8: "City Boundary"
-         level9: "Village Boundary"
-         level10: "Suburb Boundary"
-         level11: "Neighbourhood Boundary"
+         level2: "International Boundary"
+         level3: "Administrative Boundary (Level 3)"
+         level4: "Administrative Boundary (Level 4)"
+         level5: "Administrative Boundary (Level 5)"
+         level6: "Administrative Boundary (Level 6)"
+         level7: "Administrative Boundary (Level 7)"
+         level8: "Administrative Boundary (Level 8)"
+         level9: "Administrative Boundary (Level 9)"
+         level10: "Administrative Boundary (Level 10)"
+         level11: "Administrative Boundary (Level 11)"
+       border_types:
+         arrondissement: "Arrondissement Boundary"
+         borough: "Borough Boundary"
+         cercle: "Cercle Boundary"
+         city: "City Boundary"
+         comarca: "Comarca Boundary"
+         county: "County Boundary"
+         departement: "Departmental Boundary"
+         department: "Departmental Boundary"
+         district: "District Boundary"
+         distrito: "District Boundary"
+         freguesia: "Freguesia Boundary"
+         local_authority: "Local Authority Boundary"
+         municipality: "Municipal Boundary"
+         municipi: "Municipal Boundary"
+         município: "Municipal Boundary"
+         nation: "International Boundary"
+         national: "International Boundary"
+         neighbourhood: "Neighborhood Boundary"
+         parish: "Parish Boundary"
+         province: "Provincial Boundary"
+         região: "Regional Boundary"
+         region: "Regional Boundary"
+         state: "State Boundary"
+         town: "Town Boundary"
+         township: "Township Boundary"
+         village: "Village Boundary"
      results:
        no_results: "No results found"
        more_results: "More results"
@@@ -1517,9 -1544,9 +1544,9 @@@
        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:
@@@ -1533,11 -1560,12 +1560,11 @@@
        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
@@@ -1580,11 -1608,6 +1607,11 @@@
        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