+3 -3

src/applications/notification/setup/PhabricatorAphlictSetupCheck.php

reviewed

··· 7 7 PhabricatorNotificationClient::tryAnyConnection(); 8 8 } catch (Exception $ex) { 9 9 $message = pht( 10 10 - "Phabricator is configured to use a notification server, but is ". 10 10 + "This server is configured to use a notification server, but is ". 11 11 "unable to connect to it. You should resolve this issue or disable ". 12 12 "the notification server. It may be helpful to double check your ". 13 13 "configuration or restart the server using the command below.\n\n%s", ··· 26 26 ->setName(pht('Unable to Connect to Notification Server')) 27 27 ->setSummary( 28 28 pht( 29 29 - 'Phabricator is configured to use a notification server, '. 29 29 + 'This server is configured to use a notification server, '. 30 30 'but is not able to connect to it.')) 31 31 ->setMessage($message) 32 32 ->addRelatedPhabricatorConfig('notification.servers') 33 33 ->addCommand( 34 34 pht( 35 35 "(To start the server, run this command.)\n%s", 36 36 - 'phabricator/ $ ./bin/aphlict start')); 36 36 + '$ ./bin/aphlict start')); 37 37 38 38 return; 39 39 }

+8 -6

src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php

reviewed

··· 209 209 ->setTitle(pht('Authenticate: %s', $name)) 210 210 ->appendParagraph( 211 211 pht( 212 212 - 'This application ("%s") is authorized to use your Phabricator '. 212 212 + 'This application ("%s") is authorized to use your %s '. 213 213 'credentials. Continue to complete the authentication workflow.', 214 214 - phutil_tag('strong', array(), $name))) 214 214 + phutil_tag('strong', array(), $name), 215 215 + PlatformSymbols::getPlatformServerName())) 215 216 ->addCancelButton((string)$full_uri, pht('Continue to Application')); 216 217 217 218 return id(new AphrontDialogResponse())->setDialog($dialog); ··· 248 249 ->appendParagraph( 249 250 pht( 250 251 'Do you want to authorize the external application "%s" to '. 251 251 - 'access your Phabricator account data, including your primary '. 252 252 + 'access your %s account data, including your primary '. 252 253 'email address?', 253 253 - phutil_tag('strong', array(), $name))) 254 254 + phutil_tag('strong', array(), $name), 255 255 + PlatformSymbols::getPlatformServerName())) 254 256 ->appendForm($form) 255 257 ->addSubmitButton(pht('Authorize Access')) 256 258 ->addCancelButton((string)$cancel_uri, pht('Do Not Authorize')); ··· 271 273 pht( 272 274 'This application also requested additional unrecognized '. 273 275 'permissions. These permissions may have existed in an older '. 274 274 - 'version of Phabricator, or may be from a future version of '. 275 275 - 'Phabricator. They will not be granted.')); 276 276 + 'version of the software, or may be from a future version of '. 277 277 + 'the software. They will not be granted.')); 276 278 277 279 $unknown_form = id(new AphrontFormView()) 278 280 ->setViewer($viewer)

+1 -1

src/applications/oauthserver/controller/client/PhabricatorOAuthClientDisableController.php

reviewed

··· 43 43 $title = pht('Disable OAuth Application'); 44 44 $body = pht( 45 45 'Really disable the %s OAuth application? Users will no longer be '. 46 46 - 'able to authenticate against it, nor access Phabricator using '. 46 46 + 'able to authenticate against it, nor access this server using '. 47 47 'tokens generated by this application.', 48 48 phutil_tag('strong', array(), $client->getName())); 49 49 $button = pht('Disable Application');

+1 -1

src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php

reviewed

··· 68 68 ->setTitle(pht('Revoke Authorization?')) 69 69 ->appendParagraph( 70 70 pht( 71 71 - 'This application will no longer be able to access Phabricator '. 71 71 + 'This application will no longer be able to access this server '. 72 72 'on your behalf.')) 73 73 ->addSubmitButton(pht('Revoke Authorization')) 74 74 ->addCancelButton($panel_uri);

+3 -2

src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php

reviewed

··· 168 168 ->setIcon($icon) 169 169 ->setTitle(pht('Welcome to %s', $app_name)) 170 170 ->setDescription( 171 171 - pht('Group sections of a codebase into packages for re-use in other '. 172 172 - 'areas of Phabricator, like Herald rules.')) 171 171 + pht( 172 172 + 'Group sections of a codebase into packages for re-use in other '. 173 173 + 'applications, like Herald rules.')) 173 174 ->addAction($create_button); 174 175 175 176 return $view;

+1 -2

src/applications/passphrase/query/PassphraseCredentialSearchEngine.php

reviewed

··· 124 124 ->setIcon($icon) 125 125 ->setTitle(pht('Welcome to %s', $app_name)) 126 126 ->setDescription( 127 127 - pht('Credential management for re-use in other areas of Phabricator '. 128 128 - 'or general storage of shared secrets.')) 127 127 + pht('Credential management and general storage of shared secrets.')) 129 128 ->addAction($create_button); 130 129 131 130 return $view;

+1 -1

src/applications/people/controller/PhabricatorPeopleCreateController.php

reviewed

··· 24 24 $title = pht('Create New User'); 25 25 26 26 $standard_caption = pht( 27 27 - 'Create a standard user account. These users can log in to Phabricator, '. 27 27 + 'Create a standard user account. These users can log in, '. 28 28 'use the web interface and API, and receive email.'); 29 29 30 30 $standard_admin = pht(

+2 -2

src/applications/people/controller/PhabricatorPeopleDisableController.php

reviewed

··· 90 90 $short_title = pht('Disable User'); 91 91 92 92 $body = pht( 93 93 - 'Disable %s? They will no longer be able to access Phabricator or '. 93 93 + 'Disable %s? They will no longer be able to access this server or '. 94 94 'receive email.', 95 95 phutil_tag('strong', array(), $user->getUsername())); 96 96 ··· 100 100 $short_title = pht('Enable User'); 101 101 102 102 $body = pht( 103 103 - 'Enable %s? They will be able to access Phabricator and receive '. 103 103 + 'Enable %s? They will be able to access this server and receive '. 104 104 'email again.', 105 105 phutil_tag('strong', array(), $user->getUsername())); 106 106

+2 -2

src/applications/people/controller/PhabricatorPeopleEmpowerController.php

reviewed

··· 44 44 $short = pht('Remove Administrator'); 45 45 $body = pht( 46 46 'Remove %s as an administrator? They will no longer be able to '. 47 47 - 'perform administrative functions on this Phabricator install.', 47 47 + 'perform administrative functions on this server.', 48 48 phutil_tag('strong', array(), $user->getUsername())); 49 49 $submit = pht('Remove Administrator'); 50 50 } else { ··· 53 53 $body = pht( 54 54 'Empower %s as an administrator? They will be able to create users, '. 55 55 'approve users, make and remove administrators, delete accounts, and '. 56 56 - 'perform other administrative functions on this Phabricator install.', 56 56 + 'perform other administrative functions on this server.', 57 57 phutil_tag('strong', array(), $user->getUsername())); 58 58 $submit = pht('Make Administrator'); 59 59 }