diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php --- a/src/applications/herald/controller/HeraldRuleController.php +++ b/src/applications/herald/controller/HeraldRuleController.php @@ -108,8 +108,7 @@ throw new Exception( pht( 'This rule was created with a newer version of Herald. You can not '. - 'view or edit it in this older version. Upgrade your Phabricator '. - 'deployment.')); + 'view or edit it in this older version. Upgrade your software.')); } // Upgrade rule version to our version, since we might add newly-defined diff --git a/src/applications/herald/controller/HeraldWebhookViewController.php b/src/applications/herald/controller/HeraldWebhookViewController.php --- a/src/applications/herald/controller/HeraldWebhookViewController.php +++ b/src/applications/herald/controller/HeraldWebhookViewController.php @@ -53,7 +53,7 @@ $warnings = array(); if (PhabricatorEnv::getEnvConfig('phabricator.silent')) { $message = pht( - 'Phabricator is currently configured in silent mode, so it will not '. + 'This server is running in silent mode, so it will not '. 'publish webhooks. To adjust this setting, see '. '@{config:phabricator.silent} in Config.'); diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php --- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php @@ -681,7 +681,7 @@ $body = pht( "%s:\n\n". "This email address was used to sign a Legalpad document ". - "in Phabricator:\n\n". + "in %s:\n\n". " %s\n\n". "Please verify you own this email address and accept the ". "agreement by clicking this link:\n\n". @@ -690,6 +690,7 @@ "verification step.\n\nYou can review the document here:\n\n". " %s\n", $name, + PlatformSymbols::getPlatformServerName(), $doc_name, $link, $doc_link); diff --git a/src/applications/legalpad/editor/LegalpadDocumentEditor.php b/src/applications/legalpad/editor/LegalpadDocumentEditor.php --- a/src/applications/legalpad/editor/LegalpadDocumentEditor.php +++ b/src/applications/legalpad/editor/LegalpadDocumentEditor.php @@ -101,7 +101,7 @@ LegalpadDocumentRequireSignatureTransaction::TRANSACTIONTYPE, pht('Invalid'), pht('Only documents with signature type "individual" may '. - 'require signing to use Phabricator.'), + 'require signing to log in.'), null); } diff --git a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php --- a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php +++ b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php @@ -185,8 +185,7 @@ ->setIcon($icon) ->setTitle(pht('Welcome to %s', $app_name)) ->setDescription( - pht('Create documents and track signatures. Can also be re-used in '. - 'other areas of Phabricator, like CLAs.')) + pht('Create documents and track signatures.')) ->addAction($create_button); return $view; diff --git a/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php b/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php --- a/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php +++ b/src/applications/meta/controller/PhabricatorApplicationEmailCommandsController.php @@ -35,12 +35,12 @@ $content[] = '= '.pht('Mail Commands Overview'); $content[] = pht( - 'After configuring Phabricator to process inbound mail, you can '. + 'After configuring processing for inbound mail, you can '. 'interact with objects (like tasks and revisions) over email. For '. - 'information on configuring Phabricator, see '. + 'information on configuring inbound mail, see '. '**[[ %s | Configuring Inbound Email ]]**.'. "\n\n". - 'In most cases, you can reply to email you receive from Phabricator '. + 'In most cases, you can reply to email you receive from this server '. 'to leave comments. You can also use **mail commands** to take a '. 'greater range of actions (like claiming a task or requesting changes '. 'to a revision) without needing to log in to the web UI.'. @@ -52,12 +52,13 @@ 'or end of your mail message. For example, you could write this in a '. 'reply to task email to claim the task:'. "\n\n```\n!claim\n\nI'll take care of this.\n```\n\n\n". - "When Phabricator receives your mail, it will process any commands ". + "When %s receives your mail, it will process any commands ". "first, then post the remaining message body as a comment. You can ". "execute multiple commands at once:". "\n\n```\n!assign alincoln\n!close\n\nI just talked to @alincoln, ". "and he showed me that he fixed this.\n```\n", - PhabricatorEnv::getDoclink('Configuring Inbound Email')); + PhabricatorEnv::getDoclink('Configuring Inbound Email'), + PlatformSymbols::getPlatformServerName()); $content[] = '= '.$spec['header']; $content[] = $spec['summary']; @@ -122,7 +123,7 @@ $info_view = null; if (!PhabricatorEnv::getEnvConfig('metamta.reply-handler-domain')) { $error = pht( - "Phabricator is not currently configured to accept inbound mail. ". + "This server is not currently configured to accept inbound mail. ". "You won't be able to interact with objects over email until ". "inbound mail is set up."); $info_view = id(new PHUIInfoView()) diff --git a/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php b/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php --- a/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php +++ b/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php @@ -264,7 +264,7 @@ pht( 'Used if the "From:" address does not map to a user account. '. 'Setting a default author will allow anyone on the public '. - 'internet to create objects in Phabricator by sending email to '. + 'internet to create objects by sending email to '. 'this address.'))); if ($is_new) { diff --git a/src/applications/metamta/query/PhabricatorMetaMTAActor.php b/src/applications/metamta/query/PhabricatorMetaMTAActor.php --- a/src/applications/metamta/query/PhabricatorMetaMTAActor.php +++ b/src/applications/metamta/query/PhabricatorMetaMTAActor.php @@ -143,7 +143,7 @@ 'recipient received the original email message, so we are not '. 'sending them this substantially similar message (for example, '. 'the sender used "Reply All" instead of "Reply" in response to '. - 'mail from Phabricator).'), + 'mail from this server).'), self::REASON_SELF => pht( 'This recipient is the user whose actions caused delivery of '. 'this message, but they have set preferences so they do not '. diff --git a/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php b/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php --- a/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php +++ b/src/applications/metamta/receiver/PhabricatorObjectMailReceiver.php @@ -72,10 +72,10 @@ MetaMTAReceivedMailStatus::STATUS_NO_PUBLIC_MAIL, pht( 'This mail is addressed to the public email address of an object '. - '("%s"), but public replies are not enabled on this Phabricator '. - 'install. An administrator may have recently disabled this '. - 'setting, or you may have replied to an old message. Try '. - 'replying to a more recent message instead.', + '("%s"), but public replies are not enabled on this server. An '. + 'administrator may have recently disabled this setting, or you '. + 'may have replied to an old message. Try replying to a more '. + 'recent message instead.', $pattern)); } $check_phid = $object->getPHID();