@@ -139,6 +139,7 @@
     "@wordpress/admin-ui": "^2.11.0",
     "@wordpress/components": "^41.0.0",
     "@wordpress/dataviews": "^19.1.0",
+    "@wordpress/element": "^8.8.0",
     "@wordpress/hooks": "^4.56.0",
     "@wordpress/i18n": "^6.29.0",
     "@wordpress/icons": "^17.0.0",
 
@@ -1004,7 +1004,7 @@ async function createMinimalPatchForDir(dir, baseOid = null) {
             gone && a.endsWith('\n')
         );
     }
-    return skippedNotice(binaries, unreadable) + (patch || 'No changes.');
+    return skippedNotice(binaries, unreadable) + patch;
 }
 
 /**
 
@@ -12,6 +12,8 @@
 // to nothing is news for the buttons that would give it somewhere to go.
 'use strict';
 
+const { __, sprintf } = require('@wordpress/i18n');
+
 // Byte-identical to the confirm the dirty-update modal has always used, so
 // the same action reads the same everywhere it can be triggered.
 const DISCARD_CONFIRM_MESSAGE = 'Discard all local changes? This cannot be undone.';
@@ -186,29 +188,39 @@ function discardBlocked({ isUpdating, installing, building, devServerActive, dis
  * @return {string|null}
  */
 function discardDisabledReason({ patchLoading, patchLoadFailed, patchHasChanges, isUpdating, installing, building, devServerActive, discarding } = {}) {
-	if (discarding) return 'Changes are already being discarded.';
-	if (patchLoading) return 'Wait for your changes to finish loading.';
-	if (patchLoadFailed) return 'Changes could not be loaded.';
-	if (!patchHasChanges) return 'There are no changes to discard.';
-	if (isUpdating) return 'Wait for the trunk update to finish before discarding changes.';
-	if (installing) return 'Wait for the installation to finish before discarding changes.';
-	if (building) return 'Wait for the build to finish before discarding changes.';
-	if (devServerActive) return 'Stop the dev server before discarding changes.';
+	if (discarding) return __('Changes are already being discarded.');
+	if (patchLoading) return __('Wait for your changes to finish loading.');
+	if (patchLoadFailed) return __('Changes could not be loaded.');
+	if (!patchHasChanges) return __('There are no changes to discard.');
+	if (isUpdating) return __('Wait for the trunk update to finish before discarding changes.');
+	if (installing) return __('Wait for the installation to finish before discarding changes.');
+	if (building) return __('Wait for the build to finish before discarding changes.');
+	if (devServerActive) return __('Stop the dev server before discarding changes.');
 	return null;
 }
 
-// The review always names the base used to measure the displayed changes;
-// `workItemNoun` as in changesNoteParts.
+// The heading over a linked work item's changes, one sentence per kind
+// (`workItemNoun` as in changesNoteParts).
+function workItemChangesHeading(workItemNoun, number) {
+	// translators: %d: a GitHub issue number.
+	if (workItemNoun === 'issue') return sprintf(__('Your changes for issue #%d'), number);
+	// translators: %d: a Trac ticket number.
+	return sprintf(__('Your changes for ticket #%d'), number);
+}
+
+// The review always names the base used to measure the displayed changes.
 function patchReviewContext({ pullRequest, tracTicket, workItemNoun = 'ticket' } = {}) {
 	if (pullRequest) return {
-		heading: `Your changes on top of PR #${pullRequest.number}`,
-		description: 'Edits to this local copy, compared with the original PR commits.',
-		empty: `There are no changes on top of PR #${pullRequest.number}.`
+		// translators: %d: a pull request number.
+		heading: sprintf(__('Your changes on top of PR #%d'), pullRequest.number),
+		description: __('Edits to this local copy, compared with the original PR commits.'),
+		// translators: %d: a pull request number.
+		empty: sprintf(__('There are no changes on top of PR #%d.'), pullRequest.number)
 	};
 	return {
-		heading: tracTicket ? `Your changes for ${workItemNoun} #${tracTicket}` : 'Your changes',
-		description: 'Everything this site has that its copy of trunk does not.',
-		empty: 'There is nothing to send yet — this site has no changes against its copy of trunk.'
+		heading: tracTicket ? workItemChangesHeading(workItemNoun, tracTicket) : __('Your changes'),
+		description: __('Everything this site has that its copy of trunk does not.'),
+		empty: __('There is nothing to send yet — this site has no changes against its copy of trunk.')
 	};
 }
 
 
@@ -1,5 +1,7 @@
 import { useState } from 'react';
 import { Button, TextControl } from '@wordpress/components';
+import { createInterpolateElement } from '@wordpress/element';
+import { __, sprintf } from '@wordpress/i18n';
 import { Text } from '@wordpress/ui';
 import { Destination } from './destination.jsx';
 
@@ -35,12 +37,12 @@ export function MentorHandoff({ wporg, saveDisabled, onSave }) {
     try {
       const named = await wporg.rememberHandle(handleInput);
       if (!named?.ok) {
-        setHandleError(named?.error || 'Could not save that username.');
+        setHandleError(named?.error || __('Could not save that username.'));
         return;
       }
       const at = await wporg.rememberEvent(eventInput);
       if (!at?.ok) {
-        setHandleError(at?.error || 'Could not save that event.');
+        setHandleError(at?.error || __('Could not save that event.'));
         return;
       }
       setHandleInput('');
@@ -53,22 +55,33 @@ export function MentorHandoff({ wporg, saveDisabled, onSave }) {
 
   return (
     <Destination
-      title="Hand it to a mentor"
-      cost="No accounts at all. The patch carries your WordPress.org username, and the event you are at."
-      after="Someone else pushes it; the props still land on you."
+      title={__('Hand it to a mentor')}
+      cost={__('No accounts at all. The patch carries your WordPress.org username, and the event you are at.')}
+      after={__('Someone else pushes it; the props still land on you.')}
     >
       {wporg?.handle && !editingHandle ? (
         <>
           <Button variant="primary" onClick={onSave} disabled={saveDisabled}>
-            Save patch as {wporg.handle}
+            {
+              // translators: %s: the contributor's WordPress.org username.
+              sprintf(__('Save patch as %s'), wporg.handle)
+            }
           </Button>
           {/*
             The event is shown on every save rather than only when
             it is set: a remembered WordCamp from last year would
             otherwise keep stamping patches with nobody seeing it.
           */}
           <Text variant="body-sm" className="muted-label">
-            {wporg.event ? <>The patch will say it was written at <strong>{wporg.event}</strong>.</> : 'No event on the patch.'}
+            {wporg.event
+              ? createInterpolateElement(
+                // translators: <event /> is the name of the event the contributor is at, such as WordCamp Europe 2026.
+                __('The patch will say it was written at <strong><event /></strong>.'),
+                // The name goes in as an element, not into the string: it is
+                // free text, and a `<` in it would be read as markup.
+                { strong: <strong />, event: <>{wporg.event}</> }
+              )
+              : __('No event on the patch.')}
           </Text>
           <Text variant="body-sm">
             <Button
@@ -79,29 +92,29 @@ export function MentorHandoff({ wporg, saveDisabled, onSave }) {
                 setHandleError('');
                 setEditingHandle(true);
               }}
-            >Change these</Button>
+            >{__('Change these')}</Button>
           </Text>
         </>
       ) : (
         <>
           <Text variant="body-sm" className="muted-label">
-            Asked once and remembered for every site — these are facts about you, not about this checkout.
+            {__('Asked once and remembered for every site — these are facts about you, not about this checkout.')}
           </Text>
           <TextControl
             value={handleInput}
             onChange={(value) => { setHandleInput(value); setHandleError(''); }}
             onKeyDown={(event) => { if (event.key === 'Enter') { event.preventDefault(); rememberContributor(); } }}
             disabled={handleSaving}
-            placeholder="WordPress.org username, e.g. janedoe"
-            aria-label="WordPress.org username"
+            placeholder={__('WordPress.org username, e.g. janedoe')}
+            aria-label={__('WordPress.org username')}
           />
           <TextControl
             value={eventInput}
             onChange={(value) => { setEventInput(value); setHandleError(''); }}
             onKeyDown={(event) => { if (event.key === 'Enter') { event.preventDefault(); rememberContributor(); } }}
             disabled={handleSaving}
-            placeholder="Event, e.g. WordCamp Europe 2026 (optional)"
-            aria-label="Event this patch was written at"
+            placeholder={__('Event, e.g. WordCamp Europe 2026 (optional)')}
+            aria-label={__('Event this patch was written at')}
           />
           <Button
             variant="secondary"
@@ -113,7 +126,7 @@ export function MentorHandoff({ wporg, saveDisabled, onSave }) {
             // Before the first answer it would just be a button
             // that does nothing.
             disabled={handleSaving || (!handleInput.trim() && !wporg?.handle)}
-          >Remember this</Button>
+          >{__('Remember this')}</Button>
           {handleError ? <Text variant="body-sm" className="problem-text" role="alert">{handleError}</Text> : null}
         </>
       )}
 
@@ -1,8 +1,17 @@
 import { Button, Spinner } from '@wordpress/components';
+import { createInterpolateElement } from '@wordpress/element';
+import { __, sprintf } from '@wordpress/i18n';
 import { Stack, Text } from '@wordpress/ui';
 import { copy as copyIcon, check as checkIcon, download } from '@wordpress/icons';
 import { DiscardChangesLink } from './discard-changes-link.jsx';
 import { DiffText } from './diff-text.jsx';
+import { hasDiffLines } from '../diff-highlight.cjs';
+
+// What the pane says when the diff could not be generated.
+function loadError(error) {
+  // translators: %s: the error from generating the patch.
+  return error ? sprintf(__('Error: %s'), error) : __('Failed to generate patch');
+}
 
 // The left column of "Review & submit changes": the contributor's own diff,
 // with what can be done to it as a whole. Save it to a file, copy it, or throw
@@ -11,7 +20,8 @@ import { DiffText } from './diff-text.jsx';
 // It holds no state. The diff, whether it is still being generated, and what
 // the last save, copy and discard came to are the caller's, because the same
 // patch feeds the destinations beside this pane and the same discard is
-// offered from the ticket's note. This is how they look here.
+// offered from the ticket's note. This is how they look here. When the diff
+// could not be generated, `patchText` is the error.
 export function PatchDiffPane({
   heading,
   description,
@@ -35,13 +45,19 @@ export function PatchDiffPane({
           <Stack direction="row" align="baseline" gap="xs" wrap="wrap">
             <Text variant="heading-md">{heading}</Text>
             <Text variant="body-sm">
-              {'('}
-              <DiscardChangesLink
-                label="Discard all changes"
-                onClick={onDiscard}
-                reason={discardReason}
-              />
-              {')'}
+              {createInterpolateElement(
+                // translators: <discard /> is the "Discard all changes" link, beside the heading.
+                __('(<discard />)'),
+                {
+                  discard: (
+                    <DiscardChangesLink
+                      label={__('Discard all changes')}
+                      onClick={onDiscard}
+                      reason={discardReason}
+                    />
+                  )
+                }
+              )}
             </Text>
           </Stack>
           <Text variant="body-sm" className="muted-label">{description}</Text>
@@ -54,7 +70,7 @@ export function PatchDiffPane({
           pane is a column.
         */}
         <Stack direction="row" gap="sm">
-          <Button variant="secondary" icon={download} onClick={onSave} disabled={patchLoading || patchLoadFailed}>Save</Button>
+          <Button variant="secondary" icon={download} onClick={onSave} disabled={patchLoading || patchLoadFailed}>{__('Save')}</Button>
           <Button
             variant="secondary"
             icon={copied ? checkIcon : copyIcon}
@@ -75,22 +91,34 @@ export function PatchDiffPane({
         show.
       */}
       {patchSaved ? (
-        <Text variant="body-md" className="success-text">Saved to {patchSaved}</Text>
+        <Text variant="body-md" className="success-text">{
+          // translators: %s: the path of the saved patch file.
+          sprintf(__('Saved to %s'), patchSaved)
+        }</Text>
       ) : null}
       {patchSaveError ? (
-        <Text variant="body-md" className="problem-text" role="alert">Could not save the patch: {patchSaveError}</Text>
+        <Text variant="body-md" className="problem-text" role="alert">{
+          // translators: %s: why the patch could not be saved.
+          sprintf(__('Could not save the patch: %s'), patchSaveError)
+        }</Text>
       ) : null}
       <div className="patch-diff-body">
         {patchLoading ? (
           <Stack direction="column" align="center" justify="center" gap="lg" className="patch-diff-loading">
             <Spinner />
-            <Text variant="body-lg" className="muted-label">Generating patch...</Text>
+            <Text variant="body-lg" className="muted-label">{__('Generating patch…')}</Text>
           </Stack>
         ) : (
           // Its height, and why its padding is counted in it, are in
           // shell.css under `.patch-diff-code`.
           <pre className="patch-diff-code">
-            {patchText && patchText.trim().length ? <DiffText text={patchText} /> : 'No changes.'}
+            {patchLoadFailed ? loadError(patchText) : (
+              <>
+                {patchText && patchText.trim().length ? <DiffText text={patchText} /> : null}
+                {/* Under any `#` lines naming files the diff could not carry (#85). */}
+                {hasDiffLines(patchText) ? null : __('No changes.')}
+              </>
+            )}
           </pre>
         )}
       </div>
 
@@ -1,4 +1,6 @@
 import { Modal } from '@wordpress/components';
+import { createInterpolateElement } from '@wordpress/element';
+import { __, _n, sprintf } from '@wordpress/i18n';
 import { Notice, Stack, Text } from '@wordpress/ui';
 import { prSubmissionRefusal } from '../pr-checkout.cjs';
 
@@ -15,17 +17,40 @@ function OwnershipWarning({ pullRequest, appliedPatch, appliedPatchLabel }) {
     return (
       <Notice.Root intent="warning" role="alert" spokenMessage={SILENT}>
         <Notice.Description>
-          {prSubmissionRefusal(pullRequest.number)} You can still use <strong>Save</strong> to keep an unattributed copy of your edits.
+          {prSubmissionRefusal(pullRequest.number)}{' '}
+          <span>
+            {createInterpolateElement(
+              // translators: <strong>Save</strong> is the name of the Save button.
+              __('You can still use <strong>Save</strong> to keep an unattributed copy of your edits.'),
+              { strong: <strong /> }
+            )}
+          </span>
         </Notice.Description>
       </Notice.Root>
     );
   }
   if (appliedPatch) {
+    // The label is a file's name or a pull request's, and goes in as an
+    // element rather than into the string: a `<` in a file name would
+    // otherwise be read as markup.
+    const headline = appliedPatchLabel
+      ? createInterpolateElement(
+        // translators: <label /> is the name of an applied patch, such as a file name.
+        __('<strong><label /> is part of this checkout.</strong>'),
+        { strong: <strong />, label: <>{appliedPatchLabel}</> }
+      )
+      : createInterpolateElement(__('<strong>The patch you applied is part of this checkout.</strong>'), { strong: <strong /> });
     return (
       <Notice.Root intent="warning" role="alert" spokenMessage={SILENT}>
         <Notice.Description>
-          <strong>{appliedPatchLabel} is part of this checkout.</strong>{' '}
-          The app cannot safely separate its author’s changes from edits made afterward, so this combined patch cannot be submitted as your work. You can still use <strong>Save</strong> to keep an unattributed copy; revert the applied patch before submitting.
+          <span>{headline}</span>{' '}
+          <span>
+            {createInterpolateElement(
+              // translators: <strong>Save</strong> is the name of the Save button.
+              __('The app cannot safely separate its author’s changes from edits made afterward, so this combined patch cannot be submitted as your work. You can still use <strong>Save</strong> to keep an unattributed copy; revert the applied patch before submitting.'),
+              { strong: <strong /> }
+            )}
+          </span>
         </Notice.Description>
       </Notice.Root>
     );
@@ -64,7 +89,7 @@ export function ReviewDialog({
 }) {
   return (
     <Modal
-      title="Review & submit changes"
+      title={__('Review & submit changes')}
       onRequestClose={onClose}
       shouldCloseOnClickOutside
       isFullScreen
@@ -73,14 +98,22 @@ export function ReviewDialog({
         {!loading && age.stale && (
           <Notice.Root intent="warning" spokenMessage={SILENT}>
             <Notice.Description>
-              This site&apos;s WordPress code is {age.ageDays} days old — this patch may not apply on Trac. Consider updating to the latest trunk first.
+              {sprintf(
+                // translators: %d: how many days old the site's copy of WordPress is.
+                _n(
+                  "This site's WordPress code is %d day old — this patch may not apply on Trac. Consider updating to the latest trunk first.",
+                  "This site's WordPress code is %d days old — this patch may not apply on Trac. Consider updating to the latest trunk first.",
+                  age.ageDays
+                ),
+                age.ageDays
+              )}
             </Notice.Description>
           </Notice.Root>
         )}
         {!loading && loadFailed ? (
           <Notice.Root intent="error" role="alert" spokenMessage={SILENT}>
             <Notice.Description>
-              Could not load your changes. Close this panel and try again. The error is shown below.
+              {__('Could not load your changes. Close this panel and try again. The error is shown below.')}
             </Notice.Description>
           </Notice.Root>
         ) : null}
@@ -123,8 +156,8 @@ export function ReviewDialog({
           {!loading && hasChanges && (
             <div className="patch-destinations">
               <div>
-                <Text variant="heading-md" render={<div />}>Where this patch goes</Text>
-                <Text variant="body-sm" className="muted-label" render={<div />}>The pull request is the one the app sends for you. The others save a file for you to send.</Text>
+                <Text variant="heading-md" render={<div />}>{__('Where this patch goes')}</Text>
+                <Text variant="body-sm" className="muted-label" render={<div />}>{__('The pull request is the one the app sends for you. The others save a file for you to send.')}</Text>
               </div>
 
               <OwnershipWarning pullRequest={pullRequest} appliedPatch={appliedPatch} appliedPatchLabel={appliedPatchLabel} />
Original file line number	Diff line number	Diff line change
`@@ -1004,7 +1004,7 @@ async function createMinimalPatchForDir(dir, baseOid = null) {`
`1004`	`1004`	`gone && a.endsWith('\n')`
`1005`	`1005`	`);`
`1006`	`1006`	`}`
`1007`		`- return skippedNotice(binaries, unreadable) + (patch \|\| 'No changes.');`
	`1007`	`+ return skippedNotice(binaries, unreadable) + patch;`
`1008`	`1008`	`}`
`1009`	`1009`
`1010`	`1010`	`/**`