No OneTemporary
Actions

Size

82 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	index c75f4d0673..9bb4ad7604 100644
	--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	@@ -1,702 +1,702 @@
	<?php

	final class ManiphestTaskDetailController extends ManiphestController {

	private $id;

	public function shouldAllowPublic() {
	return true;
	}

	public function willProcessRequest(array $data) {
	$this->id = $data['id'];
	}

	public function processRequest() {

	$request = $this->getRequest();
	$user = $request->getUser();

	$e_title = null;

	$priority_map = ManiphestTaskPriority::getTaskPriorityMap();

	$task = id(new ManiphestTaskQuery())
	->setViewer($user)
	->withIDs(array($this->id))
	->executeOne();
	if (!$task) {
	return new Aphront404Response();
	}

	$workflow = $request->getStr('workflow');
	$parent_task = null;
	if ($workflow && is_numeric($workflow)) {
	$parent_task = id(new ManiphestTaskQuery())
	->setViewer($user)
	->withIDs(array($workflow))
	->executeOne();
	}

	$transactions = id(new ManiphestTransactionQuery())
	->setViewer($user)
	->withObjectPHIDs(array($task->getPHID()))
	->needComments(true)
	->execute();

	$field_list = PhabricatorCustomField::getObjectFields(
	$task,
	PhabricatorCustomField::ROLE_VIEW);
	$field_list
	->setViewer($user)
	->readFieldsFromStorage($task);

	$e_commit = PhabricatorEdgeConfig::TYPE_TASK_HAS_COMMIT;
	$e_dep_on = PhabricatorEdgeConfig::TYPE_TASK_DEPENDS_ON_TASK;
	$e_dep_by = PhabricatorEdgeConfig::TYPE_TASK_DEPENDED_ON_BY_TASK;
	$e_rev = PhabricatorEdgeConfig::TYPE_TASK_HAS_RELATED_DREV;
	$e_mock = PhabricatorEdgeConfig::TYPE_TASK_HAS_MOCK;

	$phid = $task->getPHID();

	$query = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs(array($phid))
	->withEdgeTypes(
	array(
	$e_commit,
	$e_dep_on,
	$e_dep_by,
	$e_rev,
	$e_mock,
	));
	$edges = idx($query->execute(), $phid);
	$phids = array_fill_keys($query->getDestinationPHIDs(), true);

	foreach ($task->getCCPHIDs() as $phid) {
	$phids[$phid] = true;
	}
	foreach ($task->getProjectPHIDs() as $phid) {
	$phids[$phid] = true;
	}
	if ($task->getOwnerPHID()) {
	$phids[$task->getOwnerPHID()] = true;
	}
	$phids[$task->getAuthorPHID()] = true;

	$attached = $task->getAttached();
	foreach ($attached as $type => $list) {
	foreach ($list as $phid => $info) {
	$phids[$phid] = true;
	}
	}

	if ($parent_task) {
	$phids[$parent_task->getPHID()] = true;
	}

	$phids = array_keys($phids);

	$this->loadHandles($phids);

	$handles = $this->getLoadedHandles();

	$context_bar = null;

	if ($parent_task) {
	$context_bar = new AphrontContextBarView();
	$context_bar->addButton(phutil_tag(
	'a',
	array(
	'href' => '/maniphest/task/create/?parent='.$parent_task->getID(),
	'class' => 'green button',
	),
	pht('Create Another Subtask')));
	$context_bar->appendChild(hsprintf(
	'Created a subtask of <strong>%s</strong>',
	$this->getHandle($parent_task->getPHID())->renderLink()));
	} else if ($workflow == 'create') {
	$context_bar = new AphrontContextBarView();
	$context_bar->addButton(phutil_tag('label', array(), 'Create Another'));
	$context_bar->addButton(phutil_tag(
	'a',
	array(
	'href' => '/maniphest/task/create/?template='.$task->getID(),
	'class' => 'green button',
	),
	pht('Similar Task')));
	$context_bar->addButton(phutil_tag(
	'a',
	array(
	'href' => '/maniphest/task/create/',
	'class' => 'green button',
	),
	pht('Empty Task')));
	$context_bar->appendChild(pht('New task created.'));
	}

	$engine = new PhabricatorMarkupEngine();
	$engine->setViewer($user);
	$engine->addObject($task, ManiphestTask::MARKUP_FIELD_DESCRIPTION);
	foreach ($transactions as $modern_xaction) {
	if ($modern_xaction->getComment()) {
	$engine->addObject(
	$modern_xaction->getComment(),
	PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
	}
	}

	$engine->process();

	$resolution_types = ManiphestTaskStatus::getTaskStatusMap();

	$transaction_types = array(
	PhabricatorTransactions::TYPE_COMMENT => pht('Comment'),
	ManiphestTransaction::TYPE_STATUS => pht('Change Status'),
	ManiphestTransaction::TYPE_OWNER => pht('Reassign / Claim'),
	ManiphestTransaction::TYPE_CCS => pht('Add CCs'),
	ManiphestTransaction::TYPE_PRIORITY => pht('Change Priority'),
	ManiphestTransaction::TYPE_PROJECTS => pht('Associate Projects'),
	);

	// Remove actions the user doesn't have permission to take.

	$requires = array(
	ManiphestTransaction::TYPE_OWNER =>
	ManiphestCapabilityEditAssign::CAPABILITY,
	ManiphestTransaction::TYPE_PRIORITY =>
	ManiphestCapabilityEditPriority::CAPABILITY,
	ManiphestTransaction::TYPE_PROJECTS =>
	ManiphestCapabilityEditProjects::CAPABILITY,
	ManiphestTransaction::TYPE_STATUS =>
	ManiphestCapabilityEditStatus::CAPABILITY,
	);

	foreach ($transaction_types as $type => $name) {
	if (isset($requires[$type])) {
	if (!$this->hasApplicationCapability($requires[$type])) {
	unset($transaction_types[$type]);
	}
	}
	}

	// Don't show an option to change to the current status, or to change to
	// the duplicate status explicitly.
	unset($resolution_types[$task->getStatus()]);
	unset($resolution_types[ManiphestTaskStatus::getDuplicateStatus()]);

	// Don't show owner/priority changes for closed tasks, as they don't make
	// much sense.
	if ($task->isClosed()) {
	unset($transaction_types[ManiphestTransaction::TYPE_PRIORITY]);
	unset($transaction_types[ManiphestTransaction::TYPE_OWNER]);
	}

	$default_claim = array(
	$user->getPHID() => $user->getUsername().' ('.$user->getRealName().')',
	);

	$draft = id(new PhabricatorDraft())->loadOneWhere(
	'authorPHID = %s AND draftKey = %s',
	$user->getPHID(),
	$task->getPHID());
	if ($draft) {
	$draft_text = $draft->getDraft();
	} else {
	$draft_text = null;
	}

	$comment_form = new AphrontFormView();
	$comment_form
	->setUser($user)
	->setWorkflow(true)
	->setAction('/maniphest/transaction/save/')
	->setEncType('multipart/form-data')
	->addHiddenInput('taskID', $task->getID())
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Action'))
	->setName('action')
	->setOptions($transaction_types)
	->setID('transaction-action'))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Status'))
	->setName('resolution')
	->setControlID('resolution')
	->setControlStyle('display: none')
	->setOptions($resolution_types))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Assign To'))
	->setName('assign_to')
	->setControlID('assign_to')
	->setControlStyle('display: none')
	->setID('assign-tokenizer')
	->setDisableBehavior(true))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('CCs'))
	->setName('ccs')
	->setControlID('ccs')
	->setControlStyle('display: none')
	->setID('cc-tokenizer')
	->setDisableBehavior(true))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Priority'))
	->setName('priority')
	->setOptions($priority_map)
	->setControlID('priority')
	->setControlStyle('display: none')
	->setValue($task->getPriority()))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Projects'))
	->setName('projects')
	->setControlID('projects')
	->setControlStyle('display: none')
	->setID('projects-tokenizer')
	->setDisableBehavior(true))
	->appendChild(
	id(new AphrontFormFileControl())
	->setLabel(pht('File'))
	->setName('file')
	->setControlID('file')
	->setControlStyle('display: none'))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setLabel(pht('Comments'))
	->setName('comments')
	->setValue($draft_text)
	->setID('transaction-comments')
	->setUser($user))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Submit')));

	$control_map = array(
	ManiphestTransaction::TYPE_STATUS => 'resolution',
	ManiphestTransaction::TYPE_OWNER => 'assign_to',
	ManiphestTransaction::TYPE_CCS => 'ccs',
	ManiphestTransaction::TYPE_PRIORITY => 'priority',
	ManiphestTransaction::TYPE_PROJECTS => 'projects',
	);

	$tokenizer_map = array(
	ManiphestTransaction::TYPE_PROJECTS => array(
	'id' => 'projects-tokenizer',
	'src' => '/typeahead/common/projects/',
	'placeholder' => pht('Type a project name...'),
	),
	ManiphestTransaction::TYPE_OWNER => array(
	'id' => 'assign-tokenizer',
	'src' => '/typeahead/common/users/',
	'value' => $default_claim,
	'limit' => 1,
	'placeholder' => pht('Type a user name...'),
	),
	ManiphestTransaction::TYPE_CCS => array(
	'id' => 'cc-tokenizer',
	'src' => '/typeahead/common/mailable/',
	'placeholder' => pht('Type a user or mailing list...'),
	),
	);

	// TODO: Initializing these behaviors for logged out users fatals things.
	if ($user->isLoggedIn()) {
	Javelin::initBehavior('maniphest-transaction-controls', array(
	'select' => 'transaction-action',
	'controlMap' => $control_map,
	'tokenizers' => $tokenizer_map,
	));

	Javelin::initBehavior('maniphest-transaction-preview', array(
	'uri' => '/maniphest/transaction/preview/'.$task->getID().'/',
	'preview' => 'transaction-preview',
	'comments' => 'transaction-comments',
	'action' => 'transaction-action',
	'map' => $control_map,
	'tokenizers' => $tokenizer_map,
	));
	}

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	$comment_header = $is_serious
	? pht('Add Comment')
	: pht('Weigh In');

	$preview_panel = phutil_tag_div(
	'aphront-panel-preview',
	phutil_tag(
	'div',
	array('id' => 'transaction-preview'),
	phutil_tag_div(
	'aphront-panel-preview-loading-text',
	pht('Loading preview...'))));

	$timeline = id(new PhabricatorApplicationTransactionView())
	->setUser($user)
	->setObjectPHID($task->getPHID())
	->setTransactions($transactions)
	->setMarkupEngine($engine);

	$object_name = 'T'.$task->getID();
	$actions = $this->buildActionView($task);

	$crumbs = $this->buildApplicationCrumbs()
	->addTextCrumb($object_name, '/'.$object_name)
	->setActionList($actions);

	$header = $this->buildHeaderView($task);
	$properties = $this->buildPropertyView(
	$task, $field_list, $edges, $actions);
	$description = $this->buildDescriptionView($task, $engine);

	if (!$user->isLoggedIn()) {
	// TODO: Eventually, everything should run through this. For now, we're
	// only using it to get a consistent "Login to Comment" button.
	$comment_box = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($user)
	->setRequestURI($request->getRequestURI());
	$preview_panel = null;
	} else {
	$comment_box = id(new PHUIObjectBoxView())
	->setFlush(true)
	->setHeaderText($comment_header)
	->appendChild($comment_form);
	$timeline->setQuoteTargetID('transaction-comments');
	$timeline->setQuoteRef($object_name);
	}

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	if ($description) {
	$object_box->addPropertyList($description);
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$context_bar,
	$object_box,
	$timeline,
	$comment_box,
	$preview_panel,
	),
	array(
	'title' => 'T'.$task->getID().' '.$task->getTitle(),
	'pageObjects' => array($task->getPHID()),
	'device' => true,
	));
	}

	private function buildHeaderView(ManiphestTask $task) {
	$view = id(new PHUIHeaderView())
	->setHeader($task->getTitle())
	->setUser($this->getRequest()->getUser())
	->setPolicyObject($task);

	$status = $task->getStatus();
	$status_name = ManiphestTaskStatus::renderFullDescription($status);

	$view->addProperty(PHUIHeaderView::PROPERTY_STATUS, $status_name);

	return $view;
	}


	private function buildActionView(ManiphestTask $task) {
	$viewer = $this->getRequest()->getUser();
	$viewer_phid = $viewer->getPHID();
	$viewer_is_cc = in_array($viewer_phid, $task->getCCPHIDs());

	$id = $task->getID();
	$phid = $task->getPHID();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$task,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	->setObject($task)
	->setObjectURI($this->getRequest()->getRequestURI());

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Task'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("/task/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	if ($task->getOwnerPHID() === $viewer_phid) {
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Automatically Subscribed'))
	->setDisabled(true)
	->setIcon('fa-check-circle'));
	} else {
	$action = $viewer_is_cc ? 'rem' : 'add';
	$name = $viewer_is_cc ? pht('Unsubscribe') : pht('Subscribe');
	$icon = $viewer_is_cc ? 'fa-minus-circle' : 'fa-plus-circle';

	$view->addAction(
	id(new PhabricatorActionView())
	->setName($name)
	->setHref("/maniphest/subscribe/{$action}/{$id}/")
	->setRenderAsForm(true)
	->setUser($viewer)
	->setIcon($icon));
	}

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Merge Duplicates In'))
	->setHref("/search/attach/{$phid}/TASK/merge/")
	->setWorkflow(true)
	->setIcon('fa-compress')
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Create Subtask'))
	->setHref($this->getApplicationURI("/task/create/?parent={$id}"))
	->setIcon('fa-level-down'));

	$view->addAction(
	id(new PhabricatorActionView())
	- ->setName(pht('Edit Dependencies'))
	- ->setHref("/search/attach/{$phid}/TASK/dependencies/")
	+ ->setName(pht('Edit Blocking Tasks'))
	+ ->setHref("/search/attach/{$phid}/TASK/blocks/")
	->setWorkflow(true)
	->setIcon('fa-link')
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	return $view;
	}

	private function buildPropertyView(
	ManiphestTask $task,
	PhabricatorCustomFieldList $field_list,
	array $edges,
	PhabricatorActionListView $actions) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($task)
	->setActionList($actions);

	$view->addProperty(
	pht('Assigned To'),
	$task->getOwnerPHID()
	? $this->getHandle($task->getOwnerPHID())->renderLink()
	: phutil_tag('em', array(), pht('None')));

	$view->addProperty(
	pht('Priority'),
	ManiphestTaskPriority::getTaskPriorityName($task->getPriority()));

	$handles = $this->getLoadedHandles();
	$cc_handles = array_select_keys($handles, $task->getCCPHIDs());
	$subscriber_html = id(new SubscriptionListStringBuilder())
	->setObjectPHID($task->getPHID())
	->setHandles($cc_handles)
	->buildPropertyString();
	$view->addProperty(pht('Subscribers'), $subscriber_html);

	$view->addProperty(
	pht('Author'),
	$this->getHandle($task->getAuthorPHID())->renderLink());

	$source = $task->getOriginalEmailSource();
	if ($source) {
	$subject = '[T'.$task->getID().'] '.$task->getTitle();
	$view->addProperty(
	pht('From Email'),
	phutil_tag(
	'a',
	array(
	'href' => 'mailto:'.$source.'?subject='.$subject
	),
	$source));
	}

	$project_phids = $task->getProjectPHIDs();
	if ($project_phids) {
	require_celerity_resource('maniphest-task-summary-css');

	// If we end up with real-world projects with many hundreds of columns, it
	// might be better to just load all the edges, then load those columns and
	// work backward that way, or denormalize this data more.

	$columns = id(new PhabricatorProjectColumnQuery())
	->setViewer($viewer)
	->withProjectPHIDs($project_phids)
	->execute();
	$columns = mpull($columns, null, 'getPHID');

	$column_edge_type = PhabricatorEdgeConfig::TYPE_OBJECT_HAS_COLUMN;
	$all_column_phids = array_keys($columns);

	$column_edge_query = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs(array($task->getPHID()))
	->withEdgeTypes(array($column_edge_type))
	->withDestinationPHIDs($all_column_phids);
	$column_edge_query->execute();
	$in_column_phids = array_fuse($column_edge_query->getDestinationPHIDs());

	$column_groups = mgroup($columns, 'getProjectPHID');

	$project_rows = array();
	foreach ($project_phids as $project_phid) {
	$row = array();

	$handle = $this->getHandle($project_phid);
	$row[] = $handle->renderLink();

	$columns = idx($column_groups, $project_phid, array());
	$column = head(array_intersect_key($columns, $in_column_phids));
	if ($column) {
	$column_name = pht('(%s)', $column->getDisplayName());
	// TODO: This is really hacky but there's no cleaner way to do it
	// right now, T4022 should give us better tools for this.
	$column_href = str_replace(
	'project/view',
	'project/board',
	$handle->getURI());
	$column_link = phutil_tag(
	'a',
	array(
	'href' => $column_href,
	'class' => 'maniphest-board-link',
	),
	$column_name);

	$row[] = ' ';
	$row[] = $column_link;
	}

	$project_rows[] = phutil_tag('div', array(), $row);
	}
	} else {
	$project_rows = phutil_tag('em', array(), pht('None'));
	}

	$view->addProperty(pht('Projects'), $project_rows);

	$edge_types = array(
	PhabricatorEdgeConfig::TYPE_TASK_DEPENDED_ON_BY_TASK
	- => pht('Dependent Tasks'),
	+ => pht('Blocking Tasks'),
	PhabricatorEdgeConfig::TYPE_TASK_DEPENDS_ON_TASK
	- => pht('Depends On'),
	+ => pht('Blocked By'),
	PhabricatorEdgeConfig::TYPE_TASK_HAS_RELATED_DREV
	=> pht('Differential Revisions'),
	PhabricatorEdgeConfig::TYPE_TASK_HAS_MOCK
	=> pht('Pholio Mocks'),
	);

	$revisions_commits = array();
	$handles = $this->getLoadedHandles();

	$commit_phids = array_keys(
	$edges[PhabricatorEdgeConfig::TYPE_TASK_HAS_COMMIT]);
	if ($commit_phids) {
	$commit_drev = PhabricatorEdgeConfig::TYPE_COMMIT_HAS_DREV;
	$drev_edges = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs($commit_phids)
	->withEdgeTypes(array($commit_drev))
	->execute();

	foreach ($commit_phids as $phid) {
	$revisions_commits[$phid] = $handles[$phid]->renderLink();
	$revision_phid = key($drev_edges[$phid][$commit_drev]);
	$revision_handle = idx($handles, $revision_phid);
	if ($revision_handle) {
	$task_drev = PhabricatorEdgeConfig::TYPE_TASK_HAS_RELATED_DREV;
	unset($edges[$task_drev][$revision_phid]);
	$revisions_commits[$phid] = hsprintf(
	'%s / %s',
	$revision_handle->renderLink($revision_handle->getName()),
	$revisions_commits[$phid]);
	}
	}
	}

	foreach ($edge_types as $edge_type => $edge_name) {
	if ($edges[$edge_type]) {
	$view->addProperty(
	$edge_name,
	$this->renderHandlesForPHIDs(array_keys($edges[$edge_type])));
	}
	}

	if ($revisions_commits) {
	$view->addProperty(
	pht('Commits'),
	phutil_implode_html(phutil_tag('br'), $revisions_commits));
	}

	$attached = $task->getAttached();
	if (!is_array($attached)) {
	$attached = array();
	}

	$file_infos = idx($attached, PhabricatorFilePHIDTypeFile::TYPECONST);
	if ($file_infos) {
	$file_phids = array_keys($file_infos);

	// TODO: These should probably be handles or something; clean this up
	// as we sort out file attachments.
	$files = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs($file_phids)
	->execute();

	$file_view = new PhabricatorFileLinkListView();
	$file_view->setFiles($files);

	$view->addProperty(
	pht('Files'),
	$file_view->render());
	}

	$field_list->appendFieldsToPropertyList(
	$task,
	$viewer,
	$view);

	$view->invokeWillRenderEvent();

	return $view;
	}

	private function buildDescriptionView(
	ManiphestTask $task,
	PhabricatorMarkupEngine $engine) {

	$section = null;
	if (strlen($task->getDescription())) {
	$section = new PHUIPropertyListView();
	$section->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);
	$section->addTextContent(
	phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup',
	),
	$engine->getOutput($task, ManiphestTask::MARKUP_FIELD_DESCRIPTION)));
	}

	return $section;
	}

	}
	diff --git a/src/applications/search/controller/PhabricatorSearchAttachController.php b/src/applications/search/controller/PhabricatorSearchAttachController.php
	index 42bc95a8cc..2218ee5662 100644
	--- a/src/applications/search/controller/PhabricatorSearchAttachController.php
	+++ b/src/applications/search/controller/PhabricatorSearchAttachController.php
	@@ -1,339 +1,347 @@
	<?php

	/**
	* @group search
	*/
	final class PhabricatorSearchAttachController
	extends PhabricatorSearchBaseController {

	private $phid;
	private $type;
	private $action;

	const ACTION_ATTACH = 'attach';
	const ACTION_MERGE = 'merge';
	const ACTION_DEPENDENCIES = 'dependencies';
	+ const ACTION_BLOCKS = 'blocks';
	const ACTION_EDGE = 'edge';

	public function willProcessRequest(array $data) {
	$this->phid = $data['phid'];
	$this->type = $data['type'];
	$this->action = idx($data, 'action', self::ACTION_ATTACH);
	}

	public function processRequest() {

	$request = $this->getRequest();
	$user = $request->getUser();

	$handle = id(new PhabricatorHandleQuery())
	->setViewer($user)
	->withPHIDs(array($this->phid))
	->executeOne();

	$object_type = $handle->getType();
	$attach_type = $this->type;

	$object = id(new PhabricatorObjectQuery())
	->setViewer($user)
	->withPHIDs(array($this->phid))
	->executeOne();

	if (!$object) {
	return new Aphront404Response();
	}

	$edge_type = null;
	switch ($this->action) {
	case self::ACTION_EDGE:
	case self::ACTION_DEPENDENCIES:
	+ case self::ACTION_BLOCKS:
	case self::ACTION_ATTACH:
	$edge_type = $this->getEdgeType($object_type, $attach_type);
	break;
	}

	if ($request->isFormPost()) {
	$phids = explode(';', $request->getStr('phids'));
	$phids = array_filter($phids);
	$phids = array_values($phids);

	if ($edge_type) {
	$do_txn = $object instanceof PhabricatorApplicationTransactionInterface;
	$old_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$this->phid,
	$edge_type);
	$add_phids = $phids;
	$rem_phids = array_diff($old_phids, $add_phids);

	if ($do_txn) {

	$txn_editor = $object->getApplicationTransactionEditor()
	->setActor($user)
	->setContentSourceFromRequest($request);
	$txn_template = $object->getApplicationTransactionTemplate()
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $edge_type)
	->setNewValue(array(
	'+' => array_fuse($add_phids),
	'-' => array_fuse($rem_phids)));
	$txn_editor->applyTransactions(
	$object->getApplicationTransactionObject(),
	array($txn_template));

	} else {

	$editor = id(new PhabricatorEdgeEditor());
	$editor->setActor($user);
	foreach ($add_phids as $phid) {
	$editor->addEdge($this->phid, $edge_type, $phid);
	}
	foreach ($rem_phids as $phid) {
	$editor->removeEdge($this->phid, $edge_type, $phid);
	}

	try {
	$editor->save();
	} catch (PhabricatorEdgeCycleException $ex) {
	$this->raiseGraphCycleException($ex);
	}
	}

	return id(new AphrontReloadResponse())->setURI($handle->getURI());
	} else {
	return $this->performMerge($object, $handle, $phids);
	}
	} else {
	if ($edge_type) {
	$phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$this->phid,
	$edge_type);
	} else {
	// This is a merge.
	$phids = array();
	}
	}

	$strings = $this->getStrings();

	$handles = $this->loadViewerHandles($phids);

	$obj_dialog = new PhabricatorObjectSelectorDialog();
	$obj_dialog
	->setUser($user)
	->setHandles($handles)
	->setFilters($this->getFilters($strings))
	->setSelectedFilter($strings['selected'])
	->setExcluded($this->phid)
	->setCancelURI($handle->getURI())
	->setSearchURI('/search/select/'.$attach_type.'/')
	->setTitle($strings['title'])
	->setHeader($strings['header'])
	->setButtonText($strings['button'])
	->setInstructions($strings['instructions']);

	$dialog = $obj_dialog->buildDialog();

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	private function performMerge(
	ManiphestTask $task,
	PhabricatorObjectHandle $handle,
	array $phids) {

	$user = $this->getRequest()->getUser();
	$response = id(new AphrontReloadResponse())->setURI($handle->getURI());

	$phids = array_fill_keys($phids, true);
	unset($phids[$task->getPHID()]); // Prevent merging a task into itself.

	if (!$phids) {
	return $response;
	}

	$targets = id(new ManiphestTaskQuery())
	->setViewer($user)
	->withPHIDs(array_keys($phids))
	->execute();

	if (empty($targets)) {
	return $response;
	}

	$editor = id(new ManiphestTransactionEditor())
	->setActor($user)
	->setContentSourceFromRequest($this->getRequest())
	->setContinueOnNoEffect(true)
	->setContinueOnMissingFields(true);

	$task_names = array();

	$merge_into_name = 'T'.$task->getID();

	$cc_vector = array();
	$cc_vector[] = $task->getCCPHIDs();
	foreach ($targets as $target) {
	$cc_vector[] = $target->getCCPHIDs();
	$cc_vector[] = array(
	$target->getAuthorPHID(),
	$target->getOwnerPHID());

	$close_task = id(new ManiphestTransaction())
	->setTransactionType(ManiphestTransaction::TYPE_STATUS)
	->setNewValue(ManiphestTaskStatus::getDuplicateStatus());

	$merge_comment = id(new ManiphestTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
	->attachComment(
	id(new ManiphestTransactionComment())
	->setContent("\xE2\x9C\x98 Merged into {$merge_into_name}."));

	$editor->applyTransactions(
	$target,
	array(
	$close_task,
	$merge_comment,
	));

	$task_names[] = 'T'.$target->getID();
	}
	$all_ccs = array_mergev($cc_vector);
	$all_ccs = array_filter($all_ccs);
	$all_ccs = array_unique($all_ccs);

	$task_names = implode(', ', $task_names);

	$add_ccs = id(new ManiphestTransaction())
	->setTransactionType(ManiphestTransaction::TYPE_CCS)
	->setNewValue($all_ccs);

	$merged_comment = id(new ManiphestTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
	->attachComment(
	id(new ManiphestTransactionComment())
	->setContent("\xE2\x97\x80 Merged tasks: {$task_names}."));

	$editor->applyTransactions($task, array($add_ccs, $merged_comment));

	return $response;
	}

	private function getStrings() {
	switch ($this->type) {
	case DifferentialPHIDTypeRevision::TYPECONST:
	$noun = 'Revisions';
	$selected = 'created';
	break;
	case ManiphestPHIDTypeTask::TYPECONST:
	$noun = 'Tasks';
	$selected = 'assigned';
	break;
	case PhabricatorRepositoryPHIDTypeCommit::TYPECONST:
	$noun = 'Commits';
	$selected = 'created';
	break;
	case PholioPHIDTypeMock::TYPECONST:
	$noun = 'Mocks';
	$selected = 'created';
	break;
	}

	switch ($this->action) {
	case self::ACTION_EDGE:
	case self::ACTION_ATTACH:
	$dialog_title = "Manage Attached {$noun}";
	$header_text = "Currently Attached {$noun}";
	$button_text = "Save {$noun}";
	$instructions = null;
	break;
	case self::ACTION_MERGE:
	$dialog_title = "Merge Duplicate Tasks";
	$header_text = "Tasks To Merge";
	$button_text = "Merge {$noun}";
	$instructions =
	"These tasks will be merged into the current task and then closed. ".
	"The current task will grow stronger.";
	break;
	case self::ACTION_DEPENDENCIES:
	$dialog_title = "Edit Dependencies";
	$header_text = "Current Dependencies";
	$button_text = "Save Dependencies";
	$instructions = null;
	break;
	+ case self::ACTION_BLOCKS:
	+ $dialog_title = pht('Edit Blocking Tasks');
	+ $header_text = pht('Current Blocking Tasks');
	+ $button_text = pht('Save Blocking Tasks');
	+ $instructions = null;
	+ break;
	}

	return array(
	'target_plural_noun' => $noun,
	'selected' => $selected,
	'title' => $dialog_title,
	'header' => $header_text,
	'button' => $button_text,
	'instructions' => $instructions,
	);
	}

	private function getFilters(array $strings) {
	if ($this->type == PholioPHIDTypeMock::TYPECONST) {
	$filters = array(
	'created' => 'Created By Me',
	'all' => 'All '.$strings['target_plural_noun'],
	);
	} else {
	$filters = array(
	'assigned' => 'Assigned to Me',
	'created' => 'Created By Me',
	'open' => 'All Open '.$strings['target_plural_noun'],
	'all' => 'All '.$strings['target_plural_noun'],
	);
	}

	return $filters;
	}

	private function getEdgeType($src_type, $dst_type) {
	$t_cmit = PhabricatorRepositoryPHIDTypeCommit::TYPECONST;
	$t_task = ManiphestPHIDTypeTask::TYPECONST;
	$t_drev = DifferentialPHIDTypeRevision::TYPECONST;
	$t_mock = PholioPHIDTypeMock::TYPECONST;

	$map = array(
	$t_cmit => array(
	$t_task => PhabricatorEdgeConfig::TYPE_COMMIT_HAS_TASK,
	),
	$t_task => array(
	$t_cmit => PhabricatorEdgeConfig::TYPE_TASK_HAS_COMMIT,
	$t_task => PhabricatorEdgeConfig::TYPE_TASK_DEPENDS_ON_TASK,
	$t_drev => PhabricatorEdgeConfig::TYPE_TASK_HAS_RELATED_DREV,
	$t_mock => PhabricatorEdgeConfig::TYPE_TASK_HAS_MOCK,
	),
	$t_drev => array(
	$t_drev => PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV,
	$t_task => PhabricatorEdgeConfig::TYPE_DREV_HAS_RELATED_TASK,
	),
	$t_mock => array(
	$t_task => PhabricatorEdgeConfig::TYPE_MOCK_HAS_TASK,
	),
	);

	if (empty($map[$src_type][$dst_type])) {
	return null;
	}

	return $map[$src_type][$dst_type];
	}

	private function raiseGraphCycleException(PhabricatorEdgeCycleException $ex) {
	$cycle = $ex->getCycle();

	$handles = $this->loadViewerHandles($cycle);
	$names = array();
	foreach ($cycle as $cycle_phid) {
	$names[] = $handles[$cycle_phid]->getFullName();
	}
	$names = implode(" \xE2\x86\x92 ", $names);
	throw new Exception(
	"You can not create that dependency, because it would create a ".
	"circular dependency: {$names}.");
	}

	}
	diff --git a/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php b/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
	index 91283a6aee..378dfe9cc0 100644
	--- a/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
	+++ b/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
	@@ -1,517 +1,518 @@
	<?php

	final class PhabricatorEdgeConfig extends PhabricatorEdgeConstants {

	const TABLE_NAME_EDGE = 'edge';
	const TABLE_NAME_EDGEDATA = 'edgedata';

	const TYPE_TASK_HAS_COMMIT = 1;
	const TYPE_COMMIT_HAS_TASK = 2;

	const TYPE_TASK_DEPENDS_ON_TASK = 3;
	const TYPE_TASK_DEPENDED_ON_BY_TASK = 4;

	const TYPE_DREV_DEPENDS_ON_DREV = 5;
	const TYPE_DREV_DEPENDED_ON_BY_DREV = 6;

	const TYPE_BLOG_HAS_POST = 7;
	const TYPE_POST_HAS_BLOG = 8;
	const TYPE_BLOG_HAS_BLOGGER = 9;
	const TYPE_BLOGGER_HAS_BLOG = 10;

	const TYPE_TASK_HAS_RELATED_DREV = 11;
	const TYPE_DREV_HAS_RELATED_TASK = 12;

	const TYPE_PROJ_MEMBER = 13;
	const TYPE_MEMBER_OF_PROJ = 14;

	const TYPE_COMMIT_HAS_PROJECT = 15;
	const TYPE_PROJECT_HAS_COMMIT = 16;

	const TYPE_QUESTION_HAS_VOTING_USER = 17;
	const TYPE_VOTING_USER_HAS_QUESTION = 18;
	const TYPE_ANSWER_HAS_VOTING_USER = 19;
	const TYPE_VOTING_USER_HAS_ANSWER = 20;

	const TYPE_OBJECT_HAS_SUBSCRIBER = 21;
	const TYPE_SUBSCRIBED_TO_OBJECT = 22;

	const TYPE_OBJECT_HAS_UNSUBSCRIBER = 23;
	const TYPE_UNSUBSCRIBED_FROM_OBJECT = 24;

	const TYPE_OBJECT_HAS_FILE = 25;
	const TYPE_FILE_HAS_OBJECT = 26;

	const TYPE_ACCOUNT_HAS_MEMBER = 27;
	const TYPE_MEMBER_HAS_ACCOUNT = 28;

	const TYPE_PURCAHSE_HAS_CHARGE = 29;
	const TYPE_CHARGE_HAS_PURCHASE = 30;

	const TYPE_DREV_HAS_COMMIT = 31;
	const TYPE_COMMIT_HAS_DREV = 32;

	const TYPE_OBJECT_HAS_CONTRIBUTOR = 33;
	const TYPE_CONTRIBUTED_TO_OBJECT = 34;

	const TYPE_DREV_HAS_REVIEWER = 35;
	const TYPE_REVIEWER_FOR_DREV = 36;

	const TYPE_MOCK_HAS_TASK = 37;
	const TYPE_TASK_HAS_MOCK = 38;

	const TYPE_OBJECT_USES_CREDENTIAL = 39;
	const TYPE_CREDENTIAL_USED_BY_OBJECT = 40;

	const TYPE_OBJECT_HAS_PROJECT = 41;
	const TYPE_PROJECT_HAS_OBJECT = 42;

	const TYPE_OBJECT_HAS_COLUMN = 43;
	const TYPE_COLUMN_HAS_OBJECT = 44;

	const TYPE_DASHBOARD_HAS_PANEL = 45;
	const TYPE_PANEL_HAS_DASHBOARD = 46;

	const TYPE_OBJECT_HAS_WATCHER = 47;
	const TYPE_WATCHER_HAS_OBJECT = 48;

	const TYPE_TEST_NO_CYCLE = 9000;

	const TYPE_PHOB_HAS_ASANATASK = 80001;
	const TYPE_ASANATASK_HAS_PHOB = 80000;

	const TYPE_PHOB_HAS_ASANASUBTASK = 80003;
	const TYPE_ASANASUBTASK_HAS_PHOB = 80002;

	const TYPE_PHOB_HAS_JIRAISSUE = 80004;
	const TYPE_JIRAISSUE_HAS_PHOB = 80005;

	public static function getInverse($edge_type) {
	static $map = array(
	self::TYPE_TASK_HAS_COMMIT => self::TYPE_COMMIT_HAS_TASK,
	self::TYPE_COMMIT_HAS_TASK => self::TYPE_TASK_HAS_COMMIT,

	self::TYPE_TASK_DEPENDS_ON_TASK => self::TYPE_TASK_DEPENDED_ON_BY_TASK,
	self::TYPE_TASK_DEPENDED_ON_BY_TASK => self::TYPE_TASK_DEPENDS_ON_TASK,

	self::TYPE_DREV_DEPENDS_ON_DREV => self::TYPE_DREV_DEPENDED_ON_BY_DREV,
	self::TYPE_DREV_DEPENDED_ON_BY_DREV => self::TYPE_DREV_DEPENDS_ON_DREV,

	self::TYPE_BLOG_HAS_POST => self::TYPE_POST_HAS_BLOG,
	self::TYPE_POST_HAS_BLOG => self::TYPE_BLOG_HAS_POST,
	self::TYPE_BLOG_HAS_BLOGGER => self::TYPE_BLOGGER_HAS_BLOG,
	self::TYPE_BLOGGER_HAS_BLOG => self::TYPE_BLOG_HAS_BLOGGER,

	self::TYPE_TASK_HAS_RELATED_DREV => self::TYPE_DREV_HAS_RELATED_TASK,
	self::TYPE_DREV_HAS_RELATED_TASK => self::TYPE_TASK_HAS_RELATED_DREV,

	self::TYPE_PROJ_MEMBER => self::TYPE_MEMBER_OF_PROJ,
	self::TYPE_MEMBER_OF_PROJ => self::TYPE_PROJ_MEMBER,

	self::TYPE_COMMIT_HAS_PROJECT => self::TYPE_PROJECT_HAS_COMMIT,
	self::TYPE_PROJECT_HAS_COMMIT => self::TYPE_COMMIT_HAS_PROJECT,

	self::TYPE_QUESTION_HAS_VOTING_USER =>
	self::TYPE_VOTING_USER_HAS_QUESTION,
	self::TYPE_VOTING_USER_HAS_QUESTION =>
	self::TYPE_QUESTION_HAS_VOTING_USER,
	self::TYPE_ANSWER_HAS_VOTING_USER => self::TYPE_VOTING_USER_HAS_ANSWER,
	self::TYPE_VOTING_USER_HAS_ANSWER => self::TYPE_ANSWER_HAS_VOTING_USER,

	self::TYPE_OBJECT_HAS_SUBSCRIBER => self::TYPE_SUBSCRIBED_TO_OBJECT,
	self::TYPE_SUBSCRIBED_TO_OBJECT => self::TYPE_OBJECT_HAS_SUBSCRIBER,

	self::TYPE_OBJECT_HAS_UNSUBSCRIBER => self::TYPE_UNSUBSCRIBED_FROM_OBJECT,
	self::TYPE_UNSUBSCRIBED_FROM_OBJECT => self::TYPE_OBJECT_HAS_UNSUBSCRIBER,

	self::TYPE_OBJECT_HAS_FILE => self::TYPE_FILE_HAS_OBJECT,
	self::TYPE_FILE_HAS_OBJECT => self::TYPE_OBJECT_HAS_FILE,

	self::TYPE_ACCOUNT_HAS_MEMBER => self::TYPE_MEMBER_HAS_ACCOUNT,
	self::TYPE_MEMBER_HAS_ACCOUNT => self::TYPE_ACCOUNT_HAS_MEMBER,

	self::TYPE_DREV_HAS_COMMIT => self::TYPE_COMMIT_HAS_DREV,
	self::TYPE_COMMIT_HAS_DREV => self::TYPE_DREV_HAS_COMMIT,

	self::TYPE_OBJECT_HAS_CONTRIBUTOR => self::TYPE_SUBSCRIBED_TO_OBJECT,
	self::TYPE_CONTRIBUTED_TO_OBJECT => self::TYPE_OBJECT_HAS_CONTRIBUTOR,

	self::TYPE_TASK_HAS_MOCK => self::TYPE_MOCK_HAS_TASK,
	self::TYPE_MOCK_HAS_TASK => self::TYPE_TASK_HAS_MOCK,

	self::TYPE_PHOB_HAS_ASANATASK => self::TYPE_ASANATASK_HAS_PHOB,
	self::TYPE_ASANATASK_HAS_PHOB => self::TYPE_PHOB_HAS_ASANATASK,

	self::TYPE_PHOB_HAS_ASANASUBTASK => self::TYPE_ASANASUBTASK_HAS_PHOB,
	self::TYPE_ASANASUBTASK_HAS_PHOB => self::TYPE_PHOB_HAS_ASANASUBTASK,

	self::TYPE_DREV_HAS_REVIEWER => self::TYPE_REVIEWER_FOR_DREV,
	self::TYPE_REVIEWER_FOR_DREV => self::TYPE_DREV_HAS_REVIEWER,

	self::TYPE_PHOB_HAS_JIRAISSUE => self::TYPE_JIRAISSUE_HAS_PHOB,
	self::TYPE_JIRAISSUE_HAS_PHOB => self::TYPE_PHOB_HAS_JIRAISSUE,

	self::TYPE_OBJECT_USES_CREDENTIAL => self::TYPE_CREDENTIAL_USED_BY_OBJECT,
	self::TYPE_CREDENTIAL_USED_BY_OBJECT => self::TYPE_OBJECT_USES_CREDENTIAL,

	self::TYPE_OBJECT_HAS_PROJECT => self::TYPE_PROJECT_HAS_OBJECT,
	self::TYPE_PROJECT_HAS_OBJECT => self::TYPE_OBJECT_HAS_PROJECT,

	self::TYPE_OBJECT_HAS_COLUMN => self::TYPE_COLUMN_HAS_OBJECT,
	self::TYPE_COLUMN_HAS_OBJECT => self::TYPE_OBJECT_HAS_COLUMN,

	self::TYPE_PANEL_HAS_DASHBOARD => self::TYPE_DASHBOARD_HAS_PANEL,
	self::TYPE_DASHBOARD_HAS_PANEL => self::TYPE_PANEL_HAS_DASHBOARD,

	self::TYPE_OBJECT_HAS_WATCHER => self::TYPE_WATCHER_HAS_OBJECT,
	self::TYPE_WATCHER_HAS_OBJECT => self::TYPE_OBJECT_HAS_WATCHER
	);

	return idx($map, $edge_type);
	}

	public static function shouldPreventCycles($edge_type) {
	static $map = array(
	self::TYPE_TEST_NO_CYCLE => true,
	self::TYPE_TASK_DEPENDS_ON_TASK => true,
	self::TYPE_DREV_DEPENDS_ON_DREV => true,
	);
	return isset($map[$edge_type]);
	}

	public static function establishConnection($phid_type, $conn_type) {
	$map = PhabricatorPHIDType::getAllTypes();
	if (isset($map[$phid_type])) {
	$type = $map[$phid_type];
	$object = $type->newObject();
	if ($object) {
	return $object->establishConnection($conn_type);
	}
	}

	static $class_map = array(
	PhabricatorPHIDConstants::PHID_TYPE_TOBJ => 'HarbormasterObject',
	PhabricatorPHIDConstants::PHID_TYPE_ACNT => 'PhortuneAccount',
	PhabricatorPHIDConstants::PHID_TYPE_PRCH => 'PhortunePurchase',
	PhabricatorPHIDConstants::PHID_TYPE_CHRG => 'PhortuneCharge',
	PhabricatorPHIDConstants::PHID_TYPE_XOBJ => 'DoorkeeperExternalObject',
	);

	$class = idx($class_map, $phid_type);

	if (!$class) {
	throw new Exception(
	"Edges are not available for objects of type '{$phid_type}'!");
	}

	return newv($class, array())->establishConnection($conn_type);
	}

	public static function getEditStringForEdgeType($type) {
	switch ($type) {
	case self::TYPE_TASK_HAS_COMMIT:
	case self::TYPE_PROJECT_HAS_COMMIT:
	case self::TYPE_DREV_HAS_COMMIT:
	return '%s edited commit(s), added %d: %s; removed %d: %s.';
	case self::TYPE_COMMIT_HAS_TASK:
	case self::TYPE_TASK_DEPENDS_ON_TASK:
	case self::TYPE_TASK_DEPENDED_ON_BY_TASK:
	case self::TYPE_DREV_HAS_RELATED_TASK:
	case self::TYPE_MOCK_HAS_TASK:
	return '%s edited task(s), added %d: %s; removed %d: %s.';
	case self::TYPE_DREV_DEPENDS_ON_DREV:
	case self::TYPE_DREV_DEPENDED_ON_BY_DREV:
	case self::TYPE_TASK_HAS_RELATED_DREV:
	case self::TYPE_COMMIT_HAS_DREV:
	case self::TYPE_REVIEWER_FOR_DREV:
	return '%s edited revision(s), added %d: %s; removed %d: %s.';
	case self::TYPE_BLOG_HAS_POST:
	return '%s edited post(s), added %d: %s; removed %d: %s.';
	case self::TYPE_POST_HAS_BLOG:
	case self::TYPE_BLOGGER_HAS_BLOG:
	return '%s edited blog(s), added %d: %s; removed %d: %s.';
	case self::TYPE_BLOG_HAS_BLOGGER:
	return '%s edited blogger(s), added %d: %s; removed %d: %s.';
	case self::TYPE_PROJ_MEMBER:
	return '%s edited member(s), added %d: %s; removed %d: %s.';
	case self::TYPE_MEMBER_OF_PROJ:
	case self::TYPE_COMMIT_HAS_PROJECT:
	case self::TYPE_OBJECT_HAS_PROJECT:
	return '%s edited project(s), added %d: %s; removed %d: %s.';
	case self::TYPE_QUESTION_HAS_VOTING_USER:
	case self::TYPE_ANSWER_HAS_VOTING_USER:
	return '%s edited voting user(s), added %d: %s; removed %d: %s.';
	case self::TYPE_VOTING_USER_HAS_QUESTION:
	return '%s edited question(s), added %d: %s; removed %d: %s.';
	case self::TYPE_VOTING_USER_HAS_ANSWER:
	return '%s edited answer(s), added %d: %s; removed %d: %s.';
	case self::TYPE_OBJECT_HAS_SUBSCRIBER:
	return '%s edited subscriber(s), added %d: %s; removed %d: %s.';
	case self::TYPE_SUBSCRIBED_TO_OBJECT:
	case self::TYPE_UNSUBSCRIBED_FROM_OBJECT:
	case self::TYPE_FILE_HAS_OBJECT:
	case self::TYPE_CONTRIBUTED_TO_OBJECT:
	case self::TYPE_PROJECT_HAS_OBJECT:
	return '%s edited object(s), added %d: %s; removed %d: %s.';
	case self::TYPE_OBJECT_HAS_UNSUBSCRIBER:
	return '%s edited unsubcriber(s), added %d: %s; removed %d: %s.';
	case self::TYPE_OBJECT_HAS_FILE:
	return '%s edited file(s), added %d: %s; removed %d: %s.';
	case self::TYPE_ACCOUNT_HAS_MEMBER:
	return '%s edited member(s), added %d: %s; removed %d: %s.';
	case self::TYPE_MEMBER_HAS_ACCOUNT:
	return '%s edited account(s), added %d: %s; removed %d: %s.';
	case self::TYPE_PURCAHSE_HAS_CHARGE:
	return '%s edited charge(s), added %d: %s; removed %d: %s.';
	case self::TYPE_CHARGE_HAS_PURCHASE:
	return '%s edited purchase(s), added %d: %s; removed %d: %s.';
	case self::TYPE_OBJECT_HAS_CONTRIBUTOR:
	return '%s edited contributor(s), added %d: %s; removed %d: %s.';
	case self::TYPE_DREV_HAS_REVIEWER:
	return '%s edited reviewer(s), added %d: %s; removed %d: %s.';
	case self::TYPE_TASK_HAS_MOCK:
	return '%s edited mock(s), added %d: %s; removed %d: %s.';
	case self::TYPE_DASHBOARD_HAS_PANEL:
	return '%s edited panel(s), added %d: %s; removed %d: %s.';
	case self::TYPE_PANEL_HAS_DASHBOARD:
	return '%s edited dashboard(s), added %d: %s; removed %d: %s.';
	case self::TYPE_SUBSCRIBED_TO_OBJECT:
	case self::TYPE_UNSUBSCRIBED_FROM_OBJECT:
	case self::TYPE_FILE_HAS_OBJECT:
	case self::TYPE_CONTRIBUTED_TO_OBJECT:
	default:
	return '%s edited object(s), added %d: %s; removed %d: %s.';

	}
	}

	public static function getAddStringForEdgeType($type) {
	switch ($type) {
	case self::TYPE_TASK_HAS_COMMIT:
	case self::TYPE_PROJECT_HAS_COMMIT:
	case self::TYPE_DREV_HAS_COMMIT:
	return '%s added %d commit(s): %s.';
	case self::TYPE_TASK_DEPENDS_ON_TASK:
	+ return '%s added %d blocking task(s): %s.';
	case self::TYPE_DREV_DEPENDS_ON_DREV:
	return '%s added %d dependencie(s): %s.';
	case self::TYPE_TASK_DEPENDED_ON_BY_TASK:
	- return '%s added %d dependent task(s): %s.';
	+ return '%s added %d blocked task(s): %s.';
	case self::TYPE_COMMIT_HAS_TASK:
	case self::TYPE_DREV_HAS_RELATED_TASK:
	case self::TYPE_MOCK_HAS_TASK:
	return '%s added %d task(s): %s.';
	case self::TYPE_DREV_DEPENDED_ON_BY_DREV:
	case self::TYPE_TASK_HAS_RELATED_DREV:
	case self::TYPE_COMMIT_HAS_DREV:
	case self::TYPE_REVIEWER_FOR_DREV:
	return '%s added %d revision(s): %s.';
	case self::TYPE_BLOG_HAS_POST:
	return '%s added %d post(s): %s.';
	case self::TYPE_POST_HAS_BLOG:
	case self::TYPE_BLOGGER_HAS_BLOG:
	return '%s added %d blog(s): %s.';
	case self::TYPE_BLOG_HAS_BLOGGER:
	return '%s added %d blogger(s): %s.';
	case self::TYPE_PROJ_MEMBER:
	return '%s added %d member(s): %s.';
	case self::TYPE_MEMBER_OF_PROJ:
	case self::TYPE_COMMIT_HAS_PROJECT:
	case self::TYPE_OBJECT_HAS_PROJECT:
	return '%s added %d project(s): %s.';
	case self::TYPE_QUESTION_HAS_VOTING_USER:
	case self::TYPE_ANSWER_HAS_VOTING_USER:
	return '%s added %d voting user(s): %s.';
	case self::TYPE_VOTING_USER_HAS_QUESTION:
	return '%s added %d question(s): %s.';
	case self::TYPE_VOTING_USER_HAS_ANSWER:
	return '%s added %d answer(s): %s.';
	case self::TYPE_OBJECT_HAS_SUBSCRIBER:
	return '%s added %d subscriber(s): %s.';
	case self::TYPE_OBJECT_HAS_UNSUBSCRIBER:
	return '%s added %d unsubcriber(s): %s.';
	case self::TYPE_OBJECT_HAS_FILE:
	return '%s added %d file(s): %s.';
	case self::TYPE_ACCOUNT_HAS_MEMBER:
	return '%s added %d member(s): %s.';
	case self::TYPE_MEMBER_HAS_ACCOUNT:
	return '%s added %d account(s): %s.';
	case self::TYPE_PURCAHSE_HAS_CHARGE:
	return '%s added %d charge(s): %s.';
	case self::TYPE_CHARGE_HAS_PURCHASE:
	return '%s added %d purchase(s): %s.';
	case self::TYPE_OBJECT_HAS_CONTRIBUTOR:
	return '%s added %d contributor(s): %s.';
	case self::TYPE_DREV_HAS_REVIEWER:
	return '%s added %d reviewer(s): %s.';
	case self::TYPE_TASK_HAS_MOCK:
	return '%s added %d mock(s): %s.';
	case self::TYPE_DASHBOARD_HAS_PANEL:
	return '%s added %d panel(s): %s.';
	case self::TYPE_PANEL_HAS_DASHBOARD:
	return '%s added %d dashboard(s): %s.';
	case self::TYPE_OBJECT_HAS_WATCHER:
	return '%s added %d watcher(s): %s.';
	case self::TYPE_SUBSCRIBED_TO_OBJECT:
	case self::TYPE_UNSUBSCRIBED_FROM_OBJECT:
	case self::TYPE_FILE_HAS_OBJECT:
	case self::TYPE_CONTRIBUTED_TO_OBJECT:
	case self::TYPE_PROJECT_HAS_OBJECT:
	default:
	return '%s added %d object(s): %s.';

	}
	}

	public static function getRemoveStringForEdgeType($type) {
	switch ($type) {
	case self::TYPE_TASK_HAS_COMMIT:
	case self::TYPE_PROJECT_HAS_COMMIT:
	case self::TYPE_DREV_HAS_COMMIT:
	return '%s removed %d commit(s): %s.';
	case self::TYPE_TASK_DEPENDS_ON_TASK:
	- return '%s removed %d dependencie(s): %s.';
	+ return '%s removed %d blocking task(s): %s.';
	case self::TYPE_TASK_DEPENDED_ON_BY_TASK:
	- return '%s removed %d dependent task(s): %s.';
	+ return '%s removed %d blocked task(s): %s.';
	case self::TYPE_COMMIT_HAS_TASK:
	case self::TYPE_DREV_HAS_RELATED_TASK:
	case self::TYPE_MOCK_HAS_TASK:
	return '%s removed %d task(s): %s.';
	case self::TYPE_DREV_DEPENDS_ON_DREV:
	case self::TYPE_DREV_DEPENDED_ON_BY_DREV:
	case self::TYPE_TASK_HAS_RELATED_DREV:
	case self::TYPE_COMMIT_HAS_DREV:
	case self::TYPE_REVIEWER_FOR_DREV:
	return '%s removed %d revision(s): %s.';
	case self::TYPE_BLOG_HAS_POST:
	return '%s removed %d post(s): %s.';
	case self::TYPE_POST_HAS_BLOG:
	case self::TYPE_BLOGGER_HAS_BLOG:
	return '%s removed %d blog(s): %s.';
	case self::TYPE_BLOG_HAS_BLOGGER:
	return '%s removed %d blogger(s): %s.';
	case self::TYPE_PROJ_MEMBER:
	return '%s removed %d member(s): %s.';
	case self::TYPE_MEMBER_OF_PROJ:
	case self::TYPE_COMMIT_HAS_PROJECT:
	case self::TYPE_OBJECT_HAS_PROJECT:
	return '%s removed %d project(s): %s.';
	case self::TYPE_QUESTION_HAS_VOTING_USER:
	case self::TYPE_ANSWER_HAS_VOTING_USER:
	return '%s removed %d voting user(s): %s.';
	case self::TYPE_VOTING_USER_HAS_QUESTION:
	return '%s removed %d question(s): %s.';
	case self::TYPE_VOTING_USER_HAS_ANSWER:
	return '%s removed %d answer(s): %s.';
	case self::TYPE_OBJECT_HAS_SUBSCRIBER:
	return '%s removed %d subscriber(s): %s.';
	case self::TYPE_OBJECT_HAS_UNSUBSCRIBER:
	return '%s removed %d unsubcriber(s): %s.';
	case self::TYPE_OBJECT_HAS_FILE:
	return '%s removed %d file(s): %s.';
	case self::TYPE_ACCOUNT_HAS_MEMBER:
	return '%s removed %d member(s): %s.';
	case self::TYPE_MEMBER_HAS_ACCOUNT:
	return '%s removed %d account(s): %s.';
	case self::TYPE_PURCAHSE_HAS_CHARGE:
	return '%s removed %d charge(s): %s.';
	case self::TYPE_CHARGE_HAS_PURCHASE:
	return '%s removed %d purchase(s): %s.';
	case self::TYPE_OBJECT_HAS_CONTRIBUTOR:
	return '%s removed %d contributor(s): %s.';
	case self::TYPE_DREV_HAS_REVIEWER:
	return '%s removed %d reviewer(s): %s.';
	case self::TYPE_TASK_HAS_MOCK:
	return '%s removed %d mock(s): %s.';
	case self::TYPE_DASHBOARD_HAS_PANEL:
	return '%s removed %d panel(s): %s.';
	case self::TYPE_PANEL_HAS_DASHBOARD:
	return '%s removed %d dashboard(s): %s.';
	case self::TYPE_OBJECT_HAS_WATCHER:
	return '%s removed %d watcher(s): %s.';
	case self::TYPE_SUBSCRIBED_TO_OBJECT:
	case self::TYPE_UNSUBSCRIBED_FROM_OBJECT:
	case self::TYPE_FILE_HAS_OBJECT:
	case self::TYPE_CONTRIBUTED_TO_OBJECT:
	case self::TYPE_PROJECT_HAS_OBJECT:
	default:
	return '%s removed %d object(s): %s.';

	}
	}

	public static function getFeedStringForEdgeType($type) {
	switch ($type) {
	case self::TYPE_TASK_HAS_COMMIT:
	case self::TYPE_PROJECT_HAS_COMMIT:
	case self::TYPE_DREV_HAS_COMMIT:
	return '%s updated commits of %s.';
	case self::TYPE_COMMIT_HAS_TASK:
	case self::TYPE_TASK_DEPENDS_ON_TASK:
	case self::TYPE_TASK_DEPENDED_ON_BY_TASK:
	case self::TYPE_DREV_HAS_RELATED_TASK:
	case self::TYPE_MOCK_HAS_TASK:
	return '%s updated tasks of %s.';
	case self::TYPE_DREV_DEPENDS_ON_DREV:
	case self::TYPE_DREV_DEPENDED_ON_BY_DREV:
	case self::TYPE_TASK_HAS_RELATED_DREV:
	case self::TYPE_COMMIT_HAS_DREV:
	case self::TYPE_REVIEWER_FOR_DREV:
	return '%s updated revisions of %s.';
	case self::TYPE_BLOG_HAS_POST:
	return '%s updated posts of %s.';
	case self::TYPE_POST_HAS_BLOG:
	case self::TYPE_BLOGGER_HAS_BLOG:
	return '%s updated blogs of %s.';
	case self::TYPE_BLOG_HAS_BLOGGER:
	return '%s updated bloggers of %s.';
	case self::TYPE_PROJ_MEMBER:
	return '%s updated members of %s.';
	case self::TYPE_MEMBER_OF_PROJ:
	case self::TYPE_COMMIT_HAS_PROJECT:
	case self::TYPE_OBJECT_HAS_PROJECT:
	return '%s updated projects of %s.';
	case self::TYPE_QUESTION_HAS_VOTING_USER:
	case self::TYPE_ANSWER_HAS_VOTING_USER:
	return '%s updated voting users of %s.';
	case self::TYPE_VOTING_USER_HAS_QUESTION:
	return '%s updated questions of %s.';
	case self::TYPE_VOTING_USER_HAS_ANSWER:
	return '%s updated answers of %s.';
	case self::TYPE_OBJECT_HAS_SUBSCRIBER:
	return '%s updated subscribers of %s.';
	case self::TYPE_OBJECT_HAS_UNSUBSCRIBER:
	return '%s updated unsubcribers of %s.';
	case self::TYPE_OBJECT_HAS_FILE:
	return '%s updated files of %s.';
	case self::TYPE_ACCOUNT_HAS_MEMBER:
	return '%s updated members of %s.';
	case self::TYPE_MEMBER_HAS_ACCOUNT:
	return '%s updated accounts of %s.';
	case self::TYPE_PURCAHSE_HAS_CHARGE:
	return '%s updated charges of %s.';
	case self::TYPE_CHARGE_HAS_PURCHASE:
	return '%s updated purchases of %s.';
	case self::TYPE_OBJECT_HAS_CONTRIBUTOR:
	return '%s updated contributors of %s.';
	case self::TYPE_DREV_HAS_REVIEWER:
	return '%s updated reviewers of %s.';
	case self::TYPE_TASK_HAS_MOCK:
	return '%s updated mocks of %s.';
	case self::TYPE_PANEL_HAS_DASHBOARD:
	return '%s updated panels for %s.';
	case self::TYPE_PANEL_HAS_DASHBOARD:
	return '%s updated dashboards for %s.';
	case self::TYPE_OBJECT_HAS_WATCHER:
	return '%s updated watchers for %s.';
	case self::TYPE_SUBSCRIBED_TO_OBJECT:
	case self::TYPE_UNSUBSCRIBED_FROM_OBJECT:
	case self::TYPE_FILE_HAS_OBJECT:
	case self::TYPE_CONTRIBUTED_TO_OBJECT:
	case self::TYPE_PROJECT_HAS_OBJECT:
	default:
	return '%s updated objects of %s.';

	}
	}

	}
	diff --git a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
	index 451da3d1ca..acabccf577 100644
	--- a/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
	+++ b/src/infrastructure/internationalization/translation/PhabricatorBaseEnglishTranslation.php
	@@ -1,918 +1,946 @@
	<?php

	abstract class PhabricatorBaseEnglishTranslation
	extends PhabricatorTranslation {

	final public function getLanguage() {
	return 'en';
	}

	public function getTranslations() {
	return array(
	'These %d configuration value(s) are related:' => array(
	'This configuration value is related:',
	'These configuration values are related:',
	),
	'Differential Revision(s)' => array(
	'Differential Revision',
	'Differential Revisions',
	),
	'file(s)' => array('file', 'files'),
	'Maniphest Task(s)' => array('Maniphest Task', 'Maniphest Tasks'),
	'Task(s)' => array('Task', 'Tasks'),

	'Please fix these errors and try again.' => array(
	'Please fix this error and try again.',
	'Please fix these errors and try again.',
	),

	'%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)'),

	'COMMIT(S)' => array('COMMIT', 'COMMITS'),

	'%d line(s)' => array('%d line', '%d lines'),
	'%d path(s)' => array('%d path', '%d paths'),
	'%d diff(s)' => array('%d diff', '%d diffs'),

	'added %d commit(s): %s' => array(
	'added commit: %2$s',
	'added commits: %2$s',
	),

	'removed %d commit(s): %s' => array(
	'removed commit: %2$s',
	'removed commits: %2$s',
	),

	'changed %d commit(s), added %d: %s; removed %d: %s' =>
	'changed commits, added: %3$s; removed: %5$s',

	'ATTACHED %d COMMIT(S)' => array(
	'ATTACHED COMMIT',
	'ATTACHED COMMITS',
	),

	'added %d mock(s): %s' => array(
	'added a mock: %2$s',
	'added mocks: %2$s',
	),

	'removed %d mock(s): %s' => array(
	'removed a mock: %2$s',
	'removed mocks: %2$s',
	),

	'changed %d mock(s), added %d: %s; removed %d: %s' =>
	'changed mocks, added: %3$s; removed: %5$s',

	'ATTACHED %d MOCK(S)' => array(
	'ATTACHED MOCK',
	'ATTACHED MOCKS',
	),

	'added %d dependencie(s): %s' => array(
	'added dependency: %2$s',
	'added dependencies: %2$s',
	),

	'added %d dependent task(s): %s' => array(
	'added dependent task: %2$s',
	'added dependent tasks: %2$s',
	),

	'removed %d dependencie(s): %s' => array(
	'removed dependency: %2$s',
	'removed dependencies: %2$s',
	),

	'removed %d dependent task(s): %s' => array(
	'removed dependent task: %2$s',
	'removed dependent tasks: %2$s',
	),

	'changed %d dependencie(s), added %d: %s; removed %d: %s' =>
	'changed dependencies, added: %3$s; removed: %5$s',

	'changed %d dependent task(s), added %d: %s; removed %d: %s',
	'changed dependent tasks, added: %3$s; removed: %5$s',

	'DEPENDENT %d TASK(s)' => array(
	'DEPENDENT TASK',
	'DEPENDENT TASKS',
	),

	'DEPENDS ON %d TASK(S)' => array(
	'DEPENDS ON TASK',
	'DEPENDS ON TASKS',
	),

	'DIFFERENTIAL %d REVISION(S)' => array(
	'DIFFERENTIAL REVISION',
	'DIFFERENTIAL REVISIONS',
	),

	'added %d revision(s): %s' => array(
	'added revision: %2$s',
	'added revisions: %2$s',
	),

	'removed %d revision(s): %s' => array(
	'removed revision: %2$s',
	'removed revisions: %2$s',
	),

	'changed %d revision(s), added %d: %s; removed %d: %s' =>
	'changed revisions, added %3$s; removed %5$s',

	'%s edited revision(s), added %d: %s; removed %d: %s.' =>
	'%s edited revisions, added: %3$s; removed: %5$s',

	'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 Flagged Object(s)' => array(
	'%d Flagged Object',
	'%d Flagged Objects',
	),

	'%d Unbreak Now Task(s)!' => array(
	'%d Unbreak Now Task!',
	'%d Unbreak Now Tasks!',
	),

	'%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',
	),
	'Switch for %d Lint Message(s)' => array(
	'Switch for %d Lint Message',
	'Switch for %d Lint Messages',
	),
	'%d Lint Message(s)' => array(
	'%d Lint Message',
	'%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.',
	),

	'%d Action(s) Have No Effect' => array(
	'Action Has No Effect',
	'Actions Have No Effect',
	),

	'%d Action(s) With No Effect' => array(
	'Action With No Effect',
	'Actions With No Effect',
	),

	'Some of your %d 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 %d 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 post(s), added %d: %s; removed %d: %s.' =>
	'%s edited posts, added: %3$s; removed: %5$s',

	'%s added %d post(s): %s.' => array(
	array(
	'%s added a post: %3$s.',
	'%s added posts: %3$s.',
	),
	),

	'%s removed %d post(s): %s.' => array(
	array(
	'%s removed a post: %3$s.',
	'%s removed posts: %3$s.',
	),
	),

	'%s edited blog(s), added %d: %s; removed %d: %s.' =>
	'%s edited blogs, added: %3$s; removed: %5$s',

	'%s added %d blog(s): %s.' => array(
	array(
	'%s added a blog: %3$s.',
	'%s added blogs: %3$s.',
	),
	),

	'%s removed %d blog(s): %s.' => array(
	array(
	'%s removed a blog: %3$s.',
	'%s removed blogs: %3$s.',
	),
	),

	'%s edited blogger(s), added %d: %s; removed %d: %s.' =>
	'%s edited bloggers, added: %3$s; removed: %5$s',

	'%s added %d blogger(s): %s.' => array(
	array(
	'%s added a blogger: %3$s.',
	'%s added bloggers: %3$s.',
	),
	),

	'%s removed %d blogger(s): %s.' => array(
	array(
	'%s removed a blogger: %3$s.',
	'%s removed bloggers: %3$s.',
	),
	),

	'%s edited member(s), added %d: %s; removed %d: %s.' =>
	'%s edited members, added: %3$s; removed: %5$s',

	'%s added %d member(s): %s.' => array(
	array(
	'%s added a member: %3$s.',
	'%s added members: %3$s.',
	),
	),

	'%s removed %d member(s): %s.' => array(
	array(
	'%s removed a member: %3$s.',
	'%s removed members: %3$s.',
	),
	),

	'%s edited project(s), added %d: %s; removed %d: %s.' =>
	'%s edited projects, added: %3$s; removed: %5$s',

	'%s added %d project(s): %s.' => array(
	array(
	'%s added a project: %3$s.',
	'%s added projects: %3$s.',
	),
	),

	'%s removed %d project(s): %s.' => array(
	array(
	'%s removed a project: %3$s.',
	'%s removed projects: %3$s.',
	),
	),

	'%s changed project(s) of %s, added %d: %s; removed %d: %s' =>
	'%s changed projects of %s, added: %4$s; removed: %6$s',

	'%s added %d 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 %d 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 voting user(s), added %d: %s; removed %d: %s.' =>
	'%s edited voting users, added: %3$s; removed: %5$s',

	'%s added %d voting user(s): %s.' => array(
	array(
	'%s added a voting user: %3$s.',
	'%s added voting users: %3$s.',
	),
	),

	'%s removed %d voting user(s): %s.' => array(
	array(
	'%s removed a voting user: %3$s.',
	'%s removed voting users: %3$s.',
	),
	),

	+ '%s added %d blocking task(s): %s.' => array(
	+ array(
	+ '%s added a blocking task: %3$s.',
	+ '%s added blocking tasks: %3$s.'
	+ ),
	+ ),
	+
	+ '%s added %d blocked task(s): %s.' => array(
	+ array(
	+ '%s added a blocked task: %3$s.',
	+ '%s added blocked tasks: %3$s.'
	+ )
	+ ),
	+
	+ '%s removed %d blocking task(s): %s.' => array(
	+ array(
	+ '%s removed a blocking task: %3$s.',
	+ '%s removed blocking tasks: %3$s.'
	+ ),
	+ ),
	+
	+ '%s removed %d blocked task(s): %s.' => array(
	+ array(
	+ '%s removed a blocked task: %3$s.',
	+ '%s removed blocked tasks: %3$s.'
	+ )
	+ ),
	+
	'%s edited answer(s), added %d: %s; removed %d: %s.' =>
	'%s edited answers, added: %3$s; removed: %5$s',

	'%s added %d answer(s): %s.' => array(
	array(
	- '%s added a answer: %3$s.',
	+ '%s added an answer: %3$s.',
	'%s added answers: %3$s.',
	),
	),

	'%s removed %d answer(s): %s.' => array(
	array(
	'%s removed a answer: %3$s.',
	'%s removed answers: %3$s.',
	),
	),

	'%s edited question(s), added %d: %s; removed %d: %s.' =>
	'%s edited questions, added: %3$s; removed: %5$s',

	'%s added %d question(s): %s.' => array(
	array(
	'%s added a question: %3$s.',
	'%s added questions: %3$s.',
	),
	),

	'%s removed %d question(s): %s.' => array(
	array(
	'%s removed a question: %3$s.',
	'%s removed questions: %3$s.',
	),
	),

	'%s edited mock(s), added %d: %s; removed %d: %s.' =>
	'%s edited mocks, added: %3$s; removed: %5$s',

	'%s added %d mock(s): %s.' => array(
	array(
	'%s added a mock: %3$s.',
	'%s added mocks: %3$s.',
	),
	),

	'%s removed %d mock(s): %s.' => array(
	array(
	'%s removed a mock: %3$s.',
	'%s removed mocks: %3$s.',
	),
	),

	'%s edited task(s), added %d: %s; removed %d: %s.' =>
	'%s edited tasks, added: %3$s; removed: %5$s',

	'%s added %d task(s): %s.' => array(
	array(
	'%s added a task: %3$s.',
	'%s added tasks: %3$s.',
	),
	),

	'%s removed %d task(s): %s.' => array(
	array(
	'%s removed a task: %3$s.',
	'%s removed tasks: %3$s.',
	),
	),

	'%s edited file(s), added %d: %s; removed %d: %s.' =>
	'%s edited files, added: %3$s; removed: %5$s',

	'%s added %d file(s): %s.' => array(
	array(
	'%s added a file: %3$s.',
	'%s added files: %3$s.',
	),
	),

	'%s removed %d file(s): %s.' => array(
	array(
	'%s removed a file: %3$s.',
	'%s removed files: %3$s.',
	),
	),

	'%s edited account(s), added %d: %s; removed %d: %s.' =>
	'%s edited accounts, added: %3$s; removed: %5$s',

	'%s added %d account(s): %s.' => array(
	array(
	'%s added a account: %3$s.',
	'%s added accounts: %3$s.',
	),
	),

	'%s removed %d account(s): %s.' => array(
	array(
	'%s removed a account: %3$s.',
	'%s removed accounts: %3$s.',
	),
	),

	'%s edited charge(s), added %d: %s; removed %d: %s.' =>
	'%s edited charges, added: %3$s; removed: %5$s',

	'%s added %d charge(s): %s.' => array(
	array(
	'%s added a charge: %3$s.',
	'%s added charges: %3$s.',
	),
	),

	'%s removed %d charge(s): %s.' => array(
	array(
	'%s removed a charge: %3$s.',
	'%s removed charges: %3$s.',
	),
	),

	'%s edited purchase(s), added %d: %s; removed %d: %s.' =>
	'%s edited purchases, added: %3$s; removed: %5$s',

	'%s added %d purchase(s): %s.' => array(
	array(
	'%s added a purchase: %3$s.',
	'%s added purchases: %3$s.',
	),
	),

	'%s removed %d purchase(s): %s.' => array(
	array(
	'%s removed a purchase: %3$s.',
	'%s removed purchases: %3$s.',
	),
	),

	'%s edited contributor(s), added %d: %s; removed %d: %s.' =>
	'%s edited contributors, added: %3$s; removed: %5$s',

	'%s added %d contributor(s): %s.' => array(
	array(
	'%s added a contributor: %3$s.',
	'%s added contributors: %3$s.',
	),
	),

	'%s removed %d contributor(s): %s.' => array(
	array(
	'%s removed a contributor: %3$s.',
	'%s removed contributors: %3$s.',
	),
	),

	'%s edited reviewer(s), added %d: %s; removed %d: %s.' =>
	'%s edited reviewers, added: %3$s; removed: %5$s',

	'%s added %d reviewer(s): %s.' => array(
	array(
	'%s added a reviewer: %3$s.',
	'%s added reviewers: %3$s.',
	),
	),

	'%s removed %d reviewer(s): %s.' => array(
	array(
	'%s removed a reviewer: %3$s.',
	'%s removed reviewers: %3$s.',
	),
	),

	'%s edited object(s), added %d: %s; removed %d: %s.' =>
	'%s edited objects, added: %3$s; removed: %5$s',

	'%s added %d object(s): %s.' => array(
	array(
	'%s added a object: %3$s.',
	'%s added objects: %3$s.',
	),
	),

	'%s removed %d object(s): %s.' => array(
	array(
	'%s removed a object: %3$s.',
	'%s removed objects: %3$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 unsubscriber(s), added %d: %s; removed %d: %s.' =>
	'%s edited unsubscribers, added: %3$s; removed: %5$s',

	'%s added %d unsubscriber(s): %s.' => array(
	array(
	'%s added a unsubscriber: %3$s.',
	'%s added unsubscribers: %3$s.',
	),
	),

	'%s removed %d unsubscriber(s): %s.' => array(
	array(
	'%s removed a unsubscriber: %3$s.',
	'%s removed unsubscribers: %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.',
	),
	),

	'%d people(s)' => array(
	array(
	'%d person',
	'%d people',
	),
	),

	'%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:',
	),

	'To update these %d value(s), run these command(s) from the command line:'
	=> array(
	'To update this value, run this command from the command line:',
	'To update these values, run these commands from the command line:',
	),

	'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 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.',
	),
	),

	'%d comment(s)' => array('%d comment', '%d comments'),
	'%d rejection(s)' => array('%d rejection', '%d rejections'),
	'%d update(s)' => array('%d update', '%d 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.',
	),

	'%d Open Pull Request(s)' => array(
	'%d Open Pull Request',
	'%d 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 added %d project(s): %s' => array(
	array(
	'%s added a project: %3$s',
	'%s added projects: %3$s',
	),
	),

	'%s removed %d project(s): %s' => array(
	array(
	'%s removed a project: %3$s',
	'%s removed projects: %3$s',
	),
	),

	'%s changed project(s), added %d: %s; removed %d: %s' =>
	'%s changed projects, added: %3$s; removed: %5$s',

	'%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 %d dependencie(s): %s.' => array(
	array(
	'%s added a dependency: %3$s',
	'%s added dependencies: %3$s',
	),
	),

	'%s added %d dependent task(s): %s.' => array(
	array(
	'%s added a dependent task: %3$s',
	'%s added dependent tasks: %3$s',
	),
	),

	'%s removed %d dependencie(s): %s.' => array(
	array(
	'%s removed a dependency: %3$s.',
	'%s removed dependencies: %3$s.',
	),
	),

	'%s removed %d dependent task(s): %s.' => array(
	array(
	'%s removed a dependent task: %3$s.',
	'%s removed dependent tasks: %3$s.',
	),
	),

	'%s added %d revision(s): %s.' => array(
	array(
	'%s added a revision: %3$s.',
	'%s added revisions: %3$s.',
	),
	),

	'%s removed %d revision(s): %s.' => array(
	array(
	'%s removed a revision: %3$s.',
	'%s removed revisions: %3$s.',
	),
	),

	'%s added %d commit(s): %s.' => array(
	array(
	'%s added a commit: %3$s.',
	'%s added commits: %3$s.',
	),
	),

	'%s removed %d commit(s): %s.' => array(
	array(
	'%s removed a commit: %3$s.',
	'%s removed commits: %3$s.',
	),
	),

	'%s edited commit(s), added %d: %s; removed %d: %s.' =>
	'%s edited commits, added %3$s; removed %5$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',
	),
	),

	'%d User(s) Need Approval' => array(
	'%d User Needs Approval',
	'%d Users Need Approval',
	),

	'Warning: there are %d signature(s) already for this document. '.
	'Updating the title or text will invalidate these signatures and users '.
	'will need to sign again. Proceed carefully.' => array(
	'Warning: there is %d signature already for this document. '.
	'Updating the title or text will invalidate this signature and the '.
	'user will need to sign again. Proceed carefully.',
	'Warning: there are %d signatures already for this document. '.
	'Updating the title or text will invalidate these signatures and '.
	'users will need to sign again. Proceed carefully.',
	),

	'%s older changes(s) are hidden.' => array(
	'%d older change is hidden.',
	'%d older changes are hidden.',
	),

	'%s, %s line(s)' => 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 %d JIRA issue(s): %s.' => array(
	array(
	'%s removed a JIRA issue: %3$s.',
	'%s removed JIRA issues: %3$s.',
	),
	),

	'%s added %d JIRA issue(s): %s.' => array(
	array(
	'%s added a JIRA issue: %3$s.',
	'%s added JIRA issues: %3$s.',
	),
	),

	'%s updated JIRA issue(s): added %d %s; removed %d %s.' =>
	'%s updated JIRA issues: added %3$s; removed %5$s.',

	);
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Wed, Nov 5, 3:59 PM (9 h, 44 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 321099
Default Alt Text: (82 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions