diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php @@ -45,7 +45,7 @@ ->setTitle(pht('Update Repository Now')) ->appendParagraph( pht( - 'Normally, Phabricator automatically updates repositories '. + 'Normally, repositories are automatically updated '. 'based on how much time has elapsed since the last commit. '. 'This helps reduce load if you have a large number of mostly '. 'inactive repositories, which is common.')) @@ -57,7 +57,7 @@ 'repository.')) ->appendParagraph( pht( - 'To learn more about how Phabricator updates repositories, '. + 'To learn more about how repositories are updated, '. 'read %s in the documentation.', $doc_link)) ->addCancelButton($panel_uri) diff --git a/src/applications/diffusion/controller/DiffusionRepositoryURICredentialController.php b/src/applications/diffusion/controller/DiffusionRepositoryURICredentialController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryURICredentialController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryURICredentialController.php @@ -38,10 +38,10 @@ ->setTitle(pht('Builtin URIs Do Not Use Credentials')) ->appendParagraph( pht( - 'You can not set a credential for builtin URIs which Phabricator '. - 'hosts and serves. Phabricator does not fetch from these URIs or '. - 'push to these URIs, and does not need credentials to '. - 'authenticate any activity against them.')) + 'You can not set a credential for builtin URIs which this '. + 'server hosts. These URIs are not fetched from or pushed to, '. + 'and credentials are not required to authenticate any '. + 'activity against them.')) ->addCancelButton($view_uri); } diff --git a/src/applications/diffusion/controller/DiffusionServeController.php b/src/applications/diffusion/controller/DiffusionServeController.php --- a/src/applications/diffusion/controller/DiffusionServeController.php +++ b/src/applications/diffusion/controller/DiffusionServeController.php @@ -421,7 +421,7 @@ $result = new PhabricatorVCSResponse( 500, pht( - 'Phabricator does not support HTTP access to Subversion '. + 'This server does not support HTTP access to Subversion '. 'repositories.')); break; default: diff --git a/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php b/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php --- a/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php +++ b/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php @@ -217,7 +217,7 @@ $permanent_value = $object->getPermanentRefRules(); $automation_instructions = pht( - "Configure **Repository Automation** to allow Phabricator to ". + "Configure **Repository Automation** to allow this server to ". "write to this repository.". "\n\n". "IMPORTANT: This feature is new, experimental, and not supported. ". @@ -234,7 +234,7 @@ $subpath_instructions = pht( 'If you want to import only part of a repository, like `trunk/`, '. - 'you can set a path in **Import Only**. Phabricator will ignore '. + 'you can set a path in **Import Only**. The import process will ignore '. 'commits which do not affect this path.'); $filesize_warning = null; @@ -256,7 +256,7 @@ $track_instructions = pht( 'WARNING: The "Track Only" feature is deprecated. Use "Fetch Refs" '. 'and "Permanent Refs" instead. This feature will be removed in a '. - 'future version of Phabricator.'); + 'future version of this software.'); return array( id(new PhabricatorSelectEditField()) diff --git a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php --- a/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php +++ b/src/applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php @@ -114,7 +114,7 @@ ->setUser($viewer) ->appendRemarkupInstructions( pht( - 'To access repositories hosted by Phabricator over HTTP, you must '. + 'To access repositories hosted on this server over HTTP, you must '. 'set a version control password. This password should be unique.'. "\n\n". "This password applies to all repositories available over ". diff --git a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php --- a/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php +++ b/src/applications/diffusion/protocol/DiffusionRepositoryClusterEngine.php @@ -273,9 +273,10 @@ throw new Exception( pht( 'Repository "%s" exists on more than one device, but no device '. - 'has any repository version information. Phabricator can not '. - 'guess which copy of the existing data is authoritative. Promote '. - 'a device or see "Ambiguous Leaders" in the documentation.', + 'has any repository version information. There is no way for the '. + 'software to determine which copy of the existing data is '. + 'authoritative. Promote a device or see "Ambiguous Leaders" in '. + 'the documentation.', $repository->getDisplayName())); } diff --git a/src/applications/diffusion/request/DiffusionRequest.php b/src/applications/diffusion/request/DiffusionRequest.php --- a/src/applications/diffusion/request/DiffusionRequest.php +++ b/src/applications/diffusion/request/DiffusionRequest.php @@ -563,7 +563,7 @@ throw new DiffusionSetupException( pht( 'The working copy for this repository ("%s") has not been cloned yet '. - 'on this machine ("%s"). Make sure you havestarted the Phabricator '. + 'on this machine ("%s"). Make sure you have started the '. 'daemons. If this problem persists for longer than a clone should '. 'take, check the daemon logs (in the Daemon Console) to see if there '. 'were errors cloning the repository. Consult the "Diffusion User '. diff --git a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php --- a/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php +++ b/src/applications/diffusion/ssh/DiffusionSSHWorkflow.php @@ -117,7 +117,7 @@ throw new Exception( pht( 'Unable to determine the username to connect with when trying '. - 'to proxy an SSH request within the Phabricator cluster.')); + 'to proxy an SSH request within the cluster.')); } $port = $uri->getPort(); diff --git a/src/applications/diviner/controller/DivinerMainController.php b/src/applications/diviner/controller/DivinerMainController.php --- a/src/applications/diviner/controller/DivinerMainController.php +++ b/src/applications/diviner/controller/DivinerMainController.php @@ -48,18 +48,20 @@ $document->appendChild($list); } else { $text = pht( - "(NOTE) **Looking for Phabricator documentation?** ". - "If you're looking for help and information about Phabricator, ". + "(NOTE) **Looking for documentation?** ". + "If you're looking for help and information about %s, ". "you can [[https://secure.phabricator.com/diviner/ | ". - "browse the public Phabricator documentation]] on the live site.\n\n". - "Diviner is the documentation generator used to build the ". - "Phabricator documentation.\n\n". + "browse the public %s documentation]] on the live site.\n\n". + "Diviner is the documentation generator used to build this ". + "documentation.\n\n". "You haven't generated any Diviner documentation books yet, so ". "there's nothing to show here. If you'd like to generate your own ". - "local copy of the Phabricator documentation and have it appear ". + "local copy of the documentation and have it appear ". "here, run this command:\n\n". " %s\n\n", - 'phabricator/ $ ./bin/diviner generate'); + PlatformSymbols::getPlatformServerName(), + PlatformSymbols::getPlatformServerName(), + '$ ./bin/diviner generate'); $text = new PHUIRemarkupView($viewer, $text); $document->appendChild($text); diff --git a/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php b/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php --- a/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php +++ b/src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php @@ -33,12 +33,14 @@ ->setSummary(pht('Optional Asana projects to use as application tags.')) ->setDescription( pht( - 'When Phabricator creates tasks in Asana, it can add the tasks '. + 'When %s creates tasks in Asana, it can add the tasks '. 'to Asana projects based on which application the corresponding '. - 'object in Phabricator comes from. For example, you can add code '. + 'object in %s comes from. For example, you can add code '. 'reviews in Asana to a "Differential" project.'. "\n\n". - 'NOTE: This feature is new and experimental.')), + 'NOTE: This feature is new and experimental.', + PlatformSymbols::getPlatformServerName(), + PlatformSymbols::getPlatformServerName())), ); }