PR -> pull request in user facing strings (#7692)

alexr00 · web-flow · commit 41d9e35819ce · 2025-08-28T08:19:01.000Z
diff --git a/package.nls.json b/package.nls.json
@@ -57,13 +57,13 @@
 			"Do not translate what's inside of the '${..}'. It is an internal syntax for the extension"
 		]
 	},
-	"githubPullRequests.pushBranch.description": "Push the \"from\" branch when creating a PR and the \"from\" branch is not available on the remote.",
-	"githubPullRequests.pushBranch.prompt": "Prompt to push the branch when creating a PR and the \"from\" branch is not available on the remote.",
-	"githubPullRequests.pushBranch.always": "Always push the branch when creating a PR and the \"from\" branch is not available on the remote.",
-	"githubPullRequests.pullBranch.description": "Pull changes from the remote when a PR branch is checked out locally. Changes are detected when the PR is manually refreshed and during periodic background updates.",
-	"githubPullRequests.pullBranch.prompt": "Prompt to pull a PR branch when changes are detected in the PR.",
-	"githubPullRequests.pullBranch.never": "Never pull a PR branch when changes are detected in the PR.",
-	"githubPullRequests.pullBranch.always": "Always pull a PR branch when changes are detected in the PR. When `\"git.autoStash\": true` this will instead `prompt` to prevent unexpected file changes.",
+	"githubPullRequests.pushBranch.description": "Push the \"from\" branch when creating a pull request and the \"from\" branch is not available on the remote.",
+	"githubPullRequests.pushBranch.prompt": "Prompt to push the branch when creating a pull request and the \"from\" branch is not available on the remote.",
+	"githubPullRequests.pushBranch.always": "Always push the branch when creating a pull request and the \"from\" branch is not available on the remote.",
+	"githubPullRequests.pullBranch.description": "Pull changes from the remote when a pull request branch is checked out locally. Changes are detected when the pull request is manually refreshed and during periodic background updates.",
+	"githubPullRequests.pullBranch.prompt": "Prompt to pull a pull request branch when changes are detected in the pull request.",
+	"githubPullRequests.pullBranch.never": "Never pull a pull request branch when changes are detected in the pull request.",
+	"githubPullRequests.pullBranch.always": "Always pull a pull request branch when changes are detected in the pull request. When `\"git.autoStash\": true` this will instead `prompt` to prevent unexpected file changes.",
 	"githubPullRequests.allowFetch.description": "Allows `git fetch` to be run for checked-out pull request branches when checking for updates to the pull request.",
 	"githubPullRequests.ignoredPullRequestBranches.description": "Prevents branches that are associated with a pull request from being automatically detected. This will prevent review mode from being entered on these branches.",
 	"githubPullRequests.ignoredPullRequestBranches.items": "Branch name",
@@ -396,8 +396,8 @@
 			"{Locked='](command:workbench.action.chat.open?%7B%22query%22%3A%22%23copilotCodingAgent%20%22%2C%22isPartialQuery%22%3Atrue%7D)'}"
 		]
 	},
-	"languageModelTools.github-pull-request_issue_fetch.displayName": "Get a GitHub Issue or PR",
-	"languageModelTools.github-pull-request_issue_summarize.displayName": "Summarize a GitHub Issue or PR",
+	"languageModelTools.github-pull-request_issue_fetch.displayName": "Get a GitHub Issue or pull request",
+	"languageModelTools.github-pull-request_issue_summarize.displayName": "Summarize a GitHub Issue or pull request",
 	"languageModelTools.github-pull-request_notification_fetch.displayName": "Get a GitHub Notification",
 	"languageModelTools.github-pull-request_notification_summarize.displayName": "Summarize a GitHub Notification",
 	"languageModelTools.github-pull-request_suggest-fix.displayName": "Suggest a Fix for a GitHub Issue",
diff --git a/src/commands.ts b/src/commands.ts
@@ -672,7 +672,7 @@ export function registerCommands(
 			await vscode.window.withProgress(
 				{
 					location: vscode.ProgressLocation.Notification,
-					title: vscode.l10n.t('Applying changes from PR #{0}', pullRequest.number.toString()),
+					title: vscode.l10n.t('Applying changes from pull request #{0}', pullRequest.number.toString()),
 					cancellable: false
 				},
 				async (task) => {
diff --git a/src/github/activityBarViewProvider.ts b/src/github/activityBarViewProvider.ts
@@ -446,7 +446,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				this._replyMessage(message, result);
 			})
 			.catch(e => {
-				vscode.window.showErrorMessage(vscode.l10n.t('Unable to set PR ready for review. {0}', formatError(e)));
+				vscode.window.showErrorMessage(vscode.l10n.t('Unable to set pull request ready for review. {0}', formatError(e)));
 				this._throwError(message, '');
 			});
 	}
@@ -473,7 +473,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 				vscode.commands.executeCommand('pr.refreshList');
 
 				if (!result.merged) {
-					vscode.window.showErrorMessage(vscode.l10n.t('Merging PR failed: {0}', result?.message ?? ''));
+					vscode.window.showErrorMessage(vscode.l10n.t('Merging pull request failed: {0}', result?.message ?? ''));
 				}
 
 				this._replyMessage(message, {
diff --git a/src/github/copilotRemoteAgent.ts b/src/github/copilotRemoteAgent.ts
@@ -792,7 +792,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 		const tooltip = await issueMarkdown(pullRequest, this.context, this.repositoriesManager);
 		const timestampNumber = new Date(pullRequest.createdAt).getTime();
 		const defaultBranch = await pullRequest.githubRepository.getDefaultBranch();
-		const description = pullRequest.base.ref === defaultBranch ? `PR #${pullRequest.number}` : `PR #${pullRequest.number} → ${pullRequest.base.ref}`;
+		const description = pullRequest.base.ref === defaultBranch ? `pull request #${pullRequest.number}` : `pull request #${pullRequest.number} → ${pullRequest.base.ref}`;
 		return {
 			id: `${pullRequest.number}`,
 			label: pullRequest.title || `Session ${pullRequest.number}`,
@@ -828,7 +828,7 @@ export class CopilotRemoteAgentManager extends Disposable {
 				const pullRequest = prAndStatus.item;
 				const tooltip = await issueMarkdown(pullRequest, this.context, this.repositoriesManager);
 				const defaultBranch = await pullRequest.githubRepository.getDefaultBranch();
-				const description = pullRequest.base.ref === defaultBranch ? `PR #${pullRequest.number}` : `PR #${pullRequest.number} → ${pullRequest.base.ref}`;
+				const description = pullRequest.base.ref === defaultBranch ? `pull request #${pullRequest.number}` : `pull request #${pullRequest.number} → ${pullRequest.base.ref}`;
 				return {
 					id: `${pullRequest.number}`,
 					label: pullRequest.title || `Session ${pullRequest.number}`,
diff --git a/src/github/folderRepositoryManager.ts b/src/github/folderRepositoryManager.ts
@@ -1705,8 +1705,8 @@ export class FolderRepositoryManager extends Disposable {
 			if (workingDirectorySHA !== mergingPRSHA) {
 				// We are looking at different commit than what will be merged
 				const { ahead } = this.repository.state.HEAD!;
-				const pluralMessage = vscode.l10n.t('You have {0} unpushed commits on this PR branch.\n\nWould you like to proceed anyway?', ahead ?? 'unknown');
-				const singularMessage = vscode.l10n.t('You have 1 unpushed commit on this PR branch.\n\nWould you like to proceed anyway?');
+				const pluralMessage = vscode.l10n.t('You have {0} unpushed commits on this pull request branch.\n\nWould you like to proceed anyway?', ahead ?? 'unknown');
+				const singularMessage = vscode.l10n.t('You have 1 unpushed commit on this pull request branch.\n\nWould you like to proceed anyway?');
 				if (ahead &&
 					(await vscode.window.showWarningMessage(
 						ahead > 1 ? pluralMessage : singularMessage,
@@ -1725,7 +1725,7 @@ export class FolderRepositoryManager extends Disposable {
 				// We have made changes to the PR that are not committed
 				if (
 					(await vscode.window.showWarningMessage(
-						vscode.l10n.t('You have uncommitted changes on this PR branch.\n\n Would you like to proceed anyway?'),
+						vscode.l10n.t('You have uncommitted changes on this pull request branch.\n\n Would you like to proceed anyway?'),
 						{ modal: true },
 						vscode.l10n.t('Yes'),
 					)) === undefined
diff --git a/src/github/pullRequestModel.ts b/src/github/pullRequestModel.ts
@@ -332,11 +332,11 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 		if (this.isActive) {
 			localHead = repository.state.HEAD?.commit;
 			remoteHead = (await this.githubRepository.getPullRequest(this.number))?.head?.sha;
-			rejectMessage = vscode.l10n.t('The remote head of the PR branch has changed. Please pull the latest changes from the remote branch before approving.');
+			rejectMessage = vscode.l10n.t('The remote head of the pull request branch has changed. Please pull the latest changes from the remote branch before approving.');
 		} else {
 			localHead = this.head?.sha;
 			remoteHead = (await this.githubRepository.getPullRequest(this.number))?.head?.sha;
-			rejectMessage = vscode.l10n.t('The remote head of the PR branch has changed. Please refresh the pull request before approving.');
+			rejectMessage = vscode.l10n.t('The remote head of the pull request branch has changed. Please refresh the pull request before approving.');
 		}
 
 		if (!remoteHead || remoteHead !== localHead) {
diff --git a/src/github/pullRequestOverview.ts b/src/github/pullRequestOverview.ts
@@ -604,7 +604,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				vscode.commands.executeCommand('pr.refreshList');
 
 				if (!result.merged) {
-					vscode.window.showErrorMessage(`Merging PR failed: ${result.message}`);
+					vscode.window.showErrorMessage(`Merging pull request failed: ${result.message}`);
 				}
 
 				const mergeResult: MergeResult = {
@@ -645,7 +645,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				this._replyMessage(message, result);
 			})
 			.catch(e => {
-				vscode.window.showErrorMessage(`Unable to set PR ready for review. ${formatError(e)}`);
+				vscode.window.showErrorMessage(`Unable to set pull request ready for review. ${formatError(e)}`);
 				this._throwError(message, '');
 			});
 	}
diff --git a/src/lm/tools/fetchIssueTool.ts b/src/lm/tools/fetchIssueTool.ts
@@ -44,12 +44,12 @@ export class FetchIssueTool extends RepoToolBase<FetchIssueToolParameters> {
 	async invoke(options: vscode.LanguageModelToolInvocationOptions<FetchIssueToolParameters>, _token: vscode.CancellationToken): Promise<vscode.LanguageModelToolResult> {
 		const issueNumber = options.input.issueNumber;
 		if (!issueNumber) {
-			throw new Error('No issue/PR number provided.');
+			throw new Error('No issue/pull-request number provided.');
 		}
 		const { owner, name, folderManager } = await this.getRepoInfo({ owner: options.input.repo?.owner, name: options.input.repo?.name });
 		const issueOrPullRequest = await folderManager.resolveIssueOrPullRequest(owner, name, issueNumber);
 		if (!issueOrPullRequest) {
-			throw new Error(`No issue or PR found for ${owner}/${name}/${issueNumber}. Make sure the issue or PR exists.`);
+			throw new Error(`No issue or pull request found for ${owner}/${name}/${issueNumber}. Make sure the issue or pull request exists.`);
 		}
 		const result: FetchIssueResult = {
 			owner,
diff --git a/src/lm/tools/summarizeIssueTool.ts b/src/lm/tools/summarizeIssueTool.ts
@@ -73,7 +73,7 @@ Body: ${comment.body}
 
 	private summarizeInstructions(repo: string, owner: string): string {
 		return `
-You are an AI assistant who is very proficient in summarizing issues and PRs.
+You are an AI assistant who is very proficient in summarizing issues and pull requests (PRs).
 You will be given information relative to an issue or PR : the title, the body and the comments. In the case of a PR you will also be given patches of the PR changes.
 Your task is to output a summary of all this information.
 Do not output code. When you try to summarize PR changes, summarize in a textual format.
diff --git a/src/view/treeNodes/fileChangeNode.ts b/src/view/treeNodes/fileChangeNode.ts
@@ -57,7 +57,7 @@ async function openDiffCommand(
 	return {
 		command: 'vscode.diff',
 		arguments: [parentURI, headURI, `${pathSegments[pathSegments.length - 1]} (Pull Request)`, opts],
-		title: 'Open Changed File in PR',
+		title: 'Open Changed File in pull request',
 	};
 }
 
diff --git a/webviews/common/context.tsx b/webviews/common/context.tsx
@@ -104,7 +104,7 @@ export class PRContext {
 		await this.postMessage({ command: 'pr.delete-comment', args });
 		const { pr } = this;
 		if (!pr) {
-			throw new Error('Unexpectedly no PR when trying to delete comment');
+			throw new Error('Unexpectedly no pull request when trying to delete comment');
 		}
 		const { id, pullRequestReviewId } = args;
 		if (!pullRequestReviewId) {
@@ -161,7 +161,7 @@ export class PRContext {
 	public close = async (body?: string) => {
 		const { pr } = this;
 		if (!pr) {
-			throw new Error('Unexpectedly no PR when trying to close');
+			throw new Error('Unexpectedly no pull request when trying to close');
 		}
 		try {
 			const result: CloseResult = await this.postMessage({ command: 'pr.close', args: body });
@@ -185,7 +185,7 @@ export class PRContext {
 	public removeLabel = async (label: string) => {
 		const { pr } = this;
 		if (!pr) {
-			throw new Error('Unexpectedly no PR when trying to remove label');
+			throw new Error('Unexpectedly no pull request when trying to remove label');
 		}
 		await this.postMessage({ command: 'pr.remove-label', args: label });
 		const labels = pr.labels.filter(r => r.name !== label);
@@ -199,7 +199,7 @@ export class PRContext {
 	private appendReview(reply: SubmitReviewReply) {
 		const { pr: state } = this;
 		if (!state) {
-			throw new Error('Unexpectedly no PR when trying to append review');
+			throw new Error('Unexpectedly no pull request when trying to append review');
 		}
 		const { events, reviewers, reviewedEvent } = reply;
 		state.busy = false;
@@ -222,7 +222,7 @@ export class PRContext {
 	public reRequestReview = async (reviewerId: string) => {
 		const { pr: state } = this;
 		if (!state) {
-			throw new Error('Unexpectedly no PR when trying to re-request review');
+			throw new Error('Unexpectedly no pull request when trying to re-request review');
 		}
 		const { reviewers } = await this.postMessage({ command: 'pr.re-request-review', args: reviewerId });
 		state.reviewers = reviewers;
@@ -232,7 +232,7 @@ export class PRContext {
 	public async updateAutoMerge({ autoMerge, autoMergeMethod }: { autoMerge?: boolean, autoMergeMethod?: MergeMethod }) {
 		const { pr: state } = this;
 		if (!state) {
-			throw new Error('Unexpectedly no PR when trying to update auto merge');
+			throw new Error('Unexpectedly no pull request when trying to update auto merge');
 		}
 		const response: { autoMerge: boolean, autoMergeMethod?: MergeMethod } = await this.postMessage({ command: 'pr.update-automerge', args: { autoMerge, autoMergeMethod } });
 		state.autoMerge = response.autoMerge;
@@ -243,7 +243,7 @@ export class PRContext {
 	public updateBranch = async () => {
 		const { pr: state } = this;
 		if (!state) {
-			throw new Error('Unexpectedly no PR when trying to update branch');
+			throw new Error('Unexpectedly no pull request when trying to update branch');
 		}
 		const result: Partial<PullRequest> = await this.postMessage({ command: 'pr.update-branch' });
 		state.events = result.events ?? state.events;
@@ -254,7 +254,7 @@ export class PRContext {
 	public dequeue = async () => {
 		const { pr: state } = this;
 		if (!state) {
-			throw new Error('Unexpectedly no PR when trying to dequeue');
+			throw new Error('Unexpectedly no pull request when trying to dequeue');
 		}
 		const isDequeued = await this.postMessage({ command: 'pr.dequeue' });
 		if (isDequeued) {
@@ -266,7 +266,7 @@ export class PRContext {
 	public enqueue = async () => {
 		const { pr: state } = this;
 		if (!state) {
-			throw new Error('Unexpectedly no PR when trying to enqueue');
+			throw new Error('Unexpectedly no pull request when trying to enqueue');
 		}
 		const result = await this.postMessage({ command: 'pr.enqueue' });
 		if (result.mergeQueueEntry) {

Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,7 @@ export function registerCommands(`
`672`	`672`	`await vscode.window.withProgress(`
`673`	`673`	`{`
`674`	`674`	`location: vscode.ProgressLocation.Notification,`
`675`		`- title: vscode.l10n.t('Applying changes from PR #{0}', pullRequest.number.toString()),`
	`675`	`+ title: vscode.l10n.t('Applying changes from pull request #{0}', pullRequest.number.toString()),`
`676`	`676`	`cancellable: false`
`677`	`677`	`},`
`678`	`678`	`async (task) => {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ async function openDiffCommand(`
`57`	`57`	`return {`
`58`	`58`	`command: 'vscode.diff',`
`59`	`59`	arguments: [parentURI, headURI, `${pathSegments[pathSegments.length - 1]} (Pull Request)`, opts],
`60`		`- title: 'Open Changed File in PR',`
	`60`	`+ title: 'Open Changed File in pull request',`
`61`	`61`	`};`
`62`	`62`	`}`
`63`	`63`