Page MenuHomePhabricator
Files F15434258

D21770.id51890.diff
No OneTemporary
Actions

D21770.id51890.diff
View Options

diff --git a/src/applications/harbormaster/step/HarbormasterUploadArtifactBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterUploadArtifactBuildStepImplementation.php
--- a/src/applications/harbormaster/step/HarbormasterUploadArtifactBuildStepImplementation.php
+++ b/src/applications/harbormaster/step/HarbormasterUploadArtifactBuildStepImplementation.php
@@ -8,7 +8,7 @@
}
public function getGenericDescription() {
- return pht('Upload a file from a host to Phabricator.');
+ return pht('Upload a file.');
}
public function getBuildStepGroupKey() {
diff --git a/src/applications/legalpad/editor/LegalpadDocumentEditEngine.php b/src/applications/legalpad/editor/LegalpadDocumentEditEngine.php
--- a/src/applications/legalpad/editor/LegalpadDocumentEditEngine.php
+++ b/src/applications/legalpad/editor/LegalpadDocumentEditEngine.php
@@ -131,7 +131,7 @@
->setKey('requireSignature')
->setOptions(
pht('No Signature Required'),
- pht('Signature Required to use Phabricator'))
+ pht('Signature Required to Log In'))
->setAsCheckbox(true)
->setTransactionType(
LegalpadDocumentRequireSignatureTransaction::TRANSACTIONTYPE)
diff --git a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
--- a/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
+++ b/src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php
@@ -218,7 +218,7 @@
Statuses will appear in the UI in the order specified. Note the status marked
`special` as `duplicate` is not settable directly and will not appear in UI
-elements, and that any status marked `silly` does not appear if Phabricator
+elements, and that any status marked `silly` does not appear if the software
is configured with `phabricator.serious-business` set to true.
Examining the default configuration and examples below will probably be helpful
diff --git a/src/applications/meta/controller/PhabricatorApplicationUninstallController.php b/src/applications/meta/controller/PhabricatorApplicationUninstallController.php
--- a/src/applications/meta/controller/PhabricatorApplicationUninstallController.php
+++ b/src/applications/meta/controller/PhabricatorApplicationUninstallController.php
@@ -38,7 +38,7 @@
->appendChild(
pht(
'To manage prototypes, enable them by setting %s in your '.
- 'Phabricator configuration.',
+ 'configuration.',
phutil_tag('tt', array(), 'phabricator.show-prototypes')));
return id(new AphrontDialogResponse())->setDialog($dialog);
}
@@ -98,9 +98,9 @@
->appendParagraph(
pht(
'This is very unusual and will leave you without any '.
- 'content on the Phabricator home page. You should only '.
- 'do this if you are certain you know what you are doing.'))
- ->addSubmitButton(pht('Completely Break Phabricator'));
+ 'content on the home page. You should only do this if you '.
+ 'are certain you know what you are doing.'))
+ ->addSubmitButton(pht('Completely Break Everything'));
} else {
$dialog
->appendParagraph(
@@ -114,8 +114,7 @@
->setTitle(pht('Information'))
->appendChild(
pht(
- 'This application cannot be uninstalled, '.
- 'because it is required for Phabricator to work.'));
+ 'This application is required and cannot be uninstalled.'));
}
}
return id(new AphrontDialogResponse())->setDialog($dialog);
diff --git a/src/applications/metamta/constants/MetaMTAReceivedMailStatus.php b/src/applications/metamta/constants/MetaMTAReceivedMailStatus.php
--- a/src/applications/metamta/constants/MetaMTAReceivedMailStatus.php
+++ b/src/applications/metamta/constants/MetaMTAReceivedMailStatus.php
@@ -21,7 +21,7 @@
public static function getHumanReadableName($status) {
$map = array(
self::STATUS_DUPLICATE => pht('Duplicate Message'),
- self::STATUS_FROM_PHABRICATOR => pht('Phabricator Mail'),
+ self::STATUS_FROM_PHABRICATOR => pht('Mail From Self'),
self::STATUS_NO_RECEIVERS => pht('No Receivers'),
self::STATUS_UNKNOWN_SENDER => pht('Unknown Sender'),
self::STATUS_DISABLED_SENDER => pht('Disabled Sender'),
diff --git a/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php b/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
--- a/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
+++ b/src/applications/metamta/controller/PhabricatorMetaMTAMailViewController.php
@@ -428,7 +428,7 @@
if ($actor_phid) {
$actor_str = $viewer->renderHandle($actor_phid);
} else {
- $actor_str = pht('Generated by Phabricator');
+ $actor_str = pht('Generated by Server');
}
$properties->addProperty(pht('Actor'), $actor_str);
diff --git a/src/applications/metamta/engine/PhabricatorMailEmailEngine.php b/src/applications/metamta/engine/PhabricatorMailEmailEngine.php
--- a/src/applications/metamta/engine/PhabricatorMailEmailEngine.php
+++ b/src/applications/metamta/engine/PhabricatorMailEmailEngine.php
@@ -166,7 +166,7 @@
if (PhabricatorEnv::getEnvConfig('phabricator.silent')) {
$mail->setMessage(
pht(
- 'Phabricator is running in silent mode. See `%s` '.
+ 'This software is running in silent mode. See `%s` '.
'in the configuration to change this setting.',
'phabricator.silent'));
@@ -241,7 +241,7 @@
// If we don't have a display name, fill in a default.
if (!strlen($reply_address->getDisplayName())) {
- $reply_address->setDisplayName(pht('Phabricator'));
+ $reply_address->setDisplayName(PlatformSymbols::getPlatformServerName());
}
return $reply_address;
@@ -509,7 +509,7 @@
$address = new PhutilEmailAddress($raw_address);
if (!strlen($address->getDisplayName())) {
- $address->setDisplayName(pht('Phabricator'));
+ $address->setDisplayName(PlatformSymbols::getPlatformServerName());
}
return $address;
diff --git a/src/applications/metamta/management/PhabricatorMailManagementListInboundWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementListInboundWorkflow.php
--- a/src/applications/metamta/management/PhabricatorMailManagementListInboundWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementListInboundWorkflow.php
@@ -6,7 +6,7 @@
protected function didConstruct() {
$this
->setName('list-inbound')
- ->setSynopsis(pht('List inbound messages received by Phabricator.'))
+ ->setSynopsis(pht('List inbound messages.'))
->setExamples(
'**list-inbound**')
->setArguments(
diff --git a/src/applications/metamta/management/PhabricatorMailManagementListOutboundWorkflow.php b/src/applications/metamta/management/PhabricatorMailManagementListOutboundWorkflow.php
--- a/src/applications/metamta/management/PhabricatorMailManagementListOutboundWorkflow.php
+++ b/src/applications/metamta/management/PhabricatorMailManagementListOutboundWorkflow.php
@@ -6,7 +6,7 @@
protected function didConstruct() {
$this
->setName('list-outbound')
- ->setSynopsis(pht('List outbound messages sent by Phabricator.'))
+ ->setSynopsis(pht('List outbound messages.'))
->setExamples('**list-outbound**')
->setArguments(
array(
diff --git a/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
--- a/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
+++ b/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
@@ -263,19 +263,16 @@
MetaMTAReceivedMailStatus::STATUS_UNKNOWN_SENDER,
pht(
'This email was sent from an email address ("%s") that is not '.
- 'associated with a Phabricator account. To interact with '.
- 'Phabricator via email, add this address to your account.',
+ 'associated with a registered user account. To interact via '.
+ 'email, add this address to your account.',
(string)$this->newFromAddress()));
} else {
throw new PhabricatorMetaMTAReceivedMailProcessingException(
MetaMTAReceivedMailStatus::STATUS_NO_RECEIVERS,
pht(
- 'Phabricator can not process this mail because no application '.
+ 'This mail can not be processed because no application '.
'knows how to handle it. Check that the address you sent it to '.
- 'is correct.'.
- "\n\n".
- '(No concrete, enabled subclass of PhabricatorMailReceiver can '.
- 'accept this mail.)'));
+ 'is correct.'));
}
}
} catch (PhabricatorMetaMTAReceivedMailProcessingException $ex) {
@@ -436,7 +433,7 @@
$status_code,
pht(
'Your message does not contain any body text or attachments, so '.
- 'Phabricator can not do anything useful with it. Make sure comment '.
+ 'this server can not do anything useful with it. Make sure comment '.
'text appears at the top of your message: quoted replies, inline '.
'text, and signatures are discarded and ignored.'));
}
@@ -484,7 +481,7 @@
$headers = implode("\n", $headers);
$body = pht(<<<EOBODY
-Your email to Phabricator was not processed, because an error occurred while
+Your email to %s was not processed, because an error occurred while
trying to handle it:
%s
@@ -499,6 +496,7 @@
EOBODY
,
+ PlatformSymbols::getPlatformServerName(),
wordwrap($description, 78),
$this->getRawTextBody(),
$headers);
@@ -563,21 +561,20 @@
if ($sender->getIsDisabled()) {
$failure_reason = pht(
'Your account ("%s") is disabled, so you can not interact with '.
- 'Phabricator over email.',
+ 'over email.',
$sender->getUsername());
} else if ($sender->getIsStandardUser()) {
if (!$sender->getIsApproved()) {
$failure_reason = pht(
'Your account ("%s") has not been approved yet. You can not '.
- 'interact with Phabricator over email until your account is '.
- 'approved.',
+ 'interact over email until your account is approved.',
$sender->getUsername());
} else if (PhabricatorUserEmail::isEmailVerificationRequired() &&
!$sender->getIsEmailVerified()) {
$failure_reason = pht(
'You have not verified the email address for your account ("%s"). '.
- 'You must verify your email address before you can interact '.
- 'with Phabricator over email.',
+ 'You must verify your email address before you can interact over '.
+ 'email.',
$sender->getUsername());
}
}

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 26, 2:48 AM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7723127
Default Alt Text
D21770.id51890.diff (10 KB)

Event Timeline

Phabricator · Built by Phacility