-
Notifications
You must be signed in to change notification settings - Fork 0
/
zh_CN.po
10749 lines (8504 loc) · 293 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.
# Contributers:
# - Jiang Xin <worldhello.net AT gmail.com>
# - Riku <lu.riku AT gmail.com>
# - Zhuang Ya <zhuangya AT me.com>
# - Lian Cheng <rhythm.mail AT gmail.com>
#
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
"POT-Creation-Date: 2013-11-02 08:06+0800\n"
"PO-Revision-Date: 2013-11-02 08:14+0800\n"
"Last-Translator: Jiang Xin <[email protected]>\n"
"Language-Team: GitHub <https://github.com/gotgit/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"
#: advice.c:57
#, c-format
msgid "hint: %.*s\n"
msgstr "提示:%.*s\n"
#.
#. * Message used both when 'git commit' fails and when
#. * other commands doing a merge do.
#.
#: advice.c:87
msgid ""
"Fix them up in the work tree,\n"
"and then use 'git add/rm <file>' as\n"
"appropriate to mark resolution and make a commit,\n"
"or use 'git commit -a'."
msgstr ""
"请先在工作区改正文件,然后酌情使用\n"
"'git add/rm <file>' 标记解决方案,\n"
"或使用 'git commit -a'。"
#: archive.c:10
msgid "git archive [options] <tree-ish> [<path>...]"
msgstr "git archive [选项] <树或提交> [<路径>...]"
#: archive.c:11
msgid "git archive --list"
msgstr "git archive --list"
#: archive.c:12
msgid ""
"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
msgstr ""
"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]"
#: archive.c:13
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <版本库> [--exec <命令>] --list"
#: archive.c:242 builtin/add.c:240 builtin/add.c:556 builtin/rm.c:328
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规则 '%s' 未匹配任何文件"
#: archive.c:327
msgid "fmt"
msgstr "格式"
#: archive.c:327
msgid "archive format"
msgstr "归档格式"
#: archive.c:328 builtin/log.c:1193
msgid "prefix"
msgstr "前缀"
#: archive.c:329
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2264
#: builtin/blame.c:2265 builtin/config.c:58 builtin/fast-export.c:680
#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
msgid "file"
msgstr "文件"
#: archive.c:331 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "归档写入此文件"
#: archive.c:333
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
#: archive.c:334
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
#: archive.c:335
msgid "store only"
msgstr "只存储"
#: archive.c:336
msgid "compress faster"
msgstr "压缩速度更快"
#: archive.c:344
msgid "compress better"
msgstr "压缩效果更好"
#: archive.c:347
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
msgid "repo"
msgstr "版本库"
#: archive.c:350 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程版本库(<版本库>)提取归档文件"
#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
msgid "command"
msgstr "命令"
#: archive.c:352 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
#: attr.c:259
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时,使用 '\\!'。"
#: branch.c:60
#, c-format
msgid "Not setting branch %s as its own upstream."
msgstr "未设置分支 %s 作为它自己的上游。"
#: branch.c:82
#, c-format
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
#: branch.c:83
#, c-format
msgid "Branch %s set up to track remote branch %s from %s."
msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
#: branch.c:87
#, c-format
msgid "Branch %s set up to track local branch %s by rebasing."
msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
#: branch.c:88
#, c-format
msgid "Branch %s set up to track local branch %s."
msgstr "分支 %s 设置为跟踪本地分支 %s。"
#: branch.c:92
#, c-format
msgid "Branch %s set up to track remote ref %s by rebasing."
msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
#: branch.c:93
#, c-format
msgid "Branch %s set up to track remote ref %s."
msgstr "分支 %s 设置为跟踪远程引用 %s。"
#: branch.c:97
#, c-format
msgid "Branch %s set up to track local ref %s by rebasing."
msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
#: branch.c:98
#, c-format
msgid "Branch %s set up to track local ref %s."
msgstr "分支 %s 设置为跟踪本地引用 %s。"
#: branch.c:118
#, c-format
msgid "Tracking not set up: name too long: %s"
msgstr "跟踪未设置:名字太长:%s"
#: branch.c:137
#, c-format
msgid "Not tracking: ambiguous information for ref %s"
msgstr "未跟踪:引用 %s 有歧义"
#: branch.c:182
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' 不是一个有效的分支名称。"
#: branch.c:187
#, c-format
msgid "A branch named '%s' already exists."
msgstr "一个分支名 '%s' 已经存在。"
#: branch.c:195
msgid "Cannot force update the current branch."
msgstr "无法强制更新当前分支。"
#: branch.c:215
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
#: branch.c:217
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' 不存在"
#: branch.c:219
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
"branch that already exists at the remote, you may need to\n"
"run \"git fetch\" to retrieve it.\n"
"\n"
"If you are planning to push out a new local branch that\n"
"will track its remote counterpart, you may want to use\n"
"\"git push -u\" to set the upstream config as you push."
msgstr ""
"\n"
"如果您正计划基于远程一个现存的上游分支开始你的工作,\n"
"您可能需要执行 \"git fetch\" 来获取分支。\n"
"\n"
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n"
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "不是一个有效的对象名:'%s'。"
#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "歧义的对象名:'%s'。"
#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点:'%s'。"
#: branch.c:295
msgid "Failed to lock ref for update"
msgstr "无法为更新锁定引用"
#: branch.c:313
msgid "Failed to write ref"
msgstr "不能写引用"
#: bundle.c:36
#, c-format
msgid "'%s' does not look like a v2 bundle file"
msgstr "'%s' 不像是一个 v2 版本的包文件"
#: bundle.c:63
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头:%s%s (%d)"
#: bundle.c:89 builtin/commit.c:706
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
#: bundle.c:140
msgid "Repository lacks these prerequisite commits:"
msgstr "版本库缺少这些必备的提交:"
#: bundle.c:164 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:364
#: builtin/shortlog.c:158
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
#: bundle.c:186
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "这个包中含有这个引用:"
msgstr[1] "这个包中含有 %d 个引用:"
#: bundle.c:193
msgid "The bundle records a complete history."
msgstr "这个包记录一个完整历史。"
#: bundle.c:195
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "这个包需要这个引用:"
msgstr[1] "这个包需要 %d 个引用:"
#: bundle.c:294
msgid "rev-list died"
msgstr "rev-list 终止"
#: bundle.c:300 builtin/log.c:1329 builtin/shortlog.c:261
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数:%s"
#: bundle.c:335
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
#: bundle.c:380
msgid "Refusing to create empty bundle."
msgstr "不能创建空包。"
#: bundle.c:398
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
#: bundle.c:416
msgid "pack-objects died"
msgstr "pack-objects 终止"
#: bundle.c:419
#, c-format
msgid "cannot create '%s'"
msgstr "不能创建 '%s'"
#: bundle.c:441
msgid "index-pack died"
msgstr "index-pack 终止"
#: commit.c:53
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
#: commit.c:55
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交!"
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "内存耗尽"
#: connected.c:60
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
#: connected.c:80
#, c-format
msgid "failed write to rev-list: %s"
msgstr "无法写入 rev-list:%s"
#: connected.c:88
#, c-format
msgid "failed to close rev-list's stdin: %s"
msgstr "无法关闭 rev-list 的标准输入:%s"
#: date.c:95
msgid "in the future"
msgstr "在将来"
#: date.c:101
#, c-format
msgid "%lu second ago"
msgid_plural "%lu seconds ago"
msgstr[0] "%lu 秒钟之前"
msgstr[1] "%lu 秒钟之前"
#: date.c:108
#, c-format
msgid "%lu minute ago"
msgid_plural "%lu minutes ago"
msgstr[0] "%lu 分钟之前"
msgstr[1] "%lu 分钟之前"
#: date.c:115
#, c-format
msgid "%lu hour ago"
msgid_plural "%lu hours ago"
msgstr[0] "%lu 小时之前"
msgstr[1] "%lu 小时之前"
#: date.c:122
#, c-format
msgid "%lu day ago"
msgid_plural "%lu days ago"
msgstr[0] "%lu 天之前"
msgstr[1] "%lu 天之前"
#: date.c:128
#, c-format
msgid "%lu week ago"
msgid_plural "%lu weeks ago"
msgstr[0] "%lu 周之前"
msgstr[1] "%lu 周之前"
#: date.c:135
#, c-format
msgid "%lu month ago"
msgid_plural "%lu months ago"
msgstr[0] "%lu 个月之前"
msgstr[1] "%lu 个月之前"
#: date.c:146
#, c-format
msgid "%lu year"
msgid_plural "%lu years"
msgstr[0] "%lu 年"
msgstr[1] "%lu 年"
#: date.c:149
#, c-format
msgid "%s, %lu month ago"
msgid_plural "%s, %lu months ago"
msgstr[0] "%s,%lu 个月之前"
msgstr[1] "%s,%lu 个月之前"
#: date.c:154 date.c:159
#, c-format
msgid "%lu year ago"
msgid_plural "%lu years ago"
msgstr[0] "%lu 年前"
msgstr[1] "%lu 年前"
# 译者:注意保持前导空格
#: diff.c:112
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
# 译者:注意保持前导空格
#: diff.c:117
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 参数 '%s'\n"
#: diff.c:210
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
#: diff.c:260
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
"发现配置变量 'diff.dirstat' 中的错误:\n"
"%s"
#: diff.c:3490
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
"无法解析 --dirstat/-X 选项的参数:\n"
"%s"
#: diff.c:3504
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数:'%s'"
#: gpg-interface.c:59 gpg-interface.c:131
msgid "could not run gpg."
msgstr "不能执行 gpg。"
#: gpg-interface.c:71
msgid "gpg did not accept the data"
msgstr "gpg 没有接受数据"
#: gpg-interface.c:82
msgid "gpg failed to sign the data"
msgstr "gpg 无法为数据签名"
#: gpg-interface.c:115
#, c-format
msgid "could not create temporary file '%s': %s"
msgstr "不能创建临时文件 '%s':%s"
#: gpg-interface.c:118
#, c-format
msgid "failed writing detached signature to '%s': %s"
msgstr "无法将分离式签名写入 '%s':%s"
#: grep.c:1695
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s':无法读取 %s"
#: grep.c:1712
#, c-format
msgid "'%s': %s"
msgstr "'%s':%s"
#: grep.c:1723
#, c-format
msgid "'%s': short read %s"
msgstr "'%s':读取不完整 %s"
#: help.c:210
#, c-format
msgid "available git commands in '%s'"
msgstr "在 '%s' 下可用的 git 命令"
#: help.c:217
msgid "git commands available from elsewhere on your $PATH"
msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
#: help.c:233
msgid "The most commonly used git commands are:"
msgstr "最常用的 git 命令有:"
#: help.c:290
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
"'%s' 像是一个 git 命令,但却无法运行。\n"
"可能是 git-%s 受损?"
#: help.c:347
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "唉呀,您的系统中未发现 Git 命令。"
#: help.c:369
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
"Continuing under the assumption that you meant '%s'"
msgstr ""
"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
"是 '%s'"
#: help.c:374
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "在 %0.1f 秒钟后自动运行..."
#: help.c:381
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
#: help.c:385 help.c:444
msgid ""
"\n"
"Did you mean this?"
msgid_plural ""
"\n"
"Did you mean one of these?"
msgstr[0] ""
"\n"
"您指的是这个么?"
msgstr[1] ""
"\n"
"您指的是这其中的某一个么?"
#: help.c:440
#, c-format
msgid "%s: %s - %s"
msgstr "%s:%s - %s"
#: merge.c:56
msgid "failed to read the cache"
msgstr "无法读取缓存"
#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
#: builtin/clone.c:655
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
#: merge-recursive.c:190
#, c-format
msgid "(bad commit)\n"
msgstr "(坏提交)\n"
#: merge-recursive.c:206
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "为路径 '%s' addinfo_cache 失败"
#: merge-recursive.c:269
msgid "error building trees"
msgstr "无法创建树"
#: merge-recursive.c:673
#, c-format
msgid "failed to create path '%s'%s"
msgstr "无法创建路径 '%s'%s"
#: merge-recursive.c:684
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
#. something else exists
#. .. but not some other error (who really cares what?)
#: merge-recursive.c:698 merge-recursive.c:719
msgid ": perhaps a D/F conflict?"
msgstr ":可能是一个目录/文件冲突?"
#: merge-recursive.c:709
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
#: merge-recursive.c:749
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
#: merge-recursive.c:751
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据(blob)对象"
#: merge-recursive.c:774 builtin/clone.c:311
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
#: merge-recursive.c:782
#, c-format
msgid "failed to symlink '%s'"
msgstr "无法创建符号链接 '%s'"
#: merge-recursive.c:785
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
#: merge-recursive.c:923
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
#: merge-recursive.c:927
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
#: merge-recursive.c:943
msgid "unsupported object type in the tree"
msgstr "在树中有不支持的对象类型"
#: merge-recursive.c:1022 merge-recursive.c:1036
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
"的版本被保留。"
#: merge-recursive.c:1028 merge-recursive.c:1041
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
"的版本保留于 %8$s 中。"
#: merge-recursive.c:1082
msgid "rename"
msgstr "重命名"
#: merge-recursive.c:1082
msgid "renamed"
msgstr "重命名"
#: merge-recursive.c:1138
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
#: merge-recursive.c:1160
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
#: merge-recursive.c:1165
msgid " (left unresolved)"
msgstr "(留下未解决)"
#: merge-recursive.c:1219
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
"%5$s"
#: merge-recursive.c:1249
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
#: merge-recursive.c:1448
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
#: merge-recursive.c:1458
#, c-format
msgid "Adding merged %s"
msgstr "添加合并后的 %s"
#: merge-recursive.c:1463 merge-recursive.c:1661
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
#: merge-recursive.c:1514
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
#: merge-recursive.c:1517
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据(blob)对象"
#: merge-recursive.c:1565
msgid "modify"
msgstr "修改"
#: merge-recursive.c:1565
msgid "modified"
msgstr "修改"
#: merge-recursive.c:1575
msgid "content"
msgstr "内容"
#: merge-recursive.c:1582
msgid "add/add"
msgstr "添加/添加"
#: merge-recursive.c:1616
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s(已经做过相同合并)"
#: merge-recursive.c:1630
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
#: merge-recursive.c:1634 git-submodule.sh:1125
msgid "submodule"
msgstr "子模组"
#: merge-recursive.c:1635
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突(%s):合并冲突于 %s"
#: merge-recursive.c:1725
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
#: merge-recursive.c:1750
msgid "file/directory"
msgstr "文件/目录"
#: merge-recursive.c:1756
msgid "directory/file"
msgstr "目录/文件"
#: merge-recursive.c:1761
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
#: merge-recursive.c:1771
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
#: merge-recursive.c:1788
msgid "Fatal merge failure, shouldn't happen."
msgstr "严重的合并错误,不应发生。"
#: merge-recursive.c:1807
msgid "Already up-to-date!"
msgstr "已经是最新的!"
#: merge-recursive.c:1816
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
#: merge-recursive.c:1846
#, c-format
msgid "Unprocessed path??? %s"
msgstr "未处理的路径??? %s"
#: merge-recursive.c:1891
msgid "Merging:"
msgstr "合并:"
#: merge-recursive.c:1904
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先:"
msgstr[1] "发现 %u 个共同祖先:"
#: merge-recursive.c:1941
msgid "merge returned no commit"
msgstr "合并未返回提交"
#: merge-recursive.c:1998
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
#: merge-recursive.c:2010 builtin/merge.c:672
msgid "Unable to write index."
msgstr "不能写入索引。"
#: notes-utils.c:40
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr "不能提交未初始化/未引用的注解树"
#: notes-utils.c:81
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
msgstr "坏的 notes.rewriteMode 值:'%s'"
#: notes-utils.c:91
#, c-format
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
#. TRANSLATORS: The first %s is the name of the
#. environment variable, the second %s is its value
#: notes-utils.c:118
#, c-format
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值:'%s'"
#: object.c:202
#, c-format
msgid "unable to parse object: %s"
msgstr "不能解析对象:%s"
#: parse-options.c:537
msgid "..."
msgstr "..."
#: parse-options.c:555
#, c-format
msgid "usage: %s"
msgstr "用法:%s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
#: parse-options.c:559
#, c-format
msgid " or: %s"
msgstr " 或:%s"
# 译者:为保证在输出中对齐,注意调整句中空格!
#: parse-options.c:562
#, c-format
msgid " %s"
msgstr " %s"
#: parse-options.c:596
msgid "-NUM"
msgstr "-数字"
#: pathspec.c:118
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr "全局的 'glob' 和 'noglob' 路径规则设置不兼容"
#: pathspec.c:128
msgid ""
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr "全局的 'literal' 路径规则设置和其它的全局路径规则设置不兼容"
#: pathspec.c:158
msgid "invalid parameter for pathspec magic 'prefix'"
msgstr "路径规则包含无效的神奇前缀"
#: pathspec.c:164
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
msgstr "在路径规则 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
#: pathspec.c:168
#, c-format
msgid "Missing ')' at the end of pathspec magic in '%s'"
msgstr "路径规则 '%s' 的神奇前缀结尾少了一个 ')'"
#: pathspec.c:186
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
msgstr "路径规则 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
#: pathspec.c:211
#, c-format
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s:'literal' 和 'glob' 不兼容"
#: pathspec.c:222
#, c-format
msgid "%s: '%s' is outside repository"
msgstr "%s:'%s' 在版本库之外"
#: pathspec.c:278
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路径规则 '%s' 在子模组 '%.*s' 中"
#.
#. * We may want to substitute "this command" with a command
#. * name. E.g. when add--interactive dies when running
#. * "checkout -p"
#.
#: pathspec.c:340
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s:路径规则神奇前缀不被此命令支持:%s"
#: pathspec.c:415
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路径规则 '%s' 位于符号链接中"
#: remote.c:1833
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
#: remote.c:1837
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
#: remote.c:1840
#, c-format
msgid "Your branch is up-to-date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
#: remote.c:1844
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
#: remote.c:1850
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
#: remote.c:1853
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
# 译者:注意保持前导空格
#: remote.c:1861
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
#: remote.c:1864
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commit each, respectively.\n"
msgid_plural ""
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
"您的分支和 '%s' 出现了偏离,\n"
"并且分别有 %d 和 %d 处不同的提交。\n"