The original translation is invalid. See the document comparison for details

[aixiu]

https://github.com/microsoft/vscode-loc-deprecated/blob/a626296642fd9a2c7cd4fcec4b37bcbdfc452d1a/i18n/vscode-language-pack-id/translations/extensions/merge-conflict.i18n.json

https://github.com/microsoft/vscode-loc/blob/471aa48fd13989f8bc220ab495a71fff078ce0d8/i18n/vscode-language-pack-zh-hans/translations/extensions/merge-conflict.i18n.json

This file needs to be updated, thank you

[cristianosuzuki77]

@TylerLeonhardt could you check on this? Not sure what is being asked from loc.

[TylerLeonhardt]

@aixiu I'm not sure what you mean, sorry. Can you elaborate on what you want us to do?

[aixiu]

@TylerLeonhardt @cristianosuzuki77
new file https://github.com/microsoft/vscode-loc-deprecated/blob/a626296642fd9a2c7cd4fcec4b37bcbdfc452d1a/i18n/vscode-language-pack-id/translations/extensions/merge-conflict.i18n.json

"contents": {
		"package": {
			"displayName": "Merge Conflict",
			"description": "Highlighting and commands for inline merge conflicts.",
			"command.category": "Merge Conflict",
			"command.accept.all-current": "Accept All Current",
			"command.accept.all-incoming": "Accept All Incoming",
			"command.accept.all-both": "Accept All Both",
			"command.accept.current": "Accept Current",
			"command.accept.incoming": "Accept Incoming",
			"command.accept.selection": "Accept Selection",
			"command.accept.both": "Accept Both",
			"command.next": "Next Conflict",
			"command.previous": "Previous Conflict",
			"command.compare": "Compare Current Conflict",
			"config.title": "Merge Conflict",
			"config.autoNavigateNextConflictEnabled": "Whether to automatically navigate to the next merge conflict after resolving a merge conflict.",
			"config.codeLensEnabled": "Create a Code Lens for merge conflict blocks within editor.",
			"config.decoratorsEnabled": "Create decorators for merge conflict blocks within editor.",
			"config.diffViewPosition": "Controls where the diff view should be opened when comparing changes in merge conflicts.",
			"config.diffViewPosition.current": "Open the diff view in the current editor group.",
			"config.diffViewPosition.beside": "Open the diff view next to the current editor group.",
			"config.diffViewPosition.below": "Open the diff view below the current editor group."
		},
		"dist/codelensProvider": {
			"acceptCurrentChange": "Accept Current Change",
			"acceptIncomingChange": "Accept Incoming Change",
			"acceptBothChanges": "Accept Both Changes",
			"compareChanges": "Compare Changes"
		},
		"dist/commandHandler": {
			"cursorNotInConflict": "Editor cursor is not within a merge conflict",
			"compareChangesTitle": "{0}: Current Changes ⟷ Incoming Changes",
			"cursorOnCommonAncestorsRange": "Editor cursor is within the common ancestors block, please move it to either the \"current\" or \"incoming\" block",
			"cursorOnSplitterRange": "Editor cursor is within the merge conflict splitter, please move it to either the \"current\" or \"incoming\" block",
			"noConflicts": "No merge conflicts found in this file",
			"noOtherConflictsInThisFile": "No other merge conflicts within this file"
		},
		"dist/mergeDecorator": {
			"currentChange": "(Current Change)",
			"incomingChange": "(Incoming Change)"
		}
	}

Relative to the current document https://github.com/microsoft/vscode-loc/blob/471aa48fd13989f8bc220ab495a71fff078ce0d8/i18n/vscode-language-pack-zh-hans/translations/extensions/merge-conflict.i18n.json

"contents": {
		"package": {
			"command.accept.all-both": "全部保留两者",
			"command.accept.all-current": "全部采用当前内容",
			"command.accept.all-incoming": "全部采用传入版本",
			"command.accept.both": "保留两者",
			"command.accept.current": "采用当前内容",
			"command.accept.incoming": "采用传入内容",
			"command.accept.selection": "采用选中版本",
			"command.category": "合并冲突",
			"command.compare": "比较当前冲突",
			"command.next": "下一个冲突",
			"command.previous": "上一个冲突",
			"config.autoNavigateNextConflictEnabled": "是否在解决合并冲突后自动转到下一个合并冲突。",
			"config.codeLensEnabled": "为编辑器中的合并冲突区域创建 CodeLens。",
			"config.decoratorsEnabled": "为编辑器中的合并冲突区域创建提示小标。",
			"config.diffViewPosition": "控件在比较合并冲突中的更改时应在何处打开差异视图。",
			"config.diffViewPosition.below": "在当前编辑器组下方打开差异视图。",
			"config.diffViewPosition.beside": "在当前编辑器组旁边打开差异视图。",
			"config.diffViewPosition.current": "在当前的编辑器组中打开差异视图。",
			"config.title": "合并冲突",
			"description": "为内联合并冲突提供高亮和命令。",
			"displayName": "合并冲突"
		}
	}

There are more places to update the translation. thx.thx.

[TylerLeonhardt]

@aixiu the files in the repo https://github.com/microsoft/vscode-loc-deprecated are deprecated. In other words, they are no longer being updated because they are language packs that are no longer supported.

There was a time when the community supported an Indonesian language pack but that is no longer the case.

[aixiu]

@TylerLeonhardt I see. Thank you