diff --git a/src/applications/maniphest/storage/ManiphestTransaction.php b/src/applications/maniphest/storage/ManiphestTransaction.php
index 0456673a10..024a292337 100644
--- a/src/applications/maniphest/storage/ManiphestTransaction.php
+++ b/src/applications/maniphest/storage/ManiphestTransaction.php
@@ -1,924 +1,924 @@
 <?php
 
 final class ManiphestTransaction
   extends PhabricatorApplicationTransaction {
 
   const TYPE_TITLE = 'title';
   const TYPE_STATUS = 'status';
   const TYPE_DESCRIPTION = 'description';
   const TYPE_OWNER  = 'reassign';
   const TYPE_PRIORITY = 'priority';
   const TYPE_EDGE = 'edge';
   const TYPE_SUBPRIORITY = 'subpriority';
   const TYPE_PROJECT_COLUMN = 'projectcolumn';
   const TYPE_MERGED_INTO = 'mergedinto';
   const TYPE_MERGED_FROM = 'mergedfrom';
   const TYPE_UNBLOCK = 'unblock';
 
   // NOTE: this type is deprecated. Keep it around for legacy installs
   // so any transactions render correctly.
   const TYPE_ATTACH = 'attach';
 
   const MAILTAG_STATUS = 'maniphest-status';
   const MAILTAG_OWNER = 'maniphest-owner';
   const MAILTAG_PRIORITY = 'maniphest-priority';
   const MAILTAG_CC = 'maniphest-cc';
   const MAILTAG_PROJECTS = 'maniphest-projects';
   const MAILTAG_COMMENT = 'maniphest-comment';
   const MAILTAG_COLUMN = 'maniphest-column';
   const MAILTAG_UNBLOCK = 'maniphest-unblock';
   const MAILTAG_OTHER = 'maniphest-other';
 
 
   public function getApplicationName() {
     return 'maniphest';
   }
 
   public function getApplicationTransactionType() {
     return ManiphestTaskPHIDType::TYPECONST;
   }
 
   public function getApplicationTransactionCommentObject() {
     return new ManiphestTransactionComment();
   }
 
   public function shouldGenerateOldValue() {
     switch ($this->getTransactionType()) {
       case self::TYPE_PROJECT_COLUMN:
       case self::TYPE_EDGE:
       case self::TYPE_UNBLOCK:
         return false;
     }
 
     return parent::shouldGenerateOldValue();
   }
 
   public function getRemarkupBlocks() {
     $blocks = parent::getRemarkupBlocks();
 
     switch ($this->getTransactionType()) {
       case self::TYPE_DESCRIPTION:
         $blocks[] = $this->getNewValue();
         break;
     }
 
     return $blocks;
   }
 
   public function getRequiredHandlePHIDs() {
     $phids = parent::getRequiredHandlePHIDs();
 
     $new = $this->getNewValue();
     $old = $this->getOldValue();
 
     switch ($this->getTransactionType()) {
       case self::TYPE_OWNER:
         if ($new) {
           $phids[] = $new;
         }
 
         if ($old) {
           $phids[] = $old;
         }
         break;
       case self::TYPE_PROJECT_COLUMN:
         $phids[] = $new['projectPHID'];
         $phids[] = head($new['columnPHIDs']);
         break;
       case self::TYPE_MERGED_INTO:
         $phids[] = $new;
         break;
       case self::TYPE_MERGED_FROM:
         $phids = array_merge($phids, $new);
         break;
       case self::TYPE_EDGE:
         $phids = array_mergev(
           array(
             $phids,
             array_keys(nonempty($old, array())),
             array_keys(nonempty($new, array())),
           ));
         break;
       case self::TYPE_ATTACH:
         $old = nonempty($old, array());
         $new = nonempty($new, array());
         $phids = array_mergev(
           array(
             $phids,
             array_keys(idx($new, 'FILE', array())),
             array_keys(idx($old, 'FILE', array())),
           ));
         break;
       case self::TYPE_UNBLOCK:
         foreach (array_keys($new) as $phid) {
           $phids[] = $phid;
         }
         break;
       case self::TYPE_STATUS:
         $commit_phid = $this->getMetadataValue('commitPHID');
         if ($commit_phid) {
           $phids[] = $commit_phid;
         }
         break;
     }
 
     return $phids;
   }
 
   public function shouldHide() {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_EDGE:
         $commit_phid = $this->getMetadataValue('commitPHID');
         $edge_type = $this->getMetadataValue('edge:type');
 
         if ($edge_type == ManiphestTaskHasCommitEdgeType::EDGECONST) {
           if ($commit_phid) {
             return true;
           }
         }
         break;
       case self::TYPE_DESCRIPTION:
       case self::TYPE_PRIORITY:
       case self::TYPE_STATUS:
         if ($this->getOldValue() === null) {
           return true;
         } else {
           return false;
         }
         break;
       case self::TYPE_SUBPRIORITY:
         return true;
       case self::TYPE_PROJECT_COLUMN:
         $old_cols = idx($this->getOldValue(), 'columnPHIDs');
         $new_cols = idx($this->getNewValue(), 'columnPHIDs');
 
         $old_cols = array_values($old_cols);
         $new_cols = array_values($new_cols);
         sort($old_cols);
         sort($new_cols);
 
         return ($old_cols === $new_cols);
     }
 
     return parent::shouldHide();
   }
 
   public function getActionStrength() {
     switch ($this->getTransactionType()) {
       case self::TYPE_TITLE:
         return 1.4;
       case self::TYPE_STATUS:
         return 1.3;
       case self::TYPE_OWNER:
         return 1.2;
       case self::TYPE_PRIORITY:
         return 1.1;
     }
 
     return parent::getActionStrength();
   }
 
 
   public function getColor() {
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case self::TYPE_OWNER:
         if ($this->getAuthorPHID() == $new) {
           return 'green';
         } else if (!$new) {
           return 'black';
         } else if (!$old) {
           return 'green';
         } else {
           return 'green';
         }
 
       case self::TYPE_STATUS:
         $color = ManiphestTaskStatus::getStatusColor($new);
         if ($color !== null) {
           return $color;
         }
 
         if (ManiphestTaskStatus::isOpenStatus($new)) {
           return 'green';
         } else {
           return 'indigo';
         }
 
       case self::TYPE_PRIORITY:
         if ($old == ManiphestTaskPriority::getDefaultPriority()) {
           return 'green';
         } else if ($old > $new) {
           return 'grey';
         } else {
           return 'yellow';
         }
 
       case self::TYPE_MERGED_FROM:
         return 'orange';
 
       case self::TYPE_MERGED_INTO:
         return 'indigo';
     }
 
     return parent::getColor();
   }
 
   public function getActionName() {
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case self::TYPE_TITLE:
         if ($old === null) {
           return pht('Created');
         }
 
         return pht('Retitled');
 
       case self::TYPE_STATUS:
         $action = ManiphestTaskStatus::getStatusActionName($new);
         if ($action) {
           return $action;
         }
 
         $old_closed = ManiphestTaskStatus::isClosedStatus($old);
         $new_closed = ManiphestTaskStatus::isClosedStatus($new);
 
         if ($new_closed && !$old_closed) {
           return pht('Closed');
         } else if (!$new_closed && $old_closed) {
           return pht('Reopened');
         } else {
           return pht('Changed Status');
         }
 
       case self::TYPE_DESCRIPTION:
         return pht('Edited');
 
       case self::TYPE_OWNER:
         if ($this->getAuthorPHID() == $new) {
           return pht('Claimed');
         } else if (!$new) {
           return pht('Up For Grabs');
         } else if (!$old) {
           return pht('Assigned');
         } else {
           return pht('Reassigned');
         }
 
       case self::TYPE_PROJECT_COLUMN:
         return pht('Changed Project Column');
 
       case self::TYPE_PRIORITY:
         if ($old == ManiphestTaskPriority::getDefaultPriority()) {
           return pht('Triaged');
         } else if ($old > $new) {
           return pht('Lowered Priority');
         } else {
           return pht('Raised Priority');
         }
 
       case self::TYPE_EDGE:
       case self::TYPE_ATTACH:
         return pht('Attached');
 
       case self::TYPE_UNBLOCK:
         $old_status = head($old);
         $new_status = head($new);
 
         $old_closed = ManiphestTaskStatus::isClosedStatus($old_status);
         $new_closed = ManiphestTaskStatus::isClosedStatus($new_status);
 
         if ($old_closed && !$new_closed) {
           return pht('Block');
         } else if (!$old_closed && $new_closed) {
           return pht('Unblock');
         } else {
           return pht('Blocker');
         }
 
       case self::TYPE_MERGED_INTO:
       case self::TYPE_MERGED_FROM:
         return pht('Merged');
 
     }
 
     return parent::getActionName();
   }
 
   public function getIcon() {
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case self::TYPE_OWNER:
         return 'fa-user';
 
       case self::TYPE_TITLE:
         if ($old === null) {
           return 'fa-pencil';
         }
 
         return 'fa-pencil';
 
       case self::TYPE_STATUS:
         $action = ManiphestTaskStatus::getStatusIcon($new);
         if ($action !== null) {
           return $action;
         }
 
         if (ManiphestTaskStatus::isClosedStatus($new)) {
           return 'fa-check';
         } else {
           return 'fa-pencil';
         }
 
       case self::TYPE_DESCRIPTION:
         return 'fa-pencil';
 
       case self::TYPE_PROJECT_COLUMN:
         return 'fa-columns';
 
       case self::TYPE_MERGED_INTO:
         return 'fa-check';
       case self::TYPE_MERGED_FROM:
         return 'fa-compress';
 
       case self::TYPE_PRIORITY:
         if ($old == ManiphestTaskPriority::getDefaultPriority()) {
           return 'fa-arrow-right';
         } else if ($old > $new) {
           return 'fa-arrow-down';
         } else {
           return 'fa-arrow-up';
         }
 
       case self::TYPE_EDGE:
       case self::TYPE_ATTACH:
         return 'fa-thumb-tack';
 
       case self::TYPE_UNBLOCK:
         return 'fa-shield';
 
     }
 
     return parent::getIcon();
   }
 
 
 
   public function getTitle() {
     $author_phid = $this->getAuthorPHID();
 
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case self::TYPE_TITLE:
         if ($old === null) {
           return pht(
             '%s created this task.',
             $this->renderHandleLink($author_phid));
         }
         return pht(
           '%s changed the title from "%s" to "%s".',
           $this->renderHandleLink($author_phid),
           $old,
           $new);
 
       case self::TYPE_DESCRIPTION:
         return pht(
           '%s edited the task description.',
           $this->renderHandleLink($author_phid));
 
       case self::TYPE_STATUS:
         $old_closed = ManiphestTaskStatus::isClosedStatus($old);
         $new_closed = ManiphestTaskStatus::isClosedStatus($new);
 
         $old_name = ManiphestTaskStatus::getTaskStatusName($old);
         $new_name = ManiphestTaskStatus::getTaskStatusName($new);
 
         $commit_phid = $this->getMetadataValue('commitPHID');
 
         if ($new_closed && !$old_closed) {
           if ($new == ManiphestTaskStatus::getDuplicateStatus()) {
             if ($commit_phid) {
               return pht(
                 '%s closed this task as a duplicate by committing %s.',
                 $this->renderHandleLink($author_phid),
                 $this->renderHandleLink($commit_phid));
             } else {
               return pht(
                 '%s closed this task as a duplicate.',
                 $this->renderHandleLink($author_phid));
             }
           } else {
             if ($commit_phid) {
               return pht(
                 '%s closed this task as "%s" by committing %s.',
                 $this->renderHandleLink($author_phid),
                 $new_name,
                 $this->renderHandleLink($commit_phid));
             } else {
               return pht(
                 '%s closed this task as "%s".',
                 $this->renderHandleLink($author_phid),
                 $new_name);
             }
           }
         } else if (!$new_closed && $old_closed) {
           if ($commit_phid) {
             return pht(
               '%s reopened this task as "%s" by committing %s.',
               $this->renderHandleLink($author_phid),
               $new_name,
               $this->renderHandleLink($commit_phid));
           } else {
             return pht(
               '%s reopened this task as "%s".',
               $this->renderHandleLink($author_phid),
               $new_name);
           }
         } else {
           if ($commit_phid) {
             return pht(
               '%s changed the task status from "%s" to "%s" by committing %s.',
               $this->renderHandleLink($author_phid),
               $old_name,
               $new_name,
               $this->renderHandleLink($commit_phid));
           } else {
             return pht(
               '%s changed the task status from "%s" to "%s".',
               $this->renderHandleLink($author_phid),
               $old_name,
               $new_name);
           }
         }
 
       case self::TYPE_UNBLOCK:
         $blocker_phid = key($new);
         $old_status = head($old);
         $new_status = head($new);
 
         $old_closed = ManiphestTaskStatus::isClosedStatus($old_status);
         $new_closed = ManiphestTaskStatus::isClosedStatus($new_status);
 
         $old_name = ManiphestTaskStatus::getTaskStatusName($old_status);
         $new_name = ManiphestTaskStatus::getTaskStatusName($new_status);
 
         if ($old_closed && !$new_closed) {
           return pht(
             '%s reopened blocking task %s as "%s".',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($blocker_phid),
             $new_name);
         } else if (!$old_closed && $new_closed) {
           return pht(
             '%s closed blocking task %s as "%s".',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($blocker_phid),
             $new_name);
         } else {
           return pht(
             '%s changed the status of blocking task %s from "%s" to "%s".',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($blocker_phid),
             $old_name,
             $new_name);
         }
 
       case self::TYPE_OWNER:
         if ($author_phid == $new) {
           return pht(
             '%s claimed this task.',
             $this->renderHandleLink($author_phid));
         } else if (!$new) {
           return pht(
             '%s placed this task up for grabs.',
             $this->renderHandleLink($author_phid));
         } else if (!$old) {
           return pht(
             '%s assigned this task to %s.',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($new));
         } else {
           return pht(
             '%s reassigned this task from %s to %s.',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($old),
             $this->renderHandleLink($new));
         }
 
       case self::TYPE_PRIORITY:
         $old_name = ManiphestTaskPriority::getTaskPriorityName($old);
         $new_name = ManiphestTaskPriority::getTaskPriorityName($new);
 
         if ($old == ManiphestTaskPriority::getDefaultPriority()) {
           return pht(
             '%s triaged this task as "%s" priority.',
             $this->renderHandleLink($author_phid),
             $new_name);
         } else if ($old > $new) {
           return pht(
             '%s lowered the priority of this task from "%s" to "%s".',
             $this->renderHandleLink($author_phid),
             $old_name,
             $new_name);
         } else {
           return pht(
             '%s raised the priority of this task from "%s" to "%s".',
             $this->renderHandleLink($author_phid),
             $old_name,
             $new_name);
         }
 
       case self::TYPE_ATTACH:
         $old = nonempty($old, array());
         $new = nonempty($new, array());
         $new = array_keys(idx($new, 'FILE', array()));
         $old = array_keys(idx($old, 'FILE', array()));
 
         $added = array_diff($new, $old);
         $removed = array_diff($old, $new);
         if ($added && !$removed) {
           return pht(
             '%s attached %s file(s): %s.',
             $this->renderHandleLink($author_phid),
             phutil_count($added),
             $this->renderHandleList($added));
         } else if ($removed && !$added) {
           return pht(
             '%s detached %s file(s): %s.',
             $this->renderHandleLink($author_phid),
             phutil_count($removed),
             $this->renderHandleList($removed));
         } else {
           return pht(
             '%s changed file(s), attached %s: %s; detached %s: %s.',
             $this->renderHandleLink($author_phid),
             phutil_count($added),
             $this->renderHandleList($added),
             phutil_count($removed),
             $this->renderHandleList($removed));
         }
 
       case self::TYPE_PROJECT_COLUMN:
         $project_phid = $new['projectPHID'];
         $column_phid = head($new['columnPHIDs']);
         return pht(
           '%s moved this task to %s on the %s workboard.',
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($column_phid),
           $this->renderHandleLink($project_phid));
         break;
 
       case self::TYPE_MERGED_INTO:
         return pht(
           '%s closed this task as a duplicate of %s.',
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($new));
         break;
 
       case self::TYPE_MERGED_FROM:
         return pht(
           '%s merged %s task(s): %s.',
           $this->renderHandleLink($author_phid),
           phutil_count($new),
           $this->renderHandleList($new));
         break;
 
 
     }
 
     return parent::getTitle();
   }
 
   public function getTitleForFeed() {
     $author_phid = $this->getAuthorPHID();
     $object_phid = $this->getObjectPHID();
 
     $old = $this->getOldValue();
     $new = $this->getNewValue();
 
     switch ($this->getTransactionType()) {
       case self::TYPE_TITLE:
         if ($old === null) {
           return pht(
             '%s created %s.',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($object_phid));
         }
 
         return pht(
           '%s renamed %s from "%s" to "%s".',
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($object_phid),
           $old,
           $new);
 
       case self::TYPE_DESCRIPTION:
         return pht(
           '%s edited the description of %s.',
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($object_phid));
 
       case self::TYPE_STATUS:
         $old_closed = ManiphestTaskStatus::isClosedStatus($old);
         $new_closed = ManiphestTaskStatus::isClosedStatus($new);
 
         $old_name = ManiphestTaskStatus::getTaskStatusName($old);
         $new_name = ManiphestTaskStatus::getTaskStatusName($new);
 
         $commit_phid = $this->getMetadataValue('commitPHID');
 
         if ($new_closed && !$old_closed) {
           if ($new == ManiphestTaskStatus::getDuplicateStatus()) {
             if ($commit_phid) {
               return pht(
                 '%s closed %s as a duplicate by committing %s.',
                 $this->renderHandleLink($author_phid),
                 $this->renderHandleLink($object_phid),
                 $this->renderHandleLink($commit_phid));
             } else {
               return pht(
                 '%s closed %s as a duplicate.',
                 $this->renderHandleLink($author_phid),
                 $this->renderHandleLink($object_phid));
             }
           } else {
             if ($commit_phid) {
               return pht(
                 '%s closed %s as "%s" by committing %s.',
                 $this->renderHandleLink($author_phid),
                 $this->renderHandleLink($object_phid),
                 $new_name,
                 $this->renderHandleLink($commit_phid));
             } else {
               return pht(
                 '%s closed %s as "%s".',
                 $this->renderHandleLink($author_phid),
                 $this->renderHandleLink($object_phid),
                 $new_name);
             }
           }
         } else if (!$new_closed && $old_closed) {
           if ($commit_phid) {
             return pht(
               '%s reopened %s as "%s" by committing %s.',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink($object_phid),
               $new_name,
               $this->renderHandleLink($commit_phid));
           } else {
             return pht(
               '%s reopened %s as "%s".',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink($object_phid),
               $new_name);
           }
         } else {
           if ($commit_phid) {
             return pht(
               '%s changed the status of %s from "%s" to "%s" by committing %s.',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink($object_phid),
               $old_name,
               $new_name,
               $this->renderHandleLink($commit_phid));
           } else {
             return pht(
               '%s changed the status of %s from "%s" to "%s".',
               $this->renderHandleLink($author_phid),
               $this->renderHandleLink($object_phid),
               $old_name,
               $new_name);
           }
         }
 
       case self::TYPE_UNBLOCK:
         $blocker_phid = key($new);
         $old_status = head($old);
         $new_status = head($new);
 
         $old_closed = ManiphestTaskStatus::isClosedStatus($old_status);
         $new_closed = ManiphestTaskStatus::isClosedStatus($new_status);
 
         $old_name = ManiphestTaskStatus::getTaskStatusName($old_status);
         $new_name = ManiphestTaskStatus::getTaskStatusName($new_status);
 
         if ($old_closed && !$new_closed) {
           return pht(
             '%s reopened %s, a task blocking %s, as "%s".',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($blocker_phid),
             $this->renderHandleLink($object_phid),
             $new_name);
         } else if (!$old_closed && $new_closed) {
           return pht(
             '%s closed %s, a task blocking %s, as "%s".',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($blocker_phid),
             $this->renderHandleLink($object_phid),
             $new_name);
         } else {
           return pht(
             '%s changed the status of %s, a task blocking %s, '.
             'from "%s" to "%s".',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($blocker_phid),
             $this->renderHandleLink($object_phid),
             $old_name,
             $new_name);
         }
 
       case self::TYPE_OWNER:
         if ($author_phid == $new) {
           return pht(
             '%s claimed %s.',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($object_phid));
         } else if (!$new) {
           return pht(
             '%s placed %s up for grabs.',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($object_phid));
         } else if (!$old) {
           return pht(
             '%s assigned %s to %s.',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($object_phid),
             $this->renderHandleLink($new));
         } else {
           return pht(
             '%s reassigned %s from %s to %s.',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($object_phid),
             $this->renderHandleLink($old),
             $this->renderHandleLink($new));
         }
 
       case self::TYPE_PRIORITY:
         $old_name = ManiphestTaskPriority::getTaskPriorityName($old);
         $new_name = ManiphestTaskPriority::getTaskPriorityName($new);
 
         if ($old == ManiphestTaskPriority::getDefaultPriority()) {
           return pht(
             '%s triaged %s as "%s" priority.',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($object_phid),
             $new_name);
         } else if ($old > $new) {
           return pht(
             '%s lowered the priority of %s from "%s" to "%s".',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($object_phid),
             $old_name,
             $new_name);
         } else {
           return pht(
             '%s raised the priority of %s from "%s" to "%s".',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($object_phid),
             $old_name,
             $new_name);
         }
 
       case self::TYPE_ATTACH:
         $old = nonempty($old, array());
         $new = nonempty($new, array());
         $new = array_keys(idx($new, 'FILE', array()));
         $old = array_keys(idx($old, 'FILE', array()));
 
         $added = array_diff($new, $old);
         $removed = array_diff($old, $new);
         if ($added && !$removed) {
           return pht(
             '%s attached %d file(s) of %s: %s',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($object_phid),
             count($added),
             $this->renderHandleList($added));
         } else if ($removed && !$added) {
           return pht(
             '%s detached %d file(s) of %s: %s',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($object_phid),
             count($removed),
             $this->renderHandleList($removed));
         } else {
           return pht(
             '%s changed file(s) for %s, attached %d: %s; detached %d: %s',
             $this->renderHandleLink($author_phid),
             $this->renderHandleLink($object_phid),
             count($added),
             $this->renderHandleList($added),
             count($removed),
             $this->renderHandleList($removed));
         }
 
       case self::TYPE_PROJECT_COLUMN:
         $project_phid = $new['projectPHID'];
         $column_phid = head($new['columnPHIDs']);
         return pht(
           '%s moved %s to %s on the %s workboard.',
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($object_phid),
           $this->renderHandleLink($column_phid),
           $this->renderHandleLink($project_phid));
 
       case self::TYPE_MERGED_INTO:
         return pht(
           '%s merged task %s into %s.',
           $this->renderHandleLink($author_phid),
           $this->renderHandleLink($object_phid),
           $this->renderHandleLink($new));
 
       case self::TYPE_MERGED_FROM:
         return pht(
-          '%s merged %d task(s) %s into %s.',
+          '%s merged %s task(s) %s into %s.',
           $this->renderHandleLink($author_phid),
-          count($new),
+          phutil_count($new),
           $this->renderHandleList($new),
           $this->renderHandleLink($object_phid));
 
     }
 
     return parent::getTitleForFeed();
   }
 
   public function hasChangeDetails() {
     switch ($this->getTransactionType()) {
       case self::TYPE_DESCRIPTION:
         return true;
     }
     return parent::hasChangeDetails();
   }
 
   public function renderChangeDetails(PhabricatorUser $viewer) {
     return $this->renderTextCorpusChangeDetails(
       $viewer,
       $this->getOldValue(),
       $this->getNewValue());
   }
 
   public function getMailTags() {
     $tags = array();
     switch ($this->getTransactionType()) {
       case self::TYPE_MERGED_INTO:
       case self::TYPE_STATUS:
         $tags[] = self::MAILTAG_STATUS;
         break;
       case self::TYPE_OWNER:
         $tags[] = self::MAILTAG_OWNER;
         break;
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
         $tags[] = self::MAILTAG_CC;
         break;
       case PhabricatorTransactions::TYPE_EDGE:
         switch ($this->getMetadataValue('edge:type')) {
           case PhabricatorProjectObjectHasProjectEdgeType::EDGECONST:
             $tags[] = self::MAILTAG_PROJECTS;
             break;
           default:
             $tags[] = self::MAILTAG_OTHER;
             break;
         }
         break;
       case self::TYPE_PRIORITY:
         $tags[] = self::MAILTAG_PRIORITY;
         break;
       case self::TYPE_UNBLOCK:
         $tags[] = self::MAILTAG_UNBLOCK;
         break;
       case self::TYPE_PROJECT_COLUMN:
         $tags[] = self::MAILTAG_COLUMN;
         break;
       case PhabricatorTransactions::TYPE_COMMENT:
         $tags[] = self::MAILTAG_COMMENT;
         break;
       default:
         $tags[] = self::MAILTAG_OTHER;
         break;
     }
     return $tags;
   }
 
   public function getNoEffectDescription() {
 
     switch ($this->getTransactionType()) {
       case self::TYPE_STATUS:
         return pht('The task already has the selected status.');
       case self::TYPE_OWNER:
         return pht('The task already has the selected owner.');
       case self::TYPE_PRIORITY:
         return pht('The task already has the selected priority.');
     }
 
     return parent::getNoEffectDescription();
   }
 
 }
diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
index fd529dc35d..346e37977d 100644
--- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
+++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
@@ -1,1494 +1,1494 @@
 <?php
 
 final class PhabricatorUSEnglishTranslation
   extends PhutilTranslation {
 
   public function getLocaleCode() {
     return 'en_US';
   }
 
   protected function getTranslations() {
     return array(
       'No daemon(s) with id(s) "%s" exist!' => array(
         'No daemon with id %s exists!',
         'No daemons with ids %s exist!',
       ),
       'These %d configuration value(s) are related:' => array(
         'This configuration value is related:',
         'These configuration values are related:',
       ),
       '%s Task(s)' => array('Task', 'Tasks'),
 
       '%s ERROR(S)' => array('ERROR', 'ERRORS'),
       '%d Error(s)' => array('%d Error', '%d Errors'),
       '%d Warning(s)' => array('%d Warning', '%d Warnings'),
       '%d Auto-Fix(es)' => array('%d Auto-Fix', '%d Auto-Fixes'),
       '%d Advice(s)' => array('%d Advice', '%d Pieces of Advice'),
       '%d Detail(s)' => array('%d Detail', '%d Details'),
 
       '(%d line(s))' => array('(%d line)', '(%d lines)'),
 
       '%d line(s)' => array('%d line', '%d lines'),
       '%d path(s)' => array('%d path', '%d paths'),
       '%d diff(s)' => array('%d diff', '%d diffs'),
 
       '%s Answer(s)' => array('%s Answer', '%s Answers'),
       'Show %d Comment(s)' => array('Show %d Comment', 'Show %d Comments'),
 
       '%s DIFF LINK(S)' => array('DIFF LINK', 'DIFF LINKS'),
       'You successfully created %d diff(s).' => array(
         'You successfully created %d diff.',
         'You successfully created %d diffs.',
       ),
       'Diff creation failed; see body for %s error(s).' => array(
         'Diff creation failed; see body for error.',
         'Diff creation failed; see body for errors.',
       ),
 
       'There are %d raw fact(s) in storage.' => array(
         'There is %d raw fact in storage.',
         'There are %d raw facts in storage.',
       ),
 
       'There are %d aggregate fact(s) in storage.' => array(
         'There is %d aggregate fact in storage.',
         'There are %d aggregate facts in storage.',
       ),
 
       '%d Commit(s) Awaiting Audit' => array(
         '%d Commit Awaiting Audit',
         '%d Commits Awaiting Audit',
       ),
 
       '%d Problem Commit(s)' => array(
         '%d Problem Commit',
         '%d Problem Commits',
       ),
 
       '%d Review(s) Blocking Others' => array(
         '%d Review Blocking Others',
         '%d Reviews Blocking Others',
       ),
 
       '%d Review(s) Need Attention' => array(
         '%d Review Needs Attention',
         '%d Reviews Need Attention',
       ),
 
       '%d Review(s) Waiting on Others' => array(
         '%d Review Waiting on Others',
         '%d Reviews Waiting on Others',
       ),
 
       '%d Active Review(s)' => array(
         '%d Active Review',
         '%d Active Reviews',
       ),
 
       '%d Flagged Object(s)' => array(
         '%d Flagged Object',
         '%d Flagged Objects',
       ),
 
       '%d Object(s) Tracked' => array(
         '%d Object Tracked',
         '%d Objects Tracked',
       ),
 
       '%d Assigned Task(s)' => array(
         '%d Assigned Task',
         '%d Assigned Tasks',
       ),
 
       'Show %d Lint Message(s)' => array(
         'Show %d Lint Message',
         'Show %d Lint Messages',
       ),
       'Hide %d Lint Message(s)' => array(
         'Hide %d Lint Message',
         'Hide %d Lint Messages',
       ),
 
       'This is a binary file. It is %s byte(s) in length.' => array(
         'This is a binary file. It is %s byte in length.',
         'This is a binary file. It is %s bytes in length.',
       ),
 
       '%s Action(s) Have No Effect' => array(
         'Action Has No Effect',
         'Actions Have No Effect',
       ),
 
       '%s Action(s) With No Effect' => array(
         'Action With No Effect',
         'Actions With No Effect',
       ),
 
       'Some of your %s action(s) have no effect:' => array(
         'One of your actions has no effect:',
         'Some of your actions have no effect:',
       ),
 
       'Apply remaining %d action(s)?' => array(
         'Apply remaining action?',
         'Apply remaining actions?',
       ),
 
       'Apply %d Other Action(s)' => array(
         'Apply Remaining Action',
         'Apply Remaining Actions',
       ),
 
       'The %s action(s) you are taking have no effect:' => array(
         'The action you are taking has no effect:',
         'The actions you are taking have no effect:',
       ),
 
       '%s edited member(s), added %d: %s; removed %d: %s.' =>
         '%s edited members, added: %3$s; removed: %5$s.',
 
       '%s added %s member(s): %s.' => array(
         array(
           '%s added a member: %3$s.',
           '%s added members: %3$s.',
         ),
       ),
 
       '%s removed %s member(s): %s.' => array(
         array(
           '%s removed a member: %3$s.',
           '%s removed members: %3$s.',
         ),
       ),
 
       '%s edited project(s), added %s: %s; removed %s: %s.' =>
         '%s edited projects, added: %3$s; removed: %5$s.',
 
       '%s added %s project(s): %s.' => array(
         array(
           '%s added a project: %3$s.',
           '%s added projects: %3$s.',
         ),
       ),
 
       '%s removed %s project(s): %s.' => array(
         array(
           '%s removed a project: %3$s.',
           '%s removed projects: %3$s.',
         ),
       ),
 
-      '%s merged %d task(s): %s.' => array(
+      '%s merged %s task(s): %s.' => array(
         array(
           '%s merged a task: %3$s.',
           '%s merged tasks: %3$s.',
         ),
       ),
 
-      '%s merged %d task(s) %s into %s.' => array(
+      '%s merged %s task(s) %s into %s.' => array(
         array(
           '%s merged %3$s into %4$s.',
           '%s merged tasks %3$s into %4$s.',
         ),
       ),
 
       '%s added %s voting user(s): %s.' => array(
         array(
           '%s added a voting user: %3$s.',
           '%s added voting users: %3$s.',
         ),
       ),
 
       '%s removed %s voting user(s): %s.' => array(
         array(
           '%s removed a voting user: %3$s.',
           '%s removed voting users: %3$s.',
         ),
       ),
 
       '%s added %s blocking task(s): %s.' => array(
         array(
           '%s added a blocking task: %3$s.',
           '%s added blocking tasks: %3$s.',
         ),
       ),
 
       '%s added %s blocked task(s): %s.' => array(
         array(
           '%s added a blocked task: %3$s.',
           '%s added blocked tasks: %3$s.',
         ),
       ),
 
       '%s removed %s blocking task(s): %s.' => array(
         array(
           '%s removed a blocking task: %3$s.',
           '%s removed blocking tasks: %3$s.',
         ),
       ),
 
       '%s removed %s blocked task(s): %s.' => array(
         array(
           '%s removed a blocked task: %3$s.',
           '%s removed blocked tasks: %3$s.',
         ),
       ),
 
       '%s added %s blocking task(s) for %s: %s.' => array(
         array(
           '%s added a blocking task for %3$s: %4$s.',
           '%s added blocking tasks for %3$s: %4$s.',
         ),
       ),
 
       '%s added %s blocked task(s) for %s: %s.' => array(
         array(
           '%s added a blocked task for %3$s: %4$s.',
           '%s added blocked tasks for %3$s: %4$s.',
         ),
       ),
 
       '%s removed %s blocking task(s) for %s: %s.' => array(
         array(
           '%s removed a blocking task for %3$s: %4$s.',
           '%s removed blocking tasks for %3$s: %4$s.',
         ),
       ),
 
       '%s removed %s blocked task(s) for %s: %s.' => array(
         array(
           '%s removed a blocked task for %3$s: %4$s.',
           '%s removed blocked tasks for %3$s: %4$s.',
         ),
       ),
 
       '%s edited blocking task(s), added %s: %s; removed %s: %s.' =>
         '%s edited blocking tasks, added: %3$s; removed: %5$s.',
 
       '%s edited blocking task(s) for %s, added %s: %s; removed %s: %s.' =>
         '%s edited blocking tasks for %s, added: %4$s; removed: %6$s.',
 
       '%s edited blocked task(s), added %s: %s; removed %s: %s.' =>
         '%s edited blocked tasks, added: %3$s; removed: %5$s.',
 
       '%s edited blocked task(s) for %s, added %s: %s; removed %s: %s.' =>
         '%s edited blocked tasks for %s, added: %4$s; removed: %6$s.',
 
       '%s edited answer(s), added %s: %s; removed %d: %s.' =>
         '%s edited answers, added: %3$s; removed: %5$s.',
 
       '%s added %s answer(s): %s.' => array(
         array(
           '%s added an answer: %3$s.',
           '%s added answers: %3$s.',
         ),
       ),
 
       '%s removed %s answer(s): %s.' => array(
         array(
           '%s removed a answer: %3$s.',
           '%s removed answers: %3$s.',
         ),
       ),
 
      '%s edited question(s), added %s: %s; removed %s: %s.' =>
         '%s edited questions, added: %3$s; removed: %5$s.',
 
       '%s added %s question(s): %s.' => array(
         array(
           '%s added a question: %3$s.',
           '%s added questions: %3$s.',
         ),
       ),
 
       '%s removed %s question(s): %s.' => array(
         array(
           '%s removed a question: %3$s.',
           '%s removed questions: %3$s.',
         ),
       ),
 
       '%s edited mock(s), added %s: %s; removed %s: %s.' =>
         '%s edited mocks, added: %3$s; removed: %5$s.',
 
       '%s added %s mock(s): %s.' => array(
         array(
           '%s added a mock: %3$s.',
           '%s added mocks: %3$s.',
         ),
       ),
 
       '%s removed %s mock(s): %s.' => array(
         array(
           '%s removed a mock: %3$s.',
           '%s removed mocks: %3$s.',
         ),
       ),
 
       '%s added %s task(s): %s.' => array(
         array(
           '%s added a task: %3$s.',
           '%s added tasks: %3$s.',
         ),
       ),
 
       '%s removed %s task(s): %s.' => array(
         array(
           '%s removed a task: %3$s.',
           '%s removed tasks: %3$s.',
         ),
       ),
 
       '%s edited file(s), added %s: %s; removed %s: %s.' =>
         '%s edited files, added: %3$s; removed: %5$s.',
 
       '%s added %s file(s): %s.' => array(
         array(
           '%s added a file: %3$s.',
           '%s added files: %3$s.',
         ),
       ),
 
       '%s removed %s file(s): %s.' => array(
         array(
           '%s removed a file: %3$s.',
           '%s removed files: %3$s.',
         ),
       ),
 
       '%s edited contributor(s), added %s: %s; removed %s: %s.' =>
         '%s edited contributors, added: %3$s; removed: %5$s.',
 
       '%s added %s contributor(s): %s.' => array(
         array(
           '%s added a contributor: %3$s.',
           '%s added contributors: %3$s.',
         ),
       ),
 
       '%s removed %s contributor(s): %s.' => array(
         array(
           '%s removed a contributor: %3$s.',
           '%s removed contributors: %3$s.',
         ),
       ),
 
       '%s edited %s reviewer(s), added %s: %s; removed %s: %s.' =>
         '%s edited reviewers, added: %4$s; removed: %6$s.',
 
       '%s edited %s reviewer(s) for %s, added %s: %s; removed %s: %s.' =>
         '%s edited reviewers for %3$s, added: %5$s; removed: %7$s.',
 
       '%s added %s reviewer(s): %s.' => array(
         array(
           '%s added a reviewer: %3$s.',
           '%s added reviewers: %3$s.',
         ),
       ),
 
       '%s added %s reviewer(s) for %s: %s.' => array(
         array(
           '%s added a reviewer for %3$s: %4$s.',
           '%s added reviewers for %3$s: %4$s.',
         ),
       ),
 
       '%s removed %s reviewer(s): %s.' => array(
         array(
           '%s removed a reviewer: %3$s.',
           '%s removed reviewers: %3$s.',
         ),
       ),
 
       '%s removed %s reviewer(s) for %s: %s.' => array(
         array(
           '%s removed a reviewer for %3$s: %4$s.',
           '%s removed reviewers for %3$s: %4$s.',
         ),
       ),
 
       '%d other(s)' => array(
         '1 other',
         '%d others',
       ),
 
       '%s edited subscriber(s), added %d: %s; removed %d: %s.' =>
         '%s edited subscribers, added: %3$s; removed: %5$s.',
 
       '%s added %d subscriber(s): %s.' => array(
         array(
           '%s added a subscriber: %3$s.',
           '%s added subscribers: %3$s.',
         ),
       ),
 
       '%s removed %d subscriber(s): %s.' => array(
         array(
           '%s removed a subscriber: %3$s.',
           '%s removed subscribers: %3$s.',
         ),
       ),
 
       '%s edited watcher(s), added %s: %s; removed %d: %s.' =>
         '%s edited watchers, added: %3$s; removed: %5$s.',
 
       '%s added %s watcher(s): %s.' => array(
         array(
           '%s added a watcher: %3$s.',
           '%s added watchers: %3$s.',
         ),
       ),
 
       '%s removed %s watcher(s): %s.' => array(
         array(
           '%s removed a watcher: %3$s.',
           '%s removed watchers: %3$s.',
         ),
       ),
 
       '%s edited participant(s), added %d: %s; removed %d: %s.' =>
         '%s edited participants, added: %3$s; removed: %5$s.',
 
       '%s added %d participant(s): %s.' => array(
         array(
           '%s added a participant: %3$s.',
           '%s added participants: %3$s.',
         ),
       ),
 
       '%s removed %d participant(s): %s.' => array(
         array(
           '%s removed a participant: %3$s.',
           '%s removed participants: %3$s.',
         ),
       ),
 
       '%s edited image(s), added %d: %s; removed %d: %s.' =>
         '%s edited images, added: %3$s; removed: %5$s',
 
       '%s added %d image(s): %s.' => array(
         array(
           '%s added an image: %3$s.',
           '%s added images: %3$s.',
         ),
       ),
 
       '%s removed %d image(s): %s.' => array(
         array(
           '%s removed an image: %3$s.',
           '%s removed images: %3$s.',
         ),
       ),
 
       '%s Line(s)' => array(
         '%s Line',
         '%s Lines',
       ),
 
       'Indexing %d object(s) of type %s.' => array(
         'Indexing %d object of type %s.',
         'Indexing %d object of type %s.',
       ),
 
       'Run these %d command(s):' => array(
         'Run this command:',
         'Run these commands:',
       ),
 
       'Install these %d PHP extension(s):' => array(
         'Install this PHP extension:',
         'Install these PHP extensions:',
       ),
 
       'The current Phabricator configuration has these %d value(s):' => array(
         'The current Phabricator configuration has this value:',
         'The current Phabricator configuration has these values:',
       ),
 
       'The current MySQL configuration has these %d value(s):' => array(
         'The current MySQL configuration has this value:',
         'The current MySQL configuration has these values:',
       ),
 
       'You can update these %d value(s) here:' => array(
         'You can update this value here:',
         'You can update these values here:',
       ),
 
       'The current PHP configuration has these %d value(s):' => array(
         'The current PHP configuration has this value:',
         'The current PHP configuration has these values:',
       ),
 
       'To update these %d value(s), edit your PHP configuration file.' => array(
         'To update this %d value, edit your PHP configuration file.',
         'To update these %d values, edit your PHP configuration file.',
       ),
 
       'To update these %d value(s), edit your PHP configuration file, located '.
       'here:' => array(
         'To update this value, edit your PHP configuration file, located '.
         'here:',
         'To update these values, edit your PHP configuration file, located '.
         'here:',
       ),
 
       'PHP also loaded these %s configuration file(s):' => array(
         'PHP also loaded this configuration file:',
         'PHP also loaded these configuration files:',
       ),
 
       'You have %d unresolved setup issue(s)...' => array(
         'You have an unresolved setup issue...',
         'You have %d unresolved setup issues...',
       ),
 
       '%s added %d inline comment(s).' => array(
         array(
           '%s added an inline comment.',
           '%s added inline comments.',
         ),
       ),
 
       '%s comment(s)' => array('%s comment', '%s comments'),
       '%s rejection(s)' => array('%s rejection', '%s rejections'),
       '%s update(s)' => array('%s update', '%s updates'),
 
       'This configuration value is defined in these %d '.
       'configuration source(s): %s.' => array(
         'This configuration value is defined in this '.
         'configuration source: %2$s.',
         'This configuration value is defined in these %d '.
         'configuration sources: %s.',
       ),
 
       '%s Open Pull Request(s)' => array(
         '%s Open Pull Request',
         '%s Open Pull Requests',
       ),
 
       'Stale (%s day(s))' => array(
         'Stale (%s day)',
         'Stale (%s days)',
       ),
 
       'Old (%s day(s))' => array(
         'Old (%s day)',
         'Old (%s days)',
       ),
 
       '%s Commit(s)' => array(
         '%s Commit',
         '%s Commits',
       ),
 
       '%s attached %d file(s): %s.' => array(
         array(
           '%s attached a file: %3$s.',
           '%s attached files: %3$s.',
         ),
       ),
 
       '%s detached %d file(s): %s.' => array(
         array(
           '%s detached a file: %3$s.',
           '%s detached files: %3$s.',
         ),
       ),
 
       '%s changed file(s), attached %d: %s; detached %d: %s.' =>
         '%s changed files, attached: %3$s; detached: %5$s.',
 
 
       '%s added %s dependencie(s): %s.' => array(
         array(
           '%s added a dependency: %3$s.',
           '%s added dependencies: %3$s.',
         ),
       ),
 
       '%s added %s dependencie(s) for %s: %s.' => array(
         array(
           '%s added a dependency for %3$s: %4$s.',
           '%s added dependencies for %3$s: %4$s.',
         ),
       ),
 
       '%s removed %s dependencie(s): %s.' => array(
         array(
           '%s removed a dependency: %3$s.',
           '%s removed dependencies: %3$s.',
         ),
       ),
 
       '%s removed %s dependencie(s) for %s: %s.' => array(
         array(
           '%s removed a dependency for %3$s: %4$s.',
           '%s removed dependencies for %3$s: %4$s.',
         ),
       ),
 
       '%s edited dependencie(s), added %s: %s; removed %s: %s.' => array(
         '%s edited dependencies, added: %3$s; removed: %5$s.',
       ),
 
       '%s edited dependencie(s) for %s, added %s: %s; removed %s: %s.' => array(
         '%s edited dependencies for %s, added: %3$s; removed: %5$s.',
       ),
 
       '%s added %s dependent revision(s): %s.' => array(
         array(
           '%s added a dependent revision: %3$s.',
           '%s added dependent revisions: %3$s.',
         ),
       ),
 
       '%s added %s dependent revision(s) for %s: %s.' => array(
         array(
           '%s added a dependent revision for %3$s: %4$s.',
           '%s added dependent revisions for %3$s: %4$s.',
         ),
       ),
 
       '%s removed %s dependent revision(s): %s.' => array(
         array(
           '%s removed a dependent revision: %3$s.',
           '%s removed dependent revisions: %3$s.',
         ),
       ),
 
       '%s removed %s dependent revision(s) for %s: %s.' => array(
         array(
           '%s removed a dependent revision for %3$s: %4$s.',
           '%s removed dependent revisions for %3$s: %4$s.',
         ),
       ),
 
       '%s added %s commit(s): %s.' => array(
         array(
           '%s added a commit: %3$s.',
           '%s added commits: %3$s.',
         ),
       ),
 
       '%s removed %s commit(s): %s.' => array(
         array(
           '%s removed a commit: %3$s.',
           '%s removed commits: %3$s.',
         ),
       ),
 
       '%s edited commit(s), added %s: %s; removed %s: %s.' =>
         '%s edited commits, added %3$s; removed %5$s.',
 
       '%s added %s reverted commit(s): %s.' => array(
         array(
           '%s added a reverted commit: %3$s.',
           '%s added reverted commits: %3$s.',
         ),
       ),
 
       '%s removed %s reverted commit(s): %s.' => array(
         array(
           '%s removed a reverted commit: %3$s.',
           '%s removed reverted commits: %3$s.',
         ),
       ),
 
       '%s edited reverted commit(s), added %s: %s; removed %s: %s.' =>
         '%s edited reverted commits, added %3$s; removed %5$s.',
 
       '%s added %s reverted commit(s) for %s: %s.' => array(
         array(
           '%s added a reverted commit for %3$s: %4$s.',
           '%s added reverted commits for %3$s: %4$s.',
         ),
       ),
 
       '%s removed %s reverted commit(s) for %s: %s.' => array(
         array(
           '%s removed a reverted commit for %3$s: %4$s.',
           '%s removed reverted commits for %3$s: %4$s.',
         ),
       ),
 
       '%s edited reverted commit(s) for %s, added %s: %s; removed %s: %s.' =>
         '%s edited reverted commits for %2$s, added %4$s; removed %6$s.',
 
       '%s added %s reverting commit(s): %s.' => array(
         array(
           '%s added a reverting commit: %3$s.',
           '%s added reverting commits: %3$s.',
         ),
       ),
 
       '%s removed %s reverting commit(s): %s.' => array(
         array(
           '%s removed a reverting commit: %3$s.',
           '%s removed reverting commits: %3$s.',
         ),
       ),
 
       '%s edited reverting commit(s), added %s: %s; removed %s: %s.' =>
         '%s edited reverting commits, added %3$s; removed %5$s.',
 
       '%s added %s reverting commit(s) for %s: %s.' => array(
         array(
           '%s added a reverting commit for %3$s: %4$s.',
           '%s added reverting commitsi for %3$s: %4$s.',
         ),
       ),
 
       '%s removed %s reverting commit(s) for %s: %s.' => array(
         array(
           '%s removed a reverting commit for %3$s: %4$s.',
           '%s removed reverting commits for %3$s: %4$s.',
         ),
       ),
 
       '%s edited reverting commit(s) for %s, added %s: %s; removed %s: %s.' =>
         '%s edited reverting commits for %s, added %4$s; removed %6$s.',
 
       '%s changed project member(s), added %d: %s; removed %d: %s.' =>
         '%s changed project members, added %3$s; removed %5$s.',
 
       '%s added %d project member(s): %s.' => array(
         array(
           '%s added a member: %3$s.',
           '%s added members: %3$s.',
         ),
       ),
 
       '%s removed %d project member(s): %s.' => array(
         array(
           '%s removed a member: %3$s.',
           '%s removed members: %3$s.',
         ),
       ),
 
       '%d project hashtag(s) are already used: %s.' => array(
           'Project hashtag %2$s is already used.',
           '%d project hashtags are already used: %2$s.',
       ),
 
       '%s changed project hashtag(s), added %d: %s; removed %d: %s.' =>
         '%s changed project hashtags, added %3$s; removed %5$s.',
 
       '%s added %d project hashtag(s): %s.' => array(
         array(
           '%s added a hashtag: %3$s.',
           '%s added hashtags: %3$s.',
         ),
       ),
 
       '%s removed %d project hashtag(s): %s.' => array(
         array(
           '%s removed a hashtag: %3$s.',
           '%s removed hashtags: %3$s.',
         ),
       ),
 
       '%s changed %s hashtag(s), added %d: %s; removed %d: %s.' =>
         '%s changed hashtags for %s, added %4$s; removed %6$s.',
 
       '%s added %d %s hashtag(s): %s.' => array(
         array(
           '%s added a hashtag to %3$s: %4$s.',
           '%s added hashtags to %3$s: %4$s.',
         ),
       ),
 
       '%s removed %d %s hashtag(s): %s.' => array(
         array(
           '%s removed a hashtag from %3$s: %4$s.',
           '%s removed hashtags from %3$s: %4$s.',
         ),
       ),
 
       '%d User(s) Need Approval' => array(
         '%d User Needs Approval',
         '%d Users Need Approval',
       ),
 
       '%s older changes(s) are hidden.' => array(
         '%d older change is hidden.',
         '%d older changes are hidden.',
       ),
 
       '%s, %s line(s)' => array(
         array(
           '%s, %s line',
           '%s, %s lines',
         ),
       ),
 
       '%s pushed %d commit(s) to %s.' => array(
         array(
           '%s pushed a commit to %3$s.',
           '%s pushed %d commits to %s.',
         ),
       ),
 
       '%s commit(s)' => array(
         '1 commit',
         '%s commits',
       ),
 
       '%s removed %s JIRA issue(s): %s.' => array(
         array(
           '%s removed a JIRA issue: %3$s.',
           '%s removed JIRA issues: %3$s.',
         ),
       ),
 
       '%s added %s JIRA issue(s): %s.' => array(
         array(
           '%s added a JIRA issue: %3$s.',
           '%s added JIRA issues: %3$s.',
         ),
       ),
 
       '%s added %s required legal document(s): %s.' => array(
         array(
           '%s added a required legal document: %3$s.',
           '%s added required legal documents: %3$s.',
         ),
       ),
 
       '%s updated JIRA issue(s): added %s %s; removed %d %s.' =>
         '%s updated JIRA issues: added %3$s; removed %5$s.',
 
       '%s edited %s task(s), added %s: %s; removed %s: %s.' =>
         '%s edited tasks, added %4$s; removed %6$s.',
 
       '%s added %s task(s) to %s: %s.' => array(
         array(
           '%s added a task to %3$s: %4$s.',
           '%s added tasks to %3$s: %4$s.',
         ),
       ),
 
       '%s removed %s task(s) from %s: %s.' => array(
         array(
           '%s removed a task from %3$s: %4$s.',
           '%s removed tasks from %3$s: %4$s.',
         ),
       ),
 
       '%s edited %s task(s) for %s, added %s: %s; removed %s: %s.' =>
         '%s edited tasks for %3$s, added: %5$s; removed %7$s.',
 
       '%s edited %s commit(s), added %s: %s; removed %s: %s.' =>
         '%s edited commits, added %4$s; removed %6$s.',
 
       '%s added %s commit(s) to %s: %s.' => array(
         array(
           '%s added a commit to %3$s: %4$s.',
           '%s added commits to %3$s: %4$s.',
         ),
       ),
 
       '%s removed %s commit(s) from %s: %s.' => array(
         array(
           '%s removed a commit from %3$s: %4$s.',
           '%s removed commits from %3$s: %4$s.',
         ),
       ),
 
       '%s edited %s commit(s) for %s, added %s: %s; removed %s: %s.' =>
         '%s edited commits for %3$s, added: %5$s; removed %7$s.',
 
       '%s added %s revision(s): %s.' => array(
         array(
           '%s added a revision: %3$s.',
           '%s added revisions: %3$s.',
         ),
       ),
 
       '%s removed %s revision(s): %s.' => array(
         array(
           '%s removed a revision: %3$s.',
           '%s removed revisions: %3$s.',
         ),
       ),
 
       '%s edited %s revision(s), added %s: %s; removed %s: %s.' =>
         '%s edited revisions, added %4$s; removed %6$s.',
 
       '%s added %s revision(s) to %s: %s.' => array(
         array(
           '%s added a revision to %3$s: %4$s.',
           '%s added revisions to %3$s: %4$s.',
         ),
       ),
 
       '%s removed %s revision(s) from %s: %s.' => array(
         array(
           '%s removed a revision from %3$s: %4$s.',
           '%s removed revisions from %3$s: %4$s.',
         ),
       ),
 
       '%s edited %s revision(s) for %s, added %s: %s; removed %s: %s.' =>
         '%s edited revisions for %3$s, added: %5$s; removed %7$s.',
 
       '%s edited %s project(s), added %s: %s; removed %s: %s.' =>
         '%s edited projects, added %4$s; removed %6$s.',
 
       '%s added %s project(s) to %s: %s.' => array(
         array(
           '%s added a project to %3$s: %4$s.',
           '%s added projects to %3$s: %4$s.',
         ),
       ),
 
       '%s removed %s project(s) from %s: %s.' => array(
         array(
           '%s removed a project from %3$s: %4$s.',
           '%s removed projects from %3$s: %4$s.',
         ),
       ),
 
       '%s edited %s project(s) for %s, added %s: %s; removed %s: %s.' =>
         '%s edited projects for %3$s, added: %5$s; removed %7$s.',
 
       '%s added %s panel(s): %s.' => array(
         array(
           '%s added a panel: %3$s.',
           '%s added panels: %3$s.',
         ),
       ),
 
       '%s removed %s panel(s): %s.' => array(
         array(
           '%s removed a panel: %3$s.',
           '%s removed panels: %3$s.',
         ),
       ),
 
       '%s edited %s panel(s), added %s: %s; removed %s: %s.' =>
         '%s edited panels, added %4$s; removed %6$s.',
 
       '%s added %s dashboard(s): %s.' => array(
         array(
           '%s added a dashboard: %3$s.',
           '%s added dashboards: %3$s.',
         ),
       ),
 
       '%s removed %s dashboard(s): %s.' => array(
         array(
           '%s removed a dashboard: %3$s.',
           '%s removed dashboards: %3$s.',
         ),
       ),
 
       '%s edited %s dashboard(s), added %s: %s; removed %s: %s.' =>
         '%s edited dashboards, added %4$s; removed %6$s.',
 
       '%s added %s edge(s): %s.' => array(
         array(
           '%s added an edge: %3$s.',
           '%s added edges: %3$s.',
         ),
       ),
 
       '%s added %s edge(s) to %s: %s.' => array(
         array(
           '%s added an edge to %3$s: %4$s.',
           '%s added edges to %3$s: %4$s.',
         ),
       ),
 
       '%s removed %s edge(s): %s.' => array(
         array(
           '%s removed an edge: %3$s.',
           '%s removed edges: %3$s.',
         ),
       ),
 
       '%s removed %s edge(s) from %s: %s.' => array(
         array(
           '%s removed an edge from %3$s: %4$s.',
           '%s removed edges from %3$s: %4$s.',
         ),
       ),
 
       '%s edited edge(s), added %s: %s; removed %s: %s.' =>
         '%s edited edges, added: %3$s; removed: %5$s.',
 
       '%s edited %s edge(s) for %s, added %s: %s; removed %s: %s.' =>
         '%s edited edges for %3$s, added: %5$s; removed %7$s.',
 
       '%s added %s member(s) for %s: %s.' => array(
         array(
           '%s added a member for %3$s: %4$s.',
           '%s added members for %3$s: %4$s.',
         ),
       ),
 
       '%s removed %s member(s) for %s: %s.' => array(
         array(
           '%s removed a member for %3$s: %4$s.',
           '%s removed members for %3$s: %4$s.',
         ),
       ),
 
       '%s edited %s member(s) for %s, added %s: %s; removed %s: %s.' =>
         '%s edited members for %3$s, added: %5$s; removed %7$s.',
 
       '%d related link(s):' => array(
         'Related link:',
         'Related links:',
       ),
 
       'You have %d unpaid invoice(s).' => array(
         'You have an unpaid invoice.',
         'You have unpaid invoices.',
       ),
 
       'The configurations differ in the following %s way(s):' => array(
         'The configurations differ:',
         'The configurations differ in these ways:',
       ),
 
       'Phabricator is configured with an email domain whitelist (in %s), so '.
       'only users with a verified email address at one of these %s '.
       'allowed domain(s) will be able to register an account: %s' => array(
         array(
           'Phabricator is configured with an email domain whitelist (in %s), '.
           'so only users with a verified email address at %3$s will be '.
           'allowed to register an account.',
           'Phabricator is configured with an email domain whitelist (in %s), '.
           'so only users with a verified email address at one of these '.
           'allowed domains will be able to register an account: %3$s',
         ),
       ),
 
       'Show First %d Line(s)' => array(
         'Show First Line',
         'Show First %d Lines',
       ),
 
       "\xE2\x96\xB2 Show %d Line(s)" => array(
         "\xE2\x96\xB2 Show Line",
         "\xE2\x96\xB2 Show %d Lines",
       ),
 
       'Show All %d Line(s)' => array(
         'Show Line',
         'Show All %d Lines',
       ),
 
       "\xE2\x96\xBC Show %d Line(s)" => array(
         "\xE2\x96\xBC Show Line",
         "\xE2\x96\xBC Show %d Lines",
       ),
 
       'Show Last %d Line(s)' => array(
         'Show Last Line',
         'Show Last %d Lines',
       ),
 
       '%s marked %s inline comment(s) as done and %s inline comment(s) as '.
       'not done.' => array(
         array(
           array(
             '%s marked an inline comment as done and an inline comment '.
             'as not done.',
             '%s marked an inline comment as done and %3$s inline comments '.
             'as not done.',
           ),
           array(
             '%s marked %s inline comments as done and an inline comment '.
             'as not done.',
             '%s marked %s inline comments as done and %s inline comments '.
             'as done.',
           ),
         ),
       ),
 
       '%s marked %s inline comment(s) as done.' => array(
         array(
           '%s marked an inline comment as done.',
           '%s marked %s inline comments as done.',
         ),
       ),
 
       '%s marked %s inline comment(s) as not done.' => array(
         array(
           '%s marked an inline comment as not done.',
           '%s marked %s inline comments as not done.',
         ),
       ),
 
       'These %s object(s) will be destroyed forever:' => array(
         'This object will be destroyed forever:',
         'These objects will be destroyed forever:',
       ),
 
       'Are you absolutely certain you want to destroy these %s '.
       'object(s)?' => array(
         'Are you absolutely certain you want to destroy this object?',
         'Are you absolutely certain you want to destroy these objects?',
       ),
 
       '%s added %s owner(s): %s.' => array(
         array(
           '%s added an owner: %3$s.',
           '%s added owners: %3$s.',
         ),
       ),
 
       '%s removed %s owner(s): %s.' => array(
         array(
           '%s removed an owner: %3$s.',
           '%s removed owners: %3$s.',
         ),
       ),
 
       '%s changed %s package owner(s), added %s: %s; removed %s: %s.' => array(
         '%s changed package owners, added: %4$s; removed: %6$s.',
       ),
 
       'Found %s book(s).' => array(
         'Found %s book.',
         'Found %s books.',
       ),
       'Found %s file(s)...' => array(
         'Found %s file...',
         'Found %s files...',
       ),
       'Found %s file(s) in project.' => array(
         'Found %s file in project.',
         'Found %s files in project.',
       ),
       'Found %s unatomized, uncached file(s).' => array(
         'Found %s unatomized, uncached file.',
         'Found %s unatomized, uncached files.',
       ),
       'Found %s file(s) to atomize.' => array(
         'Found %s file to atomize.',
         'Found %s files to atomize.',
       ),
       'Atomizing %s file(s).' => array(
         'Atomizing %s file.',
         'Atomizing %s files.',
       ),
       'Creating %s document(s).' => array(
         'Creating %s document.',
         'Creating %s documents.',
       ),
       'Deleting %s document(s).' => array(
         'Deleting %s document.',
         'Deleting %s documents.',
       ),
       'Found %s obsolete atom(s) in graph.' => array(
         'Found %s obsolete atom in graph.',
         'Found %s obsolete atoms in graph.',
       ),
       'Found %s new atom(s) in graph.' => array(
         'Found %s new atom in graph.',
         'Found %s new atoms in graph.',
       ),
       'This call takes %s parameter(s), but only %s are documented.' => array(
         array(
           'This call takes %s parameter, but only %s is documented.',
           'This call takes %s parameter, but only %s are documented.',
         ),
         array(
           'This call takes %s parameters, but only %s is documented.',
           'This call takes %s parameters, but only %s are documented.',
         ),
       ),
 
       '%s Passed Test(s)' => '%s Passed',
       '%s Failed Test(s)' => '%s Failed',
       '%s Skipped Test(s)' => '%s Skipped',
       '%s Broken Test(s)' => '%s Broken',
       '%s Unsound Test(s)' => '%s Unsound',
       '%s Other Test(s)' => '%s Other',
 
       '%s Bulk Task(s)' => array(
         '%s Task',
         '%s Tasks',
       ),
 
       '%s added %s badge(s) for %s: %s.' => array(
         array(
           '%s added a badge for %s: %3$s.',
           '%s added badges for %s: %3$s.',
         ),
       ),
       '%s added %s badge(s): %s.' => array(
         array(
           '%s added a badge: %3$s.',
           '%s added badges: %3$s.',
         ),
       ),
       '%s awarded %s recipient(s) for %s: %s.' => array(
         array(
           '%s awarded %3$s to %4$s.',
           '%s awarded %3$s to multiple recipients: %4$s.',
         ),
       ),
       '%s awarded %s recipients(s): %s.' => array(
         array(
           '%s awarded a recipient: %3$s.',
           '%s awarded multiple recipients: %3$s.',
         ),
       ),
       '%s edited badge(s) for %s, added %s: %s; revoked %s: %s.' => array(
         array(
           '%s edited badges for %s, added %s: %s; revoked %s: %s.',
           '%s edited badges for %s, added %s: %s; revoked %s: %s.',
         ),
       ),
       '%s edited badge(s), added %s: %s; revoked %s: %s.' => array(
         array(
           '%s edited badges, added %s: %s; revoked %s: %s.',
           '%s edited badges, added %s: %s; revoked %s: %s.',
         ),
       ),
       '%s edited recipient(s) for %s, awarded %s: %s; revoked %s: %s.' => array(
         array(
           '%s edited recipients for %s, awarded %s: %s; revoked %s: %s.',
           '%s edited recipients for %s, awarded %s: %s; revoked %s: %s.',
         ),
       ),
       '%s edited recipient(s), awarded %s: %s; revoked %s: %s.' => array(
         array(
           '%s edited recipients, awarded %s: %s; revoked %s: %s.',
           '%s edited recipients, awarded %s: %s; revoked %s: %s.',
         ),
       ),
       '%s revoked %s badge(s) for %s: %s.' => array(
         array(
           '%s revoked a badge for %3$s: %4$s.',
           '%s revoked multiple badges for %3$s: %4$s.',
         ),
       ),
       '%s revoked %s badge(s): %s.' => array(
         array(
           '%s revoked a badge: %3$s.',
           '%s revoked multiple badges: %3$s.',
         ),
       ),
       '%s revoked %s recipient(s) for %s: %s.' => array(
         array(
           '%s revoked %3$s from %4$s.',
           '%s revoked multiple recipients for %3$s: %4$s.',
         ),
       ),
 
       '%s revoked %s recipients(s): %s.' => array(
         array(
           '%s revoked a recipient: %3$s.',
           '%s revoked multiple recipients: %3$s.',
         ),
       ),
 
       '%s automatically subscribed target(s) were not affected: %s.' => array(
         'An automatically subscribed target was not affected: %2$s.',
         'Automatically subscribed targets were not affected: %2$s.',
       ),
 
       'Declined to resubscribe %s target(s) because they previously '.
       'unsubscribed: %s.' => array(
         'Delined to resubscribe a target because they previously '.
         'unsubscribed: %2$s.',
         'Declined to resubscribe targets because they previously '.
         'unsubscribed: %2$s.',
       ),
 
       '%s target(s) are not subscribed: %s.' => array(
         'A target is not subscribed: %2$s.',
         'Targets are not subscribed: %2$s.',
       ),
 
       '%s target(s) are already subscribed: %s.' => array(
         'A target is already subscribed: %2$s.',
         'Targets are already subscribed: %2$s.',
       ),
 
       'Added %s subscriber(s): %s.' => array(
         'Added a subscriber: %2$s.',
         'Added subscribers: %2$s.',
       ),
 
       'Removed %s subscriber(s): %s.' => array(
         'Removed a subscriber: %2$s.',
         'Removed subscribers: %2$s.',
       ),
 
       'Queued email to be delivered to %s target(s): %s.' => array(
         'Queued email to be delivered to target: %2$s.',
         'Queued email to be delivered to targets: %2$s.',
       ),
 
       'Queued email to be delivered to %s target(s), ignoring their '.
       'notification preferences: %s.' => array(
         'Queued email to be delivered to target, ignoring notification '.
         'preferences: %2$s.',
         'Queued email to be delivered to targets, ignoring notification '.
         'preferences: %2$s.',
       ),
 
       '%s project(s) are not associated: %s.' => array(
         'A project is not associated: %2$s.',
         'Projects are not associated: %2$s.',
       ),
 
       '%s project(s) are already associated: %s.' => array(
         'A project is already associated: %2$s.',
         'Projects are already associated: %2$s.',
       ),
 
       'Added %s project(s): %s.' => array(
         'Added a project: %2$s.',
         'Added projects: %2$s.',
       ),
 
       'Removed %s project(s): %s.' => array(
         'Removed a project: %2$s.',
         'Removed projects: %2$s.',
       ),
 
       'Added %s reviewer(s): %s.' => array(
         'Added a reviewer: %2$s.',
         'Added reviewers: %2$s.',
       ),
 
       'Added %s blocking reviewer(s): %s.' => array(
         'Added a blocking reviewer: %2$s.',
         'Added blocking reviewers: %2$s.',
       ),
 
       'Required %s signature(s): %s.' => array(
         'Required a signature: %2$s.',
         'Required signatures: %2$s.',
       ),
 
       'Started %s build(s): %s.' => array(
         'Started a build: %2$s.',
         'Started builds: %2$s.',
       ),
 
       'Added %s auditor(s): %s.' => array(
         'Added an auditor: %2$s.',
         'Added auditors: %2$s.',
       ),
 
       '%s target(s) do not have permission to see this object: %s.' => array(
         'A target does not have permission to see this object: %2$s.',
         'Targets do not have permission to see this object: %2$s.',
       ),
 
       'This action has no effect on %s target(s): %s.' => array(
         'This action has no effect on a target: %2$s.',
         'This action has no effect on targets: %2$s.',
       ),
 
       'Mail sent in the last %s day(s).' => array(
         'Mail sent in the last day.',
         'Mail sent in the last %s days.',
       ),
 
       '%s Day(s)' => array(
         '%s Day',
         '%s Days',
       ),
       '%s Day(s) Ago' => array(
         '%s Day Ago',
         '%s Days Ago',
       ),
 
       'Setting retention policy for "%s" to %s day(s).' => array(
         'Setting retention policy for "%s" to one day.',
         'Setting retention policy for "%s" to %s days.',
       ),
 
       'Waiting %s second(s) for lease to activate.' => array(
         'Waiting a second for lease to activate.',
         'Waiting %s seconds for lease to activate.',
       ),
 
       '%s changed %s automation blueprint(s), added %s: %s; removed %s: %s.' =>
         '%s changed automation blueprints, added: %4$s; removed: %6$s.',
 
       '%s added %s automation blueprint(s): %s.' => array(
         array(
           '%s added an automation blueprint: %3$s.',
           '%s added automation blueprints: %3$s.',
         ),
       ),
 
       '%s removed %s automation blueprint(s): %s.' => array(
         array(
           '%s removed an automation blueprint: %3$s.',
           '%s removed automation blueprints: %3$s.',
         ),
       ),
 
       'WARNING: There are %s unapproved authorization(s)!' => array(
         'WARNING: There is an unapproved authorization!',
         'WARNING: There are unapproved authorizations!',
       ),
 
       'Found %s Open Resource(s)' => array(
         'Found %s Open Resource',
         'Found %s Open Resources',
       ),
 
       '%s Open Resource(s) Remain' => array(
         '%s Open Resource Remain',
         '%s Open Resources Remain',
       ),
 
       'Found %s Blueprint(s)' => array(
         'Found %s Blueprint',
         'Found %s Blueprints',
       ),
 
       '%s Blueprint(s) Can Allocate' => array(
         '%s Blueprint Can Allocate',
         '%s Blueprints Can Allocate',
       ),
 
       '%s Blueprint(s) Enabled' => array(
         '%s Blueprint Enabled',
         '%s Blueprints Enabled',
       ),
 
       '%s Event(s)' => array(
         '%s Event',
         '%s Events',
       ),
 
       '%s Unit(s)' => array(
         '%s Unit',
         '%s Units',
       ),
 
       'QUEUEING TASKS (%s Commit(s)):' => array(
         'QUEUEING TASKS (%s Commit):',
         'QUEUEING TASKS (%s Commits):',
       ),
 
       'Found %s total commit(s); updating...' => array(
         'Found %s total commit; updating...',
         'Found %s total commits; updating...',
       ),
 
       'Not enough process slots to schedule the other %s '.
       'repository(s) for updates yet.' => array(
         'Not enough process slots to schedule the other '.'
         repository for update yet.',
         'Not enough process slots to schedule the other %s '.
         'repositories for updates yet.',
       ),
 
     );
   }
 
 }