fix: typo

Author: Ricbet

packages/core-browser/src/core-preferences.ts

@@ -300,7 +300,7 @@ export const corePreferenceSchema: PreferenceSchema = {
       type: 'boolean',
       default: true,
     },
-    'mergeEditor.autoApplyNoConflictChanges': {
+    'mergeEditor.autoApplyNonConflictChanges': {
       type: 'boolean',
       default: false,
     },

packages/i18n/src/common/en-US.lang.ts

@@ -988,7 +988,7 @@ export const localizationBundle = {
     'preference.diffEditor.renderSideBySide': 'Render Side By Side',
     'preference.diffEditor.ignoreTrimWhitespace': 'Ignore Trim Whitespace',
 
-    'preference.mergeEditor.autoApplyNoConflictChanges': 'Automatically apply non-conflicting changes',
+    'preference.mergeEditor.autoApplyNonConflictChanges': 'Automatically apply non-conflicting changes',
 
     'validate.tree.emptyFileNameError': 'Please provide a file or folder name',
     'validate.tree.fileNameStartsWithSlashError': 'File or folder name cannot start with /',

packages/i18n/src/common/zh-CN.lang.ts

@@ -560,7 +560,7 @@ export const localizationBundle = {
     'preference.diffEditor.renderSideBySide': '显示并排差异编辑器',
     'preference.diffEditor.ignoreTrimWhitespace': '忽略差异编辑器的前导和尾随空白字符',
 
-    'preference.mergeEditor.autoApplyNoConflictChanges': '自动合并非冲突变更',
+    'preference.mergeEditor.autoApplyNonConflictChanges': '自动合并非冲突变更',
 
     'status.editor.chooseLanguage': '选择语言模式',
     'status.editor.goToLineCol': '转到行/列',

packages/monaco/src/browser/contrib/merge-editor/merge-editor.service.ts

@@ -430,7 +430,7 @@ export class MergeEditorService extends Disposable {
     this.resultView.inputDiffComputingResult();
 
     // resolve non conflict ranges
-    const isAutoApply = this.preferenceService.getValid('mergeEditor.autoApplyNoConflictChanges', false);
+    const isAutoApply = this.preferenceService.getValid('mergeEditor.autoApplyNonConflictChanges', false);
     if (isAutoApply) {
       this.acceptLeft(true, ECompleteReason.AutoResolvedNonConflict);
       this.acceptRight(true, ECompleteReason.AutoResolvedNonConflict);

packages/preferences/src/browser/preference-settings.service.ts

@@ -745,8 +745,8 @@ export const defaultSettingSections: {
       preferences: [
         // merge 编辑器
         {
-          id: 'mergeEditor.autoApplyNoConflictChanges',
-          localized: 'preference.mergeEditor.autoApplyNoConflictChanges',
+          id: 'mergeEditor.autoApplyNonConflictChanges',
+          localized: 'preference.mergeEditor.autoApplyNonConflictChanges',
         },
       ],
     },