Page MenuHomePhabricator

D21790.diff
No OneTemporary

D21790.diff

diff --git a/src/applications/settings/setting/PhabricatorOlderInlinesSetting.php b/src/applications/settings/setting/PhabricatorOlderInlinesSetting.php
--- a/src/applications/settings/setting/PhabricatorOlderInlinesSetting.php
+++ b/src/applications/settings/setting/PhabricatorOlderInlinesSetting.php
@@ -22,7 +22,7 @@
protected function getControlInstructions() {
return pht(
- 'When a revision is updated, Phabricator attempts to bring inline '.
+ 'When a revision is updated, this software attempts to bring inline '.
'comments on the older version forward to the new changes. You can '.
'disable this behavior if you prefer comments stay anchored in one '.
'place.');
diff --git a/src/applications/settings/setting/PhabricatorTitleGlyphsSetting.php b/src/applications/settings/setting/PhabricatorTitleGlyphsSetting.php
--- a/src/applications/settings/setting/PhabricatorTitleGlyphsSetting.php
+++ b/src/applications/settings/setting/PhabricatorTitleGlyphsSetting.php
@@ -22,9 +22,10 @@
protected function getControlInstructions() {
return pht(
- 'Phabricator uses unicode glyphs in page titles to provide a compact '.
- 'representation of the current application. You can substitute plain '.
- 'text instead if these glyphs do not display on your system.');
+ 'Some applications use unicode glyphs in page titles to provide a '.
+ 'compact representation of the current application. You can '.
+ 'substitute plain text instead if these glyphs do not display on '.
+ 'your system.');
}
public function getSettingDefaultValue() {
diff --git a/src/applications/settings/setting/PhabricatorUnifiedDiffsSetting.php b/src/applications/settings/setting/PhabricatorUnifiedDiffsSetting.php
--- a/src/applications/settings/setting/PhabricatorUnifiedDiffsSetting.php
+++ b/src/applications/settings/setting/PhabricatorUnifiedDiffsSetting.php
@@ -22,8 +22,8 @@
protected function getControlInstructions() {
return pht(
- 'Phabricator normally shows diffs in a side-by-side layout on large '.
- 'screens and automatically switches to a unified view on small '.
+ 'Diffs are normally shown in a side-by-side layout on large '.
+ 'screens and automatically switched to a unified view on small '.
'screens (like mobile phones). If you prefer unified diffs even on '.
'large screens, you can select them for use on all displays.');
}
diff --git a/src/applications/subscriptions/command/PhabricatorSubscriptionsSubscribeEmailCommand.php b/src/applications/subscriptions/command/PhabricatorSubscriptionsSubscribeEmailCommand.php
--- a/src/applications/subscriptions/command/PhabricatorSubscriptionsSubscribeEmailCommand.php
+++ b/src/applications/subscriptions/command/PhabricatorSubscriptionsSubscribeEmailCommand.php
@@ -26,8 +26,7 @@
'command has no effect if you do not specify any subscribers.'.
"\n\n".
'Users who are CC\'d on the email itself are also automatically '.
- 'subscribed if Phabricator knows which accounts are linked to their '.
- 'email addresses.',
+ 'subscribed if their addresses are associated with a known account.',
'!subscribe alincoln #ios');
}
diff --git a/src/applications/system/management/PhabricatorSystemRemoveDestroyWorkflow.php b/src/applications/system/management/PhabricatorSystemRemoveDestroyWorkflow.php
--- a/src/applications/system/management/PhabricatorSystemRemoveDestroyWorkflow.php
+++ b/src/applications/system/management/PhabricatorSystemRemoveDestroyWorkflow.php
@@ -109,9 +109,8 @@
'projects and users.'.
"\n\n".
'These tattered edges are an expected consequence of destroying '.
- 'objects, and the Phabricator upstream will not help you fix '.
- 'them. We strongly recommend disabling or archiving objects '.
- 'instead.')));
+ 'objects, and the upstream will not help you fix them. We '.
+ 'strongly recommend disabling or archiving objects instead.')));
$phids = mpull($named_objects, 'getPHID');
$handles = PhabricatorUser::getOmnipotentUser()->loadHandles($phids);
diff --git a/src/infrastructure/cluster/PhabricatorDatabaseRef.php b/src/infrastructure/cluster/PhabricatorDatabaseRef.php
--- a/src/infrastructure/cluster/PhabricatorDatabaseRef.php
+++ b/src/infrastructure/cluster/PhabricatorDatabaseRef.php
@@ -353,7 +353,7 @@
$ref->setConnectionMessage(
pht(
'No permission to run "SHOW SLAVE STATUS". Grant this user '.
- '"REPLICATION CLIENT" permission to allow Phabricator to '.
+ '"REPLICATION CLIENT" permission to allow this server to '.
'monitor replica health.'));
} catch (AphrontInvalidCredentialsQueryException $ex) {
$ref->setConnectionStatus(self::STATUS_AUTH);
diff --git a/src/infrastructure/cluster/PhabricatorDatabaseRefParser.php b/src/infrastructure/cluster/PhabricatorDatabaseRefParser.php
--- a/src/infrastructure/cluster/PhabricatorDatabaseRefParser.php
+++ b/src/infrastructure/cluster/PhabricatorDatabaseRefParser.php
@@ -90,7 +90,7 @@
if (!is_array($partition)) {
throw new Exception(
pht(
- 'Phabricator is configured with multiple master databases, '.
+ 'This server is configured with multiple master databases, '.
'but master "%s" is missing a "partition" configuration key to '.
'define application partitioning.',
$ref->getRefKey()));
diff --git a/src/infrastructure/daemon/workers/management/PhabricatorWorkerManagementFloodWorkflow.php b/src/infrastructure/daemon/workers/management/PhabricatorWorkerManagementFloodWorkflow.php
--- a/src/infrastructure/daemon/workers/management/PhabricatorWorkerManagementFloodWorkflow.php
+++ b/src/infrastructure/daemon/workers/management/PhabricatorWorkerManagementFloodWorkflow.php
@@ -10,7 +10,7 @@
->setSynopsis(
pht(
'Flood the queue with test tasks. This command is intended for '.
- 'use when developing and debugging Phabricator.'))
+ 'use during development and debugging.'))
->setArguments(
array(
array(
diff --git a/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php b/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php
--- a/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php
+++ b/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php
@@ -138,7 +138,7 @@
throw new PhabricatorClusterImproperWriteException(
pht(
'Unable to establish a write-mode connection (to application '.
- 'database "%s") because Phabricator is in read-only mode. Whatever '.
+ 'database "%s") because this server is in read-only mode. Whatever '.
'you are trying to do does not function correctly in read-only mode.',
$database));
}

File Metadata

Mime Type
text/plain
Expires
May 18 2024, 4:55 AM (5 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6275691
Default Alt Text
D21790.diff (6 KB)

Event Timeline