diff --git a/src/applications/repository/xaction/PhabricatorRepositoryVCSTransaction.php b/src/applications/repository/xaction/PhabricatorRepositoryVCSTransaction.php
index d5944d5425..84ee86dc76 100644
--- a/src/applications/repository/xaction/PhabricatorRepositoryVCSTransaction.php
+++ b/src/applications/repository/xaction/PhabricatorRepositoryVCSTransaction.php
@@ -1,66 +1,66 @@
 <?php
 
 final class PhabricatorRepositoryVCSTransaction
   extends PhabricatorRepositoryTransactionType {
 
   const TRANSACTIONTYPE = 'repo:vcs';
 
   public function generateOldValue($object) {
     return $object->getVersionControlSystem();
   }
 
   public function applyInternalEffects($object, $value) {
     $object->setVersionControlSystem($value);
   }
 
   public function validateTransactions($object, array $xactions) {
     $errors = array();
 
     $vcs_map = PhabricatorRepositoryType::getAllRepositoryTypes();
     $current_vcs = $object->getVersionControlSystem();
 
     if (!$this->isNewObject()) {
       foreach ($xactions as $xaction) {
         if ($xaction->getNewValue() == $current_vcs) {
           continue;
         }
 
         $errors[] = $this->newInvalidError(
           pht(
             'You can not change the version control system an existing '.
             'repository uses. It can only be set when a repository is '.
             'first created.'),
           $xaction);
       }
 
       return $errors;
     }
 
     $value = $object->getVersionControlSystem();
 
     foreach ($xactions as $xaction) {
       $value = $xaction->getNewValue();
 
       if (isset($vcs_map[$value])) {
         continue;
       }
 
       $errors[] = $this->newInvalidError(
         pht(
           'Specified version control system must be a VCS '.
-          'recognized by Phabricator. Valid systems are: %s.',
+          'recognized by this software. Valid systems are: %s.',
           implode(', ', array_keys($vcs_map))),
         $xaction);
     }
 
     if ($value === null) {
       $errors[] = $this->newRequiredError(
         pht(
           'When creating a repository, you must specify a valid '.
           'underlying version control system. Valid systems are: %s.',
           implode(', ', array_keys($vcs_map))));
     }
 
     return $errors;
   }
 }
diff --git a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
index 8f7f633e7e..a888bb3175 100644
--- a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
@@ -1,414 +1,415 @@
 <?php
 
 final class PhabricatorEmailAddressesSettingsPanel
   extends PhabricatorSettingsPanel {
 
   public function getPanelKey() {
     return 'email';
   }
 
   public function getPanelName() {
     return pht('Email Addresses');
   }
 
   public function getPanelMenuIcon() {
     return 'fa-at';
   }
 
   public function getPanelGroupKey() {
     return PhabricatorSettingsEmailPanelGroup::PANELGROUPKEY;
   }
 
   public function isEditableByAdministrators() {
     if ($this->getUser()->getIsMailingList()) {
       return true;
     }
 
     return false;
   }
 
   public function processRequest(AphrontRequest $request) {
     $user = $this->getUser();
     $editable = PhabricatorEnv::getEnvConfig('account.editable');
 
     $uri = new PhutilURI($request->getPath());
 
     if ($editable) {
       $new = $request->getStr('new');
       if ($new) {
         return $this->returnNewAddressResponse($request, $uri, $new);
       }
 
       $delete = $request->getInt('delete');
       if ($delete) {
         return $this->returnDeleteAddressResponse($request, $uri, $delete);
       }
     }
 
     $verify = $request->getInt('verify');
     if ($verify) {
       return $this->returnVerifyAddressResponse($request, $uri, $verify);
     }
 
     $primary = $request->getInt('primary');
     if ($primary) {
       return $this->returnPrimaryAddressResponse($request, $uri, $primary);
     }
 
     $emails = id(new PhabricatorUserEmail())->loadAllWhere(
       'userPHID = %s ORDER BY address',
       $user->getPHID());
 
     $rowc = array();
     $rows = array();
     foreach ($emails as $email) {
 
       $button_verify = javelin_tag(
         'a',
         array(
           'class' => 'button small button-grey',
           'href'  => $uri->alter('verify', $email->getID()),
           'sigil' => 'workflow',
         ),
         pht('Verify'));
 
       $button_make_primary = javelin_tag(
         'a',
         array(
           'class' => 'button small button-grey',
           'href'  => $uri->alter('primary', $email->getID()),
           'sigil' => 'workflow',
         ),
         pht('Make Primary'));
 
       $button_remove = javelin_tag(
         'a',
         array(
           'class'   => 'button small button-grey',
           'href'    => $uri->alter('delete', $email->getID()),
           'sigil'   => 'workflow',
         ),
         pht('Remove'));
 
       $button_primary = phutil_tag(
         'a',
         array(
           'class' => 'button small disabled',
         ),
         pht('Primary'));
 
       if (!$email->getIsVerified()) {
         $action = $button_verify;
       } else if ($email->getIsPrimary()) {
         $action = $button_primary;
       } else {
         $action = $button_make_primary;
       }
 
       if ($email->getIsPrimary()) {
         $remove = $button_primary;
         $rowc[] = 'highlighted';
       } else {
         $remove = $button_remove;
         $rowc[] = null;
       }
 
       $rows[] = array(
         $email->getAddress(),
         $action,
         $remove,
       );
     }
 
     $table = new AphrontTableView($rows);
     $table->setHeaders(
       array(
         pht('Email'),
         pht('Status'),
         pht('Remove'),
       ));
     $table->setColumnClasses(
       array(
         'wide',
         'action',
         'action',
       ));
     $table->setRowClasses($rowc);
     $table->setColumnVisibility(
       array(
         true,
         true,
         $editable,
       ));
 
     $buttons = array();
     if ($editable) {
       $buttons[] = id(new PHUIButtonView())
         ->setTag('a')
         ->setIcon('fa-plus')
         ->setText(pht('Add New Address'))
         ->setHref($uri->alter('new', 'true'))
         ->addSigil('workflow')
         ->setColor(PHUIButtonView::GREY);
     }
 
     return $this->newBox(pht('Email Addresses'), $table, $buttons);
   }
 
   private function returnNewAddressResponse(
     AphrontRequest $request,
     PhutilURI $uri,
     $new) {
 
     $user = $this->getUser();
     $viewer = $this->getViewer();
 
     $token = id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
       $viewer,
       $request,
       $this->getPanelURI());
 
     $e_email = true;
     $email   = null;
     $errors  = array();
     if ($request->isDialogFormPost()) {
       $email = trim($request->getStr('email'));
 
       if ($new == 'verify') {
         // The user clicked "Done" from the "an email has been sent" dialog.
         return id(new AphrontReloadResponse())->setURI($uri);
       }
 
       PhabricatorSystemActionEngine::willTakeAction(
         array($viewer->getPHID()),
         new PhabricatorSettingsAddEmailAction(),
         1);
 
       if (!strlen($email)) {
         $e_email = pht('Required');
         $errors[] = pht('Email is required.');
       } else if (!PhabricatorUserEmail::isValidAddress($email)) {
         $e_email = pht('Invalid');
         $errors[] = PhabricatorUserEmail::describeValidAddresses();
       } else if (!PhabricatorUserEmail::isAllowedAddress($email)) {
         $e_email = pht('Disallowed');
         $errors[] = PhabricatorUserEmail::describeAllowedAddresses();
       }
       if ($e_email === true) {
         $application_email = id(new PhabricatorMetaMTAApplicationEmailQuery())
           ->setViewer(PhabricatorUser::getOmnipotentUser())
           ->withAddresses(array($email))
           ->executeOne();
         if ($application_email) {
           $e_email = pht('In Use');
           $errors[] = $application_email->getInUseMessage();
         }
       }
 
       if (!$errors) {
         $object = id(new PhabricatorUserEmail())
           ->setAddress($email)
           ->setIsVerified(0);
 
         // If an administrator is editing a mailing list, automatically verify
         // the address.
         if ($viewer->getPHID() != $user->getPHID()) {
           if ($viewer->getIsAdmin()) {
             $object->setIsVerified(1);
           }
         }
 
         try {
           id(new PhabricatorUserEditor())
             ->setActor($viewer)
             ->addEmail($user, $object);
 
           if ($object->getIsVerified()) {
             // If we autoverified the address, just reload the page.
             return id(new AphrontReloadResponse())->setURI($uri);
           }
 
           $object->sendVerificationEmail($user);
 
           $dialog = $this->newDialog()
             ->addHiddenInput('new',  'verify')
             ->setTitle(pht('Verification Email Sent'))
             ->appendChild(phutil_tag('p', array(), pht(
               'A verification email has been sent. Click the link in the '.
               'email to verify your address.')))
             ->setSubmitURI($uri)
             ->addSubmitButton(pht('Done'));
 
           return id(new AphrontDialogResponse())->setDialog($dialog);
         } catch (AphrontDuplicateKeyQueryException $ex) {
           $e_email = pht('Duplicate');
           $errors[] = pht('Another user already has this email.');
         }
       }
     }
 
     if ($errors) {
       $errors = id(new PHUIInfoView())
         ->setErrors($errors);
     }
 
     $form = id(new PHUIFormLayoutView())
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Email'))
           ->setName('email')
           ->setValue($email)
           ->setCaption(PhabricatorUserEmail::describeAllowedAddresses())
           ->setError($e_email));
 
     $dialog = $this->newDialog()
       ->addHiddenInput('new', 'true')
       ->setTitle(pht('New Address'))
       ->appendChild($errors)
       ->appendChild($form)
       ->addSubmitButton(pht('Save'))
       ->addCancelButton($uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function returnDeleteAddressResponse(
     AphrontRequest $request,
     PhutilURI $uri,
     $email_id) {
     $user = $this->getUser();
     $viewer = $this->getViewer();
 
     $token = id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
       $viewer,
       $request,
       $this->getPanelURI());
 
     // NOTE: You can only delete your own email addresses, and you can not
     // delete your primary address.
     $email = id(new PhabricatorUserEmail())->loadOneWhere(
       'id = %d AND userPHID = %s AND isPrimary = 0',
       $email_id,
       $user->getPHID());
 
     if (!$email) {
       return new Aphront404Response();
     }
 
     if ($request->isFormPost()) {
       id(new PhabricatorUserEditor())
         ->setActor($viewer)
         ->removeEmail($user, $email);
 
       return id(new AphrontRedirectResponse())->setURI($uri);
     }
 
     $address = $email->getAddress();
 
     $dialog = id(new AphrontDialogView())
       ->setUser($viewer)
       ->addHiddenInput('delete', $email_id)
       ->setTitle(pht("Really delete address '%s'?", $address))
       ->appendParagraph(
         pht(
           'Are you sure you want to delete this address? You will no '.
           'longer be able to use it to login.'))
       ->appendParagraph(
         pht(
           'Note: Removing an email address from your account will invalidate '.
           'any outstanding password reset links.'))
       ->addSubmitButton(pht('Delete'))
       ->addCancelButton($uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function returnVerifyAddressResponse(
     AphrontRequest $request,
     PhutilURI $uri,
     $email_id) {
     $user = $this->getUser();
     $viewer = $this->getViewer();
 
     // NOTE: You can only send more email for your unverified addresses.
     $email = id(new PhabricatorUserEmail())->loadOneWhere(
       'id = %d AND userPHID = %s AND isVerified = 0',
       $email_id,
       $user->getPHID());
 
     if (!$email) {
       return new Aphront404Response();
     }
 
     if ($request->isFormPost()) {
       $email->sendVerificationEmail($user);
       return id(new AphrontRedirectResponse())->setURI($uri);
     }
 
     $address = $email->getAddress();
 
     $dialog = id(new AphrontDialogView())
       ->setUser($viewer)
       ->addHiddenInput('verify', $email_id)
       ->setTitle(pht('Send Another Verification Email?'))
       ->appendChild(phutil_tag('p', array(), pht(
         'Send another copy of the verification email to %s?',
         $address)))
       ->addSubmitButton(pht('Send Email'))
       ->addCancelButton($uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
   private function returnPrimaryAddressResponse(
     AphrontRequest $request,
     PhutilURI $uri,
     $email_id) {
     $user = $this->getUser();
     $viewer = $this->getViewer();
 
     $token = id(new PhabricatorAuthSessionEngine())->requireHighSecuritySession(
       $viewer,
       $request,
       $this->getPanelURI());
 
     // NOTE: You can only make your own verified addresses primary.
     $email = id(new PhabricatorUserEmail())->loadOneWhere(
       'id = %d AND userPHID = %s AND isVerified = 1 AND isPrimary = 0',
       $email_id,
       $user->getPHID());
 
     if (!$email) {
       return new Aphront404Response();
     }
 
     if ($request->isFormPost()) {
       id(new PhabricatorUserEditor())
         ->setActor($viewer)
         ->changePrimaryEmail($user, $email);
 
       return id(new AphrontRedirectResponse())->setURI($uri);
     }
 
     $address = $email->getAddress();
 
     $dialog = id(new AphrontDialogView())
       ->setUser($viewer)
       ->addHiddenInput('primary', $email_id)
       ->setTitle(pht('Change primary email address?'))
       ->appendParagraph(
         pht(
-          'If you change your primary address, Phabricator will send all '.
+          'If you change your primary address, %s will send all '.
           'email to %s.',
+          PlatformSymbols::getPlatformServerName(),
           $address))
       ->appendParagraph(
         pht(
           'Note: Changing your primary email address will invalidate any '.
           'outstanding password reset links.'))
       ->addSubmitButton(pht('Change Primary Address'))
       ->addCancelButton($uri);
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
 
 }
diff --git a/src/applications/settings/panel/PhabricatorNotificationsSettingsPanel.php b/src/applications/settings/panel/PhabricatorNotificationsSettingsPanel.php
index d0165dc3f1..ae5679d9dd 100644
--- a/src/applications/settings/panel/PhabricatorNotificationsSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorNotificationsSettingsPanel.php
@@ -1,183 +1,184 @@
 <?php
 
 final class PhabricatorNotificationsSettingsPanel
   extends PhabricatorSettingsPanel {
 
   public function isEnabled() {
     $servers = PhabricatorNotificationServerRef::getEnabledAdminServers();
     if (!$servers) {
       return false;
     }
 
     return PhabricatorApplication::isClassInstalled(
       'PhabricatorNotificationsApplication');
   }
 
   public function getPanelKey() {
     return 'notifications';
   }
 
   public function getPanelName() {
     return pht('Notifications');
   }
 
   public function getPanelMenuIcon() {
     return 'fa-bell-o';
   }
 
   public function getPanelGroupKey() {
     return PhabricatorSettingsApplicationsPanelGroup::PANELGROUPKEY;
   }
 
   public function processRequest(AphrontRequest $request) {
     $viewer = $this->getViewer();
     $preferences = $this->getPreferences();
 
     $notifications_key = PhabricatorNotificationsSetting::SETTINGKEY;
     $notifications_value = $preferences->getSettingValue($notifications_key);
 
     if ($request->isFormPost()) {
 
       $this->writeSetting(
         $preferences,
         $notifications_key,
         $request->getInt($notifications_key));
 
       return id(new AphrontRedirectResponse())
         ->setURI($this->getPanelURI('?saved=true'));
     }
 
     $title = pht('Notifications');
     $control_id = celerity_generate_unique_node_id();
     $status_id = celerity_generate_unique_node_id();
     $browser_status_id = celerity_generate_unique_node_id();
     $cancel_ask = pht(
       'The dialog asking for permission to send desktop notifications was '.
       'closed without granting permission. Only application notifications '.
       'will be sent.');
     $accept_ask = pht(
       'Click "Save Preference" to persist these changes.');
     $reject_ask = pht(
       'Permission for desktop notifications was denied. Only application '.
       'notifications will be sent.');
     $no_support = pht(
       'This web browser does not support desktop notifications. Only '.
       'application notifications will be sent for this browser regardless of '.
       'this preference.');
     $default_status = phutil_tag(
       'span',
       array(),
       array(
-        pht('This browser has not yet granted permission to send desktop '.
-        'notifications for this Phabricator instance.'),
+        pht(
+          'Your browser has not yet granted this server permission to send '.
+          'desktop notifications.'),
         phutil_tag('br'),
         phutil_tag('br'),
         javelin_tag(
           'button',
           array(
             'sigil' => 'desktop-notifications-permission-button',
             'class' => 'green',
           ),
           pht('Grant Permission')),
       ));
     $granted_status = phutil_tag(
       'span',
       array(),
-      pht('This browser has been granted permission to send desktop '.
-          'notifications for this Phabricator instance.'));
+      pht('Your browser has granted this server permission to send desktop '.
+          'notifications.'));
     $denied_status = phutil_tag(
       'span',
       array(),
       pht('This browser has denied permission to send desktop notifications '.
-          'for this Phabricator instance. Consult your browser settings / '.
+          'to this server. Consult your browser settings / '.
           'documentation to figure out how to clear this setting, do so, '.
           'and then re-visit this page to grant permission.'));
 
     $message_id = celerity_generate_unique_node_id();
 
     $message_container = phutil_tag(
       'span',
       array(
         'id' => $message_id,
       ));
 
     $saved_box = null;
     if ($request->getBool('saved')) {
       $saved_box = id(new PHUIInfoView())
         ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
         ->appendChild(pht('Changes saved.'));
     }
 
     $status_box = id(new PHUIInfoView())
       ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
       ->setID($status_id)
       ->setIsHidden(true)
       ->appendChild($message_container);
 
     $status_box = id(new PHUIBoxView())
       ->addClass('mll mlr')
       ->appendChild($status_box);
 
     $control_config = array(
        'controlID' => $control_id,
        'statusID' => $status_id,
        'messageID' => $message_id,
        'browserStatusID' => $browser_status_id,
        'defaultMode' => 0,
        'desktop' => 1,
        'desktopOnly' => 2,
        'cancelAsk' => $cancel_ask,
        'grantedAsk' => $accept_ask,
        'deniedAsk' => $reject_ask,
        'defaultStatus' => $default_status,
        'deniedStatus' => $denied_status,
        'grantedStatus' => $granted_status,
        'noSupport' => $no_support,
      );
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->appendChild(
         id(new AphrontFormSelectControl())
         ->setLabel($title)
         ->setControlID($control_id)
         ->setName($notifications_key)
         ->setValue($notifications_value)
         ->setOptions(PhabricatorNotificationsSetting::getOptionsMap())
         ->setCaption(
           pht(
-            'Phabricator can send real-time notifications to your web browser '.
+            'This server can send real-time notifications to your web browser '.
             'or to your desktop. Select where you want to receive these '.
             'real-time updates.'))
         ->initBehavior(
           'desktop-notifications-control',
           $control_config))
       ->appendChild(
         id(new AphrontFormSubmitControl())
         ->setValue(pht('Save Preference')));
 
     $button = id(new PHUIButtonView())
       ->setTag('a')
       ->setIcon('fa-send-o')
       ->setWorkflow(true)
       ->setText(pht('Send Test Notification'))
       ->setHref('/notification/test/')
       ->setColor(PHUIButtonView::GREY);
 
     $form_content = array($saved_box, $status_box, $form);
     $form_box = $this->newBox(
       pht('Notifications'), $form_content, array($button));
 
     $browser_status_box = id(new PHUIInfoView())
       ->setID($browser_status_id)
       ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
       ->setIsHidden(true)
       ->appendChild($default_status);
 
     return array(
       $form_box,
       $browser_status_box,
     );
   }
 
 }
diff --git a/src/applications/settings/setting/PhabricatorAccessibilitySetting.php b/src/applications/settings/setting/PhabricatorAccessibilitySetting.php
index 774bfcd895..226feeae5f 100644
--- a/src/applications/settings/setting/PhabricatorAccessibilitySetting.php
+++ b/src/applications/settings/setting/PhabricatorAccessibilitySetting.php
@@ -1,47 +1,47 @@
 <?php
 
 final class PhabricatorAccessibilitySetting
   extends PhabricatorSelectSetting {
 
   const SETTINGKEY = 'resource-postprocessor';
 
   public function getSettingName() {
     return pht('Accessibility');
   }
 
   public function getSettingPanelKey() {
     return PhabricatorDisplayPreferencesSettingsPanel::PANELKEY;
   }
 
   protected function getSettingOrder() {
     return 100;
   }
 
   protected function getControlInstructions() {
     return pht(
-      'If you have difficulty reading the Phabricator UI, this setting '.
-      'may make Phabricator more accessible.');
+      'If you have difficulty reading the UI, this setting '.
+      'may help.');
   }
 
   public function getSettingDefaultValue() {
     return CelerityDefaultPostprocessor::POSTPROCESSOR_KEY;
   }
 
   protected function getSelectOptions() {
     $postprocessor_map = CelerityPostprocessor::getAllPostprocessors();
 
     $postprocessor_map = mpull($postprocessor_map, 'getPostprocessorName');
     asort($postprocessor_map);
 
     $postprocessor_order = array(
       CelerityDefaultPostprocessor::POSTPROCESSOR_KEY,
     );
 
     $postprocessor_map = array_select_keys(
       $postprocessor_map,
       $postprocessor_order) + $postprocessor_map;
 
     return $postprocessor_map;
   }
 
 }
diff --git a/src/applications/settings/setting/PhabricatorDarkConsoleSetting.php b/src/applications/settings/setting/PhabricatorDarkConsoleSetting.php
index 28ee90788e..7851bbdb76 100644
--- a/src/applications/settings/setting/PhabricatorDarkConsoleSetting.php
+++ b/src/applications/settings/setting/PhabricatorDarkConsoleSetting.php
@@ -1,58 +1,58 @@
 <?php
 
 final class PhabricatorDarkConsoleSetting
   extends PhabricatorSelectSetting {
 
   const SETTINGKEY = 'dark_console';
 
   const VALUE_DARKCONSOLE_DISABLED = '0';
   const VALUE_DARKCONSOLE_ENABLED = '1';
 
   public function getSettingName() {
     return pht('DarkConsole');
   }
 
   public function getSettingPanelKey() {
     return PhabricatorDeveloperPreferencesSettingsPanel::PANELKEY;
   }
 
   protected function getSettingOrder() {
     return 100;
   }
 
   protected function isEnabledForViewer(PhabricatorUser $viewer) {
     return PhabricatorEnv::getEnvConfig('darkconsole.enabled');
   }
 
   protected function getControlInstructions() {
     return pht(
       'DarkConsole is a debugging console for developing and troubleshooting '.
-      'Phabricator applications. After enabling DarkConsole, press the '.
+      'applications. After enabling DarkConsole, press the '.
       '{nav `} key on your keyboard to toggle it on or off.');
   }
 
   public function getSettingDefaultValue() {
     return self::VALUE_DARKCONSOLE_DISABLED;
   }
 
   protected function getSelectOptions() {
     return array(
       self::VALUE_DARKCONSOLE_DISABLED => pht('Disable DarkConsole'),
       self::VALUE_DARKCONSOLE_ENABLED => pht('Enable DarkConsole'),
     );
   }
 
   public function expandSettingTransaction($object, $xaction) {
     // If the user has hidden the DarkConsole UI, forget their setting when
     // they enable or disable it.
     return array(
       $xaction,
       $this->newSettingTransaction(
         $object,
         PhabricatorDarkConsoleVisibleSetting::SETTINGKEY,
         1),
     );
   }
 
 
 }
diff --git a/src/applications/settings/setting/PhabricatorEditorSetting.php b/src/applications/settings/setting/PhabricatorEditorSetting.php
index 1262a17e4d..bafc2ae518 100644
--- a/src/applications/settings/setting/PhabricatorEditorSetting.php
+++ b/src/applications/settings/setting/PhabricatorEditorSetting.php
@@ -1,54 +1,54 @@
 <?php
 
 final class PhabricatorEditorSetting
   extends PhabricatorStringSetting {
 
   const SETTINGKEY = 'editor';
 
   public function getSettingName() {
     return pht('Editor Link');
   }
 
   public function getSettingPanelKey() {
     return PhabricatorExternalEditorSettingsPanel::PANELKEY;
   }
 
   protected function getSettingOrder() {
     return 300;
   }
 
   protected function getControlInstructions() {
     return pht(
       "Many text editors can be configured as URI handlers for special ".
       "protocols like `editor://`. If you have installed and configured ".
-      "such an editor, Phabricator can generate links that you can click ".
-      "to open files locally.".
+      "such an editor, some applications can generate links that you can ".
+      "click to open files locally.".
       "\n\n".
       "Provide a URI pattern for building external editor URIs in your ".
       "environment. For example, if you use TextMate on macOS, the pattern ".
       "for your machine may look something like this:".
       "\n\n".
       "```name=\"Example: TextMate on macOS\"\n".
       "%s\n".
       "```\n".
       "\n\n".
       "For complete instructions on editor configuration, ".
       "see **[[ %s | %s ]]**.".
       "\n\n".
       "See the tables below for a list of supported variables and protocols.",
       'txmt://open/?url=file:///Users/alincoln/editor_links/%n/%f&line=%l',
       PhabricatorEnv::getDoclink('User Guide: Configuring an External Editor'),
       pht('User Guide: Configuring an External Editor'));
   }
 
   public function validateTransactionValue($value) {
     if (!phutil_nonempty_string($value)) {
       return;
     }
 
     id(new PhabricatorEditorURIEngine())
       ->setPattern($value)
       ->validatePattern();
   }
 
 }
diff --git a/src/applications/settings/setting/PhabricatorEmailFormatSetting.php b/src/applications/settings/setting/PhabricatorEmailFormatSetting.php
index 333d85c6f4..a8a0b07d94 100644
--- a/src/applications/settings/setting/PhabricatorEmailFormatSetting.php
+++ b/src/applications/settings/setting/PhabricatorEmailFormatSetting.php
@@ -1,40 +1,40 @@
 <?php
 
 final class PhabricatorEmailFormatSetting
   extends PhabricatorSelectSetting {
 
   const SETTINGKEY = 'html-emails';
 
   const VALUE_HTML_EMAIL = 'html';
   const VALUE_TEXT_EMAIL = 'text';
 
   public function getSettingName() {
     return pht('HTML Email');
   }
 
   public function getSettingPanelKey() {
     return PhabricatorEmailFormatSettingsPanel::PANELKEY;
   }
 
   protected function getSettingOrder() {
     return 100;
   }
 
   protected function getControlInstructions() {
     return pht(
-      'You can opt to receive plain text email from Phabricator instead '.
-      'of HTML email. Plain text email works better with some clients.');
+      'You can opt to receive plain text email instead of HTML email. '.
+      'Plain text email works better with some clients.');
   }
 
   public function getSettingDefaultValue() {
     return self::VALUE_HTML_EMAIL;
   }
 
   protected function getSelectOptions() {
     return array(
       self::VALUE_HTML_EMAIL => pht('Send HTML Email'),
       self::VALUE_TEXT_EMAIL => pht('Send Plain Text Email'),
     );
   }
 
 }
diff --git a/src/applications/settings/setting/PhabricatorEmailNotificationsSetting.php b/src/applications/settings/setting/PhabricatorEmailNotificationsSetting.php
index dfbedb3a12..2c63e01d72 100644
--- a/src/applications/settings/setting/PhabricatorEmailNotificationsSetting.php
+++ b/src/applications/settings/setting/PhabricatorEmailNotificationsSetting.php
@@ -1,44 +1,44 @@
 <?php
 
 final class PhabricatorEmailNotificationsSetting
   extends PhabricatorSelectSetting {
 
   const SETTINGKEY = 'no-mail';
 
   const VALUE_SEND_MAIL = '0';
   const VALUE_NO_MAIL = '1';
 
   public function getSettingName() {
     return pht('Email Notifications');
   }
 
   public function getSettingPanelKey() {
     return PhabricatorEmailDeliverySettingsPanel::PANELKEY;
   }
 
   protected function getSettingOrder() {
     return 100;
   }
 
   protected function getControlInstructions() {
     return pht(
-      'If you disable **Email Notifications**, Phabricator will never '.
+      'If you disable **Email Notifications**, this server will never '.
       'send email to notify you about events. This preference overrides '.
       'all your other settings.'.
       "\n\n".
       "//You will still receive some administrative email, like password ".
       "reset email.//");
   }
 
   public function getSettingDefaultValue() {
     return self::VALUE_SEND_MAIL;
   }
 
   protected function getSelectOptions() {
     return array(
       self::VALUE_SEND_MAIL => pht('Enable Email Notifications'),
       self::VALUE_NO_MAIL => pht('Disable Email Notifications'),
     );
   }
 
 }
diff --git a/src/applications/settings/setting/PhabricatorEmailSelfActionsSetting.php b/src/applications/settings/setting/PhabricatorEmailSelfActionsSetting.php
index f910c2b039..1c64cbdf32 100644
--- a/src/applications/settings/setting/PhabricatorEmailSelfActionsSetting.php
+++ b/src/applications/settings/setting/PhabricatorEmailSelfActionsSetting.php
@@ -1,40 +1,40 @@
 <?php
 
 final class PhabricatorEmailSelfActionsSetting
   extends PhabricatorSelectSetting {
 
   const SETTINGKEY = 'self-mail';
 
   const VALUE_SEND_SELF = '0';
   const VALUE_NO_SELF = '1';
 
   public function getSettingName() {
     return pht('Self Actions');
   }
 
   public function getSettingPanelKey() {
     return PhabricatorEmailDeliverySettingsPanel::PANELKEY;
   }
 
   protected function getSettingOrder() {
     return 200;
   }
 
   protected function getControlInstructions() {
     return pht(
-      'If you disable **Self Actions**, Phabricator will not notify '.
+      'If you disable **Self Actions**, this server will not notify '.
       'you about actions you take.');
   }
 
   public function getSettingDefaultValue() {
     return self::VALUE_SEND_SELF;
   }
 
   protected function getSelectOptions() {
     return array(
       self::VALUE_SEND_SELF => pht('Enable Self Action Mail'),
       self::VALUE_NO_SELF => pht('Disable Self Action Mail'),
     );
   }
 
 }