This commit is contained in:
LZX committed 2026-09-19 22:28:16 +08:00
1 parent 6f5d1ed570
commit 875840147d
17 files changed
+3093 -36

No files matched your search

+73
View File
@@ -1295,6 +1295,77 @@
"gitSearchTags": "Search tags...",
"gitNoBranches": "No branches",
"gitConflictTitle": "Resolve Conflicts",
"gitConflictRebaseInProgress": "Rebase in progress",
"gitConflictMergeInProgress": "Merge in progress",
"gitConflictCherryPickInProgress": "Cherry-pick in progress",
"gitConflictRevertInProgress": "Revert in progress",
"gitConflictRemaining": "{count} file(s) still unresolved",
"@gitConflictRemaining": {
"placeholders": {
"count": {
"type": "int"
}
}
},
"gitConflictAllResolved": "All conflicts resolved, ready to continue",
"gitConflictResolved": "Marked as resolved: {path}",
"@gitConflictResolved": {
"placeholders": {
"path": {
"type": "String"
}
}
},
"gitConflictOpenFile": "Open file to edit",
"gitConflictTakeBaseline": "Take version from {name}",
"@gitConflictTakeBaseline": {
"placeholders": {
"name": {
"type": "String"
}
}
},
"gitConflictTakeIncoming": "Take version from the commit being applied",
"gitConflictTakeBaselineGeneric": "Take the baseline version for the whole file",
"gitConflictRecreate": "Regenerate conflict markers",
"gitConflictRecreateDone": "Conflict markers regenerated",
"gitConflictRemoveFile": "Delete this file",
"gitConflictBinaryHint": "Binary files cannot be resolved with markers — choose which side to keep",
"gitConflictDeleteHint": "This file was deleted on one side — choose whether to keep or delete it",
"gitConflictContinue": "Continue",
"gitConflictSkip": "Skip this commit",
"gitConflictAbort": "Abort the whole operation",
"gitConflictAbortConfirm": "Abort this operation? All resolutions will be discarded.",
"gitConflictContinueSuccess": "Operation completed",
"gitConflictSkipSuccess": "Commit skipped",
"gitConflictAbortSuccess": "Operation aborted",
"gitConflictBlockedByUnresolved": "Some conflicts are still unresolved — mark them all resolved first",
"gitConflictEmptyCommitNotice": "This commit became empty when applied (its changes already exist in the baseline). You can skip it.",
"gitConflictSkipHint": "This commit became empty when applied — its changes usually already exist in the baseline",
"gitConflictTypeBothModified": "Both modified",
"gitConflictTypeBothAdded": "Both added",
"gitConflictTypeDeletedByUs": "Theirs modified, ours deleted",
"gitConflictTypeDeletedByThem": "Ours modified, theirs deleted",
"gitConflictTypeAddedByUs": "Ours added, theirs exists",
"gitConflictTypeAddedByThem": "Theirs added, ours exists",
"gitConflictTypeBothDeleted": "Both deleted",
"gitConflictTypeUnknown": "Conflict",
"gitConflictBaseSegment": "Common ancestor",
"gitConflictOursSegment": "Current side",
"gitConflictTheirsSegment": "Incoming side",
"gitConflictMalformed": "Conflict markers are malformed — edit this file manually",
"gitConflictBlockCount": "{count} conflict(s)",
"@gitConflictBlockCount": {
"placeholders": {
"count": {
"type": "int"
}
}
},
"gitConflictApplyOurs": "Use this",
"gitConflictApplyBoth": "Keep both",
"gitRemoteBranches": "Remote Branches",
"gitLocalBranches": "Local Branches",
"gitNoRemoteBranches": "No remote branches yet — fetch first",
@@ -1419,6 +1490,8 @@
"gitErrWritePermissionDenied": "This account has no write access to this repository",
"gitErrWritePermissionDeniedHint": "If this is someone else's repository (upstream), fork it to your own account first, then point the remote at your fork (e.g. https://github.com/your-name/repo.git).",
"gitErrRepositoryNotFound": "Repository not found, or this account has no access to it",
"gitErrLocalRemoteMissing": "The local remote path does not exist inside the container",
"gitErrLocalRemoteMissingHint": "This remote is a local directory (not a network address like GitHub), and it is outside the currently opened project folder. The container only mounts the current project folder, so paths outside it are unreachable. Move the directory into the project, or switch to a network URL.",
"gitErrRepositoryNotFoundHint": "GitHub returns 404 for both \"no permission\" and \"does not exist\". Verify the remote URL and that the token can access this repository.",
"gitErrProxyAuthRequired": "The network proxy requires authentication",
"gitErrProxyAuthRequiredHint": "This network goes through an authenticated proxy (HTTP 407). Check the proxy configuration and credentials inside the container.",
+264 -12
View File
@@ -3766,6 +3766,258 @@ abstract class AppLocalizations {
/// **'暂无分支'**
String get gitNoBranches;
/// No description provided for @gitConflictTitle.
///
/// In zh, this message translates to:
/// **'解决冲突'**
String get gitConflictTitle;
/// No description provided for @gitConflictRebaseInProgress.
///
/// In zh, this message translates to:
/// **'变基进行中'**
String get gitConflictRebaseInProgress;
/// No description provided for @gitConflictMergeInProgress.
///
/// In zh, this message translates to:
/// **'合并进行中'**
String get gitConflictMergeInProgress;
/// No description provided for @gitConflictCherryPickInProgress.
///
/// In zh, this message translates to:
/// **'拣选进行中'**
String get gitConflictCherryPickInProgress;
/// No description provided for @gitConflictRevertInProgress.
///
/// In zh, this message translates to:
/// **'回滚进行中'**
String get gitConflictRevertInProgress;
/// No description provided for @gitConflictRemaining.
///
/// In zh, this message translates to:
/// **'还有 {count} 个文件未解决'**
String gitConflictRemaining(int count);
/// No description provided for @gitConflictAllResolved.
///
/// In zh, this message translates to:
/// **'冲突已全部解决,可以继续'**
String get gitConflictAllResolved;
/// No description provided for @gitConflictResolved.
///
/// In zh, this message translates to:
/// **'已标记为已解决:{path}'**
String gitConflictResolved(String path);
/// No description provided for @gitConflictOpenFile.
///
/// In zh, this message translates to:
/// **'打开文件编辑'**
String get gitConflictOpenFile;
/// No description provided for @gitConflictTakeBaseline.
///
/// In zh, this message translates to:
/// **'采用 {name} 的版本'**
String gitConflictTakeBaseline(String name);
/// No description provided for @gitConflictTakeIncoming.
///
/// In zh, this message translates to:
/// **'采用正在应用的提交版本'**
String get gitConflictTakeIncoming;
/// No description provided for @gitConflictTakeBaselineGeneric.
///
/// In zh, this message translates to:
/// **'整文件采用基线版本'**
String get gitConflictTakeBaselineGeneric;
/// No description provided for @gitConflictRecreate.
///
/// In zh, this message translates to:
/// **'重新生成冲突标记'**
String get gitConflictRecreate;
/// No description provided for @gitConflictRecreateDone.
///
/// In zh, this message translates to:
/// **'已重新生成冲突标记'**
String get gitConflictRecreateDone;
/// No description provided for @gitConflictRemoveFile.
///
/// In zh, this message translates to:
/// **'删除此文件'**
String get gitConflictRemoveFile;
/// No description provided for @gitConflictBinaryHint.
///
/// In zh, this message translates to:
/// **'二进制文件无法用标记解决,请选择保留哪一边'**
String get gitConflictBinaryHint;
/// No description provided for @gitConflictDeleteHint.
///
/// In zh, this message translates to:
/// **'该文件在一侧被删除,请选择保留还是删除'**
String get gitConflictDeleteHint;
/// No description provided for @gitConflictContinue.
///
/// In zh, this message translates to:
/// **'继续'**
String get gitConflictContinue;
/// No description provided for @gitConflictSkip.
///
/// In zh, this message translates to:
/// **'跳过此提交'**
String get gitConflictSkip;
/// No description provided for @gitConflictAbort.
///
/// In zh, this message translates to:
/// **'放弃本次变基'**
String get gitConflictAbort;
/// No description provided for @gitConflictAbortConfirm.
///
/// In zh, this message translates to:
/// **'确定要放弃本次变基操作并回到操作前的状态吗?'**
String get gitConflictAbortConfirm;
/// No description provided for @gitConflictContinueSuccess.
///
/// In zh, this message translates to:
/// **'操作已完成'**
String get gitConflictContinueSuccess;
/// No description provided for @gitConflictSkipSuccess.
///
/// In zh, this message translates to:
/// **'已跳过当前提交'**
String get gitConflictSkipSuccess;
/// No description provided for @gitConflictAbortSuccess.
///
/// In zh, this message translates to:
/// **'已放弃本次操作'**
String get gitConflictAbortSuccess;
/// No description provided for @gitConflictBlockedByUnresolved.
///
/// In zh, this message translates to:
/// **'仍有未解决的冲突文件,请先全部标记为已解决'**
String get gitConflictBlockedByUnresolved;
/// No description provided for @gitConflictEmptyCommitNotice.
///
/// In zh, this message translates to:
/// **'该提交在应用后变为空(内容已存在于基线中),可以跳过它'**
String get gitConflictEmptyCommitNotice;
/// No description provided for @gitConflictSkipHint.
///
/// In zh, this message translates to:
/// **'该提交在应用后变为空,通常表示它的改动已存在于基线中'**
String get gitConflictSkipHint;
/// No description provided for @gitConflictTypeBothModified.
///
/// In zh, this message translates to:
/// **'双方修改'**
String get gitConflictTypeBothModified;
/// No description provided for @gitConflictTypeBothAdded.
///
/// In zh, this message translates to:
/// **'双方新增'**
String get gitConflictTypeBothAdded;
/// No description provided for @gitConflictTypeDeletedByUs.
///
/// In zh, this message translates to:
/// **'对方修改、我方删除'**
String get gitConflictTypeDeletedByUs;
/// No description provided for @gitConflictTypeDeletedByThem.
///
/// In zh, this message translates to:
/// **'我方修改、对方删除'**
String get gitConflictTypeDeletedByThem;
/// No description provided for @gitConflictTypeAddedByUs.
///
/// In zh, this message translates to:
/// **'我方新增、对方已存在'**
String get gitConflictTypeAddedByUs;
/// No description provided for @gitConflictTypeAddedByThem.
///
/// In zh, this message translates to:
/// **'对方新增、我方已存在'**
String get gitConflictTypeAddedByThem;
/// No description provided for @gitConflictTypeBothDeleted.
///
/// In zh, this message translates to:
/// **'双方删除'**
String get gitConflictTypeBothDeleted;
/// No description provided for @gitConflictTypeUnknown.
///
/// In zh, this message translates to:
/// **'冲突'**
String get gitConflictTypeUnknown;
/// No description provided for @gitConflictBaseSegment.
///
/// In zh, this message translates to:
/// **'共同祖先'**
String get gitConflictBaseSegment;
/// No description provided for @gitConflictOursSegment.
///
/// In zh, this message translates to:
/// **'当前侧'**
String get gitConflictOursSegment;
/// No description provided for @gitConflictTheirsSegment.
///
/// In zh, this message translates to:
/// **'传入侧'**
String get gitConflictTheirsSegment;
/// No description provided for @gitConflictMalformed.
///
/// In zh, this message translates to:
/// **'冲突标记结构异常,请手工编辑该文件'**
String get gitConflictMalformed;
/// No description provided for @gitConflictBlockCount.
///
/// In zh, this message translates to:
/// **'{count} 处冲突'**
String gitConflictBlockCount(int count);
/// No description provided for @gitConflictApplyOurs.
///
/// In zh, this message translates to:
/// **'采用此段'**
String get gitConflictApplyOurs;
/// No description provided for @gitConflictApplyBoth.
///
/// In zh, this message translates to:
/// **'两段都要'**
String get gitConflictApplyBoth;
/// No description provided for @gitRemoteBranches.
///
/// In zh, this message translates to:
@@ -4096,6 +4348,18 @@ abstract class AppLocalizations {
/// **'仓库不存在,或当前账号无权访问'**
String get gitErrRepositoryNotFound;
/// No description provided for @gitErrLocalRemoteMissing.
///
/// In zh, this message translates to:
/// **'本地远端路径在容器内不存在'**
String get gitErrLocalRemoteMissing;
/// No description provided for @gitErrLocalRemoteMissingHint.
///
/// In zh, this message translates to:
/// **'该远端是一个本地目录(不是 GitHub 等网络地址),但它不在当前打开的项目目录内。容器只挂载当前项目目录,因此项目外的路径无法访问。请把该目录移到项目内,或改用网络地址。'**
String get gitErrLocalRemoteMissingHint;
/// No description provided for @gitErrRepositoryNotFoundHint.
///
/// In zh, this message translates to:
@@ -4684,18 +4948,6 @@ abstract class AppLocalizations {
/// **'远端存在本地没有的提交,先拉取合并后再推送。'**
String get gitPullThenPushDesc;
/// No description provided for @gitConflictAbort.
///
/// In zh, this message translates to:
/// **'放弃本次变基'**
String get gitConflictAbort;
/// No description provided for @gitConflictAbortConfirm.
///
/// In zh, this message translates to:
/// **'确定要放弃本次变基操作并回到操作前的状态吗?'**
String get gitConflictAbortConfirm;
/// No description provided for @gitUncommittedChangesTitle.
///
/// In zh, this message translates to:
+152 -7
View File
@@ -2250,6 +2250,150 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get gitNoBranches => 'No branches';
@override
String get gitConflictTitle => 'Resolve Conflicts';
@override
String get gitConflictRebaseInProgress => 'Rebase in progress';
@override
String get gitConflictMergeInProgress => 'Merge in progress';
@override
String get gitConflictCherryPickInProgress => 'Cherry-pick in progress';
@override
String get gitConflictRevertInProgress => 'Revert in progress';
@override
String gitConflictRemaining(int count) {
return '$count file(s) still unresolved';
}
@override
String get gitConflictAllResolved =>
'All conflicts resolved, ready to continue';
@override
String gitConflictResolved(String path) {
return 'Marked as resolved: $path';
}
@override
String get gitConflictOpenFile => 'Open file to edit';
@override
String gitConflictTakeBaseline(String name) {
return 'Take version from $name';
}
@override
String get gitConflictTakeIncoming =>
'Take version from the commit being applied';
@override
String get gitConflictTakeBaselineGeneric =>
'Take the baseline version for the whole file';
@override
String get gitConflictRecreate => 'Regenerate conflict markers';
@override
String get gitConflictRecreateDone => 'Conflict markers regenerated';
@override
String get gitConflictRemoveFile => 'Delete this file';
@override
String get gitConflictBinaryHint =>
'Binary files cannot be resolved with markers — choose which side to keep';
@override
String get gitConflictDeleteHint =>
'This file was deleted on one side — choose whether to keep or delete it';
@override
String get gitConflictContinue => 'Continue';
@override
String get gitConflictSkip => 'Skip this commit';
@override
String get gitConflictAbort => 'Abort Rebase';
@override
String get gitConflictAbortConfirm =>
'Abort this rebase and return to the state before it started?';
@override
String get gitConflictContinueSuccess => 'Operation completed';
@override
String get gitConflictSkipSuccess => 'Commit skipped';
@override
String get gitConflictAbortSuccess => 'Operation aborted';
@override
String get gitConflictBlockedByUnresolved =>
'Some conflicts are still unresolved — mark them all resolved first';
@override
String get gitConflictEmptyCommitNotice =>
'This commit became empty when applied (its changes already exist in the baseline). You can skip it.';
@override
String get gitConflictSkipHint =>
'This commit became empty when applied — its changes usually already exist in the baseline';
@override
String get gitConflictTypeBothModified => 'Both modified';
@override
String get gitConflictTypeBothAdded => 'Both added';
@override
String get gitConflictTypeDeletedByUs => 'Theirs modified, ours deleted';
@override
String get gitConflictTypeDeletedByThem => 'Ours modified, theirs deleted';
@override
String get gitConflictTypeAddedByUs => 'Ours added, theirs exists';
@override
String get gitConflictTypeAddedByThem => 'Theirs added, ours exists';
@override
String get gitConflictTypeBothDeleted => 'Both deleted';
@override
String get gitConflictTypeUnknown => 'Conflict';
@override
String get gitConflictBaseSegment => 'Common ancestor';
@override
String get gitConflictOursSegment => 'Current side';
@override
String get gitConflictTheirsSegment => 'Incoming side';
@override
String get gitConflictMalformed =>
'Conflict markers are malformed — edit this file manually';
@override
String gitConflictBlockCount(int count) {
return '$count conflict(s)';
}
@override
String get gitConflictApplyOurs => 'Use this';
@override
String get gitConflictApplyBoth => 'Keep both';
@override
String get gitRemoteBranches => 'Remote Branches';
@@ -2448,6 +2592,14 @@ class AppLocalizationsEn extends AppLocalizations {
String get gitErrRepositoryNotFound =>
'Repository not found, or this account has no access to it';
@override
String get gitErrLocalRemoteMissing =>
'The local remote path does not exist inside the container';
@override
String get gitErrLocalRemoteMissingHint =>
'This remote is a local directory (not a network address like GitHub), and it is outside the currently opened project folder. The container only mounts the current project folder, so paths outside it are unreachable. Move the directory into the project, or switch to a network URL.';
@override
String get gitErrRepositoryNotFoundHint =>
'GitHub returns 404 for both \"no permission\" and \"does not exist\". Verify the remote URL and that the token can access this repository.';
@@ -2798,13 +2950,6 @@ class AppLocalizationsEn extends AppLocalizations {
String get gitPullThenPushDesc =>
'The remote has commits you do not have. Pull and merge them before pushing.';
@override
String get gitConflictAbort => 'Abort Rebase';
@override
String get gitConflictAbortConfirm =>
'Abort this rebase and return to the state before it started?';
@override
String get gitUncommittedChangesTitle => 'Uncommitted Changes';
+141 -6
View File
@@ -2187,6 +2187,140 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get gitNoBranches => '暂无分支';
@override
String get gitConflictTitle => '解决冲突';
@override
String get gitConflictRebaseInProgress => '变基进行中';
@override
String get gitConflictMergeInProgress => '合并进行中';
@override
String get gitConflictCherryPickInProgress => '拣选进行中';
@override
String get gitConflictRevertInProgress => '回滚进行中';
@override
String gitConflictRemaining(int count) {
return '还有 $count 个文件未解决';
}
@override
String get gitConflictAllResolved => '冲突已全部解决,可以继续';
@override
String gitConflictResolved(String path) {
return '已标记为已解决:$path';
}
@override
String get gitConflictOpenFile => '打开文件编辑';
@override
String gitConflictTakeBaseline(String name) {
return '采用 $name 的版本';
}
@override
String get gitConflictTakeIncoming => '采用正在应用的提交版本';
@override
String get gitConflictTakeBaselineGeneric => '整文件采用基线版本';
@override
String get gitConflictRecreate => '重新生成冲突标记';
@override
String get gitConflictRecreateDone => '已重新生成冲突标记';
@override
String get gitConflictRemoveFile => '删除此文件';
@override
String get gitConflictBinaryHint => '二进制文件无法用标记解决,请选择保留哪一边';
@override
String get gitConflictDeleteHint => '该文件在一侧被删除,请选择保留还是删除';
@override
String get gitConflictContinue => '继续';
@override
String get gitConflictSkip => '跳过此提交';
@override
String get gitConflictAbort => '放弃本次变基';
@override
String get gitConflictAbortConfirm => '确定要放弃本次变基操作并回到操作前的状态吗?';
@override
String get gitConflictContinueSuccess => '操作已完成';
@override
String get gitConflictSkipSuccess => '已跳过当前提交';
@override
String get gitConflictAbortSuccess => '已放弃本次操作';
@override
String get gitConflictBlockedByUnresolved => '仍有未解决的冲突文件,请先全部标记为已解决';
@override
String get gitConflictEmptyCommitNotice => '该提交在应用后变为空(内容已存在于基线中),可以跳过它';
@override
String get gitConflictSkipHint => '该提交在应用后变为空,通常表示它的改动已存在于基线中';
@override
String get gitConflictTypeBothModified => '双方修改';
@override
String get gitConflictTypeBothAdded => '双方新增';
@override
String get gitConflictTypeDeletedByUs => '对方修改、我方删除';
@override
String get gitConflictTypeDeletedByThem => '我方修改、对方删除';
@override
String get gitConflictTypeAddedByUs => '我方新增、对方已存在';
@override
String get gitConflictTypeAddedByThem => '对方新增、我方已存在';
@override
String get gitConflictTypeBothDeleted => '双方删除';
@override
String get gitConflictTypeUnknown => '冲突';
@override
String get gitConflictBaseSegment => '共同祖先';
@override
String get gitConflictOursSegment => '当前侧';
@override
String get gitConflictTheirsSegment => '传入侧';
@override
String get gitConflictMalformed => '冲突标记结构异常,请手工编辑该文件';
@override
String gitConflictBlockCount(int count) {
return '$count 处冲突';
}
@override
String get gitConflictApplyOurs => '采用此段';
@override
String get gitConflictApplyBoth => '两段都要';
@override
String get gitRemoteBranches => '远端分支';
@@ -2371,6 +2505,13 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get gitErrRepositoryNotFound => '仓库不存在,或当前账号无权访问';
@override
String get gitErrLocalRemoteMissing => '本地远端路径在容器内不存在';
@override
String get gitErrLocalRemoteMissingHint =>
'该远端是一个本地目录(不是 GitHub 等网络地址),但它不在当前打开的项目目录内。容器只挂载当前项目目录,因此项目外的路径无法访问。请把该目录移到项目内,或改用网络地址。';
@override
String get gitErrRepositoryNotFoundHint =>
'GitHub 对「无权限」和「不存在」都返回 404。请确认远端地址拼写正确,且该令牌有权访问该仓库。';
@@ -2691,12 +2832,6 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get gitPullThenPushDesc => '远端存在本地没有的提交,先拉取合并后再推送。';
@override
String get gitConflictAbort => '放弃本次变基';
@override
String get gitConflictAbortConfirm => '确定要放弃本次变基操作并回到操作前的状态吗?';
@override
String get gitUncommittedChangesTitle => '存在未提交的改动';
+73
View File
@@ -1295,6 +1295,77 @@
"gitSearchTags": "搜索标签...",
"gitNoBranches": "暂无分支",
"gitConflictTitle": "解决冲突",
"gitConflictRebaseInProgress": "变基进行中",
"gitConflictMergeInProgress": "合并进行中",
"gitConflictCherryPickInProgress": "拣选进行中",
"gitConflictRevertInProgress": "回滚进行中",
"gitConflictRemaining": "还有 {count} 个文件未解决",
"@gitConflictRemaining": {
"placeholders": {
"count": {
"type": "int"
}
}
},
"gitConflictAllResolved": "冲突已全部解决,可以继续",
"gitConflictResolved": "已标记为已解决:{path}",
"@gitConflictResolved": {
"placeholders": {
"path": {
"type": "String"
}
}
},
"gitConflictOpenFile": "打开文件编辑",
"gitConflictTakeBaseline": "采用 {name} 的版本",
"@gitConflictTakeBaseline": {
"placeholders": {
"name": {
"type": "String"
}
}
},
"gitConflictTakeIncoming": "采用正在应用的提交版本",
"gitConflictTakeBaselineGeneric": "整文件采用基线版本",
"gitConflictRecreate": "重新生成冲突标记",
"gitConflictRecreateDone": "已重新生成冲突标记",
"gitConflictRemoveFile": "删除此文件",
"gitConflictBinaryHint": "二进制文件无法用标记解决,请选择保留哪一边",
"gitConflictDeleteHint": "该文件在一侧被删除,请选择保留还是删除",
"gitConflictContinue": "继续",
"gitConflictSkip": "跳过此提交",
"gitConflictAbort": "放弃整个操作",
"gitConflictAbortConfirm": "确定放弃本次操作吗?所有已解决的冲突都会回退。",
"gitConflictContinueSuccess": "操作已完成",
"gitConflictSkipSuccess": "已跳过当前提交",
"gitConflictAbortSuccess": "已放弃本次操作",
"gitConflictBlockedByUnresolved": "仍有未解决的冲突文件,请先全部标记为已解决",
"gitConflictEmptyCommitNotice": "该提交在应用后变为空(内容已存在于基线中),可以跳过它",
"gitConflictSkipHint": "该提交在应用后变为空,通常表示它的改动已存在于基线中",
"gitConflictTypeBothModified": "双方修改",
"gitConflictTypeBothAdded": "双方新增",
"gitConflictTypeDeletedByUs": "对方修改、我方删除",
"gitConflictTypeDeletedByThem": "我方修改、对方删除",
"gitConflictTypeAddedByUs": "我方新增、对方已存在",
"gitConflictTypeAddedByThem": "对方新增、我方已存在",
"gitConflictTypeBothDeleted": "双方删除",
"gitConflictTypeUnknown": "冲突",
"gitConflictBaseSegment": "共同祖先",
"gitConflictOursSegment": "当前侧",
"gitConflictTheirsSegment": "传入侧",
"gitConflictMalformed": "冲突标记结构异常,请手工编辑该文件",
"gitConflictBlockCount": "{count} 处冲突",
"@gitConflictBlockCount": {
"placeholders": {
"count": {
"type": "int"
}
}
},
"gitConflictApplyOurs": "采用此段",
"gitConflictApplyBoth": "两段都要",
"gitRemoteBranches": "远端分支",
"gitLocalBranches": "本地分支",
"gitNoRemoteBranches": "暂无远端分支,请先执行抓取",
@@ -1419,6 +1490,8 @@
"gitErrWritePermissionDenied": "当前账号对该仓库没有写权限",
"gitErrWritePermissionDeniedHint": "若这是别人的仓库(上游),请先 Fork 到你自己的账号,再把远端地址改为你的 Fork(如 https://github.com/你的用户名/仓库.git)。",
"gitErrRepositoryNotFound": "仓库不存在,或当前账号无权访问",
"gitErrLocalRemoteMissing": "本地远端路径在容器内不存在",
"gitErrLocalRemoteMissingHint": "该远端是一个本地目录(不是 GitHub 等网络地址),但它不在当前打开的项目目录内。容器只挂载当前项目目录,因此项目外的路径无法访问。请把该目录移到项目内,或改用网络地址。",
"gitErrRepositoryNotFoundHint": "GitHub 对「无权限」和「不存在」都返回 404。请确认远端地址拼写正确,且该令牌有权访问该仓库。",
"gitErrProxyAuthRequired": "网络代理需要认证",
"gitErrProxyAuthRequiredHint": "当前网络经过需要认证的代理(HTTP 407)。请检查容器内代理配置与凭据。",