From e11ce4dff518aad3e91b0ce66d5b35a3bf82d303 Mon Sep 17 00:00:00 2001 From: zetaloop Date: Wed, 11 Dec 2024 01:43:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=87=8D=E6=8E=92/=E5=8E=8B?= =?UTF-8?q?=E7=BC=A9=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/ui/history/compare.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/ui/history/compare.tsx b/app/src/ui/history/compare.tsx index e04497b670..1575bd19a5 100644 --- a/app/src/ui/history/compare.tsx +++ b/app/src/ui/history/compare.tsx @@ -306,7 +306,7 @@ export class CompareSidebar extends React.Component< ) { defaultErrorHandler( new Error( - `Unable to reorder. Reordering replays all commits up to the last one required for the reorder. A merge commit cannot exist among those commits.` + `无法重排。重排操作需要逐个重新应用所有需要调整顺序的提交，这中间不能有合并提交。` ), this.props.dispatcher ) @@ -684,7 +684,7 @@ export class CompareSidebar extends React.Component< ) { defaultErrorHandler( new Error( - `Unable to squash. Squashing replays all commits up to the last one required for the squash. A merge commit cannot exist among those commits.` + `无法压缩。压缩操作需要逐个重新应用所有需要调整顺序的提交，这中间不能有合并提交。` ), this.props.dispatcher )