diff --git a/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php b/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php --- a/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php +++ b/src/applications/differential/edge/DifferentialRevisionDependedOnByRevisionEdgeType.php @@ -33,7 +33,7 @@ $add_edges) { return pht( - '%s added %s dependent revision(s): %s.', + '%s added %s child revision(s): %s.', $actor, $add_count, $add_edges); @@ -45,7 +45,7 @@ $rem_edges) { return pht( - '%s removed %s dependent revision(s): %s.', + '%s removed %s child revision(s): %s.', $actor, $rem_count, $rem_edges); @@ -60,7 +60,7 @@ $rem_edges) { return pht( - '%s edited dependent revision(s), added %s: %s; removed %s: %s.', + '%s edited child revision(s), added %s: %s; removed %s: %s.', $actor, $add_count, $add_edges, @@ -75,7 +75,7 @@ $add_edges) { return pht( - '%s added %s dependent revision(s) for %s: %s.', + '%s added %s child revision(s) for %s: %s.', $actor, $add_count, $object, @@ -89,7 +89,7 @@ $rem_edges) { return pht( - '%s removed %s dependent revision(s) for %s: %s.', + '%s removed %s child revision(s) for %s: %s.', $actor, $rem_count, $object, @@ -106,7 +106,7 @@ $rem_edges) { return pht( - '%s edited dependent revision(s) for %s, added %s: %s; removed %s: %s.', + '%s edited child revision(s) for %s, added %s: %s; removed %s: %s.', $actor, $object, $add_count, diff --git a/src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php b/src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php --- a/src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php +++ b/src/applications/differential/edge/DifferentialRevisionDependsOnRevisionEdgeType.php @@ -36,7 +36,7 @@ $add_edges) { return pht( - '%s added %s dependencie(s): %s.', + '%s added %s parent revision(s): %s.', $actor, $add_count, $add_edges); @@ -48,7 +48,7 @@ $rem_edges) { return pht( - '%s removed %s dependencie(s): %s.', + '%s removed %s parent revision(s): %s.', $actor, $rem_count, $rem_edges); @@ -63,7 +63,7 @@ $rem_edges) { return pht( - '%s edited dependencie(s), added %s: %s; removed %s: %s.', + '%s edited parent revision(s), added %s: %s; removed %s: %s.', $actor, $add_count, $add_edges, @@ -78,7 +78,7 @@ $add_edges) { return pht( - '%s added %s dependencie(s) for %s: %s.', + '%s added %s parent revision(s) for %s: %s.', $actor, $add_count, $object, @@ -92,7 +92,7 @@ $rem_edges) { return pht( - '%s removed %s dependencie(s) for %s: %s.', + '%s removed %s parent revision(s) for %s: %s.', $actor, $rem_count, $object, @@ -109,7 +109,7 @@ $rem_edges) { return pht( - '%s edited dependencie(s) for %s, added %s: %s; removed %s: %s.', + '%s edited parent revision(s) for %s, added %s: %s; removed %s: %s.', $actor, $object, $add_count, diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php --- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php +++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php @@ -595,70 +595,80 @@ '%s changed files, attached: %3$s; detached: %5$s.', - '%s added %s dependencie(s): %s.' => array( + '%s added %s parent revision(s): %s.' => array( array( - '%s added a dependency: %3$s.', - '%s added dependencies: %3$s.', + '%s added a parent revision: %3$s.', + '%s added parent revisions: %3$s.', ), ), - '%s added %s dependencie(s) for %s: %s.' => array( + '%s added %s parent revision(s) for %s: %s.' => array( array( - '%s added a dependency for %3$s: %4$s.', - '%s added dependencies for %3$s: %4$s.', + '%s added a parent revision for %3$s: %4$s.', + '%s added parent revisions for %3$s: %4$s.', ), ), - '%s removed %s dependencie(s): %s.' => array( + '%s removed %s parent revision(s): %s.' => array( array( - '%s removed a dependency: %3$s.', - '%s removed dependencies: %3$s.', + '%s removed a parent revision: %3$s.', + '%s removed parent revisions: %3$s.', ), ), - '%s removed %s dependencie(s) for %s: %s.' => array( + '%s removed %s parent revision(s) for %s: %s.' => array( array( - '%s removed a dependency for %3$s: %4$s.', - '%s removed dependencies for %3$s: %4$s.', + '%s removed a parent revision for %3$s: %4$s.', + '%s removed parent revisions for %3$s: %4$s.', ), ), - '%s edited dependencie(s), added %s: %s; removed %s: %s.' => array( - '%s edited dependencies, added: %3$s; removed: %5$s.', + '%s edited parent revision(s), added %s: %s; removed %s: %s.' => array( + '%s edited parent revisions, added: %3$s; removed: %5$s.', ), - '%s edited dependencie(s) for %s, added %s: %s; removed %s: %s.' => array( - '%s edited dependencies for %s, added: %3$s; removed: %5$s.', + '%s edited parent revision(s) for %s, '. + 'added %s: %s; removed %s: %s.' => array( + '%s edited parent revisions for %s, added: %3$s; removed: %5$s.', ), - '%s added %s dependent revision(s): %s.' => array( + '%s added %s child revision(s): %s.' => array( array( - '%s added a dependent revision: %3$s.', - '%s added dependent revisions: %3$s.', + '%s added a child revision: %3$s.', + '%s added child revisions: %3$s.', ), ), - '%s added %s dependent revision(s) for %s: %s.' => array( + '%s added %s child revision(s) for %s: %s.' => array( array( - '%s added a dependent revision for %3$s: %4$s.', - '%s added dependent revisions for %3$s: %4$s.', + '%s added a child revision for %3$s: %4$s.', + '%s added child revisions for %3$s: %4$s.', ), ), - '%s removed %s dependent revision(s): %s.' => array( + '%s removed %s child revision(s): %s.' => array( array( - '%s removed a dependent revision: %3$s.', - '%s removed dependent revisions: %3$s.', + '%s removed a child revision: %3$s.', + '%s removed child revisions: %3$s.', ), ), - '%s removed %s dependent revision(s) for %s: %s.' => array( + '%s removed %s child revision(s) for %s: %s.' => array( array( - '%s removed a dependent revision for %3$s: %4$s.', - '%s removed dependent revisions for %3$s: %4$s.', + '%s removed a child revision for %3$s: %4$s.', + '%s removed child revisions for %3$s: %4$s.', ), ), + '%s edited child revision(s), added %s: %s; removed %s: %s.' => array( + '%s edited child revisions, added: %3$s; removed: %5$s.', + ), + + '%s edited child revision(s) for %s, '. + 'added %s: %s; removed %s: %s.' => array( + '%s edited child revisions for %s, added: %3$s; removed: %5$s.', + ), + '%s added %s commit(s): %s.' => array( array( '%s added a commit: %3$s.',