diff --git a/src/applications/notification/setup/PhabricatorAphlictSetupCheck.php b/src/applications/notification/setup/PhabricatorAphlictSetupCheck.php --- a/src/applications/notification/setup/PhabricatorAphlictSetupCheck.php +++ b/src/applications/notification/setup/PhabricatorAphlictSetupCheck.php @@ -7,7 +7,7 @@ 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 @@ ->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 --- a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php +++ b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php @@ -209,9 +209,10 @@ ->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 @@ ->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 @@ 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 --- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientDisableController.php +++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientDisableController.php @@ -43,7 +43,7 @@ $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 --- a/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php +++ b/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php @@ -68,7 +68,7 @@ ->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 --- a/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php +++ b/src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php @@ -168,8 +168,9 @@ ->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 --- a/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php +++ b/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php @@ -124,8 +124,7 @@ ->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 --- a/src/applications/people/controller/PhabricatorPeopleCreateController.php +++ b/src/applications/people/controller/PhabricatorPeopleCreateController.php @@ -24,7 +24,7 @@ $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 --- a/src/applications/people/controller/PhabricatorPeopleDisableController.php +++ b/src/applications/people/controller/PhabricatorPeopleDisableController.php @@ -90,7 +90,7 @@ $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 @@ $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 --- a/src/applications/people/controller/PhabricatorPeopleEmpowerController.php +++ b/src/applications/people/controller/PhabricatorPeopleEmpowerController.php @@ -44,7 +44,7 @@ $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 @@ $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'); }