diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementStopWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementStopWorkflow.php --- a/src/applications/daemon/management/PhabricatorDaemonManagementStopWorkflow.php +++ b/src/applications/daemon/management/PhabricatorDaemonManagementStopWorkflow.php @@ -21,7 +21,7 @@ 'name' => 'force', 'help' => pht( 'Stop all daemon processes on this host, even if they belong '. - 'to another Phabricator instance.'), + 'to another instance.'), ), array( 'name' => 'gently', diff --git a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php --- a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php +++ b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php @@ -140,8 +140,7 @@ return $this->renderErrorPanel( $panel->getName(), pht( - 'This panel has type "%s", but that panel type is not known to '. - 'Phabricator.', + 'This panel has type "%s", but that panel type is unknown.', $panel->getPanelType())); } @@ -425,8 +424,9 @@ throw new Exception( pht( 'To render more than %s levels of panels nested inside other '. - 'panels, purchase a subscription to Phabricator Gold.', - new PhutilNumber($max_depth))); + 'panels, purchase a subscription to %s Gold.', + new PhutilNumber($max_depth), + PlatformSymbols::getPlatformServerName())); } if (in_array($panel->getPHID(), $this->parentPanelPHIDs)) { diff --git a/src/applications/dashboard/storage/PhabricatorDashboardPanel.php b/src/applications/dashboard/storage/PhabricatorDashboardPanel.php --- a/src/applications/dashboard/storage/PhabricatorDashboardPanel.php +++ b/src/applications/dashboard/storage/PhabricatorDashboardPanel.php @@ -96,8 +96,7 @@ throw new Exception( pht( 'Attempting to use a panel in a way that requires an '. - 'implementation, but the panel implementation ("%s") is unknown to '. - 'Phabricator.', + 'implementation, but the panel implementation ("%s") is unknown.', $this->getPanelType())); } return $impl; diff --git a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php --- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php +++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php @@ -210,8 +210,8 @@ 'to "Close" the revision and move it off the dashboard.'. "\n\n". 'If you have an unusual workflow where Differential is used for '. - 'post-commit review (normally called "Audit", elsewhere in '. - 'Phabricator), you can set this flag to treat the "Accepted" '. + 'post-commit review (normally called "Audit", elsewhere), you '. + 'can set this flag to treat the "Accepted" '. 'state as a "Closed" state and end the review workflow early.'. "\n\n". 'This sort of workflow is very unusual. Very few installs should '. @@ -228,7 +228,7 @@ ->setSummary(pht('Attach patches to email, as text attachments.')) ->setDescription( pht( - 'If you set this to true, Phabricator will attach patches to '. + 'If you set this to true, patches will be attached to '. 'Differential mail (as text attachments). This will not work if '. 'you are using SendGrid as your mail adapter.')), $this->newOption( diff --git a/src/applications/differential/controller/DifferentialDiffCreateController.php b/src/applications/differential/controller/DifferentialDiffCreateController.php --- a/src/applications/differential/controller/DifferentialDiffCreateController.php +++ b/src/applications/differential/controller/DifferentialDiffCreateController.php @@ -112,8 +112,9 @@ array( array( pht( - 'The best way to create a diff is to use the Arcanist '. - 'command-line tool.'), + 'The best way to create a diff is to use the %s '. + 'command-line tool.', + PlatformSymbols::getPlatformClientName()), ' ', $arcanist_link, ), diff --git a/src/applications/differential/customfield/DifferentialJIRAIssuesField.php b/src/applications/differential/customfield/DifferentialJIRAIssuesField.php --- a/src/applications/differential/customfield/DifferentialJIRAIssuesField.php +++ b/src/applications/differential/customfield/DifferentialJIRAIssuesField.php @@ -166,8 +166,9 @@ pht('Not Linked'), pht( 'You can not add JIRA issues (%s) to this revision because your '. - 'Phabricator account is not linked to a JIRA account.', - implode(', ', $add)), + '%s account is not linked to a JIRA account.', + implode(', ', $add), + PlatformSymbols::getPlatformServerName()), $xaction); continue; } diff --git a/src/applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php --- a/src/applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php +++ b/src/applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php @@ -13,7 +13,7 @@ public function getMethodDescription() { return pht( - 'Advises Phabricator to look for new commits in a repository as soon '. + 'Advises this server to look for new commits in a repository as soon '. 'as possible. This advice is most useful if you have just pushed new '. 'commits to that repository.'); } diff --git a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php --- a/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php +++ b/src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php @@ -107,12 +107,12 @@ ->setSummary(pht('Enable HTTP Basic Auth for repositories.')) ->setDescription( pht( - "Phabricator can serve repositories over HTTP, using HTTP basic ". + "This server can serve repositories over HTTP, using HTTP basic ". "auth.\n\n". "Because HTTP basic auth is less secure than SSH auth, it is ". "disabled by default. You can enable it here if you'd like to use ". "it anyway. There's nothing fundamentally insecure about it as ". - "long as Phabricator uses HTTPS, but it presents a much lower ". + "long as this server uses HTTPS, but it presents a much lower ". "barrier to attackers than SSH does.\n\n". "Consider using SSH for authenticated access to repositories ". "instead of HTTP.")), @@ -126,9 +126,9 @@ ->setSummary(pht('Allow Git Large File Storage (LFS).')) ->setDescription( pht( - 'Phabricator supports Git LFS, a Git extension for storing large '. + 'This server supports Git LFS, a Git extension for storing large '. 'files alongside a repository. Activate this setting to allow '. - 'the extension to store file data in Phabricator.')), + 'the extension to store file data.')), $this->newOption('diffusion.ssh-user', 'string', null) ->setLocked(true) ->setSummary(pht('Login username for SSH connections to repositories.')) @@ -150,10 +150,9 @@ ->setSummary(pht('Host for SSH connections to repositories.')) ->setDescription( pht( - 'If you accept Phabricator SSH traffic on a different host '. - 'from web traffic (for example, if you use different SSH and '. - 'web load balancers), you can set the SSH hostname here. This '. - 'is an advanced option.')), + 'If you accept SSH traffic on a different host from web traffic '. + '(for example, if you use different SSH and web load balancers), '. + 'you can set the SSH hostname here. This is an advanced option.')), $this->newOption('diffusion.fields', $custom_field_type, $default_fields) ->setCustomData( id(new PhabricatorRepositoryCommit()) diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditDangerousController.php @@ -23,7 +23,7 @@ ->appendParagraph( pht( 'This repository can not be protected from dangerous changes '. - 'because Phabricator does not control what users are allowed '. + 'because this server does not control what users are allowed '. 'to push to it.')) ->addCancelButton($panel_uri); } diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditEnormousController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditEnormousController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditEnormousController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditEnormousController.php @@ -23,7 +23,7 @@ ->appendParagraph( pht( 'This repository can not be protected from enormous changes '. - 'because Phabricator does not control what users are allowed '. + 'because this server does not control what users are allowed '. 'to push to it.')) ->addCancelButton($panel_uri); }