🐶 新增几处翻译字段

Author: cngege

json/localization.json

@@ -888,6 +888,9 @@
 		["\"Undo\"","\"撤销\""],
 		["\"There are unresolved conflicts in the working directory\\.\"","\"工作目录中存在未解决的冲突。\""],
 		["\"Undo is disabled while the repository is being updated\"","\"当仓库正在更新时，撤销功能已禁用。\""],
+		["\"This will merge\"","\"这将会合并\""],
+		["\" from \",(..)\\(\\)\\.createElement\\(\"strong\",null,(.)\\.name\\),\" into \"","\"从\",$1().createElement(\"strong\",null,$2.name),\"分支到\""],
+		["\" The following files would be overwritten:\"","\"以下文件将被覆盖\""],
 		["\"\"","\"\""]
 	],
 	"renderer_dev": [