Skip to content

Commit 8292a46

Browse files
committed
Update translations from Crowdin
1 parent cc96d8c commit 8292a46

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

pkg/i18n/translations/ja.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"MergingTitle": "メインパネル(マージ中)",
1414
"NormalTitle": "メインパネル(通常)",
1515
"LogTitle": "ログ",
16+
"LogXOfYTitle": "ログ(%d / %d)",
1617
"CommitSummary": "コミット概要",
1718
"CredentialsUsername": "ユーザー名",
1819
"CredentialsPassword": "パスワード",
@@ -786,7 +787,6 @@
786787
"NewWorktreePath": "新しいワークツリーのパス",
787788
"NewWorktreeBase": "新しいワークツリーのベース参照",
788789
"RemoveWorktreeTooltip": "選択したワークツリーを削除します。これはワークツリーのディレクトリとワークツリーに関するメタデータの両方を.gitディレクトリから削除します。",
789-
"BranchNameCannotBeBlank": "ブランチ名は空白にできません",
790790
"NewBranchName": "新しいブランチ名",
791791
"NewBranchNameLeaveBlank": "新しいブランチ名({{.default}} をチェックアウトするには空白のままにしてください)",
792792
"ViewWorktreeOptions": "ワークツリーオプションを表示",

pkg/i18n/translations/pl.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,6 @@
645645
"NewWorktreePath": "Nowa ścieżka drzewa pracy",
646646
"NewWorktreeBase": "Nowa bazowa ref drzewa pracy",
647647
"RemoveWorktreeTooltip": "Usuń wybrane drzewo pracy. To usunie zarówno katalog drzewa pracy, jak i metadane o drzewie pracy w katalogu .git.",
648-
"BranchNameCannotBeBlank": "Nazwa brancha nie może być pusta",
649648
"NewBranchName": "Nowa nazwa brancha",
650649
"NewBranchNameLeaveBlank": "Nowa nazwa brancha (pozostaw puste, aby przełączyć {{.default}})",
651650
"ViewWorktreeOptions": "Zobacz opcje drzewa pracy",

pkg/i18n/translations/zh-CN.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"MergingTitle": "正在合并",
1414
"NormalTitle": "正常",
1515
"LogTitle": "日志",
16+
"LogXOfYTitle": "日志 (%d / %d)",
1617
"CommitSummary": "提交信息",
1718
"CredentialsUsername": "用户名",
1819
"CredentialsPassword": "密码",
@@ -43,6 +44,7 @@
4344
"ToggleStagedAll": "切换所有文件的暂存状态",
4445
"ToggleStagedAllTooltip": "切换工作区中所有文件的已暂存/未暂存状态",
4546
"ToggleTreeView": "切换文件树视图",
47+
"ToggleTreeViewTooltip": "在平面布局和树布局之间切换文件视图。平面布局在单个列表中显示所有文件路径,树布局按目录分组文件。\n\n可以在配置文件中使用 'gui.showFileTree' 键更改默认设置。",
4648
"OpenDiffTool": "使用外部差异比较工具(git difftool)",
4749
"OpenMergeTool": "打开外部合并工具(git mergetool)",
4850
"Refresh": "刷新",
@@ -120,6 +122,7 @@
120122
"ForceCheckoutTooltip": "强制检出所选分支。这将在检出所选分支之前放弃工作目录中的所有本地更改。",
121123
"CheckoutByName": "按名称检出",
122124
"CheckoutByNameTooltip": "按名称检出。在输入框中,您可以输入'-' 来切换到最后一个分支。",
125+
"CheckoutPreviousBranch": "签出上一个分支",
123126
"RemoteBranchCheckoutTitle": "检出 {{.branchName}}",
124127
"RemoteBranchCheckoutPrompt": "您希望已什么方式检出到该分支?",
125128
"CheckoutTypeNewBranch": "新建本地分支",
@@ -128,6 +131,9 @@
128131
"CheckoutTypeDetachedHeadTooltip": "将远程分支检出作为分离HEAD,如果您只想用来测试而不是正式使用,这会很有用。您之后仍可以根据它创建本地分支。",
129132
"NewBranch": "新分支",
130133
"NewBranchFromStashTooltip": "从选定的贮藏项创建一个新分支。这是通过 git 检查创建贮藏项的提交,从该提交创建一个新分支,然后将贮藏项作为附加提交应用到新分支来实现的。",
134+
"MoveCommitsToNewBranch": "移动提交至新分支",
135+
"CannotMoveCommitsFromDetachedHead": "无法从分离头移动提交",
136+
"CannotMoveCommitsNoUpstream": "无法从没有上游分支的分支中移动提交",
131137
"NoBranchesThisRepo": "此仓库中没有分支",
132138
"CommitWithoutMessageErr": "您必须编写提交消息才能进行提交",
133139
"Close": "关闭",
@@ -235,8 +241,11 @@
235241
"IgnoreFile": "添加到 .gitignore",
236242
"ExcludeFile": "添加到 .git/info/exclude",
237243
"RefreshFiles": "刷新文件",
244+
"FocusMainView": "聚焦主视图",
238245
"Merge": "合并到当前检出的分支",
239246
"MergeBranchTooltip": "Merge selected branch into currently checked out branch.",
247+
"SquashMergeUncommitted": "压缩合并并保持未提交状态",
248+
"SquashMergeCommitted": "压缩合并,然后提交",
240249
"ConfirmQuit": "您确定要退出吗?",
241250
"SwitchRepo": "切换到最近的仓库",
242251
"AllBranchesLogGraph": "显示/循环所有分支日志",
@@ -255,6 +264,7 @@
255264
"StageSelectionTooltip": "切换行暂存状态",
256265
"DiscardSelection": "取消变更(git reset)",
257266
"DiscardSelectionTooltip": "当选择未暂存的变更时,使用git reset丢弃该变更。当选择已暂存的变更时,取消暂存该变更",
267+
"ToggleSelectHunk": "切换代码块选择",
258268
"ToggleSelectionForPatch": "添加/移除 行到补丁",
259269
"EditHunk": "编辑代码块",
260270
"EditHunkTooltip": "在外部编辑器中编辑选中的代码块",
@@ -273,11 +283,13 @@
273283
"ViewMergeRebaseOptionsTooltip": "查看当前合并或变基的中止、继续、跳过选项",
274284
"ViewMergeOptions": "查看合并选项",
275285
"ViewRebaseOptions": "查看变基选项",
286+
"ViewRevertOptions": "查看撤销选项",
276287
"NotMergingOrRebasing": "您目前既不进行变基也不进行合并",
277288
"AlreadyRebasing": "在变基时无法执行此操作",
278289
"RecentRepos": "最近的仓库",
279290
"MergeOptionsTitle": "合并选项",
280291
"RebaseOptionsTitle": "变基选项",
292+
"RevertOptionsTitle": "撤销选项",
281293
"CommitSummaryTitle": "提交信息",
282294
"CommitDescriptionTitle": "提交信息说明",
283295
"CommitDescriptionSubTitle": "按 {{.togglePanelKeyBinding}} 键切换焦点, {{.commitMenuKeybinding}} 打开菜单",
@@ -308,6 +320,8 @@
308320
"FwdCommitsToPush": "此分支带有尚未推送的提交,无法快进",
309321
"PullRequestNoUpstream": "没有设置上游的分支无法执行拉取请求",
310322
"ErrorOccurred": "发生错误!请在以下位置创建 issue",
323+
"ConflictLabel": "冲突",
324+
"CommitsSectionHeader": "提交",
311325
"YouDied": "您死了!",
312326
"RewordNotSupported": "当前不支持交互式重新基准化时的重新措词提交",
313327
"ChangingThisActionIsNotAllowed": "不允许更改这类变基待办项目",
@@ -762,7 +776,6 @@
762776
"NewWorktreePath": "新建工作树路径",
763777
"NewWorktreeBase": "新建工作树基于ref",
764778
"RemoveWorktreeTooltip": "删除选定的工作树。这将删除工作树的目录以及 .git 目录中有关工作树的元数据。",
765-
"BranchNameCannotBeBlank": "分支名称不能为空",
766779
"NewBranchName": "新分支名称",
767780
"NewBranchNameLeaveBlank": "新分支名称(为空则默认检出为 {{.default}})",
768781
"ViewWorktreeOptions": "查看工作区选项",

pkg/i18n/translations/zh-TW.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,6 @@
545545
"MainWorktree": "(主要)",
546546
"NewWorktreePath": "工作目錄路徑",
547547
"NewWorktreeBase": "工作目錄來源",
548-
"BranchNameCannotBeBlank": "分支名稱不能為空",
549548
"NewBranchName": "分支名稱",
550549
"NewBranchNameLeaveBlank": "分支名稱(留空將檢出 {{.default}})",
551550
"ViewWorktreeOptions": "檢視工作目錄選項",

0 commit comments

Comments
 (0)