blob: 4a9d4efed926852cd6bd8a97f20c9baac869010a [file] [log] [blame]
Jiang Xindce37b62012-02-13 14:37:59 +08001# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#
6#, fuzzy
7msgid ""
8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
Jiang Xinc6bc7d42013-04-30 08:31:19 +080011"POT-Creation-Date: 2013-04-30 08:25+0800\n"
Jiang Xindce37b62012-02-13 14:37:59 +080012"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
15"Language: \n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
Jiang Xinc138af52013-04-10 15:19:54 +080021#: advice.c:53
Jiang Xindce37b62012-02-13 14:37:59 +080022#, c-format
23msgid "hint: %.*s\n"
24msgstr ""
25
26#.
27#. * Message used both when 'git commit' fails and when
28#. * other commands doing a merge do.
29#.
Jiang Xinc138af52013-04-10 15:19:54 +080030#: advice.c:83
Jiang Xindce37b62012-02-13 14:37:59 +080031msgid ""
32"Fix them up in the work tree,\n"
33"and then use 'git add/rm <file>' as\n"
34"appropriate to mark resolution and make a commit,\n"
35"or use 'git commit -a'."
36msgstr ""
37
Jiang Xincc760112012-09-15 10:26:13 +080038#: archive.c:10
39msgid "git archive [options] <tree-ish> [<path>...]"
40msgstr ""
41
42#: archive.c:11
43msgid "git archive --list"
44msgstr ""
45
46#: archive.c:12
47msgid ""
48"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
49msgstr ""
50
51#: archive.c:13
52msgid "git archive --remote <repo> [--exec <cmd>] --list"
53msgstr ""
54
Jiang Xin46bc4032013-01-25 12:33:58 +080055#: archive.c:323
Jiang Xincc760112012-09-15 10:26:13 +080056msgid "fmt"
57msgstr ""
58
Jiang Xin46bc4032013-01-25 12:33:58 +080059#: archive.c:323
Jiang Xincc760112012-09-15 10:26:13 +080060msgid "archive format"
61msgstr ""
62
Jiang Xinc6bc7d42013-04-30 08:31:19 +080063#: archive.c:324 builtin/log.c:1126
Jiang Xincc760112012-09-15 10:26:13 +080064msgid "prefix"
65msgstr ""
66
Jiang Xin46bc4032013-01-25 12:33:58 +080067#: archive.c:325
Jiang Xincc760112012-09-15 10:26:13 +080068msgid "prepend prefix to each pathname in the archive"
69msgstr ""
70
Jiang Xinc6bc7d42013-04-30 08:31:19 +080071#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371
72#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665
73#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77
74#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536
Jiang Xin9caaf232013-02-14 14:49:45 +080075#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149
Jiang Xincc760112012-09-15 10:26:13 +080076msgid "file"
77msgstr ""
78
Jiang Xinc138af52013-04-10 15:19:54 +080079#: archive.c:327 builtin/archive.c:89
Jiang Xincc760112012-09-15 10:26:13 +080080msgid "write the archive to this file"
81msgstr ""
82
Jiang Xin46bc4032013-01-25 12:33:58 +080083#: archive.c:329
Jiang Xincc760112012-09-15 10:26:13 +080084msgid "read .gitattributes in working directory"
85msgstr ""
86
Jiang Xin46bc4032013-01-25 12:33:58 +080087#: archive.c:330
Jiang Xincc760112012-09-15 10:26:13 +080088msgid "report archived files on stderr"
89msgstr ""
90
Jiang Xin46bc4032013-01-25 12:33:58 +080091#: archive.c:331
Jiang Xincc760112012-09-15 10:26:13 +080092msgid "store only"
93msgstr ""
94
Jiang Xin46bc4032013-01-25 12:33:58 +080095#: archive.c:332
Jiang Xincc760112012-09-15 10:26:13 +080096msgid "compress faster"
97msgstr ""
98
Jiang Xin46bc4032013-01-25 12:33:58 +080099#: archive.c:340
Jiang Xincc760112012-09-15 10:26:13 +0800100msgid "compress better"
101msgstr ""
102
Jiang Xin46bc4032013-01-25 12:33:58 +0800103#: archive.c:343
Jiang Xincc760112012-09-15 10:26:13 +0800104msgid "list supported archive formats"
105msgstr ""
106
Jiang Xinc138af52013-04-10 15:19:54 +0800107#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86
Jiang Xincc760112012-09-15 10:26:13 +0800108msgid "repo"
109msgstr ""
110
Jiang Xinc138af52013-04-10 15:19:54 +0800111#: archive.c:346 builtin/archive.c:91
Jiang Xincc760112012-09-15 10:26:13 +0800112msgid "retrieve the archive from remote repository <repo>"
113msgstr ""
114
Jiang Xinc138af52013-04-10 15:19:54 +0800115#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615
Jiang Xincc760112012-09-15 10:26:13 +0800116msgid "command"
117msgstr ""
118
Jiang Xinc138af52013-04-10 15:19:54 +0800119#: archive.c:348 builtin/archive.c:93
Jiang Xincc760112012-09-15 10:26:13 +0800120msgid "path to the remote git-upload-archive command"
121msgstr ""
122
Jiang Xinfe52cd62012-11-23 14:29:02 +0800123#: attr.c:259
124msgid ""
Jiang Xined1ddaf2013-03-05 12:41:45 +0800125"Negative patterns are ignored in git attributes\n"
Jiang Xinfe52cd62012-11-23 14:29:02 +0800126"Use '\\!' for literal leading exclamation."
127msgstr ""
128
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800129#: branch.c:60
130#, c-format
131msgid "Not setting branch %s as its own upstream."
132msgstr ""
133
134#: branch.c:82
135#, c-format
136msgid "Branch %s set up to track remote branch %s from %s by rebasing."
137msgstr ""
138
139#: branch.c:83
140#, c-format
141msgid "Branch %s set up to track remote branch %s from %s."
142msgstr ""
143
144#: branch.c:87
145#, c-format
146msgid "Branch %s set up to track local branch %s by rebasing."
147msgstr ""
148
149#: branch.c:88
150#, c-format
151msgid "Branch %s set up to track local branch %s."
152msgstr ""
153
154#: branch.c:92
155#, c-format
156msgid "Branch %s set up to track remote ref %s by rebasing."
157msgstr ""
158
159#: branch.c:93
160#, c-format
161msgid "Branch %s set up to track remote ref %s."
162msgstr ""
163
164#: branch.c:97
165#, c-format
166msgid "Branch %s set up to track local ref %s by rebasing."
167msgstr ""
168
169#: branch.c:98
170#, c-format
171msgid "Branch %s set up to track local ref %s."
172msgstr ""
173
174#: branch.c:118
175#, c-format
176msgid "Tracking not set up: name too long: %s"
177msgstr ""
178
179#: branch.c:137
180#, c-format
181msgid "Not tracking: ambiguous information for ref %s"
182msgstr ""
183
184#: branch.c:182
185#, c-format
186msgid "'%s' is not a valid branch name."
187msgstr ""
188
189#: branch.c:187
190#, c-format
191msgid "A branch named '%s' already exists."
192msgstr ""
193
194#: branch.c:195
195msgid "Cannot force update the current branch."
196msgstr ""
197
Jiang Xinc138af52013-04-10 15:19:54 +0800198#: branch.c:201
199#, c-format
200msgid "Cannot setup tracking information; starting point '%s' is not a branch."
201msgstr ""
202
203#: branch.c:203
204#, c-format
205msgid "the requested upstream branch '%s' does not exist"
206msgstr ""
207
208#: branch.c:205
209msgid ""
210"\n"
211"If you are planning on basing your work on an upstream\n"
212"branch that already exists at the remote, you may need to\n"
213"run \"git fetch\" to retrieve it.\n"
214"\n"
215"If you are planning to push out a new local branch that\n"
216"will track its remote counterpart, you may want to use\n"
217"\"git push -u\" to set the upstream config as you push."
218msgstr ""
219
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800220#: branch.c:250
221#, c-format
222msgid "Not a valid object name: '%s'."
223msgstr ""
224
225#: branch.c:270
226#, c-format
227msgid "Ambiguous object name: '%s'."
228msgstr ""
229
230#: branch.c:275
231#, c-format
232msgid "Not a valid branch point: '%s'."
233msgstr ""
234
235#: branch.c:281
236msgid "Failed to lock ref for update"
237msgstr ""
238
239#: branch.c:299
240msgid "Failed to write ref"
241msgstr ""
242
Jiang Xin822e4a62012-05-08 16:10:22 +0800243#: bundle.c:36
244#, c-format
245msgid "'%s' does not look like a v2 bundle file"
246msgstr ""
247
248#: bundle.c:63
249#, c-format
250msgid "unrecognized header: %s%s (%d)"
251msgstr ""
252
Jiang Xinc138af52013-04-10 15:19:54 +0800253#: bundle.c:89 builtin/commit.c:676
Jiang Xin822e4a62012-05-08 16:10:22 +0800254#, c-format
255msgid "could not open '%s'"
256msgstr ""
257
258#: bundle.c:140
259msgid "Repository lacks these prerequisite commits:"
260msgstr ""
261
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800262#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300
263#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349
264#: builtin/shortlog.c:155
Jiang Xin822e4a62012-05-08 16:10:22 +0800265msgid "revision walk setup failed"
266msgstr ""
267
268#: bundle.c:186
269#, c-format
Jiang Xinc138af52013-04-10 15:19:54 +0800270msgid "The bundle contains this ref:"
271msgid_plural "The bundle contains these %d refs:"
Jiang Xin822e4a62012-05-08 16:10:22 +0800272msgstr[0] ""
273msgstr[1] ""
274
Jiang Xinc138af52013-04-10 15:19:54 +0800275#: bundle.c:193
Jiang Xin11b90172012-07-03 10:31:59 +0800276msgid "The bundle records a complete history."
277msgstr ""
278
279#: bundle.c:195
Jiang Xin822e4a62012-05-08 16:10:22 +0800280#, c-format
Jiang Xinc138af52013-04-10 15:19:54 +0800281msgid "The bundle requires this ref:"
282msgid_plural "The bundle requires these %d refs:"
Jiang Xin822e4a62012-05-08 16:10:22 +0800283msgstr[0] ""
284msgstr[1] ""
285
Jiang Xin11b90172012-07-03 10:31:59 +0800286#: bundle.c:294
Jiang Xin822e4a62012-05-08 16:10:22 +0800287msgid "rev-list died"
288msgstr ""
289
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800290#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258
Jiang Xin822e4a62012-05-08 16:10:22 +0800291#, c-format
292msgid "unrecognized argument: %s"
293msgstr ""
294
Jiang Xin11b90172012-07-03 10:31:59 +0800295#: bundle.c:335
Jiang Xin822e4a62012-05-08 16:10:22 +0800296#, c-format
297msgid "ref '%s' is excluded by the rev-list options"
298msgstr ""
299
Jiang Xin11b90172012-07-03 10:31:59 +0800300#: bundle.c:380
Jiang Xin822e4a62012-05-08 16:10:22 +0800301msgid "Refusing to create empty bundle."
302msgstr ""
303
Jiang Xin11b90172012-07-03 10:31:59 +0800304#: bundle.c:398
Jiang Xin822e4a62012-05-08 16:10:22 +0800305msgid "Could not spawn pack-objects"
306msgstr ""
307
Jiang Xin11b90172012-07-03 10:31:59 +0800308#: bundle.c:416
Jiang Xin822e4a62012-05-08 16:10:22 +0800309msgid "pack-objects died"
310msgstr ""
311
Jiang Xin11b90172012-07-03 10:31:59 +0800312#: bundle.c:419
Jiang Xin822e4a62012-05-08 16:10:22 +0800313#, c-format
314msgid "cannot create '%s'"
315msgstr ""
316
Jiang Xin11b90172012-07-03 10:31:59 +0800317#: bundle.c:441
Jiang Xin822e4a62012-05-08 16:10:22 +0800318msgid "index-pack died"
319msgstr ""
320
Jiang Xin9306b5b2012-10-16 08:39:10 +0800321#: commit.c:50
Jiang Xindce37b62012-02-13 14:37:59 +0800322#, c-format
323msgid "could not parse %s"
324msgstr ""
325
Jiang Xin9306b5b2012-10-16 08:39:10 +0800326#: commit.c:52
Jiang Xindce37b62012-02-13 14:37:59 +0800327#, c-format
328msgid "%s %s is not a commit!"
329msgstr ""
330
331#: compat/obstack.c:406 compat/obstack.c:408
332msgid "memory exhausted"
333msgstr ""
334
335#: connected.c:39
336msgid "Could not run 'git rev-list'"
337msgstr ""
338
339#: connected.c:48
340#, c-format
341msgid "failed write to rev-list: %s"
342msgstr ""
343
344#: connected.c:56
345#, c-format
346msgid "failed to close rev-list's stdin: %s"
347msgstr ""
348
Jiang Xin822e4a62012-05-08 16:10:22 +0800349#: date.c:95
350msgid "in the future"
351msgstr ""
352
353#: date.c:101
354#, c-format
355msgid "%lu second ago"
356msgid_plural "%lu seconds ago"
357msgstr[0] ""
358msgstr[1] ""
359
360#: date.c:108
361#, c-format
362msgid "%lu minute ago"
363msgid_plural "%lu minutes ago"
364msgstr[0] ""
365msgstr[1] ""
366
367#: date.c:115
368#, c-format
369msgid "%lu hour ago"
370msgid_plural "%lu hours ago"
371msgstr[0] ""
372msgstr[1] ""
373
374#: date.c:122
375#, c-format
376msgid "%lu day ago"
377msgid_plural "%lu days ago"
378msgstr[0] ""
379msgstr[1] ""
380
381#: date.c:128
382#, c-format
383msgid "%lu week ago"
384msgid_plural "%lu weeks ago"
385msgstr[0] ""
386msgstr[1] ""
387
388#: date.c:135
389#, c-format
390msgid "%lu month ago"
391msgid_plural "%lu months ago"
392msgstr[0] ""
393msgstr[1] ""
394
395#: date.c:146
396#, c-format
397msgid "%lu year"
398msgid_plural "%lu years"
399msgstr[0] ""
400msgstr[1] ""
401
402#: date.c:149
403#, c-format
404msgid "%s, %lu month ago"
405msgid_plural "%s, %lu months ago"
406msgstr[0] ""
407msgstr[1] ""
408
409#: date.c:154 date.c:159
410#, c-format
411msgid "%lu year ago"
412msgid_plural "%lu years ago"
413msgstr[0] ""
414msgstr[1] ""
415
Jiang Xin235537a2013-02-19 13:36:11 +0800416#: diff.c:112
Jiang Xindce37b62012-02-13 14:37:59 +0800417#, c-format
Jiang Xinfe52cd62012-11-23 14:29:02 +0800418msgid " Failed to parse dirstat cut-off percentage '%s'\n"
Jiang Xindce37b62012-02-13 14:37:59 +0800419msgstr ""
420
Jiang Xin235537a2013-02-19 13:36:11 +0800421#: diff.c:117
Jiang Xindce37b62012-02-13 14:37:59 +0800422#, c-format
Jiang Xinfe52cd62012-11-23 14:29:02 +0800423msgid " Unknown dirstat parameter '%s'\n"
Jiang Xindce37b62012-02-13 14:37:59 +0800424msgstr ""
425
Jiang Xin235537a2013-02-19 13:36:11 +0800426#: diff.c:210
Jiang Xinf9472e32012-11-30 12:41:47 +0800427#, c-format
428msgid "Unknown value for 'diff.submodule' config variable: '%s'"
429msgstr ""
430
Jiang Xin235537a2013-02-19 13:36:11 +0800431#: diff.c:260
Jiang Xindce37b62012-02-13 14:37:59 +0800432#, c-format
433msgid ""
434"Found errors in 'diff.dirstat' config variable:\n"
435"%s"
436msgstr ""
437
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800438#: diff.c:3481
Jiang Xindce37b62012-02-13 14:37:59 +0800439#, c-format
440msgid ""
441"Failed to parse --dirstat/-X option parameter:\n"
442"%s"
443msgstr ""
444
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800445#: diff.c:3495
Jiang Xinf9472e32012-11-30 12:41:47 +0800446#, c-format
447msgid "Failed to parse --submodule option parameter: '%s'"
448msgstr ""
449
Jiang Xinc138af52013-04-10 15:19:54 +0800450#: gpg-interface.c:59 gpg-interface.c:131
Jiang Xindce37b62012-02-13 14:37:59 +0800451msgid "could not run gpg."
452msgstr ""
453
454#: gpg-interface.c:71
455msgid "gpg did not accept the data"
456msgstr ""
457
458#: gpg-interface.c:82
459msgid "gpg failed to sign the data"
460msgstr ""
461
Jiang Xinc138af52013-04-10 15:19:54 +0800462#: gpg-interface.c:115
Jiang Xin9caaf232013-02-14 14:49:45 +0800463#, c-format
464msgid "could not create temporary file '%s': %s"
465msgstr ""
466
Jiang Xinc138af52013-04-10 15:19:54 +0800467#: gpg-interface.c:118
Jiang Xin9caaf232013-02-14 14:49:45 +0800468#, c-format
469msgid "failed writing detached signature to '%s': %s"
470msgstr ""
471
Jiang Xinc138af52013-04-10 15:19:54 +0800472#: grep.c:1623
Jiang Xin1d4ac882012-02-28 12:24:20 +0800473#, c-format
474msgid "'%s': unable to read %s"
475msgstr ""
476
Jiang Xinc138af52013-04-10 15:19:54 +0800477#: grep.c:1640
Jiang Xin1d4ac882012-02-28 12:24:20 +0800478#, c-format
479msgid "'%s': %s"
480msgstr ""
481
Jiang Xinc138af52013-04-10 15:19:54 +0800482#: grep.c:1651
Jiang Xin1d4ac882012-02-28 12:24:20 +0800483#, c-format
484msgid "'%s': short read %s"
485msgstr ""
486
Jiang Xin0bbe5b42012-07-30 10:24:47 +0800487#: help.c:212
Jiang Xin822e4a62012-05-08 16:10:22 +0800488#, c-format
489msgid "available git commands in '%s'"
490msgstr ""
491
Jiang Xin0bbe5b42012-07-30 10:24:47 +0800492#: help.c:219
Jiang Xin822e4a62012-05-08 16:10:22 +0800493msgid "git commands available from elsewhere on your $PATH"
494msgstr ""
495
Jiang Xin9caaf232013-02-14 14:49:45 +0800496#: help.c:235
497msgid "The most commonly used git commands are:"
498msgstr ""
499
500#: help.c:292
Jiang Xindce37b62012-02-13 14:37:59 +0800501#, c-format
502msgid ""
503"'%s' appears to be a git command, but we were not\n"
504"able to execute it. Maybe git-%s is broken?"
505msgstr ""
506
Jiang Xin9caaf232013-02-14 14:49:45 +0800507#: help.c:349
Jiang Xin822e4a62012-05-08 16:10:22 +0800508msgid "Uh oh. Your system reports no Git commands at all."
509msgstr ""
510
Jiang Xin9caaf232013-02-14 14:49:45 +0800511#: help.c:371
Jiang Xin822e4a62012-05-08 16:10:22 +0800512#, c-format
513msgid ""
514"WARNING: You called a Git command named '%s', which does not exist.\n"
515"Continuing under the assumption that you meant '%s'"
516msgstr ""
517
Jiang Xin9caaf232013-02-14 14:49:45 +0800518#: help.c:376
Jiang Xin822e4a62012-05-08 16:10:22 +0800519#, c-format
520msgid "in %0.1f seconds automatically..."
521msgstr ""
522
Jiang Xin9caaf232013-02-14 14:49:45 +0800523#: help.c:383
Jiang Xin822e4a62012-05-08 16:10:22 +0800524#, c-format
525msgid "git: '%s' is not a git command. See 'git --help'."
526msgstr ""
527
Jiang Xin9caaf232013-02-14 14:49:45 +0800528#: help.c:387
Jiang Xin822e4a62012-05-08 16:10:22 +0800529msgid ""
530"\n"
531"Did you mean this?"
532msgid_plural ""
533"\n"
534"Did you mean one of these?"
535msgstr[0] ""
536msgstr[1] ""
537
Jiang Xinfe52cd62012-11-23 14:29:02 +0800538#: merge.c:56
539msgid "failed to read the cache"
540msgstr ""
541
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800542#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
543#: builtin/clone.c:645
Jiang Xinfe52cd62012-11-23 14:29:02 +0800544msgid "unable to write new index file"
545msgstr ""
546
Jiang Xin3b6137f2012-08-02 09:35:23 +0800547#: merge-recursive.c:190
548#, c-format
549msgid "(bad commit)\n"
550msgstr ""
551
552#: merge-recursive.c:206
553#, c-format
554msgid "addinfo_cache failed for path '%s'"
555msgstr ""
556
557#: merge-recursive.c:268
558msgid "error building trees"
559msgstr ""
560
Jiang Xinccfca8d2012-09-05 06:20:57 +0800561#: merge-recursive.c:672
Jiang Xin3b6137f2012-08-02 09:35:23 +0800562#, c-format
563msgid "failed to create path '%s'%s"
564msgstr ""
565
Jiang Xinccfca8d2012-09-05 06:20:57 +0800566#: merge-recursive.c:683
Jiang Xin3b6137f2012-08-02 09:35:23 +0800567#, c-format
568msgid "Removing %s to make room for subdirectory\n"
569msgstr ""
570
571#. something else exists
572#. .. but not some other error (who really cares what?)
Jiang Xinccfca8d2012-09-05 06:20:57 +0800573#: merge-recursive.c:697 merge-recursive.c:718
Jiang Xin3b6137f2012-08-02 09:35:23 +0800574msgid ": perhaps a D/F conflict?"
575msgstr ""
576
Jiang Xinccfca8d2012-09-05 06:20:57 +0800577#: merge-recursive.c:708
Jiang Xin3b6137f2012-08-02 09:35:23 +0800578#, c-format
579msgid "refusing to lose untracked file at '%s'"
580msgstr ""
581
Jiang Xinccfca8d2012-09-05 06:20:57 +0800582#: merge-recursive.c:748
Jiang Xin3b6137f2012-08-02 09:35:23 +0800583#, c-format
584msgid "cannot read object %s '%s'"
585msgstr ""
586
Jiang Xinccfca8d2012-09-05 06:20:57 +0800587#: merge-recursive.c:750
Jiang Xin3b6137f2012-08-02 09:35:23 +0800588#, c-format
589msgid "blob expected for %s '%s'"
590msgstr ""
591
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800592#: merge-recursive.c:773 builtin/clone.c:313
Jiang Xin3b6137f2012-08-02 09:35:23 +0800593#, c-format
594msgid "failed to open '%s'"
595msgstr ""
596
Jiang Xinccfca8d2012-09-05 06:20:57 +0800597#: merge-recursive.c:781
Jiang Xin3b6137f2012-08-02 09:35:23 +0800598#, c-format
599msgid "failed to symlink '%s'"
600msgstr ""
601
Jiang Xinccfca8d2012-09-05 06:20:57 +0800602#: merge-recursive.c:784
Jiang Xin3b6137f2012-08-02 09:35:23 +0800603#, c-format
604msgid "do not know what to do with %06o %s '%s'"
605msgstr ""
606
Jiang Xincc760112012-09-15 10:26:13 +0800607#: merge-recursive.c:922
Jiang Xin3b6137f2012-08-02 09:35:23 +0800608msgid "Failed to execute internal merge"
609msgstr ""
610
Jiang Xincc760112012-09-15 10:26:13 +0800611#: merge-recursive.c:926
Jiang Xin3b6137f2012-08-02 09:35:23 +0800612#, c-format
613msgid "Unable to add %s to database"
614msgstr ""
615
Jiang Xincc760112012-09-15 10:26:13 +0800616#: merge-recursive.c:942
Jiang Xin3b6137f2012-08-02 09:35:23 +0800617msgid "unsupported object type in the tree"
618msgstr ""
619
Jiang Xincc760112012-09-15 10:26:13 +0800620#: merge-recursive.c:1021 merge-recursive.c:1035
Jiang Xin3b6137f2012-08-02 09:35:23 +0800621#, c-format
622msgid ""
623"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
624"in tree."
625msgstr ""
626
Jiang Xincc760112012-09-15 10:26:13 +0800627#: merge-recursive.c:1027 merge-recursive.c:1040
Jiang Xin3b6137f2012-08-02 09:35:23 +0800628#, c-format
629msgid ""
630"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
631"in tree at %s."
632msgstr ""
633
Jiang Xincc760112012-09-15 10:26:13 +0800634#: merge-recursive.c:1081
Jiang Xin3b6137f2012-08-02 09:35:23 +0800635msgid "rename"
636msgstr ""
637
Jiang Xincc760112012-09-15 10:26:13 +0800638#: merge-recursive.c:1081
Jiang Xin3b6137f2012-08-02 09:35:23 +0800639msgid "renamed"
640msgstr ""
641
Jiang Xincc760112012-09-15 10:26:13 +0800642#: merge-recursive.c:1137
Jiang Xin3b6137f2012-08-02 09:35:23 +0800643#, c-format
644msgid "%s is a directory in %s adding as %s instead"
645msgstr ""
646
Jiang Xincc760112012-09-15 10:26:13 +0800647#: merge-recursive.c:1159
Jiang Xin3b6137f2012-08-02 09:35:23 +0800648#, c-format
649msgid ""
650"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
651"\"->\"%s\" in \"%s\"%s"
652msgstr ""
653
Jiang Xincc760112012-09-15 10:26:13 +0800654#: merge-recursive.c:1164
Jiang Xin3b6137f2012-08-02 09:35:23 +0800655msgid " (left unresolved)"
656msgstr ""
657
Jiang Xincc760112012-09-15 10:26:13 +0800658#: merge-recursive.c:1218
Jiang Xin3b6137f2012-08-02 09:35:23 +0800659#, c-format
660msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
661msgstr ""
662
Jiang Xincc760112012-09-15 10:26:13 +0800663#: merge-recursive.c:1248
Jiang Xin3b6137f2012-08-02 09:35:23 +0800664#, c-format
665msgid "Renaming %s to %s and %s to %s instead"
666msgstr ""
667
Jiang Xincc760112012-09-15 10:26:13 +0800668#: merge-recursive.c:1447
Jiang Xin3b6137f2012-08-02 09:35:23 +0800669#, c-format
670msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
671msgstr ""
672
Jiang Xincc760112012-09-15 10:26:13 +0800673#: merge-recursive.c:1457
Jiang Xin3b6137f2012-08-02 09:35:23 +0800674#, c-format
675msgid "Adding merged %s"
676msgstr ""
677
Jiang Xincc760112012-09-15 10:26:13 +0800678#: merge-recursive.c:1462 merge-recursive.c:1660
Jiang Xin3b6137f2012-08-02 09:35:23 +0800679#, c-format
680msgid "Adding as %s instead"
681msgstr ""
682
Jiang Xincc760112012-09-15 10:26:13 +0800683#: merge-recursive.c:1513
Jiang Xin3b6137f2012-08-02 09:35:23 +0800684#, c-format
685msgid "cannot read object %s"
686msgstr ""
687
Jiang Xincc760112012-09-15 10:26:13 +0800688#: merge-recursive.c:1516
Jiang Xin3b6137f2012-08-02 09:35:23 +0800689#, c-format
690msgid "object %s is not a blob"
691msgstr ""
692
Jiang Xincc760112012-09-15 10:26:13 +0800693#: merge-recursive.c:1564
Jiang Xin3b6137f2012-08-02 09:35:23 +0800694msgid "modify"
695msgstr ""
696
Jiang Xincc760112012-09-15 10:26:13 +0800697#: merge-recursive.c:1564
Jiang Xin3b6137f2012-08-02 09:35:23 +0800698msgid "modified"
699msgstr ""
700
Jiang Xincc760112012-09-15 10:26:13 +0800701#: merge-recursive.c:1574
Jiang Xin3b6137f2012-08-02 09:35:23 +0800702msgid "content"
703msgstr ""
704
Jiang Xincc760112012-09-15 10:26:13 +0800705#: merge-recursive.c:1581
Jiang Xin3b6137f2012-08-02 09:35:23 +0800706msgid "add/add"
707msgstr ""
708
Jiang Xincc760112012-09-15 10:26:13 +0800709#: merge-recursive.c:1615
Jiang Xin3b6137f2012-08-02 09:35:23 +0800710#, c-format
711msgid "Skipped %s (merged same as existing)"
712msgstr ""
713
Jiang Xincc760112012-09-15 10:26:13 +0800714#: merge-recursive.c:1629
Jiang Xin3b6137f2012-08-02 09:35:23 +0800715#, c-format
716msgid "Auto-merging %s"
717msgstr ""
718
Jiang Xinc138af52013-04-10 15:19:54 +0800719#: merge-recursive.c:1633 git-submodule.sh:1029
Jiang Xin3b6137f2012-08-02 09:35:23 +0800720msgid "submodule"
721msgstr ""
722
Jiang Xincc760112012-09-15 10:26:13 +0800723#: merge-recursive.c:1634
Jiang Xin3b6137f2012-08-02 09:35:23 +0800724#, c-format
725msgid "CONFLICT (%s): Merge conflict in %s"
726msgstr ""
727
Jiang Xincc760112012-09-15 10:26:13 +0800728#: merge-recursive.c:1724
Jiang Xin3b6137f2012-08-02 09:35:23 +0800729#, c-format
730msgid "Removing %s"
731msgstr ""
732
Jiang Xincc760112012-09-15 10:26:13 +0800733#: merge-recursive.c:1749
Jiang Xin3b6137f2012-08-02 09:35:23 +0800734msgid "file/directory"
735msgstr ""
736
Jiang Xincc760112012-09-15 10:26:13 +0800737#: merge-recursive.c:1755
Jiang Xin3b6137f2012-08-02 09:35:23 +0800738msgid "directory/file"
739msgstr ""
740
Jiang Xincc760112012-09-15 10:26:13 +0800741#: merge-recursive.c:1760
Jiang Xin3b6137f2012-08-02 09:35:23 +0800742#, c-format
743msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
744msgstr ""
745
Jiang Xincc760112012-09-15 10:26:13 +0800746#: merge-recursive.c:1770
Jiang Xin3b6137f2012-08-02 09:35:23 +0800747#, c-format
748msgid "Adding %s"
749msgstr ""
750
Jiang Xincc760112012-09-15 10:26:13 +0800751#: merge-recursive.c:1787
Jiang Xin3b6137f2012-08-02 09:35:23 +0800752msgid "Fatal merge failure, shouldn't happen."
753msgstr ""
754
Jiang Xincc760112012-09-15 10:26:13 +0800755#: merge-recursive.c:1806
Jiang Xin3b6137f2012-08-02 09:35:23 +0800756msgid "Already up-to-date!"
757msgstr ""
758
Jiang Xincc760112012-09-15 10:26:13 +0800759#: merge-recursive.c:1815
Jiang Xin3b6137f2012-08-02 09:35:23 +0800760#, c-format
761msgid "merging of trees %s and %s failed"
762msgstr ""
763
Jiang Xincc760112012-09-15 10:26:13 +0800764#: merge-recursive.c:1845
Jiang Xin3b6137f2012-08-02 09:35:23 +0800765#, c-format
766msgid "Unprocessed path??? %s"
767msgstr ""
768
Jiang Xincc760112012-09-15 10:26:13 +0800769#: merge-recursive.c:1890
Jiang Xin3b6137f2012-08-02 09:35:23 +0800770msgid "Merging:"
771msgstr ""
772
Jiang Xincc760112012-09-15 10:26:13 +0800773#: merge-recursive.c:1903
Jiang Xin3b6137f2012-08-02 09:35:23 +0800774#, c-format
Jiang Xinbb2ba062012-08-06 23:48:08 +0800775msgid "found %u common ancestor:"
776msgid_plural "found %u common ancestors:"
777msgstr[0] ""
778msgstr[1] ""
Jiang Xin3b6137f2012-08-02 09:35:23 +0800779
Jiang Xincc760112012-09-15 10:26:13 +0800780#: merge-recursive.c:1940
Jiang Xin3b6137f2012-08-02 09:35:23 +0800781msgid "merge returned no commit"
782msgstr ""
783
Jiang Xincc760112012-09-15 10:26:13 +0800784#: merge-recursive.c:1997
Jiang Xin3b6137f2012-08-02 09:35:23 +0800785#, c-format
786msgid "Could not parse object '%s'"
787msgstr ""
788
Jiang Xinc138af52013-04-10 15:19:54 +0800789#: merge-recursive.c:2009 builtin/merge.c:658
Jiang Xin3b6137f2012-08-02 09:35:23 +0800790msgid "Unable to write index."
791msgstr ""
792
Jiang Xinc138af52013-04-10 15:19:54 +0800793#: object.c:195
794#, c-format
795msgid "unable to parse object: %s"
796msgstr ""
797
Jiang Xin235537a2013-02-19 13:36:11 +0800798#: parse-options.c:489
Jiang Xin6f6731e2012-05-21 09:00:39 +0800799msgid "..."
800msgstr ""
801
Jiang Xin235537a2013-02-19 13:36:11 +0800802#: parse-options.c:507
Jiang Xin6f6731e2012-05-21 09:00:39 +0800803#, c-format
804msgid "usage: %s"
805msgstr ""
806
807#. TRANSLATORS: the colon here should align with the
808#. one in "usage: %s" translation
Jiang Xin235537a2013-02-19 13:36:11 +0800809#: parse-options.c:511
Jiang Xin6f6731e2012-05-21 09:00:39 +0800810#, c-format
811msgid " or: %s"
812msgstr ""
813
Jiang Xin235537a2013-02-19 13:36:11 +0800814#: parse-options.c:514
Jiang Xin6f6731e2012-05-21 09:00:39 +0800815#, c-format
816msgid " %s"
817msgstr ""
818
Jiang Xin235537a2013-02-19 13:36:11 +0800819#: parse-options.c:548
820msgid "-NUM"
821msgstr ""
822
Jiang Xin9caaf232013-02-14 14:49:45 +0800823#: pathspec.c:83
824#, c-format
825msgid "Path '%s' is in submodule '%.*s'"
826msgstr ""
827
828#: pathspec.c:99
829#, c-format
830msgid "'%s' is beyond a symbolic link"
831msgstr ""
832
Jiang Xinc138af52013-04-10 15:19:54 +0800833#: remote.c:1781
Jiang Xindce37b62012-02-13 14:37:59 +0800834#, c-format
835msgid "Your branch is ahead of '%s' by %d commit.\n"
836msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
837msgstr[0] ""
838msgstr[1] ""
839
Jiang Xinc138af52013-04-10 15:19:54 +0800840#: remote.c:1787
Jiang Xinf9472e32012-11-30 12:41:47 +0800841msgid " (use \"git push\" to publish your local commits)\n"
842msgstr ""
843
Jiang Xinc138af52013-04-10 15:19:54 +0800844#: remote.c:1790
Jiang Xindce37b62012-02-13 14:37:59 +0800845#, c-format
846msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
847msgid_plural ""
848"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
849msgstr[0] ""
850msgstr[1] ""
851
Jiang Xinc138af52013-04-10 15:19:54 +0800852#: remote.c:1798
Jiang Xinf9472e32012-11-30 12:41:47 +0800853msgid " (use \"git pull\" to update your local branch)\n"
854msgstr ""
855
Jiang Xinc138af52013-04-10 15:19:54 +0800856#: remote.c:1801
Jiang Xindce37b62012-02-13 14:37:59 +0800857#, c-format
858msgid ""
859"Your branch and '%s' have diverged,\n"
860"and have %d and %d different commit each, respectively.\n"
861msgid_plural ""
862"Your branch and '%s' have diverged,\n"
863"and have %d and %d different commits each, respectively.\n"
864msgstr[0] ""
865msgstr[1] ""
866
Jiang Xinc138af52013-04-10 15:19:54 +0800867#: remote.c:1811
Jiang Xinf9472e32012-11-30 12:41:47 +0800868msgid " (use \"git pull\" to merge the remote branch into yours)\n"
869msgstr ""
870
Jiang Xinc138af52013-04-10 15:19:54 +0800871#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999
872#: builtin/merge.c:1009
Jiang Xindce37b62012-02-13 14:37:59 +0800873#, c-format
874msgid "Could not open '%s' for writing"
875msgstr ""
876
Jiang Xinc138af52013-04-10 15:19:54 +0800877#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779
878#: builtin/merge.c:1001 builtin/merge.c:1014
Jiang Xindce37b62012-02-13 14:37:59 +0800879#, c-format
880msgid "Could not write to '%s'"
881msgstr ""
882
Jiang Xinc138af52013-04-10 15:19:54 +0800883#: sequencer.c:229
Jiang Xin2b911f82012-03-08 10:20:20 +0800884msgid ""
885"after resolving the conflicts, mark the corrected paths\n"
886"with 'git add <paths>' or 'git rm <paths>'"
887msgstr ""
888
Jiang Xinc138af52013-04-10 15:19:54 +0800889#: sequencer.c:232
Jiang Xindce37b62012-02-13 14:37:59 +0800890msgid ""
891"after resolving the conflicts, mark the corrected paths\n"
892"with 'git add <paths>' or 'git rm <paths>'\n"
893"and commit the result with 'git commit'"
894msgstr ""
895
Jiang Xinc138af52013-04-10 15:19:54 +0800896#: sequencer.c:245 sequencer.c:859 sequencer.c:942
Jiang Xindce37b62012-02-13 14:37:59 +0800897#, c-format
898msgid "Could not write to %s"
899msgstr ""
900
Jiang Xinc138af52013-04-10 15:19:54 +0800901#: sequencer.c:248
Jiang Xindce37b62012-02-13 14:37:59 +0800902#, c-format
903msgid "Error wrapping up %s"
904msgstr ""
905
Jiang Xinc138af52013-04-10 15:19:54 +0800906#: sequencer.c:263
Jiang Xindce37b62012-02-13 14:37:59 +0800907msgid "Your local changes would be overwritten by cherry-pick."
908msgstr ""
909
Jiang Xinc138af52013-04-10 15:19:54 +0800910#: sequencer.c:265
Jiang Xindce37b62012-02-13 14:37:59 +0800911msgid "Your local changes would be overwritten by revert."
912msgstr ""
913
Jiang Xinc138af52013-04-10 15:19:54 +0800914#: sequencer.c:268
Jiang Xindce37b62012-02-13 14:37:59 +0800915msgid "Commit your changes or stash them to proceed."
916msgstr ""
917
918#. TRANSLATORS: %s will be "revert" or "cherry-pick"
Jiang Xinc138af52013-04-10 15:19:54 +0800919#: sequencer.c:319
Jiang Xindce37b62012-02-13 14:37:59 +0800920#, c-format
921msgid "%s: Unable to write new index file"
922msgstr ""
923
Jiang Xinc138af52013-04-10 15:19:54 +0800924#: sequencer.c:350
Jiang Xin822e4a62012-05-08 16:10:22 +0800925msgid "Could not resolve HEAD commit\n"
926msgstr ""
927
Jiang Xinc138af52013-04-10 15:19:54 +0800928#: sequencer.c:371
Jiang Xin822e4a62012-05-08 16:10:22 +0800929msgid "Unable to update cache tree\n"
930msgstr ""
931
Jiang Xinc138af52013-04-10 15:19:54 +0800932#: sequencer.c:416
Jiang Xin822e4a62012-05-08 16:10:22 +0800933#, c-format
Jiang Xin9306b5b2012-10-16 08:39:10 +0800934msgid "Could not parse commit %s\n"
935msgstr ""
936
Jiang Xinc138af52013-04-10 15:19:54 +0800937#: sequencer.c:421
Jiang Xin9306b5b2012-10-16 08:39:10 +0800938#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +0800939msgid "Could not parse parent commit %s\n"
940msgstr ""
941
Jiang Xinc138af52013-04-10 15:19:54 +0800942#: sequencer.c:487
Jiang Xindce37b62012-02-13 14:37:59 +0800943msgid "Your index file is unmerged."
944msgstr ""
945
Jiang Xinc138af52013-04-10 15:19:54 +0800946#: sequencer.c:506
Jiang Xindce37b62012-02-13 14:37:59 +0800947#, c-format
948msgid "Commit %s is a merge but no -m option was given."
949msgstr ""
950
Jiang Xinc138af52013-04-10 15:19:54 +0800951#: sequencer.c:514
Jiang Xindce37b62012-02-13 14:37:59 +0800952#, c-format
953msgid "Commit %s does not have parent %d"
954msgstr ""
955
Jiang Xinc138af52013-04-10 15:19:54 +0800956#: sequencer.c:518
Jiang Xindce37b62012-02-13 14:37:59 +0800957#, c-format
958msgid "Mainline was specified but commit %s is not a merge."
959msgstr ""
960
961#. TRANSLATORS: The first %s will be "revert" or
962#. "cherry-pick", the second %s a SHA1
Jiang Xinc138af52013-04-10 15:19:54 +0800963#: sequencer.c:531
Jiang Xindce37b62012-02-13 14:37:59 +0800964#, c-format
965msgid "%s: cannot parse parent commit %s"
966msgstr ""
967
Jiang Xinc138af52013-04-10 15:19:54 +0800968#: sequencer.c:535
Jiang Xindce37b62012-02-13 14:37:59 +0800969#, c-format
970msgid "Cannot get commit message for %s"
971msgstr ""
972
Jiang Xinc138af52013-04-10 15:19:54 +0800973#: sequencer.c:621
Jiang Xindce37b62012-02-13 14:37:59 +0800974#, c-format
975msgid "could not revert %s... %s"
976msgstr ""
977
Jiang Xinc138af52013-04-10 15:19:54 +0800978#: sequencer.c:622
Jiang Xindce37b62012-02-13 14:37:59 +0800979#, c-format
980msgid "could not apply %s... %s"
981msgstr ""
982
Jiang Xinc138af52013-04-10 15:19:54 +0800983#: sequencer.c:654
Jiang Xindce37b62012-02-13 14:37:59 +0800984msgid "empty commit set passed"
985msgstr ""
986
Jiang Xin46bc4032013-01-25 12:33:58 +0800987#: sequencer.c:662
Jiang Xindce37b62012-02-13 14:37:59 +0800988#, c-format
Jiang Xinc138af52013-04-10 15:19:54 +0800989msgid "git %s: failed to read the index"
Jiang Xindce37b62012-02-13 14:37:59 +0800990msgstr ""
991
Jiang Xin46bc4032013-01-25 12:33:58 +0800992#: sequencer.c:667
Jiang Xinc138af52013-04-10 15:19:54 +0800993#, c-format
994msgid "git %s: failed to refresh the index"
995msgstr ""
996
997#: sequencer.c:725
998#, c-format
999msgid "Cannot %s during a %s"
1000msgstr ""
1001
1002#: sequencer.c:747
1003#, c-format
1004msgid "Could not parse line %d."
1005msgstr ""
1006
1007#: sequencer.c:752
Jiang Xindce37b62012-02-13 14:37:59 +08001008msgid "No commits parsed."
1009msgstr ""
1010
Jiang Xinc138af52013-04-10 15:19:54 +08001011#: sequencer.c:765
Jiang Xindce37b62012-02-13 14:37:59 +08001012#, c-format
Jiang Xin46bc4032013-01-25 12:33:58 +08001013msgid "Could not open %s"
1014msgstr ""
1015
Jiang Xinc138af52013-04-10 15:19:54 +08001016#: sequencer.c:769
Jiang Xin46bc4032013-01-25 12:33:58 +08001017#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08001018msgid "Could not read %s."
1019msgstr ""
1020
Jiang Xinc138af52013-04-10 15:19:54 +08001021#: sequencer.c:776
Jiang Xindce37b62012-02-13 14:37:59 +08001022#, c-format
1023msgid "Unusable instruction sheet: %s"
1024msgstr ""
1025
Jiang Xinc138af52013-04-10 15:19:54 +08001026#: sequencer.c:804
Jiang Xindce37b62012-02-13 14:37:59 +08001027#, c-format
1028msgid "Invalid key: %s"
1029msgstr ""
1030
Jiang Xinc138af52013-04-10 15:19:54 +08001031#: sequencer.c:807
Jiang Xindce37b62012-02-13 14:37:59 +08001032#, c-format
1033msgid "Invalid value for %s: %s"
1034msgstr ""
1035
Jiang Xinc138af52013-04-10 15:19:54 +08001036#: sequencer.c:819
Jiang Xindce37b62012-02-13 14:37:59 +08001037#, c-format
1038msgid "Malformed options sheet: %s"
1039msgstr ""
1040
Jiang Xinc138af52013-04-10 15:19:54 +08001041#: sequencer.c:840
Jiang Xindce37b62012-02-13 14:37:59 +08001042msgid "a cherry-pick or revert is already in progress"
1043msgstr ""
1044
Jiang Xinc138af52013-04-10 15:19:54 +08001045#: sequencer.c:841
Jiang Xindce37b62012-02-13 14:37:59 +08001046msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1047msgstr ""
1048
Jiang Xinc138af52013-04-10 15:19:54 +08001049#: sequencer.c:845
Jiang Xindce37b62012-02-13 14:37:59 +08001050#, c-format
1051msgid "Could not create sequencer directory %s"
1052msgstr ""
1053
Jiang Xinc138af52013-04-10 15:19:54 +08001054#: sequencer.c:861 sequencer.c:946
Jiang Xindce37b62012-02-13 14:37:59 +08001055#, c-format
1056msgid "Error wrapping up %s."
1057msgstr ""
1058
Jiang Xinc138af52013-04-10 15:19:54 +08001059#: sequencer.c:880 sequencer.c:1014
Jiang Xindce37b62012-02-13 14:37:59 +08001060msgid "no cherry-pick or revert in progress"
1061msgstr ""
1062
Jiang Xinc138af52013-04-10 15:19:54 +08001063#: sequencer.c:882
Jiang Xindce37b62012-02-13 14:37:59 +08001064msgid "cannot resolve HEAD"
1065msgstr ""
1066
Jiang Xinc138af52013-04-10 15:19:54 +08001067#: sequencer.c:884
Jiang Xindce37b62012-02-13 14:37:59 +08001068msgid "cannot abort from a branch yet to be born"
1069msgstr ""
1070
Jiang Xinc138af52013-04-10 15:19:54 +08001071#: sequencer.c:906 builtin/apply.c:4060
Jiang Xindce37b62012-02-13 14:37:59 +08001072#, c-format
1073msgid "cannot open %s: %s"
1074msgstr ""
1075
Jiang Xinc138af52013-04-10 15:19:54 +08001076#: sequencer.c:909
Jiang Xindce37b62012-02-13 14:37:59 +08001077#, c-format
1078msgid "cannot read %s: %s"
1079msgstr ""
1080
Jiang Xinc138af52013-04-10 15:19:54 +08001081#: sequencer.c:910
Jiang Xindce37b62012-02-13 14:37:59 +08001082msgid "unexpected end of file"
1083msgstr ""
1084
Jiang Xinc138af52013-04-10 15:19:54 +08001085#: sequencer.c:916
Jiang Xindce37b62012-02-13 14:37:59 +08001086#, c-format
1087msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1088msgstr ""
1089
Jiang Xinc138af52013-04-10 15:19:54 +08001090#: sequencer.c:939
Jiang Xindce37b62012-02-13 14:37:59 +08001091#, c-format
1092msgid "Could not format %s."
1093msgstr ""
1094
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001095#: sequencer.c:1083
1096#, c-format
1097msgid "%s: can't cherry-pick a %s"
1098msgstr ""
1099
1100#: sequencer.c:1085
1101#, c-format
1102msgid "%s: bad revision"
1103msgstr ""
1104
1105#: sequencer.c:1119
Jiang Xindce37b62012-02-13 14:37:59 +08001106msgid "Can't revert as initial commit"
1107msgstr ""
1108
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001109#: sequencer.c:1120
Jiang Xindce37b62012-02-13 14:37:59 +08001110msgid "Can't cherry-pick into empty head"
1111msgstr ""
1112
Jiang Xinc138af52013-04-10 15:19:54 +08001113#: sha1_name.c:1036
Jiang Xincd1e7482012-04-28 20:27:01 +08001114msgid "HEAD does not point to a branch"
1115msgstr ""
1116
Jiang Xinc138af52013-04-10 15:19:54 +08001117#: sha1_name.c:1039
Jiang Xincd1e7482012-04-28 20:27:01 +08001118#, c-format
1119msgid "No such branch: '%s'"
1120msgstr ""
1121
Jiang Xinc138af52013-04-10 15:19:54 +08001122#: sha1_name.c:1041
Jiang Xincd1e7482012-04-28 20:27:01 +08001123#, c-format
1124msgid "No upstream configured for branch '%s'"
1125msgstr ""
1126
Jiang Xinc138af52013-04-10 15:19:54 +08001127#: sha1_name.c:1044
Jiang Xincd1e7482012-04-28 20:27:01 +08001128#, c-format
1129msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1130msgstr ""
1131
Jiang Xincc760112012-09-15 10:26:13 +08001132#: wrapper.c:408
1133#, c-format
1134msgid "unable to access '%s': %s"
1135msgstr ""
1136
Jiang Xin46bc4032013-01-25 12:33:58 +08001137#: wrapper.c:423
1138#, c-format
1139msgid "unable to access '%s'"
1140msgstr ""
1141
1142#: wrapper.c:434
Jiang Xin75f7b4b2012-06-02 07:07:27 +08001143#, c-format
1144msgid "unable to look up current user in the passwd file: %s"
1145msgstr ""
1146
Jiang Xin46bc4032013-01-25 12:33:58 +08001147#: wrapper.c:435
Jiang Xin75f7b4b2012-06-02 07:07:27 +08001148msgid "no such user"
1149msgstr ""
1150
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001151#: wt-status.c:140
Jiang Xindce37b62012-02-13 14:37:59 +08001152msgid "Unmerged paths:"
1153msgstr ""
1154
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001155#: wt-status.c:167 wt-status.c:194
Jiang Xindce37b62012-02-13 14:37:59 +08001156#, c-format
1157msgid " (use \"git reset %s <file>...\" to unstage)"
1158msgstr ""
1159
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001160#: wt-status.c:169 wt-status.c:196
Jiang Xindce37b62012-02-13 14:37:59 +08001161msgid " (use \"git rm --cached <file>...\" to unstage)"
1162msgstr ""
1163
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001164#: wt-status.c:173
Jiang Xin11b90172012-07-03 10:31:59 +08001165msgid " (use \"git add <file>...\" to mark resolution)"
1166msgstr ""
1167
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001168#: wt-status.c:175 wt-status.c:179
Jiang Xindce37b62012-02-13 14:37:59 +08001169msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1170msgstr ""
1171
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001172#: wt-status.c:177
Jiang Xin11b90172012-07-03 10:31:59 +08001173msgid " (use \"git rm <file>...\" to mark resolution)"
1174msgstr ""
1175
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001176#: wt-status.c:188
Jiang Xindce37b62012-02-13 14:37:59 +08001177msgid "Changes to be committed:"
1178msgstr ""
1179
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001180#: wt-status.c:206
Jiang Xindce37b62012-02-13 14:37:59 +08001181msgid "Changes not staged for commit:"
1182msgstr ""
1183
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001184#: wt-status.c:210
Jiang Xindce37b62012-02-13 14:37:59 +08001185msgid " (use \"git add <file>...\" to update what will be committed)"
1186msgstr ""
1187
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001188#: wt-status.c:212
Jiang Xindce37b62012-02-13 14:37:59 +08001189msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1190msgstr ""
1191
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001192#: wt-status.c:213
Jiang Xindce37b62012-02-13 14:37:59 +08001193msgid ""
1194" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1195msgstr ""
1196
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001197#: wt-status.c:215
Jiang Xindce37b62012-02-13 14:37:59 +08001198msgid " (commit or discard the untracked or modified content in submodules)"
1199msgstr ""
1200
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001201#: wt-status.c:227
Jiang Xindce37b62012-02-13 14:37:59 +08001202#, c-format
1203msgid " (use \"git %s <file>...\" to include in what will be committed)"
1204msgstr ""
1205
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001206#: wt-status.c:244
Jiang Xindce37b62012-02-13 14:37:59 +08001207msgid "bug"
1208msgstr ""
1209
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001210#: wt-status.c:249
Jiang Xindce37b62012-02-13 14:37:59 +08001211msgid "both deleted:"
1212msgstr ""
1213
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001214#: wt-status.c:250
Jiang Xindce37b62012-02-13 14:37:59 +08001215msgid "added by us:"
1216msgstr ""
1217
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001218#: wt-status.c:251
Jiang Xindce37b62012-02-13 14:37:59 +08001219msgid "deleted by them:"
1220msgstr ""
1221
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001222#: wt-status.c:252
Jiang Xindce37b62012-02-13 14:37:59 +08001223msgid "added by them:"
1224msgstr ""
1225
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001226#: wt-status.c:253
Jiang Xindce37b62012-02-13 14:37:59 +08001227msgid "deleted by us:"
1228msgstr ""
1229
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001230#: wt-status.c:254
Jiang Xindce37b62012-02-13 14:37:59 +08001231msgid "both added:"
1232msgstr ""
1233
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001234#: wt-status.c:255
Jiang Xindce37b62012-02-13 14:37:59 +08001235msgid "both modified:"
1236msgstr ""
1237
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001238#: wt-status.c:285
Jiang Xindce37b62012-02-13 14:37:59 +08001239msgid "new commits, "
1240msgstr ""
1241
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001242#: wt-status.c:287
Jiang Xindce37b62012-02-13 14:37:59 +08001243msgid "modified content, "
1244msgstr ""
1245
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001246#: wt-status.c:289
Jiang Xindce37b62012-02-13 14:37:59 +08001247msgid "untracked content, "
1248msgstr ""
1249
Jiang Xinc138af52013-04-10 15:19:54 +08001250#: wt-status.c:306
Jiang Xindce37b62012-02-13 14:37:59 +08001251#, c-format
1252msgid "new file: %s"
1253msgstr ""
1254
Jiang Xinc138af52013-04-10 15:19:54 +08001255#: wt-status.c:309
Jiang Xindce37b62012-02-13 14:37:59 +08001256#, c-format
1257msgid "copied: %s -> %s"
1258msgstr ""
1259
Jiang Xinc138af52013-04-10 15:19:54 +08001260#: wt-status.c:312
Jiang Xindce37b62012-02-13 14:37:59 +08001261#, c-format
1262msgid "deleted: %s"
1263msgstr ""
1264
Jiang Xinc138af52013-04-10 15:19:54 +08001265#: wt-status.c:315
Jiang Xindce37b62012-02-13 14:37:59 +08001266#, c-format
1267msgid "modified: %s"
1268msgstr ""
1269
Jiang Xinc138af52013-04-10 15:19:54 +08001270#: wt-status.c:318
Jiang Xindce37b62012-02-13 14:37:59 +08001271#, c-format
1272msgid "renamed: %s -> %s"
1273msgstr ""
1274
Jiang Xinc138af52013-04-10 15:19:54 +08001275#: wt-status.c:321
Jiang Xindce37b62012-02-13 14:37:59 +08001276#, c-format
1277msgid "typechange: %s"
1278msgstr ""
1279
Jiang Xinc138af52013-04-10 15:19:54 +08001280#: wt-status.c:324
Jiang Xindce37b62012-02-13 14:37:59 +08001281#, c-format
1282msgid "unknown: %s"
1283msgstr ""
1284
Jiang Xinc138af52013-04-10 15:19:54 +08001285#: wt-status.c:327
Jiang Xindce37b62012-02-13 14:37:59 +08001286#, c-format
1287msgid "unmerged: %s"
1288msgstr ""
1289
Jiang Xinc138af52013-04-10 15:19:54 +08001290#: wt-status.c:330
Jiang Xindce37b62012-02-13 14:37:59 +08001291#, c-format
1292msgid "bug: unhandled diff status %c"
1293msgstr ""
1294
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001295#: wt-status.c:803
Jiang Xin11b90172012-07-03 10:31:59 +08001296msgid "You have unmerged paths."
1297msgstr ""
1298
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001299#: wt-status.c:806 wt-status.c:958
Jiang Xin11b90172012-07-03 10:31:59 +08001300msgid " (fix conflicts and run \"git commit\")"
1301msgstr ""
1302
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001303#: wt-status.c:809
Jiang Xin11b90172012-07-03 10:31:59 +08001304msgid "All conflicts fixed but you are still merging."
1305msgstr ""
1306
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001307#: wt-status.c:812
Jiang Xin11b90172012-07-03 10:31:59 +08001308msgid " (use \"git commit\" to conclude merge)"
1309msgstr ""
1310
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001311#: wt-status.c:822
Jiang Xin11b90172012-07-03 10:31:59 +08001312msgid "You are in the middle of an am session."
1313msgstr ""
1314
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001315#: wt-status.c:825
Jiang Xin11b90172012-07-03 10:31:59 +08001316msgid "The current patch is empty."
1317msgstr ""
1318
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001319#: wt-status.c:829
Jiang Xin11b90172012-07-03 10:31:59 +08001320msgid " (fix conflicts and then run \"git am --resolved\")"
1321msgstr ""
1322
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001323#: wt-status.c:831
Jiang Xin11b90172012-07-03 10:31:59 +08001324msgid " (use \"git am --skip\" to skip this patch)"
1325msgstr ""
1326
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001327#: wt-status.c:833
Jiang Xin11b90172012-07-03 10:31:59 +08001328msgid " (use \"git am --abort\" to restore the original branch)"
1329msgstr ""
1330
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001331#: wt-status.c:893 wt-status.c:910
Jiang Xin235537a2013-02-19 13:36:11 +08001332#, c-format
1333msgid "You are currently rebasing branch '%s' on '%s'."
1334msgstr ""
1335
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001336#: wt-status.c:898 wt-status.c:915
Jiang Xin11b90172012-07-03 10:31:59 +08001337msgid "You are currently rebasing."
1338msgstr ""
1339
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001340#: wt-status.c:901
Jiang Xin11b90172012-07-03 10:31:59 +08001341msgid " (fix conflicts and then run \"git rebase --continue\")"
1342msgstr ""
1343
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001344#: wt-status.c:903
Jiang Xin11b90172012-07-03 10:31:59 +08001345msgid " (use \"git rebase --skip\" to skip this patch)"
1346msgstr ""
1347
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001348#: wt-status.c:905
Jiang Xin11b90172012-07-03 10:31:59 +08001349msgid " (use \"git rebase --abort\" to check out the original branch)"
1350msgstr ""
1351
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001352#: wt-status.c:918
Jiang Xin11b90172012-07-03 10:31:59 +08001353msgid " (all conflicts fixed: run \"git rebase --continue\")"
1354msgstr ""
1355
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001356#: wt-status.c:922
Jiang Xin235537a2013-02-19 13:36:11 +08001357#, c-format
1358msgid ""
1359"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1360msgstr ""
1361
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001362#: wt-status.c:927
Jiang Xin11b90172012-07-03 10:31:59 +08001363msgid "You are currently splitting a commit during a rebase."
1364msgstr ""
1365
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001366#: wt-status.c:930
Jiang Xin11b90172012-07-03 10:31:59 +08001367msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1368msgstr ""
1369
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001370#: wt-status.c:934
Jiang Xin235537a2013-02-19 13:36:11 +08001371#, c-format
1372msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1373msgstr ""
1374
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001375#: wt-status.c:939
Jiang Xin11b90172012-07-03 10:31:59 +08001376msgid "You are currently editing a commit during a rebase."
1377msgstr ""
1378
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001379#: wt-status.c:942
Jiang Xin11b90172012-07-03 10:31:59 +08001380msgid " (use \"git commit --amend\" to amend the current commit)"
1381msgstr ""
1382
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001383#: wt-status.c:944
Jiang Xin11b90172012-07-03 10:31:59 +08001384msgid ""
1385" (use \"git rebase --continue\" once you are satisfied with your changes)"
1386msgstr ""
1387
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001388#: wt-status.c:954
Jiang Xin11b90172012-07-03 10:31:59 +08001389msgid "You are currently cherry-picking."
1390msgstr ""
1391
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001392#: wt-status.c:961
Jiang Xin11b90172012-07-03 10:31:59 +08001393msgid " (all conflicts fixed: run \"git commit\")"
1394msgstr ""
1395
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001396#: wt-status.c:970
Jiang Xin235537a2013-02-19 13:36:11 +08001397#, c-format
Jiang Xinc138af52013-04-10 15:19:54 +08001398msgid "You are currently reverting commit %s."
Jiang Xin235537a2013-02-19 13:36:11 +08001399msgstr ""
1400
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001401#: wt-status.c:975
Jiang Xinc138af52013-04-10 15:19:54 +08001402msgid " (fix conflicts and run \"git revert --continue\")"
1403msgstr ""
1404
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001405#: wt-status.c:978
Jiang Xinc138af52013-04-10 15:19:54 +08001406msgid " (all conflicts fixed: run \"git revert --continue\")"
1407msgstr ""
1408
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001409#: wt-status.c:980
Jiang Xinc138af52013-04-10 15:19:54 +08001410msgid " (use \"git revert --abort\" to cancel the revert operation)"
1411msgstr ""
1412
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001413#: wt-status.c:991
Jiang Xinc138af52013-04-10 15:19:54 +08001414#, c-format
1415msgid "You are currently bisecting, started from branch '%s'."
1416msgstr ""
1417
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001418#: wt-status.c:995
Jiang Xin11b90172012-07-03 10:31:59 +08001419msgid "You are currently bisecting."
1420msgstr ""
1421
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001422#: wt-status.c:998
Jiang Xin11b90172012-07-03 10:31:59 +08001423msgid " (use \"git bisect reset\" to get back to the original branch)"
1424msgstr ""
1425
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001426#: wt-status.c:1173
Jiang Xindce37b62012-02-13 14:37:59 +08001427msgid "On branch "
1428msgstr ""
1429
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001430#: wt-status.c:1184
Jiang Xinc138af52013-04-10 15:19:54 +08001431msgid "HEAD detached at "
1432msgstr ""
1433
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001434#: wt-status.c:1186
Jiang Xinc138af52013-04-10 15:19:54 +08001435msgid "HEAD detached from "
1436msgstr ""
1437
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001438#: wt-status.c:1189
Jiang Xindce37b62012-02-13 14:37:59 +08001439msgid "Not currently on any branch."
1440msgstr ""
1441
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001442#: wt-status.c:1206
Jiang Xindce37b62012-02-13 14:37:59 +08001443msgid "Initial commit"
1444msgstr ""
1445
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001446#: wt-status.c:1220
Jiang Xincc760112012-09-15 10:26:13 +08001447msgid "Untracked files"
Jiang Xindce37b62012-02-13 14:37:59 +08001448msgstr ""
1449
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001450#: wt-status.c:1222
Jiang Xincc760112012-09-15 10:26:13 +08001451msgid "Ignored files"
Jiang Xindce37b62012-02-13 14:37:59 +08001452msgstr ""
1453
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001454#: wt-status.c:1226
Jiang Xinc138af52013-04-10 15:19:54 +08001455#, c-format
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001456msgid ""
1457"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1458"may speed it up, but you have to be careful not to forget to add\n"
1459"new files yourself (see 'git help status')."
Jiang Xinc138af52013-04-10 15:19:54 +08001460msgstr ""
1461
1462#: wt-status.c:1232
Jiang Xindce37b62012-02-13 14:37:59 +08001463#, c-format
1464msgid "Untracked files not listed%s"
1465msgstr ""
1466
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001467#: wt-status.c:1234
Jiang Xindce37b62012-02-13 14:37:59 +08001468msgid " (use -u option to show untracked files)"
1469msgstr ""
1470
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001471#: wt-status.c:1240
Jiang Xindce37b62012-02-13 14:37:59 +08001472msgid "No changes"
1473msgstr ""
1474
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001475#: wt-status.c:1245
Jiang Xindce37b62012-02-13 14:37:59 +08001476#, c-format
Jiang Xincc760112012-09-15 10:26:13 +08001477msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
Jiang Xindce37b62012-02-13 14:37:59 +08001478msgstr ""
1479
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001480#: wt-status.c:1248
Jiang Xindce37b62012-02-13 14:37:59 +08001481#, c-format
Jiang Xincc760112012-09-15 10:26:13 +08001482msgid "no changes added to commit\n"
Jiang Xindce37b62012-02-13 14:37:59 +08001483msgstr ""
1484
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001485#: wt-status.c:1251
Jiang Xindce37b62012-02-13 14:37:59 +08001486#, c-format
Jiang Xincc760112012-09-15 10:26:13 +08001487msgid ""
1488"nothing added to commit but untracked files present (use \"git add\" to "
1489"track)\n"
Jiang Xindce37b62012-02-13 14:37:59 +08001490msgstr ""
1491
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001492#: wt-status.c:1254
Jiang Xincc760112012-09-15 10:26:13 +08001493#, c-format
1494msgid "nothing added to commit but untracked files present\n"
Jiang Xindce37b62012-02-13 14:37:59 +08001495msgstr ""
1496
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001497#: wt-status.c:1257
Jiang Xincc760112012-09-15 10:26:13 +08001498#, c-format
1499msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
Jiang Xindce37b62012-02-13 14:37:59 +08001500msgstr ""
1501
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001502#: wt-status.c:1260 wt-status.c:1265
Jiang Xincc760112012-09-15 10:26:13 +08001503#, c-format
1504msgid "nothing to commit\n"
Jiang Xindce37b62012-02-13 14:37:59 +08001505msgstr ""
1506
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001507#: wt-status.c:1263
Jiang Xincc760112012-09-15 10:26:13 +08001508#, c-format
1509msgid "nothing to commit (use -u to show untracked files)\n"
1510msgstr ""
1511
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001512#: wt-status.c:1267
Jiang Xincc760112012-09-15 10:26:13 +08001513#, c-format
1514msgid "nothing to commit, working directory clean\n"
1515msgstr ""
1516
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001517#: wt-status.c:1375
Jiang Xindce37b62012-02-13 14:37:59 +08001518msgid "HEAD (no branch)"
1519msgstr ""
1520
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001521#: wt-status.c:1381
Jiang Xindce37b62012-02-13 14:37:59 +08001522msgid "Initial commit on "
1523msgstr ""
1524
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001525#: wt-status.c:1396
Jiang Xindce37b62012-02-13 14:37:59 +08001526msgid "behind "
1527msgstr ""
1528
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001529#: wt-status.c:1399 wt-status.c:1402
Jiang Xindce37b62012-02-13 14:37:59 +08001530msgid "ahead "
1531msgstr ""
1532
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001533#: wt-status.c:1404
Jiang Xindce37b62012-02-13 14:37:59 +08001534msgid ", behind "
1535msgstr ""
1536
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001537#: compat/precompose_utf8.c:58 builtin/clone.c:352
Jiang Xin9caaf232013-02-14 14:49:45 +08001538#, c-format
1539msgid "failed to unlink '%s'"
Jiang Xincc760112012-09-15 10:26:13 +08001540msgstr ""
1541
Jiang Xin9caaf232013-02-14 14:49:45 +08001542#: builtin/add.c:20
1543msgid "git add [options] [--] <pathspec>..."
1544msgstr ""
1545
Jiang Xin9caaf232013-02-14 14:49:45 +08001546#.
1547#. * To be consistent with "git add -p" and most Git
1548#. * commands, we should default to being tree-wide, but
1549#. * this is not the original behavior and can't be
1550#. * changed until users trained themselves not to type
1551#. * "git add -u" or "git add -A". For now, we warn and
Jiang Xinc138af52013-04-10 15:19:54 +08001552#. * keep the old behavior. Later, the behavior can be changed
1553#. * to tree-wide, keeping the warning for a while, and
1554#. * eventually we can drop the warning.
Jiang Xin9caaf232013-02-14 14:49:45 +08001555#.
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001556#: builtin/add.c:58
Jiang Xin9caaf232013-02-14 14:49:45 +08001557#, c-format
1558msgid ""
1559"The behavior of 'git add %s (or %s)' with no path argument from a\n"
1560"subdirectory of the tree will change in Git 2.0 and should not be used "
1561"anymore.\n"
1562"To add content for the whole tree, run:\n"
1563"\n"
1564" git add %s :/\n"
1565" (or git add %s :/)\n"
1566"\n"
1567"To restrict the command to the current directory, run:\n"
1568"\n"
1569" git add %s .\n"
1570" (or git add %s .)\n"
1571"\n"
1572"With the current Git version, the command is restricted to the current "
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001573"directory.\n"
Jiang Xin9caaf232013-02-14 14:49:45 +08001574msgstr ""
1575
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001576#: builtin/add.c:100
1577#, c-format
1578msgid ""
1579"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
1580"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
1581"Paths like '%s' that are\n"
1582"removed from your working tree are ignored with this version of Git.\n"
1583"\n"
1584"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
1585" ignores paths you removed from your working tree.\n"
1586"\n"
1587"* 'git add --all <pathspec>' will let you also record the removals.\n"
1588"\n"
1589"Run 'git status' to check the paths you removed from your working tree.\n"
1590msgstr ""
1591
1592#: builtin/add.c:144
1593#, c-format
1594msgid "unexpected diff status %c"
1595msgstr ""
1596
1597#: builtin/add.c:149 builtin/commit.c:233
1598msgid "updating files failed"
1599msgstr ""
1600
1601#: builtin/add.c:163
1602#, c-format
1603msgid "remove '%s'\n"
1604msgstr ""
1605
1606#: builtin/add.c:253
1607msgid "Unstaged changes after refreshing the index:"
1608msgstr ""
1609
1610#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275
1611#, c-format
1612msgid "pathspec '%s' did not match any files"
1613msgstr ""
1614
1615#: builtin/add.c:339
1616msgid "Could not read the index"
1617msgstr ""
1618
1619#: builtin/add.c:349
1620#, c-format
1621msgid "Could not open '%s' for writing."
1622msgstr ""
1623
1624#: builtin/add.c:353
1625msgid "Could not write patch"
1626msgstr ""
1627
1628#: builtin/add.c:358
1629#, c-format
1630msgid "Could not stat '%s'"
1631msgstr ""
1632
1633#: builtin/add.c:360
1634msgid "Empty patch. Aborted."
1635msgstr ""
1636
1637#: builtin/add.c:366
1638#, c-format
1639msgid "Could not apply '%s'"
1640msgstr ""
1641
1642#: builtin/add.c:376
1643msgid "The following paths are ignored by one of your .gitignore files:\n"
1644msgstr ""
1645
1646#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
1647#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
1648#: builtin/rm.c:206
1649msgid "dry run"
1650msgstr ""
1651
1652#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19
1653#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613
1654#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112
1655msgid "be verbose"
1656msgstr ""
1657
1658#: builtin/add.c:396
1659msgid "interactive picking"
1660msgstr ""
1661
1662#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258
1663msgid "select hunks interactively"
1664msgstr ""
1665
1666#: builtin/add.c:398
1667msgid "edit current diff and apply"
1668msgstr ""
1669
1670#: builtin/add.c:399
1671msgid "allow adding otherwise ignored files"
1672msgstr ""
1673
1674#: builtin/add.c:400
1675msgid "update tracked files"
1676msgstr ""
1677
1678#: builtin/add.c:401
1679msgid "record only the fact that the path will be added later"
1680msgstr ""
1681
1682#: builtin/add.c:402
1683msgid "add changes from all tracked and untracked files"
1684msgstr ""
1685
1686#. takes no arguments
1687#: builtin/add.c:405
1688msgid "ignore paths removed in the working tree (same as --no-all)"
1689msgstr ""
1690
1691#: builtin/add.c:407
1692msgid "don't add, only refresh the index"
1693msgstr ""
1694
1695#: builtin/add.c:408
1696msgid "just skip files which cannot be added because of errors"
1697msgstr ""
1698
1699#: builtin/add.c:409
1700msgid "check if - even missing - files are ignored in dry run"
1701msgstr ""
1702
1703#: builtin/add.c:431
1704#, c-format
1705msgid "Use -f if you really want to add them.\n"
1706msgstr ""
1707
1708#: builtin/add.c:432
1709msgid "no files added"
1710msgstr ""
1711
1712#: builtin/add.c:438
1713msgid "adding files failed"
1714msgstr ""
1715
1716#: builtin/add.c:477
Jiang Xindce37b62012-02-13 14:37:59 +08001717msgid "-A and -u are mutually incompatible"
1718msgstr ""
1719
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001720#: builtin/add.c:495
Jiang Xindce37b62012-02-13 14:37:59 +08001721msgid "Option --ignore-missing can only be used together with --dry-run"
1722msgstr ""
1723
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001724#: builtin/add.c:525
Jiang Xindce37b62012-02-13 14:37:59 +08001725#, c-format
Jiang Xincc760112012-09-15 10:26:13 +08001726msgid "Nothing specified, nothing added.\n"
1727msgstr ""
1728
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001729#: builtin/add.c:526
Jiang Xincc760112012-09-15 10:26:13 +08001730#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08001731msgid "Maybe you wanted to say 'git add .'?\n"
1732msgstr ""
1733
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001734#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204
Jiang Xinc138af52013-04-10 15:19:54 +08001735#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235
Jiang Xindce37b62012-02-13 14:37:59 +08001736msgid "index file corrupt"
1737msgstr ""
1738
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001739#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370
Jiang Xindce37b62012-02-13 14:37:59 +08001740msgid "Unable to write new index file"
1741msgstr ""
1742
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001743#: builtin/apply.c:57
Jiang Xin6f6731e2012-05-21 09:00:39 +08001744msgid "git apply [options] [<patch>...]"
1745msgstr ""
1746
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001747#: builtin/apply.c:110
Jiang Xin822e4a62012-05-08 16:10:22 +08001748#, c-format
1749msgid "unrecognized whitespace option '%s'"
1750msgstr ""
1751
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001752#: builtin/apply.c:125
Jiang Xin822e4a62012-05-08 16:10:22 +08001753#, c-format
1754msgid "unrecognized whitespace ignore option '%s'"
1755msgstr ""
1756
Jiang Xinccfca8d2012-09-05 06:20:57 +08001757#: builtin/apply.c:823
Jiang Xin822e4a62012-05-08 16:10:22 +08001758#, c-format
1759msgid "Cannot prepare timestamp regexp %s"
1760msgstr ""
1761
Jiang Xinccfca8d2012-09-05 06:20:57 +08001762#: builtin/apply.c:832
Jiang Xin822e4a62012-05-08 16:10:22 +08001763#, c-format
1764msgid "regexec returned %d for input: %s"
1765msgstr ""
1766
Jiang Xinccfca8d2012-09-05 06:20:57 +08001767#: builtin/apply.c:913
Jiang Xin822e4a62012-05-08 16:10:22 +08001768#, c-format
1769msgid "unable to find filename in patch at line %d"
1770msgstr ""
1771
Jiang Xinccfca8d2012-09-05 06:20:57 +08001772#: builtin/apply.c:945
Jiang Xin822e4a62012-05-08 16:10:22 +08001773#, c-format
1774msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1775msgstr ""
1776
Jiang Xinccfca8d2012-09-05 06:20:57 +08001777#: builtin/apply.c:949
Jiang Xin822e4a62012-05-08 16:10:22 +08001778#, c-format
Jiang Xin93329722012-05-15 06:43:03 +08001779msgid "git apply: bad git-diff - inconsistent new filename on line %d"
Jiang Xin822e4a62012-05-08 16:10:22 +08001780msgstr ""
1781
Jiang Xinccfca8d2012-09-05 06:20:57 +08001782#: builtin/apply.c:950
Jiang Xin93329722012-05-15 06:43:03 +08001783#, c-format
1784msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1785msgstr ""
1786
Jiang Xinccfca8d2012-09-05 06:20:57 +08001787#: builtin/apply.c:957
Jiang Xin822e4a62012-05-08 16:10:22 +08001788#, c-format
1789msgid "git apply: bad git-diff - expected /dev/null on line %d"
1790msgstr ""
1791
Jiang Xin9caaf232013-02-14 14:49:45 +08001792#: builtin/apply.c:1422
Jiang Xin822e4a62012-05-08 16:10:22 +08001793#, c-format
1794msgid "recount: unexpected line: %.*s"
1795msgstr ""
1796
Jiang Xin9caaf232013-02-14 14:49:45 +08001797#: builtin/apply.c:1479
Jiang Xin822e4a62012-05-08 16:10:22 +08001798#, c-format
1799msgid "patch fragment without header at line %d: %.*s"
1800msgstr ""
1801
Jiang Xin9caaf232013-02-14 14:49:45 +08001802#: builtin/apply.c:1496
Jiang Xin822e4a62012-05-08 16:10:22 +08001803#, c-format
1804msgid ""
1805"git diff header lacks filename information when removing %d leading pathname "
1806"component (line %d)"
1807msgid_plural ""
1808"git diff header lacks filename information when removing %d leading pathname "
1809"components (line %d)"
1810msgstr[0] ""
1811msgstr[1] ""
1812
Jiang Xin9caaf232013-02-14 14:49:45 +08001813#: builtin/apply.c:1656
Jiang Xin822e4a62012-05-08 16:10:22 +08001814msgid "new file depends on old contents"
1815msgstr ""
1816
Jiang Xin9caaf232013-02-14 14:49:45 +08001817#: builtin/apply.c:1658
Jiang Xin822e4a62012-05-08 16:10:22 +08001818msgid "deleted file still has contents"
1819msgstr ""
1820
Jiang Xin9caaf232013-02-14 14:49:45 +08001821#: builtin/apply.c:1684
Jiang Xin822e4a62012-05-08 16:10:22 +08001822#, c-format
1823msgid "corrupt patch at line %d"
1824msgstr ""
1825
Jiang Xin9caaf232013-02-14 14:49:45 +08001826#: builtin/apply.c:1720
Jiang Xin822e4a62012-05-08 16:10:22 +08001827#, c-format
1828msgid "new file %s depends on old contents"
1829msgstr ""
1830
Jiang Xin9caaf232013-02-14 14:49:45 +08001831#: builtin/apply.c:1722
Jiang Xin822e4a62012-05-08 16:10:22 +08001832#, c-format
1833msgid "deleted file %s still has contents"
1834msgstr ""
1835
Jiang Xin9caaf232013-02-14 14:49:45 +08001836#: builtin/apply.c:1725
Jiang Xin822e4a62012-05-08 16:10:22 +08001837#, c-format
1838msgid "** warning: file %s becomes empty but is not deleted"
1839msgstr ""
1840
Jiang Xin9caaf232013-02-14 14:49:45 +08001841#: builtin/apply.c:1871
Jiang Xin822e4a62012-05-08 16:10:22 +08001842#, c-format
1843msgid "corrupt binary patch at line %d: %.*s"
1844msgstr ""
1845
1846#. there has to be one hunk (forward hunk)
Jiang Xin9caaf232013-02-14 14:49:45 +08001847#: builtin/apply.c:1900
Jiang Xin822e4a62012-05-08 16:10:22 +08001848#, c-format
1849msgid "unrecognized binary patch at line %d"
1850msgstr ""
1851
Jiang Xin9caaf232013-02-14 14:49:45 +08001852#: builtin/apply.c:1986
Jiang Xin822e4a62012-05-08 16:10:22 +08001853#, c-format
1854msgid "patch with only garbage at line %d"
1855msgstr ""
1856
Jiang Xin9caaf232013-02-14 14:49:45 +08001857#: builtin/apply.c:2076
Jiang Xin822e4a62012-05-08 16:10:22 +08001858#, c-format
1859msgid "unable to read symlink %s"
1860msgstr ""
1861
Jiang Xin9caaf232013-02-14 14:49:45 +08001862#: builtin/apply.c:2080
Jiang Xin822e4a62012-05-08 16:10:22 +08001863#, c-format
1864msgid "unable to open or read %s"
1865msgstr ""
1866
Jiang Xinc138af52013-04-10 15:19:54 +08001867#: builtin/apply.c:2688
Jiang Xin822e4a62012-05-08 16:10:22 +08001868#, c-format
1869msgid "invalid start of line: '%c'"
1870msgstr ""
1871
Jiang Xinc138af52013-04-10 15:19:54 +08001872#: builtin/apply.c:2806
Jiang Xin822e4a62012-05-08 16:10:22 +08001873#, c-format
1874msgid "Hunk #%d succeeded at %d (offset %d line)."
1875msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1876msgstr[0] ""
1877msgstr[1] ""
1878
Jiang Xinc138af52013-04-10 15:19:54 +08001879#: builtin/apply.c:2818
Jiang Xin822e4a62012-05-08 16:10:22 +08001880#, c-format
1881msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1882msgstr ""
1883
Jiang Xinc138af52013-04-10 15:19:54 +08001884#: builtin/apply.c:2824
Jiang Xin822e4a62012-05-08 16:10:22 +08001885#, c-format
1886msgid ""
1887"while searching for:\n"
1888"%.*s"
1889msgstr ""
1890
Jiang Xinc138af52013-04-10 15:19:54 +08001891#: builtin/apply.c:2843
Jiang Xin822e4a62012-05-08 16:10:22 +08001892#, c-format
1893msgid "missing binary patch data for '%s'"
1894msgstr ""
1895
Jiang Xinc138af52013-04-10 15:19:54 +08001896#: builtin/apply.c:2946
Jiang Xin822e4a62012-05-08 16:10:22 +08001897#, c-format
1898msgid "binary patch does not apply to '%s'"
1899msgstr ""
1900
Jiang Xinc138af52013-04-10 15:19:54 +08001901#: builtin/apply.c:2952
Jiang Xin822e4a62012-05-08 16:10:22 +08001902#, c-format
1903msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1904msgstr ""
1905
Jiang Xinc138af52013-04-10 15:19:54 +08001906#: builtin/apply.c:2973
Jiang Xin822e4a62012-05-08 16:10:22 +08001907#, c-format
1908msgid "patch failed: %s:%ld"
1909msgstr ""
1910
Jiang Xinc138af52013-04-10 15:19:54 +08001911#: builtin/apply.c:3095
Jiang Xin822e4a62012-05-08 16:10:22 +08001912#, c-format
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001913msgid "cannot checkout %s"
Jiang Xin822e4a62012-05-08 16:10:22 +08001914msgstr ""
1915
Jiang Xinc138af52013-04-10 15:19:54 +08001916#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193
Jiang Xin822e4a62012-05-08 16:10:22 +08001917#, c-format
1918msgid "read of %s failed"
1919msgstr ""
1920
Jiang Xinc138af52013-04-10 15:19:54 +08001921#: builtin/apply.c:3173 builtin/apply.c:3395
Jiang Xin822e4a62012-05-08 16:10:22 +08001922#, c-format
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001923msgid "path %s has been renamed/deleted"
Jiang Xin822e4a62012-05-08 16:10:22 +08001924msgstr ""
1925
Jiang Xinc138af52013-04-10 15:19:54 +08001926#: builtin/apply.c:3254 builtin/apply.c:3409
Jiang Xin822e4a62012-05-08 16:10:22 +08001927#, c-format
1928msgid "%s: does not exist in index"
1929msgstr ""
1930
Jiang Xinc138af52013-04-10 15:19:54 +08001931#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001932#, c-format
1933msgid "%s: %s"
1934msgstr ""
1935
Jiang Xinc138af52013-04-10 15:19:54 +08001936#: builtin/apply.c:3263 builtin/apply.c:3417
Jiang Xin822e4a62012-05-08 16:10:22 +08001937#, c-format
1938msgid "%s: does not match index"
1939msgstr ""
1940
Jiang Xinc138af52013-04-10 15:19:54 +08001941#: builtin/apply.c:3365
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001942msgid "removal patch leaves file contents"
1943msgstr ""
1944
Jiang Xinc138af52013-04-10 15:19:54 +08001945#: builtin/apply.c:3434
Jiang Xin822e4a62012-05-08 16:10:22 +08001946#, c-format
Jiang Xin9caaf232013-02-14 14:49:45 +08001947msgid "%s: wrong type"
1948msgstr ""
1949
Jiang Xinc138af52013-04-10 15:19:54 +08001950#: builtin/apply.c:3436
Jiang Xin9caaf232013-02-14 14:49:45 +08001951#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +08001952msgid "%s has type %o, expected %o"
1953msgstr ""
1954
Jiang Xinc138af52013-04-10 15:19:54 +08001955#: builtin/apply.c:3537
Jiang Xin822e4a62012-05-08 16:10:22 +08001956#, c-format
1957msgid "%s: already exists in index"
1958msgstr ""
1959
Jiang Xinc138af52013-04-10 15:19:54 +08001960#: builtin/apply.c:3540
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001961#, c-format
1962msgid "%s: already exists in working directory"
1963msgstr ""
1964
Jiang Xinc138af52013-04-10 15:19:54 +08001965#: builtin/apply.c:3560
Jiang Xin822e4a62012-05-08 16:10:22 +08001966#, c-format
Jiang Xin75f7b4b2012-06-02 07:07:27 +08001967msgid "new mode (%o) of %s does not match old mode (%o)"
Jiang Xin822e4a62012-05-08 16:10:22 +08001968msgstr ""
1969
Jiang Xinc138af52013-04-10 15:19:54 +08001970#: builtin/apply.c:3565
Jiang Xin822e4a62012-05-08 16:10:22 +08001971#, c-format
Jiang Xin75f7b4b2012-06-02 07:07:27 +08001972msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1973msgstr ""
1974
Jiang Xinc138af52013-04-10 15:19:54 +08001975#: builtin/apply.c:3573
Jiang Xin75f7b4b2012-06-02 07:07:27 +08001976#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +08001977msgid "%s: patch does not apply"
1978msgstr ""
1979
Jiang Xinc138af52013-04-10 15:19:54 +08001980#: builtin/apply.c:3586
Jiang Xin822e4a62012-05-08 16:10:22 +08001981#, c-format
1982msgid "Checking patch %s..."
1983msgstr ""
1984
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001985#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124
Jiang Xin822e4a62012-05-08 16:10:22 +08001986#, c-format
1987msgid "make_cache_entry failed for path '%s'"
1988msgstr ""
1989
Jiang Xinc138af52013-04-10 15:19:54 +08001990#: builtin/apply.c:3822
Jiang Xin822e4a62012-05-08 16:10:22 +08001991#, c-format
1992msgid "unable to remove %s from index"
1993msgstr ""
1994
Jiang Xinc138af52013-04-10 15:19:54 +08001995#: builtin/apply.c:3850
Jiang Xin822e4a62012-05-08 16:10:22 +08001996#, c-format
1997msgid "corrupt patch for subproject %s"
1998msgstr ""
1999
Jiang Xinc138af52013-04-10 15:19:54 +08002000#: builtin/apply.c:3854
Jiang Xin822e4a62012-05-08 16:10:22 +08002001#, c-format
2002msgid "unable to stat newly created file '%s'"
2003msgstr ""
2004
Jiang Xinc138af52013-04-10 15:19:54 +08002005#: builtin/apply.c:3859
Jiang Xin822e4a62012-05-08 16:10:22 +08002006#, c-format
2007msgid "unable to create backing store for newly created file %s"
2008msgstr ""
2009
Jiang Xinc138af52013-04-10 15:19:54 +08002010#: builtin/apply.c:3862 builtin/apply.c:3970
Jiang Xin822e4a62012-05-08 16:10:22 +08002011#, c-format
2012msgid "unable to add cache entry for %s"
2013msgstr ""
2014
Jiang Xinc138af52013-04-10 15:19:54 +08002015#: builtin/apply.c:3895
Jiang Xin822e4a62012-05-08 16:10:22 +08002016#, c-format
2017msgid "closing file '%s'"
2018msgstr ""
2019
Jiang Xinc138af52013-04-10 15:19:54 +08002020#: builtin/apply.c:3944
Jiang Xin822e4a62012-05-08 16:10:22 +08002021#, c-format
2022msgid "unable to write file '%s' mode %o"
2023msgstr ""
2024
Jiang Xinc138af52013-04-10 15:19:54 +08002025#: builtin/apply.c:4031
Jiang Xin822e4a62012-05-08 16:10:22 +08002026#, c-format
2027msgid "Applied patch %s cleanly."
2028msgstr ""
2029
Jiang Xinc138af52013-04-10 15:19:54 +08002030#: builtin/apply.c:4039
Jiang Xin822e4a62012-05-08 16:10:22 +08002031msgid "internal error"
2032msgstr ""
2033
2034#. Say this even without --verbose
Jiang Xinc138af52013-04-10 15:19:54 +08002035#: builtin/apply.c:4042
Jiang Xin822e4a62012-05-08 16:10:22 +08002036#, c-format
2037msgid "Applying patch %%s with %d reject..."
2038msgid_plural "Applying patch %%s with %d rejects..."
2039msgstr[0] ""
2040msgstr[1] ""
2041
Jiang Xinc138af52013-04-10 15:19:54 +08002042#: builtin/apply.c:4052
Jiang Xin822e4a62012-05-08 16:10:22 +08002043#, c-format
2044msgid "truncating .rej filename to %.*s.rej"
2045msgstr ""
2046
Jiang Xinc138af52013-04-10 15:19:54 +08002047#: builtin/apply.c:4073
Jiang Xin822e4a62012-05-08 16:10:22 +08002048#, c-format
2049msgid "Hunk #%d applied cleanly."
2050msgstr ""
2051
Jiang Xinc138af52013-04-10 15:19:54 +08002052#: builtin/apply.c:4076
Jiang Xin822e4a62012-05-08 16:10:22 +08002053#, c-format
2054msgid "Rejected hunk #%d."
2055msgstr ""
2056
Jiang Xinc138af52013-04-10 15:19:54 +08002057#: builtin/apply.c:4226
Jiang Xin822e4a62012-05-08 16:10:22 +08002058msgid "unrecognized input"
2059msgstr ""
2060
Jiang Xinc138af52013-04-10 15:19:54 +08002061#: builtin/apply.c:4237
Jiang Xin822e4a62012-05-08 16:10:22 +08002062msgid "unable to read index file"
2063msgstr ""
2064
Jiang Xinc138af52013-04-10 15:19:54 +08002065#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92
Jiang Xincc760112012-09-15 10:26:13 +08002066#: builtin/fetch.c:63
Jiang Xin6f6731e2012-05-21 09:00:39 +08002067msgid "path"
2068msgstr ""
2069
Jiang Xinc138af52013-04-10 15:19:54 +08002070#: builtin/apply.c:4357
Jiang Xin6f6731e2012-05-21 09:00:39 +08002071msgid "don't apply changes matching the given path"
2072msgstr ""
2073
Jiang Xinc138af52013-04-10 15:19:54 +08002074#: builtin/apply.c:4360
Jiang Xin6f6731e2012-05-21 09:00:39 +08002075msgid "apply changes matching the given path"
2076msgstr ""
2077
Jiang Xinc138af52013-04-10 15:19:54 +08002078#: builtin/apply.c:4362
Jiang Xin6f6731e2012-05-21 09:00:39 +08002079msgid "num"
2080msgstr ""
2081
Jiang Xinc138af52013-04-10 15:19:54 +08002082#: builtin/apply.c:4363
Jiang Xin6f6731e2012-05-21 09:00:39 +08002083msgid "remove <num> leading slashes from traditional diff paths"
2084msgstr ""
2085
Jiang Xinc138af52013-04-10 15:19:54 +08002086#: builtin/apply.c:4366
Jiang Xin6f6731e2012-05-21 09:00:39 +08002087msgid "ignore additions made by the patch"
2088msgstr ""
2089
Jiang Xinc138af52013-04-10 15:19:54 +08002090#: builtin/apply.c:4368
Jiang Xin6f6731e2012-05-21 09:00:39 +08002091msgid "instead of applying the patch, output diffstat for the input"
2092msgstr ""
2093
Jiang Xinc138af52013-04-10 15:19:54 +08002094#: builtin/apply.c:4372
Jiang Xincc760112012-09-15 10:26:13 +08002095msgid "show number of added and deleted lines in decimal notation"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002096msgstr ""
2097
Jiang Xinc138af52013-04-10 15:19:54 +08002098#: builtin/apply.c:4374
Jiang Xincc760112012-09-15 10:26:13 +08002099msgid "instead of applying the patch, output a summary for the input"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002100msgstr ""
2101
Jiang Xinc138af52013-04-10 15:19:54 +08002102#: builtin/apply.c:4376
Jiang Xincc760112012-09-15 10:26:13 +08002103msgid "instead of applying the patch, see if the patch is applicable"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002104msgstr ""
2105
Jiang Xinc138af52013-04-10 15:19:54 +08002106#: builtin/apply.c:4378
Jiang Xincc760112012-09-15 10:26:13 +08002107msgid "make sure the patch is applicable to the current index"
2108msgstr ""
2109
Jiang Xinc138af52013-04-10 15:19:54 +08002110#: builtin/apply.c:4380
Jiang Xincc760112012-09-15 10:26:13 +08002111msgid "apply a patch without touching the working tree"
2112msgstr ""
2113
Jiang Xinc138af52013-04-10 15:19:54 +08002114#: builtin/apply.c:4382
Jiang Xincc760112012-09-15 10:26:13 +08002115msgid "also apply the patch (use with --stat/--summary/--check)"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002116msgstr ""
2117
Jiang Xinc138af52013-04-10 15:19:54 +08002118#: builtin/apply.c:4384
Jiang Xincc760112012-09-15 10:26:13 +08002119msgid "attempt three-way merge if a patch does not apply"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002120msgstr ""
2121
Jiang Xinc138af52013-04-10 15:19:54 +08002122#: builtin/apply.c:4386
Jiang Xincc760112012-09-15 10:26:13 +08002123msgid "build a temporary index based on embedded index information"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002124msgstr ""
2125
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002126#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456
Jiang Xincc760112012-09-15 10:26:13 +08002127msgid "paths are separated with NUL character"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002128msgstr ""
2129
Jiang Xinc138af52013-04-10 15:19:54 +08002130#: builtin/apply.c:4391
Jiang Xincc760112012-09-15 10:26:13 +08002131msgid "ensure at least <n> lines of context match"
2132msgstr ""
2133
Jiang Xinc138af52013-04-10 15:19:54 +08002134#: builtin/apply.c:4392
Jiang Xincc760112012-09-15 10:26:13 +08002135msgid "action"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002136msgstr ""
2137
Jiang Xinc138af52013-04-10 15:19:54 +08002138#: builtin/apply.c:4393
Jiang Xincc760112012-09-15 10:26:13 +08002139msgid "detect new or modified lines that have whitespace errors"
2140msgstr ""
2141
Jiang Xinc138af52013-04-10 15:19:54 +08002142#: builtin/apply.c:4396 builtin/apply.c:4399
Jiang Xincc760112012-09-15 10:26:13 +08002143msgid "ignore changes in whitespace when finding context"
2144msgstr ""
2145
Jiang Xinc138af52013-04-10 15:19:54 +08002146#: builtin/apply.c:4402
Jiang Xincc760112012-09-15 10:26:13 +08002147msgid "apply the patch in reverse"
2148msgstr ""
2149
Jiang Xinc138af52013-04-10 15:19:54 +08002150#: builtin/apply.c:4404
Jiang Xincc760112012-09-15 10:26:13 +08002151msgid "don't expect at least one line of context"
2152msgstr ""
2153
Jiang Xinc138af52013-04-10 15:19:54 +08002154#: builtin/apply.c:4406
Jiang Xincc760112012-09-15 10:26:13 +08002155msgid "leave the rejected hunks in corresponding *.rej files"
2156msgstr ""
2157
Jiang Xinc138af52013-04-10 15:19:54 +08002158#: builtin/apply.c:4408
Jiang Xincc760112012-09-15 10:26:13 +08002159msgid "allow overlapping hunks"
2160msgstr ""
2161
Jiang Xinc138af52013-04-10 15:19:54 +08002162#: builtin/apply.c:4411
Jiang Xin6f6731e2012-05-21 09:00:39 +08002163msgid "tolerate incorrectly detected missing new-line at the end of file"
2164msgstr ""
2165
Jiang Xinc138af52013-04-10 15:19:54 +08002166#: builtin/apply.c:4414
Jiang Xin6f6731e2012-05-21 09:00:39 +08002167msgid "do not trust the line counts in the hunk headers"
2168msgstr ""
2169
Jiang Xinc138af52013-04-10 15:19:54 +08002170#: builtin/apply.c:4416
Jiang Xin6f6731e2012-05-21 09:00:39 +08002171msgid "root"
2172msgstr ""
2173
Jiang Xinc138af52013-04-10 15:19:54 +08002174#: builtin/apply.c:4417
Jiang Xin6f6731e2012-05-21 09:00:39 +08002175msgid "prepend <root> to all filenames"
2176msgstr ""
2177
Jiang Xinc138af52013-04-10 15:19:54 +08002178#: builtin/apply.c:4439
Jiang Xin0bbe5b42012-07-30 10:24:47 +08002179msgid "--3way outside a repository"
2180msgstr ""
2181
Jiang Xinc138af52013-04-10 15:19:54 +08002182#: builtin/apply.c:4447
Jiang Xin822e4a62012-05-08 16:10:22 +08002183msgid "--index outside a repository"
2184msgstr ""
2185
Jiang Xinc138af52013-04-10 15:19:54 +08002186#: builtin/apply.c:4450
Jiang Xin822e4a62012-05-08 16:10:22 +08002187msgid "--cached outside a repository"
2188msgstr ""
2189
Jiang Xinc138af52013-04-10 15:19:54 +08002190#: builtin/apply.c:4466
Jiang Xin822e4a62012-05-08 16:10:22 +08002191#, c-format
2192msgid "can't open patch '%s'"
2193msgstr ""
2194
Jiang Xinc138af52013-04-10 15:19:54 +08002195#: builtin/apply.c:4480
Jiang Xin822e4a62012-05-08 16:10:22 +08002196#, c-format
2197msgid "squelched %d whitespace error"
2198msgid_plural "squelched %d whitespace errors"
2199msgstr[0] ""
2200msgstr[1] ""
2201
Jiang Xinc138af52013-04-10 15:19:54 +08002202#: builtin/apply.c:4486 builtin/apply.c:4496
Jiang Xin822e4a62012-05-08 16:10:22 +08002203#, c-format
2204msgid "%d line adds whitespace errors."
2205msgid_plural "%d lines add whitespace errors."
2206msgstr[0] ""
2207msgstr[1] ""
2208
Jiang Xindce37b62012-02-13 14:37:59 +08002209#: builtin/archive.c:17
2210#, c-format
2211msgid "could not create archive file '%s'"
2212msgstr ""
2213
2214#: builtin/archive.c:20
2215msgid "could not redirect output"
2216msgstr ""
2217
2218#: builtin/archive.c:37
2219msgid "git archive: Remote with no URL"
2220msgstr ""
2221
2222#: builtin/archive.c:58
2223msgid "git archive: expected ACK/NAK, got EOF"
2224msgstr ""
2225
Jiang Xinc138af52013-04-10 15:19:54 +08002226#: builtin/archive.c:61
Jiang Xindce37b62012-02-13 14:37:59 +08002227#, c-format
2228msgid "git archive: NACK %s"
2229msgstr ""
2230
Jiang Xinc138af52013-04-10 15:19:54 +08002231#: builtin/archive.c:63
Jiang Xindce37b62012-02-13 14:37:59 +08002232#, c-format
2233msgid "remote error: %s"
2234msgstr ""
2235
Jiang Xinc138af52013-04-10 15:19:54 +08002236#: builtin/archive.c:64
Jiang Xindce37b62012-02-13 14:37:59 +08002237msgid "git archive: protocol error"
2238msgstr ""
2239
Jiang Xinc138af52013-04-10 15:19:54 +08002240#: builtin/archive.c:68
Jiang Xindce37b62012-02-13 14:37:59 +08002241msgid "git archive: expected a flush"
2242msgstr ""
2243
Jiang Xincc760112012-09-15 10:26:13 +08002244#: builtin/bisect--helper.c:7
2245msgid "git bisect--helper --next-all [--no-checkout]"
2246msgstr ""
2247
2248#: builtin/bisect--helper.c:17
2249msgid "perform 'git bisect next'"
2250msgstr ""
2251
2252#: builtin/bisect--helper.c:19
2253msgid "update BISECT_HEAD instead of checking out the current commit"
2254msgstr ""
2255
2256#: builtin/blame.c:25
2257msgid "git blame [options] [rev-opts] [rev] [--] file"
2258msgstr ""
2259
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002260#: builtin/blame.c:30
Jiang Xincc760112012-09-15 10:26:13 +08002261msgid "[rev-opts] are documented in git-rev-list(1)"
2262msgstr ""
2263
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002264#: builtin/blame.c:2355
Jiang Xincc760112012-09-15 10:26:13 +08002265msgid "Show blame entries as we find them, incrementally"
2266msgstr ""
2267
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002268#: builtin/blame.c:2356
Jiang Xincc760112012-09-15 10:26:13 +08002269msgid "Show blank SHA-1 for boundary commits (Default: off)"
2270msgstr ""
2271
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002272#: builtin/blame.c:2357
Jiang Xincc760112012-09-15 10:26:13 +08002273msgid "Do not treat root commits as boundaries (Default: off)"
2274msgstr ""
2275
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002276#: builtin/blame.c:2358
Jiang Xincc760112012-09-15 10:26:13 +08002277msgid "Show work cost statistics"
2278msgstr ""
2279
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002280#: builtin/blame.c:2359
Jiang Xincc760112012-09-15 10:26:13 +08002281msgid "Show output score for blame entries"
2282msgstr ""
2283
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002284#: builtin/blame.c:2360
Jiang Xincc760112012-09-15 10:26:13 +08002285msgid "Show original filename (Default: auto)"
2286msgstr ""
2287
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002288#: builtin/blame.c:2361
Jiang Xincc760112012-09-15 10:26:13 +08002289msgid "Show original linenumber (Default: off)"
2290msgstr ""
2291
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002292#: builtin/blame.c:2362
Jiang Xincc760112012-09-15 10:26:13 +08002293msgid "Show in a format designed for machine consumption"
2294msgstr ""
2295
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002296#: builtin/blame.c:2363
Jiang Xincc760112012-09-15 10:26:13 +08002297msgid "Show porcelain format with per-line commit information"
2298msgstr ""
2299
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002300#: builtin/blame.c:2364
Jiang Xincc760112012-09-15 10:26:13 +08002301msgid "Use the same output mode as git-annotate (Default: off)"
2302msgstr ""
2303
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002304#: builtin/blame.c:2365
Jiang Xincc760112012-09-15 10:26:13 +08002305msgid "Show raw timestamp (Default: off)"
2306msgstr ""
2307
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002308#: builtin/blame.c:2366
Jiang Xincc760112012-09-15 10:26:13 +08002309msgid "Show long commit SHA1 (Default: off)"
2310msgstr ""
2311
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002312#: builtin/blame.c:2367
Jiang Xincc760112012-09-15 10:26:13 +08002313msgid "Suppress author name and timestamp (Default: off)"
2314msgstr ""
2315
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002316#: builtin/blame.c:2368
Jiang Xincc760112012-09-15 10:26:13 +08002317msgid "Show author email instead of name (Default: off)"
2318msgstr ""
2319
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002320#: builtin/blame.c:2369
Jiang Xincc760112012-09-15 10:26:13 +08002321msgid "Ignore whitespace differences"
2322msgstr ""
2323
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002324#: builtin/blame.c:2370
Jiang Xincc760112012-09-15 10:26:13 +08002325msgid "Spend extra cycles to find better match"
2326msgstr ""
2327
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002328#: builtin/blame.c:2371
Jiang Xincc760112012-09-15 10:26:13 +08002329msgid "Use revisions from <file> instead of calling git-rev-list"
2330msgstr ""
2331
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002332#: builtin/blame.c:2372
Jiang Xincc760112012-09-15 10:26:13 +08002333msgid "Use <file>'s contents as the final image"
2334msgstr ""
2335
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002336#: builtin/blame.c:2373 builtin/blame.c:2374
Jiang Xincc760112012-09-15 10:26:13 +08002337msgid "score"
2338msgstr ""
2339
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002340#: builtin/blame.c:2373
Jiang Xincc760112012-09-15 10:26:13 +08002341msgid "Find line copies within and across files"
2342msgstr ""
2343
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002344#: builtin/blame.c:2374
Jiang Xincc760112012-09-15 10:26:13 +08002345msgid "Find line movements within and across files"
2346msgstr ""
2347
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002348#: builtin/blame.c:2375
Jiang Xincc760112012-09-15 10:26:13 +08002349msgid "n,m"
2350msgstr ""
2351
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002352#: builtin/blame.c:2375
Jiang Xincc760112012-09-15 10:26:13 +08002353msgid "Process only line range n,m, counting from 1"
2354msgstr ""
2355
Jiang Xinc138af52013-04-10 15:19:54 +08002356#: builtin/branch.c:24
Jiang Xincc760112012-09-15 10:26:13 +08002357msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2358msgstr ""
2359
Jiang Xinc138af52013-04-10 15:19:54 +08002360#: builtin/branch.c:25
Jiang Xincc760112012-09-15 10:26:13 +08002361msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2362msgstr ""
2363
Jiang Xinc138af52013-04-10 15:19:54 +08002364#: builtin/branch.c:26
Jiang Xincc760112012-09-15 10:26:13 +08002365msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2366msgstr ""
2367
Jiang Xinc138af52013-04-10 15:19:54 +08002368#: builtin/branch.c:27
Jiang Xincc760112012-09-15 10:26:13 +08002369msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2370msgstr ""
2371
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002372#: builtin/branch.c:150
Jiang Xindce37b62012-02-13 14:37:59 +08002373#, c-format
2374msgid ""
2375"deleting branch '%s' that has been merged to\n"
2376" '%s', but not yet merged to HEAD."
2377msgstr ""
2378
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002379#: builtin/branch.c:154
Jiang Xindce37b62012-02-13 14:37:59 +08002380#, c-format
2381msgid ""
2382"not deleting branch '%s' that is not yet merged to\n"
2383" '%s', even though it is merged to HEAD."
2384msgstr ""
2385
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002386#: builtin/branch.c:168
Jiang Xindce37b62012-02-13 14:37:59 +08002387#, c-format
2388msgid "Couldn't look up commit object for '%s'"
2389msgstr ""
2390
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002391#: builtin/branch.c:172
Jiang Xindce37b62012-02-13 14:37:59 +08002392#, c-format
2393msgid ""
2394"The branch '%s' is not fully merged.\n"
2395"If you are sure you want to delete it, run 'git branch -D %s'."
2396msgstr ""
2397
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002398#: builtin/branch.c:185
Jiang Xinfe52cd62012-11-23 14:29:02 +08002399msgid "Update of config-file failed"
Jiang Xindce37b62012-02-13 14:37:59 +08002400msgstr ""
2401
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002402#: builtin/branch.c:213
Jiang Xinfe52cd62012-11-23 14:29:02 +08002403msgid "cannot use -a with -d"
Jiang Xin822e4a62012-05-08 16:10:22 +08002404msgstr ""
2405
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002406#: builtin/branch.c:219
Jiang Xinfe52cd62012-11-23 14:29:02 +08002407msgid "Couldn't look up commit object for HEAD"
2408msgstr ""
2409
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002410#: builtin/branch.c:227
Jiang Xin822e4a62012-05-08 16:10:22 +08002411#, c-format
Jiang Xinfe52cd62012-11-23 14:29:02 +08002412msgid "Cannot delete the branch '%s' which you are currently on."
Jiang Xin822e4a62012-05-08 16:10:22 +08002413msgstr ""
2414
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002415#: builtin/branch.c:240
Jiang Xin822e4a62012-05-08 16:10:22 +08002416#, c-format
Jiang Xinfe52cd62012-11-23 14:29:02 +08002417msgid "remote branch '%s' not found."
2418msgstr ""
2419
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002420#: builtin/branch.c:241
Jiang Xinfe52cd62012-11-23 14:29:02 +08002421#, c-format
2422msgid "branch '%s' not found."
2423msgstr ""
2424
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002425#: builtin/branch.c:255
Jiang Xinfe52cd62012-11-23 14:29:02 +08002426#, c-format
2427msgid "Error deleting remote branch '%s'"
2428msgstr ""
2429
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002430#: builtin/branch.c:256
Jiang Xinfe52cd62012-11-23 14:29:02 +08002431#, c-format
2432msgid "Error deleting branch '%s'"
2433msgstr ""
2434
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002435#: builtin/branch.c:263
Jiang Xinfe52cd62012-11-23 14:29:02 +08002436#, c-format
2437msgid "Deleted remote branch %s (was %s).\n"
2438msgstr ""
2439
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002440#: builtin/branch.c:264
Jiang Xinfe52cd62012-11-23 14:29:02 +08002441#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +08002442msgid "Deleted branch %s (was %s).\n"
2443msgstr ""
2444
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002445#: builtin/branch.c:366
Jiang Xindce37b62012-02-13 14:37:59 +08002446#, c-format
2447msgid "branch '%s' does not point at a commit"
2448msgstr ""
2449
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002450#: builtin/branch.c:453
Jiang Xindce37b62012-02-13 14:37:59 +08002451#, c-format
Jiang Xin93329722012-05-15 06:43:03 +08002452msgid "[%s: behind %d]"
Jiang Xindce37b62012-02-13 14:37:59 +08002453msgstr ""
2454
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002455#: builtin/branch.c:455
Jiang Xindce37b62012-02-13 14:37:59 +08002456#, c-format
Jiang Xin93329722012-05-15 06:43:03 +08002457msgid "[behind %d]"
Jiang Xindce37b62012-02-13 14:37:59 +08002458msgstr ""
2459
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002460#: builtin/branch.c:459
Jiang Xindce37b62012-02-13 14:37:59 +08002461#, c-format
Jiang Xin93329722012-05-15 06:43:03 +08002462msgid "[%s: ahead %d]"
Jiang Xindce37b62012-02-13 14:37:59 +08002463msgstr ""
2464
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002465#: builtin/branch.c:461
Jiang Xin93329722012-05-15 06:43:03 +08002466#, c-format
2467msgid "[ahead %d]"
2468msgstr ""
2469
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002470#: builtin/branch.c:464
Jiang Xin93329722012-05-15 06:43:03 +08002471#, c-format
2472msgid "[%s: ahead %d, behind %d]"
2473msgstr ""
2474
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002475#: builtin/branch.c:467
Jiang Xin93329722012-05-15 06:43:03 +08002476#, c-format
2477msgid "[ahead %d, behind %d]"
2478msgstr ""
2479
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002480#: builtin/branch.c:490
Jiang Xin9caaf232013-02-14 14:49:45 +08002481msgid " **** invalid ref ****"
2482msgstr ""
2483
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002484#: builtin/branch.c:582
Jiang Xinc138af52013-04-10 15:19:54 +08002485#, c-format
2486msgid "(no branch, rebasing %s)"
2487msgstr ""
2488
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002489#: builtin/branch.c:585
Jiang Xinc138af52013-04-10 15:19:54 +08002490#, c-format
2491msgid "(no branch, bisect started on %s)"
2492msgstr ""
2493
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002494#: builtin/branch.c:588
Jiang Xinc138af52013-04-10 15:19:54 +08002495#, c-format
2496msgid "(detached from %s)"
2497msgstr ""
2498
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002499#: builtin/branch.c:591
Jiang Xindce37b62012-02-13 14:37:59 +08002500msgid "(no branch)"
2501msgstr ""
2502
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002503#: builtin/branch.c:637
Jiang Xin9caaf232013-02-14 14:49:45 +08002504#, c-format
2505msgid "object '%s' does not point to a commit"
2506msgstr ""
2507
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002508#: builtin/branch.c:669
Jiang Xindce37b62012-02-13 14:37:59 +08002509msgid "some refs could not be read"
2510msgstr ""
2511
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002512#: builtin/branch.c:682
Jiang Xindce37b62012-02-13 14:37:59 +08002513msgid "cannot rename the current branch while not on any."
2514msgstr ""
2515
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002516#: builtin/branch.c:692
Jiang Xin2b911f82012-03-08 10:20:20 +08002517#, c-format
Jiang Xinfe52cd62012-11-23 14:29:02 +08002518msgid "Invalid branch name: '%s'"
2519msgstr ""
2520
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002521#: builtin/branch.c:707
Jiang Xinfe52cd62012-11-23 14:29:02 +08002522msgid "Branch rename failed"
2523msgstr ""
2524
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002525#: builtin/branch.c:711
Jiang Xinfe52cd62012-11-23 14:29:02 +08002526#, c-format
2527msgid "Renamed a misnamed branch '%s' away"
2528msgstr ""
2529
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002530#: builtin/branch.c:715
Jiang Xinfe52cd62012-11-23 14:29:02 +08002531#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08002532msgid "Branch renamed to %s, but HEAD is not updated!"
2533msgstr ""
2534
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002535#: builtin/branch.c:722
Jiang Xindce37b62012-02-13 14:37:59 +08002536msgid "Branch is renamed, but update of config-file failed"
2537msgstr ""
2538
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002539#: builtin/branch.c:737
Jiang Xindce37b62012-02-13 14:37:59 +08002540#, c-format
Jiang Xinc138af52013-04-10 15:19:54 +08002541msgid "malformed object name %s"
2542msgstr ""
2543
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002544#: builtin/branch.c:761
Jiang Xinc138af52013-04-10 15:19:54 +08002545#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +08002546msgid "could not write branch description template: %s"
Jiang Xindce37b62012-02-13 14:37:59 +08002547msgstr ""
2548
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002549#: builtin/branch.c:791
Jiang Xincc760112012-09-15 10:26:13 +08002550msgid "Generic options"
2551msgstr ""
2552
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002553#: builtin/branch.c:793
Jiang Xincc760112012-09-15 10:26:13 +08002554msgid "show hash and subject, give twice for upstream branch"
2555msgstr ""
2556
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002557#: builtin/branch.c:794
Jiang Xincc760112012-09-15 10:26:13 +08002558msgid "suppress informational messages"
2559msgstr ""
2560
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002561#: builtin/branch.c:795
Jiang Xincc760112012-09-15 10:26:13 +08002562msgid "set up tracking mode (see git-pull(1))"
2563msgstr ""
2564
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002565#: builtin/branch.c:797
Jiang Xincc760112012-09-15 10:26:13 +08002566msgid "change upstream info"
2567msgstr ""
2568
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002569#: builtin/branch.c:801
Jiang Xincc760112012-09-15 10:26:13 +08002570msgid "use colored output"
2571msgstr ""
2572
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002573#: builtin/branch.c:802
Jiang Xincc760112012-09-15 10:26:13 +08002574msgid "act on remote-tracking branches"
2575msgstr ""
2576
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002577#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
2578#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369
Jiang Xinc138af52013-04-10 15:19:54 +08002579#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468
Jiang Xincc760112012-09-15 10:26:13 +08002580msgid "commit"
2581msgstr ""
2582
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002583#: builtin/branch.c:806 builtin/branch.c:812
Jiang Xincc760112012-09-15 10:26:13 +08002584msgid "print only branches that contain the commit"
2585msgstr ""
2586
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002587#: builtin/branch.c:818
Jiang Xincc760112012-09-15 10:26:13 +08002588msgid "Specific git-branch actions:"
2589msgstr ""
2590
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002591#: builtin/branch.c:819
Jiang Xincc760112012-09-15 10:26:13 +08002592msgid "list both remote-tracking and local branches"
2593msgstr ""
2594
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002595#: builtin/branch.c:821
Jiang Xincc760112012-09-15 10:26:13 +08002596msgid "delete fully merged branch"
2597msgstr ""
2598
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002599#: builtin/branch.c:822
Jiang Xincc760112012-09-15 10:26:13 +08002600msgid "delete branch (even if not merged)"
2601msgstr ""
2602
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002603#: builtin/branch.c:823
Jiang Xincc760112012-09-15 10:26:13 +08002604msgid "move/rename a branch and its reflog"
2605msgstr ""
2606
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002607#: builtin/branch.c:824
Jiang Xincc760112012-09-15 10:26:13 +08002608msgid "move/rename a branch, even if target exists"
2609msgstr ""
2610
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002611#: builtin/branch.c:825
Jiang Xincc760112012-09-15 10:26:13 +08002612msgid "list branch names"
2613msgstr ""
2614
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002615#: builtin/branch.c:826
Jiang Xincc760112012-09-15 10:26:13 +08002616msgid "create the branch's reflog"
2617msgstr ""
2618
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002619#: builtin/branch.c:828
Jiang Xincc760112012-09-15 10:26:13 +08002620msgid "edit the description for the branch"
2621msgstr ""
2622
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002623#: builtin/branch.c:829
Jiang Xincc760112012-09-15 10:26:13 +08002624msgid "force creation (when already exists)"
2625msgstr ""
2626
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002627#: builtin/branch.c:832
Jiang Xincc760112012-09-15 10:26:13 +08002628msgid "print only not merged branches"
2629msgstr ""
2630
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002631#: builtin/branch.c:838
Jiang Xincc760112012-09-15 10:26:13 +08002632msgid "print only merged branches"
2633msgstr ""
2634
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002635#: builtin/branch.c:842
Jiang Xincc760112012-09-15 10:26:13 +08002636msgid "list branches in columns"
2637msgstr ""
2638
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002639#: builtin/branch.c:855
Jiang Xindce37b62012-02-13 14:37:59 +08002640msgid "Failed to resolve HEAD as a valid ref."
2641msgstr ""
2642
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002643#: builtin/branch.c:860 builtin/clone.c:619
Jiang Xindce37b62012-02-13 14:37:59 +08002644msgid "HEAD not found below refs/heads!"
2645msgstr ""
2646
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002647#: builtin/branch.c:883
Jiang Xin822e4a62012-05-08 16:10:22 +08002648msgid "--column and --verbose are incompatible"
2649msgstr ""
2650
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002651#: builtin/branch.c:889 builtin/branch.c:928
Jiang Xin9caaf232013-02-14 14:49:45 +08002652msgid "branch name required"
2653msgstr ""
2654
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002655#: builtin/branch.c:904
Jiang Xin9caaf232013-02-14 14:49:45 +08002656msgid "Cannot give description to detached HEAD"
2657msgstr ""
2658
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002659#: builtin/branch.c:909
Jiang Xin9caaf232013-02-14 14:49:45 +08002660msgid "cannot edit description of more than one branch"
2661msgstr ""
2662
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002663#: builtin/branch.c:916
Jiang Xin9caaf232013-02-14 14:49:45 +08002664#, c-format
2665msgid "No commit on branch '%s' yet."
2666msgstr ""
2667
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002668#: builtin/branch.c:919
Jiang Xin9caaf232013-02-14 14:49:45 +08002669#, c-format
2670msgid "No branch named '%s'."
2671msgstr ""
2672
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002673#: builtin/branch.c:934
Jiang Xin9caaf232013-02-14 14:49:45 +08002674msgid "too many branches for a rename operation"
2675msgstr ""
2676
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002677#: builtin/branch.c:939
Jiang Xinc138af52013-04-10 15:19:54 +08002678msgid "too many branches to set new upstream"
2679msgstr ""
2680
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002681#: builtin/branch.c:943
Jiang Xinc138af52013-04-10 15:19:54 +08002682#, c-format
2683msgid ""
2684"could not set upstream of HEAD to %s when it does not point to any branch."
2685msgstr ""
2686
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002687#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
Jiang Xinc138af52013-04-10 15:19:54 +08002688#, c-format
2689msgid "no such branch '%s'"
2690msgstr ""
2691
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002692#: builtin/branch.c:950
Jiang Xincc760112012-09-15 10:26:13 +08002693#, c-format
2694msgid "branch '%s' does not exist"
2695msgstr ""
2696
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002697#: builtin/branch.c:962
Jiang Xinc138af52013-04-10 15:19:54 +08002698msgid "too many branches to unset upstream"
2699msgstr ""
2700
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002701#: builtin/branch.c:966
Jiang Xinc138af52013-04-10 15:19:54 +08002702msgid "could not unset upstream of HEAD when it does not point to any branch."
2703msgstr ""
2704
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002705#: builtin/branch.c:972
Jiang Xincc760112012-09-15 10:26:13 +08002706#, c-format
2707msgid "Branch '%s' has no upstream information"
2708msgstr ""
2709
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002710#: builtin/branch.c:987
Jiang Xinc138af52013-04-10 15:19:54 +08002711msgid "it does not make sense to create 'HEAD' manually"
2712msgstr ""
2713
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002714#: builtin/branch.c:993
Jiang Xindce37b62012-02-13 14:37:59 +08002715msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2716msgstr ""
2717
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002718#: builtin/branch.c:996
Jiang Xincc760112012-09-15 10:26:13 +08002719#, c-format
2720msgid ""
2721"The --set-upstream flag is deprecated and will be removed. Consider using --"
2722"track or --set-upstream-to\n"
2723msgstr ""
2724
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002725#: builtin/branch.c:1013
Jiang Xincc760112012-09-15 10:26:13 +08002726#, c-format
2727msgid ""
2728"\n"
2729"If you wanted to make '%s' track '%s', do this:\n"
2730"\n"
2731msgstr ""
2732
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002733#: builtin/branch.c:1014
Jiang Xincc760112012-09-15 10:26:13 +08002734#, c-format
2735msgid " git branch -d %s\n"
2736msgstr ""
2737
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002738#: builtin/branch.c:1015
Jiang Xincc760112012-09-15 10:26:13 +08002739#, c-format
2740msgid " git branch --set-upstream-to %s\n"
2741msgstr ""
2742
Jiang Xindce37b62012-02-13 14:37:59 +08002743#: builtin/bundle.c:47
2744#, c-format
2745msgid "%s is okay\n"
2746msgstr ""
2747
2748#: builtin/bundle.c:56
2749msgid "Need a repository to create a bundle."
2750msgstr ""
2751
2752#: builtin/bundle.c:60
2753msgid "Need a repository to unbundle."
2754msgstr ""
2755
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002756#: builtin/cat-file.c:176
Jiang Xincc760112012-09-15 10:26:13 +08002757msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2758msgstr ""
2759
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002760#: builtin/cat-file.c:177
Jiang Xincc760112012-09-15 10:26:13 +08002761msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2762msgstr ""
2763
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002764#: builtin/cat-file.c:195
Jiang Xincc760112012-09-15 10:26:13 +08002765msgid "<type> can be one of: blob, tree, commit, tag"
2766msgstr ""
2767
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002768#: builtin/cat-file.c:196
Jiang Xincc760112012-09-15 10:26:13 +08002769msgid "show object type"
2770msgstr ""
2771
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002772#: builtin/cat-file.c:197
Jiang Xincc760112012-09-15 10:26:13 +08002773msgid "show object size"
2774msgstr ""
2775
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002776#: builtin/cat-file.c:199
Jiang Xincc760112012-09-15 10:26:13 +08002777msgid "exit with zero when there's no error"
2778msgstr ""
2779
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002780#: builtin/cat-file.c:200
Jiang Xincc760112012-09-15 10:26:13 +08002781msgid "pretty-print object's content"
2782msgstr ""
2783
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002784#: builtin/cat-file.c:202
Jiang Xincc760112012-09-15 10:26:13 +08002785msgid "for blob objects, run textconv on object's content"
2786msgstr ""
2787
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002788#: builtin/cat-file.c:204
Jiang Xincc760112012-09-15 10:26:13 +08002789msgid "show info and content of objects fed from the standard input"
2790msgstr ""
2791
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002792#: builtin/cat-file.c:207
Jiang Xincc760112012-09-15 10:26:13 +08002793msgid "show info about objects fed from the standard input"
2794msgstr ""
2795
2796#: builtin/check-attr.c:11
2797msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2798msgstr ""
2799
2800#: builtin/check-attr.c:12
Jiang Xin9306b5b2012-10-16 08:39:10 +08002801msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
Jiang Xincc760112012-09-15 10:26:13 +08002802msgstr ""
2803
2804#: builtin/check-attr.c:19
2805msgid "report all attributes set on file"
2806msgstr ""
2807
2808#: builtin/check-attr.c:20
2809msgid "use .gitattributes only from the index"
2810msgstr ""
2811
Jiang Xin9caaf232013-02-14 14:49:45 +08002812#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
Jiang Xincc760112012-09-15 10:26:13 +08002813msgid "read file names from stdin"
2814msgstr ""
2815
Jiang Xin9caaf232013-02-14 14:49:45 +08002816#: builtin/check-attr.c:23 builtin/check-ignore.c:24
Jiang Xincc760112012-09-15 10:26:13 +08002817msgid "input paths are terminated by a null character"
2818msgstr ""
2819
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002820#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177
Jiang Xin9caaf232013-02-14 14:49:45 +08002821msgid "suppress progress reporting"
2822msgstr ""
2823
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002824#: builtin/check-ignore.c:146
Jiang Xin9caaf232013-02-14 14:49:45 +08002825msgid "cannot specify pathnames with --stdin"
2826msgstr ""
2827
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002828#: builtin/check-ignore.c:149
Jiang Xin9caaf232013-02-14 14:49:45 +08002829msgid "-z only makes sense with --stdin"
2830msgstr ""
2831
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002832#: builtin/check-ignore.c:151
Jiang Xin9caaf232013-02-14 14:49:45 +08002833msgid "no path specified"
2834msgstr ""
2835
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002836#: builtin/check-ignore.c:155
Jiang Xin9caaf232013-02-14 14:49:45 +08002837msgid "--quiet is only valid with a single pathname"
2838msgstr ""
2839
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002840#: builtin/check-ignore.c:157
Jiang Xin9caaf232013-02-14 14:49:45 +08002841msgid "cannot have both --quiet and --verbose"
2842msgstr ""
2843
Jiang Xincc760112012-09-15 10:26:13 +08002844#: builtin/checkout-index.c:126
2845msgid "git checkout-index [options] [--] [<file>...]"
2846msgstr ""
2847
2848#: builtin/checkout-index.c:187
2849msgid "check out all files in the index"
2850msgstr ""
2851
2852#: builtin/checkout-index.c:188
2853msgid "force overwrite of existing files"
2854msgstr ""
2855
2856#: builtin/checkout-index.c:190
2857msgid "no warning for existing files and files not in index"
2858msgstr ""
2859
2860#: builtin/checkout-index.c:192
2861msgid "don't checkout new files"
2862msgstr ""
2863
2864#: builtin/checkout-index.c:194
2865msgid "update stat information in the index file"
2866msgstr ""
2867
2868#: builtin/checkout-index.c:200
2869msgid "read list of paths from the standard input"
2870msgstr ""
2871
2872#: builtin/checkout-index.c:202
2873msgid "write the content to temporary files"
2874msgstr ""
2875
2876#: builtin/checkout-index.c:203 builtin/column.c:30
2877msgid "string"
2878msgstr ""
2879
2880#: builtin/checkout-index.c:204
2881msgid "when creating files, prepend <string>"
2882msgstr ""
2883
2884#: builtin/checkout-index.c:207
2885msgid "copy out the files from named stage"
2886msgstr ""
2887
2888#: builtin/checkout.c:25
2889msgid "git checkout [options] <branch>"
2890msgstr ""
2891
2892#: builtin/checkout.c:26
2893msgid "git checkout [options] [<branch>] -- <file>..."
Jiang Xindce37b62012-02-13 14:37:59 +08002894msgstr ""
2895
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002896#: builtin/checkout.c:117 builtin/checkout.c:150
Jiang Xindce37b62012-02-13 14:37:59 +08002897#, c-format
Jiang Xincc760112012-09-15 10:26:13 +08002898msgid "path '%s' does not have our version"
2899msgstr ""
2900
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002901#: builtin/checkout.c:119 builtin/checkout.c:152
Jiang Xincc760112012-09-15 10:26:13 +08002902#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08002903msgid "path '%s' does not have their version"
2904msgstr ""
2905
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002906#: builtin/checkout.c:135
Jiang Xindce37b62012-02-13 14:37:59 +08002907#, c-format
2908msgid "path '%s' does not have all necessary versions"
2909msgstr ""
2910
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002911#: builtin/checkout.c:179
Jiang Xindce37b62012-02-13 14:37:59 +08002912#, c-format
2913msgid "path '%s' does not have necessary versions"
2914msgstr ""
2915
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002916#: builtin/checkout.c:196
Jiang Xindce37b62012-02-13 14:37:59 +08002917#, c-format
2918msgid "path '%s': cannot merge"
2919msgstr ""
2920
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002921#: builtin/checkout.c:213
Jiang Xindce37b62012-02-13 14:37:59 +08002922#, c-format
2923msgid "Unable to add merge result for '%s'"
2924msgstr ""
2925
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002926#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
2927#: builtin/checkout.c:246
Jiang Xincc760112012-09-15 10:26:13 +08002928#, c-format
2929msgid "'%s' cannot be used with updating paths"
2930msgstr ""
2931
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002932#: builtin/checkout.c:249 builtin/checkout.c:252
Jiang Xincc760112012-09-15 10:26:13 +08002933#, c-format
2934msgid "'%s' cannot be used with %s"
2935msgstr ""
2936
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002937#: builtin/checkout.c:255
Jiang Xincc760112012-09-15 10:26:13 +08002938#, c-format
2939msgid "Cannot update paths and switch to branch '%s' at the same time."
2940msgstr ""
2941
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002942#: builtin/checkout.c:266 builtin/checkout.c:458
Jiang Xindce37b62012-02-13 14:37:59 +08002943msgid "corrupt index file"
2944msgstr ""
2945
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002946#: builtin/checkout.c:329 builtin/checkout.c:336
Jiang Xindce37b62012-02-13 14:37:59 +08002947#, c-format
2948msgid "path '%s' is unmerged"
2949msgstr ""
2950
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002951#: builtin/checkout.c:480
Jiang Xindce37b62012-02-13 14:37:59 +08002952msgid "you need to resolve your current index first"
2953msgstr ""
2954
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002955#: builtin/checkout.c:601
Jiang Xindce37b62012-02-13 14:37:59 +08002956#, c-format
2957msgid "Can not do reflog for '%s'\n"
2958msgstr ""
2959
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002960#: builtin/checkout.c:634
Jiang Xindce37b62012-02-13 14:37:59 +08002961msgid "HEAD is now at"
2962msgstr ""
2963
Jiang Xinc138af52013-04-10 15:19:54 +08002964#: builtin/checkout.c:641
Jiang Xindce37b62012-02-13 14:37:59 +08002965#, c-format
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002966msgid "Reset branch '%s'\n"
2967msgstr ""
2968
2969#: builtin/checkout.c:644
2970#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08002971msgid "Already on '%s'\n"
2972msgstr ""
2973
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002974#: builtin/checkout.c:648
Jiang Xindce37b62012-02-13 14:37:59 +08002975#, c-format
2976msgid "Switched to and reset branch '%s'\n"
2977msgstr ""
2978
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002979#: builtin/checkout.c:650 builtin/checkout.c:987
Jiang Xindce37b62012-02-13 14:37:59 +08002980#, c-format
2981msgid "Switched to a new branch '%s'\n"
2982msgstr ""
2983
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002984#: builtin/checkout.c:652
Jiang Xindce37b62012-02-13 14:37:59 +08002985#, c-format
2986msgid "Switched to branch '%s'\n"
2987msgstr ""
2988
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002989#: builtin/checkout.c:708
Jiang Xindce37b62012-02-13 14:37:59 +08002990#, c-format
2991msgid " ... and %d more.\n"
2992msgstr ""
2993
2994#. The singular version
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002995#: builtin/checkout.c:714
Jiang Xindce37b62012-02-13 14:37:59 +08002996#, c-format
2997msgid ""
2998"Warning: you are leaving %d commit behind, not connected to\n"
2999"any of your branches:\n"
3000"\n"
3001"%s\n"
3002msgid_plural ""
3003"Warning: you are leaving %d commits behind, not connected to\n"
3004"any of your branches:\n"
3005"\n"
3006"%s\n"
3007msgstr[0] ""
3008msgstr[1] ""
3009
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003010#: builtin/checkout.c:732
Jiang Xindce37b62012-02-13 14:37:59 +08003011#, c-format
3012msgid ""
3013"If you want to keep them by creating a new branch, this may be a good time\n"
3014"to do so with:\n"
3015"\n"
3016" git branch new_branch_name %s\n"
3017"\n"
3018msgstr ""
3019
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003020#: builtin/checkout.c:762
Jiang Xindce37b62012-02-13 14:37:59 +08003021msgid "internal error in revision walk"
3022msgstr ""
3023
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003024#: builtin/checkout.c:766
Jiang Xindce37b62012-02-13 14:37:59 +08003025msgid "Previous HEAD position was"
3026msgstr ""
3027
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003028#: builtin/checkout.c:793 builtin/checkout.c:982
Jiang Xindce37b62012-02-13 14:37:59 +08003029msgid "You are on a branch yet to be born"
3030msgstr ""
3031
3032#. case (1)
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003033#: builtin/checkout.c:918
Jiang Xindce37b62012-02-13 14:37:59 +08003034#, c-format
3035msgid "invalid reference: %s"
3036msgstr ""
3037
3038#. case (1): want a tree
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003039#: builtin/checkout.c:957
Jiang Xindce37b62012-02-13 14:37:59 +08003040#, c-format
3041msgid "reference is not a tree: %s"
3042msgstr ""
3043
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003044#: builtin/checkout.c:996
Jiang Xincc760112012-09-15 10:26:13 +08003045msgid "paths cannot be used with switching branches"
Jiang Xindce37b62012-02-13 14:37:59 +08003046msgstr ""
3047
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003048#: builtin/checkout.c:999 builtin/checkout.c:1003
Jiang Xincc760112012-09-15 10:26:13 +08003049#, c-format
3050msgid "'%s' cannot be used with switching branches"
3051msgstr ""
3052
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003053#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015
3054#: builtin/checkout.c:1018
Jiang Xincc760112012-09-15 10:26:13 +08003055#, c-format
3056msgid "'%s' cannot be used with '%s'"
Jiang Xindce37b62012-02-13 14:37:59 +08003057msgstr ""
3058
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003059#: builtin/checkout.c:1023
Jiang Xincc760112012-09-15 10:26:13 +08003060#, c-format
3061msgid "Cannot switch branch to a non-commit '%s'"
Jiang Xindce37b62012-02-13 14:37:59 +08003062msgstr ""
3063
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003064#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90
Jiang Xincc760112012-09-15 10:26:13 +08003065#: builtin/remote.c:169 builtin/remote.c:171
3066msgid "branch"
Jiang Xindce37b62012-02-13 14:37:59 +08003067msgstr ""
3068
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003069#: builtin/checkout.c:1046
Jiang Xincc760112012-09-15 10:26:13 +08003070msgid "create and checkout a new branch"
3071msgstr ""
3072
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003073#: builtin/checkout.c:1048
Jiang Xincc760112012-09-15 10:26:13 +08003074msgid "create/reset and checkout a branch"
3075msgstr ""
3076
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003077#: builtin/checkout.c:1049
Jiang Xincc760112012-09-15 10:26:13 +08003078msgid "create reflog for new branch"
3079msgstr ""
3080
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003081#: builtin/checkout.c:1050
Jiang Xincc760112012-09-15 10:26:13 +08003082msgid "detach the HEAD at named commit"
3083msgstr ""
3084
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003085#: builtin/checkout.c:1051
Jiang Xincc760112012-09-15 10:26:13 +08003086msgid "set upstream info for new branch"
3087msgstr ""
3088
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003089#: builtin/checkout.c:1053
Jiang Xincc760112012-09-15 10:26:13 +08003090msgid "new branch"
3091msgstr ""
3092
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003093#: builtin/checkout.c:1053
Jiang Xincc760112012-09-15 10:26:13 +08003094msgid "new unparented branch"
3095msgstr ""
3096
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003097#: builtin/checkout.c:1054
Jiang Xincc760112012-09-15 10:26:13 +08003098msgid "checkout our version for unmerged files"
Jiang Xindce37b62012-02-13 14:37:59 +08003099msgstr ""
3100
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003101#: builtin/checkout.c:1056
Jiang Xincc760112012-09-15 10:26:13 +08003102msgid "checkout their version for unmerged files"
Jiang Xindce37b62012-02-13 14:37:59 +08003103msgstr ""
3104
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003105#: builtin/checkout.c:1058
Jiang Xincc760112012-09-15 10:26:13 +08003106msgid "force checkout (throw away local modifications)"
3107msgstr ""
3108
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003109#: builtin/checkout.c:1059
Jiang Xincc760112012-09-15 10:26:13 +08003110msgid "perform a 3-way merge with the new branch"
3111msgstr ""
3112
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003113#: builtin/checkout.c:1060 builtin/merge.c:217
Jiang Xincc760112012-09-15 10:26:13 +08003114msgid "update ignored files (default)"
3115msgstr ""
3116
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003117#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245
Jiang Xincc760112012-09-15 10:26:13 +08003118msgid "style"
3119msgstr ""
3120
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003121#: builtin/checkout.c:1062
Jiang Xincc760112012-09-15 10:26:13 +08003122msgid "conflict style (merge or diff3)"
3123msgstr ""
3124
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003125#: builtin/checkout.c:1065
3126msgid "do not limit pathspecs to sparse entries only"
3127msgstr ""
3128
3129#: builtin/checkout.c:1067
Jiang Xincc760112012-09-15 10:26:13 +08003130msgid "second guess 'git checkout no-such-branch'"
3131msgstr ""
3132
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003133#: builtin/checkout.c:1091
Jiang Xincc760112012-09-15 10:26:13 +08003134msgid "-b, -B and --orphan are mutually exclusive"
3135msgstr ""
3136
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003137#: builtin/checkout.c:1108
Jiang Xincc760112012-09-15 10:26:13 +08003138msgid "--track needs a branch name"
3139msgstr ""
3140
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003141#: builtin/checkout.c:1115
Jiang Xincc760112012-09-15 10:26:13 +08003142msgid "Missing branch name; try -b"
3143msgstr ""
3144
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003145#: builtin/checkout.c:1150
Jiang Xindce37b62012-02-13 14:37:59 +08003146msgid "invalid path specification"
3147msgstr ""
3148
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003149#: builtin/checkout.c:1157
Jiang Xindce37b62012-02-13 14:37:59 +08003150#, c-format
3151msgid ""
Jiang Xincc760112012-09-15 10:26:13 +08003152"Cannot update paths and switch to branch '%s' at the same time.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08003153"Did you intend to checkout '%s' which can not be resolved as commit?"
3154msgstr ""
3155
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003156#: builtin/checkout.c:1162
Jiang Xincc760112012-09-15 10:26:13 +08003157#, c-format
3158msgid "git checkout: --detach does not take a path argument '%s'"
Jiang Xindce37b62012-02-13 14:37:59 +08003159msgstr ""
3160
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003161#: builtin/checkout.c:1166
Jiang Xindce37b62012-02-13 14:37:59 +08003162msgid ""
3163"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3164"checking out of the index."
3165msgstr ""
3166
Jiang Xin46bc4032013-01-25 12:33:58 +08003167#: builtin/clean.c:20
Jiang Xincc760112012-09-15 10:26:13 +08003168msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
Jiang Xindce37b62012-02-13 14:37:59 +08003169msgstr ""
3170
Jiang Xin46bc4032013-01-25 12:33:58 +08003171#: builtin/clean.c:24
Jiang Xindce37b62012-02-13 14:37:59 +08003172#, c-format
3173msgid "Removing %s\n"
3174msgstr ""
3175
Jiang Xin46bc4032013-01-25 12:33:58 +08003176#: builtin/clean.c:25
3177#, c-format
3178msgid "Would remove %s\n"
3179msgstr ""
3180
3181#: builtin/clean.c:26
3182#, c-format
3183msgid "Skipping repository %s\n"
3184msgstr ""
3185
3186#: builtin/clean.c:27
3187#, c-format
3188msgid "Would skip repository %s\n"
3189msgstr ""
3190
3191#: builtin/clean.c:28
Jiang Xindce37b62012-02-13 14:37:59 +08003192#, c-format
3193msgid "failed to remove %s"
3194msgstr ""
3195
Jiang Xin9caaf232013-02-14 14:49:45 +08003196#: builtin/clean.c:160
Jiang Xin46bc4032013-01-25 12:33:58 +08003197msgid "do not print names of files removed"
3198msgstr ""
3199
Jiang Xin9caaf232013-02-14 14:49:45 +08003200#: builtin/clean.c:162
Jiang Xin46bc4032013-01-25 12:33:58 +08003201msgid "force"
3202msgstr ""
3203
Jiang Xin9caaf232013-02-14 14:49:45 +08003204#: builtin/clean.c:164
Jiang Xin46bc4032013-01-25 12:33:58 +08003205msgid "remove whole directories"
3206msgstr ""
3207
Jiang Xinc138af52013-04-10 15:19:54 +08003208#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003209#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182
Jiang Xin46bc4032013-01-25 12:33:58 +08003210msgid "pattern"
3211msgstr ""
3212
Jiang Xin9caaf232013-02-14 14:49:45 +08003213#: builtin/clean.c:166
Jiang Xin46bc4032013-01-25 12:33:58 +08003214msgid "add <pattern> to ignore rules"
3215msgstr ""
3216
Jiang Xin9caaf232013-02-14 14:49:45 +08003217#: builtin/clean.c:167
Jiang Xin46bc4032013-01-25 12:33:58 +08003218msgid "remove ignored files, too"
Jiang Xindce37b62012-02-13 14:37:59 +08003219msgstr ""
3220
Jiang Xin9caaf232013-02-14 14:49:45 +08003221#: builtin/clean.c:169
Jiang Xin46bc4032013-01-25 12:33:58 +08003222msgid "remove only ignored files"
3223msgstr ""
3224
Jiang Xin9caaf232013-02-14 14:49:45 +08003225#: builtin/clean.c:187
Jiang Xin46bc4032013-01-25 12:33:58 +08003226msgid "-x and -X cannot be used together"
3227msgstr ""
3228
Jiang Xin9caaf232013-02-14 14:49:45 +08003229#: builtin/clean.c:191
Jiang Xin46bc4032013-01-25 12:33:58 +08003230msgid ""
3231"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
3232msgstr ""
3233
Jiang Xin9caaf232013-02-14 14:49:45 +08003234#: builtin/clean.c:194
Jiang Xin46bc4032013-01-25 12:33:58 +08003235msgid ""
3236"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
3237"clean"
Jiang Xindce37b62012-02-13 14:37:59 +08003238msgstr ""
3239
Jiang Xinc138af52013-04-10 15:19:54 +08003240#: builtin/clone.c:37
Jiang Xincc760112012-09-15 10:26:13 +08003241msgid "git clone [options] [--] <repo> [<dir>]"
3242msgstr ""
3243
Jiang Xinc138af52013-04-10 15:19:54 +08003244#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214
Jiang Xin9caaf232013-02-14 14:49:45 +08003245#: builtin/push.c:436
Jiang Xincc760112012-09-15 10:26:13 +08003246msgid "force progress reporting"
3247msgstr ""
3248
Jiang Xinc138af52013-04-10 15:19:54 +08003249#: builtin/clone.c:67
Jiang Xincc760112012-09-15 10:26:13 +08003250msgid "don't create a checkout"
3251msgstr ""
3252
Jiang Xinc138af52013-04-10 15:19:54 +08003253#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488
Jiang Xincc760112012-09-15 10:26:13 +08003254msgid "create a bare repository"
3255msgstr ""
3256
Jiang Xinc138af52013-04-10 15:19:54 +08003257#: builtin/clone.c:73
Jiang Xincc760112012-09-15 10:26:13 +08003258msgid "create a mirror repository (implies bare)"
3259msgstr ""
3260
Jiang Xinc138af52013-04-10 15:19:54 +08003261#: builtin/clone.c:75
Jiang Xincc760112012-09-15 10:26:13 +08003262msgid "to clone from a local repository"
3263msgstr ""
3264
Jiang Xinc138af52013-04-10 15:19:54 +08003265#: builtin/clone.c:77
Jiang Xincc760112012-09-15 10:26:13 +08003266msgid "don't use local hardlinks, always copy"
3267msgstr ""
3268
Jiang Xinc138af52013-04-10 15:19:54 +08003269#: builtin/clone.c:79
Jiang Xincc760112012-09-15 10:26:13 +08003270msgid "setup as shared repository"
3271msgstr ""
3272
Jiang Xinc138af52013-04-10 15:19:54 +08003273#: builtin/clone.c:81 builtin/clone.c:83
Jiang Xincc760112012-09-15 10:26:13 +08003274msgid "initialize submodules in the clone"
3275msgstr ""
3276
Jiang Xinc138af52013-04-10 15:19:54 +08003277#: builtin/clone.c:84 builtin/init-db.c:485
Jiang Xincc760112012-09-15 10:26:13 +08003278msgid "template-directory"
3279msgstr ""
3280
Jiang Xinc138af52013-04-10 15:19:54 +08003281#: builtin/clone.c:85 builtin/init-db.c:486
Jiang Xincc760112012-09-15 10:26:13 +08003282msgid "directory from which templates will be used"
3283msgstr ""
3284
Jiang Xinc138af52013-04-10 15:19:54 +08003285#: builtin/clone.c:87
Jiang Xincc760112012-09-15 10:26:13 +08003286msgid "reference repository"
3287msgstr ""
3288
Jiang Xinc138af52013-04-10 15:19:54 +08003289#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
Jiang Xincc760112012-09-15 10:26:13 +08003290msgid "name"
3291msgstr ""
3292
Jiang Xinc138af52013-04-10 15:19:54 +08003293#: builtin/clone.c:89
Jiang Xincc760112012-09-15 10:26:13 +08003294msgid "use <name> instead of 'origin' to track upstream"
3295msgstr ""
3296
Jiang Xinc138af52013-04-10 15:19:54 +08003297#: builtin/clone.c:91
Jiang Xincc760112012-09-15 10:26:13 +08003298msgid "checkout <branch> instead of the remote's HEAD"
3299msgstr ""
3300
Jiang Xinc138af52013-04-10 15:19:54 +08003301#: builtin/clone.c:93
Jiang Xincc760112012-09-15 10:26:13 +08003302msgid "path to git-upload-pack on the remote"
3303msgstr ""
3304
Jiang Xinc138af52013-04-10 15:19:54 +08003305#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662
Jiang Xincc760112012-09-15 10:26:13 +08003306msgid "depth"
3307msgstr ""
3308
Jiang Xinc138af52013-04-10 15:19:54 +08003309#: builtin/clone.c:95
Jiang Xincc760112012-09-15 10:26:13 +08003310msgid "create a shallow clone of that depth"
3311msgstr ""
3312
Jiang Xinc138af52013-04-10 15:19:54 +08003313#: builtin/clone.c:97
Jiang Xincc760112012-09-15 10:26:13 +08003314msgid "clone only one branch, HEAD or --branch"
3315msgstr ""
3316
Jiang Xinc138af52013-04-10 15:19:54 +08003317#: builtin/clone.c:98 builtin/init-db.c:494
Jiang Xincc760112012-09-15 10:26:13 +08003318msgid "gitdir"
3319msgstr ""
3320
Jiang Xinc138af52013-04-10 15:19:54 +08003321#: builtin/clone.c:99 builtin/init-db.c:495
Jiang Xincc760112012-09-15 10:26:13 +08003322msgid "separate git dir from working tree"
3323msgstr ""
3324
Jiang Xinc138af52013-04-10 15:19:54 +08003325#: builtin/clone.c:100
Jiang Xincc760112012-09-15 10:26:13 +08003326msgid "key=value"
3327msgstr ""
3328
Jiang Xinc138af52013-04-10 15:19:54 +08003329#: builtin/clone.c:101
Jiang Xincc760112012-09-15 10:26:13 +08003330msgid "set config inside the new repository"
3331msgstr ""
3332
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003333#: builtin/clone.c:254
Jiang Xindce37b62012-02-13 14:37:59 +08003334#, c-format
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003335msgid "reference repository '%s' is not a local repository."
Jiang Xindce37b62012-02-13 14:37:59 +08003336msgstr ""
3337
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003338#: builtin/clone.c:317
Jiang Xindce37b62012-02-13 14:37:59 +08003339#, c-format
3340msgid "failed to create directory '%s'"
3341msgstr ""
3342
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003343#: builtin/clone.c:319 builtin/diff.c:77
Jiang Xindce37b62012-02-13 14:37:59 +08003344#, c-format
3345msgid "failed to stat '%s'"
3346msgstr ""
3347
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003348#: builtin/clone.c:321
Jiang Xindce37b62012-02-13 14:37:59 +08003349#, c-format
3350msgid "%s exists and is not a directory"
3351msgstr ""
3352
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003353#: builtin/clone.c:335
Jiang Xindce37b62012-02-13 14:37:59 +08003354#, c-format
3355msgid "failed to stat %s\n"
3356msgstr ""
3357
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003358#: builtin/clone.c:357
Jiang Xindce37b62012-02-13 14:37:59 +08003359#, c-format
3360msgid "failed to create link '%s'"
3361msgstr ""
3362
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003363#: builtin/clone.c:361
Jiang Xindce37b62012-02-13 14:37:59 +08003364#, c-format
3365msgid "failed to copy file to '%s'"
3366msgstr ""
3367
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003368#: builtin/clone.c:384
Jiang Xindce37b62012-02-13 14:37:59 +08003369#, c-format
3370msgid "done.\n"
3371msgstr ""
3372
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003373#: builtin/clone.c:397
Jiang Xinc138af52013-04-10 15:19:54 +08003374msgid ""
3375"Clone succeeded, but checkout failed.\n"
3376"You can inspect what was checked out with 'git status'\n"
3377"and retry the checkout with 'git checkout -f HEAD'\n"
3378msgstr ""
3379
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003380#: builtin/clone.c:476
Jiang Xindce37b62012-02-13 14:37:59 +08003381#, c-format
3382msgid "Could not find remote branch %s to clone."
3383msgstr ""
3384
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003385#: builtin/clone.c:550
Jiang Xinc138af52013-04-10 15:19:54 +08003386msgid "remote did not send all necessary objects"
3387msgstr ""
3388
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003389#: builtin/clone.c:610
Jiang Xindce37b62012-02-13 14:37:59 +08003390msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3391msgstr ""
3392
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003393#: builtin/clone.c:641
Jiang Xinc138af52013-04-10 15:19:54 +08003394msgid "unable to checkout working tree"
3395msgstr ""
3396
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003397#: builtin/clone.c:749
Jiang Xindce37b62012-02-13 14:37:59 +08003398msgid "Too many arguments."
3399msgstr ""
3400
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003401#: builtin/clone.c:753
Jiang Xindce37b62012-02-13 14:37:59 +08003402msgid "You must specify a repository to clone."
3403msgstr ""
3404
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003405#: builtin/clone.c:764
Jiang Xindce37b62012-02-13 14:37:59 +08003406#, c-format
3407msgid "--bare and --origin %s options are incompatible."
3408msgstr ""
3409
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003410#: builtin/clone.c:767
Jiang Xin46bc4032013-01-25 12:33:58 +08003411msgid "--bare and --separate-git-dir are incompatible."
3412msgstr ""
3413
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003414#: builtin/clone.c:780
Jiang Xindce37b62012-02-13 14:37:59 +08003415#, c-format
3416msgid "repository '%s' does not exist"
3417msgstr ""
3418
Jiang Xinc138af52013-04-10 15:19:54 +08003419#: builtin/clone.c:785
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003420msgid "--depth is ignored in local clones; use file:// instead."
Jiang Xindce37b62012-02-13 14:37:59 +08003421msgstr ""
3422
Jiang Xinc138af52013-04-10 15:19:54 +08003423#: builtin/clone.c:795
Jiang Xindce37b62012-02-13 14:37:59 +08003424#, c-format
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003425msgid "destination path '%s' already exists and is not an empty directory."
3426msgstr ""
3427
3428#: builtin/clone.c:805
3429#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08003430msgid "working tree '%s' already exists."
3431msgstr ""
3432
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003433#: builtin/clone.c:818 builtin/clone.c:830
Jiang Xindce37b62012-02-13 14:37:59 +08003434#, c-format
3435msgid "could not create leading directories of '%s'"
3436msgstr ""
3437
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003438#: builtin/clone.c:821
Jiang Xindce37b62012-02-13 14:37:59 +08003439#, c-format
3440msgid "could not create work tree dir '%s'."
3441msgstr ""
3442
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003443#: builtin/clone.c:840
Jiang Xindce37b62012-02-13 14:37:59 +08003444#, c-format
3445msgid "Cloning into bare repository '%s'...\n"
3446msgstr ""
3447
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003448#: builtin/clone.c:842
Jiang Xindce37b62012-02-13 14:37:59 +08003449#, c-format
3450msgid "Cloning into '%s'...\n"
3451msgstr ""
3452
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003453#: builtin/clone.c:877
Jiang Xindce37b62012-02-13 14:37:59 +08003454#, c-format
3455msgid "Don't know how to clone %s"
3456msgstr ""
3457
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003458#: builtin/clone.c:926
Jiang Xindce37b62012-02-13 14:37:59 +08003459#, c-format
3460msgid "Remote branch %s not found in upstream %s"
3461msgstr ""
3462
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003463#: builtin/clone.c:933
Jiang Xindce37b62012-02-13 14:37:59 +08003464msgid "You appear to have cloned an empty repository."
3465msgstr ""
3466
Jiang Xincc760112012-09-15 10:26:13 +08003467#: builtin/column.c:9
3468msgid "git column [options]"
3469msgstr ""
3470
3471#: builtin/column.c:26
3472msgid "lookup config vars"
3473msgstr ""
3474
3475#: builtin/column.c:27 builtin/column.c:28
3476msgid "layout to use"
3477msgstr ""
3478
3479#: builtin/column.c:29
3480msgid "Maximum width"
3481msgstr ""
3482
3483#: builtin/column.c:30
3484msgid "Padding space on left border"
3485msgstr ""
3486
3487#: builtin/column.c:31
3488msgid "Padding space on right border"
3489msgstr ""
3490
3491#: builtin/column.c:32
3492msgid "Padding space between columns"
3493msgstr ""
3494
Jiang Xin822e4a62012-05-08 16:10:22 +08003495#: builtin/column.c:51
3496msgid "--command must be the first argument"
3497msgstr ""
3498
Jiang Xin9306b5b2012-10-16 08:39:10 +08003499#: builtin/commit.c:34
Jiang Xin9caaf232013-02-14 14:49:45 +08003500msgid "git commit [options] [--] <pathspec>..."
Jiang Xincc760112012-09-15 10:26:13 +08003501msgstr ""
3502
Jiang Xin9306b5b2012-10-16 08:39:10 +08003503#: builtin/commit.c:39
Jiang Xin9caaf232013-02-14 14:49:45 +08003504msgid "git status [options] [--] <pathspec>..."
Jiang Xincc760112012-09-15 10:26:13 +08003505msgstr ""
3506
Jiang Xin9306b5b2012-10-16 08:39:10 +08003507#: builtin/commit.c:44
Jiang Xindce37b62012-02-13 14:37:59 +08003508msgid ""
3509"Your name and email address were configured automatically based\n"
3510"on your username and hostname. Please check that they are accurate.\n"
3511"You can suppress this message by setting them explicitly:\n"
3512"\n"
3513" git config --global user.name \"Your Name\"\n"
3514" git config --global user.email you@example.com\n"
3515"\n"
3516"After doing this, you may fix the identity used for this commit with:\n"
3517"\n"
3518" git commit --amend --reset-author\n"
3519msgstr ""
3520
Jiang Xin9306b5b2012-10-16 08:39:10 +08003521#: builtin/commit.c:56
Jiang Xindce37b62012-02-13 14:37:59 +08003522msgid ""
3523"You asked to amend the most recent commit, but doing so would make\n"
3524"it empty. You can repeat your command with --allow-empty, or you can\n"
3525"remove the commit entirely with \"git reset HEAD^\".\n"
3526msgstr ""
3527
Jiang Xin9306b5b2012-10-16 08:39:10 +08003528#: builtin/commit.c:61
Jiang Xindce37b62012-02-13 14:37:59 +08003529msgid ""
3530"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3531"If you wish to commit it anyway, use:\n"
3532"\n"
3533" git commit --allow-empty\n"
3534"\n"
3535"Otherwise, please use 'git reset'\n"
3536msgstr ""
3537
Jiang Xinc138af52013-04-10 15:19:54 +08003538#: builtin/commit.c:260
Jiang Xindce37b62012-02-13 14:37:59 +08003539msgid "failed to unpack HEAD tree object"
3540msgstr ""
3541
Jiang Xinc138af52013-04-10 15:19:54 +08003542#: builtin/commit.c:302
Jiang Xindce37b62012-02-13 14:37:59 +08003543msgid "unable to create temporary index"
3544msgstr ""
3545
Jiang Xinc138af52013-04-10 15:19:54 +08003546#: builtin/commit.c:308
Jiang Xindce37b62012-02-13 14:37:59 +08003547msgid "interactive add failed"
3548msgstr ""
3549
Jiang Xinc138af52013-04-10 15:19:54 +08003550#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412
Jiang Xindce37b62012-02-13 14:37:59 +08003551msgid "unable to write new_index file"
3552msgstr ""
3553
Jiang Xinc138af52013-04-10 15:19:54 +08003554#: builtin/commit.c:393
Jiang Xin822e4a62012-05-08 16:10:22 +08003555msgid "cannot do a partial commit during a merge."
Jiang Xindce37b62012-02-13 14:37:59 +08003556msgstr ""
3557
Jiang Xinc138af52013-04-10 15:19:54 +08003558#: builtin/commit.c:395
Jiang Xin822e4a62012-05-08 16:10:22 +08003559msgid "cannot do a partial commit during a cherry-pick."
3560msgstr ""
3561
Jiang Xinc138af52013-04-10 15:19:54 +08003562#: builtin/commit.c:405
Jiang Xindce37b62012-02-13 14:37:59 +08003563msgid "cannot read the index"
3564msgstr ""
3565
Jiang Xinc138af52013-04-10 15:19:54 +08003566#: builtin/commit.c:425
Jiang Xindce37b62012-02-13 14:37:59 +08003567msgid "unable to write temporary index file"
3568msgstr ""
3569
Jiang Xinc138af52013-04-10 15:19:54 +08003570#: builtin/commit.c:513 builtin/commit.c:519
Jiang Xindce37b62012-02-13 14:37:59 +08003571#, c-format
3572msgid "invalid commit: %s"
3573msgstr ""
3574
Jiang Xinc138af52013-04-10 15:19:54 +08003575#: builtin/commit.c:542
Jiang Xindce37b62012-02-13 14:37:59 +08003576msgid "malformed --author parameter"
3577msgstr ""
3578
Jiang Xinc138af52013-04-10 15:19:54 +08003579#: builtin/commit.c:562
Jiang Xindce37b62012-02-13 14:37:59 +08003580#, c-format
3581msgid "Malformed ident string: '%s'"
3582msgstr ""
3583
Jiang Xinc138af52013-04-10 15:19:54 +08003584#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956
Jiang Xindce37b62012-02-13 14:37:59 +08003585#, c-format
3586msgid "could not lookup commit %s"
3587msgstr ""
3588
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003589#: builtin/commit.c:612 builtin/shortlog.c:270
Jiang Xindce37b62012-02-13 14:37:59 +08003590#, c-format
3591msgid "(reading log message from standard input)\n"
3592msgstr ""
3593
Jiang Xinc138af52013-04-10 15:19:54 +08003594#: builtin/commit.c:614
Jiang Xindce37b62012-02-13 14:37:59 +08003595msgid "could not read log from standard input"
3596msgstr ""
3597
Jiang Xinc138af52013-04-10 15:19:54 +08003598#: builtin/commit.c:618
Jiang Xindce37b62012-02-13 14:37:59 +08003599#, c-format
3600msgid "could not read log file '%s'"
3601msgstr ""
3602
Jiang Xinc138af52013-04-10 15:19:54 +08003603#: builtin/commit.c:624
Jiang Xindce37b62012-02-13 14:37:59 +08003604msgid "commit has empty message"
3605msgstr ""
3606
Jiang Xinc138af52013-04-10 15:19:54 +08003607#: builtin/commit.c:640
Jiang Xindce37b62012-02-13 14:37:59 +08003608msgid "could not read MERGE_MSG"
3609msgstr ""
3610
Jiang Xinc138af52013-04-10 15:19:54 +08003611#: builtin/commit.c:644
Jiang Xindce37b62012-02-13 14:37:59 +08003612msgid "could not read SQUASH_MSG"
3613msgstr ""
3614
Jiang Xinc138af52013-04-10 15:19:54 +08003615#: builtin/commit.c:648
Jiang Xindce37b62012-02-13 14:37:59 +08003616#, c-format
3617msgid "could not read '%s'"
3618msgstr ""
3619
Jiang Xinc138af52013-04-10 15:19:54 +08003620#: builtin/commit.c:709
Jiang Xindce37b62012-02-13 14:37:59 +08003621msgid "could not write commit template"
3622msgstr ""
3623
Jiang Xinc138af52013-04-10 15:19:54 +08003624#: builtin/commit.c:720
Jiang Xindce37b62012-02-13 14:37:59 +08003625#, c-format
3626msgid ""
3627"\n"
Jiang Xin822e4a62012-05-08 16:10:22 +08003628"It looks like you may be committing a merge.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08003629"If this is not correct, please remove the file\n"
3630"\t%s\n"
3631"and try again.\n"
3632msgstr ""
3633
Jiang Xinc138af52013-04-10 15:19:54 +08003634#: builtin/commit.c:725
Jiang Xin822e4a62012-05-08 16:10:22 +08003635#, c-format
3636msgid ""
3637"\n"
3638"It looks like you may be committing a cherry-pick.\n"
3639"If this is not correct, please remove the file\n"
3640"\t%s\n"
3641"and try again.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08003642msgstr ""
3643
Jiang Xinc138af52013-04-10 15:19:54 +08003644#: builtin/commit.c:737
Jiang Xin9caaf232013-02-14 14:49:45 +08003645#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08003646msgid ""
Jiang Xin822e4a62012-05-08 16:10:22 +08003647"Please enter the commit message for your changes. Lines starting\n"
Jiang Xin9caaf232013-02-14 14:49:45 +08003648"with '%c' will be ignored, and an empty message aborts the commit.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08003649msgstr ""
3650
Jiang Xinc138af52013-04-10 15:19:54 +08003651#: builtin/commit.c:742
Jiang Xin9caaf232013-02-14 14:49:45 +08003652#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08003653msgid ""
Jiang Xin822e4a62012-05-08 16:10:22 +08003654"Please enter the commit message for your changes. Lines starting\n"
Jiang Xin9caaf232013-02-14 14:49:45 +08003655"with '%c' will be kept; you may remove them yourself if you want to.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08003656"An empty message aborts the commit.\n"
3657msgstr ""
3658
Jiang Xinc138af52013-04-10 15:19:54 +08003659#: builtin/commit.c:755
Jiang Xindce37b62012-02-13 14:37:59 +08003660#, c-format
3661msgid "%sAuthor: %s"
3662msgstr ""
3663
Jiang Xinc138af52013-04-10 15:19:54 +08003664#: builtin/commit.c:762
Jiang Xindce37b62012-02-13 14:37:59 +08003665#, c-format
3666msgid "%sCommitter: %s"
3667msgstr ""
3668
Jiang Xinc138af52013-04-10 15:19:54 +08003669#: builtin/commit.c:782
Jiang Xindce37b62012-02-13 14:37:59 +08003670msgid "Cannot read index"
3671msgstr ""
3672
Jiang Xinc138af52013-04-10 15:19:54 +08003673#: builtin/commit.c:819
Jiang Xindce37b62012-02-13 14:37:59 +08003674msgid "Error building trees"
3675msgstr ""
3676
Jiang Xinc138af52013-04-10 15:19:54 +08003677#: builtin/commit.c:834 builtin/tag.c:359
Jiang Xindce37b62012-02-13 14:37:59 +08003678#, c-format
3679msgid "Please supply the message using either -m or -F option.\n"
3680msgstr ""
3681
Jiang Xinc138af52013-04-10 15:19:54 +08003682#: builtin/commit.c:931
Jiang Xindce37b62012-02-13 14:37:59 +08003683#, c-format
3684msgid "No existing author found with '%s'"
3685msgstr ""
3686
Jiang Xinc138af52013-04-10 15:19:54 +08003687#: builtin/commit.c:946 builtin/commit.c:1140
Jiang Xindce37b62012-02-13 14:37:59 +08003688#, c-format
3689msgid "Invalid untracked files mode '%s'"
3690msgstr ""
3691
Jiang Xinc138af52013-04-10 15:19:54 +08003692#: builtin/commit.c:976
Jiang Xindce37b62012-02-13 14:37:59 +08003693msgid "Using both --reset-author and --author does not make sense"
3694msgstr ""
3695
Jiang Xinc138af52013-04-10 15:19:54 +08003696#: builtin/commit.c:987
Jiang Xindce37b62012-02-13 14:37:59 +08003697msgid "You have nothing to amend."
3698msgstr ""
3699
Jiang Xinc138af52013-04-10 15:19:54 +08003700#: builtin/commit.c:990
Jiang Xin822e4a62012-05-08 16:10:22 +08003701msgid "You are in the middle of a merge -- cannot amend."
Jiang Xindce37b62012-02-13 14:37:59 +08003702msgstr ""
3703
Jiang Xinc138af52013-04-10 15:19:54 +08003704#: builtin/commit.c:992
Jiang Xin822e4a62012-05-08 16:10:22 +08003705msgid "You are in the middle of a cherry-pick -- cannot amend."
3706msgstr ""
3707
Jiang Xinc138af52013-04-10 15:19:54 +08003708#: builtin/commit.c:995
Jiang Xindce37b62012-02-13 14:37:59 +08003709msgid "Options --squash and --fixup cannot be used together"
3710msgstr ""
3711
Jiang Xinc138af52013-04-10 15:19:54 +08003712#: builtin/commit.c:1005
Jiang Xindce37b62012-02-13 14:37:59 +08003713msgid "Only one of -c/-C/-F/--fixup can be used."
3714msgstr ""
3715
Jiang Xinc138af52013-04-10 15:19:54 +08003716#: builtin/commit.c:1007
Jiang Xindce37b62012-02-13 14:37:59 +08003717msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3718msgstr ""
3719
Jiang Xinc138af52013-04-10 15:19:54 +08003720#: builtin/commit.c:1015
Jiang Xindce37b62012-02-13 14:37:59 +08003721msgid "--reset-author can be used only with -C, -c or --amend."
3722msgstr ""
3723
Jiang Xinc138af52013-04-10 15:19:54 +08003724#: builtin/commit.c:1032
Jiang Xindce37b62012-02-13 14:37:59 +08003725msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3726msgstr ""
3727
Jiang Xinc138af52013-04-10 15:19:54 +08003728#: builtin/commit.c:1034
Jiang Xindce37b62012-02-13 14:37:59 +08003729msgid "No paths with --include/--only does not make sense."
3730msgstr ""
3731
Jiang Xinc138af52013-04-10 15:19:54 +08003732#: builtin/commit.c:1036
Jiang Xindce37b62012-02-13 14:37:59 +08003733msgid "Clever... amending the last one with dirty index."
3734msgstr ""
3735
Jiang Xinc138af52013-04-10 15:19:54 +08003736#: builtin/commit.c:1038
Jiang Xindce37b62012-02-13 14:37:59 +08003737msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3738msgstr ""
3739
Jiang Xinc138af52013-04-10 15:19:54 +08003740#: builtin/commit.c:1048 builtin/tag.c:575
Jiang Xindce37b62012-02-13 14:37:59 +08003741#, c-format
3742msgid "Invalid cleanup mode %s"
3743msgstr ""
3744
Jiang Xinc138af52013-04-10 15:19:54 +08003745#: builtin/commit.c:1053
Jiang Xindce37b62012-02-13 14:37:59 +08003746msgid "Paths with -a does not make sense."
3747msgstr ""
3748
Jiang Xinc138af52013-04-10 15:19:54 +08003749#: builtin/commit.c:1059 builtin/commit.c:1194
Jiang Xinfe52cd62012-11-23 14:29:02 +08003750msgid "--long and -z are incompatible"
3751msgstr ""
3752
Jiang Xinc138af52013-04-10 15:19:54 +08003753#: builtin/commit.c:1154 builtin/commit.c:1390
Jiang Xincc760112012-09-15 10:26:13 +08003754msgid "show status concisely"
3755msgstr ""
3756
Jiang Xinc138af52013-04-10 15:19:54 +08003757#: builtin/commit.c:1156 builtin/commit.c:1392
Jiang Xincc760112012-09-15 10:26:13 +08003758msgid "show branch information"
3759msgstr ""
3760
Jiang Xinc138af52013-04-10 15:19:54 +08003761#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426
Jiang Xincc760112012-09-15 10:26:13 +08003762msgid "machine-readable output"
3763msgstr ""
3764
Jiang Xinc138af52013-04-10 15:19:54 +08003765#: builtin/commit.c:1161 builtin/commit.c:1396
Jiang Xinfe52cd62012-11-23 14:29:02 +08003766msgid "show status in long format (default)"
3767msgstr ""
3768
Jiang Xinc138af52013-04-10 15:19:54 +08003769#: builtin/commit.c:1164 builtin/commit.c:1399
Jiang Xincc760112012-09-15 10:26:13 +08003770msgid "terminate entries with NUL"
3771msgstr ""
3772
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003773#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659
3774#: builtin/fast-export.c:662 builtin/tag.c:459
Jiang Xincc760112012-09-15 10:26:13 +08003775msgid "mode"
3776msgstr ""
3777
Jiang Xinc138af52013-04-10 15:19:54 +08003778#: builtin/commit.c:1167 builtin/commit.c:1402
Jiang Xincc760112012-09-15 10:26:13 +08003779msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3780msgstr ""
3781
Jiang Xinc138af52013-04-10 15:19:54 +08003782#: builtin/commit.c:1170
Jiang Xincc760112012-09-15 10:26:13 +08003783msgid "show ignored files"
3784msgstr ""
3785
Jiang Xinc138af52013-04-10 15:19:54 +08003786#: builtin/commit.c:1171 parse-options.h:151
Jiang Xincc760112012-09-15 10:26:13 +08003787msgid "when"
3788msgstr ""
3789
Jiang Xinc138af52013-04-10 15:19:54 +08003790#: builtin/commit.c:1172
Jiang Xincc760112012-09-15 10:26:13 +08003791msgid ""
3792"ignore changes to submodules, optional when: all, dirty, untracked. "
3793"(Default: all)"
3794msgstr ""
3795
Jiang Xinc138af52013-04-10 15:19:54 +08003796#: builtin/commit.c:1174
Jiang Xincc760112012-09-15 10:26:13 +08003797msgid "list untracked files in columns"
3798msgstr ""
3799
Jiang Xinc138af52013-04-10 15:19:54 +08003800#: builtin/commit.c:1248
Jiang Xindce37b62012-02-13 14:37:59 +08003801msgid "couldn't look up newly created commit"
3802msgstr ""
3803
Jiang Xinc138af52013-04-10 15:19:54 +08003804#: builtin/commit.c:1250
Jiang Xindce37b62012-02-13 14:37:59 +08003805msgid "could not parse newly created commit"
3806msgstr ""
3807
Jiang Xinc138af52013-04-10 15:19:54 +08003808#: builtin/commit.c:1291
Jiang Xindce37b62012-02-13 14:37:59 +08003809msgid "detached HEAD"
3810msgstr ""
3811
Jiang Xinc138af52013-04-10 15:19:54 +08003812#: builtin/commit.c:1293
Jiang Xindce37b62012-02-13 14:37:59 +08003813msgid " (root-commit)"
3814msgstr ""
3815
Jiang Xinc138af52013-04-10 15:19:54 +08003816#: builtin/commit.c:1360
Jiang Xincc760112012-09-15 10:26:13 +08003817msgid "suppress summary after successful commit"
3818msgstr ""
3819
Jiang Xinc138af52013-04-10 15:19:54 +08003820#: builtin/commit.c:1361
Jiang Xincc760112012-09-15 10:26:13 +08003821msgid "show diff in commit message template"
3822msgstr ""
3823
Jiang Xinc138af52013-04-10 15:19:54 +08003824#: builtin/commit.c:1363
Jiang Xincc760112012-09-15 10:26:13 +08003825msgid "Commit message options"
3826msgstr ""
3827
Jiang Xinc138af52013-04-10 15:19:54 +08003828#: builtin/commit.c:1364 builtin/tag.c:457
Jiang Xincc760112012-09-15 10:26:13 +08003829msgid "read message from file"
3830msgstr ""
3831
Jiang Xinc138af52013-04-10 15:19:54 +08003832#: builtin/commit.c:1365
Jiang Xincc760112012-09-15 10:26:13 +08003833msgid "author"
3834msgstr ""
3835
Jiang Xinc138af52013-04-10 15:19:54 +08003836#: builtin/commit.c:1365
Jiang Xincc760112012-09-15 10:26:13 +08003837msgid "override author for commit"
3838msgstr ""
3839
Jiang Xinc138af52013-04-10 15:19:54 +08003840#: builtin/commit.c:1366 builtin/gc.c:178
Jiang Xincc760112012-09-15 10:26:13 +08003841msgid "date"
3842msgstr ""
3843
Jiang Xinc138af52013-04-10 15:19:54 +08003844#: builtin/commit.c:1366
Jiang Xincc760112012-09-15 10:26:13 +08003845msgid "override date for commit"
3846msgstr ""
3847
Jiang Xinc138af52013-04-10 15:19:54 +08003848#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533
Jiang Xin9caaf232013-02-14 14:49:45 +08003849#: builtin/notes.c:690 builtin/tag.c:455
Jiang Xincc760112012-09-15 10:26:13 +08003850msgid "message"
3851msgstr ""
3852
Jiang Xinc138af52013-04-10 15:19:54 +08003853#: builtin/commit.c:1367
Jiang Xincc760112012-09-15 10:26:13 +08003854msgid "commit message"
3855msgstr ""
3856
Jiang Xinc138af52013-04-10 15:19:54 +08003857#: builtin/commit.c:1368
Jiang Xincc760112012-09-15 10:26:13 +08003858msgid "reuse and edit message from specified commit"
3859msgstr ""
3860
Jiang Xinc138af52013-04-10 15:19:54 +08003861#: builtin/commit.c:1369
Jiang Xincc760112012-09-15 10:26:13 +08003862msgid "reuse message from specified commit"
3863msgstr ""
3864
Jiang Xinc138af52013-04-10 15:19:54 +08003865#: builtin/commit.c:1370
Jiang Xincc760112012-09-15 10:26:13 +08003866msgid "use autosquash formatted message to fixup specified commit"
3867msgstr ""
3868
Jiang Xinc138af52013-04-10 15:19:54 +08003869#: builtin/commit.c:1371
Jiang Xincc760112012-09-15 10:26:13 +08003870msgid "use autosquash formatted message to squash specified commit"
3871msgstr ""
3872
Jiang Xinc138af52013-04-10 15:19:54 +08003873#: builtin/commit.c:1372
Jiang Xincc760112012-09-15 10:26:13 +08003874msgid "the commit is authored by me now (used with -C/-c/--amend)"
3875msgstr ""
3876
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003877#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109
Jiang Xincc760112012-09-15 10:26:13 +08003878msgid "add Signed-off-by:"
3879msgstr ""
3880
Jiang Xinc138af52013-04-10 15:19:54 +08003881#: builtin/commit.c:1374
Jiang Xincc760112012-09-15 10:26:13 +08003882msgid "use specified template file"
3883msgstr ""
3884
Jiang Xinc138af52013-04-10 15:19:54 +08003885#: builtin/commit.c:1375
Jiang Xincc760112012-09-15 10:26:13 +08003886msgid "force edit of commit"
3887msgstr ""
3888
Jiang Xinc138af52013-04-10 15:19:54 +08003889#: builtin/commit.c:1376
Jiang Xincc760112012-09-15 10:26:13 +08003890msgid "default"
3891msgstr ""
3892
Jiang Xinc138af52013-04-10 15:19:54 +08003893#: builtin/commit.c:1376 builtin/tag.c:460
Jiang Xincc760112012-09-15 10:26:13 +08003894msgid "how to strip spaces and #comments from message"
3895msgstr ""
3896
Jiang Xinc138af52013-04-10 15:19:54 +08003897#: builtin/commit.c:1377
Jiang Xincc760112012-09-15 10:26:13 +08003898msgid "include status in commit message template"
3899msgstr ""
3900
Jiang Xinc138af52013-04-10 15:19:54 +08003901#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461
Jiang Xincc760112012-09-15 10:26:13 +08003902msgid "key id"
3903msgstr ""
3904
Jiang Xinc138af52013-04-10 15:19:54 +08003905#: builtin/commit.c:1379 builtin/merge.c:216
Jiang Xincc760112012-09-15 10:26:13 +08003906msgid "GPG sign commit"
3907msgstr ""
3908
3909#. end commit message options
Jiang Xinc138af52013-04-10 15:19:54 +08003910#: builtin/commit.c:1382
Jiang Xincc760112012-09-15 10:26:13 +08003911msgid "Commit contents options"
3912msgstr ""
3913
Jiang Xinc138af52013-04-10 15:19:54 +08003914#: builtin/commit.c:1383
Jiang Xincc760112012-09-15 10:26:13 +08003915msgid "commit all changed files"
3916msgstr ""
3917
Jiang Xinc138af52013-04-10 15:19:54 +08003918#: builtin/commit.c:1384
Jiang Xincc760112012-09-15 10:26:13 +08003919msgid "add specified files to index for commit"
3920msgstr ""
3921
Jiang Xinc138af52013-04-10 15:19:54 +08003922#: builtin/commit.c:1385
Jiang Xincc760112012-09-15 10:26:13 +08003923msgid "interactively add files"
3924msgstr ""
3925
Jiang Xinc138af52013-04-10 15:19:54 +08003926#: builtin/commit.c:1386
Jiang Xincc760112012-09-15 10:26:13 +08003927msgid "interactively add changes"
3928msgstr ""
3929
Jiang Xinc138af52013-04-10 15:19:54 +08003930#: builtin/commit.c:1387
Jiang Xincc760112012-09-15 10:26:13 +08003931msgid "commit only specified files"
3932msgstr ""
3933
Jiang Xinc138af52013-04-10 15:19:54 +08003934#: builtin/commit.c:1388
Jiang Xincc760112012-09-15 10:26:13 +08003935msgid "bypass pre-commit hook"
3936msgstr ""
3937
Jiang Xinc138af52013-04-10 15:19:54 +08003938#: builtin/commit.c:1389
Jiang Xincc760112012-09-15 10:26:13 +08003939msgid "show what would be committed"
3940msgstr ""
3941
Jiang Xinc138af52013-04-10 15:19:54 +08003942#: builtin/commit.c:1400
Jiang Xincc760112012-09-15 10:26:13 +08003943msgid "amend previous commit"
3944msgstr ""
3945
Jiang Xinc138af52013-04-10 15:19:54 +08003946#: builtin/commit.c:1401
Jiang Xincc760112012-09-15 10:26:13 +08003947msgid "bypass post-rewrite hook"
3948msgstr ""
3949
Jiang Xinc138af52013-04-10 15:19:54 +08003950#: builtin/commit.c:1406
Jiang Xincc760112012-09-15 10:26:13 +08003951msgid "ok to record an empty change"
3952msgstr ""
3953
Jiang Xinc138af52013-04-10 15:19:54 +08003954#: builtin/commit.c:1409
Jiang Xincc760112012-09-15 10:26:13 +08003955msgid "ok to record a change with an empty message"
3956msgstr ""
3957
Jiang Xinc138af52013-04-10 15:19:54 +08003958#: builtin/commit.c:1441
Jiang Xindce37b62012-02-13 14:37:59 +08003959msgid "could not parse HEAD commit"
3960msgstr ""
3961
Jiang Xinc138af52013-04-10 15:19:54 +08003962#: builtin/commit.c:1479 builtin/merge.c:510
Jiang Xindce37b62012-02-13 14:37:59 +08003963#, c-format
3964msgid "could not open '%s' for reading"
3965msgstr ""
3966
Jiang Xinc138af52013-04-10 15:19:54 +08003967#: builtin/commit.c:1486
Jiang Xindce37b62012-02-13 14:37:59 +08003968#, c-format
3969msgid "Corrupt MERGE_HEAD file (%s)"
3970msgstr ""
3971
Jiang Xinc138af52013-04-10 15:19:54 +08003972#: builtin/commit.c:1493
Jiang Xindce37b62012-02-13 14:37:59 +08003973msgid "could not read MERGE_MODE"
3974msgstr ""
3975
Jiang Xinc138af52013-04-10 15:19:54 +08003976#: builtin/commit.c:1512
Jiang Xindce37b62012-02-13 14:37:59 +08003977#, c-format
3978msgid "could not read commit message: %s"
3979msgstr ""
3980
Jiang Xinc138af52013-04-10 15:19:54 +08003981#: builtin/commit.c:1526
Jiang Xincd1e7482012-04-28 20:27:01 +08003982#, c-format
3983msgid "Aborting commit; you did not edit the message.\n"
3984msgstr ""
3985
Jiang Xinc138af52013-04-10 15:19:54 +08003986#: builtin/commit.c:1531
Jiang Xindce37b62012-02-13 14:37:59 +08003987#, c-format
3988msgid "Aborting commit due to empty commit message.\n"
3989msgstr ""
3990
Jiang Xinc138af52013-04-10 15:19:54 +08003991#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872
Jiang Xindce37b62012-02-13 14:37:59 +08003992msgid "failed to write commit object"
3993msgstr ""
3994
Jiang Xinc138af52013-04-10 15:19:54 +08003995#: builtin/commit.c:1567
Jiang Xindce37b62012-02-13 14:37:59 +08003996msgid "cannot lock HEAD ref"
3997msgstr ""
3998
Jiang Xinc138af52013-04-10 15:19:54 +08003999#: builtin/commit.c:1571
Jiang Xindce37b62012-02-13 14:37:59 +08004000msgid "cannot update HEAD ref"
4001msgstr ""
4002
Jiang Xinc138af52013-04-10 15:19:54 +08004003#: builtin/commit.c:1582
Jiang Xindce37b62012-02-13 14:37:59 +08004004msgid ""
4005"Repository has been updated, but unable to write\n"
4006"new_index file. Check that disk is not full or quota is\n"
4007"not exceeded, and then \"git reset HEAD\" to recover."
4008msgstr ""
4009
Jiang Xincc760112012-09-15 10:26:13 +08004010#: builtin/config.c:7
4011msgid "git config [options]"
4012msgstr ""
4013
Jiang Xinfe52cd62012-11-23 14:29:02 +08004014#: builtin/config.c:51
Jiang Xincc760112012-09-15 10:26:13 +08004015msgid "Config file location"
4016msgstr ""
4017
Jiang Xinfe52cd62012-11-23 14:29:02 +08004018#: builtin/config.c:52
Jiang Xincc760112012-09-15 10:26:13 +08004019msgid "use global config file"
4020msgstr ""
4021
Jiang Xinfe52cd62012-11-23 14:29:02 +08004022#: builtin/config.c:53
Jiang Xincc760112012-09-15 10:26:13 +08004023msgid "use system config file"
4024msgstr ""
4025
Jiang Xinfe52cd62012-11-23 14:29:02 +08004026#: builtin/config.c:54
Jiang Xincc760112012-09-15 10:26:13 +08004027msgid "use repository config file"
4028msgstr ""
4029
Jiang Xinfe52cd62012-11-23 14:29:02 +08004030#: builtin/config.c:55
Jiang Xincc760112012-09-15 10:26:13 +08004031msgid "use given config file"
4032msgstr ""
4033
Jiang Xinfe52cd62012-11-23 14:29:02 +08004034#: builtin/config.c:56
Jiang Xincc760112012-09-15 10:26:13 +08004035msgid "Action"
4036msgstr ""
4037
Jiang Xinfe52cd62012-11-23 14:29:02 +08004038#: builtin/config.c:57
Jiang Xincc760112012-09-15 10:26:13 +08004039msgid "get value: name [value-regex]"
4040msgstr ""
4041
Jiang Xinfe52cd62012-11-23 14:29:02 +08004042#: builtin/config.c:58
Jiang Xincc760112012-09-15 10:26:13 +08004043msgid "get all values: key [value-regex]"
4044msgstr ""
4045
Jiang Xinfe52cd62012-11-23 14:29:02 +08004046#: builtin/config.c:59
Jiang Xincc760112012-09-15 10:26:13 +08004047msgid "get values for regexp: name-regex [value-regex]"
4048msgstr ""
4049
Jiang Xinfe52cd62012-11-23 14:29:02 +08004050#: builtin/config.c:60
Jiang Xincc760112012-09-15 10:26:13 +08004051msgid "replace all matching variables: name value [value_regex]"
4052msgstr ""
4053
Jiang Xinfe52cd62012-11-23 14:29:02 +08004054#: builtin/config.c:61
Jiang Xincc760112012-09-15 10:26:13 +08004055msgid "add a new variable: name value"
4056msgstr ""
4057
Jiang Xinfe52cd62012-11-23 14:29:02 +08004058#: builtin/config.c:62
Jiang Xincc760112012-09-15 10:26:13 +08004059msgid "remove a variable: name [value-regex]"
4060msgstr ""
4061
Jiang Xinfe52cd62012-11-23 14:29:02 +08004062#: builtin/config.c:63
Jiang Xincc760112012-09-15 10:26:13 +08004063msgid "remove all matches: name [value-regex]"
4064msgstr ""
4065
Jiang Xinfe52cd62012-11-23 14:29:02 +08004066#: builtin/config.c:64
Jiang Xincc760112012-09-15 10:26:13 +08004067msgid "rename section: old-name new-name"
4068msgstr ""
4069
Jiang Xinfe52cd62012-11-23 14:29:02 +08004070#: builtin/config.c:65
Jiang Xincc760112012-09-15 10:26:13 +08004071msgid "remove a section: name"
4072msgstr ""
4073
Jiang Xinfe52cd62012-11-23 14:29:02 +08004074#: builtin/config.c:66
Jiang Xincc760112012-09-15 10:26:13 +08004075msgid "list all"
4076msgstr ""
4077
Jiang Xinfe52cd62012-11-23 14:29:02 +08004078#: builtin/config.c:67
Jiang Xincc760112012-09-15 10:26:13 +08004079msgid "open an editor"
4080msgstr ""
4081
Jiang Xinfe52cd62012-11-23 14:29:02 +08004082#: builtin/config.c:68 builtin/config.c:69
Jiang Xincc760112012-09-15 10:26:13 +08004083msgid "slot"
4084msgstr ""
4085
Jiang Xinfe52cd62012-11-23 14:29:02 +08004086#: builtin/config.c:68
Jiang Xincc760112012-09-15 10:26:13 +08004087msgid "find the color configured: [default]"
4088msgstr ""
4089
Jiang Xinfe52cd62012-11-23 14:29:02 +08004090#: builtin/config.c:69
Jiang Xincc760112012-09-15 10:26:13 +08004091msgid "find the color setting: [stdout-is-tty]"
4092msgstr ""
4093
Jiang Xinfe52cd62012-11-23 14:29:02 +08004094#: builtin/config.c:70
Jiang Xincc760112012-09-15 10:26:13 +08004095msgid "Type"
4096msgstr ""
4097
Jiang Xinfe52cd62012-11-23 14:29:02 +08004098#: builtin/config.c:71
Jiang Xincc760112012-09-15 10:26:13 +08004099msgid "value is \"true\" or \"false\""
4100msgstr ""
4101
Jiang Xinfe52cd62012-11-23 14:29:02 +08004102#: builtin/config.c:72
Jiang Xincc760112012-09-15 10:26:13 +08004103msgid "value is decimal number"
4104msgstr ""
4105
Jiang Xinfe52cd62012-11-23 14:29:02 +08004106#: builtin/config.c:73
Jiang Xincc760112012-09-15 10:26:13 +08004107msgid "value is --bool or --int"
4108msgstr ""
4109
Jiang Xinfe52cd62012-11-23 14:29:02 +08004110#: builtin/config.c:74
Jiang Xincc760112012-09-15 10:26:13 +08004111msgid "value is a path (file or directory name)"
4112msgstr ""
4113
Jiang Xinfe52cd62012-11-23 14:29:02 +08004114#: builtin/config.c:75
Jiang Xincc760112012-09-15 10:26:13 +08004115msgid "Other"
4116msgstr ""
4117
Jiang Xinfe52cd62012-11-23 14:29:02 +08004118#: builtin/config.c:76
Jiang Xincc760112012-09-15 10:26:13 +08004119msgid "terminate values with NUL byte"
4120msgstr ""
4121
Jiang Xinfe52cd62012-11-23 14:29:02 +08004122#: builtin/config.c:77
Jiang Xincc760112012-09-15 10:26:13 +08004123msgid "respect include directives on lookup"
4124msgstr ""
4125
Jiang Xinc138af52013-04-10 15:19:54 +08004126#: builtin/count-objects.c:82
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004127msgid "git count-objects [-v] [-H | --human-readable]"
4128msgstr ""
4129
4130#: builtin/count-objects.c:97
4131msgid "print sizes in human readable format"
Jiang Xincc760112012-09-15 10:26:13 +08004132msgstr ""
4133
4134#: builtin/describe.c:15
4135msgid "git describe [options] <committish>*"
4136msgstr ""
4137
4138#: builtin/describe.c:16
4139msgid "git describe [options] --dirty"
4140msgstr ""
4141
Jiang Xinc138af52013-04-10 15:19:54 +08004142#: builtin/describe.c:233
Jiang Xindce37b62012-02-13 14:37:59 +08004143#, c-format
4144msgid "annotated tag %s not available"
4145msgstr ""
4146
Jiang Xinc138af52013-04-10 15:19:54 +08004147#: builtin/describe.c:237
Jiang Xindce37b62012-02-13 14:37:59 +08004148#, c-format
4149msgid "annotated tag %s has no embedded name"
4150msgstr ""
4151
Jiang Xinc138af52013-04-10 15:19:54 +08004152#: builtin/describe.c:239
Jiang Xindce37b62012-02-13 14:37:59 +08004153#, c-format
4154msgid "tag '%s' is really '%s' here"
4155msgstr ""
4156
Jiang Xinc138af52013-04-10 15:19:54 +08004157#: builtin/describe.c:266
Jiang Xindce37b62012-02-13 14:37:59 +08004158#, c-format
4159msgid "Not a valid object name %s"
4160msgstr ""
4161
Jiang Xinc138af52013-04-10 15:19:54 +08004162#: builtin/describe.c:269
Jiang Xindce37b62012-02-13 14:37:59 +08004163#, c-format
4164msgid "%s is not a valid '%s' object"
4165msgstr ""
4166
Jiang Xinc138af52013-04-10 15:19:54 +08004167#: builtin/describe.c:286
Jiang Xindce37b62012-02-13 14:37:59 +08004168#, c-format
4169msgid "no tag exactly matches '%s'"
4170msgstr ""
4171
Jiang Xinc138af52013-04-10 15:19:54 +08004172#: builtin/describe.c:288
Jiang Xindce37b62012-02-13 14:37:59 +08004173#, c-format
4174msgid "searching to describe %s\n"
4175msgstr ""
4176
Jiang Xinc138af52013-04-10 15:19:54 +08004177#: builtin/describe.c:328
Jiang Xindce37b62012-02-13 14:37:59 +08004178#, c-format
4179msgid "finished search at %s\n"
4180msgstr ""
4181
Jiang Xinc138af52013-04-10 15:19:54 +08004182#: builtin/describe.c:352
Jiang Xindce37b62012-02-13 14:37:59 +08004183#, c-format
4184msgid ""
4185"No annotated tags can describe '%s'.\n"
4186"However, there were unannotated tags: try --tags."
4187msgstr ""
4188
Jiang Xinc138af52013-04-10 15:19:54 +08004189#: builtin/describe.c:356
Jiang Xindce37b62012-02-13 14:37:59 +08004190#, c-format
4191msgid ""
4192"No tags can describe '%s'.\n"
4193"Try --always, or create some tags."
4194msgstr ""
4195
Jiang Xinc138af52013-04-10 15:19:54 +08004196#: builtin/describe.c:377
Jiang Xindce37b62012-02-13 14:37:59 +08004197#, c-format
4198msgid "traversed %lu commits\n"
4199msgstr ""
4200
Jiang Xinc138af52013-04-10 15:19:54 +08004201#: builtin/describe.c:380
Jiang Xindce37b62012-02-13 14:37:59 +08004202#, c-format
4203msgid ""
4204"more than %i tags found; listed %i most recent\n"
4205"gave up search at %s\n"
4206msgstr ""
4207
Jiang Xinc138af52013-04-10 15:19:54 +08004208#: builtin/describe.c:402
Jiang Xincc760112012-09-15 10:26:13 +08004209msgid "find the tag that comes after the commit"
4210msgstr ""
4211
Jiang Xinc138af52013-04-10 15:19:54 +08004212#: builtin/describe.c:403
Jiang Xincc760112012-09-15 10:26:13 +08004213msgid "debug search strategy on stderr"
4214msgstr ""
4215
Jiang Xinc138af52013-04-10 15:19:54 +08004216#: builtin/describe.c:404
4217msgid "use any ref"
4218msgstr ""
4219
Jiang Xincc760112012-09-15 10:26:13 +08004220#: builtin/describe.c:405
Jiang Xinc138af52013-04-10 15:19:54 +08004221msgid "use any tag, even unannotated"
Jiang Xincc760112012-09-15 10:26:13 +08004222msgstr ""
4223
4224#: builtin/describe.c:406
Jiang Xincc760112012-09-15 10:26:13 +08004225msgid "always use long format"
4226msgstr ""
4227
Jiang Xinc138af52013-04-10 15:19:54 +08004228#: builtin/describe.c:409
Jiang Xincc760112012-09-15 10:26:13 +08004229msgid "only output exact matches"
4230msgstr ""
4231
Jiang Xinc138af52013-04-10 15:19:54 +08004232#: builtin/describe.c:411
Jiang Xincc760112012-09-15 10:26:13 +08004233msgid "consider <n> most recent tags (default: 10)"
4234msgstr ""
4235
Jiang Xinc138af52013-04-10 15:19:54 +08004236#: builtin/describe.c:413
Jiang Xincc760112012-09-15 10:26:13 +08004237msgid "only consider tags matching <pattern>"
4238msgstr ""
4239
Jiang Xinc138af52013-04-10 15:19:54 +08004240#: builtin/describe.c:415 builtin/name-rev.c:238
Jiang Xincc760112012-09-15 10:26:13 +08004241msgid "show abbreviated commit object as fallback"
4242msgstr ""
4243
Jiang Xinc138af52013-04-10 15:19:54 +08004244#: builtin/describe.c:416
Jiang Xincc760112012-09-15 10:26:13 +08004245msgid "mark"
4246msgstr ""
4247
Jiang Xinc138af52013-04-10 15:19:54 +08004248#: builtin/describe.c:417
Jiang Xincc760112012-09-15 10:26:13 +08004249msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4250msgstr ""
4251
Jiang Xinc138af52013-04-10 15:19:54 +08004252#: builtin/describe.c:435
Jiang Xindce37b62012-02-13 14:37:59 +08004253msgid "--long is incompatible with --abbrev=0"
4254msgstr ""
4255
Jiang Xinc138af52013-04-10 15:19:54 +08004256#: builtin/describe.c:461
Jiang Xindce37b62012-02-13 14:37:59 +08004257msgid "No names found, cannot describe anything."
4258msgstr ""
4259
Jiang Xinc138af52013-04-10 15:19:54 +08004260#: builtin/describe.c:481
Jiang Xindce37b62012-02-13 14:37:59 +08004261msgid "--dirty is incompatible with committishes"
4262msgstr ""
4263
Jiang Xinccfca8d2012-09-05 06:20:57 +08004264#: builtin/diff.c:79
Jiang Xindce37b62012-02-13 14:37:59 +08004265#, c-format
4266msgid "'%s': not a regular file or symlink"
4267msgstr ""
4268
Jiang Xinfe52cd62012-11-23 14:29:02 +08004269#: builtin/diff.c:228
Jiang Xindce37b62012-02-13 14:37:59 +08004270#, c-format
4271msgid "invalid option: %s"
4272msgstr ""
4273
Jiang Xinfe52cd62012-11-23 14:29:02 +08004274#: builtin/diff.c:305
Jiang Xindce37b62012-02-13 14:37:59 +08004275msgid "Not a git repository"
4276msgstr ""
4277
Jiang Xinfe52cd62012-11-23 14:29:02 +08004278#: builtin/diff.c:348
Jiang Xindce37b62012-02-13 14:37:59 +08004279#, c-format
4280msgid "invalid object '%s' given."
4281msgstr ""
4282
Jiang Xinfe52cd62012-11-23 14:29:02 +08004283#: builtin/diff.c:353
Jiang Xindce37b62012-02-13 14:37:59 +08004284#, c-format
4285msgid "more than %d trees given: '%s'"
4286msgstr ""
4287
Jiang Xinfe52cd62012-11-23 14:29:02 +08004288#: builtin/diff.c:363
Jiang Xindce37b62012-02-13 14:37:59 +08004289#, c-format
4290msgid "more than two blobs given: '%s'"
4291msgstr ""
4292
Jiang Xinfe52cd62012-11-23 14:29:02 +08004293#: builtin/diff.c:371
Jiang Xindce37b62012-02-13 14:37:59 +08004294#, c-format
4295msgid "unhandled object '%s' given."
4296msgstr ""
4297
Jiang Xincc760112012-09-15 10:26:13 +08004298#: builtin/fast-export.c:22
4299msgid "git fast-export [rev-list-opts]"
4300msgstr ""
4301
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004302#: builtin/fast-export.c:658
Jiang Xincc760112012-09-15 10:26:13 +08004303msgid "show progress after <n> objects"
4304msgstr ""
4305
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004306#: builtin/fast-export.c:660
Jiang Xincc760112012-09-15 10:26:13 +08004307msgid "select handling of signed tags"
4308msgstr ""
4309
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004310#: builtin/fast-export.c:663
Jiang Xincc760112012-09-15 10:26:13 +08004311msgid "select handling of tags that tag filtered objects"
4312msgstr ""
4313
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004314#: builtin/fast-export.c:666
Jiang Xincc760112012-09-15 10:26:13 +08004315msgid "Dump marks to this file"
4316msgstr ""
4317
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004318#: builtin/fast-export.c:668
Jiang Xincc760112012-09-15 10:26:13 +08004319msgid "Import marks from this file"
4320msgstr ""
4321
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004322#: builtin/fast-export.c:670
Jiang Xincc760112012-09-15 10:26:13 +08004323msgid "Fake a tagger when tags lack one"
4324msgstr ""
4325
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004326#: builtin/fast-export.c:672
Jiang Xincc760112012-09-15 10:26:13 +08004327msgid "Output full tree for each commit"
4328msgstr ""
4329
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004330#: builtin/fast-export.c:674
Jiang Xincc760112012-09-15 10:26:13 +08004331msgid "Use the done feature to terminate the stream"
4332msgstr ""
4333
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004334#: builtin/fast-export.c:675
Jiang Xincc760112012-09-15 10:26:13 +08004335msgid "Skip output of blob data"
4336msgstr ""
4337
4338#: builtin/fetch.c:20
4339msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4340msgstr ""
4341
4342#: builtin/fetch.c:21
4343msgid "git fetch [<options>] <group>"
4344msgstr ""
4345
4346#: builtin/fetch.c:22
4347msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4348msgstr ""
4349
4350#: builtin/fetch.c:23
4351msgid "git fetch --all [<options>]"
4352msgstr ""
4353
4354#: builtin/fetch.c:60
4355msgid "fetch from all remotes"
4356msgstr ""
4357
4358#: builtin/fetch.c:62
4359msgid "append to .git/FETCH_HEAD instead of overwriting"
4360msgstr ""
4361
4362#: builtin/fetch.c:64
4363msgid "path to upload pack on remote end"
4364msgstr ""
4365
4366#: builtin/fetch.c:65
4367msgid "force overwrite of local branch"
4368msgstr ""
4369
4370#: builtin/fetch.c:67
4371msgid "fetch from multiple remotes"
4372msgstr ""
4373
4374#: builtin/fetch.c:69
4375msgid "fetch all tags and associated objects"
4376msgstr ""
4377
4378#: builtin/fetch.c:71
4379msgid "do not fetch all tags (--no-tags)"
4380msgstr ""
4381
4382#: builtin/fetch.c:73
4383msgid "prune remote-tracking branches no longer on remote"
4384msgstr ""
4385
4386#: builtin/fetch.c:74
4387msgid "on-demand"
4388msgstr ""
4389
4390#: builtin/fetch.c:75
4391msgid "control recursive fetching of submodules"
4392msgstr ""
4393
4394#: builtin/fetch.c:79
4395msgid "keep downloaded pack"
4396msgstr ""
4397
4398#: builtin/fetch.c:81
4399msgid "allow updating of HEAD ref"
4400msgstr ""
4401
4402#: builtin/fetch.c:84
4403msgid "deepen history of shallow clone"
4404msgstr ""
4405
Jiang Xin9caaf232013-02-14 14:49:45 +08004406#: builtin/fetch.c:86
4407msgid "convert to a complete repository"
4408msgstr ""
4409
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004410#: builtin/fetch.c:88 builtin/log.c:1130
Jiang Xincc760112012-09-15 10:26:13 +08004411msgid "dir"
4412msgstr ""
4413
Jiang Xin9caaf232013-02-14 14:49:45 +08004414#: builtin/fetch.c:89
Jiang Xincc760112012-09-15 10:26:13 +08004415msgid "prepend this to submodule path output"
4416msgstr ""
4417
Jiang Xin9caaf232013-02-14 14:49:45 +08004418#: builtin/fetch.c:92
Jiang Xincc760112012-09-15 10:26:13 +08004419msgid "default mode for recursion"
4420msgstr ""
4421
Jiang Xin9caaf232013-02-14 14:49:45 +08004422#: builtin/fetch.c:204
Jiang Xindce37b62012-02-13 14:37:59 +08004423msgid "Couldn't find remote ref HEAD"
4424msgstr ""
4425
Jiang Xin9caaf232013-02-14 14:49:45 +08004426#: builtin/fetch.c:257
Jiang Xindce37b62012-02-13 14:37:59 +08004427#, c-format
4428msgid "object %s not found"
4429msgstr ""
4430
Jiang Xin9caaf232013-02-14 14:49:45 +08004431#: builtin/fetch.c:262
Jiang Xindce37b62012-02-13 14:37:59 +08004432msgid "[up to date]"
4433msgstr ""
4434
Jiang Xin9caaf232013-02-14 14:49:45 +08004435#: builtin/fetch.c:276
Jiang Xindce37b62012-02-13 14:37:59 +08004436#, c-format
4437msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4438msgstr ""
4439
Jiang Xin9caaf232013-02-14 14:49:45 +08004440#: builtin/fetch.c:277 builtin/fetch.c:363
Jiang Xindce37b62012-02-13 14:37:59 +08004441msgid "[rejected]"
4442msgstr ""
4443
Jiang Xin9caaf232013-02-14 14:49:45 +08004444#: builtin/fetch.c:288
Jiang Xindce37b62012-02-13 14:37:59 +08004445msgid "[tag update]"
4446msgstr ""
4447
Jiang Xin9caaf232013-02-14 14:49:45 +08004448#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
Jiang Xindce37b62012-02-13 14:37:59 +08004449msgid " (unable to update local ref)"
4450msgstr ""
4451
Jiang Xin9caaf232013-02-14 14:49:45 +08004452#: builtin/fetch.c:308
Jiang Xindce37b62012-02-13 14:37:59 +08004453msgid "[new tag]"
4454msgstr ""
4455
Jiang Xin9caaf232013-02-14 14:49:45 +08004456#: builtin/fetch.c:311
Jiang Xindce37b62012-02-13 14:37:59 +08004457msgid "[new branch]"
4458msgstr ""
4459
Jiang Xin9caaf232013-02-14 14:49:45 +08004460#: builtin/fetch.c:314
Jiang Xincd1e7482012-04-28 20:27:01 +08004461msgid "[new ref]"
4462msgstr ""
4463
Jiang Xin9caaf232013-02-14 14:49:45 +08004464#: builtin/fetch.c:359
Jiang Xindce37b62012-02-13 14:37:59 +08004465msgid "unable to update local ref"
4466msgstr ""
4467
Jiang Xin9caaf232013-02-14 14:49:45 +08004468#: builtin/fetch.c:359
Jiang Xindce37b62012-02-13 14:37:59 +08004469msgid "forced update"
4470msgstr ""
4471
Jiang Xin9caaf232013-02-14 14:49:45 +08004472#: builtin/fetch.c:365
Jiang Xindce37b62012-02-13 14:37:59 +08004473msgid "(non-fast-forward)"
4474msgstr ""
4475
Jiang Xin9caaf232013-02-14 14:49:45 +08004476#: builtin/fetch.c:396 builtin/fetch.c:688
Jiang Xindce37b62012-02-13 14:37:59 +08004477#, c-format
4478msgid "cannot open %s: %s\n"
4479msgstr ""
4480
Jiang Xin9caaf232013-02-14 14:49:45 +08004481#: builtin/fetch.c:405
Jiang Xindce37b62012-02-13 14:37:59 +08004482#, c-format
4483msgid "%s did not send all necessary objects\n"
4484msgstr ""
4485
Jiang Xin9caaf232013-02-14 14:49:45 +08004486#: builtin/fetch.c:491
Jiang Xindce37b62012-02-13 14:37:59 +08004487#, c-format
4488msgid "From %.*s\n"
4489msgstr ""
4490
Jiang Xin9caaf232013-02-14 14:49:45 +08004491#: builtin/fetch.c:502
Jiang Xindce37b62012-02-13 14:37:59 +08004492#, c-format
4493msgid ""
4494"some local refs could not be updated; try running\n"
4495" 'git remote prune %s' to remove any old, conflicting branches"
4496msgstr ""
4497
Jiang Xin9caaf232013-02-14 14:49:45 +08004498#: builtin/fetch.c:552
Jiang Xindce37b62012-02-13 14:37:59 +08004499#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +08004500msgid " (%s will become dangling)"
Jiang Xindce37b62012-02-13 14:37:59 +08004501msgstr ""
4502
Jiang Xin9caaf232013-02-14 14:49:45 +08004503#: builtin/fetch.c:553
Jiang Xindce37b62012-02-13 14:37:59 +08004504#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +08004505msgid " (%s has become dangling)"
Jiang Xindce37b62012-02-13 14:37:59 +08004506msgstr ""
4507
Jiang Xin9caaf232013-02-14 14:49:45 +08004508#: builtin/fetch.c:560
Jiang Xindce37b62012-02-13 14:37:59 +08004509msgid "[deleted]"
4510msgstr ""
4511
Jiang Xin9caaf232013-02-14 14:49:45 +08004512#: builtin/fetch.c:561 builtin/remote.c:1055
Jiang Xindce37b62012-02-13 14:37:59 +08004513msgid "(none)"
4514msgstr ""
4515
Jiang Xin9caaf232013-02-14 14:49:45 +08004516#: builtin/fetch.c:678
Jiang Xindce37b62012-02-13 14:37:59 +08004517#, c-format
4518msgid "Refusing to fetch into current branch %s of non-bare repository"
4519msgstr ""
4520
Jiang Xin9caaf232013-02-14 14:49:45 +08004521#: builtin/fetch.c:712
Jiang Xindce37b62012-02-13 14:37:59 +08004522#, c-format
4523msgid "Don't know how to fetch from %s"
4524msgstr ""
4525
Jiang Xin9caaf232013-02-14 14:49:45 +08004526#: builtin/fetch.c:789
Jiang Xindce37b62012-02-13 14:37:59 +08004527#, c-format
4528msgid "Option \"%s\" value \"%s\" is not valid for %s"
4529msgstr ""
4530
Jiang Xin9caaf232013-02-14 14:49:45 +08004531#: builtin/fetch.c:792
Jiang Xindce37b62012-02-13 14:37:59 +08004532#, c-format
4533msgid "Option \"%s\" is ignored for %s\n"
4534msgstr ""
4535
Jiang Xin9caaf232013-02-14 14:49:45 +08004536#: builtin/fetch.c:894
Jiang Xindce37b62012-02-13 14:37:59 +08004537#, c-format
4538msgid "Fetching %s\n"
4539msgstr ""
4540
Jiang Xin9caaf232013-02-14 14:49:45 +08004541#: builtin/fetch.c:896 builtin/remote.c:100
Jiang Xindce37b62012-02-13 14:37:59 +08004542#, c-format
4543msgid "Could not fetch %s"
4544msgstr ""
4545
Jiang Xin9caaf232013-02-14 14:49:45 +08004546#: builtin/fetch.c:915
Jiang Xindce37b62012-02-13 14:37:59 +08004547msgid ""
4548"No remote repository specified. Please, specify either a URL or a\n"
4549"remote name from which new revisions should be fetched."
4550msgstr ""
4551
Jiang Xin9caaf232013-02-14 14:49:45 +08004552#: builtin/fetch.c:935
Jiang Xindce37b62012-02-13 14:37:59 +08004553msgid "You need to specify a tag name."
4554msgstr ""
4555
Jiang Xin9caaf232013-02-14 14:49:45 +08004556#: builtin/fetch.c:981
4557msgid "--depth and --unshallow cannot be used together"
4558msgstr ""
4559
4560#: builtin/fetch.c:983
4561msgid "--unshallow on a complete repository does not make sense"
4562msgstr ""
4563
4564#: builtin/fetch.c:1002
Jiang Xindce37b62012-02-13 14:37:59 +08004565msgid "fetch --all does not take a repository argument"
4566msgstr ""
4567
Jiang Xin9caaf232013-02-14 14:49:45 +08004568#: builtin/fetch.c:1004
Jiang Xindce37b62012-02-13 14:37:59 +08004569msgid "fetch --all does not make sense with refspecs"
4570msgstr ""
4571
Jiang Xin9caaf232013-02-14 14:49:45 +08004572#: builtin/fetch.c:1015
Jiang Xindce37b62012-02-13 14:37:59 +08004573#, c-format
4574msgid "No such remote or remote group: %s"
4575msgstr ""
4576
Jiang Xin9caaf232013-02-14 14:49:45 +08004577#: builtin/fetch.c:1023
Jiang Xindce37b62012-02-13 14:37:59 +08004578msgid "Fetching a group and specifying refspecs does not make sense"
4579msgstr ""
4580
Jiang Xincc760112012-09-15 10:26:13 +08004581#: builtin/fmt-merge-msg.c:13
4582msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4583msgstr ""
4584
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004585#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701
4586#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175
Jiang Xin9caaf232013-02-14 14:49:45 +08004587#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
Jiang Xincc760112012-09-15 10:26:13 +08004588msgid "n"
4589msgstr ""
4590
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004591#: builtin/fmt-merge-msg.c:664
Jiang Xincc760112012-09-15 10:26:13 +08004592msgid "populate log with at most <n> entries from shortlog"
4593msgstr ""
4594
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004595#: builtin/fmt-merge-msg.c:667
Jiang Xincc760112012-09-15 10:26:13 +08004596msgid "alias for --log (deprecated)"
4597msgstr ""
4598
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004599#: builtin/fmt-merge-msg.c:670
Jiang Xincc760112012-09-15 10:26:13 +08004600msgid "text"
4601msgstr ""
4602
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004603#: builtin/fmt-merge-msg.c:671
Jiang Xincc760112012-09-15 10:26:13 +08004604msgid "use <text> as start of message"
4605msgstr ""
4606
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004607#: builtin/fmt-merge-msg.c:672
Jiang Xincc760112012-09-15 10:26:13 +08004608msgid "file to read from"
4609msgstr ""
4610
4611#: builtin/for-each-ref.c:979
4612msgid "git for-each-ref [options] [<pattern>]"
4613msgstr ""
4614
4615#: builtin/for-each-ref.c:994
4616msgid "quote placeholders suitably for shells"
4617msgstr ""
4618
4619#: builtin/for-each-ref.c:996
4620msgid "quote placeholders suitably for perl"
4621msgstr ""
4622
4623#: builtin/for-each-ref.c:998
4624msgid "quote placeholders suitably for python"
4625msgstr ""
4626
4627#: builtin/for-each-ref.c:1000
4628msgid "quote placeholders suitably for tcl"
4629msgstr ""
4630
4631#: builtin/for-each-ref.c:1003
4632msgid "show only <n> matched refs"
4633msgstr ""
4634
4635#: builtin/for-each-ref.c:1004
4636msgid "format"
4637msgstr ""
4638
4639#: builtin/for-each-ref.c:1004
4640msgid "format to use for the output"
4641msgstr ""
4642
4643#: builtin/for-each-ref.c:1005
4644msgid "key"
4645msgstr ""
4646
4647#: builtin/for-each-ref.c:1006
4648msgid "field name to sort on"
4649msgstr ""
4650
4651#: builtin/fsck.c:608
4652msgid "git fsck [options] [<object>...]"
4653msgstr ""
4654
4655#: builtin/fsck.c:614
4656msgid "show unreachable objects"
4657msgstr ""
4658
4659#: builtin/fsck.c:615
4660msgid "show dangling objects"
4661msgstr ""
4662
4663#: builtin/fsck.c:616
4664msgid "report tags"
4665msgstr ""
4666
4667#: builtin/fsck.c:617
4668msgid "report root nodes"
4669msgstr ""
4670
4671#: builtin/fsck.c:618
4672msgid "make index objects head nodes"
4673msgstr ""
4674
4675#: builtin/fsck.c:619
4676msgid "make reflogs head nodes (default)"
4677msgstr ""
4678
4679#: builtin/fsck.c:620
4680msgid "also consider packs and alternate objects"
4681msgstr ""
4682
4683#: builtin/fsck.c:621
4684msgid "enable more strict checking"
4685msgstr ""
4686
4687#: builtin/fsck.c:623
4688msgid "write dangling objects in .git/lost-found"
4689msgstr ""
4690
4691#: builtin/fsck.c:624 builtin/prune.c:134
4692msgid "show progress"
4693msgstr ""
4694
4695#: builtin/gc.c:22
4696msgid "git gc [options]"
4697msgstr ""
4698
Jiang Xindce37b62012-02-13 14:37:59 +08004699#: builtin/gc.c:63
4700#, c-format
4701msgid "Invalid %s: '%s'"
4702msgstr ""
4703
Jiang Xin822e4a62012-05-08 16:10:22 +08004704#: builtin/gc.c:90
Jiang Xindce37b62012-02-13 14:37:59 +08004705#, c-format
4706msgid "insanely long object directory %.*s"
4707msgstr ""
4708
Jiang Xincc760112012-09-15 10:26:13 +08004709#: builtin/gc.c:179
4710msgid "prune unreferenced objects"
4711msgstr ""
4712
4713#: builtin/gc.c:181
4714msgid "be more thorough (increased runtime)"
4715msgstr ""
4716
4717#: builtin/gc.c:182
4718msgid "enable auto-gc mode"
4719msgstr ""
4720
Jiang Xin9306b5b2012-10-16 08:39:10 +08004721#: builtin/gc.c:222
Jiang Xindce37b62012-02-13 14:37:59 +08004722#, c-format
4723msgid ""
4724"Auto packing the repository for optimum performance. You may also\n"
4725"run \"git gc\" manually. See \"git help gc\" for more information.\n"
4726msgstr ""
4727
Jiang Xin9306b5b2012-10-16 08:39:10 +08004728#: builtin/gc.c:249
Jiang Xindce37b62012-02-13 14:37:59 +08004729msgid ""
4730"There are too many unreachable loose objects; run 'git prune' to remove them."
4731msgstr ""
4732
Jiang Xincc760112012-09-15 10:26:13 +08004733#: builtin/grep.c:22
4734msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4735msgstr ""
4736
Jiang Xin9306b5b2012-10-16 08:39:10 +08004737#: builtin/grep.c:217
Jiang Xindce37b62012-02-13 14:37:59 +08004738#, c-format
4739msgid "grep: failed to create thread: %s"
4740msgstr ""
4741
Jiang Xinfe52cd62012-11-23 14:29:02 +08004742#: builtin/grep.c:365
Jiang Xindce37b62012-02-13 14:37:59 +08004743#, c-format
4744msgid "Failed to chdir: %s"
4745msgstr ""
4746
Jiang Xinfe52cd62012-11-23 14:29:02 +08004747#: builtin/grep.c:443 builtin/grep.c:478
Jiang Xindce37b62012-02-13 14:37:59 +08004748#, c-format
4749msgid "unable to read tree (%s)"
4750msgstr ""
4751
Jiang Xinfe52cd62012-11-23 14:29:02 +08004752#: builtin/grep.c:493
Jiang Xindce37b62012-02-13 14:37:59 +08004753#, c-format
4754msgid "unable to grep from object of type %s"
4755msgstr ""
4756
Jiang Xinfe52cd62012-11-23 14:29:02 +08004757#: builtin/grep.c:551
Jiang Xindce37b62012-02-13 14:37:59 +08004758#, c-format
4759msgid "switch `%c' expects a numerical value"
4760msgstr ""
4761
Jiang Xinfe52cd62012-11-23 14:29:02 +08004762#: builtin/grep.c:568
Jiang Xindce37b62012-02-13 14:37:59 +08004763#, c-format
4764msgid "cannot open '%s'"
4765msgstr ""
4766
Jiang Xinfe52cd62012-11-23 14:29:02 +08004767#: builtin/grep.c:643
Jiang Xincc760112012-09-15 10:26:13 +08004768msgid "search in index instead of in the work tree"
4769msgstr ""
4770
Jiang Xinfe52cd62012-11-23 14:29:02 +08004771#: builtin/grep.c:645
Jiang Xincc760112012-09-15 10:26:13 +08004772msgid "find in contents not managed by git"
4773msgstr ""
4774
Jiang Xinfe52cd62012-11-23 14:29:02 +08004775#: builtin/grep.c:647
Jiang Xincc760112012-09-15 10:26:13 +08004776msgid "search in both tracked and untracked files"
4777msgstr ""
4778
Jiang Xinfe52cd62012-11-23 14:29:02 +08004779#: builtin/grep.c:649
Jiang Xincc760112012-09-15 10:26:13 +08004780msgid "search also in ignored files"
4781msgstr ""
4782
Jiang Xinfe52cd62012-11-23 14:29:02 +08004783#: builtin/grep.c:652
Jiang Xincc760112012-09-15 10:26:13 +08004784msgid "show non-matching lines"
4785msgstr ""
4786
Jiang Xinfe52cd62012-11-23 14:29:02 +08004787#: builtin/grep.c:654
Jiang Xincc760112012-09-15 10:26:13 +08004788msgid "case insensitive matching"
4789msgstr ""
4790
Jiang Xinfe52cd62012-11-23 14:29:02 +08004791#: builtin/grep.c:656
Jiang Xincc760112012-09-15 10:26:13 +08004792msgid "match patterns only at word boundaries"
4793msgstr ""
4794
Jiang Xinfe52cd62012-11-23 14:29:02 +08004795#: builtin/grep.c:658
Jiang Xincc760112012-09-15 10:26:13 +08004796msgid "process binary files as text"
4797msgstr ""
4798
Jiang Xinfe52cd62012-11-23 14:29:02 +08004799#: builtin/grep.c:660
Jiang Xincc760112012-09-15 10:26:13 +08004800msgid "don't match patterns in binary files"
4801msgstr ""
4802
Jiang Xinfe52cd62012-11-23 14:29:02 +08004803#: builtin/grep.c:663
Jiang Xincc760112012-09-15 10:26:13 +08004804msgid "descend at most <depth> levels"
4805msgstr ""
4806
Jiang Xinfe52cd62012-11-23 14:29:02 +08004807#: builtin/grep.c:667
Jiang Xincc760112012-09-15 10:26:13 +08004808msgid "use extended POSIX regular expressions"
4809msgstr ""
4810
Jiang Xinfe52cd62012-11-23 14:29:02 +08004811#: builtin/grep.c:670
Jiang Xincc760112012-09-15 10:26:13 +08004812msgid "use basic POSIX regular expressions (default)"
4813msgstr ""
4814
Jiang Xinfe52cd62012-11-23 14:29:02 +08004815#: builtin/grep.c:673
Jiang Xincc760112012-09-15 10:26:13 +08004816msgid "interpret patterns as fixed strings"
4817msgstr ""
4818
Jiang Xinfe52cd62012-11-23 14:29:02 +08004819#: builtin/grep.c:676
Jiang Xincc760112012-09-15 10:26:13 +08004820msgid "use Perl-compatible regular expressions"
4821msgstr ""
4822
Jiang Xinfe52cd62012-11-23 14:29:02 +08004823#: builtin/grep.c:679
Jiang Xincc760112012-09-15 10:26:13 +08004824msgid "show line numbers"
4825msgstr ""
4826
Jiang Xinfe52cd62012-11-23 14:29:02 +08004827#: builtin/grep.c:680
Jiang Xincc760112012-09-15 10:26:13 +08004828msgid "don't show filenames"
4829msgstr ""
4830
Jiang Xinfe52cd62012-11-23 14:29:02 +08004831#: builtin/grep.c:681
Jiang Xincc760112012-09-15 10:26:13 +08004832msgid "show filenames"
4833msgstr ""
4834
Jiang Xinfe52cd62012-11-23 14:29:02 +08004835#: builtin/grep.c:683
Jiang Xincc760112012-09-15 10:26:13 +08004836msgid "show filenames relative to top directory"
4837msgstr ""
4838
Jiang Xinfe52cd62012-11-23 14:29:02 +08004839#: builtin/grep.c:685
Jiang Xincc760112012-09-15 10:26:13 +08004840msgid "show only filenames instead of matching lines"
4841msgstr ""
4842
Jiang Xinfe52cd62012-11-23 14:29:02 +08004843#: builtin/grep.c:687
Jiang Xincc760112012-09-15 10:26:13 +08004844msgid "synonym for --files-with-matches"
4845msgstr ""
4846
Jiang Xinfe52cd62012-11-23 14:29:02 +08004847#: builtin/grep.c:690
Jiang Xincc760112012-09-15 10:26:13 +08004848msgid "show only the names of files without match"
4849msgstr ""
4850
Jiang Xinfe52cd62012-11-23 14:29:02 +08004851#: builtin/grep.c:692
Jiang Xincc760112012-09-15 10:26:13 +08004852msgid "print NUL after filenames"
4853msgstr ""
4854
Jiang Xinfe52cd62012-11-23 14:29:02 +08004855#: builtin/grep.c:694
Jiang Xincc760112012-09-15 10:26:13 +08004856msgid "show the number of matches instead of matching lines"
4857msgstr ""
4858
Jiang Xinfe52cd62012-11-23 14:29:02 +08004859#: builtin/grep.c:695
Jiang Xincc760112012-09-15 10:26:13 +08004860msgid "highlight matches"
4861msgstr ""
4862
Jiang Xinfe52cd62012-11-23 14:29:02 +08004863#: builtin/grep.c:697
Jiang Xincc760112012-09-15 10:26:13 +08004864msgid "print empty line between matches from different files"
4865msgstr ""
4866
Jiang Xinfe52cd62012-11-23 14:29:02 +08004867#: builtin/grep.c:699
Jiang Xincc760112012-09-15 10:26:13 +08004868msgid "show filename only once above matches from same file"
4869msgstr ""
4870
Jiang Xinfe52cd62012-11-23 14:29:02 +08004871#: builtin/grep.c:702
Jiang Xincc760112012-09-15 10:26:13 +08004872msgid "show <n> context lines before and after matches"
4873msgstr ""
4874
Jiang Xinfe52cd62012-11-23 14:29:02 +08004875#: builtin/grep.c:705
Jiang Xincc760112012-09-15 10:26:13 +08004876msgid "show <n> context lines before matches"
4877msgstr ""
4878
Jiang Xinfe52cd62012-11-23 14:29:02 +08004879#: builtin/grep.c:707
Jiang Xincc760112012-09-15 10:26:13 +08004880msgid "show <n> context lines after matches"
4881msgstr ""
4882
Jiang Xinfe52cd62012-11-23 14:29:02 +08004883#: builtin/grep.c:708
Jiang Xincc760112012-09-15 10:26:13 +08004884msgid "shortcut for -C NUM"
4885msgstr ""
4886
Jiang Xinfe52cd62012-11-23 14:29:02 +08004887#: builtin/grep.c:711
Jiang Xincc760112012-09-15 10:26:13 +08004888msgid "show a line with the function name before matches"
4889msgstr ""
4890
Jiang Xinfe52cd62012-11-23 14:29:02 +08004891#: builtin/grep.c:713
Jiang Xincc760112012-09-15 10:26:13 +08004892msgid "show the surrounding function"
4893msgstr ""
4894
Jiang Xinfe52cd62012-11-23 14:29:02 +08004895#: builtin/grep.c:716
Jiang Xincc760112012-09-15 10:26:13 +08004896msgid "read patterns from file"
4897msgstr ""
4898
Jiang Xinfe52cd62012-11-23 14:29:02 +08004899#: builtin/grep.c:718
Jiang Xincc760112012-09-15 10:26:13 +08004900msgid "match <pattern>"
4901msgstr ""
4902
Jiang Xinfe52cd62012-11-23 14:29:02 +08004903#: builtin/grep.c:720
Jiang Xincc760112012-09-15 10:26:13 +08004904msgid "combine patterns specified with -e"
4905msgstr ""
4906
Jiang Xinfe52cd62012-11-23 14:29:02 +08004907#: builtin/grep.c:732
Jiang Xincc760112012-09-15 10:26:13 +08004908msgid "indicate hit with exit status without output"
4909msgstr ""
4910
Jiang Xinfe52cd62012-11-23 14:29:02 +08004911#: builtin/grep.c:734
Jiang Xincc760112012-09-15 10:26:13 +08004912msgid "show only matches from files that match all patterns"
4913msgstr ""
4914
Jiang Xinfe52cd62012-11-23 14:29:02 +08004915#: builtin/grep.c:736
Jiang Xin9306b5b2012-10-16 08:39:10 +08004916msgid "show parse tree for grep expression"
4917msgstr ""
4918
Jiang Xinfe52cd62012-11-23 14:29:02 +08004919#: builtin/grep.c:740
Jiang Xincc760112012-09-15 10:26:13 +08004920msgid "pager"
4921msgstr ""
4922
Jiang Xinfe52cd62012-11-23 14:29:02 +08004923#: builtin/grep.c:740
Jiang Xincc760112012-09-15 10:26:13 +08004924msgid "show matching files in the pager"
4925msgstr ""
4926
Jiang Xinfe52cd62012-11-23 14:29:02 +08004927#: builtin/grep.c:743
Jiang Xincc760112012-09-15 10:26:13 +08004928msgid "allow calling of grep(1) (ignored by this build)"
4929msgstr ""
4930
Jiang Xinfe52cd62012-11-23 14:29:02 +08004931#: builtin/grep.c:744 builtin/show-ref.c:184
Jiang Xincc760112012-09-15 10:26:13 +08004932msgid "show usage"
4933msgstr ""
4934
Jiang Xinfe52cd62012-11-23 14:29:02 +08004935#: builtin/grep.c:811
Jiang Xindce37b62012-02-13 14:37:59 +08004936msgid "no pattern given."
4937msgstr ""
4938
Jiang Xinc138af52013-04-10 15:19:54 +08004939#: builtin/grep.c:866
Jiang Xindce37b62012-02-13 14:37:59 +08004940msgid "--open-files-in-pager only works on the worktree"
4941msgstr ""
4942
Jiang Xinc138af52013-04-10 15:19:54 +08004943#: builtin/grep.c:889
Jiang Xindce37b62012-02-13 14:37:59 +08004944msgid "--cached or --untracked cannot be used with --no-index."
4945msgstr ""
4946
Jiang Xinc138af52013-04-10 15:19:54 +08004947#: builtin/grep.c:894
Jiang Xindce37b62012-02-13 14:37:59 +08004948msgid "--no-index or --untracked cannot be used with revs."
4949msgstr ""
4950
Jiang Xinc138af52013-04-10 15:19:54 +08004951#: builtin/grep.c:897
Jiang Xindce37b62012-02-13 14:37:59 +08004952msgid "--[no-]exclude-standard cannot be used for tracked contents."
4953msgstr ""
4954
Jiang Xinc138af52013-04-10 15:19:54 +08004955#: builtin/grep.c:905
Jiang Xindce37b62012-02-13 14:37:59 +08004956msgid "both --cached and trees are given."
4957msgstr ""
4958
Jiang Xincc760112012-09-15 10:26:13 +08004959#: builtin/hash-object.c:60
4960msgid ""
4961"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4962"<file>..."
4963msgstr ""
4964
4965#: builtin/hash-object.c:61
4966msgid "git hash-object --stdin-paths < <list-of-paths>"
4967msgstr ""
4968
4969#: builtin/hash-object.c:72
4970msgid "type"
4971msgstr ""
4972
4973#: builtin/hash-object.c:72
4974msgid "object type"
4975msgstr ""
4976
4977#: builtin/hash-object.c:73
4978msgid "write the object into the object database"
4979msgstr ""
4980
4981#: builtin/hash-object.c:74
4982msgid "read the object from stdin"
4983msgstr ""
4984
4985#: builtin/hash-object.c:76
4986msgid "store file as is without filters"
4987msgstr ""
4988
4989#: builtin/hash-object.c:77
4990msgid "process file as it were from this path"
4991msgstr ""
4992
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004993#: builtin/help.c:43
Jiang Xincc760112012-09-15 10:26:13 +08004994msgid "print all available commands"
4995msgstr ""
4996
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004997#: builtin/help.c:44
4998msgid "print list of useful guides"
4999msgstr ""
5000
5001#: builtin/help.c:45
Jiang Xincc760112012-09-15 10:26:13 +08005002msgid "show man page"
5003msgstr ""
5004
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005005#: builtin/help.c:46
Jiang Xincc760112012-09-15 10:26:13 +08005006msgid "show manual in web browser"
5007msgstr ""
5008
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005009#: builtin/help.c:48
Jiang Xincc760112012-09-15 10:26:13 +08005010msgid "show info page"
5011msgstr ""
5012
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005013#: builtin/help.c:54
5014msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
Jiang Xincc760112012-09-15 10:26:13 +08005015msgstr ""
5016
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005017#: builtin/help.c:66
Jiang Xin822e4a62012-05-08 16:10:22 +08005018#, c-format
5019msgid "unrecognized help format '%s'"
5020msgstr ""
5021
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005022#: builtin/help.c:94
Jiang Xin822e4a62012-05-08 16:10:22 +08005023msgid "Failed to start emacsclient."
5024msgstr ""
5025
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005026#: builtin/help.c:107
Jiang Xin822e4a62012-05-08 16:10:22 +08005027msgid "Failed to parse emacsclient version."
5028msgstr ""
5029
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005030#: builtin/help.c:115
Jiang Xin822e4a62012-05-08 16:10:22 +08005031#, c-format
5032msgid "emacsclient version '%d' too old (< 22)."
5033msgstr ""
5034
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005035#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178
Jiang Xin822e4a62012-05-08 16:10:22 +08005036#, c-format
5037msgid "failed to exec '%s': %s"
5038msgstr ""
5039
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005040#: builtin/help.c:218
Jiang Xin822e4a62012-05-08 16:10:22 +08005041#, c-format
5042msgid ""
5043"'%s': path for unsupported man viewer.\n"
5044"Please consider using 'man.<tool>.cmd' instead."
5045msgstr ""
5046
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005047#: builtin/help.c:230
Jiang Xin822e4a62012-05-08 16:10:22 +08005048#, c-format
5049msgid ""
5050"'%s': cmd for supported man viewer.\n"
5051"Please consider using 'man.<tool>.path' instead."
5052msgstr ""
5053
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005054#: builtin/help.c:351
Jiang Xin822e4a62012-05-08 16:10:22 +08005055#, c-format
5056msgid "'%s': unknown man viewer."
5057msgstr ""
5058
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005059#: builtin/help.c:368
Jiang Xin822e4a62012-05-08 16:10:22 +08005060msgid "no man viewer handled the request"
5061msgstr ""
5062
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005063#: builtin/help.c:376
Jiang Xin822e4a62012-05-08 16:10:22 +08005064msgid "no info viewer handled the request"
5065msgstr ""
5066
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005067#: builtin/help.c:422
5068msgid "Defining attributes per path"
5069msgstr ""
5070
5071#: builtin/help.c:423
5072msgid "A Git glossary"
5073msgstr ""
5074
5075#: builtin/help.c:424
5076msgid "Specifies intentionally untracked files to ignore"
5077msgstr ""
5078
5079#: builtin/help.c:425
5080msgid "Defining submodule properties"
5081msgstr ""
5082
5083#: builtin/help.c:426
5084msgid "Specifying revisions and ranges for Git"
5085msgstr ""
5086
5087#: builtin/help.c:427
5088msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5089msgstr ""
5090
5091#: builtin/help.c:428
5092msgid "An overview of recommended workflows with Git"
5093msgstr ""
5094
5095#: builtin/help.c:440
5096msgid "The common Git guides are:\n"
5097msgstr ""
5098
5099#: builtin/help.c:462 builtin/help.c:478
Jiang Xin822e4a62012-05-08 16:10:22 +08005100#, c-format
5101msgid "usage: %s%s"
5102msgstr ""
5103
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005104#: builtin/help.c:494
Jiang Xin822e4a62012-05-08 16:10:22 +08005105#, c-format
5106msgid "`git %s' is aliased to `%s'"
5107msgstr ""
5108
Jiang Xinc138af52013-04-10 15:19:54 +08005109#: builtin/index-pack.c:182
Jiang Xin822e4a62012-05-08 16:10:22 +08005110#, c-format
5111msgid "object type mismatch at %s"
5112msgstr ""
5113
Jiang Xinc138af52013-04-10 15:19:54 +08005114#: builtin/index-pack.c:202
Jiang Xin822e4a62012-05-08 16:10:22 +08005115msgid "object of unexpected type"
5116msgstr ""
5117
Jiang Xinc138af52013-04-10 15:19:54 +08005118#: builtin/index-pack.c:239
Jiang Xin822e4a62012-05-08 16:10:22 +08005119#, c-format
5120msgid "cannot fill %d byte"
5121msgid_plural "cannot fill %d bytes"
5122msgstr[0] ""
5123msgstr[1] ""
5124
Jiang Xinc138af52013-04-10 15:19:54 +08005125#: builtin/index-pack.c:249
Jiang Xin822e4a62012-05-08 16:10:22 +08005126msgid "early EOF"
5127msgstr ""
5128
Jiang Xinc138af52013-04-10 15:19:54 +08005129#: builtin/index-pack.c:250
Jiang Xin822e4a62012-05-08 16:10:22 +08005130msgid "read error on input"
5131msgstr ""
5132
Jiang Xinc138af52013-04-10 15:19:54 +08005133#: builtin/index-pack.c:262
Jiang Xin822e4a62012-05-08 16:10:22 +08005134msgid "used more bytes than were available"
5135msgstr ""
5136
Jiang Xinc138af52013-04-10 15:19:54 +08005137#: builtin/index-pack.c:269
Jiang Xin822e4a62012-05-08 16:10:22 +08005138msgid "pack too large for current definition of off_t"
5139msgstr ""
5140
Jiang Xinc138af52013-04-10 15:19:54 +08005141#: builtin/index-pack.c:285
Jiang Xin822e4a62012-05-08 16:10:22 +08005142#, c-format
5143msgid "unable to create '%s'"
5144msgstr ""
5145
Jiang Xinc138af52013-04-10 15:19:54 +08005146#: builtin/index-pack.c:290
Jiang Xin822e4a62012-05-08 16:10:22 +08005147#, c-format
5148msgid "cannot open packfile '%s'"
5149msgstr ""
5150
Jiang Xinc138af52013-04-10 15:19:54 +08005151#: builtin/index-pack.c:304
Jiang Xin822e4a62012-05-08 16:10:22 +08005152msgid "pack signature mismatch"
5153msgstr ""
5154
Jiang Xinc138af52013-04-10 15:19:54 +08005155#: builtin/index-pack.c:306
Jiang Xincc760112012-09-15 10:26:13 +08005156#, c-format
5157msgid "pack version %<PRIu32> unsupported"
5158msgstr ""
5159
Jiang Xinc138af52013-04-10 15:19:54 +08005160#: builtin/index-pack.c:324
Jiang Xin822e4a62012-05-08 16:10:22 +08005161#, c-format
5162msgid "pack has bad object at offset %lu: %s"
5163msgstr ""
5164
Jiang Xinc138af52013-04-10 15:19:54 +08005165#: builtin/index-pack.c:446
Jiang Xin822e4a62012-05-08 16:10:22 +08005166#, c-format
5167msgid "inflate returned %d"
5168msgstr ""
5169
Jiang Xinc138af52013-04-10 15:19:54 +08005170#: builtin/index-pack.c:495
Jiang Xin822e4a62012-05-08 16:10:22 +08005171msgid "offset value overflow for delta base object"
5172msgstr ""
5173
Jiang Xinc138af52013-04-10 15:19:54 +08005174#: builtin/index-pack.c:503
Jiang Xin822e4a62012-05-08 16:10:22 +08005175msgid "delta base offset is out of bound"
5176msgstr ""
5177
Jiang Xinc138af52013-04-10 15:19:54 +08005178#: builtin/index-pack.c:511
Jiang Xin822e4a62012-05-08 16:10:22 +08005179#, c-format
5180msgid "unknown object type %d"
5181msgstr ""
5182
Jiang Xinc138af52013-04-10 15:19:54 +08005183#: builtin/index-pack.c:542
Jiang Xin822e4a62012-05-08 16:10:22 +08005184msgid "cannot pread pack file"
5185msgstr ""
5186
Jiang Xinc138af52013-04-10 15:19:54 +08005187#: builtin/index-pack.c:544
Jiang Xin822e4a62012-05-08 16:10:22 +08005188#, c-format
5189msgid "premature end of pack file, %lu byte missing"
5190msgid_plural "premature end of pack file, %lu bytes missing"
5191msgstr[0] ""
5192msgstr[1] ""
5193
Jiang Xinc138af52013-04-10 15:19:54 +08005194#: builtin/index-pack.c:570
Jiang Xin822e4a62012-05-08 16:10:22 +08005195msgid "serious inflate inconsistency"
5196msgstr ""
5197
Jiang Xinc138af52013-04-10 15:19:54 +08005198#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690
5199#: builtin/index-pack.c:724 builtin/index-pack.c:733
Jiang Xin822e4a62012-05-08 16:10:22 +08005200#, c-format
5201msgid "SHA1 COLLISION FOUND WITH %s !"
5202msgstr ""
5203
Jiang Xinc138af52013-04-10 15:19:54 +08005204#: builtin/index-pack.c:664 builtin/pack-objects.c:170
Jiang Xin11b90172012-07-03 10:31:59 +08005205#: builtin/pack-objects.c:262
5206#, c-format
5207msgid "unable to read %s"
5208msgstr ""
5209
Jiang Xinc138af52013-04-10 15:19:54 +08005210#: builtin/index-pack.c:730
Jiang Xin11b90172012-07-03 10:31:59 +08005211#, c-format
5212msgid "cannot read existing object %s"
5213msgstr ""
5214
Jiang Xinc138af52013-04-10 15:19:54 +08005215#: builtin/index-pack.c:744
Jiang Xin822e4a62012-05-08 16:10:22 +08005216#, c-format
5217msgid "invalid blob object %s"
5218msgstr ""
5219
Jiang Xinc138af52013-04-10 15:19:54 +08005220#: builtin/index-pack.c:759
Jiang Xin822e4a62012-05-08 16:10:22 +08005221#, c-format
5222msgid "invalid %s"
5223msgstr ""
5224
Jiang Xinc138af52013-04-10 15:19:54 +08005225#: builtin/index-pack.c:761
Jiang Xin822e4a62012-05-08 16:10:22 +08005226msgid "Error in object"
5227msgstr ""
5228
Jiang Xinc138af52013-04-10 15:19:54 +08005229#: builtin/index-pack.c:763
Jiang Xin822e4a62012-05-08 16:10:22 +08005230#, c-format
5231msgid "Not all child objects of %s are reachable"
5232msgstr ""
5233
Jiang Xinc138af52013-04-10 15:19:54 +08005234#: builtin/index-pack.c:833 builtin/index-pack.c:863
Jiang Xin822e4a62012-05-08 16:10:22 +08005235msgid "failed to apply delta"
5236msgstr ""
5237
Jiang Xinc138af52013-04-10 15:19:54 +08005238#: builtin/index-pack.c:1004
Jiang Xin822e4a62012-05-08 16:10:22 +08005239msgid "Receiving objects"
5240msgstr ""
5241
Jiang Xinc138af52013-04-10 15:19:54 +08005242#: builtin/index-pack.c:1004
Jiang Xin822e4a62012-05-08 16:10:22 +08005243msgid "Indexing objects"
5244msgstr ""
5245
Jiang Xinc138af52013-04-10 15:19:54 +08005246#: builtin/index-pack.c:1030
Jiang Xin822e4a62012-05-08 16:10:22 +08005247msgid "pack is corrupted (SHA1 mismatch)"
5248msgstr ""
5249
Jiang Xinc138af52013-04-10 15:19:54 +08005250#: builtin/index-pack.c:1035
Jiang Xin822e4a62012-05-08 16:10:22 +08005251msgid "cannot fstat packfile"
5252msgstr ""
5253
Jiang Xinc138af52013-04-10 15:19:54 +08005254#: builtin/index-pack.c:1038
Jiang Xin822e4a62012-05-08 16:10:22 +08005255msgid "pack has junk at the end"
5256msgstr ""
5257
Jiang Xinc138af52013-04-10 15:19:54 +08005258#: builtin/index-pack.c:1049
Jiang Xin11b90172012-07-03 10:31:59 +08005259msgid "confusion beyond insanity in parse_pack_objects()"
5260msgstr ""
5261
Jiang Xinc138af52013-04-10 15:19:54 +08005262#: builtin/index-pack.c:1072
Jiang Xin822e4a62012-05-08 16:10:22 +08005263msgid "Resolving deltas"
5264msgstr ""
5265
Jiang Xinc138af52013-04-10 15:19:54 +08005266#: builtin/index-pack.c:1082
Jiang Xincc760112012-09-15 10:26:13 +08005267#, c-format
5268msgid "unable to create thread: %s"
5269msgstr ""
5270
Jiang Xinc138af52013-04-10 15:19:54 +08005271#: builtin/index-pack.c:1124
Jiang Xin93329722012-05-15 06:43:03 +08005272msgid "confusion beyond insanity"
5273msgstr ""
5274
Jiang Xinc138af52013-04-10 15:19:54 +08005275#: builtin/index-pack.c:1132
Jiang Xincc760112012-09-15 10:26:13 +08005276#, c-format
5277msgid "completed with %d local objects"
5278msgstr ""
5279
Jiang Xinc138af52013-04-10 15:19:54 +08005280#: builtin/index-pack.c:1142
Jiang Xincc760112012-09-15 10:26:13 +08005281#, c-format
5282msgid "Unexpected tail checksum for %s (disk corruption?)"
5283msgstr ""
5284
Jiang Xinc138af52013-04-10 15:19:54 +08005285#: builtin/index-pack.c:1146
Jiang Xin93329722012-05-15 06:43:03 +08005286#, c-format
5287msgid "pack has %d unresolved delta"
5288msgid_plural "pack has %d unresolved deltas"
5289msgstr[0] ""
5290msgstr[1] ""
5291
Jiang Xinc138af52013-04-10 15:19:54 +08005292#: builtin/index-pack.c:1171
Jiang Xin822e4a62012-05-08 16:10:22 +08005293#, c-format
5294msgid "unable to deflate appended object (%d)"
5295msgstr ""
5296
Jiang Xinc138af52013-04-10 15:19:54 +08005297#: builtin/index-pack.c:1250
Jiang Xin822e4a62012-05-08 16:10:22 +08005298#, c-format
5299msgid "local object %s is corrupt"
5300msgstr ""
5301
Jiang Xinc138af52013-04-10 15:19:54 +08005302#: builtin/index-pack.c:1274
Jiang Xin822e4a62012-05-08 16:10:22 +08005303msgid "error while closing pack file"
5304msgstr ""
5305
Jiang Xinc138af52013-04-10 15:19:54 +08005306#: builtin/index-pack.c:1287
Jiang Xin822e4a62012-05-08 16:10:22 +08005307#, c-format
5308msgid "cannot write keep file '%s'"
5309msgstr ""
5310
Jiang Xinc138af52013-04-10 15:19:54 +08005311#: builtin/index-pack.c:1295
Jiang Xin822e4a62012-05-08 16:10:22 +08005312#, c-format
5313msgid "cannot close written keep file '%s'"
5314msgstr ""
5315
Jiang Xinc138af52013-04-10 15:19:54 +08005316#: builtin/index-pack.c:1308
Jiang Xin822e4a62012-05-08 16:10:22 +08005317msgid "cannot store pack file"
5318msgstr ""
5319
Jiang Xinc138af52013-04-10 15:19:54 +08005320#: builtin/index-pack.c:1319
Jiang Xin822e4a62012-05-08 16:10:22 +08005321msgid "cannot store index file"
5322msgstr ""
5323
Jiang Xinc138af52013-04-10 15:19:54 +08005324#: builtin/index-pack.c:1352
Jiang Xincc760112012-09-15 10:26:13 +08005325#, c-format
5326msgid "bad pack.indexversion=%<PRIu32>"
5327msgstr ""
5328
Jiang Xinc138af52013-04-10 15:19:54 +08005329#: builtin/index-pack.c:1358
Jiang Xincc760112012-09-15 10:26:13 +08005330#, c-format
5331msgid "invalid number of threads specified (%d)"
5332msgstr ""
5333
Jiang Xinc138af52013-04-10 15:19:54 +08005334#: builtin/index-pack.c:1362 builtin/index-pack.c:1535
Jiang Xincc760112012-09-15 10:26:13 +08005335#, c-format
5336msgid "no threads support, ignoring %s"
5337msgstr ""
5338
Jiang Xinc138af52013-04-10 15:19:54 +08005339#: builtin/index-pack.c:1420
Jiang Xin822e4a62012-05-08 16:10:22 +08005340#, c-format
5341msgid "Cannot open existing pack file '%s'"
5342msgstr ""
5343
Jiang Xinc138af52013-04-10 15:19:54 +08005344#: builtin/index-pack.c:1422
Jiang Xin822e4a62012-05-08 16:10:22 +08005345#, c-format
5346msgid "Cannot open existing pack idx file for '%s'"
5347msgstr ""
5348
Jiang Xinc138af52013-04-10 15:19:54 +08005349#: builtin/index-pack.c:1469
Jiang Xin822e4a62012-05-08 16:10:22 +08005350#, c-format
5351msgid "non delta: %d object"
5352msgid_plural "non delta: %d objects"
5353msgstr[0] ""
5354msgstr[1] ""
5355
Jiang Xinc138af52013-04-10 15:19:54 +08005356#: builtin/index-pack.c:1476
Jiang Xin822e4a62012-05-08 16:10:22 +08005357#, c-format
5358msgid "chain length = %d: %lu object"
5359msgid_plural "chain length = %d: %lu objects"
5360msgstr[0] ""
5361msgstr[1] ""
5362
Jiang Xinc138af52013-04-10 15:19:54 +08005363#: builtin/index-pack.c:1503
Jiang Xin822e4a62012-05-08 16:10:22 +08005364msgid "Cannot come back to cwd"
5365msgstr ""
5366
Jiang Xinc138af52013-04-10 15:19:54 +08005367#: builtin/index-pack.c:1547 builtin/index-pack.c:1550
5368#: builtin/index-pack.c:1562 builtin/index-pack.c:1566
Jiang Xin822e4a62012-05-08 16:10:22 +08005369#, c-format
5370msgid "bad %s"
5371msgstr ""
5372
Jiang Xinc138af52013-04-10 15:19:54 +08005373#: builtin/index-pack.c:1580
Jiang Xin822e4a62012-05-08 16:10:22 +08005374msgid "--fix-thin cannot be used without --stdin"
5375msgstr ""
5376
Jiang Xinc138af52013-04-10 15:19:54 +08005377#: builtin/index-pack.c:1584 builtin/index-pack.c:1594
Jiang Xin822e4a62012-05-08 16:10:22 +08005378#, c-format
5379msgid "packfile name '%s' does not end with '.pack'"
5380msgstr ""
5381
Jiang Xinc138af52013-04-10 15:19:54 +08005382#: builtin/index-pack.c:1603
Jiang Xin822e4a62012-05-08 16:10:22 +08005383msgid "--verify with no packfile name given"
5384msgstr ""
5385
Jiang Xindce37b62012-02-13 14:37:59 +08005386#: builtin/init-db.c:35
5387#, c-format
5388msgid "Could not make %s writable by group"
5389msgstr ""
5390
5391#: builtin/init-db.c:62
5392#, c-format
5393msgid "insanely long template name %s"
5394msgstr ""
5395
5396#: builtin/init-db.c:67
5397#, c-format
5398msgid "cannot stat '%s'"
5399msgstr ""
5400
5401#: builtin/init-db.c:73
5402#, c-format
5403msgid "cannot stat template '%s'"
5404msgstr ""
5405
5406#: builtin/init-db.c:80
5407#, c-format
5408msgid "cannot opendir '%s'"
5409msgstr ""
5410
5411#: builtin/init-db.c:97
5412#, c-format
5413msgid "cannot readlink '%s'"
5414msgstr ""
5415
5416#: builtin/init-db.c:99
5417#, c-format
5418msgid "insanely long symlink %s"
5419msgstr ""
5420
5421#: builtin/init-db.c:102
5422#, c-format
5423msgid "cannot symlink '%s' '%s'"
5424msgstr ""
5425
5426#: builtin/init-db.c:106
5427#, c-format
5428msgid "cannot copy '%s' to '%s'"
5429msgstr ""
5430
5431#: builtin/init-db.c:110
5432#, c-format
5433msgid "ignoring template %s"
5434msgstr ""
5435
5436#: builtin/init-db.c:133
5437#, c-format
5438msgid "insanely long template path %s"
5439msgstr ""
5440
5441#: builtin/init-db.c:141
5442#, c-format
5443msgid "templates not found %s"
5444msgstr ""
5445
5446#: builtin/init-db.c:154
5447#, c-format
5448msgid "not copying templates of a wrong format version %d from '%s'"
5449msgstr ""
5450
5451#: builtin/init-db.c:192
5452#, c-format
5453msgid "insane git directory %s"
5454msgstr ""
5455
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005456#: builtin/init-db.c:323 builtin/init-db.c:326
Jiang Xindce37b62012-02-13 14:37:59 +08005457#, c-format
5458msgid "%s already exists"
5459msgstr ""
5460
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005461#: builtin/init-db.c:355
Jiang Xindce37b62012-02-13 14:37:59 +08005462#, c-format
5463msgid "unable to handle file type %d"
5464msgstr ""
5465
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005466#: builtin/init-db.c:358
Jiang Xindce37b62012-02-13 14:37:59 +08005467#, c-format
5468msgid "unable to move %s to %s"
5469msgstr ""
5470
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005471#: builtin/init-db.c:363
Jiang Xindce37b62012-02-13 14:37:59 +08005472#, c-format
5473msgid "Could not create git link %s"
5474msgstr ""
5475
5476#.
5477#. * TRANSLATORS: The first '%s' is either "Reinitialized
5478#. * existing" or "Initialized empty", the second " shared" or
5479#. * "", and the last '%s%s' is the verbatim directory name.
5480#.
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005481#: builtin/init-db.c:420
Jiang Xindce37b62012-02-13 14:37:59 +08005482#, c-format
5483msgid "%s%s Git repository in %s%s\n"
5484msgstr ""
5485
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005486#: builtin/init-db.c:421
Jiang Xindce37b62012-02-13 14:37:59 +08005487msgid "Reinitialized existing"
5488msgstr ""
5489
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005490#: builtin/init-db.c:421
Jiang Xindce37b62012-02-13 14:37:59 +08005491msgid "Initialized empty"
5492msgstr ""
5493
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005494#: builtin/init-db.c:422
Jiang Xindce37b62012-02-13 14:37:59 +08005495msgid " shared"
5496msgstr ""
5497
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005498#: builtin/init-db.c:441
Jiang Xindce37b62012-02-13 14:37:59 +08005499msgid "cannot tell cwd"
5500msgstr ""
5501
Jiang Xincc760112012-09-15 10:26:13 +08005502#: builtin/init-db.c:467
5503msgid ""
Jiang Xin9caaf232013-02-14 14:49:45 +08005504"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5505"shared[=<permissions>]] [directory]"
Jiang Xincc760112012-09-15 10:26:13 +08005506msgstr ""
5507
5508#: builtin/init-db.c:490
5509msgid "permissions"
5510msgstr ""
5511
5512#: builtin/init-db.c:491
5513msgid "specify that the git repository is to be shared amongst several users"
5514msgstr ""
5515
5516#: builtin/init-db.c:493 builtin/prune-packed.c:77
5517msgid "be quiet"
5518msgstr ""
5519
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005520#: builtin/init-db.c:522 builtin/init-db.c:529
Jiang Xindce37b62012-02-13 14:37:59 +08005521#, c-format
5522msgid "cannot mkdir %s"
5523msgstr ""
5524
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005525#: builtin/init-db.c:533
Jiang Xindce37b62012-02-13 14:37:59 +08005526#, c-format
5527msgid "cannot chdir to %s"
5528msgstr ""
5529
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005530#: builtin/init-db.c:555
Jiang Xindce37b62012-02-13 14:37:59 +08005531#, c-format
5532msgid ""
5533"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5534"dir=<directory>)"
5535msgstr ""
5536
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005537#: builtin/init-db.c:579
Jiang Xindce37b62012-02-13 14:37:59 +08005538msgid "Cannot access current working directory"
5539msgstr ""
5540
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005541#: builtin/init-db.c:586
Jiang Xindce37b62012-02-13 14:37:59 +08005542#, c-format
5543msgid "Cannot access work tree '%s'"
5544msgstr ""
5545
Jiang Xinc138af52013-04-10 15:19:54 +08005546#: builtin/log.c:40
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005547msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
Jiang Xincc760112012-09-15 10:26:13 +08005548msgstr ""
5549
Jiang Xinc138af52013-04-10 15:19:54 +08005550#: builtin/log.c:41
Jiang Xincc760112012-09-15 10:26:13 +08005551msgid " or: git show [options] <object>..."
5552msgstr ""
5553
Jiang Xinc138af52013-04-10 15:19:54 +08005554#: builtin/log.c:103
Jiang Xincc760112012-09-15 10:26:13 +08005555msgid "suppress diff output"
5556msgstr ""
5557
Jiang Xinc138af52013-04-10 15:19:54 +08005558#: builtin/log.c:104
Jiang Xincc760112012-09-15 10:26:13 +08005559msgid "show source"
5560msgstr ""
5561
Jiang Xinc138af52013-04-10 15:19:54 +08005562#: builtin/log.c:105
Jiang Xin46bc4032013-01-25 12:33:58 +08005563msgid "Use mail map file"
5564msgstr ""
5565
Jiang Xinc138af52013-04-10 15:19:54 +08005566#: builtin/log.c:106
Jiang Xincc760112012-09-15 10:26:13 +08005567msgid "decorate options"
5568msgstr ""
5569
Jiang Xinc138af52013-04-10 15:19:54 +08005570#: builtin/log.c:199
Jiang Xindce37b62012-02-13 14:37:59 +08005571#, c-format
5572msgid "Final output: %d %s\n"
5573msgstr ""
5574
Jiang Xinc138af52013-04-10 15:19:54 +08005575#: builtin/log.c:422 builtin/log.c:514
Jiang Xindce37b62012-02-13 14:37:59 +08005576#, c-format
5577msgid "Could not read object %s"
5578msgstr ""
5579
Jiang Xinc138af52013-04-10 15:19:54 +08005580#: builtin/log.c:538
Jiang Xindce37b62012-02-13 14:37:59 +08005581#, c-format
5582msgid "Unknown type: %d"
5583msgstr ""
5584
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005585#: builtin/log.c:638
Jiang Xindce37b62012-02-13 14:37:59 +08005586msgid "format.headers without value"
5587msgstr ""
5588
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005589#: builtin/log.c:720
Jiang Xindce37b62012-02-13 14:37:59 +08005590msgid "name of output directory is too long"
5591msgstr ""
5592
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005593#: builtin/log.c:736
Jiang Xindce37b62012-02-13 14:37:59 +08005594#, c-format
5595msgid "Cannot open patch file %s"
5596msgstr ""
5597
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005598#: builtin/log.c:750
Jiang Xindce37b62012-02-13 14:37:59 +08005599msgid "Need exactly one range."
5600msgstr ""
5601
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005602#: builtin/log.c:758
Jiang Xindce37b62012-02-13 14:37:59 +08005603msgid "Not a range."
5604msgstr ""
5605
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005606#: builtin/log.c:860
Jiang Xindce37b62012-02-13 14:37:59 +08005607msgid "Cover letter needs email format"
5608msgstr ""
5609
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005610#: builtin/log.c:936
Jiang Xindce37b62012-02-13 14:37:59 +08005611#, c-format
5612msgid "insane in-reply-to: %s"
5613msgstr ""
5614
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005615#: builtin/log.c:964
Jiang Xincc760112012-09-15 10:26:13 +08005616msgid "git format-patch [options] [<since> | <revision range>]"
5617msgstr ""
5618
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005619#: builtin/log.c:1009
Jiang Xindce37b62012-02-13 14:37:59 +08005620msgid "Two output directories?"
5621msgstr ""
5622
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005623#: builtin/log.c:1108
Jiang Xincc760112012-09-15 10:26:13 +08005624msgid "use [PATCH n/m] even with a single patch"
5625msgstr ""
5626
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005627#: builtin/log.c:1111
Jiang Xincc760112012-09-15 10:26:13 +08005628msgid "use [PATCH] even with multiple patches"
5629msgstr ""
5630
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005631#: builtin/log.c:1115
Jiang Xincc760112012-09-15 10:26:13 +08005632msgid "print patches to standard out"
5633msgstr ""
5634
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005635#: builtin/log.c:1117
Jiang Xincc760112012-09-15 10:26:13 +08005636msgid "generate a cover letter"
5637msgstr ""
5638
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005639#: builtin/log.c:1119
Jiang Xincc760112012-09-15 10:26:13 +08005640msgid "use simple number sequence for output file names"
5641msgstr ""
5642
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005643#: builtin/log.c:1120
Jiang Xincc760112012-09-15 10:26:13 +08005644msgid "sfx"
5645msgstr ""
5646
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005647#: builtin/log.c:1121
Jiang Xincc760112012-09-15 10:26:13 +08005648msgid "use <sfx> instead of '.patch'"
5649msgstr ""
5650
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005651#: builtin/log.c:1123
Jiang Xincc760112012-09-15 10:26:13 +08005652msgid "start numbering patches at <n> instead of 1"
5653msgstr ""
5654
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005655#: builtin/log.c:1125
Jiang Xin46bc4032013-01-25 12:33:58 +08005656msgid "mark the series as Nth re-roll"
5657msgstr ""
5658
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005659#: builtin/log.c:1127
Jiang Xincc760112012-09-15 10:26:13 +08005660msgid "Use [<prefix>] instead of [PATCH]"
5661msgstr ""
5662
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005663#: builtin/log.c:1130
Jiang Xincc760112012-09-15 10:26:13 +08005664msgid "store resulting files in <dir>"
5665msgstr ""
5666
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005667#: builtin/log.c:1133
Jiang Xincc760112012-09-15 10:26:13 +08005668msgid "don't strip/add [PATCH]"
5669msgstr ""
5670
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005671#: builtin/log.c:1136
Jiang Xincc760112012-09-15 10:26:13 +08005672msgid "don't output binary diffs"
5673msgstr ""
5674
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005675#: builtin/log.c:1138
Jiang Xincc760112012-09-15 10:26:13 +08005676msgid "don't include a patch matching a commit upstream"
5677msgstr ""
5678
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005679#: builtin/log.c:1140
Jiang Xincc760112012-09-15 10:26:13 +08005680msgid "show patch format instead of default (patch + stat)"
5681msgstr ""
5682
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005683#: builtin/log.c:1142
Jiang Xincc760112012-09-15 10:26:13 +08005684msgid "Messaging"
5685msgstr ""
5686
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005687#: builtin/log.c:1143
Jiang Xincc760112012-09-15 10:26:13 +08005688msgid "header"
5689msgstr ""
5690
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005691#: builtin/log.c:1144
Jiang Xincc760112012-09-15 10:26:13 +08005692msgid "add email header"
5693msgstr ""
5694
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005695#: builtin/log.c:1145 builtin/log.c:1147
Jiang Xincc760112012-09-15 10:26:13 +08005696msgid "email"
5697msgstr ""
5698
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005699#: builtin/log.c:1145
Jiang Xincc760112012-09-15 10:26:13 +08005700msgid "add To: header"
5701msgstr ""
5702
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005703#: builtin/log.c:1147
Jiang Xincc760112012-09-15 10:26:13 +08005704msgid "add Cc: header"
5705msgstr ""
5706
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005707#: builtin/log.c:1149
Jiang Xincc760112012-09-15 10:26:13 +08005708msgid "message-id"
5709msgstr ""
5710
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005711#: builtin/log.c:1150
Jiang Xincc760112012-09-15 10:26:13 +08005712msgid "make first mail a reply to <message-id>"
5713msgstr ""
5714
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005715#: builtin/log.c:1151 builtin/log.c:1154
Jiang Xincc760112012-09-15 10:26:13 +08005716msgid "boundary"
5717msgstr ""
5718
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005719#: builtin/log.c:1152
Jiang Xincc760112012-09-15 10:26:13 +08005720msgid "attach the patch"
5721msgstr ""
5722
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005723#: builtin/log.c:1155
Jiang Xincc760112012-09-15 10:26:13 +08005724msgid "inline the patch"
5725msgstr ""
5726
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005727#: builtin/log.c:1159
Jiang Xincc760112012-09-15 10:26:13 +08005728msgid "enable message threading, styles: shallow, deep"
5729msgstr ""
5730
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005731#: builtin/log.c:1161
Jiang Xincc760112012-09-15 10:26:13 +08005732msgid "signature"
5733msgstr ""
5734
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005735#: builtin/log.c:1162
Jiang Xincc760112012-09-15 10:26:13 +08005736msgid "add a signature"
5737msgstr ""
5738
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005739#: builtin/log.c:1164
Jiang Xincc760112012-09-15 10:26:13 +08005740msgid "don't print the patch filenames"
5741msgstr ""
5742
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005743#: builtin/log.c:1248
Jiang Xindce37b62012-02-13 14:37:59 +08005744msgid "-n and -k are mutually exclusive."
5745msgstr ""
5746
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005747#: builtin/log.c:1250
Jiang Xindce37b62012-02-13 14:37:59 +08005748msgid "--subject-prefix and -k are mutually exclusive."
5749msgstr ""
5750
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005751#: builtin/log.c:1258
Jiang Xindce37b62012-02-13 14:37:59 +08005752msgid "--name-only does not make sense"
5753msgstr ""
5754
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005755#: builtin/log.c:1260
Jiang Xindce37b62012-02-13 14:37:59 +08005756msgid "--name-status does not make sense"
5757msgstr ""
5758
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005759#: builtin/log.c:1262
Jiang Xindce37b62012-02-13 14:37:59 +08005760msgid "--check does not make sense"
5761msgstr ""
5762
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005763#: builtin/log.c:1285
Jiang Xindce37b62012-02-13 14:37:59 +08005764msgid "standard output, or directory, which one?"
5765msgstr ""
5766
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005767#: builtin/log.c:1287
Jiang Xindce37b62012-02-13 14:37:59 +08005768#, c-format
5769msgid "Could not create directory '%s'"
5770msgstr ""
5771
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005772#: builtin/log.c:1435
Jiang Xindce37b62012-02-13 14:37:59 +08005773msgid "Failed to create output files"
5774msgstr ""
5775
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005776#: builtin/log.c:1484
Jiang Xincc760112012-09-15 10:26:13 +08005777msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5778msgstr ""
5779
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005780#: builtin/log.c:1539
Jiang Xindce37b62012-02-13 14:37:59 +08005781#, c-format
5782msgid ""
5783"Could not find a tracked remote branch, please specify <upstream> manually.\n"
5784msgstr ""
5785
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005786#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566
Jiang Xindce37b62012-02-13 14:37:59 +08005787#, c-format
5788msgid "Unknown commit %s"
5789msgstr ""
5790
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005791#: builtin/ls-files.c:402
Jiang Xincc760112012-09-15 10:26:13 +08005792msgid "git ls-files [options] [<file>...]"
5793msgstr ""
5794
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005795#: builtin/ls-files.c:459
Jiang Xincc760112012-09-15 10:26:13 +08005796msgid "identify the file status with tags"
5797msgstr ""
5798
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005799#: builtin/ls-files.c:461
Jiang Xincc760112012-09-15 10:26:13 +08005800msgid "use lowercase letters for 'assume unchanged' files"
5801msgstr ""
5802
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005803#: builtin/ls-files.c:463
Jiang Xincc760112012-09-15 10:26:13 +08005804msgid "show cached files in the output (default)"
5805msgstr ""
5806
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005807#: builtin/ls-files.c:465
Jiang Xincc760112012-09-15 10:26:13 +08005808msgid "show deleted files in the output"
5809msgstr ""
5810
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005811#: builtin/ls-files.c:467
Jiang Xincc760112012-09-15 10:26:13 +08005812msgid "show modified files in the output"
5813msgstr ""
5814
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005815#: builtin/ls-files.c:469
Jiang Xincc760112012-09-15 10:26:13 +08005816msgid "show other files in the output"
5817msgstr ""
5818
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005819#: builtin/ls-files.c:471
Jiang Xincc760112012-09-15 10:26:13 +08005820msgid "show ignored files in the output"
5821msgstr ""
5822
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005823#: builtin/ls-files.c:474
Jiang Xincc760112012-09-15 10:26:13 +08005824msgid "show staged contents' object name in the output"
5825msgstr ""
5826
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005827#: builtin/ls-files.c:476
Jiang Xincc760112012-09-15 10:26:13 +08005828msgid "show files on the filesystem that need to be removed"
5829msgstr ""
5830
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005831#: builtin/ls-files.c:478
Jiang Xincc760112012-09-15 10:26:13 +08005832msgid "show 'other' directories' name only"
5833msgstr ""
5834
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005835#: builtin/ls-files.c:481
Jiang Xincc760112012-09-15 10:26:13 +08005836msgid "don't show empty directories"
5837msgstr ""
5838
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005839#: builtin/ls-files.c:484
Jiang Xincc760112012-09-15 10:26:13 +08005840msgid "show unmerged files in the output"
5841msgstr ""
5842
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005843#: builtin/ls-files.c:486
Jiang Xincc760112012-09-15 10:26:13 +08005844msgid "show resolve-undo information"
5845msgstr ""
5846
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005847#: builtin/ls-files.c:488
Jiang Xincc760112012-09-15 10:26:13 +08005848msgid "skip files matching pattern"
5849msgstr ""
5850
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005851#: builtin/ls-files.c:491
Jiang Xincc760112012-09-15 10:26:13 +08005852msgid "exclude patterns are read from <file>"
5853msgstr ""
5854
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005855#: builtin/ls-files.c:494
Jiang Xincc760112012-09-15 10:26:13 +08005856msgid "read additional per-directory exclude patterns in <file>"
5857msgstr ""
5858
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005859#: builtin/ls-files.c:496
Jiang Xincc760112012-09-15 10:26:13 +08005860msgid "add the standard git exclusions"
5861msgstr ""
5862
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005863#: builtin/ls-files.c:499
Jiang Xincc760112012-09-15 10:26:13 +08005864msgid "make the output relative to the project top directory"
5865msgstr ""
5866
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005867#: builtin/ls-files.c:502
Jiang Xincc760112012-09-15 10:26:13 +08005868msgid "if any <file> is not in the index, treat this as an error"
5869msgstr ""
5870
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005871#: builtin/ls-files.c:503
Jiang Xincc760112012-09-15 10:26:13 +08005872msgid "tree-ish"
5873msgstr ""
5874
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005875#: builtin/ls-files.c:504
Jiang Xincc760112012-09-15 10:26:13 +08005876msgid "pretend that paths removed since <tree-ish> are still present"
5877msgstr ""
5878
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005879#: builtin/ls-files.c:506
Jiang Xincc760112012-09-15 10:26:13 +08005880msgid "show debugging data"
5881msgstr ""
5882
5883#: builtin/ls-tree.c:27
5884msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5885msgstr ""
5886
5887#: builtin/ls-tree.c:125
5888msgid "only show trees"
5889msgstr ""
5890
5891#: builtin/ls-tree.c:127
5892msgid "recurse into subtrees"
5893msgstr ""
5894
5895#: builtin/ls-tree.c:129
5896msgid "show trees when recursing"
5897msgstr ""
5898
5899#: builtin/ls-tree.c:132
5900msgid "terminate entries with NUL byte"
5901msgstr ""
5902
5903#: builtin/ls-tree.c:133
5904msgid "include object size"
5905msgstr ""
5906
5907#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5908msgid "list only filenames"
5909msgstr ""
5910
5911#: builtin/ls-tree.c:140
5912msgid "use full path names"
5913msgstr ""
5914
5915#: builtin/ls-tree.c:142
5916msgid "list entire tree; not just current directory (implies --full-name)"
5917msgstr ""
5918
5919#: builtin/merge.c:43
5920msgid "git merge [options] [<commit>...]"
5921msgstr ""
5922
5923#: builtin/merge.c:44
5924msgid "git merge [options] <msg> HEAD <commit>"
5925msgstr ""
5926
5927#: builtin/merge.c:45
5928msgid "git merge --abort"
5929msgstr ""
5930
Jiang Xincd1e7482012-04-28 20:27:01 +08005931#: builtin/merge.c:90
Jiang Xindce37b62012-02-13 14:37:59 +08005932msgid "switch `m' requires a value"
5933msgstr ""
5934
Jiang Xincd1e7482012-04-28 20:27:01 +08005935#: builtin/merge.c:127
Jiang Xindce37b62012-02-13 14:37:59 +08005936#, c-format
5937msgid "Could not find merge strategy '%s'.\n"
5938msgstr ""
5939
Jiang Xincd1e7482012-04-28 20:27:01 +08005940#: builtin/merge.c:128
Jiang Xindce37b62012-02-13 14:37:59 +08005941#, c-format
5942msgid "Available strategies are:"
5943msgstr ""
5944
Jiang Xincd1e7482012-04-28 20:27:01 +08005945#: builtin/merge.c:133
Jiang Xindce37b62012-02-13 14:37:59 +08005946#, c-format
5947msgid "Available custom strategies are:"
5948msgstr ""
5949
Jiang Xincc760112012-09-15 10:26:13 +08005950#: builtin/merge.c:183
5951msgid "do not show a diffstat at the end of the merge"
5952msgstr ""
5953
5954#: builtin/merge.c:186
5955msgid "show a diffstat at the end of the merge"
5956msgstr ""
5957
5958#: builtin/merge.c:187
5959msgid "(synonym to --stat)"
5960msgstr ""
5961
5962#: builtin/merge.c:189
5963msgid "add (at most <n>) entries from shortlog to merge commit message"
5964msgstr ""
5965
5966#: builtin/merge.c:192
5967msgid "create a single commit instead of doing a merge"
5968msgstr ""
5969
5970#: builtin/merge.c:194
5971msgid "perform a commit if the merge succeeds (default)"
5972msgstr ""
5973
5974#: builtin/merge.c:196
5975msgid "edit message before committing"
5976msgstr ""
5977
5978#: builtin/merge.c:198
5979msgid "allow fast-forward (default)"
5980msgstr ""
5981
5982#: builtin/merge.c:200
5983msgid "abort if fast-forward is not possible"
5984msgstr ""
5985
Jiang Xinc138af52013-04-10 15:19:54 +08005986#: builtin/merge.c:203
5987msgid "Verify that the named commit has a valid GPG signature"
5988msgstr ""
5989
5990#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112
Jiang Xincc760112012-09-15 10:26:13 +08005991msgid "strategy"
5992msgstr ""
5993
Jiang Xinc138af52013-04-10 15:19:54 +08005994#: builtin/merge.c:205
Jiang Xincc760112012-09-15 10:26:13 +08005995msgid "merge strategy to use"
5996msgstr ""
5997
Jiang Xinc138af52013-04-10 15:19:54 +08005998#: builtin/merge.c:206
Jiang Xincc760112012-09-15 10:26:13 +08005999msgid "option=value"
6000msgstr ""
6001
Jiang Xinc138af52013-04-10 15:19:54 +08006002#: builtin/merge.c:207
Jiang Xincc760112012-09-15 10:26:13 +08006003msgid "option for selected merge strategy"
6004msgstr ""
6005
Jiang Xinc138af52013-04-10 15:19:54 +08006006#: builtin/merge.c:209
Jiang Xincc760112012-09-15 10:26:13 +08006007msgid "merge commit message (for a non-fast-forward merge)"
6008msgstr ""
6009
Jiang Xinc138af52013-04-10 15:19:54 +08006010#: builtin/merge.c:213
Jiang Xincc760112012-09-15 10:26:13 +08006011msgid "abort the current in-progress merge"
6012msgstr ""
6013
Jiang Xinc138af52013-04-10 15:19:54 +08006014#: builtin/merge.c:242
Jiang Xindce37b62012-02-13 14:37:59 +08006015msgid "could not run stash."
6016msgstr ""
6017
Jiang Xinc138af52013-04-10 15:19:54 +08006018#: builtin/merge.c:247
Jiang Xindce37b62012-02-13 14:37:59 +08006019msgid "stash failed"
6020msgstr ""
6021
Jiang Xinc138af52013-04-10 15:19:54 +08006022#: builtin/merge.c:252
Jiang Xindce37b62012-02-13 14:37:59 +08006023#, c-format
6024msgid "not a valid object: %s"
6025msgstr ""
6026
Jiang Xinc138af52013-04-10 15:19:54 +08006027#: builtin/merge.c:271 builtin/merge.c:288
Jiang Xindce37b62012-02-13 14:37:59 +08006028msgid "read-tree failed"
6029msgstr ""
6030
Jiang Xinc138af52013-04-10 15:19:54 +08006031#: builtin/merge.c:318
Jiang Xindce37b62012-02-13 14:37:59 +08006032msgid " (nothing to squash)"
6033msgstr ""
6034
Jiang Xinc138af52013-04-10 15:19:54 +08006035#: builtin/merge.c:331
Jiang Xindce37b62012-02-13 14:37:59 +08006036#, c-format
6037msgid "Squash commit -- not updating HEAD\n"
6038msgstr ""
6039
Jiang Xinc138af52013-04-10 15:19:54 +08006040#: builtin/merge.c:363
Jiang Xindce37b62012-02-13 14:37:59 +08006041msgid "Writing SQUASH_MSG"
6042msgstr ""
6043
Jiang Xinc138af52013-04-10 15:19:54 +08006044#: builtin/merge.c:365
Jiang Xindce37b62012-02-13 14:37:59 +08006045msgid "Finishing SQUASH_MSG"
6046msgstr ""
6047
Jiang Xinc138af52013-04-10 15:19:54 +08006048#: builtin/merge.c:388
Jiang Xindce37b62012-02-13 14:37:59 +08006049#, c-format
6050msgid "No merge message -- not updating HEAD\n"
6051msgstr ""
6052
Jiang Xinc138af52013-04-10 15:19:54 +08006053#: builtin/merge.c:438
Jiang Xindce37b62012-02-13 14:37:59 +08006054#, c-format
6055msgid "'%s' does not point to a commit"
6056msgstr ""
6057
Jiang Xinc138af52013-04-10 15:19:54 +08006058#: builtin/merge.c:550
Jiang Xindce37b62012-02-13 14:37:59 +08006059#, c-format
6060msgid "Bad branch.%s.mergeoptions string: %s"
6061msgstr ""
6062
Jiang Xinc138af52013-04-10 15:19:54 +08006063#: builtin/merge.c:643
Jiang Xindce37b62012-02-13 14:37:59 +08006064msgid "git write-tree failed to write a tree"
6065msgstr ""
6066
Jiang Xinc138af52013-04-10 15:19:54 +08006067#: builtin/merge.c:671
Jiang Xindce37b62012-02-13 14:37:59 +08006068msgid "Not handling anything other than two heads merge."
6069msgstr ""
6070
Jiang Xinc138af52013-04-10 15:19:54 +08006071#: builtin/merge.c:685
Jiang Xindce37b62012-02-13 14:37:59 +08006072#, c-format
6073msgid "Unknown option for merge-recursive: -X%s"
6074msgstr ""
6075
Jiang Xinc138af52013-04-10 15:19:54 +08006076#: builtin/merge.c:699
Jiang Xindce37b62012-02-13 14:37:59 +08006077#, c-format
6078msgid "unable to write %s"
6079msgstr ""
6080
Jiang Xinc138af52013-04-10 15:19:54 +08006081#: builtin/merge.c:788
Jiang Xindce37b62012-02-13 14:37:59 +08006082#, c-format
6083msgid "Could not read from '%s'"
6084msgstr ""
6085
Jiang Xinc138af52013-04-10 15:19:54 +08006086#: builtin/merge.c:797
Jiang Xindce37b62012-02-13 14:37:59 +08006087#, c-format
6088msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6089msgstr ""
6090
Jiang Xinc138af52013-04-10 15:19:54 +08006091#: builtin/merge.c:803
Jiang Xin9caaf232013-02-14 14:49:45 +08006092#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08006093msgid ""
6094"Please enter a commit message to explain why this merge is necessary,\n"
6095"especially if it merges an updated upstream into a topic branch.\n"
6096"\n"
Jiang Xin9caaf232013-02-14 14:49:45 +08006097"Lines starting with '%c' will be ignored, and an empty message aborts\n"
Jiang Xindce37b62012-02-13 14:37:59 +08006098"the commit.\n"
6099msgstr ""
6100
Jiang Xinc138af52013-04-10 15:19:54 +08006101#: builtin/merge.c:827
Jiang Xindce37b62012-02-13 14:37:59 +08006102msgid "Empty commit message."
6103msgstr ""
6104
Jiang Xinc138af52013-04-10 15:19:54 +08006105#: builtin/merge.c:839
Jiang Xindce37b62012-02-13 14:37:59 +08006106#, c-format
6107msgid "Wonderful.\n"
6108msgstr ""
6109
Jiang Xinc138af52013-04-10 15:19:54 +08006110#: builtin/merge.c:904
Jiang Xindce37b62012-02-13 14:37:59 +08006111#, c-format
6112msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6113msgstr ""
6114
Jiang Xinc138af52013-04-10 15:19:54 +08006115#: builtin/merge.c:920
Jiang Xindce37b62012-02-13 14:37:59 +08006116#, c-format
6117msgid "'%s' is not a commit"
6118msgstr ""
6119
Jiang Xinc138af52013-04-10 15:19:54 +08006120#: builtin/merge.c:961
Jiang Xindce37b62012-02-13 14:37:59 +08006121msgid "No current branch."
6122msgstr ""
6123
Jiang Xinc138af52013-04-10 15:19:54 +08006124#: builtin/merge.c:963
Jiang Xindce37b62012-02-13 14:37:59 +08006125msgid "No remote for the current branch."
6126msgstr ""
6127
Jiang Xinc138af52013-04-10 15:19:54 +08006128#: builtin/merge.c:965
Jiang Xindce37b62012-02-13 14:37:59 +08006129msgid "No default upstream defined for the current branch."
6130msgstr ""
6131
Jiang Xinc138af52013-04-10 15:19:54 +08006132#: builtin/merge.c:970
Jiang Xindce37b62012-02-13 14:37:59 +08006133#, c-format
6134msgid "No remote tracking branch for %s from %s"
6135msgstr ""
6136
Jiang Xinc138af52013-04-10 15:19:54 +08006137#: builtin/merge.c:1057 builtin/merge.c:1214
Jiang Xincd1e7482012-04-28 20:27:01 +08006138#, c-format
6139msgid "%s - not something we can merge"
6140msgstr ""
6141
Jiang Xinc138af52013-04-10 15:19:54 +08006142#: builtin/merge.c:1125
Jiang Xindce37b62012-02-13 14:37:59 +08006143msgid "There is no merge to abort (MERGE_HEAD missing)."
6144msgstr ""
6145
Jiang Xinc138af52013-04-10 15:19:54 +08006146#: builtin/merge.c:1141 git-pull.sh:31
Jiang Xindce37b62012-02-13 14:37:59 +08006147msgid ""
6148"You have not concluded your merge (MERGE_HEAD exists).\n"
6149"Please, commit your changes before you can merge."
6150msgstr ""
6151
Jiang Xinc138af52013-04-10 15:19:54 +08006152#: builtin/merge.c:1144 git-pull.sh:34
Jiang Xindce37b62012-02-13 14:37:59 +08006153msgid "You have not concluded your merge (MERGE_HEAD exists)."
6154msgstr ""
6155
Jiang Xinc138af52013-04-10 15:19:54 +08006156#: builtin/merge.c:1148
Jiang Xindce37b62012-02-13 14:37:59 +08006157msgid ""
6158"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6159"Please, commit your changes before you can merge."
6160msgstr ""
6161
Jiang Xinc138af52013-04-10 15:19:54 +08006162#: builtin/merge.c:1151
Jiang Xindce37b62012-02-13 14:37:59 +08006163msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6164msgstr ""
6165
Jiang Xinc138af52013-04-10 15:19:54 +08006166#: builtin/merge.c:1160
Jiang Xindce37b62012-02-13 14:37:59 +08006167msgid "You cannot combine --squash with --no-ff."
6168msgstr ""
6169
Jiang Xinc138af52013-04-10 15:19:54 +08006170#: builtin/merge.c:1165
Jiang Xindce37b62012-02-13 14:37:59 +08006171msgid "You cannot combine --no-ff with --ff-only."
6172msgstr ""
6173
Jiang Xinc138af52013-04-10 15:19:54 +08006174#: builtin/merge.c:1172
Jiang Xindce37b62012-02-13 14:37:59 +08006175msgid "No commit specified and merge.defaultToUpstream not set."
6176msgstr ""
6177
Jiang Xinc138af52013-04-10 15:19:54 +08006178#: builtin/merge.c:1204
Jiang Xindce37b62012-02-13 14:37:59 +08006179msgid "Can merge only exactly one commit into empty head"
6180msgstr ""
6181
Jiang Xinc138af52013-04-10 15:19:54 +08006182#: builtin/merge.c:1207
Jiang Xindce37b62012-02-13 14:37:59 +08006183msgid "Squash commit into empty head not supported yet"
6184msgstr ""
6185
Jiang Xinc138af52013-04-10 15:19:54 +08006186#: builtin/merge.c:1209
Jiang Xindce37b62012-02-13 14:37:59 +08006187msgid "Non-fast-forward commit does not make sense into an empty head"
6188msgstr ""
6189
Jiang Xinc138af52013-04-10 15:19:54 +08006190#: builtin/merge.c:1265
6191#, c-format
6192msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6193msgstr ""
6194
6195#: builtin/merge.c:1268
6196#, c-format
6197msgid "Commit %s has a bad GPG signature allegedly by %s."
6198msgstr ""
6199
6200#. 'N'
6201#: builtin/merge.c:1271
6202#, c-format
6203msgid "Commit %s does not have a GPG signature."
6204msgstr ""
6205
6206#: builtin/merge.c:1274
6207#, c-format
6208msgid "Commit %s has a good GPG signature by %s\n"
6209msgstr ""
6210
6211#: builtin/merge.c:1358
Jiang Xindce37b62012-02-13 14:37:59 +08006212#, c-format
6213msgid "Updating %s..%s\n"
6214msgstr ""
6215
Jiang Xinc138af52013-04-10 15:19:54 +08006216#: builtin/merge.c:1397
Jiang Xindce37b62012-02-13 14:37:59 +08006217#, c-format
6218msgid "Trying really trivial in-index merge...\n"
6219msgstr ""
6220
Jiang Xinc138af52013-04-10 15:19:54 +08006221#: builtin/merge.c:1404
Jiang Xindce37b62012-02-13 14:37:59 +08006222#, c-format
6223msgid "Nope.\n"
6224msgstr ""
6225
Jiang Xinc138af52013-04-10 15:19:54 +08006226#: builtin/merge.c:1436
Jiang Xindce37b62012-02-13 14:37:59 +08006227msgid "Not possible to fast-forward, aborting."
6228msgstr ""
6229
Jiang Xinc138af52013-04-10 15:19:54 +08006230#: builtin/merge.c:1459 builtin/merge.c:1538
Jiang Xindce37b62012-02-13 14:37:59 +08006231#, c-format
6232msgid "Rewinding the tree to pristine...\n"
6233msgstr ""
6234
Jiang Xinc138af52013-04-10 15:19:54 +08006235#: builtin/merge.c:1463
Jiang Xindce37b62012-02-13 14:37:59 +08006236#, c-format
6237msgid "Trying merge strategy %s...\n"
6238msgstr ""
6239
Jiang Xinc138af52013-04-10 15:19:54 +08006240#: builtin/merge.c:1529
Jiang Xindce37b62012-02-13 14:37:59 +08006241#, c-format
6242msgid "No merge strategy handled the merge.\n"
6243msgstr ""
6244
Jiang Xinc138af52013-04-10 15:19:54 +08006245#: builtin/merge.c:1531
Jiang Xindce37b62012-02-13 14:37:59 +08006246#, c-format
6247msgid "Merge with strategy %s failed.\n"
6248msgstr ""
6249
Jiang Xinc138af52013-04-10 15:19:54 +08006250#: builtin/merge.c:1540
Jiang Xindce37b62012-02-13 14:37:59 +08006251#, c-format
6252msgid "Using the %s to prepare resolving by hand.\n"
6253msgstr ""
6254
Jiang Xinc138af52013-04-10 15:19:54 +08006255#: builtin/merge.c:1552
Jiang Xindce37b62012-02-13 14:37:59 +08006256#, c-format
6257msgid "Automatic merge went well; stopped before committing as requested\n"
6258msgstr ""
6259
Jiang Xincc760112012-09-15 10:26:13 +08006260#: builtin/merge-base.c:26
6261msgid "git merge-base [-a|--all] <commit> <commit>..."
6262msgstr ""
6263
6264#: builtin/merge-base.c:27
6265msgid "git merge-base [-a|--all] --octopus <commit>..."
6266msgstr ""
6267
6268#: builtin/merge-base.c:28
6269msgid "git merge-base --independent <commit>..."
6270msgstr ""
6271
6272#: builtin/merge-base.c:29
6273msgid "git merge-base --is-ancestor <commit> <commit>"
6274msgstr ""
6275
6276#: builtin/merge-base.c:98
6277msgid "output all common ancestors"
6278msgstr ""
6279
6280#: builtin/merge-base.c:99
6281msgid "find ancestors for a single n-way merge"
6282msgstr ""
6283
6284#: builtin/merge-base.c:100
6285msgid "list revs not reachable from others"
6286msgstr ""
6287
6288#: builtin/merge-base.c:102
6289msgid "is the first one ancestor of the other?"
6290msgstr ""
6291
6292#: builtin/merge-file.c:8
6293msgid ""
6294"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6295"file2"
6296msgstr ""
6297
6298#: builtin/merge-file.c:33
6299msgid "send results to standard output"
6300msgstr ""
6301
6302#: builtin/merge-file.c:34
6303msgid "use a diff3 based merge"
6304msgstr ""
6305
6306#: builtin/merge-file.c:35
6307msgid "for conflicts, use our version"
6308msgstr ""
6309
6310#: builtin/merge-file.c:37
6311msgid "for conflicts, use their version"
6312msgstr ""
6313
6314#: builtin/merge-file.c:39
6315msgid "for conflicts, use a union version"
6316msgstr ""
6317
6318#: builtin/merge-file.c:42
6319msgid "for conflicts, use this marker size"
6320msgstr ""
6321
6322#: builtin/merge-file.c:43
6323msgid "do not warn about conflicts"
6324msgstr ""
6325
6326#: builtin/merge-file.c:45
6327msgid "set labels for file1/orig_file/file2"
6328msgstr ""
6329
6330#: builtin/mktree.c:67
6331msgid "git mktree [-z] [--missing] [--batch]"
6332msgstr ""
6333
6334#: builtin/mktree.c:153
6335msgid "input is NUL terminated"
6336msgstr ""
6337
6338#: builtin/mktree.c:154 builtin/write-tree.c:24
6339msgid "allow missing objects"
6340msgstr ""
6341
6342#: builtin/mktree.c:155
6343msgid "allow creation of more than one tree"
6344msgstr ""
6345
6346#: builtin/mv.c:14
6347msgid "git mv [options] <source>... <destination>"
6348msgstr ""
6349
6350#: builtin/mv.c:64
6351msgid "force move/rename even if target exists"
6352msgstr ""
6353
6354#: builtin/mv.c:65
6355msgid "skip move/rename errors"
6356msgstr ""
6357
Jiang Xindce37b62012-02-13 14:37:59 +08006358#: builtin/mv.c:108
6359#, c-format
6360msgid "Checking rename of '%s' to '%s'\n"
6361msgstr ""
6362
6363#: builtin/mv.c:112
6364msgid "bad source"
6365msgstr ""
6366
6367#: builtin/mv.c:115
6368msgid "can not move directory into itself"
6369msgstr ""
6370
6371#: builtin/mv.c:118
6372msgid "cannot move directory over file"
6373msgstr ""
6374
6375#: builtin/mv.c:128
6376#, c-format
6377msgid "Huh? %.*s is in index?"
6378msgstr ""
6379
6380#: builtin/mv.c:140
6381msgid "source directory is empty"
6382msgstr ""
6383
6384#: builtin/mv.c:171
6385msgid "not under version control"
6386msgstr ""
6387
6388#: builtin/mv.c:173
6389msgid "destination exists"
6390msgstr ""
6391
6392#: builtin/mv.c:181
6393#, c-format
6394msgid "overwriting '%s'"
6395msgstr ""
6396
6397#: builtin/mv.c:184
6398msgid "Cannot overwrite"
6399msgstr ""
6400
6401#: builtin/mv.c:187
6402msgid "multiple sources for the same target"
6403msgstr ""
6404
6405#: builtin/mv.c:202
6406#, c-format
6407msgid "%s, source=%s, destination=%s"
6408msgstr ""
6409
6410#: builtin/mv.c:212
6411#, c-format
6412msgid "Renaming %s to %s\n"
6413msgstr ""
6414
Jiang Xin822e4a62012-05-08 16:10:22 +08006415#: builtin/mv.c:215 builtin/remote.c:731
Jiang Xindce37b62012-02-13 14:37:59 +08006416#, c-format
6417msgid "renaming '%s' failed"
6418msgstr ""
6419
Jiang Xincc760112012-09-15 10:26:13 +08006420#: builtin/name-rev.c:175
6421msgid "git name-rev [options] <commit>..."
6422msgstr ""
6423
6424#: builtin/name-rev.c:176
6425msgid "git name-rev [options] --all"
6426msgstr ""
6427
6428#: builtin/name-rev.c:177
6429msgid "git name-rev [options] --stdin"
6430msgstr ""
6431
6432#: builtin/name-rev.c:229
6433msgid "print only names (no SHA-1)"
6434msgstr ""
6435
6436#: builtin/name-rev.c:230
6437msgid "only use tags to name the commits"
6438msgstr ""
6439
6440#: builtin/name-rev.c:232
6441msgid "only use refs matching <pattern>"
6442msgstr ""
6443
6444#: builtin/name-rev.c:234
6445msgid "list all commits reachable from all refs"
6446msgstr ""
6447
6448#: builtin/name-rev.c:235
6449msgid "read from stdin"
6450msgstr ""
6451
6452#: builtin/name-rev.c:236
6453msgid "allow to print `undefined` names"
6454msgstr ""
6455
Jiang Xin9306b5b2012-10-16 08:39:10 +08006456#: builtin/notes.c:26
Jiang Xincc760112012-09-15 10:26:13 +08006457msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6458msgstr ""
6459
Jiang Xin9306b5b2012-10-16 08:39:10 +08006460#: builtin/notes.c:27
Jiang Xincc760112012-09-15 10:26:13 +08006461msgid ""
6462"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6463"<object>] [<object>]"
6464msgstr ""
6465
Jiang Xin9306b5b2012-10-16 08:39:10 +08006466#: builtin/notes.c:28
Jiang Xincc760112012-09-15 10:26:13 +08006467msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6468msgstr ""
6469
Jiang Xin9306b5b2012-10-16 08:39:10 +08006470#: builtin/notes.c:29
Jiang Xincc760112012-09-15 10:26:13 +08006471msgid ""
6472"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6473"<object>] [<object>]"
6474msgstr ""
6475
Jiang Xin9306b5b2012-10-16 08:39:10 +08006476#: builtin/notes.c:30
Jiang Xincc760112012-09-15 10:26:13 +08006477msgid "git notes [--ref <notes_ref>] edit [<object>]"
6478msgstr ""
6479
Jiang Xin9306b5b2012-10-16 08:39:10 +08006480#: builtin/notes.c:31
Jiang Xincc760112012-09-15 10:26:13 +08006481msgid "git notes [--ref <notes_ref>] show [<object>]"
6482msgstr ""
6483
Jiang Xin9306b5b2012-10-16 08:39:10 +08006484#: builtin/notes.c:32
Jiang Xincc760112012-09-15 10:26:13 +08006485msgid ""
6486"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6487msgstr ""
6488
Jiang Xin9306b5b2012-10-16 08:39:10 +08006489#: builtin/notes.c:33
Jiang Xincc760112012-09-15 10:26:13 +08006490msgid "git notes merge --commit [-v | -q]"
6491msgstr ""
6492
Jiang Xin9306b5b2012-10-16 08:39:10 +08006493#: builtin/notes.c:34
Jiang Xincc760112012-09-15 10:26:13 +08006494msgid "git notes merge --abort [-v | -q]"
6495msgstr ""
6496
Jiang Xin9306b5b2012-10-16 08:39:10 +08006497#: builtin/notes.c:35
Jiang Xincc760112012-09-15 10:26:13 +08006498msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6499msgstr ""
6500
Jiang Xin9306b5b2012-10-16 08:39:10 +08006501#: builtin/notes.c:36
Jiang Xincc760112012-09-15 10:26:13 +08006502msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6503msgstr ""
6504
Jiang Xin9306b5b2012-10-16 08:39:10 +08006505#: builtin/notes.c:37
Jiang Xincc760112012-09-15 10:26:13 +08006506msgid "git notes [--ref <notes_ref>] get-ref"
6507msgstr ""
6508
Jiang Xin9306b5b2012-10-16 08:39:10 +08006509#: builtin/notes.c:42
Jiang Xincc760112012-09-15 10:26:13 +08006510msgid "git notes [list [<object>]]"
6511msgstr ""
6512
Jiang Xin9306b5b2012-10-16 08:39:10 +08006513#: builtin/notes.c:47
Jiang Xincc760112012-09-15 10:26:13 +08006514msgid "git notes add [<options>] [<object>]"
6515msgstr ""
6516
Jiang Xin9306b5b2012-10-16 08:39:10 +08006517#: builtin/notes.c:52
Jiang Xincc760112012-09-15 10:26:13 +08006518msgid "git notes copy [<options>] <from-object> <to-object>"
6519msgstr ""
6520
Jiang Xin9306b5b2012-10-16 08:39:10 +08006521#: builtin/notes.c:53
Jiang Xincc760112012-09-15 10:26:13 +08006522msgid "git notes copy --stdin [<from-object> <to-object>]..."
6523msgstr ""
6524
Jiang Xin9306b5b2012-10-16 08:39:10 +08006525#: builtin/notes.c:58
Jiang Xincc760112012-09-15 10:26:13 +08006526msgid "git notes append [<options>] [<object>]"
6527msgstr ""
6528
Jiang Xin9306b5b2012-10-16 08:39:10 +08006529#: builtin/notes.c:63
Jiang Xincc760112012-09-15 10:26:13 +08006530msgid "git notes edit [<object>]"
6531msgstr ""
6532
Jiang Xin9306b5b2012-10-16 08:39:10 +08006533#: builtin/notes.c:68
Jiang Xincc760112012-09-15 10:26:13 +08006534msgid "git notes show [<object>]"
6535msgstr ""
6536
Jiang Xin9306b5b2012-10-16 08:39:10 +08006537#: builtin/notes.c:73
Jiang Xincc760112012-09-15 10:26:13 +08006538msgid "git notes merge [<options>] <notes_ref>"
6539msgstr ""
6540
Jiang Xin9306b5b2012-10-16 08:39:10 +08006541#: builtin/notes.c:74
Jiang Xincc760112012-09-15 10:26:13 +08006542msgid "git notes merge --commit [<options>]"
6543msgstr ""
6544
Jiang Xin9306b5b2012-10-16 08:39:10 +08006545#: builtin/notes.c:75
Jiang Xincc760112012-09-15 10:26:13 +08006546msgid "git notes merge --abort [<options>]"
6547msgstr ""
6548
Jiang Xin9306b5b2012-10-16 08:39:10 +08006549#: builtin/notes.c:80
Jiang Xincc760112012-09-15 10:26:13 +08006550msgid "git notes remove [<object>]"
6551msgstr ""
6552
Jiang Xin9306b5b2012-10-16 08:39:10 +08006553#: builtin/notes.c:85
Jiang Xincc760112012-09-15 10:26:13 +08006554msgid "git notes prune [<options>]"
6555msgstr ""
6556
Jiang Xin9306b5b2012-10-16 08:39:10 +08006557#: builtin/notes.c:90
Jiang Xincc760112012-09-15 10:26:13 +08006558msgid "git notes get-ref"
6559msgstr ""
6560
Jiang Xin9caaf232013-02-14 14:49:45 +08006561#: builtin/notes.c:139
Jiang Xindce37b62012-02-13 14:37:59 +08006562#, c-format
6563msgid "unable to start 'show' for object '%s'"
6564msgstr ""
6565
Jiang Xin9caaf232013-02-14 14:49:45 +08006566#: builtin/notes.c:143
6567msgid "could not read 'show' output"
Jiang Xindce37b62012-02-13 14:37:59 +08006568msgstr ""
6569
Jiang Xin9caaf232013-02-14 14:49:45 +08006570#: builtin/notes.c:151
Jiang Xin9306b5b2012-10-16 08:39:10 +08006571#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08006572msgid "failed to finish 'show' for object '%s'"
6573msgstr ""
6574
Jiang Xin9caaf232013-02-14 14:49:45 +08006575#: builtin/notes.c:169 builtin/tag.c:341
Jiang Xindce37b62012-02-13 14:37:59 +08006576#, c-format
6577msgid "could not create file '%s'"
6578msgstr ""
6579
Jiang Xin9caaf232013-02-14 14:49:45 +08006580#: builtin/notes.c:188
Jiang Xindce37b62012-02-13 14:37:59 +08006581msgid "Please supply the note contents using either -m or -F option"
6582msgstr ""
6583
Jiang Xin9caaf232013-02-14 14:49:45 +08006584#: builtin/notes.c:209 builtin/notes.c:972
Jiang Xindce37b62012-02-13 14:37:59 +08006585#, c-format
6586msgid "Removing note for object %s\n"
6587msgstr ""
6588
Jiang Xin9caaf232013-02-14 14:49:45 +08006589#: builtin/notes.c:214
Jiang Xindce37b62012-02-13 14:37:59 +08006590msgid "unable to write note object"
6591msgstr ""
6592
Jiang Xin9caaf232013-02-14 14:49:45 +08006593#: builtin/notes.c:216
Jiang Xindce37b62012-02-13 14:37:59 +08006594#, c-format
6595msgid "The note contents has been left in %s"
6596msgstr ""
6597
Jiang Xin9caaf232013-02-14 14:49:45 +08006598#: builtin/notes.c:250 builtin/tag.c:540
Jiang Xindce37b62012-02-13 14:37:59 +08006599#, c-format
6600msgid "cannot read '%s'"
6601msgstr ""
6602
Jiang Xin9caaf232013-02-14 14:49:45 +08006603#: builtin/notes.c:252 builtin/tag.c:543
Jiang Xindce37b62012-02-13 14:37:59 +08006604#, c-format
6605msgid "could not open or read '%s'"
6606msgstr ""
6607
Jiang Xin9caaf232013-02-14 14:49:45 +08006608#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
6609#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
6610#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
6611#: builtin/notes.c:967 builtin/tag.c:556
Jiang Xindce37b62012-02-13 14:37:59 +08006612#, c-format
6613msgid "Failed to resolve '%s' as a valid ref."
6614msgstr ""
6615
Jiang Xin9caaf232013-02-14 14:49:45 +08006616#: builtin/notes.c:274
Jiang Xindce37b62012-02-13 14:37:59 +08006617#, c-format
6618msgid "Failed to read object '%s'."
6619msgstr ""
6620
Jiang Xin9caaf232013-02-14 14:49:45 +08006621#: builtin/notes.c:298
Jiang Xindce37b62012-02-13 14:37:59 +08006622msgid "Cannot commit uninitialized/unreferenced notes tree"
6623msgstr ""
6624
Jiang Xin9caaf232013-02-14 14:49:45 +08006625#: builtin/notes.c:339
Jiang Xindce37b62012-02-13 14:37:59 +08006626#, c-format
6627msgid "Bad notes.rewriteMode value: '%s'"
6628msgstr ""
6629
Jiang Xin9caaf232013-02-14 14:49:45 +08006630#: builtin/notes.c:349
Jiang Xindce37b62012-02-13 14:37:59 +08006631#, c-format
6632msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
6633msgstr ""
6634
6635#. TRANSLATORS: The first %s is the name of the
6636#. environment variable, the second %s is its value
Jiang Xin9caaf232013-02-14 14:49:45 +08006637#: builtin/notes.c:376
Jiang Xindce37b62012-02-13 14:37:59 +08006638#, c-format
6639msgid "Bad %s value: '%s'"
6640msgstr ""
6641
Jiang Xin9caaf232013-02-14 14:49:45 +08006642#: builtin/notes.c:440
Jiang Xindce37b62012-02-13 14:37:59 +08006643#, c-format
6644msgid "Malformed input line: '%s'."
6645msgstr ""
6646
Jiang Xin9caaf232013-02-14 14:49:45 +08006647#: builtin/notes.c:455
Jiang Xindce37b62012-02-13 14:37:59 +08006648#, c-format
6649msgid "Failed to copy notes from '%s' to '%s'"
6650msgstr ""
6651
Jiang Xin9caaf232013-02-14 14:49:45 +08006652#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
6653#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
6654#: builtin/notes.c:1032
Jiang Xindce37b62012-02-13 14:37:59 +08006655msgid "too many parameters"
6656msgstr ""
6657
Jiang Xin9caaf232013-02-14 14:49:45 +08006658#: builtin/notes.c:512 builtin/notes.c:771
Jiang Xindce37b62012-02-13 14:37:59 +08006659#, c-format
6660msgid "No note found for object %s."
6661msgstr ""
6662
Jiang Xin9caaf232013-02-14 14:49:45 +08006663#: builtin/notes.c:534 builtin/notes.c:691
Jiang Xincc760112012-09-15 10:26:13 +08006664msgid "note contents as a string"
6665msgstr ""
6666
Jiang Xin9caaf232013-02-14 14:49:45 +08006667#: builtin/notes.c:537 builtin/notes.c:694
Jiang Xincc760112012-09-15 10:26:13 +08006668msgid "note contents in a file"
6669msgstr ""
6670
Jiang Xin9caaf232013-02-14 14:49:45 +08006671#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
6672#: builtin/notes.c:699 builtin/tag.c:474
Jiang Xincc760112012-09-15 10:26:13 +08006673msgid "object"
6674msgstr ""
6675
Jiang Xin9caaf232013-02-14 14:49:45 +08006676#: builtin/notes.c:540 builtin/notes.c:697
Jiang Xincc760112012-09-15 10:26:13 +08006677msgid "reuse and edit specified note object"
6678msgstr ""
6679
Jiang Xin9caaf232013-02-14 14:49:45 +08006680#: builtin/notes.c:543 builtin/notes.c:700
Jiang Xincc760112012-09-15 10:26:13 +08006681msgid "reuse specified note object"
6682msgstr ""
6683
Jiang Xin9caaf232013-02-14 14:49:45 +08006684#: builtin/notes.c:545 builtin/notes.c:613
Jiang Xincc760112012-09-15 10:26:13 +08006685msgid "replace existing notes"
6686msgstr ""
6687
Jiang Xin9caaf232013-02-14 14:49:45 +08006688#: builtin/notes.c:579
Jiang Xindce37b62012-02-13 14:37:59 +08006689#, c-format
6690msgid ""
6691"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6692"existing notes"
6693msgstr ""
6694
Jiang Xin9caaf232013-02-14 14:49:45 +08006695#: builtin/notes.c:584 builtin/notes.c:661
Jiang Xindce37b62012-02-13 14:37:59 +08006696#, c-format
6697msgid "Overwriting existing notes for object %s\n"
6698msgstr ""
6699
Jiang Xin9caaf232013-02-14 14:49:45 +08006700#: builtin/notes.c:614
Jiang Xincc760112012-09-15 10:26:13 +08006701msgid "read objects from stdin"
6702msgstr ""
6703
Jiang Xin9caaf232013-02-14 14:49:45 +08006704#: builtin/notes.c:616
Jiang Xincc760112012-09-15 10:26:13 +08006705msgid "load rewriting config for <command> (implies --stdin)"
6706msgstr ""
6707
Jiang Xin9caaf232013-02-14 14:49:45 +08006708#: builtin/notes.c:634
Jiang Xindce37b62012-02-13 14:37:59 +08006709msgid "too few parameters"
6710msgstr ""
6711
Jiang Xin9caaf232013-02-14 14:49:45 +08006712#: builtin/notes.c:655
Jiang Xindce37b62012-02-13 14:37:59 +08006713#, c-format
6714msgid ""
6715"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6716"existing notes"
6717msgstr ""
6718
Jiang Xin9caaf232013-02-14 14:49:45 +08006719#: builtin/notes.c:667
Jiang Xindce37b62012-02-13 14:37:59 +08006720#, c-format
6721msgid "Missing notes on source object %s. Cannot copy."
6722msgstr ""
6723
Jiang Xin9caaf232013-02-14 14:49:45 +08006724#: builtin/notes.c:716
Jiang Xindce37b62012-02-13 14:37:59 +08006725#, c-format
6726msgid ""
6727"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6728"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6729msgstr ""
6730
Jiang Xin9caaf232013-02-14 14:49:45 +08006731#: builtin/notes.c:863
Jiang Xincc760112012-09-15 10:26:13 +08006732msgid "General options"
6733msgstr ""
6734
Jiang Xin9caaf232013-02-14 14:49:45 +08006735#: builtin/notes.c:865
Jiang Xincc760112012-09-15 10:26:13 +08006736msgid "Merge options"
6737msgstr ""
6738
Jiang Xin9caaf232013-02-14 14:49:45 +08006739#: builtin/notes.c:867
Jiang Xincc760112012-09-15 10:26:13 +08006740msgid ""
6741"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6742"cat_sort_uniq)"
6743msgstr ""
6744
Jiang Xin9caaf232013-02-14 14:49:45 +08006745#: builtin/notes.c:869
Jiang Xincc760112012-09-15 10:26:13 +08006746msgid "Committing unmerged notes"
6747msgstr ""
6748
Jiang Xin9caaf232013-02-14 14:49:45 +08006749#: builtin/notes.c:871
Jiang Xincc760112012-09-15 10:26:13 +08006750msgid "finalize notes merge by committing unmerged notes"
6751msgstr ""
6752
Jiang Xin9caaf232013-02-14 14:49:45 +08006753#: builtin/notes.c:873
Jiang Xincc760112012-09-15 10:26:13 +08006754msgid "Aborting notes merge resolution"
6755msgstr ""
6756
Jiang Xin9caaf232013-02-14 14:49:45 +08006757#: builtin/notes.c:875
Jiang Xincc760112012-09-15 10:26:13 +08006758msgid "abort notes merge"
6759msgstr ""
6760
Jiang Xin9caaf232013-02-14 14:49:45 +08006761#: builtin/notes.c:970
Jiang Xindce37b62012-02-13 14:37:59 +08006762#, c-format
6763msgid "Object %s has no note\n"
6764msgstr ""
6765
Jiang Xin9caaf232013-02-14 14:49:45 +08006766#: builtin/notes.c:982
Jiang Xincc760112012-09-15 10:26:13 +08006767msgid "attempt to remove non-existent note is not an error"
6768msgstr ""
6769
Jiang Xin9caaf232013-02-14 14:49:45 +08006770#: builtin/notes.c:985
Jiang Xincc760112012-09-15 10:26:13 +08006771msgid "read object names from the standard input"
6772msgstr ""
6773
Jiang Xin9caaf232013-02-14 14:49:45 +08006774#: builtin/notes.c:1066
Jiang Xincc760112012-09-15 10:26:13 +08006775msgid "notes_ref"
6776msgstr ""
6777
Jiang Xin9caaf232013-02-14 14:49:45 +08006778#: builtin/notes.c:1067
Jiang Xincc760112012-09-15 10:26:13 +08006779msgid "use notes from <notes_ref>"
6780msgstr ""
6781
Jiang Xin9caaf232013-02-14 14:49:45 +08006782#: builtin/notes.c:1102 builtin/remote.c:1598
Jiang Xindce37b62012-02-13 14:37:59 +08006783#, c-format
6784msgid "Unknown subcommand: %s"
6785msgstr ""
6786
Jiang Xincc760112012-09-15 10:26:13 +08006787#: builtin/pack-objects.c:23
6788msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6789msgstr ""
6790
6791#: builtin/pack-objects.c:24
6792msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6793msgstr ""
6794
Jiang Xin11b90172012-07-03 10:31:59 +08006795#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6796#, c-format
6797msgid "deflate error (%d)"
6798msgstr ""
6799
Jiang Xinfe52cd62012-11-23 14:29:02 +08006800#: builtin/pack-objects.c:2397
Jiang Xin1d4ac882012-02-28 12:24:20 +08006801#, c-format
6802msgid "unsupported index version %s"
6803msgstr ""
6804
Jiang Xinfe52cd62012-11-23 14:29:02 +08006805#: builtin/pack-objects.c:2401
Jiang Xin1d4ac882012-02-28 12:24:20 +08006806#, c-format
6807msgid "bad index version '%s'"
6808msgstr ""
6809
Jiang Xinfe52cd62012-11-23 14:29:02 +08006810#: builtin/pack-objects.c:2424
Jiang Xin1d4ac882012-02-28 12:24:20 +08006811#, c-format
6812msgid "option %s does not accept negative form"
6813msgstr ""
6814
Jiang Xinfe52cd62012-11-23 14:29:02 +08006815#: builtin/pack-objects.c:2428
Jiang Xin1d4ac882012-02-28 12:24:20 +08006816#, c-format
6817msgid "unable to parse value '%s' for option %s"
6818msgstr ""
6819
Jiang Xinfe52cd62012-11-23 14:29:02 +08006820#: builtin/pack-objects.c:2447
Jiang Xincc760112012-09-15 10:26:13 +08006821msgid "do not show progress meter"
6822msgstr ""
6823
Jiang Xinfe52cd62012-11-23 14:29:02 +08006824#: builtin/pack-objects.c:2449
Jiang Xincc760112012-09-15 10:26:13 +08006825msgid "show progress meter"
6826msgstr ""
6827
Jiang Xinfe52cd62012-11-23 14:29:02 +08006828#: builtin/pack-objects.c:2451
Jiang Xincc760112012-09-15 10:26:13 +08006829msgid "show progress meter during object writing phase"
6830msgstr ""
6831
Jiang Xinfe52cd62012-11-23 14:29:02 +08006832#: builtin/pack-objects.c:2454
Jiang Xincc760112012-09-15 10:26:13 +08006833msgid "similar to --all-progress when progress meter is shown"
6834msgstr ""
6835
Jiang Xinfe52cd62012-11-23 14:29:02 +08006836#: builtin/pack-objects.c:2455
Jiang Xincc760112012-09-15 10:26:13 +08006837msgid "version[,offset]"
6838msgstr ""
6839
Jiang Xinfe52cd62012-11-23 14:29:02 +08006840#: builtin/pack-objects.c:2456
Jiang Xincc760112012-09-15 10:26:13 +08006841msgid "write the pack index file in the specified idx format version"
6842msgstr ""
6843
Jiang Xinfe52cd62012-11-23 14:29:02 +08006844#: builtin/pack-objects.c:2459
Jiang Xincc760112012-09-15 10:26:13 +08006845msgid "maximum size of each output pack file"
6846msgstr ""
6847
Jiang Xinfe52cd62012-11-23 14:29:02 +08006848#: builtin/pack-objects.c:2461
Jiang Xincc760112012-09-15 10:26:13 +08006849msgid "ignore borrowed objects from alternate object store"
6850msgstr ""
6851
Jiang Xinfe52cd62012-11-23 14:29:02 +08006852#: builtin/pack-objects.c:2463
Jiang Xincc760112012-09-15 10:26:13 +08006853msgid "ignore packed objects"
6854msgstr ""
6855
Jiang Xinfe52cd62012-11-23 14:29:02 +08006856#: builtin/pack-objects.c:2465
Jiang Xincc760112012-09-15 10:26:13 +08006857msgid "limit pack window by objects"
6858msgstr ""
6859
Jiang Xinfe52cd62012-11-23 14:29:02 +08006860#: builtin/pack-objects.c:2467
Jiang Xincc760112012-09-15 10:26:13 +08006861msgid "limit pack window by memory in addition to object limit"
6862msgstr ""
6863
Jiang Xinfe52cd62012-11-23 14:29:02 +08006864#: builtin/pack-objects.c:2469
Jiang Xincc760112012-09-15 10:26:13 +08006865msgid "maximum length of delta chain allowed in the resulting pack"
6866msgstr ""
6867
Jiang Xinfe52cd62012-11-23 14:29:02 +08006868#: builtin/pack-objects.c:2471
Jiang Xincc760112012-09-15 10:26:13 +08006869msgid "reuse existing deltas"
6870msgstr ""
6871
Jiang Xinfe52cd62012-11-23 14:29:02 +08006872#: builtin/pack-objects.c:2473
Jiang Xincc760112012-09-15 10:26:13 +08006873msgid "reuse existing objects"
6874msgstr ""
6875
Jiang Xinfe52cd62012-11-23 14:29:02 +08006876#: builtin/pack-objects.c:2475
Jiang Xincc760112012-09-15 10:26:13 +08006877msgid "use OFS_DELTA objects"
6878msgstr ""
6879
Jiang Xinfe52cd62012-11-23 14:29:02 +08006880#: builtin/pack-objects.c:2477
Jiang Xincc760112012-09-15 10:26:13 +08006881msgid "use threads when searching for best delta matches"
6882msgstr ""
6883
Jiang Xinfe52cd62012-11-23 14:29:02 +08006884#: builtin/pack-objects.c:2479
Jiang Xincc760112012-09-15 10:26:13 +08006885msgid "do not create an empty pack output"
6886msgstr ""
6887
Jiang Xinfe52cd62012-11-23 14:29:02 +08006888#: builtin/pack-objects.c:2481
Jiang Xincc760112012-09-15 10:26:13 +08006889msgid "read revision arguments from standard input"
6890msgstr ""
6891
Jiang Xinfe52cd62012-11-23 14:29:02 +08006892#: builtin/pack-objects.c:2483
Jiang Xincc760112012-09-15 10:26:13 +08006893msgid "limit the objects to those that are not yet packed"
6894msgstr ""
6895
Jiang Xinfe52cd62012-11-23 14:29:02 +08006896#: builtin/pack-objects.c:2486
Jiang Xincc760112012-09-15 10:26:13 +08006897msgid "include objects reachable from any reference"
6898msgstr ""
6899
Jiang Xinfe52cd62012-11-23 14:29:02 +08006900#: builtin/pack-objects.c:2489
Jiang Xincc760112012-09-15 10:26:13 +08006901msgid "include objects referred by reflog entries"
6902msgstr ""
6903
Jiang Xinfe52cd62012-11-23 14:29:02 +08006904#: builtin/pack-objects.c:2492
Jiang Xincc760112012-09-15 10:26:13 +08006905msgid "output pack to stdout"
6906msgstr ""
6907
Jiang Xinfe52cd62012-11-23 14:29:02 +08006908#: builtin/pack-objects.c:2494
Jiang Xincc760112012-09-15 10:26:13 +08006909msgid "include tag objects that refer to objects to be packed"
6910msgstr ""
6911
Jiang Xinfe52cd62012-11-23 14:29:02 +08006912#: builtin/pack-objects.c:2496
Jiang Xincc760112012-09-15 10:26:13 +08006913msgid "keep unreachable objects"
6914msgstr ""
6915
Jiang Xinfe52cd62012-11-23 14:29:02 +08006916#: builtin/pack-objects.c:2497 parse-options.h:141
Jiang Xincc760112012-09-15 10:26:13 +08006917msgid "time"
6918msgstr ""
6919
Jiang Xinfe52cd62012-11-23 14:29:02 +08006920#: builtin/pack-objects.c:2498
Jiang Xincc760112012-09-15 10:26:13 +08006921msgid "unpack unreachable objects newer than <time>"
6922msgstr ""
6923
Jiang Xinfe52cd62012-11-23 14:29:02 +08006924#: builtin/pack-objects.c:2501
Jiang Xincc760112012-09-15 10:26:13 +08006925msgid "create thin packs"
6926msgstr ""
6927
Jiang Xinfe52cd62012-11-23 14:29:02 +08006928#: builtin/pack-objects.c:2503
Jiang Xincc760112012-09-15 10:26:13 +08006929msgid "ignore packs that have companion .keep file"
6930msgstr ""
6931
Jiang Xinfe52cd62012-11-23 14:29:02 +08006932#: builtin/pack-objects.c:2505
Jiang Xincc760112012-09-15 10:26:13 +08006933msgid "pack compression level"
6934msgstr ""
6935
Jiang Xinfe52cd62012-11-23 14:29:02 +08006936#: builtin/pack-objects.c:2507
Jiang Xincc760112012-09-15 10:26:13 +08006937msgid "do not hide commits by grafts"
6938msgstr ""
6939
6940#: builtin/pack-refs.c:6
6941msgid "git pack-refs [options]"
6942msgstr ""
6943
6944#: builtin/pack-refs.c:14
6945msgid "pack everything"
6946msgstr ""
6947
6948#: builtin/pack-refs.c:15
6949msgid "prune loose refs (default)"
6950msgstr ""
6951
6952#: builtin/prune-packed.c:7
6953msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
6954msgstr ""
6955
6956#: builtin/prune.c:12
6957msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
6958msgstr ""
6959
6960#: builtin/prune.c:132
6961msgid "do not remove, show only"
6962msgstr ""
6963
6964#: builtin/prune.c:133
6965msgid "report pruned objects"
6966msgstr ""
6967
6968#: builtin/prune.c:136
6969msgid "expire objects older than <time>"
6970msgstr ""
6971
6972#: builtin/push.c:14
6973msgid "git push [<options>] [<repository> [<refspec>...]]"
6974msgstr ""
6975
Jiang Xincd1e7482012-04-28 20:27:01 +08006976#: builtin/push.c:45
Jiang Xindce37b62012-02-13 14:37:59 +08006977msgid "tag shorthand without <tag>"
6978msgstr ""
6979
Jiang Xincd1e7482012-04-28 20:27:01 +08006980#: builtin/push.c:64
Jiang Xindce37b62012-02-13 14:37:59 +08006981msgid "--delete only accepts plain target ref names"
6982msgstr ""
6983
Jiang Xin822e4a62012-05-08 16:10:22 +08006984#: builtin/push.c:99
6985msgid ""
6986"\n"
6987"To choose either option permanently, see push.default in 'git help config'."
6988msgstr ""
6989
6990#: builtin/push.c:102
6991#, c-format
6992msgid ""
6993"The upstream branch of your current branch does not match\n"
6994"the name of your current branch. To push to the upstream branch\n"
6995"on the remote, use\n"
6996"\n"
6997" git push %s HEAD:%s\n"
6998"\n"
6999"To push to the branch of the same name on the remote, use\n"
7000"\n"
7001" git push %s %s\n"
7002"%s"
7003msgstr ""
7004
7005#: builtin/push.c:121
Jiang Xindce37b62012-02-13 14:37:59 +08007006#, c-format
7007msgid ""
7008"You are not currently on a branch.\n"
7009"To push the history leading to the current (detached HEAD)\n"
7010"state now, use\n"
7011"\n"
7012" git push %s HEAD:<name-of-remote-branch>\n"
7013msgstr ""
7014
Jiang Xin822e4a62012-05-08 16:10:22 +08007015#: builtin/push.c:128
Jiang Xindce37b62012-02-13 14:37:59 +08007016#, c-format
7017msgid ""
7018"The current branch %s has no upstream branch.\n"
7019"To push the current branch and set the remote as upstream, use\n"
7020"\n"
7021" git push --set-upstream %s %s\n"
7022msgstr ""
7023
Jiang Xin822e4a62012-05-08 16:10:22 +08007024#: builtin/push.c:136
Jiang Xindce37b62012-02-13 14:37:59 +08007025#, c-format
7026msgid "The current branch %s has multiple upstream branches, refusing to push."
7027msgstr ""
7028
Jiang Xin822e4a62012-05-08 16:10:22 +08007029#: builtin/push.c:139
Jiang Xincd1e7482012-04-28 20:27:01 +08007030#, c-format
7031msgid ""
7032"You are pushing to remote '%s', which is not the upstream of\n"
7033"your current branch '%s', without telling me what to push\n"
7034"to update which remote branch."
7035msgstr ""
7036
Jiang Xinccfca8d2012-09-05 06:20:57 +08007037#: builtin/push.c:151
7038msgid ""
7039"push.default is unset; its implicit value is changing in\n"
7040"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7041"and maintain the current behavior after the default changes, use:\n"
7042"\n"
7043" git config --global push.default matching\n"
7044"\n"
7045"To squelch this message and adopt the new behavior now, use:\n"
7046"\n"
7047" git config --global push.default simple\n"
7048"\n"
7049"See 'git help config' and search for 'push.default' for further "
7050"information.\n"
7051"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7052"'current' instead of 'simple' if you sometimes use older versions of Git)"
7053msgstr ""
7054
7055#: builtin/push.c:199
Jiang Xindce37b62012-02-13 14:37:59 +08007056msgid ""
7057"You didn't specify any refspecs to push, and push.default is \"nothing\"."
7058msgstr ""
7059
Jiang Xinccfca8d2012-09-05 06:20:57 +08007060#: builtin/push.c:206
Jiang Xincd1e7482012-04-28 20:27:01 +08007061msgid ""
7062"Updates were rejected because the tip of your current branch is behind\n"
7063"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
7064"before pushing again.\n"
7065"See the 'Note about fast-forwards' in 'git push --help' for details."
7066msgstr ""
7067
Jiang Xinccfca8d2012-09-05 06:20:57 +08007068#: builtin/push.c:212
Jiang Xincd1e7482012-04-28 20:27:01 +08007069msgid ""
7070"Updates were rejected because a pushed branch tip is behind its remote\n"
7071"counterpart. If you did not intend to push that branch, you may want to\n"
Jiang Xinccfca8d2012-09-05 06:20:57 +08007072"specify branches to push or set the 'push.default' configuration variable\n"
7073"to 'simple', 'current' or 'upstream' to push only the current branch."
Jiang Xincd1e7482012-04-28 20:27:01 +08007074msgstr ""
7075
Jiang Xinccfca8d2012-09-05 06:20:57 +08007076#: builtin/push.c:218
Jiang Xincd1e7482012-04-28 20:27:01 +08007077msgid ""
7078"Updates were rejected because a pushed branch tip is behind its remote\n"
7079"counterpart. Check out this branch and merge the remote changes\n"
7080"(e.g. 'git pull') before pushing again.\n"
7081"See the 'Note about fast-forwards' in 'git push --help' for details."
7082msgstr ""
7083
Jiang Xin46bc4032013-01-25 12:33:58 +08007084#: builtin/push.c:224
7085msgid ""
Jiang Xin9caaf232013-02-14 14:49:45 +08007086"Updates were rejected because the remote contains work that you do\n"
7087"not have locally. This is usually caused by another repository pushing\n"
7088"to the same ref. You may want to first merge the remote changes (e.g.,\n"
7089"'git pull') before pushing again.\n"
7090"See the 'Note about fast-forwards' in 'git push --help' for details."
Jiang Xin46bc4032013-01-25 12:33:58 +08007091msgstr ""
7092
Jiang Xin9caaf232013-02-14 14:49:45 +08007093#: builtin/push.c:231
7094msgid "Updates were rejected because the tag already exists in the remote."
7095msgstr ""
7096
7097#: builtin/push.c:234
7098msgid ""
7099"You cannot update a remote ref that points at a non-commit object,\n"
7100"or update a remote ref to make it point at a non-commit object,\n"
7101"without using the '--force' option.\n"
7102msgstr ""
7103
7104#: builtin/push.c:294
Jiang Xindce37b62012-02-13 14:37:59 +08007105#, c-format
7106msgid "Pushing to %s\n"
7107msgstr ""
7108
Jiang Xin9caaf232013-02-14 14:49:45 +08007109#: builtin/push.c:298
Jiang Xindce37b62012-02-13 14:37:59 +08007110#, c-format
7111msgid "failed to push some refs to '%s'"
7112msgstr ""
7113
Jiang Xin9caaf232013-02-14 14:49:45 +08007114#: builtin/push.c:331
Jiang Xindce37b62012-02-13 14:37:59 +08007115#, c-format
7116msgid "bad repository '%s'"
7117msgstr ""
7118
Jiang Xin9caaf232013-02-14 14:49:45 +08007119#: builtin/push.c:332
Jiang Xindce37b62012-02-13 14:37:59 +08007120msgid ""
7121"No configured push destination.\n"
7122"Either specify the URL from the command-line or configure a remote "
7123"repository using\n"
7124"\n"
7125" git remote add <name> <url>\n"
7126"\n"
7127"and then push using the remote name\n"
7128"\n"
7129" git push <name>\n"
7130msgstr ""
7131
Jiang Xin9caaf232013-02-14 14:49:45 +08007132#: builtin/push.c:347
Jiang Xindce37b62012-02-13 14:37:59 +08007133msgid "--all and --tags are incompatible"
7134msgstr ""
7135
Jiang Xin9caaf232013-02-14 14:49:45 +08007136#: builtin/push.c:348
Jiang Xindce37b62012-02-13 14:37:59 +08007137msgid "--all can't be combined with refspecs"
7138msgstr ""
7139
Jiang Xin9caaf232013-02-14 14:49:45 +08007140#: builtin/push.c:353
Jiang Xindce37b62012-02-13 14:37:59 +08007141msgid "--mirror and --tags are incompatible"
7142msgstr ""
7143
Jiang Xin9caaf232013-02-14 14:49:45 +08007144#: builtin/push.c:354
Jiang Xindce37b62012-02-13 14:37:59 +08007145msgid "--mirror can't be combined with refspecs"
7146msgstr ""
7147
Jiang Xin9caaf232013-02-14 14:49:45 +08007148#: builtin/push.c:359
Jiang Xindce37b62012-02-13 14:37:59 +08007149msgid "--all and --mirror are incompatible"
7150msgstr ""
7151
Jiang Xin9caaf232013-02-14 14:49:45 +08007152#: builtin/push.c:419
Jiang Xincc760112012-09-15 10:26:13 +08007153msgid "repository"
7154msgstr ""
7155
Jiang Xin9caaf232013-02-14 14:49:45 +08007156#: builtin/push.c:420
Jiang Xincc760112012-09-15 10:26:13 +08007157msgid "push all refs"
7158msgstr ""
7159
Jiang Xin9caaf232013-02-14 14:49:45 +08007160#: builtin/push.c:421
Jiang Xincc760112012-09-15 10:26:13 +08007161msgid "mirror all refs"
7162msgstr ""
7163
Jiang Xin9caaf232013-02-14 14:49:45 +08007164#: builtin/push.c:423
Jiang Xincc760112012-09-15 10:26:13 +08007165msgid "delete refs"
7166msgstr ""
7167
Jiang Xin9caaf232013-02-14 14:49:45 +08007168#: builtin/push.c:424
Jiang Xincc760112012-09-15 10:26:13 +08007169msgid "push tags (can't be used with --all or --mirror)"
7170msgstr ""
7171
Jiang Xin9caaf232013-02-14 14:49:45 +08007172#: builtin/push.c:427
Jiang Xincc760112012-09-15 10:26:13 +08007173msgid "force updates"
7174msgstr ""
7175
Jiang Xin9caaf232013-02-14 14:49:45 +08007176#: builtin/push.c:428
Jiang Xincc760112012-09-15 10:26:13 +08007177msgid "check"
7178msgstr ""
7179
Jiang Xin9caaf232013-02-14 14:49:45 +08007180#: builtin/push.c:429
Jiang Xincc760112012-09-15 10:26:13 +08007181msgid "control recursive pushing of submodules"
7182msgstr ""
7183
Jiang Xin9caaf232013-02-14 14:49:45 +08007184#: builtin/push.c:431
Jiang Xincc760112012-09-15 10:26:13 +08007185msgid "use thin pack"
7186msgstr ""
7187
Jiang Xin9caaf232013-02-14 14:49:45 +08007188#: builtin/push.c:432 builtin/push.c:433
Jiang Xincc760112012-09-15 10:26:13 +08007189msgid "receive pack program"
7190msgstr ""
7191
Jiang Xin9caaf232013-02-14 14:49:45 +08007192#: builtin/push.c:434
Jiang Xincc760112012-09-15 10:26:13 +08007193msgid "set upstream for git pull/status"
7194msgstr ""
7195
Jiang Xin9caaf232013-02-14 14:49:45 +08007196#: builtin/push.c:437
Jiang Xincc760112012-09-15 10:26:13 +08007197msgid "prune locally removed refs"
7198msgstr ""
7199
Jiang Xin9caaf232013-02-14 14:49:45 +08007200#: builtin/push.c:439
7201msgid "bypass pre-push hook"
7202msgstr ""
7203
Jiang Xinc138af52013-04-10 15:19:54 +08007204#: builtin/push.c:440
7205msgid "push missing but relevant tags"
Jiang Xindce37b62012-02-13 14:37:59 +08007206msgstr ""
7207
Jiang Xin9caaf232013-02-14 14:49:45 +08007208#: builtin/push.c:450
Jiang Xinc138af52013-04-10 15:19:54 +08007209msgid "--delete is incompatible with --all, --mirror and --tags"
7210msgstr ""
7211
7212#: builtin/push.c:452
Jiang Xindce37b62012-02-13 14:37:59 +08007213msgid "--delete doesn't make sense without any refs"
7214msgstr ""
7215
Jiang Xincc760112012-09-15 10:26:13 +08007216#: builtin/read-tree.c:36
7217msgid ""
7218"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7219"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7220"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7221msgstr ""
7222
7223#: builtin/read-tree.c:108
7224msgid "write resulting index to <file>"
7225msgstr ""
7226
7227#: builtin/read-tree.c:111
7228msgid "only empty the index"
7229msgstr ""
7230
7231#: builtin/read-tree.c:113
7232msgid "Merging"
7233msgstr ""
7234
7235#: builtin/read-tree.c:115
7236msgid "perform a merge in addition to a read"
7237msgstr ""
7238
7239#: builtin/read-tree.c:117
7240msgid "3-way merge if no file level merging required"
7241msgstr ""
7242
7243#: builtin/read-tree.c:119
7244msgid "3-way merge in presence of adds and removes"
7245msgstr ""
7246
7247#: builtin/read-tree.c:121
7248msgid "same as -m, but discard unmerged entries"
7249msgstr ""
7250
7251#: builtin/read-tree.c:122
7252msgid "<subdirectory>/"
7253msgstr ""
7254
7255#: builtin/read-tree.c:123
7256msgid "read the tree into the index under <subdirectory>/"
7257msgstr ""
7258
7259#: builtin/read-tree.c:126
7260msgid "update working tree with merge result"
7261msgstr ""
7262
7263#: builtin/read-tree.c:128
7264msgid "gitignore"
7265msgstr ""
7266
7267#: builtin/read-tree.c:129
7268msgid "allow explicitly ignored files to be overwritten"
7269msgstr ""
7270
7271#: builtin/read-tree.c:132
7272msgid "don't check the working tree after merging"
7273msgstr ""
7274
7275#: builtin/read-tree.c:133
7276msgid "don't update the index or the work tree"
7277msgstr ""
7278
7279#: builtin/read-tree.c:135
7280msgid "skip applying sparse checkout filter"
7281msgstr ""
7282
7283#: builtin/read-tree.c:137
7284msgid "debug unpack-trees"
7285msgstr ""
7286
7287#: builtin/remote.c:11
7288msgid "git remote [-v | --verbose]"
7289msgstr ""
7290
7291#: builtin/remote.c:12
7292msgid ""
7293"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7294"mirror=<fetch|push>] <name> <url>"
7295msgstr ""
7296
7297#: builtin/remote.c:13 builtin/remote.c:32
7298msgid "git remote rename <old> <new>"
7299msgstr ""
7300
7301#: builtin/remote.c:14 builtin/remote.c:37
7302msgid "git remote remove <name>"
7303msgstr ""
7304
Jiang Xinf9472e32012-11-30 12:41:47 +08007305#: builtin/remote.c:15 builtin/remote.c:42
Jiang Xincc760112012-09-15 10:26:13 +08007306msgid "git remote set-head <name> (-a | -d | <branch>)"
7307msgstr ""
7308
7309#: builtin/remote.c:16
7310msgid "git remote [-v | --verbose] show [-n] <name>"
7311msgstr ""
7312
7313#: builtin/remote.c:17
7314msgid "git remote prune [-n | --dry-run] <name>"
7315msgstr ""
7316
7317#: builtin/remote.c:18
7318msgid ""
7319"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7320msgstr ""
7321
7322#: builtin/remote.c:19
7323msgid "git remote set-branches [--add] <name> <branch>..."
7324msgstr ""
7325
7326#: builtin/remote.c:20 builtin/remote.c:68
7327msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7328msgstr ""
7329
7330#: builtin/remote.c:21 builtin/remote.c:69
7331msgid "git remote set-url --add <name> <newurl>"
7332msgstr ""
7333
7334#: builtin/remote.c:22 builtin/remote.c:70
7335msgid "git remote set-url --delete <name> <url>"
7336msgstr ""
7337
7338#: builtin/remote.c:27
7339msgid "git remote add [<options>] <name> <url>"
7340msgstr ""
7341
Jiang Xincc760112012-09-15 10:26:13 +08007342#: builtin/remote.c:47
7343msgid "git remote set-branches <name> <branch>..."
7344msgstr ""
7345
7346#: builtin/remote.c:48
7347msgid "git remote set-branches --add <name> <branch>..."
7348msgstr ""
7349
7350#: builtin/remote.c:53
7351msgid "git remote show [<options>] <name>"
7352msgstr ""
7353
7354#: builtin/remote.c:58
7355msgid "git remote prune [<options>] <name>"
7356msgstr ""
7357
7358#: builtin/remote.c:63
7359msgid "git remote update [<options>] [<group> | <remote>]..."
7360msgstr ""
7361
Jiang Xin822e4a62012-05-08 16:10:22 +08007362#: builtin/remote.c:98
7363#, c-format
7364msgid "Updating %s"
7365msgstr ""
7366
7367#: builtin/remote.c:130
7368msgid ""
7369"--mirror is dangerous and deprecated; please\n"
7370"\t use --mirror=fetch or --mirror=push instead"
7371msgstr ""
7372
7373#: builtin/remote.c:147
7374#, c-format
7375msgid "unknown mirror argument: %s"
7376msgstr ""
7377
Jiang Xincc760112012-09-15 10:26:13 +08007378#: builtin/remote.c:163
7379msgid "fetch the remote branches"
7380msgstr ""
7381
7382#: builtin/remote.c:165
7383msgid "import all tags and associated objects when fetching"
7384msgstr ""
7385
7386#: builtin/remote.c:168
7387msgid "or do not fetch any tag at all (--no-tags)"
7388msgstr ""
7389
7390#: builtin/remote.c:170
7391msgid "branch(es) to track"
7392msgstr ""
7393
7394#: builtin/remote.c:171
7395msgid "master branch"
7396msgstr ""
7397
7398#: builtin/remote.c:172
7399msgid "push|fetch"
7400msgstr ""
7401
7402#: builtin/remote.c:173
7403msgid "set up remote as a mirror to push to or fetch from"
7404msgstr ""
7405
Jiang Xin822e4a62012-05-08 16:10:22 +08007406#: builtin/remote.c:185
7407msgid "specifying a master branch makes no sense with --mirror"
7408msgstr ""
7409
7410#: builtin/remote.c:187
7411msgid "specifying branches to track makes sense only with fetch mirrors"
7412msgstr ""
7413
7414#: builtin/remote.c:195 builtin/remote.c:646
7415#, c-format
7416msgid "remote %s already exists."
7417msgstr ""
7418
7419#: builtin/remote.c:199 builtin/remote.c:650
7420#, c-format
7421msgid "'%s' is not a valid remote name"
7422msgstr ""
7423
7424#: builtin/remote.c:243
7425#, c-format
7426msgid "Could not setup master '%s'"
7427msgstr ""
7428
7429#: builtin/remote.c:299
7430#, c-format
7431msgid "more than one %s"
7432msgstr ""
7433
7434#: builtin/remote.c:339
7435#, c-format
7436msgid "Could not get fetch map for refspec %s"
7437msgstr ""
7438
7439#: builtin/remote.c:440 builtin/remote.c:448
7440msgid "(matching)"
7441msgstr ""
7442
7443#: builtin/remote.c:452
7444msgid "(delete)"
7445msgstr ""
7446
7447#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7448#, c-format
7449msgid "Could not append '%s' to '%s'"
7450msgstr ""
7451
7452#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7453#, c-format
7454msgid "No such remote: %s"
7455msgstr ""
7456
7457#: builtin/remote.c:656
7458#, c-format
7459msgid "Could not rename config section '%s' to '%s'"
7460msgstr ""
7461
7462#: builtin/remote.c:662 builtin/remote.c:799
7463#, c-format
7464msgid "Could not remove config section '%s'"
7465msgstr ""
7466
7467#: builtin/remote.c:677
7468#, c-format
7469msgid ""
Jiang Xin75f7b4b2012-06-02 07:07:27 +08007470"Not updating non-default fetch refspec\n"
Jiang Xin822e4a62012-05-08 16:10:22 +08007471"\t%s\n"
7472"\tPlease update the configuration manually if necessary."
7473msgstr ""
7474
7475#: builtin/remote.c:683
7476#, c-format
7477msgid "Could not append '%s'"
7478msgstr ""
7479
7480#: builtin/remote.c:694
7481#, c-format
7482msgid "Could not set '%s'"
7483msgstr ""
7484
7485#: builtin/remote.c:716
7486#, c-format
7487msgid "deleting '%s' failed"
7488msgstr ""
7489
7490#: builtin/remote.c:750
7491#, c-format
7492msgid "creating '%s' failed"
7493msgstr ""
7494
7495#: builtin/remote.c:764
7496#, c-format
7497msgid "Could not remove branch %s"
7498msgstr ""
7499
7500#: builtin/remote.c:834
7501msgid ""
7502"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7503"to delete it, use:"
7504msgid_plural ""
7505"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7506"to delete them, use:"
7507msgstr[0] ""
7508msgstr[1] ""
7509
7510#: builtin/remote.c:943
7511#, c-format
7512msgid " new (next fetch will store in remotes/%s)"
7513msgstr ""
7514
7515#: builtin/remote.c:946
7516msgid " tracked"
7517msgstr ""
7518
7519#: builtin/remote.c:948
7520msgid " stale (use 'git remote prune' to remove)"
7521msgstr ""
7522
7523#: builtin/remote.c:950
7524msgid " ???"
7525msgstr ""
7526
7527#: builtin/remote.c:991
7528#, c-format
7529msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7530msgstr ""
7531
7532#: builtin/remote.c:998
7533#, c-format
7534msgid "rebases onto remote %s"
7535msgstr ""
7536
7537#: builtin/remote.c:1001
7538#, c-format
7539msgid " merges with remote %s"
7540msgstr ""
7541
7542#: builtin/remote.c:1002
7543msgid " and with remote"
7544msgstr ""
7545
7546#: builtin/remote.c:1004
7547#, c-format
7548msgid "merges with remote %s"
7549msgstr ""
7550
7551#: builtin/remote.c:1005
7552msgid " and with remote"
7553msgstr ""
7554
7555#: builtin/remote.c:1051
7556msgid "create"
7557msgstr ""
7558
7559#: builtin/remote.c:1054
7560msgid "delete"
7561msgstr ""
7562
7563#: builtin/remote.c:1058
7564msgid "up to date"
7565msgstr ""
7566
7567#: builtin/remote.c:1061
7568msgid "fast-forwardable"
7569msgstr ""
7570
7571#: builtin/remote.c:1064
7572msgid "local out of date"
7573msgstr ""
7574
7575#: builtin/remote.c:1071
7576#, c-format
7577msgid " %-*s forces to %-*s (%s)"
7578msgstr ""
7579
7580#: builtin/remote.c:1074
7581#, c-format
7582msgid " %-*s pushes to %-*s (%s)"
7583msgstr ""
7584
7585#: builtin/remote.c:1078
7586#, c-format
7587msgid " %-*s forces to %s"
7588msgstr ""
7589
7590#: builtin/remote.c:1081
7591#, c-format
7592msgid " %-*s pushes to %s"
7593msgstr ""
7594
Jiang Xincc760112012-09-15 10:26:13 +08007595#: builtin/remote.c:1091
7596msgid "do not query remotes"
7597msgstr ""
7598
Jiang Xin822e4a62012-05-08 16:10:22 +08007599#: builtin/remote.c:1118
7600#, c-format
7601msgid "* remote %s"
7602msgstr ""
7603
7604#: builtin/remote.c:1119
7605#, c-format
7606msgid " Fetch URL: %s"
7607msgstr ""
7608
7609#: builtin/remote.c:1120 builtin/remote.c:1285
7610msgid "(no URL)"
7611msgstr ""
7612
7613#: builtin/remote.c:1129 builtin/remote.c:1131
7614#, c-format
7615msgid " Push URL: %s"
7616msgstr ""
7617
7618#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7619#, c-format
7620msgid " HEAD branch: %s"
7621msgstr ""
7622
7623#: builtin/remote.c:1139
7624#, c-format
7625msgid ""
7626" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7627msgstr ""
7628
7629#: builtin/remote.c:1151
7630#, c-format
7631msgid " Remote branch:%s"
7632msgid_plural " Remote branches:%s"
7633msgstr[0] ""
7634msgstr[1] ""
7635
7636#: builtin/remote.c:1154 builtin/remote.c:1181
7637msgid " (status not queried)"
7638msgstr ""
7639
7640#: builtin/remote.c:1163
7641msgid " Local branch configured for 'git pull':"
7642msgid_plural " Local branches configured for 'git pull':"
7643msgstr[0] ""
7644msgstr[1] ""
7645
7646#: builtin/remote.c:1171
7647msgid " Local refs will be mirrored by 'git push'"
7648msgstr ""
7649
7650#: builtin/remote.c:1178
7651#, c-format
7652msgid " Local ref configured for 'git push'%s:"
7653msgid_plural " Local refs configured for 'git push'%s:"
7654msgstr[0] ""
7655msgstr[1] ""
7656
Jiang Xincc760112012-09-15 10:26:13 +08007657#: builtin/remote.c:1199
7658msgid "set refs/remotes/<name>/HEAD according to remote"
7659msgstr ""
7660
7661#: builtin/remote.c:1201
7662msgid "delete refs/remotes/<name>/HEAD"
7663msgstr ""
7664
Jiang Xin822e4a62012-05-08 16:10:22 +08007665#: builtin/remote.c:1216
7666msgid "Cannot determine remote HEAD"
7667msgstr ""
7668
7669#: builtin/remote.c:1218
7670msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7671msgstr ""
7672
7673#: builtin/remote.c:1228
7674#, c-format
7675msgid "Could not delete %s"
7676msgstr ""
7677
7678#: builtin/remote.c:1236
7679#, c-format
7680msgid "Not a valid ref: %s"
7681msgstr ""
7682
7683#: builtin/remote.c:1238
7684#, c-format
7685msgid "Could not setup %s"
7686msgstr ""
7687
7688#: builtin/remote.c:1274
7689#, c-format
7690msgid " %s will become dangling!"
7691msgstr ""
7692
7693#: builtin/remote.c:1275
7694#, c-format
7695msgid " %s has become dangling!"
7696msgstr ""
7697
7698#: builtin/remote.c:1281
7699#, c-format
7700msgid "Pruning %s"
7701msgstr ""
7702
7703#: builtin/remote.c:1282
7704#, c-format
7705msgid "URL: %s"
7706msgstr ""
7707
7708#: builtin/remote.c:1295
7709#, c-format
7710msgid " * [would prune] %s"
7711msgstr ""
7712
7713#: builtin/remote.c:1298
7714#, c-format
7715msgid " * [pruned] %s"
7716msgstr ""
7717
Jiang Xincc760112012-09-15 10:26:13 +08007718#: builtin/remote.c:1321
7719msgid "prune remotes after fetching"
7720msgstr ""
7721
Jiang Xin822e4a62012-05-08 16:10:22 +08007722#: builtin/remote.c:1387 builtin/remote.c:1461
7723#, c-format
7724msgid "No such remote '%s'"
7725msgstr ""
7726
Jiang Xincc760112012-09-15 10:26:13 +08007727#: builtin/remote.c:1407
7728msgid "add branch"
7729msgstr ""
7730
Jiang Xin822e4a62012-05-08 16:10:22 +08007731#: builtin/remote.c:1414
7732msgid "no remote specified"
7733msgstr ""
7734
Jiang Xincc760112012-09-15 10:26:13 +08007735#: builtin/remote.c:1436
7736msgid "manipulate push URLs"
7737msgstr ""
7738
7739#: builtin/remote.c:1438
7740msgid "add URL"
7741msgstr ""
7742
7743#: builtin/remote.c:1440
7744msgid "delete URLs"
7745msgstr ""
7746
Jiang Xin822e4a62012-05-08 16:10:22 +08007747#: builtin/remote.c:1447
7748msgid "--add --delete doesn't make sense"
7749msgstr ""
7750
7751#: builtin/remote.c:1487
7752#, c-format
7753msgid "Invalid old URL pattern: %s"
7754msgstr ""
7755
7756#: builtin/remote.c:1495
7757#, c-format
7758msgid "No such URL found: %s"
7759msgstr ""
7760
7761#: builtin/remote.c:1497
7762msgid "Will not delete all non-push URLs"
7763msgstr ""
7764
Jiang Xincc760112012-09-15 10:26:13 +08007765#: builtin/remote.c:1569
7766msgid "be verbose; must be placed before a subcommand"
7767msgstr ""
7768
7769#: builtin/replace.c:17
7770msgid "git replace [-f] <object> <replacement>"
7771msgstr ""
7772
7773#: builtin/replace.c:18
7774msgid "git replace -d <object>..."
7775msgstr ""
7776
7777#: builtin/replace.c:19
7778msgid "git replace -l [<pattern>]"
7779msgstr ""
7780
Jiang Xinfe52cd62012-11-23 14:29:02 +08007781#: builtin/replace.c:121
Jiang Xincc760112012-09-15 10:26:13 +08007782msgid "list replace refs"
7783msgstr ""
7784
Jiang Xinfe52cd62012-11-23 14:29:02 +08007785#: builtin/replace.c:122
Jiang Xincc760112012-09-15 10:26:13 +08007786msgid "delete replace refs"
7787msgstr ""
7788
Jiang Xinfe52cd62012-11-23 14:29:02 +08007789#: builtin/replace.c:123
Jiang Xincc760112012-09-15 10:26:13 +08007790msgid "replace the ref if it exists"
7791msgstr ""
7792
7793#: builtin/rerere.c:11
7794msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7795msgstr ""
7796
7797#: builtin/rerere.c:56
7798msgid "register clean resolutions in index"
7799msgstr ""
7800
7801#: builtin/reset.c:25
7802msgid ""
7803"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7804msgstr ""
7805
7806#: builtin/reset.c:26
Jiang Xin46bc4032013-01-25 12:33:58 +08007807msgid "git reset [-q] <tree-ish> [--] <paths>..."
Jiang Xincc760112012-09-15 10:26:13 +08007808msgstr ""
7809
7810#: builtin/reset.c:27
Jiang Xin46bc4032013-01-25 12:33:58 +08007811msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
Jiang Xincc760112012-09-15 10:26:13 +08007812msgstr ""
7813
Jiang Xindce37b62012-02-13 14:37:59 +08007814#: builtin/reset.c:33
7815msgid "mixed"
7816msgstr ""
7817
7818#: builtin/reset.c:33
7819msgid "soft"
7820msgstr ""
7821
7822#: builtin/reset.c:33
7823msgid "hard"
7824msgstr ""
7825
7826#: builtin/reset.c:33
Jiang Xin822e4a62012-05-08 16:10:22 +08007827msgid "merge"
7828msgstr ""
7829
7830#: builtin/reset.c:33
Jiang Xindce37b62012-02-13 14:37:59 +08007831msgid "keep"
7832msgstr ""
7833
Jiang Xin46bc4032013-01-25 12:33:58 +08007834#: builtin/reset.c:73
Jiang Xindce37b62012-02-13 14:37:59 +08007835msgid "You do not have a valid HEAD."
7836msgstr ""
7837
Jiang Xin46bc4032013-01-25 12:33:58 +08007838#: builtin/reset.c:75
Jiang Xindce37b62012-02-13 14:37:59 +08007839msgid "Failed to find tree of HEAD."
7840msgstr ""
7841
Jiang Xin46bc4032013-01-25 12:33:58 +08007842#: builtin/reset.c:81
Jiang Xindce37b62012-02-13 14:37:59 +08007843#, c-format
7844msgid "Failed to find tree of %s."
7845msgstr ""
7846
Jiang Xin46bc4032013-01-25 12:33:58 +08007847#: builtin/reset.c:98
Jiang Xindce37b62012-02-13 14:37:59 +08007848#, c-format
7849msgid "HEAD is now at %s"
7850msgstr ""
7851
Jiang Xin46bc4032013-01-25 12:33:58 +08007852#: builtin/reset.c:169
Jiang Xindce37b62012-02-13 14:37:59 +08007853#, c-format
7854msgid "Cannot do a %s reset in the middle of a merge."
7855msgstr ""
7856
Jiang Xin46bc4032013-01-25 12:33:58 +08007857#: builtin/reset.c:248
Jiang Xincc760112012-09-15 10:26:13 +08007858msgid "be quiet, only report errors"
7859msgstr ""
7860
Jiang Xin46bc4032013-01-25 12:33:58 +08007861#: builtin/reset.c:250
Jiang Xincc760112012-09-15 10:26:13 +08007862msgid "reset HEAD and index"
7863msgstr ""
7864
Jiang Xin46bc4032013-01-25 12:33:58 +08007865#: builtin/reset.c:251
Jiang Xincc760112012-09-15 10:26:13 +08007866msgid "reset only HEAD"
7867msgstr ""
7868
Jiang Xin46bc4032013-01-25 12:33:58 +08007869#: builtin/reset.c:253 builtin/reset.c:255
Jiang Xincc760112012-09-15 10:26:13 +08007870msgid "reset HEAD, index and working tree"
7871msgstr ""
7872
Jiang Xin46bc4032013-01-25 12:33:58 +08007873#: builtin/reset.c:257
Jiang Xincc760112012-09-15 10:26:13 +08007874msgid "reset HEAD but keep local changes"
7875msgstr ""
7876
Jiang Xin46bc4032013-01-25 12:33:58 +08007877#: builtin/reset.c:275
7878#, c-format
7879msgid "Failed to resolve '%s' as a valid revision."
7880msgstr ""
7881
7882#: builtin/reset.c:278 builtin/reset.c:286
Jiang Xindce37b62012-02-13 14:37:59 +08007883#, c-format
7884msgid "Could not parse object '%s'."
7885msgstr ""
7886
Jiang Xin46bc4032013-01-25 12:33:58 +08007887#: builtin/reset.c:283
7888#, c-format
7889msgid "Failed to resolve '%s' as a valid tree."
7890msgstr ""
7891
7892#: builtin/reset.c:292
Jiang Xindce37b62012-02-13 14:37:59 +08007893msgid "--patch is incompatible with --{hard,mixed,soft}"
7894msgstr ""
7895
Jiang Xin46bc4032013-01-25 12:33:58 +08007896#: builtin/reset.c:301
Jiang Xindce37b62012-02-13 14:37:59 +08007897msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
7898msgstr ""
7899
Jiang Xin46bc4032013-01-25 12:33:58 +08007900#: builtin/reset.c:303
Jiang Xindce37b62012-02-13 14:37:59 +08007901#, c-format
7902msgid "Cannot do %s reset with paths."
7903msgstr ""
7904
Jiang Xin46bc4032013-01-25 12:33:58 +08007905#: builtin/reset.c:313
Jiang Xindce37b62012-02-13 14:37:59 +08007906#, c-format
7907msgid "%s reset is not allowed in a bare repository"
7908msgstr ""
7909
Jiang Xin46bc4032013-01-25 12:33:58 +08007910#: builtin/reset.c:333
Jiang Xindce37b62012-02-13 14:37:59 +08007911#, c-format
7912msgid "Could not reset index file to revision '%s'."
7913msgstr ""
7914
Jiang Xin46bc4032013-01-25 12:33:58 +08007915#: builtin/reset.c:339
7916msgid "Unstaged changes after reset:"
7917msgstr ""
7918
7919#: builtin/reset.c:344
7920msgid "Could not write new index file."
7921msgstr ""
7922
Jiang Xincc760112012-09-15 10:26:13 +08007923#: builtin/rev-parse.c:339
7924msgid "git rev-parse --parseopt [options] -- [<args>...]"
7925msgstr ""
7926
7927#: builtin/rev-parse.c:344
7928msgid "keep the `--` passed as an arg"
7929msgstr ""
7930
7931#: builtin/rev-parse.c:346
7932msgid "stop parsing after the first non-option argument"
7933msgstr ""
7934
7935#: builtin/rev-parse.c:464
7936msgid ""
7937"git rev-parse --parseopt [options] -- [<args>...]\n"
7938" or: git rev-parse --sq-quote [<arg>...]\n"
7939" or: git rev-parse [options] [<arg>...]\n"
7940"\n"
7941"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7942msgstr ""
7943
7944#: builtin/revert.c:22
Jiang Xinc6bc7d42013-04-30 08:31:19 +08007945msgid "git revert [options] <commit-ish>..."
Jiang Xincc760112012-09-15 10:26:13 +08007946msgstr ""
7947
7948#: builtin/revert.c:23
7949msgid "git revert <subcommand>"
7950msgstr ""
7951
7952#: builtin/revert.c:28
Jiang Xinc6bc7d42013-04-30 08:31:19 +08007953msgid "git cherry-pick [options] <commit-ish>..."
Jiang Xincc760112012-09-15 10:26:13 +08007954msgstr ""
7955
7956#: builtin/revert.c:29
7957msgid "git cherry-pick <subcommand>"
7958msgstr ""
7959
Jiang Xincd1e7482012-04-28 20:27:01 +08007960#: builtin/revert.c:70 builtin/revert.c:92
Jiang Xindce37b62012-02-13 14:37:59 +08007961#, c-format
7962msgid "%s: %s cannot be used with %s"
7963msgstr ""
7964
Jiang Xincc760112012-09-15 10:26:13 +08007965#: builtin/revert.c:103
7966msgid "end revert or cherry-pick sequence"
7967msgstr ""
7968
7969#: builtin/revert.c:104
7970msgid "resume revert or cherry-pick sequence"
7971msgstr ""
7972
7973#: builtin/revert.c:105
7974msgid "cancel revert or cherry-pick sequence"
7975msgstr ""
7976
7977#: builtin/revert.c:106
7978msgid "don't automatically commit"
7979msgstr ""
7980
7981#: builtin/revert.c:107
7982msgid "edit the commit message"
7983msgstr ""
7984
7985#: builtin/revert.c:110
7986msgid "parent number"
7987msgstr ""
7988
7989#: builtin/revert.c:112
7990msgid "merge strategy"
7991msgstr ""
7992
7993#: builtin/revert.c:113
7994msgid "option"
7995msgstr ""
7996
7997#: builtin/revert.c:114
7998msgid "option for merge strategy"
7999msgstr ""
8000
8001#: builtin/revert.c:125
8002msgid "append commit name"
8003msgstr ""
8004
8005#: builtin/revert.c:126
8006msgid "allow fast-forward"
8007msgstr ""
8008
8009#: builtin/revert.c:127
8010msgid "preserve initially empty commits"
8011msgstr ""
8012
8013#: builtin/revert.c:128
8014msgid "allow commits with empty messages"
8015msgstr ""
8016
8017#: builtin/revert.c:129
8018msgid "keep redundant, empty commits"
8019msgstr ""
8020
8021#: builtin/revert.c:133
Jiang Xindce37b62012-02-13 14:37:59 +08008022msgid "program error"
8023msgstr ""
8024
Jiang Xincc760112012-09-15 10:26:13 +08008025#: builtin/revert.c:223
Jiang Xindce37b62012-02-13 14:37:59 +08008026msgid "revert failed"
8027msgstr ""
8028
Jiang Xincc760112012-09-15 10:26:13 +08008029#: builtin/revert.c:238
Jiang Xindce37b62012-02-13 14:37:59 +08008030msgid "cherry-pick failed"
8031msgstr ""
8032
Jiang Xinfe52cd62012-11-23 14:29:02 +08008033#: builtin/rm.c:15
Jiang Xincc760112012-09-15 10:26:13 +08008034msgid "git rm [options] [--] <file>..."
8035msgstr ""
8036
Jiang Xinfe52cd62012-11-23 14:29:02 +08008037#: builtin/rm.c:64 builtin/rm.c:186
8038#, c-format
8039msgid ""
8040"submodule '%s' (or one of its nested submodules) uses a .git directory\n"
8041"(use 'rm -rf' if you really want to remove it including all of its history)"
8042msgstr ""
8043
8044#: builtin/rm.c:174
Jiang Xindce37b62012-02-13 14:37:59 +08008045#, c-format
8046msgid ""
8047"'%s' has staged content different from both the file and the HEAD\n"
8048"(use -f to force removal)"
8049msgstr ""
8050
Jiang Xinfe52cd62012-11-23 14:29:02 +08008051#: builtin/rm.c:180
Jiang Xindce37b62012-02-13 14:37:59 +08008052#, c-format
8053msgid ""
8054"'%s' has changes staged in the index\n"
8055"(use --cached to keep the file, or -f to force removal)"
8056msgstr ""
8057
Jiang Xinfe52cd62012-11-23 14:29:02 +08008058#: builtin/rm.c:191
Jiang Xindce37b62012-02-13 14:37:59 +08008059#, c-format
8060msgid ""
8061"'%s' has local modifications\n"
8062"(use --cached to keep the file, or -f to force removal)"
8063msgstr ""
8064
Jiang Xinfe52cd62012-11-23 14:29:02 +08008065#: builtin/rm.c:207
Jiang Xincc760112012-09-15 10:26:13 +08008066msgid "do not list removed files"
8067msgstr ""
8068
Jiang Xinfe52cd62012-11-23 14:29:02 +08008069#: builtin/rm.c:208
Jiang Xincc760112012-09-15 10:26:13 +08008070msgid "only remove from the index"
8071msgstr ""
8072
Jiang Xinfe52cd62012-11-23 14:29:02 +08008073#: builtin/rm.c:209
Jiang Xincc760112012-09-15 10:26:13 +08008074msgid "override the up-to-date check"
8075msgstr ""
8076
Jiang Xinfe52cd62012-11-23 14:29:02 +08008077#: builtin/rm.c:210
Jiang Xincc760112012-09-15 10:26:13 +08008078msgid "allow recursive removal"
8079msgstr ""
8080
Jiang Xinfe52cd62012-11-23 14:29:02 +08008081#: builtin/rm.c:212
Jiang Xincc760112012-09-15 10:26:13 +08008082msgid "exit with a zero status even if nothing matched"
8083msgstr ""
8084
Jiang Xinf9472e32012-11-30 12:41:47 +08008085#: builtin/rm.c:283
Jiang Xindce37b62012-02-13 14:37:59 +08008086#, c-format
8087msgid "not removing '%s' recursively without -r"
8088msgstr ""
8089
Jiang Xinf9472e32012-11-30 12:41:47 +08008090#: builtin/rm.c:322
Jiang Xindce37b62012-02-13 14:37:59 +08008091#, c-format
8092msgid "git rm: unable to remove %s"
8093msgstr ""
8094
Jiang Xincc760112012-09-15 10:26:13 +08008095#: builtin/shortlog.c:13
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008096msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
Jiang Xincc760112012-09-15 10:26:13 +08008097msgstr ""
8098
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008099#: builtin/shortlog.c:131
Jiang Xindce37b62012-02-13 14:37:59 +08008100#, c-format
8101msgid "Missing author: %s"
8102msgstr ""
8103
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008104#: builtin/shortlog.c:227
Jiang Xincc760112012-09-15 10:26:13 +08008105msgid "sort output according to the number of commits per author"
8106msgstr ""
8107
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008108#: builtin/shortlog.c:229
Jiang Xincc760112012-09-15 10:26:13 +08008109msgid "Suppress commit descriptions, only provides commit count"
8110msgstr ""
8111
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008112#: builtin/shortlog.c:231
Jiang Xincc760112012-09-15 10:26:13 +08008113msgid "Show the email address of each author"
8114msgstr ""
8115
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008116#: builtin/shortlog.c:232
Jiang Xincc760112012-09-15 10:26:13 +08008117msgid "w[,i1[,i2]]"
8118msgstr ""
8119
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008120#: builtin/shortlog.c:233
Jiang Xincc760112012-09-15 10:26:13 +08008121msgid "Linewrap output"
8122msgstr ""
8123
8124#: builtin/show-branch.c:9
8125msgid ""
8126"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8127"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8128"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8129"<glob>)...]"
8130msgstr ""
8131
8132#: builtin/show-branch.c:10
8133msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8134msgstr ""
8135
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008136#: builtin/show-branch.c:650
Jiang Xincc760112012-09-15 10:26:13 +08008137msgid "show remote-tracking and local branches"
8138msgstr ""
8139
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008140#: builtin/show-branch.c:652
Jiang Xincc760112012-09-15 10:26:13 +08008141msgid "show remote-tracking branches"
8142msgstr ""
8143
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008144#: builtin/show-branch.c:654
Jiang Xincc760112012-09-15 10:26:13 +08008145msgid "color '*!+-' corresponding to the branch"
8146msgstr ""
8147
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008148#: builtin/show-branch.c:656
Jiang Xincc760112012-09-15 10:26:13 +08008149msgid "show <n> more commits after the common ancestor"
8150msgstr ""
8151
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008152#: builtin/show-branch.c:658
Jiang Xincc760112012-09-15 10:26:13 +08008153msgid "synonym to more=-1"
8154msgstr ""
8155
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008156#: builtin/show-branch.c:659
Jiang Xincc760112012-09-15 10:26:13 +08008157msgid "suppress naming strings"
8158msgstr ""
8159
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008160#: builtin/show-branch.c:661
Jiang Xincc760112012-09-15 10:26:13 +08008161msgid "include the current branch"
8162msgstr ""
8163
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008164#: builtin/show-branch.c:663
Jiang Xincc760112012-09-15 10:26:13 +08008165msgid "name commits with their object names"
8166msgstr ""
8167
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008168#: builtin/show-branch.c:665
Jiang Xincc760112012-09-15 10:26:13 +08008169msgid "show possible merge bases"
8170msgstr ""
8171
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008172#: builtin/show-branch.c:667
Jiang Xincc760112012-09-15 10:26:13 +08008173msgid "show refs unreachable from any other ref"
8174msgstr ""
8175
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008176#: builtin/show-branch.c:669
Jiang Xincc760112012-09-15 10:26:13 +08008177msgid "show commits in topological order"
8178msgstr ""
8179
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008180#: builtin/show-branch.c:671
Jiang Xincc760112012-09-15 10:26:13 +08008181msgid "show only commits not on the first branch"
8182msgstr ""
8183
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008184#: builtin/show-branch.c:673
Jiang Xincc760112012-09-15 10:26:13 +08008185msgid "show merges reachable from only one tip"
8186msgstr ""
8187
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008188#: builtin/show-branch.c:675
Jiang Xincc760112012-09-15 10:26:13 +08008189msgid "show commits where no parent comes before its children"
8190msgstr ""
8191
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008192#: builtin/show-branch.c:677
Jiang Xincc760112012-09-15 10:26:13 +08008193msgid "<n>[,<base>]"
8194msgstr ""
8195
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008196#: builtin/show-branch.c:678
Jiang Xincc760112012-09-15 10:26:13 +08008197msgid "show <n> most recent ref-log entries starting at base"
8198msgstr ""
8199
8200#: builtin/show-ref.c:10
8201msgid ""
Jiang Xin9caaf232013-02-14 14:49:45 +08008202"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8203"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
Jiang Xincc760112012-09-15 10:26:13 +08008204msgstr ""
8205
8206#: builtin/show-ref.c:11
8207msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8208msgstr ""
8209
Jiang Xinfe52cd62012-11-23 14:29:02 +08008210#: builtin/show-ref.c:165
Jiang Xincc760112012-09-15 10:26:13 +08008211msgid "only show tags (can be combined with heads)"
8212msgstr ""
8213
Jiang Xinfe52cd62012-11-23 14:29:02 +08008214#: builtin/show-ref.c:166
Jiang Xincc760112012-09-15 10:26:13 +08008215msgid "only show heads (can be combined with tags)"
8216msgstr ""
8217
Jiang Xinfe52cd62012-11-23 14:29:02 +08008218#: builtin/show-ref.c:167
Jiang Xincc760112012-09-15 10:26:13 +08008219msgid "stricter reference checking, requires exact ref path"
8220msgstr ""
8221
Jiang Xinfe52cd62012-11-23 14:29:02 +08008222#: builtin/show-ref.c:170 builtin/show-ref.c:172
Jiang Xincc760112012-09-15 10:26:13 +08008223msgid "show the HEAD reference"
8224msgstr ""
8225
Jiang Xinfe52cd62012-11-23 14:29:02 +08008226#: builtin/show-ref.c:174
Jiang Xincc760112012-09-15 10:26:13 +08008227msgid "dereference tags into object IDs"
8228msgstr ""
8229
Jiang Xinfe52cd62012-11-23 14:29:02 +08008230#: builtin/show-ref.c:176
Jiang Xincc760112012-09-15 10:26:13 +08008231msgid "only show SHA1 hash using <n> digits"
8232msgstr ""
8233
Jiang Xinfe52cd62012-11-23 14:29:02 +08008234#: builtin/show-ref.c:180
Jiang Xincc760112012-09-15 10:26:13 +08008235msgid "do not print results to stdout (useful with --verify)"
8236msgstr ""
8237
Jiang Xinfe52cd62012-11-23 14:29:02 +08008238#: builtin/show-ref.c:182
Jiang Xincc760112012-09-15 10:26:13 +08008239msgid "show refs from stdin that aren't in local repository"
8240msgstr ""
8241
8242#: builtin/symbolic-ref.c:7
8243msgid "git symbolic-ref [options] name [ref]"
8244msgstr ""
8245
Jiang Xinfe52cd62012-11-23 14:29:02 +08008246#: builtin/symbolic-ref.c:8
8247msgid "git symbolic-ref -d [-q] name"
8248msgstr ""
8249
8250#: builtin/symbolic-ref.c:40
Jiang Xincc760112012-09-15 10:26:13 +08008251msgid "suppress error message for non-symbolic (detached) refs"
8252msgstr ""
8253
Jiang Xinfe52cd62012-11-23 14:29:02 +08008254#: builtin/symbolic-ref.c:41
8255msgid "delete symbolic ref"
8256msgstr ""
8257
8258#: builtin/symbolic-ref.c:42
Jiang Xincc760112012-09-15 10:26:13 +08008259msgid "shorten ref output"
8260msgstr ""
8261
Jiang Xinfe52cd62012-11-23 14:29:02 +08008262#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
Jiang Xincc760112012-09-15 10:26:13 +08008263msgid "reason"
8264msgstr ""
8265
Jiang Xinfe52cd62012-11-23 14:29:02 +08008266#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
Jiang Xincc760112012-09-15 10:26:13 +08008267msgid "reason of the update"
8268msgstr ""
8269
8270#: builtin/tag.c:22
8271msgid ""
8272"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8273msgstr ""
8274
8275#: builtin/tag.c:23
8276msgid "git tag -d <tagname>..."
8277msgstr ""
8278
8279#: builtin/tag.c:24
8280msgid ""
8281"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8282"\t\t[<pattern>...]"
8283msgstr ""
8284
8285#: builtin/tag.c:26
8286msgid "git tag -v <tagname>..."
8287msgstr ""
8288
Jiang Xin822e4a62012-05-08 16:10:22 +08008289#: builtin/tag.c:60
Jiang Xin1d4ac882012-02-28 12:24:20 +08008290#, c-format
8291msgid "malformed object at '%s'"
8292msgstr ""
8293
Jiang Xin822e4a62012-05-08 16:10:22 +08008294#: builtin/tag.c:207
Jiang Xindce37b62012-02-13 14:37:59 +08008295#, c-format
8296msgid "tag name too long: %.*s..."
8297msgstr ""
8298
Jiang Xin822e4a62012-05-08 16:10:22 +08008299#: builtin/tag.c:212
Jiang Xindce37b62012-02-13 14:37:59 +08008300#, c-format
8301msgid "tag '%s' not found."
8302msgstr ""
8303
Jiang Xin822e4a62012-05-08 16:10:22 +08008304#: builtin/tag.c:227
Jiang Xindce37b62012-02-13 14:37:59 +08008305#, c-format
8306msgid "Deleted tag '%s' (was %s)\n"
8307msgstr ""
8308
Jiang Xin822e4a62012-05-08 16:10:22 +08008309#: builtin/tag.c:239
Jiang Xindce37b62012-02-13 14:37:59 +08008310#, c-format
8311msgid "could not verify the tag '%s'"
8312msgstr ""
8313
Jiang Xin822e4a62012-05-08 16:10:22 +08008314#: builtin/tag.c:249
Jiang Xin9caaf232013-02-14 14:49:45 +08008315#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08008316msgid ""
8317"\n"
Jiang Xin9caaf232013-02-14 14:49:45 +08008318"Write a tag message\n"
8319"Lines starting with '%c' will be ignored.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08008320msgstr ""
8321
Jiang Xin9caaf232013-02-14 14:49:45 +08008322#: builtin/tag.c:253
8323#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08008324msgid ""
8325"\n"
Jiang Xin9caaf232013-02-14 14:49:45 +08008326"Write a tag message\n"
8327"Lines starting with '%c' will be kept; you may remove them yourself if you "
Jiang Xindce37b62012-02-13 14:37:59 +08008328"want to.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08008329msgstr ""
8330
Jiang Xin9caaf232013-02-14 14:49:45 +08008331#: builtin/tag.c:292
Jiang Xindce37b62012-02-13 14:37:59 +08008332msgid "unable to sign the tag"
8333msgstr ""
8334
Jiang Xin9caaf232013-02-14 14:49:45 +08008335#: builtin/tag.c:294
Jiang Xindce37b62012-02-13 14:37:59 +08008336msgid "unable to write tag file"
8337msgstr ""
8338
Jiang Xin9caaf232013-02-14 14:49:45 +08008339#: builtin/tag.c:319
Jiang Xindce37b62012-02-13 14:37:59 +08008340msgid "bad object type."
8341msgstr ""
8342
Jiang Xin9caaf232013-02-14 14:49:45 +08008343#: builtin/tag.c:332
Jiang Xindce37b62012-02-13 14:37:59 +08008344msgid "tag header too big."
8345msgstr ""
8346
Jiang Xin9caaf232013-02-14 14:49:45 +08008347#: builtin/tag.c:368
Jiang Xindce37b62012-02-13 14:37:59 +08008348msgid "no tag message?"
8349msgstr ""
8350
Jiang Xin9caaf232013-02-14 14:49:45 +08008351#: builtin/tag.c:374
Jiang Xindce37b62012-02-13 14:37:59 +08008352#, c-format
8353msgid "The tag message has been left in %s\n"
8354msgstr ""
8355
Jiang Xin9caaf232013-02-14 14:49:45 +08008356#: builtin/tag.c:423
Jiang Xin1d4ac882012-02-28 12:24:20 +08008357msgid "switch 'points-at' requires an object"
8358msgstr ""
8359
Jiang Xin9caaf232013-02-14 14:49:45 +08008360#: builtin/tag.c:425
Jiang Xin1d4ac882012-02-28 12:24:20 +08008361#, c-format
8362msgid "malformed object name '%s'"
8363msgstr ""
8364
Jiang Xin9caaf232013-02-14 14:49:45 +08008365#: builtin/tag.c:445
Jiang Xincc760112012-09-15 10:26:13 +08008366msgid "list tag names"
8367msgstr ""
8368
Jiang Xin9caaf232013-02-14 14:49:45 +08008369#: builtin/tag.c:447
Jiang Xincc760112012-09-15 10:26:13 +08008370msgid "print <n> lines of each tag message"
8371msgstr ""
8372
Jiang Xin9caaf232013-02-14 14:49:45 +08008373#: builtin/tag.c:449
Jiang Xincc760112012-09-15 10:26:13 +08008374msgid "delete tags"
8375msgstr ""
8376
Jiang Xin9caaf232013-02-14 14:49:45 +08008377#: builtin/tag.c:450
Jiang Xincc760112012-09-15 10:26:13 +08008378msgid "verify tags"
8379msgstr ""
8380
Jiang Xin9caaf232013-02-14 14:49:45 +08008381#: builtin/tag.c:452
Jiang Xincc760112012-09-15 10:26:13 +08008382msgid "Tag creation options"
8383msgstr ""
8384
Jiang Xin9caaf232013-02-14 14:49:45 +08008385#: builtin/tag.c:454
Jiang Xincc760112012-09-15 10:26:13 +08008386msgid "annotated tag, needs a message"
8387msgstr ""
8388
Jiang Xin9caaf232013-02-14 14:49:45 +08008389#: builtin/tag.c:456
Jiang Xincc760112012-09-15 10:26:13 +08008390msgid "tag message"
8391msgstr ""
8392
Jiang Xin9caaf232013-02-14 14:49:45 +08008393#: builtin/tag.c:458
Jiang Xincc760112012-09-15 10:26:13 +08008394msgid "annotated and GPG-signed tag"
8395msgstr ""
8396
Jiang Xin9caaf232013-02-14 14:49:45 +08008397#: builtin/tag.c:462
Jiang Xincc760112012-09-15 10:26:13 +08008398msgid "use another key to sign the tag"
8399msgstr ""
8400
Jiang Xin9caaf232013-02-14 14:49:45 +08008401#: builtin/tag.c:463
Jiang Xincc760112012-09-15 10:26:13 +08008402msgid "replace the tag if exists"
8403msgstr ""
8404
Jiang Xin9caaf232013-02-14 14:49:45 +08008405#: builtin/tag.c:464
Jiang Xincc760112012-09-15 10:26:13 +08008406msgid "show tag list in columns"
8407msgstr ""
8408
Jiang Xin9caaf232013-02-14 14:49:45 +08008409#: builtin/tag.c:466
Jiang Xincc760112012-09-15 10:26:13 +08008410msgid "Tag listing options"
8411msgstr ""
8412
Jiang Xin9caaf232013-02-14 14:49:45 +08008413#: builtin/tag.c:469
Jiang Xincc760112012-09-15 10:26:13 +08008414msgid "print only tags that contain the commit"
8415msgstr ""
8416
Jiang Xin9caaf232013-02-14 14:49:45 +08008417#: builtin/tag.c:475
Jiang Xincc760112012-09-15 10:26:13 +08008418msgid "print only tags of the object"
8419msgstr ""
8420
Jiang Xin9caaf232013-02-14 14:49:45 +08008421#: builtin/tag.c:504
Jiang Xin822e4a62012-05-08 16:10:22 +08008422msgid "--column and -n are incompatible"
8423msgstr ""
8424
Jiang Xin9caaf232013-02-14 14:49:45 +08008425#: builtin/tag.c:521
Jiang Xindce37b62012-02-13 14:37:59 +08008426msgid "-n option is only allowed with -l."
8427msgstr ""
8428
Jiang Xin9caaf232013-02-14 14:49:45 +08008429#: builtin/tag.c:523
Jiang Xindce37b62012-02-13 14:37:59 +08008430msgid "--contains option is only allowed with -l."
8431msgstr ""
8432
Jiang Xin9caaf232013-02-14 14:49:45 +08008433#: builtin/tag.c:525
Jiang Xin1d4ac882012-02-28 12:24:20 +08008434msgid "--points-at option is only allowed with -l."
8435msgstr ""
8436
Jiang Xin9caaf232013-02-14 14:49:45 +08008437#: builtin/tag.c:533
Jiang Xindce37b62012-02-13 14:37:59 +08008438msgid "only one -F or -m option is allowed."
8439msgstr ""
8440
Jiang Xin9caaf232013-02-14 14:49:45 +08008441#: builtin/tag.c:553
Jiang Xindce37b62012-02-13 14:37:59 +08008442msgid "too many params"
8443msgstr ""
8444
Jiang Xin9caaf232013-02-14 14:49:45 +08008445#: builtin/tag.c:559
Jiang Xindce37b62012-02-13 14:37:59 +08008446#, c-format
8447msgid "'%s' is not a valid tag name."
8448msgstr ""
8449
Jiang Xin9caaf232013-02-14 14:49:45 +08008450#: builtin/tag.c:564
Jiang Xindce37b62012-02-13 14:37:59 +08008451#, c-format
8452msgid "tag '%s' already exists"
8453msgstr ""
8454
Jiang Xin9caaf232013-02-14 14:49:45 +08008455#: builtin/tag.c:582
Jiang Xindce37b62012-02-13 14:37:59 +08008456#, c-format
8457msgid "%s: cannot lock the ref"
8458msgstr ""
8459
Jiang Xin9caaf232013-02-14 14:49:45 +08008460#: builtin/tag.c:584
Jiang Xindce37b62012-02-13 14:37:59 +08008461#, c-format
8462msgid "%s: cannot update the ref"
8463msgstr ""
8464
Jiang Xin9caaf232013-02-14 14:49:45 +08008465#: builtin/tag.c:586
Jiang Xindce37b62012-02-13 14:37:59 +08008466#, c-format
8467msgid "Updated tag '%s' (was %s)\n"
8468msgstr ""
8469
Jiang Xincc760112012-09-15 10:26:13 +08008470#: builtin/update-index.c:401
8471msgid "git update-index [options] [--] [<file>...]"
8472msgstr ""
8473
Jiang Xinfe52cd62012-11-23 14:29:02 +08008474#: builtin/update-index.c:718
Jiang Xincc760112012-09-15 10:26:13 +08008475msgid "continue refresh even when index needs update"
8476msgstr ""
8477
Jiang Xinfe52cd62012-11-23 14:29:02 +08008478#: builtin/update-index.c:721
Jiang Xincc760112012-09-15 10:26:13 +08008479msgid "refresh: ignore submodules"
8480msgstr ""
8481
Jiang Xinfe52cd62012-11-23 14:29:02 +08008482#: builtin/update-index.c:724
Jiang Xincc760112012-09-15 10:26:13 +08008483msgid "do not ignore new files"
8484msgstr ""
8485
Jiang Xinfe52cd62012-11-23 14:29:02 +08008486#: builtin/update-index.c:726
Jiang Xincc760112012-09-15 10:26:13 +08008487msgid "let files replace directories and vice-versa"
8488msgstr ""
8489
Jiang Xinfe52cd62012-11-23 14:29:02 +08008490#: builtin/update-index.c:728
Jiang Xincc760112012-09-15 10:26:13 +08008491msgid "notice files missing from worktree"
8492msgstr ""
8493
Jiang Xinfe52cd62012-11-23 14:29:02 +08008494#: builtin/update-index.c:730
Jiang Xincc760112012-09-15 10:26:13 +08008495msgid "refresh even if index contains unmerged entries"
8496msgstr ""
8497
Jiang Xinfe52cd62012-11-23 14:29:02 +08008498#: builtin/update-index.c:733
Jiang Xincc760112012-09-15 10:26:13 +08008499msgid "refresh stat information"
8500msgstr ""
8501
Jiang Xinfe52cd62012-11-23 14:29:02 +08008502#: builtin/update-index.c:737
Jiang Xincc760112012-09-15 10:26:13 +08008503msgid "like --refresh, but ignore assume-unchanged setting"
8504msgstr ""
8505
Jiang Xinfe52cd62012-11-23 14:29:02 +08008506#: builtin/update-index.c:741
Jiang Xincc760112012-09-15 10:26:13 +08008507msgid "<mode> <object> <path>"
8508msgstr ""
8509
Jiang Xinfe52cd62012-11-23 14:29:02 +08008510#: builtin/update-index.c:742
Jiang Xincc760112012-09-15 10:26:13 +08008511msgid "add the specified entry to the index"
8512msgstr ""
8513
Jiang Xinfe52cd62012-11-23 14:29:02 +08008514#: builtin/update-index.c:746
Jiang Xincc760112012-09-15 10:26:13 +08008515msgid "(+/-)x"
8516msgstr ""
8517
Jiang Xinfe52cd62012-11-23 14:29:02 +08008518#: builtin/update-index.c:747
Jiang Xincc760112012-09-15 10:26:13 +08008519msgid "override the executable bit of the listed files"
8520msgstr ""
8521
Jiang Xinfe52cd62012-11-23 14:29:02 +08008522#: builtin/update-index.c:751
Jiang Xincc760112012-09-15 10:26:13 +08008523msgid "mark files as \"not changing\""
8524msgstr ""
8525
Jiang Xinfe52cd62012-11-23 14:29:02 +08008526#: builtin/update-index.c:754
Jiang Xincc760112012-09-15 10:26:13 +08008527msgid "clear assumed-unchanged bit"
8528msgstr ""
8529
Jiang Xinfe52cd62012-11-23 14:29:02 +08008530#: builtin/update-index.c:757
Jiang Xincc760112012-09-15 10:26:13 +08008531msgid "mark files as \"index-only\""
8532msgstr ""
8533
Jiang Xinfe52cd62012-11-23 14:29:02 +08008534#: builtin/update-index.c:760
Jiang Xincc760112012-09-15 10:26:13 +08008535msgid "clear skip-worktree bit"
8536msgstr ""
8537
Jiang Xinfe52cd62012-11-23 14:29:02 +08008538#: builtin/update-index.c:763
Jiang Xincc760112012-09-15 10:26:13 +08008539msgid "add to index only; do not add content to object database"
8540msgstr ""
8541
Jiang Xinfe52cd62012-11-23 14:29:02 +08008542#: builtin/update-index.c:765
Jiang Xincc760112012-09-15 10:26:13 +08008543msgid "remove named paths even if present in worktree"
8544msgstr ""
8545
Jiang Xinfe52cd62012-11-23 14:29:02 +08008546#: builtin/update-index.c:767
Jiang Xincc760112012-09-15 10:26:13 +08008547msgid "with --stdin: input lines are terminated by null bytes"
8548msgstr ""
8549
Jiang Xinfe52cd62012-11-23 14:29:02 +08008550#: builtin/update-index.c:769
Jiang Xincc760112012-09-15 10:26:13 +08008551msgid "read list of paths to be updated from standard input"
8552msgstr ""
8553
Jiang Xinfe52cd62012-11-23 14:29:02 +08008554#: builtin/update-index.c:773
Jiang Xincc760112012-09-15 10:26:13 +08008555msgid "add entries from standard input to the index"
8556msgstr ""
8557
Jiang Xinfe52cd62012-11-23 14:29:02 +08008558#: builtin/update-index.c:777
Jiang Xincc760112012-09-15 10:26:13 +08008559msgid "repopulate stages #2 and #3 for the listed paths"
8560msgstr ""
8561
Jiang Xinfe52cd62012-11-23 14:29:02 +08008562#: builtin/update-index.c:781
Jiang Xincc760112012-09-15 10:26:13 +08008563msgid "only update entries that differ from HEAD"
8564msgstr ""
8565
Jiang Xinfe52cd62012-11-23 14:29:02 +08008566#: builtin/update-index.c:785
Jiang Xincc760112012-09-15 10:26:13 +08008567msgid "ignore files missing from worktree"
8568msgstr ""
8569
Jiang Xinfe52cd62012-11-23 14:29:02 +08008570#: builtin/update-index.c:788
Jiang Xincc760112012-09-15 10:26:13 +08008571msgid "report actions to standard output"
8572msgstr ""
8573
Jiang Xinfe52cd62012-11-23 14:29:02 +08008574#: builtin/update-index.c:790
Jiang Xincc760112012-09-15 10:26:13 +08008575msgid "(for porcelains) forget saved unresolved conflicts"
8576msgstr ""
8577
Jiang Xinfe52cd62012-11-23 14:29:02 +08008578#: builtin/update-index.c:794
Jiang Xincc760112012-09-15 10:26:13 +08008579msgid "write index in this format"
8580msgstr ""
8581
8582#: builtin/update-ref.c:7
8583msgid "git update-ref [options] -d <refname> [<oldval>]"
8584msgstr ""
8585
8586#: builtin/update-ref.c:8
8587msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8588msgstr ""
8589
8590#: builtin/update-ref.c:19
8591msgid "delete the reference"
8592msgstr ""
8593
8594#: builtin/update-ref.c:21
8595msgid "update <refname> not the one it points to"
8596msgstr ""
8597
8598#: builtin/update-server-info.c:6
8599msgid "git update-server-info [--force]"
8600msgstr ""
8601
8602#: builtin/update-server-info.c:14
8603msgid "update the info files from scratch"
8604msgstr ""
8605
8606#: builtin/verify-pack.c:56
8607msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8608msgstr ""
8609
8610#: builtin/verify-pack.c:66
8611msgid "verbose"
8612msgstr ""
8613
8614#: builtin/verify-pack.c:68
8615msgid "show statistics only"
8616msgstr ""
8617
8618#: builtin/verify-tag.c:17
8619msgid "git verify-tag [-v|--verbose] <tag>..."
8620msgstr ""
8621
8622#: builtin/verify-tag.c:73
8623msgid "print tag contents"
8624msgstr ""
8625
8626#: builtin/write-tree.c:13
8627msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8628msgstr ""
8629
8630#: builtin/write-tree.c:26
8631msgid "<prefix>/"
8632msgstr ""
8633
8634#: builtin/write-tree.c:27
8635msgid "write tree object for a subdirectory <prefix>"
8636msgstr ""
8637
8638#: builtin/write-tree.c:30
8639msgid "only useful for debugging"
8640msgstr ""
8641
Jiang Xin822e4a62012-05-08 16:10:22 +08008642#: git.c:16
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008643msgid ""
8644"'git help -a' and 'git help -g' lists available subcommands and some\n"
8645"concept guides. See 'git help <command>' or 'git help <concept>'\n"
8646"to read about a specific subcommand or concept."
Jiang Xin822e4a62012-05-08 16:10:22 +08008647msgstr ""
8648
Jiang Xin6f6731e2012-05-21 09:00:39 +08008649#: parse-options.h:156
8650msgid "no-op (backward compatibility)"
8651msgstr ""
8652
Jiang Xin46bc4032013-01-25 12:33:58 +08008653#: parse-options.h:232
Jiang Xin6f6731e2012-05-21 09:00:39 +08008654msgid "be more verbose"
8655msgstr ""
8656
Jiang Xin46bc4032013-01-25 12:33:58 +08008657#: parse-options.h:234
Jiang Xin6f6731e2012-05-21 09:00:39 +08008658msgid "be more quiet"
8659msgstr ""
8660
Jiang Xin46bc4032013-01-25 12:33:58 +08008661#: parse-options.h:240
Jiang Xin6f6731e2012-05-21 09:00:39 +08008662msgid "use <n> digits to display SHA-1s"
8663msgstr ""
8664
Jiang Xin822e4a62012-05-08 16:10:22 +08008665#: common-cmds.h:8
8666msgid "Add file contents to the index"
8667msgstr ""
8668
8669#: common-cmds.h:9
8670msgid "Find by binary search the change that introduced a bug"
8671msgstr ""
8672
8673#: common-cmds.h:10
8674msgid "List, create, or delete branches"
8675msgstr ""
8676
8677#: common-cmds.h:11
8678msgid "Checkout a branch or paths to the working tree"
8679msgstr ""
8680
8681#: common-cmds.h:12
8682msgid "Clone a repository into a new directory"
8683msgstr ""
8684
8685#: common-cmds.h:13
8686msgid "Record changes to the repository"
8687msgstr ""
8688
8689#: common-cmds.h:14
8690msgid "Show changes between commits, commit and working tree, etc"
8691msgstr ""
8692
8693#: common-cmds.h:15
8694msgid "Download objects and refs from another repository"
8695msgstr ""
8696
8697#: common-cmds.h:16
8698msgid "Print lines matching a pattern"
8699msgstr ""
8700
8701#: common-cmds.h:17
Jiang Xin9caaf232013-02-14 14:49:45 +08008702msgid "Create an empty Git repository or reinitialize an existing one"
Jiang Xin822e4a62012-05-08 16:10:22 +08008703msgstr ""
8704
8705#: common-cmds.h:18
8706msgid "Show commit logs"
8707msgstr ""
8708
8709#: common-cmds.h:19
8710msgid "Join two or more development histories together"
8711msgstr ""
8712
8713#: common-cmds.h:20
8714msgid "Move or rename a file, a directory, or a symlink"
8715msgstr ""
8716
8717#: common-cmds.h:21
8718msgid "Fetch from and merge with another repository or a local branch"
8719msgstr ""
8720
8721#: common-cmds.h:22
8722msgid "Update remote refs along with associated objects"
8723msgstr ""
8724
8725#: common-cmds.h:23
8726msgid "Forward-port local commits to the updated upstream head"
8727msgstr ""
8728
8729#: common-cmds.h:24
8730msgid "Reset current HEAD to the specified state"
8731msgstr ""
8732
8733#: common-cmds.h:25
8734msgid "Remove files from the working tree and from the index"
8735msgstr ""
8736
8737#: common-cmds.h:26
8738msgid "Show various types of objects"
8739msgstr ""
8740
8741#: common-cmds.h:27
8742msgid "Show the working tree status"
8743msgstr ""
8744
8745#: common-cmds.h:28
8746msgid "Create, list, delete or verify a tag object signed with GPG"
8747msgstr ""
8748
Jiang Xincd1e7482012-04-28 20:27:01 +08008749#: git-am.sh:50
Jiang Xindce37b62012-02-13 14:37:59 +08008750msgid "You need to set your committer info first"
8751msgstr ""
8752
Jiang Xin7256fd72012-06-08 10:40:20 +08008753#: git-am.sh:95
8754msgid ""
8755"You seem to have moved HEAD since the last 'am' failure.\n"
8756"Not rewinding to ORIG_HEAD"
8757msgstr ""
8758
8759#: git-am.sh:105
8760#, sh-format
8761msgid ""
Jiang Xin3b6137f2012-08-02 09:35:23 +08008762"When you have resolved this problem, run \"$cmdline --resolved\".\n"
8763"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8764"To restore the original branch and stop patching, run \"$cmdline --abort\"."
Jiang Xin7256fd72012-06-08 10:40:20 +08008765msgstr ""
8766
8767#: git-am.sh:121
8768msgid "Cannot fall back to three-way merge."
8769msgstr ""
8770
Jiang Xincd1e7482012-04-28 20:27:01 +08008771#: git-am.sh:137
Jiang Xindce37b62012-02-13 14:37:59 +08008772msgid "Repository lacks necessary blobs to fall back on 3-way merge."
8773msgstr ""
8774
Jiang Xin3b6137f2012-08-02 09:35:23 +08008775#: git-am.sh:139
8776msgid "Using index info to reconstruct a base tree..."
8777msgstr ""
8778
Jiang Xincd1e7482012-04-28 20:27:01 +08008779#: git-am.sh:154
Jiang Xindce37b62012-02-13 14:37:59 +08008780msgid ""
8781"Did you hand edit your patch?\n"
8782"It does not apply to blobs recorded in its index."
8783msgstr ""
8784
Jiang Xincd1e7482012-04-28 20:27:01 +08008785#: git-am.sh:163
Jiang Xindce37b62012-02-13 14:37:59 +08008786msgid "Falling back to patching base and 3-way merge..."
8787msgstr ""
8788
Jiang Xin3b6137f2012-08-02 09:35:23 +08008789#: git-am.sh:179
8790msgid "Failed to merge in the changes."
8791msgstr ""
8792
8793#: git-am.sh:274
Jiang Xindce37b62012-02-13 14:37:59 +08008794msgid "Only one StGIT patch series can be applied at once"
8795msgstr ""
8796
Jiang Xin3b6137f2012-08-02 09:35:23 +08008797#: git-am.sh:361
Jiang Xindce37b62012-02-13 14:37:59 +08008798#, sh-format
8799msgid "Patch format $patch_format is not supported."
8800msgstr ""
8801
Jiang Xin3b6137f2012-08-02 09:35:23 +08008802#: git-am.sh:363
Jiang Xindce37b62012-02-13 14:37:59 +08008803msgid "Patch format detection failed."
8804msgstr ""
8805
Jiang Xin3b6137f2012-08-02 09:35:23 +08008806#: git-am.sh:389
8807msgid ""
8808"The -b/--binary option has been a no-op for long time, and\n"
8809"it will be removed. Please do not use it anymore."
Jiang Xindce37b62012-02-13 14:37:59 +08008810msgstr ""
8811
Jiang Xin3b6137f2012-08-02 09:35:23 +08008812#: git-am.sh:477
Jiang Xindce37b62012-02-13 14:37:59 +08008813#, sh-format
8814msgid "previous rebase directory $dotest still exists but mbox given."
8815msgstr ""
8816
Jiang Xin3b6137f2012-08-02 09:35:23 +08008817#: git-am.sh:482
Jiang Xindce37b62012-02-13 14:37:59 +08008818msgid "Please make up your mind. --skip or --abort?"
8819msgstr ""
8820
Jiang Xin3b6137f2012-08-02 09:35:23 +08008821#: git-am.sh:509
Jiang Xindce37b62012-02-13 14:37:59 +08008822msgid "Resolve operation not in progress, we are not resuming."
8823msgstr ""
8824
Jiang Xin3b6137f2012-08-02 09:35:23 +08008825#: git-am.sh:575
Jiang Xindce37b62012-02-13 14:37:59 +08008826#, sh-format
8827msgid "Dirty index: cannot apply patches (dirty: $files)"
8828msgstr ""
8829
Jiang Xin3b6137f2012-08-02 09:35:23 +08008830#: git-am.sh:679
Jiang Xin7256fd72012-06-08 10:40:20 +08008831#, sh-format
8832msgid ""
8833"Patch is empty. Was it split wrong?\n"
8834"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8835"To restore the original branch and stop patching run \"$cmdline --abort\"."
8836msgstr ""
8837
Jiang Xin3b6137f2012-08-02 09:35:23 +08008838#: git-am.sh:706
Jiang Xin7256fd72012-06-08 10:40:20 +08008839msgid "Patch does not have a valid e-mail address."
8840msgstr ""
8841
Jiang Xin3b6137f2012-08-02 09:35:23 +08008842#: git-am.sh:753
Jiang Xindce37b62012-02-13 14:37:59 +08008843msgid "cannot be interactive without stdin connected to a terminal."
8844msgstr ""
8845
Jiang Xin3b6137f2012-08-02 09:35:23 +08008846#: git-am.sh:757
Jiang Xin7256fd72012-06-08 10:40:20 +08008847msgid "Commit Body is:"
8848msgstr ""
8849
Jiang Xindce37b62012-02-13 14:37:59 +08008850#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
8851#. in your translation. The program will only accept English
8852#. input at this point.
Jiang Xin3b6137f2012-08-02 09:35:23 +08008853#: git-am.sh:764
Jiang Xindce37b62012-02-13 14:37:59 +08008854msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
8855msgstr ""
8856
Jiang Xin3b6137f2012-08-02 09:35:23 +08008857#: git-am.sh:800
Jiang Xindce37b62012-02-13 14:37:59 +08008858#, sh-format
8859msgid "Applying: $FIRSTLINE"
8860msgstr ""
8861
Jiang Xin3b6137f2012-08-02 09:35:23 +08008862#: git-am.sh:821
Jiang Xin7256fd72012-06-08 10:40:20 +08008863msgid ""
8864"No changes - did you forget to use 'git add'?\n"
8865"If there is nothing left to stage, chances are that something else\n"
8866"already introduced the same changes; you might want to skip this patch."
8867msgstr ""
8868
Jiang Xin3b6137f2012-08-02 09:35:23 +08008869#: git-am.sh:829
Jiang Xin7256fd72012-06-08 10:40:20 +08008870msgid ""
8871"You still have unmerged paths in your index\n"
8872"did you forget to use 'git add'?"
8873msgstr ""
8874
Jiang Xin3b6137f2012-08-02 09:35:23 +08008875#: git-am.sh:845
Jiang Xindce37b62012-02-13 14:37:59 +08008876msgid "No changes -- Patch already applied."
8877msgstr ""
8878
Jiang Xin3b6137f2012-08-02 09:35:23 +08008879#: git-am.sh:855
Jiang Xin7256fd72012-06-08 10:40:20 +08008880#, sh-format
8881msgid "Patch failed at $msgnum $FIRSTLINE"
8882msgstr ""
8883
Jiang Xincc760112012-09-15 10:26:13 +08008884#: git-am.sh:858
8885#, sh-format
8886msgid ""
8887"The copy of the patch that failed is found in:\n"
8888" $dotest/patch"
8889msgstr ""
8890
Jiang Xin3b6137f2012-08-02 09:35:23 +08008891#: git-am.sh:876
Jiang Xindce37b62012-02-13 14:37:59 +08008892msgid "applying to an empty history"
8893msgstr ""
8894
Jiang Xin7256fd72012-06-08 10:40:20 +08008895#: git-bisect.sh:48
8896msgid "You need to start by \"git bisect start\""
8897msgstr ""
8898
Jiang Xindce37b62012-02-13 14:37:59 +08008899#. TRANSLATORS: Make sure to include [Y] and [n] in your
8900#. translation. The program will only accept English input
8901#. at this point.
8902#: git-bisect.sh:54
8903msgid "Do you want me to do it for you [Y/n]? "
8904msgstr ""
8905
8906#: git-bisect.sh:95
8907#, sh-format
8908msgid "unrecognised option: '$arg'"
8909msgstr ""
8910
8911#: git-bisect.sh:99
8912#, sh-format
8913msgid "'$arg' does not appear to be a valid revision"
8914msgstr ""
8915
8916#: git-bisect.sh:117
8917msgid "Bad HEAD - I need a HEAD"
8918msgstr ""
8919
8920#: git-bisect.sh:130
8921#, sh-format
8922msgid ""
8923"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
8924msgstr ""
8925
8926#: git-bisect.sh:140
8927msgid "won't bisect on seeked tree"
8928msgstr ""
8929
8930#: git-bisect.sh:144
8931msgid "Bad HEAD - strange symbolic ref"
8932msgstr ""
8933
8934#: git-bisect.sh:189
8935#, sh-format
8936msgid "Bad bisect_write argument: $state"
8937msgstr ""
8938
8939#: git-bisect.sh:218
8940#, sh-format
8941msgid "Bad rev input: $arg"
8942msgstr ""
8943
8944#: git-bisect.sh:232
8945msgid "Please call 'bisect_state' with at least one argument."
8946msgstr ""
8947
8948#: git-bisect.sh:244
8949#, sh-format
8950msgid "Bad rev input: $rev"
8951msgstr ""
8952
8953#: git-bisect.sh:250
8954msgid "'git bisect bad' can take only one argument."
8955msgstr ""
8956
Jiang Xin7256fd72012-06-08 10:40:20 +08008957#. have bad but not good. we could bisect although
8958#. this is less optimum.
8959#: git-bisect.sh:273
8960msgid "Warning: bisecting only with a bad commit."
8961msgstr ""
8962
Jiang Xindce37b62012-02-13 14:37:59 +08008963#. TRANSLATORS: Make sure to include [Y] and [n] in your
8964#. translation. The program will only accept English input
8965#. at this point.
8966#: git-bisect.sh:279
8967msgid "Are you sure [Y/n]? "
8968msgstr ""
8969
Jiang Xin7256fd72012-06-08 10:40:20 +08008970#: git-bisect.sh:289
8971msgid ""
8972"You need to give me at least one good and one bad revisions.\n"
8973"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8974msgstr ""
8975
8976#: git-bisect.sh:292
8977msgid ""
8978"You need to start by \"git bisect start\".\n"
8979"You then need to give me at least one good and one bad revisions.\n"
8980"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8981msgstr ""
8982
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008983#: git-bisect.sh:363 git-bisect.sh:490
Jiang Xin7256fd72012-06-08 10:40:20 +08008984msgid "We are not bisecting."
8985msgstr ""
8986
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008987#: git-bisect.sh:370
Jiang Xindce37b62012-02-13 14:37:59 +08008988#, sh-format
8989msgid "'$invalid' is not a valid commit"
8990msgstr ""
8991
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008992#: git-bisect.sh:379
Jiang Xindce37b62012-02-13 14:37:59 +08008993#, sh-format
8994msgid ""
8995"Could not check out original HEAD '$branch'.\n"
8996"Try 'git bisect reset <commit>'."
8997msgstr ""
8998
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008999#: git-bisect.sh:406
Jiang Xindce37b62012-02-13 14:37:59 +08009000msgid "No logfile given"
9001msgstr ""
9002
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009003#: git-bisect.sh:407
Jiang Xindce37b62012-02-13 14:37:59 +08009004#, sh-format
9005msgid "cannot read $file for replaying"
9006msgstr ""
9007
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009008#: git-bisect.sh:424
Jiang Xindce37b62012-02-13 14:37:59 +08009009msgid "?? what are you talking about?"
9010msgstr ""
9011
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009012#: git-bisect.sh:436
Jiang Xin7256fd72012-06-08 10:40:20 +08009013#, sh-format
9014msgid "running $command"
9015msgstr ""
9016
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009017#: git-bisect.sh:443
Jiang Xin7256fd72012-06-08 10:40:20 +08009018#, sh-format
9019msgid ""
9020"bisect run failed:\n"
9021"exit code $res from '$command' is < 0 or >= 128"
9022msgstr ""
9023
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009024#: git-bisect.sh:469
Jiang Xin7256fd72012-06-08 10:40:20 +08009025msgid "bisect run cannot continue any more"
9026msgstr ""
9027
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009028#: git-bisect.sh:475
Jiang Xin7256fd72012-06-08 10:40:20 +08009029#, sh-format
9030msgid ""
9031"bisect run failed:\n"
9032"'bisect_state $state' exited with error code $res"
9033msgstr ""
9034
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009035#: git-bisect.sh:482
Jiang Xin7256fd72012-06-08 10:40:20 +08009036msgid "bisect run success"
Jiang Xindce37b62012-02-13 14:37:59 +08009037msgstr ""
9038
9039#: git-pull.sh:21
9040msgid ""
9041"Pull is not possible because you have unmerged files.\n"
9042"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9043"as appropriate to mark resolution, or use 'git commit -a'."
9044msgstr ""
9045
9046#: git-pull.sh:25
9047msgid "Pull is not possible because you have unmerged files."
9048msgstr ""
9049
Jiang Xinc138af52013-04-10 15:19:54 +08009050#: git-pull.sh:203
Jiang Xindce37b62012-02-13 14:37:59 +08009051msgid "updating an unborn branch with changes added to the index"
9052msgstr ""
9053
Jiang Xin7256fd72012-06-08 10:40:20 +08009054#. The fetch involved updating the current branch.
9055#. The working tree and the index file is still based on the
9056#. $orig_head commit, but we are merging into $curr_head.
9057#. First update the working tree to match $curr_head.
Jiang Xinc138af52013-04-10 15:19:54 +08009058#: git-pull.sh:235
Jiang Xin7256fd72012-06-08 10:40:20 +08009059#, sh-format
9060msgid ""
9061"Warning: fetch updated the current branch head.\n"
9062"Warning: fast-forwarding your working tree from\n"
9063"Warning: commit $orig_head."
9064msgstr ""
9065
Jiang Xinc138af52013-04-10 15:19:54 +08009066#: git-pull.sh:260
Jiang Xindce37b62012-02-13 14:37:59 +08009067msgid "Cannot merge multiple branches into empty head"
9068msgstr ""
9069
Jiang Xinc138af52013-04-10 15:19:54 +08009070#: git-pull.sh:264
Jiang Xindce37b62012-02-13 14:37:59 +08009071msgid "Cannot rebase onto multiple branches"
9072msgstr ""
9073
Jiang Xin9306b5b2012-10-16 08:39:10 +08009074#: git-rebase.sh:53
Jiang Xin3b6137f2012-08-02 09:35:23 +08009075msgid ""
9076"When you have resolved this problem, run \"git rebase --continue\".\n"
9077"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9078"To check out the original branch and stop rebasing, run \"git rebase --abort"
9079"\"."
9080msgstr ""
9081
Jiang Xin9306b5b2012-10-16 08:39:10 +08009082#: git-rebase.sh:160
Jiang Xin3b6137f2012-08-02 09:35:23 +08009083msgid "The pre-rebase hook refused to rebase."
9084msgstr ""
9085
Jiang Xin9306b5b2012-10-16 08:39:10 +08009086#: git-rebase.sh:165
Jiang Xin3b6137f2012-08-02 09:35:23 +08009087msgid "It looks like git-am is in progress. Cannot rebase."
9088msgstr ""
9089
Jiang Xin9306b5b2012-10-16 08:39:10 +08009090#: git-rebase.sh:296
Jiang Xin3b6137f2012-08-02 09:35:23 +08009091msgid "The --exec option must be used with the --interactive option"
9092msgstr ""
9093
Jiang Xin9306b5b2012-10-16 08:39:10 +08009094#: git-rebase.sh:301
Jiang Xin3b6137f2012-08-02 09:35:23 +08009095msgid "No rebase in progress?"
9096msgstr ""
9097
Jiang Xin9306b5b2012-10-16 08:39:10 +08009098#: git-rebase.sh:312
9099msgid "The --edit-todo action can only be used during interactive rebase."
9100msgstr ""
9101
9102#: git-rebase.sh:319
Jiang Xin3b6137f2012-08-02 09:35:23 +08009103msgid "Cannot read HEAD"
9104msgstr ""
9105
Jiang Xin9306b5b2012-10-16 08:39:10 +08009106#: git-rebase.sh:322
Jiang Xin3b6137f2012-08-02 09:35:23 +08009107msgid ""
9108"You must edit all merge conflicts and then\n"
9109"mark them as resolved using git add"
9110msgstr ""
9111
Jiang Xin9306b5b2012-10-16 08:39:10 +08009112#: git-rebase.sh:340
Jiang Xin3b6137f2012-08-02 09:35:23 +08009113#, sh-format
9114msgid "Could not move back to $head_name"
9115msgstr ""
9116
Jiang Xin9306b5b2012-10-16 08:39:10 +08009117#: git-rebase.sh:359
Jiang Xin3b6137f2012-08-02 09:35:23 +08009118#, sh-format
9119msgid ""
9120"It seems that there is already a $state_dir_base directory, and\n"
9121"I wonder if you are in the middle of another rebase. If that is the\n"
9122"case, please try\n"
9123"\t$cmd_live_rebase\n"
9124"If that is not the case, please\n"
9125"\t$cmd_clear_stale_rebase\n"
9126"and run me again. I am stopping in case you still have something\n"
9127"valuable there."
9128msgstr ""
9129
Jiang Xin9306b5b2012-10-16 08:39:10 +08009130#: git-rebase.sh:404
Jiang Xin3b6137f2012-08-02 09:35:23 +08009131#, sh-format
9132msgid "invalid upstream $upstream_name"
9133msgstr ""
9134
Jiang Xin9306b5b2012-10-16 08:39:10 +08009135#: git-rebase.sh:428
Jiang Xin3b6137f2012-08-02 09:35:23 +08009136#, sh-format
9137msgid "$onto_name: there are more than one merge bases"
9138msgstr ""
9139
Jiang Xin9306b5b2012-10-16 08:39:10 +08009140#: git-rebase.sh:431 git-rebase.sh:435
Jiang Xin3b6137f2012-08-02 09:35:23 +08009141#, sh-format
9142msgid "$onto_name: there is no merge base"
9143msgstr ""
9144
Jiang Xin9306b5b2012-10-16 08:39:10 +08009145#: git-rebase.sh:440
Jiang Xin3b6137f2012-08-02 09:35:23 +08009146#, sh-format
9147msgid "Does not point to a valid commit: $onto_name"
9148msgstr ""
9149
Jiang Xin9306b5b2012-10-16 08:39:10 +08009150#: git-rebase.sh:463
Jiang Xin3b6137f2012-08-02 09:35:23 +08009151#, sh-format
9152msgid "fatal: no such branch: $branch_name"
9153msgstr ""
9154
Jiang Xin9306b5b2012-10-16 08:39:10 +08009155#: git-rebase.sh:483
Jiang Xin3b6137f2012-08-02 09:35:23 +08009156msgid "Please commit or stash them."
9157msgstr ""
9158
Jiang Xin9306b5b2012-10-16 08:39:10 +08009159#: git-rebase.sh:501
Jiang Xin3b6137f2012-08-02 09:35:23 +08009160#, sh-format
9161msgid "Current branch $branch_name is up to date."
9162msgstr ""
9163
Jiang Xin9306b5b2012-10-16 08:39:10 +08009164#: git-rebase.sh:504
Jiang Xin3b6137f2012-08-02 09:35:23 +08009165#, sh-format
9166msgid "Current branch $branch_name is up to date, rebase forced."
9167msgstr ""
9168
Jiang Xin9306b5b2012-10-16 08:39:10 +08009169#: git-rebase.sh:515
Jiang Xin3b6137f2012-08-02 09:35:23 +08009170#, sh-format
9171msgid "Changes from $mb to $onto:"
9172msgstr ""
9173
9174#. Detach HEAD and reset the tree
Jiang Xin9306b5b2012-10-16 08:39:10 +08009175#: git-rebase.sh:524
Jiang Xin3b6137f2012-08-02 09:35:23 +08009176msgid "First, rewinding head to replay your work on top of it..."
9177msgstr ""
9178
Jiang Xin9306b5b2012-10-16 08:39:10 +08009179#: git-rebase.sh:532
Jiang Xin3b6137f2012-08-02 09:35:23 +08009180#, sh-format
9181msgid "Fast-forwarded $branch_name to $onto_name."
9182msgstr ""
9183
Jiang Xindce37b62012-02-13 14:37:59 +08009184#: git-stash.sh:51
9185msgid "git stash clear with parameters is unimplemented"
9186msgstr ""
9187
9188#: git-stash.sh:74
9189msgid "You do not have the initial commit yet"
9190msgstr ""
9191
9192#: git-stash.sh:89
9193msgid "Cannot save the current index state"
9194msgstr ""
9195
9196#: git-stash.sh:123 git-stash.sh:136
9197msgid "Cannot save the current worktree state"
9198msgstr ""
9199
9200#: git-stash.sh:140
9201msgid "No changes selected"
9202msgstr ""
9203
9204#: git-stash.sh:143
9205msgid "Cannot remove temporary index (can't happen)"
9206msgstr ""
9207
9208#: git-stash.sh:156
9209msgid "Cannot record working tree state"
9210msgstr ""
9211
Jiang Xin7256fd72012-06-08 10:40:20 +08009212#. TRANSLATORS: $option is an invalid option, like
9213#. `--blah-blah'. The 7 spaces at the beginning of the
9214#. second line correspond to "error: ". So you should line
9215#. up the second line with however many characters the
9216#. translation of "error: " takes in your language. E.g. in
9217#. English this is:
9218#.
9219#. $ git stash save --blah-blah 2>&1 | head -n 2
9220#. error: unknown option for 'stash save': --blah-blah
9221#. To provide a message, use git stash save -- '--blah-blah'
9222#: git-stash.sh:202
9223#, sh-format
9224msgid ""
9225"error: unknown option for 'stash save': $option\n"
9226" To provide a message, use git stash save -- '$option'"
9227msgstr ""
9228
Jiang Xindce37b62012-02-13 14:37:59 +08009229#: git-stash.sh:223
9230msgid "No local changes to save"
9231msgstr ""
9232
9233#: git-stash.sh:227
9234msgid "Cannot initialize stash"
9235msgstr ""
9236
9237#: git-stash.sh:235
9238msgid "Cannot save the current status"
9239msgstr ""
9240
9241#: git-stash.sh:253
9242msgid "Cannot remove worktree changes"
9243msgstr ""
9244
9245#: git-stash.sh:352
9246msgid "No stash found."
9247msgstr ""
9248
9249#: git-stash.sh:359
9250#, sh-format
9251msgid "Too many revisions specified: $REV"
9252msgstr ""
9253
9254#: git-stash.sh:365
9255#, sh-format
9256msgid "$reference is not valid reference"
9257msgstr ""
9258
9259#: git-stash.sh:393
9260#, sh-format
9261msgid "'$args' is not a stash-like commit"
9262msgstr ""
9263
9264#: git-stash.sh:404
9265#, sh-format
9266msgid "'$args' is not a stash reference"
9267msgstr ""
9268
9269#: git-stash.sh:412
9270msgid "unable to refresh index"
9271msgstr ""
9272
9273#: git-stash.sh:416
9274msgid "Cannot apply a stash in the middle of a merge"
9275msgstr ""
9276
9277#: git-stash.sh:424
9278msgid "Conflicts in index. Try without --index."
9279msgstr ""
9280
9281#: git-stash.sh:426
9282msgid "Could not save index tree"
9283msgstr ""
9284
9285#: git-stash.sh:460
9286msgid "Cannot unstage modified files"
9287msgstr ""
9288
Jiang Xincc760112012-09-15 10:26:13 +08009289#: git-stash.sh:475
Jiang Xin7256fd72012-06-08 10:40:20 +08009290msgid "Index was not unstashed."
9291msgstr ""
9292
Jiang Xindce37b62012-02-13 14:37:59 +08009293#: git-stash.sh:492
9294#, sh-format
Jiang Xincc760112012-09-15 10:26:13 +08009295msgid "Dropped ${REV} ($s)"
9296msgstr ""
9297
9298#: git-stash.sh:493
9299#, sh-format
Jiang Xindce37b62012-02-13 14:37:59 +08009300msgid "${REV}: Could not drop stash entry"
9301msgstr ""
9302
Jiang Xincc760112012-09-15 10:26:13 +08009303#: git-stash.sh:500
Jiang Xindce37b62012-02-13 14:37:59 +08009304msgid "No branch name specified"
9305msgstr ""
9306
Jiang Xincc760112012-09-15 10:26:13 +08009307#: git-stash.sh:571
Jiang Xindce37b62012-02-13 14:37:59 +08009308msgid "(To restore them type \"git stash apply\")"
9309msgstr ""
9310
Jiang Xinc138af52013-04-10 15:19:54 +08009311#: git-submodule.sh:91
Jiang Xindce37b62012-02-13 14:37:59 +08009312#, sh-format
9313msgid "cannot strip one component off url '$remoteurl'"
9314msgstr ""
9315
Jiang Xinc138af52013-04-10 15:19:54 +08009316#: git-submodule.sh:196
Jiang Xindce37b62012-02-13 14:37:59 +08009317#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009318msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009319msgstr ""
9320
Jiang Xinc138af52013-04-10 15:19:54 +08009321#: git-submodule.sh:239
Jiang Xindce37b62012-02-13 14:37:59 +08009322#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009323msgid "Clone of '$url' into submodule path '$sm_path' failed"
Jiang Xindce37b62012-02-13 14:37:59 +08009324msgstr ""
9325
Jiang Xinc138af52013-04-10 15:19:54 +08009326#: git-submodule.sh:251
Jiang Xina2c01b52012-03-16 20:28:05 +08009327#, sh-format
9328msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9329msgstr ""
9330
Jiang Xinc138af52013-04-10 15:19:54 +08009331#: git-submodule.sh:349
Jiang Xindce37b62012-02-13 14:37:59 +08009332#, sh-format
9333msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9334msgstr ""
9335
Jiang Xinc138af52013-04-10 15:19:54 +08009336#: git-submodule.sh:366
Jiang Xindce37b62012-02-13 14:37:59 +08009337#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009338msgid "'$sm_path' already exists in the index"
Jiang Xindce37b62012-02-13 14:37:59 +08009339msgstr ""
9340
Jiang Xinc138af52013-04-10 15:19:54 +08009341#: git-submodule.sh:370
Jiang Xin7256fd72012-06-08 10:40:20 +08009342#, sh-format
9343msgid ""
9344"The following path is ignored by one of your .gitignore files:\n"
9345"$sm_path\n"
9346"Use -f if you really want to add it."
9347msgstr ""
9348
Jiang Xinc138af52013-04-10 15:19:54 +08009349#: git-submodule.sh:388
Jiang Xin7256fd72012-06-08 10:40:20 +08009350#, sh-format
9351msgid "Adding existing repo at '$sm_path' to the index"
9352msgstr ""
9353
Jiang Xinc138af52013-04-10 15:19:54 +08009354#: git-submodule.sh:390
Jiang Xindce37b62012-02-13 14:37:59 +08009355#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009356msgid "'$sm_path' already exists and is not a valid git repo"
Jiang Xindce37b62012-02-13 14:37:59 +08009357msgstr ""
9358
Jiang Xinc138af52013-04-10 15:19:54 +08009359#: git-submodule.sh:398
Jiang Xindce37b62012-02-13 14:37:59 +08009360#, sh-format
Jiang Xinfe52cd62012-11-23 14:29:02 +08009361msgid "A git directory for '$sm_name' is found locally with remote(s):"
9362msgstr ""
9363
Jiang Xinc138af52013-04-10 15:19:54 +08009364#: git-submodule.sh:400
Jiang Xinfe52cd62012-11-23 14:29:02 +08009365#, sh-format
9366msgid ""
9367"If you want to reuse this local git directory instead of cloning again from"
9368msgstr ""
9369
Jiang Xinc138af52013-04-10 15:19:54 +08009370#: git-submodule.sh:402
Jiang Xinfe52cd62012-11-23 14:29:02 +08009371#, sh-format
9372msgid ""
9373"use the '--force' option. If the local git directory is not the correct repo"
Jiang Xindce37b62012-02-13 14:37:59 +08009374msgstr ""
9375
Jiang Xinc138af52013-04-10 15:19:54 +08009376#: git-submodule.sh:403
Jiang Xindce37b62012-02-13 14:37:59 +08009377#, sh-format
Jiang Xinfe52cd62012-11-23 14:29:02 +08009378msgid ""
9379"or you are unsure what this means choose another name with the '--name' "
9380"option."
9381msgstr ""
9382
Jiang Xinc138af52013-04-10 15:19:54 +08009383#: git-submodule.sh:405
Jiang Xinfe52cd62012-11-23 14:29:02 +08009384#, sh-format
9385msgid "Reactivating local git directory for submodule '$sm_name'."
9386msgstr ""
9387
Jiang Xinc138af52013-04-10 15:19:54 +08009388#: git-submodule.sh:417
Jiang Xinfe52cd62012-11-23 14:29:02 +08009389#, sh-format
9390msgid "Unable to checkout submodule '$sm_path'"
9391msgstr ""
9392
Jiang Xinc138af52013-04-10 15:19:54 +08009393#: git-submodule.sh:422
Jiang Xinfe52cd62012-11-23 14:29:02 +08009394#, sh-format
9395msgid "Failed to add submodule '$sm_path'"
9396msgstr ""
9397
Jiang Xinc138af52013-04-10 15:19:54 +08009398#: git-submodule.sh:431
Jiang Xinfe52cd62012-11-23 14:29:02 +08009399#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009400msgid "Failed to register submodule '$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009401msgstr ""
9402
Jiang Xinc138af52013-04-10 15:19:54 +08009403#: git-submodule.sh:474
Jiang Xindce37b62012-02-13 14:37:59 +08009404#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009405msgid "Entering '$prefix$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009406msgstr ""
9407
Jiang Xinc138af52013-04-10 15:19:54 +08009408#: git-submodule.sh:488
Jiang Xindce37b62012-02-13 14:37:59 +08009409#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009410msgid "Stopping at '$sm_path'; script returned non-zero status."
Jiang Xindce37b62012-02-13 14:37:59 +08009411msgstr ""
9412
Jiang Xinc138af52013-04-10 15:19:54 +08009413#: git-submodule.sh:532
Jiang Xindce37b62012-02-13 14:37:59 +08009414#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009415msgid "No url found for submodule path '$sm_path' in .gitmodules"
Jiang Xindce37b62012-02-13 14:37:59 +08009416msgstr ""
9417
Jiang Xinc138af52013-04-10 15:19:54 +08009418#: git-submodule.sh:541
Jiang Xindce37b62012-02-13 14:37:59 +08009419#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009420msgid "Failed to register url for submodule path '$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009421msgstr ""
9422
Jiang Xinc138af52013-04-10 15:19:54 +08009423#: git-submodule.sh:543
Jiang Xindce37b62012-02-13 14:37:59 +08009424#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009425msgid "Submodule '$name' ($url) registered for path '$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009426msgstr ""
9427
Jiang Xinc138af52013-04-10 15:19:54 +08009428#: git-submodule.sh:551
Jiang Xin75f7b4b2012-06-02 07:07:27 +08009429#, sh-format
9430msgid "Failed to register update mode for submodule path '$sm_path'"
9431msgstr ""
9432
Jiang Xinc138af52013-04-10 15:19:54 +08009433#: git-submodule.sh:588
9434#, sh-format
9435msgid "Use '.' if you really want to deinitialize all submodules"
9436msgstr ""
9437
9438#: git-submodule.sh:603
9439#, sh-format
9440msgid "Submodule work tree '$sm_path' contains a .git directory"
9441msgstr ""
9442
9443#: git-submodule.sh:604
Jiang Xindce37b62012-02-13 14:37:59 +08009444#, sh-format
9445msgid ""
Jiang Xinc138af52013-04-10 15:19:54 +08009446"(use 'rm -rf' if you really want to remove it including all of its history)"
9447msgstr ""
9448
9449#: git-submodule.sh:610
9450#, sh-format
9451msgid ""
9452"Submodule work tree '$sm_path' contains local modifications; use '-f' to "
9453"discard them"
9454msgstr ""
9455
9456#: git-submodule.sh:613
9457#, sh-format
9458msgid "Cleared directory '$sm_path'"
9459msgstr ""
9460
9461#: git-submodule.sh:614
9462#, sh-format
9463msgid "Could not remove submodule work tree '$sm_path'"
9464msgstr ""
9465
9466#: git-submodule.sh:617
9467#, sh-format
9468msgid "Could not create empty submodule directory '$sm_path'"
9469msgstr ""
9470
9471#: git-submodule.sh:626
9472#, sh-format
9473msgid "Submodule '$name' ($url) unregistered for path '$sm_path'"
9474msgstr ""
9475
9476#: git-submodule.sh:731
9477#, sh-format
9478msgid ""
9479"Submodule path '$prefix$sm_path' not initialized\n"
Jiang Xindce37b62012-02-13 14:37:59 +08009480"Maybe you want to use 'update --init'?"
9481msgstr ""
9482
Jiang Xinc138af52013-04-10 15:19:54 +08009483#: git-submodule.sh:744
Jiang Xindce37b62012-02-13 14:37:59 +08009484#, sh-format
Jiang Xinc138af52013-04-10 15:19:54 +08009485msgid "Unable to find current revision in submodule path '$prefix$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009486msgstr ""
9487
Jiang Xinc138af52013-04-10 15:19:54 +08009488#: git-submodule.sh:753
Jiang Xindce37b62012-02-13 14:37:59 +08009489#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009490msgid "Unable to fetch in submodule path '$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009491msgstr ""
9492
Jiang Xinc138af52013-04-10 15:19:54 +08009493#: git-submodule.sh:777
Jiang Xindce37b62012-02-13 14:37:59 +08009494#, sh-format
Jiang Xinc138af52013-04-10 15:19:54 +08009495msgid "Unable to fetch in submodule path '$prefix$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009496msgstr ""
9497
Jiang Xinc138af52013-04-10 15:19:54 +08009498#: git-submodule.sh:791
Jiang Xindce37b62012-02-13 14:37:59 +08009499#, sh-format
Jiang Xinc138af52013-04-10 15:19:54 +08009500msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009501msgstr ""
9502
Jiang Xinc138af52013-04-10 15:19:54 +08009503#: git-submodule.sh:792
Jiang Xindce37b62012-02-13 14:37:59 +08009504#, sh-format
Jiang Xinc138af52013-04-10 15:19:54 +08009505msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'"
Jiang Xindce37b62012-02-13 14:37:59 +08009506msgstr ""
9507
Jiang Xinc138af52013-04-10 15:19:54 +08009508#: git-submodule.sh:797
Jiang Xindce37b62012-02-13 14:37:59 +08009509#, sh-format
Jiang Xinc138af52013-04-10 15:19:54 +08009510msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009511msgstr ""
9512
Jiang Xinc138af52013-04-10 15:19:54 +08009513#: git-submodule.sh:798
Jiang Xindce37b62012-02-13 14:37:59 +08009514#, sh-format
Jiang Xinc138af52013-04-10 15:19:54 +08009515msgid "Submodule path '$prefix$sm_path': merged in '$sha1'"
Jiang Xindce37b62012-02-13 14:37:59 +08009516msgstr ""
9517
Jiang Xinc138af52013-04-10 15:19:54 +08009518#: git-submodule.sh:803
Jiang Xindce37b62012-02-13 14:37:59 +08009519#, sh-format
Jiang Xinc138af52013-04-10 15:19:54 +08009520msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009521msgstr ""
9522
Jiang Xinc138af52013-04-10 15:19:54 +08009523#: git-submodule.sh:804
Jiang Xindce37b62012-02-13 14:37:59 +08009524#, sh-format
Jiang Xinc138af52013-04-10 15:19:54 +08009525msgid "Submodule path '$prefix$sm_path': checked out '$sha1'"
Jiang Xindce37b62012-02-13 14:37:59 +08009526msgstr ""
9527
Jiang Xinc138af52013-04-10 15:19:54 +08009528#: git-submodule.sh:831
9529#, sh-format
9530msgid "Failed to recurse into submodule path '$prefix$sm_path'"
9531msgstr ""
9532
9533#: git-submodule.sh:939
Jiang Xin3b6137f2012-08-02 09:35:23 +08009534msgid "The --cached option cannot be used with the --files option"
Jiang Xin7256fd72012-06-08 10:40:20 +08009535msgstr ""
9536
9537#. unexpected type
Jiang Xinc138af52013-04-10 15:19:54 +08009538#: git-submodule.sh:979
Jiang Xin7256fd72012-06-08 10:40:20 +08009539#, sh-format
9540msgid "unexpected mode $mod_dst"
Jiang Xindce37b62012-02-13 14:37:59 +08009541msgstr ""
9542
Jiang Xinc138af52013-04-10 15:19:54 +08009543#: git-submodule.sh:997
Jiang Xindce37b62012-02-13 14:37:59 +08009544#, sh-format
9545msgid " Warn: $name doesn't contain commit $sha1_src"
9546msgstr ""
9547
Jiang Xinc138af52013-04-10 15:19:54 +08009548#: git-submodule.sh:1000
Jiang Xindce37b62012-02-13 14:37:59 +08009549#, sh-format
9550msgid " Warn: $name doesn't contain commit $sha1_dst"
9551msgstr ""
9552
Jiang Xinc138af52013-04-10 15:19:54 +08009553#: git-submodule.sh:1003
Jiang Xindce37b62012-02-13 14:37:59 +08009554#, sh-format
9555msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
9556msgstr ""
9557
Jiang Xinc138af52013-04-10 15:19:54 +08009558#: git-submodule.sh:1028
Jiang Xindce37b62012-02-13 14:37:59 +08009559msgid "blob"
9560msgstr ""
9561
Jiang Xinc138af52013-04-10 15:19:54 +08009562#: git-submodule.sh:1066
Jiang Xin9caaf232013-02-14 14:49:45 +08009563msgid "Submodules changed but not updated:"
Jiang Xin7256fd72012-06-08 10:40:20 +08009564msgstr ""
9565
Jiang Xinc138af52013-04-10 15:19:54 +08009566#: git-submodule.sh:1068
Jiang Xin9caaf232013-02-14 14:49:45 +08009567msgid "Submodule changes to be committed:"
Jiang Xin7256fd72012-06-08 10:40:20 +08009568msgstr ""
9569
Jiang Xinc138af52013-04-10 15:19:54 +08009570#: git-submodule.sh:1153
9571#, sh-format
9572msgid "Failed to recurse into submodule path '$sm_path'"
9573msgstr ""
9574
9575#: git-submodule.sh:1216
Jiang Xindce37b62012-02-13 14:37:59 +08009576#, sh-format
Jiang Xinfe52cd62012-11-23 14:29:02 +08009577msgid "Synchronizing submodule url for '$prefix$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009578msgstr ""