Fixes microsoft#162043 by renaming "Accept Merge" to "Complete Merge" (microsoft#162361)

Author: hediet

extensions/git/package.nls.json

@@ -103,7 +103,7 @@
 	"command.api.getRepositories": "Get Repositories",
 	"command.api.getRepositoryState": "Get Repository State",
 	"command.api.getRemoteSources": "Get Remote Sources",
-	"command.git.acceptMerge": "Accept Merge",
+	"command.git.acceptMerge": "Complete Merge",
 	"command.git.openMergeEditor": "Resolve in Merge Editor",
 	"command.git.runGitMerge": "Compute Conflicts With Git",
 	"command.git.runGitMergeDiff3": "Compute Conflicts With Git (Diff3)",

extensions/git/src/commands.ts

@@ -1162,7 +1162,7 @@ export class CommandCenter {
 
 		const repository = this.model.getRepository(uri);
 		if (!repository) {
-			console.log(`FAILED to accept merge because uri ${uri.toString()} doesn't belong to any repository`);
+			console.log(`FAILED to complete merge because uri ${uri.toString()} doesn't belong to any repository`);
 			return;
 		}
 
@@ -1183,7 +1183,7 @@ export class CommandCenter {
 		// make sure to save the merged document
 		const doc = workspace.textDocuments.find(doc => doc.uri.toString() === uri.toString());
 		if (!doc) {
-			console.log(`FAILED to accept merge because uri ${uri.toString()} doesn't match a document`);
+			console.log(`FAILED to complete merge because uri ${uri.toString()} doesn't match a document`);
 			return;
 		}
 		if (doc.isDirty) {

src/vs/workbench/contrib/mergeEditor/browser/commands/commands.ts

@@ -616,9 +616,9 @@ export class AcceptMerge extends MergeEditorAction2 {
 			title: {
 				value: localize(
 					'mergeEditor.acceptMerge',
-					'Accept Merge'
+					'Complete Merge'
 				),
-				original: 'Accept Merge',
+				original: 'Complete Merge',
 			},
 			f1: false,
 			precondition: ctxIsMergeEditor
@@ -633,7 +633,7 @@ export class AcceptMerge extends MergeEditorAction2 {
 			const confirmResult = await dialogService.confirm({
 				type: 'info',
 				message: localize('mergeEditor.acceptMerge.unhandledConflicts', "There are still unhandled conflicts. Are you sure you want to accept the merge?"),
-				primaryButton: localize('mergeEditor.acceptMerge.unhandledConflicts.accept', "Accept merge with unhandled conflicts"),
+				primaryButton: localize('mergeEditor.acceptMerge.unhandledConflicts.accept', "Complete merge with unhandled conflicts"),
 				secondaryButton: localize('mergeEditor.acceptMerge.unhandledConflicts.cancel', "Cancel"),
 			});
 

src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts

@@ -1152,7 +1152,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
 			constructor() {
 				super({
 					id: 'workbench.userDataSync.actions.acceptMerges',
-					title: localize('accept merges title', "Accept Merge"),
+					title: localize('complete merges title', "Complete Merge"),
 					menu: [{
 						id: MenuId.EditorContent,
 						when: ContextKeyExpr.and(ctxIsMergeResultEditor, ContextKeyExpr.regex(ctxMergeBaseUri.key, new RegExp(`^${USER_DATA_SYNC_SCHEME}:`))),