This commit is contained in:
LZX committed 2026-09-19 23:00:50 +08:00
1 parent 875840147d
commit a8b7bdf606
13 files changed
+2038 -16

No files matched your search

+48
View File
@@ -1365,6 +1365,54 @@
},
"gitConflictApplyOurs": "Use this",
"gitConflictApplyBoth": "Keep both",
"gitConflictResolveTitle": "Resolve Conflict",
"gitConflictBlockIndex": "Conflict {index} of {total}",
"@gitConflictBlockIndex": {
"placeholders": {
"index": {
"type": "int"
},
"total": {
"type": "int"
}
}
},
"gitConflictSectionBaseline": "Baseline (common ancestor)",
"gitConflictSectionOurs": "Current side",
"gitConflictSectionTheirs": "Incoming side",
"gitConflictTakeBoth": "Keep both",
"gitConflictEditManually": "Edit manually",
"gitConflictAllOurs": "Use current side for all",
"gitConflictAllTheirs": "Use incoming side for all",
"gitConflictSaveAndMark": "Save and mark resolved",
"gitConflictAcceptCurrent": "Accept Current Change",
"gitConflictAcceptIncoming": "Accept Incoming Change",
"gitConflictAcceptBoth": "Accept Both Changes",
"gitConflictCompare": "Compare Changes",
"gitConflictPrev": "Previous conflict",
"gitConflictNext": "Next conflict",
"gitConflictSaveAndMarkDone": "Resolved and written back",
"gitConflictNoBlocks": "No conflict markers left in this file",
"gitConflictLoadFailed": "Failed to load conflict contents",
"gitConflictUnresolvedRemain": "{count} block(s) still unresolved",
"@gitConflictUnresolvedRemain": {
"placeholders": {
"count": {
"type": "int"
}
}
},
"gitConflictMarkWithMarkers": "{count} conflict marker(s) still remain in the file",
"@gitConflictMarkWithMarkers": {
"placeholders": {
"count": {
"type": "int"
}
}
},
"gitConflictMarkWithMarkersHint": "Marking as resolved would commit them as normal content.",
"gitConflictMarkAnyway": "Mark anyway",
"gitConflictGoResolve": "Resolve first",
"gitRemoteBranches": "Remote Branches",
"gitLocalBranches": "Local Branches",
+144
View File
@@ -4018,6 +4018,150 @@ abstract class AppLocalizations {
/// **'两段都要'**
String get gitConflictApplyBoth;
/// No description provided for @gitConflictResolveTitle.
///
/// In zh, this message translates to:
/// **'解决冲突'**
String get gitConflictResolveTitle;
/// No description provided for @gitConflictBlockIndex.
///
/// In zh, this message translates to:
/// **'冲突 {index} / {total}'**
String gitConflictBlockIndex(int index, int total);
/// No description provided for @gitConflictSectionBaseline.
///
/// In zh, this message translates to:
/// **'基线(共同祖先)'**
String get gitConflictSectionBaseline;
/// No description provided for @gitConflictSectionOurs.
///
/// In zh, this message translates to:
/// **'当前侧'**
String get gitConflictSectionOurs;
/// No description provided for @gitConflictSectionTheirs.
///
/// In zh, this message translates to:
/// **'传入侧'**
String get gitConflictSectionTheirs;
/// No description provided for @gitConflictTakeBoth.
///
/// In zh, this message translates to:
/// **'两段都要'**
String get gitConflictTakeBoth;
/// No description provided for @gitConflictEditManually.
///
/// In zh, this message translates to:
/// **'手动编辑'**
String get gitConflictEditManually;
/// No description provided for @gitConflictAllOurs.
///
/// In zh, this message translates to:
/// **'全部采用当前侧'**
String get gitConflictAllOurs;
/// No description provided for @gitConflictAllTheirs.
///
/// In zh, this message translates to:
/// **'全部采用传入侧'**
String get gitConflictAllTheirs;
/// No description provided for @gitConflictSaveAndMark.
///
/// In zh, this message translates to:
/// **'保存并标记为已解决'**
String get gitConflictSaveAndMark;
/// No description provided for @gitConflictAcceptCurrent.
///
/// In zh, this message translates to:
/// **'采用当前侧'**
String get gitConflictAcceptCurrent;
/// No description provided for @gitConflictAcceptIncoming.
///
/// In zh, this message translates to:
/// **'采用传入侧'**
String get gitConflictAcceptIncoming;
/// No description provided for @gitConflictAcceptBoth.
///
/// In zh, this message translates to:
/// **'两段都保留'**
String get gitConflictAcceptBoth;
/// No description provided for @gitConflictCompare.
///
/// In zh, this message translates to:
/// **'对比查看'**
String get gitConflictCompare;
/// No description provided for @gitConflictPrev.
///
/// In zh, this message translates to:
/// **'上一处冲突'**
String get gitConflictPrev;
/// No description provided for @gitConflictNext.
///
/// In zh, this message translates to:
/// **'下一处冲突'**
String get gitConflictNext;
/// No description provided for @gitConflictSaveAndMarkDone.
///
/// In zh, this message translates to:
/// **'已解决并写回文件'**
String get gitConflictSaveAndMarkDone;
/// No description provided for @gitConflictNoBlocks.
///
/// In zh, this message translates to:
/// **'该文件已无冲突标记'**
String get gitConflictNoBlocks;
/// No description provided for @gitConflictLoadFailed.
///
/// In zh, this message translates to:
/// **'读取冲突内容失败'**
String get gitConflictLoadFailed;
/// No description provided for @gitConflictUnresolvedRemain.
///
/// In zh, this message translates to:
/// **'还剩 {count} 处未处理'**
String gitConflictUnresolvedRemain(int count);
/// No description provided for @gitConflictMarkWithMarkers.
///
/// In zh, this message translates to:
/// **'文件里仍残留 {count} 处冲突标记'**
String gitConflictMarkWithMarkers(int count);
/// No description provided for @gitConflictMarkWithMarkersHint.
///
/// In zh, this message translates to:
/// **'标记为已解决会把它们当作正常内容提交进仓库。建议先处理干净。'**
String get gitConflictMarkWithMarkersHint;
/// No description provided for @gitConflictMarkAnyway.
///
/// In zh, this message translates to:
/// **'仍然标记'**
String get gitConflictMarkAnyway;
/// No description provided for @gitConflictGoResolve.
///
/// In zh, this message translates to:
/// **'去处理'**
String get gitConflictGoResolve;
/// No description provided for @gitRemoteBranches.
///
/// In zh, this message translates to:
+79
View File
@@ -2394,6 +2394,85 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get gitConflictApplyBoth => 'Keep both';
@override
String get gitConflictResolveTitle => 'Resolve Conflict';
@override
String gitConflictBlockIndex(int index, int total) {
return 'Conflict $index of $total';
}
@override
String get gitConflictSectionBaseline => 'Baseline (common ancestor)';
@override
String get gitConflictSectionOurs => 'Current side';
@override
String get gitConflictSectionTheirs => 'Incoming side';
@override
String get gitConflictTakeBoth => 'Keep both';
@override
String get gitConflictEditManually => 'Edit manually';
@override
String get gitConflictAllOurs => 'Use current side for all';
@override
String get gitConflictAllTheirs => 'Use incoming side for all';
@override
String get gitConflictSaveAndMark => 'Save and mark resolved';
@override
String get gitConflictAcceptCurrent => 'Accept Current Change';
@override
String get gitConflictAcceptIncoming => 'Accept Incoming Change';
@override
String get gitConflictAcceptBoth => 'Accept Both Changes';
@override
String get gitConflictCompare => 'Compare Changes';
@override
String get gitConflictPrev => 'Previous conflict';
@override
String get gitConflictNext => 'Next conflict';
@override
String get gitConflictSaveAndMarkDone => 'Resolved and written back';
@override
String get gitConflictNoBlocks => 'No conflict markers left in this file';
@override
String get gitConflictLoadFailed => 'Failed to load conflict contents';
@override
String gitConflictUnresolvedRemain(int count) {
return '$count block(s) still unresolved';
}
@override
String gitConflictMarkWithMarkers(int count) {
return '$count conflict marker(s) still remain in the file';
}
@override
String get gitConflictMarkWithMarkersHint =>
'Marking as resolved would commit them as normal content.';
@override
String get gitConflictMarkAnyway => 'Mark anyway';
@override
String get gitConflictGoResolve => 'Resolve first';
@override
String get gitRemoteBranches => 'Remote Branches';
+78
View File
@@ -2321,6 +2321,84 @@ class AppLocalizationsZh extends AppLocalizations {
@override
String get gitConflictApplyBoth => '两段都要';
@override
String get gitConflictResolveTitle => '解决冲突';
@override
String gitConflictBlockIndex(int index, int total) {
return '冲突 $index / $total';
}
@override
String get gitConflictSectionBaseline => '基线(共同祖先)';
@override
String get gitConflictSectionOurs => '当前侧';
@override
String get gitConflictSectionTheirs => '传入侧';
@override
String get gitConflictTakeBoth => '两段都要';
@override
String get gitConflictEditManually => '手动编辑';
@override
String get gitConflictAllOurs => '全部采用当前侧';
@override
String get gitConflictAllTheirs => '全部采用传入侧';
@override
String get gitConflictSaveAndMark => '保存并标记为已解决';
@override
String get gitConflictAcceptCurrent => '采用当前侧';
@override
String get gitConflictAcceptIncoming => '采用传入侧';
@override
String get gitConflictAcceptBoth => '两段都保留';
@override
String get gitConflictCompare => '对比查看';
@override
String get gitConflictPrev => '上一处冲突';
@override
String get gitConflictNext => '下一处冲突';
@override
String get gitConflictSaveAndMarkDone => '已解决并写回文件';
@override
String get gitConflictNoBlocks => '该文件已无冲突标记';
@override
String get gitConflictLoadFailed => '读取冲突内容失败';
@override
String gitConflictUnresolvedRemain(int count) {
return '还剩 $count 处未处理';
}
@override
String gitConflictMarkWithMarkers(int count) {
return '文件里仍残留 $count 处冲突标记';
}
@override
String get gitConflictMarkWithMarkersHint => '标记为已解决会把它们当作正常内容提交进仓库。建议先处理干净。';
@override
String get gitConflictMarkAnyway => '仍然标记';
@override
String get gitConflictGoResolve => '去处理';
@override
String get gitRemoteBranches => '远端分支';
+48
View File
@@ -1365,6 +1365,54 @@
},
"gitConflictApplyOurs": "采用此段",
"gitConflictApplyBoth": "两段都要",
"gitConflictResolveTitle": "解决冲突",
"gitConflictBlockIndex": "冲突 {index} / {total}",
"@gitConflictBlockIndex": {
"placeholders": {
"index": {
"type": "int"
},
"total": {
"type": "int"
}
}
},
"gitConflictSectionBaseline": "基线(共同祖先)",
"gitConflictSectionOurs": "当前侧",
"gitConflictSectionTheirs": "传入侧",
"gitConflictTakeBoth": "两段都要",
"gitConflictEditManually": "手动编辑",
"gitConflictAllOurs": "全部采用当前侧",
"gitConflictAllTheirs": "全部采用传入侧",
"gitConflictSaveAndMark": "保存并标记为已解决",
"gitConflictAcceptCurrent": "采用当前侧",
"gitConflictAcceptIncoming": "采用传入侧",
"gitConflictAcceptBoth": "两段都保留",
"gitConflictCompare": "对比查看",
"gitConflictPrev": "上一处冲突",
"gitConflictNext": "下一处冲突",
"gitConflictSaveAndMarkDone": "已解决并写回文件",
"gitConflictNoBlocks": "该文件已无冲突标记",
"gitConflictLoadFailed": "读取冲突内容失败",
"gitConflictUnresolvedRemain": "还剩 {count} 处未处理",
"@gitConflictUnresolvedRemain": {
"placeholders": {
"count": {
"type": "int"
}
}
},
"gitConflictMarkWithMarkers": "文件里仍残留 {count} 处冲突标记",
"@gitConflictMarkWithMarkers": {
"placeholders": {
"count": {
"type": "int"
}
}
},
"gitConflictMarkWithMarkersHint": "标记为已解决会把它们当作正常内容提交进仓库。建议先处理干净。",
"gitConflictMarkAnyway": "仍然标记",
"gitConflictGoResolve": "去处理",
"gitRemoteBranches": "远端分支",
"gitLocalBranches": "本地分支",