-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathzh_CN.po
24420 lines (19545 loc) · 681 KB
/
zh_CN.po
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
# Chinese translations for Git package
# Git 软件包的简体中文翻译.
# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
# This file is distributed under the same license as the Git package.
# Contributors:
# - Fangyi Zhou <me AT fangyi.io>
# - Jiang Xin <worldhello.net AT gmail.com>
# - Lian Cheng <rhythm.mail AT gmail.com>
# - Ray Chen <oldsharp AT gmail.com>
# - Riku <lu.riku AT gmail.com>
# - Thynson <lanxingcan AT gmail.com>
# - ws3389 <willsmith3389 AT gmail.com>
# - Wang Sheng <wangsheng2008love AT 163.com>
# - 依云 <lilydjwg AT gmail.com>
# - Yichao Yu <yyc1992 AT gmail.com>
# - Zhuang Ya <zhuangya AT me.com>
#
# Git glossary for Chinese translators
#
# English | Chinese
# ---------------------------------+--------------------------------------
# 3-way merge | 三方合并
# abbreviate | 简写(的 SHA-1 值)
# alternate object database | 备用对象库
# amend | 修补
# ancestor | 祖先,祖先提交
# annotated tag | 附注标签
# bare repository | 纯仓库
# bisect | 二分查找
# blob object | 数据对象
# branch | 分支
# bundle | 包
# bypass | 绕过
# cache | 索引(的别称)
# chain | (提交)链
# changeset | 变更集
# checkout | 检出
# checksum | 校验,校验和
# cherry-picking | 拣选
# clean | 干净(的工作区)
# clone | 克隆
# commit | 提交
# commit message | 提交说明
# commit object | 提交对象
# commit-ish (also committish) | 提交号
# conflict | 冲突
# core Git | 核心 Git 工具
# cover letter | 附函
# DAG | 有向无环图
# dangling object | 悬空对象
# detached HEAD | 分离头指针
# directory | 目录
# dirty | 脏(的工作区)
# dumb HTTP protocol | 哑 HTTP 协议
# evil merge | 坏合并(合并引入了父提交没有的修改)
# fast-forward | 快进
# fetch | 获取
# file system | 文件系统
# fork | 派生
# Git archive | 仓库(对于 arch 用户)
# gitfile | gitfile(仓库链接文件)
# grafts | (提交)移植
# hash | 哈希值
# HEAD | HEAD(头指针,亦即当前分支)
# head | 头、分支
# head ref | 分支
# header | 头信息
# hook | 钩子
# hunk | 补丁片段
# index | 索引
# index entry | 索引条目
# loose object | 松散对象
# loose refs | 松散引用
# master | master(默认分支名)
# merge | 合并
# object | 对象
# object database | 对象库
# object identifier | 对象标识符
# object name | 对象名称
# object type | 对象类型
# octopus | 章鱼式合并(两分支以上的合并)
# origin | origin(默认的远程名称)
# pack | 包
# pack index | 包索引
# packfile | 包文件
# parent | 父提交
# patch | 补丁
# pathspec | 路径规格
# pattern | 模式
# pickaxe | 挖掘
# plumbing | 管件(Git 底层核心命令的别称)
# porcelain | 瓷件(Git 上层封装命令的别称)
# precious-objects repo | 珍品仓库
# prune | 清除
# pull | 拉,拉取
# push | 推,推送
# reachable | 可达
# rebase | 变基
# ref | 引用
# reflog | 引用日志
# refspec | 引用规格
# remote | 远程,远程仓库
# remote-tracking branch | 远程跟踪分支
# replay | 重放
# repo | 仓库
# repository | 仓库
# resolve | (冲突)解决
# revert | 还原
# revision | 版本
# rewind | 回退
# SCM | 源代码管理(工具)
# SHA-1 | SHA-1(安全哈希算法1)
# shallow repository | 浅(克隆)仓库
# signed tag | 签名标签
# smart HTTP protocol | 智能 HTTP 协议
# squash | 压缩
# stage | n. 暂存区(即索引); v. 暂存
# stash | n. 贮藏区; v. 贮藏
# submodule | 子模组
# symref | 符号引用
# tag | n. 标签; v. 打标签
# tag object | 标签对象
# tagger | 打标签者
# topic branch | 主题分支
# track | 跟踪
# trailer | 尾部署名
# tree | 树(工作区或树对象)
# tree object | 树对象
# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
# unmerged index | 未合并索引
# unpack | 解包
# unreachable object | 不可达对象
# unstage | 取消暂存
# upstream | 上游
# upstream branch | 上游分支
# working tree | 工作区
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
"POT-Creation-Date: 2020-05-27 07:23+0800\n"
"PO-Revision-Date: 2020-05-27 07:39+0800\n"
"Last-Translator: Jiang Xin <[email protected]>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: add-interactive.c:368
#, c-format
msgid "Huh (%s)?"
msgstr "嗯(%s)?"
#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142
#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518
#: builtin/rebase.c:1919
msgid "could not read index"
msgstr "不能读取索引"
#: add-interactive.c:576 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "二进制"
#: add-interactive.c:634 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "无"
#: add-interactive.c:635 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "没有修改"
#: add-interactive.c:672 git-add--interactive.perl:643
msgid "Update"
msgstr "更新"
#: add-interactive.c:689 add-interactive.c:877
#, c-format
msgid "could not stage '%s'"
msgstr "不能暂存 '%s'"
#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336
msgid "could not write index"
msgstr "不能写入索引"
#: add-interactive.c:698 git-add--interactive.perl:628
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "更新了 %d 个路径\n"
msgstr[1] "更新了 %d 个路径\n"
#: add-interactive.c:716 git-add--interactive.perl:678
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "说明:%s 现已成为未跟踪的。\n"
#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294
#: builtin/reset.c:145
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
#: add-interactive.c:751 git-add--interactive.perl:655
msgid "Revert"
msgstr "还原"
#: add-interactive.c:767
msgid "Could not parse HEAD^{tree}"
msgstr "不能解析 HEAD^{tree}"
#: add-interactive.c:805 git-add--interactive.perl:631
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "还原了 %d 个路径\n"
msgstr[1] "还原了 %d 个路径\n"
#: add-interactive.c:856 git-add--interactive.perl:695
#, c-format
msgid "No untracked files.\n"
msgstr "没有未跟踪的文件。\n"
#: add-interactive.c:860 git-add--interactive.perl:689
msgid "Add untracked"
msgstr "添加未跟踪的"
#: add-interactive.c:887 git-add--interactive.perl:625
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "增加了 %d 个路径\n"
msgstr[1] "增加了 %d 个路径\n"
#: add-interactive.c:917
#, c-format
msgid "ignoring unmerged: %s"
msgstr "忽略未合入的:%s"
#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
#, c-format
msgid "Only binary files changed.\n"
msgstr "只有二进制文件被修改。\n"
#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
#, c-format
msgid "No changes.\n"
msgstr "没有修改。\n"
#: add-interactive.c:935 git-add--interactive.perl:1376
msgid "Patch update"
msgstr "补丁更新"
#: add-interactive.c:974 git-add--interactive.perl:1754
msgid "Review diff"
msgstr "检视 diff"
#: add-interactive.c:1002
msgid "show paths with changes"
msgstr "显示含变更的路径"
#: add-interactive.c:1004
msgid "add working tree state to the staged set of changes"
msgstr "将工作区状态添加到暂存区修改集中"
#: add-interactive.c:1006
msgid "revert staged set of changes back to the HEAD version"
msgstr "将暂存的修改集恢复为 HEAD 版本"
#: add-interactive.c:1008
msgid "pick hunks and update selectively"
msgstr "挑选数据块并有选择地更新"
#: add-interactive.c:1010
msgid "view diff between HEAD and index"
msgstr "显示 HEAD 和索引的差异"
#: add-interactive.c:1012
msgid "add contents of untracked files to the staged set of changes"
msgstr "将未跟踪文件的内容添加到暂存区修改集中"
#: add-interactive.c:1020 add-interactive.c:1069
msgid "Prompt help:"
msgstr "帮助:"
#: add-interactive.c:1022
msgid "select a single item"
msgstr "选择一个条目"
#: add-interactive.c:1024
msgid "select a range of items"
msgstr "选择一系列条目"
#: add-interactive.c:1026
msgid "select multiple ranges"
msgstr "选择多个范围"
#: add-interactive.c:1028 add-interactive.c:1073
msgid "select item based on unique prefix"
msgstr "基于唯一前缀选择条目"
#: add-interactive.c:1030
msgid "unselect specified items"
msgstr "反选指定的条目"
#: add-interactive.c:1032
msgid "choose all items"
msgstr "选择所有条目"
#: add-interactive.c:1034
msgid "(empty) finish selecting"
msgstr "(空)结束选择"
#: add-interactive.c:1071
msgid "select a numbered item"
msgstr "选择一个编号条目"
#: add-interactive.c:1075
msgid "(empty) select nothing"
msgstr "(空)不选择任何内容"
#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851
msgid "*** Commands ***"
msgstr "*** 命令 ***"
#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848
msgid "What now"
msgstr "请选择"
#: add-interactive.c:1136 git-add--interactive.perl:213
msgid "staged"
msgstr "缓存"
#: add-interactive.c:1136 git-add--interactive.perl:213
msgid "unstaged"
msgstr "未缓存"
#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250
#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145
#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
#: builtin/submodule--helper.c:2148 bugreport.c:129
#: git-add--interactive.perl:213
msgid "path"
msgstr "路径"
#: add-interactive.c:1143
msgid "could not refresh index"
msgstr "不能刷新索引"
#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
#: add-patch.c:34 git-add--interactive.perl:1428
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
#: add-patch.c:35 git-add--interactive.perl:1429
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
#: add-patch.c:36 git-add--interactive.perl:1430
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "暂存该块 [y,n,q,a,d%s,?]? "
#: add-patch.c:38
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr "如果补丁能正确地应用,编辑块将立即标记为暂存。"
#: add-patch.c:41
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
"q - quit; do not stage this hunk or any of the remaining ones\n"
"a - stage this hunk and all later hunks in the file\n"
"d - do not stage this hunk or any of the later hunks in the file\n"
msgstr ""
"y - 暂存该块\n"
"n - 不要暂存该块\n"
"q - 退出。不暂存该块及后面的全部块\n"
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块\n"
#: add-patch.c:55 git-add--interactive.perl:1433
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
#: add-patch.c:56 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
#: add-patch.c:57 git-add--interactive.perl:1435
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
#: add-patch.c:59
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr "如果补丁能正确地应用,编辑块将立即标记为贮藏。"
#: add-patch.c:62
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
"q - quit; do not stash this hunk or any of the remaining ones\n"
"a - stash this hunk and all later hunks in the file\n"
"d - do not stash this hunk or any of the later hunks in the file\n"
msgstr ""
"y - 贮藏该块\n"
"n - 不要贮藏该块\n"
"q - 退出。不贮藏该块及后面的全部块\n"
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块\n"
#: add-patch.c:78 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
#: add-patch.c:79 git-add--interactive.perl:1439
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
#: add-patch.c:80 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
#: add-patch.c:82
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr "如果补丁能正确地应用,编辑块将立即标记为未暂存。"
#: add-patch.c:85
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
"q - quit; do not unstage this hunk or any of the remaining ones\n"
"a - unstage this hunk and all later hunks in the file\n"
"d - do not unstage this hunk or any of the later hunks in the file\n"
msgstr ""
"y - 取消暂存该块\n"
"n - 不要取消暂存该块\n"
"q - 退出。不要取消暂存该块及后面的全部块\n"
"a - 取消暂存该块和本文件中后面的全部块\n"
"d - 不要取消暂存该块和本文件中后面的全部块\n"
#: add-patch.c:100 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
#: add-patch.c:101 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
#: add-patch.c:102 git-add--interactive.perl:1445
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
#: add-patch.c:104 add-patch.c:169 add-patch.c:212
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"applying."
msgstr "如果补丁能正确地应用,编辑块将立即标记为应用。"
#: add-patch.c:107
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
"y - 在索引中应用该块\n"
"n - 不要在索引中应用该块\n"
"q - 退出。不要应用该块及后面的全部块\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块\n"
#: add-patch.c:122 git-add--interactive.perl:1448
#: git-add--interactive.perl:1463
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
#: add-patch.c:123 git-add--interactive.perl:1449
#: git-add--interactive.perl:1464
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
#: add-patch.c:124 git-add--interactive.perl:1450
#: git-add--interactive.perl:1465
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
#: add-patch.c:126 add-patch.c:148 add-patch.c:191
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"discarding."
msgstr "如果补丁能正确地应用,编辑块将立即标记为丢弃。"
#: add-patch.c:129 add-patch.c:194
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
"q - quit; do not discard this hunk or any of the remaining ones\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
"y - 在工作区中丢弃该块\n"
"n - 不要在工作区中丢弃该块\n"
"q - 退出。不要丢弃该块及后面的全部块\n"
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块\n"
#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
#: add-patch.c:151
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
"q - quit; do not discard this hunk or any of the remaining ones\n"
"a - discard this hunk and all later hunks in the file\n"
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
"y - 在索引和工作区中丢弃该块\n"
"n - 不要在索引和工作区中丢弃该块\n"
"q - 退出。不要丢弃该块及后面的全部块\n"
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块\n"
#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
#: add-patch.c:172
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
"y - 在索引和工作区中应用该块\n"
"n - 不要在索引和工作区中应用该块\n"
"q - 退出。不要应用该块及后面的全部块\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块\n"
#: add-patch.c:215
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
"q - quit; do not apply this hunk or any of the remaining ones\n"
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
"y - 在工作区中应用该块\n"
"n - 不要在工作区中应用该块\n"
"q - 退出。不要应用该块及后面的全部块\n"
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块\n"
#: add-patch.c:319
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "无法解析数据块头信息 '%.*s'"
#: add-patch.c:338 add-patch.c:342
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "无法解析彩色数据块头信息 '%.*s'"
#: add-patch.c:396
msgid "could not parse diff"
msgstr "不能解析差异信息"
#: add-patch.c:415
msgid "could not parse colored diff"
msgstr "不能解析彩色差异信息"
#: add-patch.c:429
#, c-format
msgid "failed to run '%s'"
msgstr "运行 '%s' 失败"
#: add-patch.c:588
msgid "mismatched output from interactive.diffFilter"
msgstr "interactive.diffFilter 的输出不匹配"
#: add-patch.c:589
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。"
#: add-patch.c:762
#, c-format
msgid ""
"expected context line #%d in\n"
"%.*s"
msgstr ""
"预期上下文行 #%d 于\n"
"%.*s"
#: add-patch.c:777
#, c-format
msgid ""
"hunks do not overlap:\n"
"%.*s\n"
"\tdoes not end with:\n"
"%.*s"
msgstr ""
"块不重叠:\n"
"%.*s\n"
"\t不是结尾于:\n"
"%.*s"
#: add-patch.c:1053 git-add--interactive.perl:1112
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
#: add-patch.c:1057
#, c-format
msgid ""
"---\n"
"To remove '%c' lines, make them ' ' lines (context).\n"
"To remove '%c' lines, delete them.\n"
"Lines starting with %c will be removed.\n"
msgstr ""
"---\n"
"要删除 '%c' 开始的行,使其成为 ' ' 开始的行(上下文)。\n"
"要删除 '%c' 开始的行,删除它们。\n"
"以 %c 开始的行将被删除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
#: add-patch.c:1071 git-add--interactive.perl:1126
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
"如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n"
"此次编辑被终止,该块不会被修改。\n"
#: add-patch.c:1104
msgid "could not parse hunk header"
msgstr "无法解析数据块头信息"
#: add-patch.c:1149
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' 失败"
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input at this point.
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
#.
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input
#. at this point.
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
#: add-patch.c:1218 git-add--interactive.perl:1239
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? "
#: add-patch.c:1261
msgid "The selected hunks do not apply to the index!"
msgstr "选中的块不能应用到索引!"
#: add-patch.c:1262 git-add--interactive.perl:1343
msgid "Apply them to the worktree anyway? "
msgstr "无论如何都要应用到工作区么?"
#: add-patch.c:1269 git-add--interactive.perl:1346
msgid "Nothing was applied.\n"
msgstr "未应用。\n"
#: add-patch.c:1326
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
"k - leave this hunk undecided, see previous undecided hunk\n"
"K - leave this hunk undecided, see previous hunk\n"
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
"s - split the current hunk into smaller hunks\n"
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
"j - 维持该块未决状态,查看下一个未决块\n"
"J - 维持该块未决状态,查看下一个块\n"
"k - 维持该块未决状态,查看上一个未决块\n"
"K - 维持该块未决状态,查看上一个块\n"
"g - 选择跳转到一个块\n"
"/ - 查找和给定正则表达式匹配的块\n"
"s - 拆分当前块为更小的块\n"
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
#: add-patch.c:1447 add-patch.c:1457
msgid "No previous hunk"
msgstr "没有前一个块"
#: add-patch.c:1452 add-patch.c:1462
msgid "No next hunk"
msgstr "没有下一个块"
#: add-patch.c:1468
msgid "No other hunks to goto"
msgstr "没有其它可供跳转的块"
#: add-patch.c:1479 git-add--interactive.perl:1577
msgid "go to which hunk (<ret> to see more)? "
msgstr "跳转到哪个块(<回车> 查看更多)? "
#: add-patch.c:1480 git-add--interactive.perl:1579
msgid "go to which hunk? "
msgstr "跳转到哪个块?"
#: add-patch.c:1491
#, c-format
msgid "Invalid number: '%s'"
msgstr "无效数字:'%s'"
#: add-patch.c:1496
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "对不起,只有 %d 个可用块。"
msgstr[1] "对不起,只有 %d 个可用块。"
#: add-patch.c:1505
msgid "No other hunks to search"
msgstr "没有其它可供查找的块"
#: add-patch.c:1511 git-add--interactive.perl:1623
msgid "search for regex? "
msgstr "使用正则表达式搜索?"
#: add-patch.c:1526
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "错误的正则表达式 %s:%s"
#: add-patch.c:1543
msgid "No hunk matches the given pattern"
msgstr "没有和给定模式相匹配的块"
#: add-patch.c:1550
msgid "Sorry, cannot split this hunk"
msgstr "对不起,不能拆分这个块"
#: add-patch.c:1554
#, c-format
msgid "Split into %d hunks."
msgstr "拆分为 %d 块。"
#: add-patch.c:1558
msgid "Sorry, cannot edit this hunk"
msgstr "对不起,不能编辑这个块"
#: add-patch.c:1609
msgid "'git apply' failed"
msgstr "'git apply' 失败"
#: advice.c:140
#, c-format
msgid ""
"\n"
"Disable this message with \"git config advice.%s false\""
msgstr ""
"\n"
"使用 \"git config advice.%s false\" 来关闭此消息"
#: advice.c:156
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示:%.*s%s\n"
#: advice.c:247
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "无法拣选,因为您有未合并的文件。"
#: advice.c:249
msgid "Committing is not possible because you have unmerged files."
msgstr "无法提交,因为您有未合并的文件。"
#: advice.c:251
msgid "Merging is not possible because you have unmerged files."
msgstr "无法合并,因为您有未合并的文件。"
#: advice.c:253
msgid "Pulling is not possible because you have unmerged files."
msgstr "无法拉取,因为您有未合并的文件。"
#: advice.c:255
msgid "Reverting is not possible because you have unmerged files."
msgstr "无法回退,因为您有未合并的文件。"
#: advice.c:257
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "无法 %s,因为您有未合并的文件。"
#: advice.c:265
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
#: advice.c:273
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
#: advice.c:278 builtin/merge.c:1353
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
#: advice.c:280
msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"
#: advice.c:281
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完成的合并而退出。"
#: advice.c:287
#, c-format
msgid ""
"Note: switching to '%s'.\n"
"\n"
"You are in 'detached HEAD' state. You can look around, make experimental\n"
"changes and commit them, and you can discard any commits you make in this\n"
"state without impacting any branches by switching back to a branch.\n"
"\n"
"If you want to create a new branch to retain commits you create, you may\n"
"do so (now or later) by using -c with the switch command. Example:\n"
"\n"
" git switch -c <new-branch-name>\n"
"\n"
"Or undo this operation with:\n"
"\n"
" git switch -\n"
"\n"
"Turn off this advice by setting config variable advice.detachedHead to "
"false\n"
"\n"
msgstr ""
"注意:正在切换到 '%s'。\n"
"\n"
"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n"
"回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n"
"\n"
"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n"
"中添加参数 -c 来实现(现在或稍后)。例如:\n"
"\n"
" git switch -c <新分支名>\n"
"\n"
"或者撤销此操作:\n"
"\n"
" git switch -\n"
"\n"
"通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n"
"\n"
#: alias.c:50
msgid "cmdline ends with \\"
msgstr "命令行以 \\ 结尾"
#: alias.c:51
msgid "unclosed quote"
msgstr "未关闭的引号"
#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "未能识别的空白字符选项 '%s'"
#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject 和 --3way 不能同时使用。"
#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached 和 --3way 不能同时使用。"
#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way 在一个仓库之外"
#: apply.c:151
msgid "--index outside a repository"
msgstr "--index 在一个仓库之外"
#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached 在一个仓库之外"
#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "无法准备时间戳正则表达式 %s"
#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d,输入为:%s"
#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在补丁的第 %d 行找到文件名"
#: apply.c:922
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
#: apply.c:928
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
#: apply.c:929
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "第 %d 行包含无效文件模式:%s"
#: apply.c:1282
#, c-format