diff --git a/src/applications/auth/management/PhabricatorAuthManagementRecoverWorkflow.php b/src/applications/auth/management/PhabricatorAuthManagementRecoverWorkflow.php --- a/src/applications/auth/management/PhabricatorAuthManagementRecoverWorkflow.php +++ b/src/applications/auth/management/PhabricatorAuthManagementRecoverWorkflow.php @@ -9,8 +9,7 @@ ->setExamples('**recover** __username__') ->setSynopsis( pht( - 'Recover access to an account if you have locked yourself out '. - 'of Phabricator.')) + 'Recover access to an account if you have locked yourself out.')) ->setArguments( array( array( diff --git a/src/applications/auth/provider/PhabricatorAmazonAuthProvider.php b/src/applications/auth/provider/PhabricatorAmazonAuthProvider.php --- a/src/applications/auth/provider/PhabricatorAmazonAuthProvider.php +++ b/src/applications/auth/provider/PhabricatorAmazonAuthProvider.php @@ -14,7 +14,7 @@ $https_note = null; if ($uri->getProtocol() !== 'https') { $https_note = pht( - 'NOTE: Amazon **requires** HTTPS, but your Phabricator install does '. + 'NOTE: Amazon **requires** HTTPS, but this service does '. 'not use HTTPS. **You will not be able to add Amazon as an '. 'authentication provider until you configure HTTPS on this install**.'); } diff --git a/src/applications/auth/provider/PhabricatorGitHubAuthProvider.php b/src/applications/auth/provider/PhabricatorGitHubAuthProvider.php --- a/src/applications/auth/provider/PhabricatorGitHubAuthProvider.php +++ b/src/applications/auth/provider/PhabricatorGitHubAuthProvider.php @@ -19,7 +19,7 @@ "You should use these settings in your application:". "\n\n". " - **URL:** Set this to your full domain with protocol. For this ". - " Phabricator install, the correct value is: `%s`\n". + " server, the correct value is: `%s`\n". " - **Callback URL**: Set this to: `%s`\n". "\n\n". "Once you've created an application, copy the **Client ID** and ". diff --git a/src/applications/auth/provider/PhabricatorJIRAAuthProvider.php b/src/applications/auth/provider/PhabricatorJIRAAuthProvider.php --- a/src/applications/auth/provider/PhabricatorJIRAAuthProvider.php +++ b/src/applications/auth/provider/PhabricatorJIRAAuthProvider.php @@ -31,7 +31,7 @@ "settings to create an application:\n\n". " - **Server URL**: `%s`\n". " - Then, click **Next**. On the second page:\n". - " - **Application Name**: `Phabricator`\n". + " - **Application Name**: `%s`\n". " - **Application Type**: `Generic Application`\n". " - Then, click **Create**.\n\n". "**Configure Your Application**: Find the application you just ". @@ -41,13 +41,15 @@ "settings:\n\n". " - **Consumer Key**: Set this to the \"Consumer Key\" value in the ". "form above.\n". - " - **Consumer Name**: `Phabricator`\n". + " - **Consumer Name**: `%s`\n". " - **Public Key**: Set this to the \"Public Key\" value in the ". "form above.\n". " - **Consumer Callback URL**: `%s`\n". "Click **Save** in JIRA. Authentication should now be configured, ". "and this provider should work correctly.", PhabricatorEnv::getProductionURI('/'), + PlatformSymbols::getPlatformServerName(), + PlatformSymbols::getPlatformServerName(), $login_uri); } } @@ -169,7 +171,7 @@ "The PHP 'openssl' extension is not installed. You must install ". "this extension in order to add a JIRA authentication provider, ". "because JIRA OAuth requests use the RSA-SHA1 signing algorithm. ". - "Install the 'openssl' extension, restart Phabricator, and try ". + "Install the 'openssl' extension, restart everything, and try ". "again.")); } @@ -198,8 +200,8 @@ ->appendRemarkupInstructions( pht( "**JIRA Instance Name**\n\n". - "Choose a permanent name for this instance of JIRA. Phabricator ". - "uses this name internally to keep track of this instance of ". + "Choose a permanent name for this instance of JIRA. This name is ". + "used internally to keep track of this particular instance of ". "JIRA, in case the URL changes later.\n\n". "Use lowercase letters, digits, and period. For example, ". "`jira`, `jira.mycompany` or `jira.engineering` are reasonable ". @@ -281,8 +283,7 @@ new PHUIRemarkupView( $viewer, pht( - '**Post a comment** in the JIRA task, similar to the '. - 'emails Phabricator sends.')), + '**Post a comment** in the JIRA task.')), $this->shouldCreateJIRAComment())); } diff --git a/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php b/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php --- a/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php +++ b/src/applications/auth/provider/PhabricatorLDAPAuthProvider.php @@ -11,7 +11,7 @@ public function getDescriptionForCreate() { return pht( 'Configure a connection to an LDAP server so that users can use their '. - 'LDAP credentials to log in to Phabricator.'); + 'LDAP credentials to log in.'); } public function getDefaultProviderConfig() { @@ -312,8 +312,8 @@ $instructions = array( self::KEY_SEARCH_ATTRIBUTES => pht( - "When a user types their LDAP username and password into Phabricator, ". - "Phabricator can either bind to LDAP with those credentials directly ". + "When a user provides their LDAP username and password, this ". + "software can either bind to LDAP with those credentials directly ". "(which is simpler, but not as powerful) or bind to LDAP with ". "anonymous credentials, then search for record matching the supplied ". "credentials (which is more complicated, but more powerful).\n\n". diff --git a/src/applications/auth/provider/PhabricatorWordPressAuthProvider.php b/src/applications/auth/provider/PhabricatorWordPressAuthProvider.php --- a/src/applications/auth/provider/PhabricatorWordPressAuthProvider.php +++ b/src/applications/auth/provider/PhabricatorWordPressAuthProvider.php @@ -19,7 +19,7 @@ "You should use these settings in your application:". "\n\n". " - **URL:** Set this to your full domain with protocol. For this ". - " Phabricator install, the correct value is: `%s`\n". + " server, the correct value is: `%s`\n". " - **Redirect URL**: Set this to: `%s`\n". "\n\n". "Once you've created an application, copy the **Client ID** and ". diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php --- a/src/applications/base/PhabricatorApplication.php +++ b/src/applications/base/PhabricatorApplication.php @@ -556,7 +556,7 @@ case PhabricatorPolicyCapability::CAN_VIEW: if (!$this->canUninstall()) { return pht( - 'This application is required for Phabricator to operate, so all '. + 'This application is required, so all '. 'users must have access to it.'); } else { return null; diff --git a/src/applications/cache/spec/PhabricatorCacheSpec.php b/src/applications/cache/spec/PhabricatorCacheSpec.php --- a/src/applications/cache/spec/PhabricatorCacheSpec.php +++ b/src/applications/cache/spec/PhabricatorCacheSpec.php @@ -96,8 +96,8 @@ $summary = pht('Enabling APC/APCu will improve performance.'); $message = pht( 'The APC or APCu PHP extensions are installed, but not enabled in your '. - 'PHP configuration. Enabling these extensions will improve Phabricator '. - 'performance. Edit the "%s" setting to enable these extensions.', + 'PHP configuration. Enabling these extensions will improve performance. '. + 'Edit the "%s" setting to enable these extensions.', 'apc.enabled'); return $this diff --git a/src/applications/cache/spec/PhabricatorDataCacheSpec.php b/src/applications/cache/spec/PhabricatorDataCacheSpec.php --- a/src/applications/cache/spec/PhabricatorDataCacheSpec.php +++ b/src/applications/cache/spec/PhabricatorDataCacheSpec.php @@ -70,7 +70,7 @@ if (version_compare(phpversion(), '5.5', '>=')) { $message = pht( 'Installing the "APCu" PHP extension will improve performance. '. - 'This extension is strongly recommended. Without it, Phabricator '. + 'This extension is strongly recommended. Without it, this software '. 'must rely on a very inefficient disk-based cache.'); $this diff --git a/src/applications/cache/spec/PhabricatorOpcodeCacheSpec.php b/src/applications/cache/spec/PhabricatorOpcodeCacheSpec.php --- a/src/applications/cache/spec/PhabricatorOpcodeCacheSpec.php +++ b/src/applications/cache/spec/PhabricatorOpcodeCacheSpec.php @@ -85,9 +85,9 @@ $message = pht( 'The "%s" setting is currently disabled in your PHP configuration, '. - 'but Phabricator is running in development mode. This option should '. - 'normally be enabled in development so you do not need to restart '. - 'anything after making changes to the code.', + 'but this software is running in development mode. This option '. + 'should normally be enabled in development so you do not need to '. + 'restart anything after making changes to the code.', 'apc.stat'); $this @@ -174,8 +174,7 @@ $message = pht( 'The PHP "Zend OPcache" extension is installed, but not enabled in '. 'your PHP configuration. Enabling it will dramatically improve '. - 'Phabricator performance. Edit the "%s" setting to '. - 'enable the extension.', + 'performance. Edit the "%s" setting to enable the extension.', 'opcache.enable'); $this->newIssue('extension.opcache.enable')