Merge branch 'master' into phutil_tag

(Synchronizing.)
2013-01-29 11:05:02 -08:00
parent 40547030a5 3e7a7518fa
commit 39221b1d3f
88 changed files with 1195 additions and 576 deletions
--- a/src/applications/conpherence/controller/ConpherenceController.php
+++ b/src/applications/conpherence/controller/ConpherenceController.php
@@ -107,9 +107,9 @@ abstract class ConpherenceController extends PhabricatorController {
    $nav->addClass('conpherence-menu');
    $nav->setMenuID('conpherence-menu');

-    $nav->addFilter(
+    $nav->addButton(
      'new',
-      pht('New Conpherence'),
+      pht('New Conversation'),
      $this->getApplicationURI('new/')
    );
    $nav->addLabel(pht('Unread'));
@@ -183,7 +183,7 @@ abstract class ConpherenceController extends PhabricatorController {
    $crumbs
      ->addAction(
        id(new PhabricatorMenuItemView())
-          ->setName(pht('New Conpherence'))
+          ->setName(pht('New Conversation'))
          ->setHref($this->getApplicationURI('new/'))
          ->setIcon('create')
      )