diff --git a/src/applications/notification/setup/PhabricatorAphlictSetupCheck.php b/src/applications/notification/setup/PhabricatorAphlictSetupCheck.php index 7a00673ae1..20787c79bd 100644 --- a/src/applications/notification/setup/PhabricatorAphlictSetupCheck.php +++ b/src/applications/notification/setup/PhabricatorAphlictSetupCheck.php @@ -7,7 +7,7 @@ final class PhabricatorAphlictSetupCheck extends PhabricatorSetupCheck { PhabricatorNotificationClient::tryAnyConnection(); } catch (Exception $ex) { $message = pht( - "Phabricator is configured to use a notification server, but is ". + "This server is configured to use a notification server, but is ". "unable to connect to it. You should resolve this issue or disable ". "the notification server. It may be helpful to double check your ". "configuration or restart the server using the command below.\n\n%s", @@ -26,14 +26,14 @@ final class PhabricatorAphlictSetupCheck extends PhabricatorSetupCheck { ->setName(pht('Unable to Connect to Notification Server')) ->setSummary( pht( - 'Phabricator is configured to use a notification server, '. + 'This server is configured to use a notification server, '. 'but is not able to connect to it.')) ->setMessage($message) ->addRelatedPhabricatorConfig('notification.servers') ->addCommand( pht( "(To start the server, run this command.)\n%s", - 'phabricator/ $ ./bin/aphlict start')); + '$ ./bin/aphlict start')); return; } diff --git a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php index 2b454e00ef..6b10dd60c5 100644 --- a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php +++ b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php @@ -209,9 +209,10 @@ final class PhabricatorOAuthServerAuthController ->setTitle(pht('Authenticate: %s', $name)) ->appendParagraph( pht( - 'This application ("%s") is authorized to use your Phabricator '. + 'This application ("%s") is authorized to use your %s '. 'credentials. Continue to complete the authentication workflow.', - phutil_tag('strong', array(), $name))) + phutil_tag('strong', array(), $name), + PlatformSymbols::getPlatformServerName())) ->addCancelButton((string)$full_uri, pht('Continue to Application')); return id(new AphrontDialogResponse())->setDialog($dialog); @@ -248,9 +249,10 @@ final class PhabricatorOAuthServerAuthController ->appendParagraph( pht( 'Do you want to authorize the external application "%s" to '. - 'access your Phabricator account data, including your primary '. + 'access your %s account data, including your primary '. 'email address?', - phutil_tag('strong', array(), $name))) + phutil_tag('strong', array(), $name), + PlatformSymbols::getPlatformServerName())) ->appendForm($form) ->addSubmitButton(pht('Authorize Access')) ->addCancelButton((string)$cancel_uri, pht('Do Not Authorize')); @@ -271,8 +273,8 @@ final class PhabricatorOAuthServerAuthController pht( 'This application also requested additional unrecognized '. 'permissions. These permissions may have existed in an older '. - 'version of Phabricator, or may be from a future version of '. - 'Phabricator. They will not be granted.')); + 'version of the software, or may be from a future version of '. + 'the software. They will not be granted.')); $unknown_form = id(new AphrontFormView()) ->setViewer($viewer) diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientDisableController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientDisableController.php index 2ea9955365..334ef1b0aa 100644 --- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientDisableController.php +++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientDisableController.php @@ -43,7 +43,7 @@ final class PhabricatorOAuthClientDisableController $title = pht('Disable OAuth Application'); $body = pht( 'Really disable the %s OAuth application? Users will no longer be '. - 'able to authenticate against it, nor access Phabricator using '. + 'able to authenticate against it, nor access this server using '. 'tokens generated by this application.', phutil_tag('strong', array(), $client->getName())); $button = pht('Disable Application'); diff --git a/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php b/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php index 89a1cc0281..21fb891330 100644 --- a/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php +++ b/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php @@ -68,7 +68,7 @@ final class PhabricatorOAuthServerAuthorizationsSettingsPanel ->setTitle(pht('Revoke Authorization?')) ->appendParagraph( pht( - 'This application will no longer be able to access Phabricator '. + 'This application will no longer be able to access this server '. 'on your behalf.')) ->addSubmitButton(pht('Revoke Authorization')) ->addCancelButton($panel_uri); diff --git a/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php b/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php index 728c3f42a8..26889c0e7a 100644 --- a/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php +++ b/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php @@ -168,8 +168,9 @@ final class PhabricatorOwnersPackageSearchEngine ->setIcon($icon) ->setTitle(pht('Welcome to %s', $app_name)) ->setDescription( - pht('Group sections of a codebase into packages for re-use in other '. - 'areas of Phabricator, like Herald rules.')) + pht( + 'Group sections of a codebase into packages for re-use in other '. + 'applications, like Herald rules.')) ->addAction($create_button); return $view; diff --git a/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php b/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php index ac4cbec9bf..971094afc4 100644 --- a/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php +++ b/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php @@ -124,8 +124,7 @@ final class PassphraseCredentialSearchEngine ->setIcon($icon) ->setTitle(pht('Welcome to %s', $app_name)) ->setDescription( - pht('Credential management for re-use in other areas of Phabricator '. - 'or general storage of shared secrets.')) + pht('Credential management and general storage of shared secrets.')) ->addAction($create_button); return $view; diff --git a/src/applications/people/controller/PhabricatorPeopleCreateController.php b/src/applications/people/controller/PhabricatorPeopleCreateController.php index c0b232645b..320ed57d3c 100644 --- a/src/applications/people/controller/PhabricatorPeopleCreateController.php +++ b/src/applications/people/controller/PhabricatorPeopleCreateController.php @@ -24,7 +24,7 @@ final class PhabricatorPeopleCreateController $title = pht('Create New User'); $standard_caption = pht( - 'Create a standard user account. These users can log in to Phabricator, '. + 'Create a standard user account. These users can log in, '. 'use the web interface and API, and receive email.'); $standard_admin = pht( diff --git a/src/applications/people/controller/PhabricatorPeopleDisableController.php b/src/applications/people/controller/PhabricatorPeopleDisableController.php index 9f2718086b..6e3f436d6f 100644 --- a/src/applications/people/controller/PhabricatorPeopleDisableController.php +++ b/src/applications/people/controller/PhabricatorPeopleDisableController.php @@ -90,7 +90,7 @@ final class PhabricatorPeopleDisableController $short_title = pht('Disable User'); $body = pht( - 'Disable %s? They will no longer be able to access Phabricator or '. + 'Disable %s? They will no longer be able to access this server or '. 'receive email.', phutil_tag('strong', array(), $user->getUsername())); @@ -100,7 +100,7 @@ final class PhabricatorPeopleDisableController $short_title = pht('Enable User'); $body = pht( - 'Enable %s? They will be able to access Phabricator and receive '. + 'Enable %s? They will be able to access this server and receive '. 'email again.', phutil_tag('strong', array(), $user->getUsername())); diff --git a/src/applications/people/controller/PhabricatorPeopleEmpowerController.php b/src/applications/people/controller/PhabricatorPeopleEmpowerController.php index 22e7c22b68..b7af73ac02 100644 --- a/src/applications/people/controller/PhabricatorPeopleEmpowerController.php +++ b/src/applications/people/controller/PhabricatorPeopleEmpowerController.php @@ -44,7 +44,7 @@ final class PhabricatorPeopleEmpowerController $short = pht('Remove Administrator'); $body = pht( 'Remove %s as an administrator? They will no longer be able to '. - 'perform administrative functions on this Phabricator install.', + 'perform administrative functions on this server.', phutil_tag('strong', array(), $user->getUsername())); $submit = pht('Remove Administrator'); } else { @@ -53,7 +53,7 @@ final class PhabricatorPeopleEmpowerController $body = pht( 'Empower %s as an administrator? They will be able to create users, '. 'approve users, make and remove administrators, delete accounts, and '. - 'perform other administrative functions on this Phabricator install.', + 'perform other administrative functions on this server.', phutil_tag('strong', array(), $user->getUsername())); $submit = pht('Make Administrator'); }