diff --git a/src/applications/remarkup/conduit/RemarkupProcessConduitAPIMethod.php b/src/applications/remarkup/conduit/RemarkupProcessConduitAPIMethod.php --- a/src/applications/remarkup/conduit/RemarkupProcessConduitAPIMethod.php +++ b/src/applications/remarkup/conduit/RemarkupProcessConduitAPIMethod.php @@ -11,7 +11,7 @@ } public function getMethodDescription() { - return pht('Process text through remarkup in Phabricator context.'); + return pht('Process text through remarkup.'); } protected function defineReturnType() { diff --git a/src/applications/repository/engine/PhabricatorRepositoryMirrorEngine.php b/src/applications/repository/engine/PhabricatorRepositoryMirrorEngine.php --- a/src/applications/repository/engine/PhabricatorRepositoryMirrorEngine.php +++ b/src/applications/repository/engine/PhabricatorRepositoryMirrorEngine.php @@ -16,7 +16,7 @@ if (PhabricatorEnv::getEnvConfig('phabricator.silent')) { $this->log( - pht('Phabricator is running in silent mode; declining to mirror.')); + pht('This software is running in silent mode; declining to mirror.')); return; } diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementCacheWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementCacheWorkflow.php --- a/src/applications/repository/management/PhabricatorRepositoryManagementCacheWorkflow.php +++ b/src/applications/repository/management/PhabricatorRepositoryManagementCacheWorkflow.php @@ -47,7 +47,7 @@ ->loadPathIDs(); if (empty($path_map[$path_name])) { throw new PhutilArgumentUsageException( - pht('Path "%s" is not known to Phabricator.', $path_name)); + pht('Path "%s" is not unknown.', $path_name)); } $path_id = $path_map[$path_name]; diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php --- a/src/applications/repository/storage/PhabricatorRepository.php +++ b/src/applications/repository/storage/PhabricatorRepository.php @@ -203,7 +203,8 @@ public function getDisplayName() { $slug = $this->getRepositorySlug(); - if (strlen($slug)) { + + if (phutil_nonempty_string($slug)) { return $slug; } diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php --- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php +++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php @@ -674,9 +674,9 @@ return array( 'buildable.commit' => pht('The commit identifier, if applicable.'), 'repository.callsign' => - pht('The callsign of the repository in Phabricator.'), + pht('The callsign of the repository.'), 'repository.phid' => - pht('The PHID of the repository in Phabricator.'), + pht('The PHID of the repository.'), 'repository.vcs' => pht('The version control system, either "svn", "hg" or "git".'), 'repository.uri' => diff --git a/src/applications/repository/storage/PhabricatorRepositoryURI.php b/src/applications/repository/storage/PhabricatorRepositoryURI.php --- a/src/applications/repository/storage/PhabricatorRepositoryURI.php +++ b/src/applications/repository/storage/PhabricatorRepositoryURI.php @@ -501,7 +501,7 @@ 'color' => 'green', 'label' => pht('Observe'), 'note' => pht( - 'Phabricator will observe changes to this URI and copy them.'), + 'Changes to this URI will be observed and pulled.'), 'short' => pht('Copy from a remote.'), ), self::IO_MIRROR => array( @@ -509,7 +509,7 @@ 'color' => 'green', 'label' => pht('Mirror'), 'note' => pht( - 'Phabricator will push a copy of any changes to this URI.'), + 'A copy of any changes will be pushed to this URI.'), 'short' => pht('Push a copy to a remote.'), ), self::IO_NONE => array( @@ -517,7 +517,7 @@ 'color' => 'grey', 'label' => pht('No I/O'), 'note' => pht( - 'Phabricator will not push or pull any changes to this URI.'), + 'No changes will be pushed or pulled from this URI.'), 'short' => pht('Do not perform any I/O.'), ), self::IO_READ => array( @@ -525,8 +525,7 @@ 'color' => 'blue', 'label' => pht('Read Only'), 'note' => pht( - 'Phabricator will serve a read-only copy of the repository from '. - 'this URI.'), + 'A read-only copy of the repository will be served from this URI.'), 'short' => pht('Serve repository in read-only mode.'), ), self::IO_READWRITE => array( @@ -534,8 +533,7 @@ 'color' => 'blue', 'label' => pht('Read/Write'), 'note' => pht( - 'Phabricator will serve a read/write copy of the repository from '. - 'this URI.'), + 'A read/write copy of the repository will be served from this URI.'), 'short' => pht('Serve repository in read/write mode.'), ), ); diff --git a/src/applications/settings/panel/PhabricatorExternalEditorSettingsPanel.php b/src/applications/settings/panel/PhabricatorExternalEditorSettingsPanel.php --- a/src/applications/settings/panel/PhabricatorExternalEditorSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorExternalEditorSettingsPanel.php @@ -129,7 +129,7 @@ $protocol_table = id(new AphrontTableView($protocol_rows)) ->setNoDataString( pht( - 'Phabricator is not configured to allow any editor protocols.')) + 'No allowed editor protocols are configured.')) ->setHeaders( array( pht('Protocol'), diff --git a/src/applications/settings/setting/PhabricatorEmailStampsSetting.php b/src/applications/settings/setting/PhabricatorEmailStampsSetting.php --- a/src/applications/settings/setting/PhabricatorEmailStampsSetting.php +++ b/src/applications/settings/setting/PhabricatorEmailStampsSetting.php @@ -22,7 +22,7 @@ protected function getControlInstructions() { return pht(<<