diff --git a/src/applications/config/check/PhabricatorMailSetupCheck.php b/src/applications/config/check/PhabricatorMailSetupCheck.php --- a/src/applications/config/check/PhabricatorMailSetupCheck.php +++ b/src/applications/config/check/PhabricatorMailSetupCheck.php @@ -12,9 +12,9 @@ } $message = pht( - 'You haven\'t configured mailers yet, so Phabricator won\'t be able '. + 'You haven\'t configured mailers yet, so this server won\'t be able '. 'to send outbound mail or receive inbound mail. See the '. - 'configuration setting cluster.mailers for details.'); + 'configuration setting "cluster.mailers" for details.'); $this->newIssue('cluster.mailers') ->setName(pht('Mailers Not Configured')) diff --git a/src/applications/config/check/PhabricatorMySQLSetupCheck.php b/src/applications/config/check/PhabricatorMySQLSetupCheck.php --- a/src/applications/config/check/PhabricatorMySQLSetupCheck.php +++ b/src/applications/config/check/PhabricatorMySQLSetupCheck.php @@ -66,7 +66,7 @@ 'fit into the column), or security concerns (for example, by '. 'truncating keys or credentials).'. "\n\n". - 'Phabricator is developed and tested in "STRICT_ALL_TABLES" mode so '. + 'This software is developed and tested in "STRICT_ALL_TABLES" mode so '. 'you should normally never encounter these situations, but may run '. 'into them if you interact with the database directly, run '. 'third-party code, develop extensions, or just encounter a bug in '. @@ -88,7 +88,7 @@ 'they may not work in strict mode.'. "\n\n". 'If you can not or do not want to enable "STRICT_ALL_TABLES", you '. - 'can safely ignore this warning. Phabricator will work correctly '. + 'can safely ignore this warning. This software will work correctly '. 'with this mode enabled or disabled.', $host_name, phutil_tag('pre', array(), 'sql_mode=STRICT_ALL_TABLES')); @@ -151,7 +151,7 @@ $message = pht( "Database host \"%s\" is using the builtin stopword file for ". - "building search indexes. This can make Phabricator's search ". + "building search indexes. This can make the search ". "feature less useful.\n\n". "Stopwords are common words which are not indexed and thus can not ". "be searched for. The default stopword file has about 500 words, ". @@ -273,11 +273,11 @@ "There are no hard-and-fast rules to setting an appropriate value, ". "but a reasonable starting point for a standard install is something ". "like 40%% of the total memory on the machine. For example, if you ". - "have 4GB of RAM on the machine you have installed Phabricator on, ". + "have 4GB of RAM on the machine you have installed this software on, ". "you might set this value to %s.\n\n". "You can read more about this option in the MySQL documentation to ". "help you make a decision about how to configure it for your use ". - "case. There are no concerns specific to Phabricator which make it ". + "case. There are no concerns specific to this software which make it ". "different from normal workloads with respect to this setting.\n\n". "To adjust the setting, add something like this to your %s file (in ". "the %s section), replacing %s with an appropriate value for your ". diff --git a/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php b/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php --- a/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php +++ b/src/applications/config/check/PhabricatorPHPConfigSetupCheck.php @@ -21,8 +21,8 @@ 'REMOTE_ADDR is no longer empty.'); $message = pht( - 'No REMOTE_ADDR is available, so Phabricator cannot determine the '. - 'origin address for requests. This will prevent Phabricator from '. + 'No REMOTE_ADDR is available, so this server cannot determine the '. + 'origin address for requests. This will prevent the software from '. 'performing important security checks. This most often means you '. 'have a mistake in your preamble script. Consult the documentation '. '(%s) and double-check that the script is written correctly.', @@ -76,8 +76,8 @@ 'with the database. You should install the newer "mysqli" extension '. 'to improve behaviors (like error handling and query timeouts).'. "\n\n". - 'Phabricator will work with the older extension, but upgrading to the '. - 'newer extension is recommended.'. + 'This software will work with the older extension, but upgrading to '. + 'the newer extension is recommended.'. "\n\n". 'You may be able to install the extension with a command like: %s', @@ -96,10 +96,10 @@ $message = pht( 'PHP is currently using the older MySQL external driver instead of '. 'the newer MySQL native driver. The older driver lacks options and '. - 'features (like support for query timeouts) which allow Phabricator '. + 'features (like support for query timeouts) which allow this server '. 'to interact better with the database.'. "\n\n". - 'Phabricator will work with the older driver, but upgrading to the '. + 'This software will work with the older driver, but upgrading to the '. 'native driver is recommended.'. "\n\n". 'You may be able to install the native driver with a command like: %s', @@ -134,7 +134,7 @@ 'and the client will comply.'. "\n\n". 'Although it is normally difficult for an attacker to convince '. - 'Phabricator to connect to a malicious MySQL server, you should '. + 'this software to connect to a malicious MySQL server, you should '. 'disable this option: this capability is unnecessary and inherently '. 'dangerous.'. "\n\n". diff --git a/src/applications/config/check/PhabricatorPathSetupCheck.php b/src/applications/config/check/PhabricatorPathSetupCheck.php --- a/src/applications/config/check/PhabricatorPathSetupCheck.php +++ b/src/applications/config/check/PhabricatorPathSetupCheck.php @@ -13,15 +13,15 @@ if (!$path) { $summary = pht( - 'The environmental variable %s is empty. Phabricator will not '. + 'The environmental variable %s is empty. This server will not '. 'be able to execute some commands.', '$PATH'); $message = pht( - "The environmental variable %s is empty. Phabricator needs to execute ". + "The environmental variable %s is empty. This server needs to execute ". "some system commands, like `%s`, `%s`, `%s`, and `%s`. To execute ". "these commands, the binaries must be available in the webserver's ". - "%s. You can set additional paths in Phabricator configuration.", + "%s. You can set additional paths in configuration.", '$PATH', 'svn', 'git', @@ -120,7 +120,7 @@ ->setMessage( pht( "The configured PATH includes a component which is not usable. ". - "Phabricator will be unable to find or execute binaries located ". + "This server will be unable to find or execute binaries located ". "here:". "\n\n". "%s". diff --git a/src/applications/config/check/PhabricatorPygmentSetupCheck.php b/src/applications/config/check/PhabricatorPygmentSetupCheck.php --- a/src/applications/config/check/PhabricatorPygmentSetupCheck.php +++ b/src/applications/config/check/PhabricatorPygmentSetupCheck.php @@ -42,7 +42,7 @@ 'pygmentize'); $message = pht( - 'Phabricator has %s available in %s, but the binary '. + 'This server has %s available in %s, but the binary '. 'exited with an error code when run as %s. Check that it is '. 'installed correctly.', phutil_tag('tt', array(), 'pygmentize'), @@ -64,7 +64,7 @@ 'to provide advanced syntax highlighting.'); $message = pht( - 'Phabricator can highlight a few languages by default, '. + 'This software can highlight a few languages by default, '. 'but installing and enabling Pygments (a third-party highlighting '. "tool) will add syntax highlighting for many more languages. \n\n". 'For instructions on installing and enabling Pygments, see the '. diff --git a/src/applications/config/check/PhabricatorRepositoriesSetupCheck.php b/src/applications/config/check/PhabricatorRepositoriesSetupCheck.php --- a/src/applications/config/check/PhabricatorRepositoriesSetupCheck.php +++ b/src/applications/config/check/PhabricatorRepositoriesSetupCheck.php @@ -45,9 +45,9 @@ 'readable by the webserver.'); $message = pht( "The directory for local repositories (%s) does not exist, or is not ". - "readable by the webserver. Phabricator uses this directory to store ". - "information about repositories. If this directory does not exist, ". - "create it:\n\n". + "readable by the webserver. This software uses this directory to ". + "store information about repositories. If this directory does not ". + "exist, create it:\n\n". "%s\n". "If this directory exists, make it readable to the webserver. You ". "can also edit the configuration below to use some other directory.", diff --git a/src/applications/config/check/PhabricatorSecuritySetupCheck.php b/src/applications/config/check/PhabricatorSecuritySetupCheck.php --- a/src/applications/config/check/PhabricatorSecuritySetupCheck.php +++ b/src/applications/config/check/PhabricatorSecuritySetupCheck.php @@ -31,7 +31,7 @@ "\n\n". 'Upgrade %s to a patched version.'. "\n\n". - 'To learn more about how this issue affects Phabricator, see %s.', + 'To learn more about how this issue affects this software, see %s.', phutil_tag('tt', array(), 'bash'), phutil_tag('tt', array(), 'bash'), phutil_tag( @@ -61,7 +61,7 @@ 'Improve security by configuring an alternate file domain.')) ->setMessage( pht( - 'Phabricator is currently configured to serve user uploads '. + 'This software is currently configured to serve user uploads '. 'directly from the same domain as other content. This is a '. 'security risk.'. "\n\n". diff --git a/src/applications/config/check/PhabricatorStorageSetupCheck.php b/src/applications/config/check/PhabricatorStorageSetupCheck.php --- a/src/applications/config/check/PhabricatorStorageSetupCheck.php +++ b/src/applications/config/check/PhabricatorStorageSetupCheck.php @@ -83,7 +83,7 @@ $message = pht( 'When you upload a file via drag-and-drop or the API, chunks must '. 'be buffered into memory before being written to permanent '. - 'storage. Phabricator needs memory available to store these '. + 'storage. This server needs memory available to store these '. 'chunks while they are uploaded, but PHP is currently configured '. 'to severely limit the available memory.'. "\n\n". @@ -97,7 +97,7 @@ "The easiest way to resolve this issue is to set %s to %s in your ". "PHP configuration, to disable the memory limit. There is ". "usually little or no value to using this option to limit ". - "Phabricator process memory.". + "process memory.". "\n\n". "You can also increase the limit or ignore this issue and accept ". "that you may encounter problems uploading large files and ". diff --git a/src/applications/config/check/PhabricatorTimezoneSetupCheck.php b/src/applications/config/check/PhabricatorTimezoneSetupCheck.php --- a/src/applications/config/check/PhabricatorTimezoneSetupCheck.php +++ b/src/applications/config/check/PhabricatorTimezoneSetupCheck.php @@ -40,9 +40,10 @@ $message = pht( "Your configuration fails to specify a server timezone. You can either ". - "set the PHP configuration value '%s' or the Phabricator ". - "configuration value '%s' to specify one.", + "set the PHP configuration value '%s' or the %s configuration ". + "value '%s' to specify one.", 'date.timezone', + PlatformSymbols::getPlatformServerName(), 'phabricator.timezone'); $this diff --git a/src/applications/config/controller/settings/PhabricatorConfigEditController.php b/src/applications/config/controller/settings/PhabricatorConfigEditController.php --- a/src/applications/config/controller/settings/PhabricatorConfigEditController.php +++ b/src/applications/config/controller/settings/PhabricatorConfigEditController.php @@ -18,7 +18,7 @@ } else { $desc = pht( 'This configuration option is unknown. It may be misspelled, '. - 'or have existed in a previous version of Phabricator.'); + 'or have existed in a previous version of the software.'); } // This may be a dead config entry, which existed in the past but no