blob: c91e1975214f07ab6e6264764082511e01e569c0 [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 Xinb8ecf232013-08-06 14:13:23 +080011"POT-Creation-Date: 2013-08-06 14:10+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 Xin28b3cff2013-07-26 08:56:45 +080021#: advice.c:57
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 Xin28b3cff2013-07-26 08:56:45 +080030#: advice.c:87
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 Xin28b3cff2013-07-26 08:56:45 +080063#: archive.c:324 builtin/log.c:1173
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 Xin28b3cff2013-07-26 08:56:45 +080071#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292
72#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673
73#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77
74#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408
75#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152
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 Xin28b3cff2013-07-26 08:56:45 +0800107#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85
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 Xin28b3cff2013-07-26 08:56:45 +0800115#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487
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 Xin28b3cff2013-07-26 08:56:45 +0800198#: branch.c:216
Jiang Xinc138af52013-04-10 15:19:54 +0800199#, c-format
200msgid "Cannot setup tracking information; starting point '%s' is not a branch."
201msgstr ""
202
Jiang Xin28b3cff2013-07-26 08:56:45 +0800203#: branch.c:218
Jiang Xinc138af52013-04-10 15:19:54 +0800204#, c-format
205msgid "the requested upstream branch '%s' does not exist"
206msgstr ""
207
Jiang Xin28b3cff2013-07-26 08:56:45 +0800208#: branch.c:220
Jiang Xinc138af52013-04-10 15:19:54 +0800209msgid ""
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 Xin28b3cff2013-07-26 08:56:45 +0800220#: branch.c:265
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800221#, c-format
222msgid "Not a valid object name: '%s'."
223msgstr ""
224
Jiang Xin28b3cff2013-07-26 08:56:45 +0800225#: branch.c:285
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800226#, c-format
227msgid "Ambiguous object name: '%s'."
228msgstr ""
229
Jiang Xin28b3cff2013-07-26 08:56:45 +0800230#: branch.c:290
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800231#, c-format
232msgid "Not a valid branch point: '%s'."
233msgstr ""
234
Jiang Xin28b3cff2013-07-26 08:56:45 +0800235#: branch.c:296
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800236msgid "Failed to lock ref for update"
237msgstr ""
238
Jiang Xin28b3cff2013-07-26 08:56:45 +0800239#: branch.c:314
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800240msgid "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 Xinb8ecf232013-08-06 14:13:23 +0800253#: bundle.c:89 builtin/commit.c:697
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 Xin28b3cff2013-07-26 08:56:45 +0800262#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331
263#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364
264#: builtin/shortlog.c:156
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 Xin28b3cff2013-07-26 08:56:45 +0800290#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259
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 Xin28b3cff2013-07-26 08:56:45 +0800321#: commit.c:53
Jiang Xindce37b62012-02-13 14:37:59 +0800322#, c-format
323msgid "could not parse %s"
324msgstr ""
325
Jiang Xin28b3cff2013-07-26 08:56:45 +0800326#: commit.c:55
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
Jiang Xin28b3cff2013-07-26 08:56:45 +0800335#: connected.c:60
Jiang Xindce37b62012-02-13 14:37:59 +0800336msgid "Could not run 'git rev-list'"
337msgstr ""
338
Jiang Xin28b3cff2013-07-26 08:56:45 +0800339#: connected.c:80
Jiang Xindce37b62012-02-13 14:37:59 +0800340#, c-format
341msgid "failed write to rev-list: %s"
342msgstr ""
343
Jiang Xin28b3cff2013-07-26 08:56:45 +0800344#: connected.c:88
Jiang Xindce37b62012-02-13 14:37:59 +0800345#, 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 Xin28b3cff2013-07-26 08:56:45 +0800438#: diff.c:3487
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 Xin28b3cff2013-07-26 08:56:45 +0800445#: diff.c:3501
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 Xinb8ecf232013-08-06 14:13:23 +0800487#: help.c:210
Jiang Xin822e4a62012-05-08 16:10:22 +0800488#, c-format
489msgid "available git commands in '%s'"
490msgstr ""
491
Jiang Xinb8ecf232013-08-06 14:13:23 +0800492#: help.c:217
Jiang Xin822e4a62012-05-08 16:10:22 +0800493msgid "git commands available from elsewhere on your $PATH"
494msgstr ""
495
Jiang Xinb8ecf232013-08-06 14:13:23 +0800496#: help.c:233
Jiang Xin9caaf232013-02-14 14:49:45 +0800497msgid "The most commonly used git commands are:"
498msgstr ""
499
Jiang Xinb8ecf232013-08-06 14:13:23 +0800500#: help.c:290
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 Xinb8ecf232013-08-06 14:13:23 +0800507#: help.c:347
Jiang Xin822e4a62012-05-08 16:10:22 +0800508msgid "Uh oh. Your system reports no Git commands at all."
509msgstr ""
510
Jiang Xinb8ecf232013-08-06 14:13:23 +0800511#: help.c:369
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 Xinb8ecf232013-08-06 14:13:23 +0800518#: help.c:374
Jiang Xin822e4a62012-05-08 16:10:22 +0800519#, c-format
520msgid "in %0.1f seconds automatically..."
521msgstr ""
522
Jiang Xinb8ecf232013-08-06 14:13:23 +0800523#: help.c:381
Jiang Xin822e4a62012-05-08 16:10:22 +0800524#, c-format
525msgid "git: '%s' is not a git command. See 'git --help'."
526msgstr ""
527
Jiang Xinb8ecf232013-08-06 14:13:23 +0800528#: help.c:385 help.c:444
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 Xinb8ecf232013-08-06 14:13:23 +0800538#: help.c:440
Jiang Xin28b3cff2013-07-26 08:56:45 +0800539#, c-format
540msgid "%s: %s - %s"
541msgstr ""
542
Jiang Xinfe52cd62012-11-23 14:29:02 +0800543#: merge.c:56
544msgid "failed to read the cache"
545msgstr ""
546
Jiang Xinc6bc7d42013-04-30 08:31:19 +0800547#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
Jiang Xin28b3cff2013-07-26 08:56:45 +0800548#: builtin/clone.c:656
Jiang Xinfe52cd62012-11-23 14:29:02 +0800549msgid "unable to write new index file"
550msgstr ""
551
Jiang Xin3b6137f2012-08-02 09:35:23 +0800552#: merge-recursive.c:190
553#, c-format
554msgid "(bad commit)\n"
555msgstr ""
556
557#: merge-recursive.c:206
558#, c-format
559msgid "addinfo_cache failed for path '%s'"
560msgstr ""
561
Jiang Xin28b3cff2013-07-26 08:56:45 +0800562#: merge-recursive.c:269
Jiang Xin3b6137f2012-08-02 09:35:23 +0800563msgid "error building trees"
564msgstr ""
565
Jiang Xin28b3cff2013-07-26 08:56:45 +0800566#: merge-recursive.c:673
Jiang Xin3b6137f2012-08-02 09:35:23 +0800567#, c-format
568msgid "failed to create path '%s'%s"
569msgstr ""
570
Jiang Xin28b3cff2013-07-26 08:56:45 +0800571#: merge-recursive.c:684
Jiang Xin3b6137f2012-08-02 09:35:23 +0800572#, c-format
573msgid "Removing %s to make room for subdirectory\n"
574msgstr ""
575
576#. something else exists
577#. .. but not some other error (who really cares what?)
Jiang Xin28b3cff2013-07-26 08:56:45 +0800578#: merge-recursive.c:698 merge-recursive.c:719
Jiang Xin3b6137f2012-08-02 09:35:23 +0800579msgid ": perhaps a D/F conflict?"
580msgstr ""
581
Jiang Xin28b3cff2013-07-26 08:56:45 +0800582#: merge-recursive.c:709
Jiang Xin3b6137f2012-08-02 09:35:23 +0800583#, c-format
584msgid "refusing to lose untracked file at '%s'"
585msgstr ""
586
Jiang Xin28b3cff2013-07-26 08:56:45 +0800587#: merge-recursive.c:749
Jiang Xin3b6137f2012-08-02 09:35:23 +0800588#, c-format
589msgid "cannot read object %s '%s'"
590msgstr ""
591
Jiang Xin28b3cff2013-07-26 08:56:45 +0800592#: merge-recursive.c:751
Jiang Xin3b6137f2012-08-02 09:35:23 +0800593#, c-format
594msgid "blob expected for %s '%s'"
595msgstr ""
596
Jiang Xin28b3cff2013-07-26 08:56:45 +0800597#: merge-recursive.c:774 builtin/clone.c:312
Jiang Xin3b6137f2012-08-02 09:35:23 +0800598#, c-format
599msgid "failed to open '%s'"
600msgstr ""
601
Jiang Xin28b3cff2013-07-26 08:56:45 +0800602#: merge-recursive.c:782
Jiang Xin3b6137f2012-08-02 09:35:23 +0800603#, c-format
604msgid "failed to symlink '%s'"
605msgstr ""
606
Jiang Xin28b3cff2013-07-26 08:56:45 +0800607#: merge-recursive.c:785
Jiang Xin3b6137f2012-08-02 09:35:23 +0800608#, c-format
609msgid "do not know what to do with %06o %s '%s'"
610msgstr ""
611
Jiang Xin28b3cff2013-07-26 08:56:45 +0800612#: merge-recursive.c:923
Jiang Xin3b6137f2012-08-02 09:35:23 +0800613msgid "Failed to execute internal merge"
614msgstr ""
615
Jiang Xin28b3cff2013-07-26 08:56:45 +0800616#: merge-recursive.c:927
Jiang Xin3b6137f2012-08-02 09:35:23 +0800617#, c-format
618msgid "Unable to add %s to database"
619msgstr ""
620
Jiang Xin28b3cff2013-07-26 08:56:45 +0800621#: merge-recursive.c:943
Jiang Xin3b6137f2012-08-02 09:35:23 +0800622msgid "unsupported object type in the tree"
623msgstr ""
624
Jiang Xin28b3cff2013-07-26 08:56:45 +0800625#: merge-recursive.c:1022 merge-recursive.c:1036
Jiang Xin3b6137f2012-08-02 09:35:23 +0800626#, c-format
627msgid ""
628"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
629"in tree."
630msgstr ""
631
Jiang Xin28b3cff2013-07-26 08:56:45 +0800632#: merge-recursive.c:1028 merge-recursive.c:1041
Jiang Xin3b6137f2012-08-02 09:35:23 +0800633#, c-format
634msgid ""
635"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
636"in tree at %s."
637msgstr ""
638
Jiang Xin28b3cff2013-07-26 08:56:45 +0800639#: merge-recursive.c:1082
Jiang Xin3b6137f2012-08-02 09:35:23 +0800640msgid "rename"
641msgstr ""
642
Jiang Xin28b3cff2013-07-26 08:56:45 +0800643#: merge-recursive.c:1082
Jiang Xin3b6137f2012-08-02 09:35:23 +0800644msgid "renamed"
645msgstr ""
646
Jiang Xin28b3cff2013-07-26 08:56:45 +0800647#: merge-recursive.c:1138
Jiang Xin3b6137f2012-08-02 09:35:23 +0800648#, c-format
649msgid "%s is a directory in %s adding as %s instead"
650msgstr ""
651
Jiang Xin28b3cff2013-07-26 08:56:45 +0800652#: merge-recursive.c:1160
Jiang Xin3b6137f2012-08-02 09:35:23 +0800653#, c-format
654msgid ""
655"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
656"\"->\"%s\" in \"%s\"%s"
657msgstr ""
658
Jiang Xin28b3cff2013-07-26 08:56:45 +0800659#: merge-recursive.c:1165
Jiang Xin3b6137f2012-08-02 09:35:23 +0800660msgid " (left unresolved)"
661msgstr ""
662
Jiang Xin28b3cff2013-07-26 08:56:45 +0800663#: merge-recursive.c:1219
Jiang Xin3b6137f2012-08-02 09:35:23 +0800664#, c-format
665msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
666msgstr ""
667
Jiang Xin28b3cff2013-07-26 08:56:45 +0800668#: merge-recursive.c:1249
Jiang Xin3b6137f2012-08-02 09:35:23 +0800669#, c-format
670msgid "Renaming %s to %s and %s to %s instead"
671msgstr ""
672
Jiang Xin28b3cff2013-07-26 08:56:45 +0800673#: merge-recursive.c:1448
Jiang Xin3b6137f2012-08-02 09:35:23 +0800674#, c-format
675msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
676msgstr ""
677
Jiang Xin28b3cff2013-07-26 08:56:45 +0800678#: merge-recursive.c:1458
Jiang Xin3b6137f2012-08-02 09:35:23 +0800679#, c-format
680msgid "Adding merged %s"
681msgstr ""
682
Jiang Xin28b3cff2013-07-26 08:56:45 +0800683#: merge-recursive.c:1463 merge-recursive.c:1661
Jiang Xin3b6137f2012-08-02 09:35:23 +0800684#, c-format
685msgid "Adding as %s instead"
686msgstr ""
687
Jiang Xin28b3cff2013-07-26 08:56:45 +0800688#: merge-recursive.c:1514
Jiang Xin3b6137f2012-08-02 09:35:23 +0800689#, c-format
690msgid "cannot read object %s"
691msgstr ""
692
Jiang Xin28b3cff2013-07-26 08:56:45 +0800693#: merge-recursive.c:1517
Jiang Xin3b6137f2012-08-02 09:35:23 +0800694#, c-format
695msgid "object %s is not a blob"
696msgstr ""
697
Jiang Xin28b3cff2013-07-26 08:56:45 +0800698#: merge-recursive.c:1565
Jiang Xin3b6137f2012-08-02 09:35:23 +0800699msgid "modify"
700msgstr ""
701
Jiang Xin28b3cff2013-07-26 08:56:45 +0800702#: merge-recursive.c:1565
Jiang Xin3b6137f2012-08-02 09:35:23 +0800703msgid "modified"
704msgstr ""
705
Jiang Xin28b3cff2013-07-26 08:56:45 +0800706#: merge-recursive.c:1575
Jiang Xin3b6137f2012-08-02 09:35:23 +0800707msgid "content"
708msgstr ""
709
Jiang Xin28b3cff2013-07-26 08:56:45 +0800710#: merge-recursive.c:1582
Jiang Xin3b6137f2012-08-02 09:35:23 +0800711msgid "add/add"
712msgstr ""
713
Jiang Xin28b3cff2013-07-26 08:56:45 +0800714#: merge-recursive.c:1616
Jiang Xin3b6137f2012-08-02 09:35:23 +0800715#, c-format
716msgid "Skipped %s (merged same as existing)"
717msgstr ""
718
Jiang Xin28b3cff2013-07-26 08:56:45 +0800719#: merge-recursive.c:1630
Jiang Xin3b6137f2012-08-02 09:35:23 +0800720#, c-format
721msgid "Auto-merging %s"
722msgstr ""
723
Jiang Xin28b3cff2013-07-26 08:56:45 +0800724#: merge-recursive.c:1634 git-submodule.sh:1118
Jiang Xin3b6137f2012-08-02 09:35:23 +0800725msgid "submodule"
726msgstr ""
727
Jiang Xin28b3cff2013-07-26 08:56:45 +0800728#: merge-recursive.c:1635
Jiang Xin3b6137f2012-08-02 09:35:23 +0800729#, c-format
730msgid "CONFLICT (%s): Merge conflict in %s"
731msgstr ""
732
Jiang Xin28b3cff2013-07-26 08:56:45 +0800733#: merge-recursive.c:1725
Jiang Xin3b6137f2012-08-02 09:35:23 +0800734#, c-format
735msgid "Removing %s"
736msgstr ""
737
Jiang Xin28b3cff2013-07-26 08:56:45 +0800738#: merge-recursive.c:1750
Jiang Xin3b6137f2012-08-02 09:35:23 +0800739msgid "file/directory"
740msgstr ""
741
Jiang Xin28b3cff2013-07-26 08:56:45 +0800742#: merge-recursive.c:1756
Jiang Xin3b6137f2012-08-02 09:35:23 +0800743msgid "directory/file"
744msgstr ""
745
Jiang Xin28b3cff2013-07-26 08:56:45 +0800746#: merge-recursive.c:1761
Jiang Xin3b6137f2012-08-02 09:35:23 +0800747#, c-format
748msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
749msgstr ""
750
Jiang Xin28b3cff2013-07-26 08:56:45 +0800751#: merge-recursive.c:1771
Jiang Xin3b6137f2012-08-02 09:35:23 +0800752#, c-format
753msgid "Adding %s"
754msgstr ""
755
Jiang Xin28b3cff2013-07-26 08:56:45 +0800756#: merge-recursive.c:1788
Jiang Xin3b6137f2012-08-02 09:35:23 +0800757msgid "Fatal merge failure, shouldn't happen."
758msgstr ""
759
Jiang Xin28b3cff2013-07-26 08:56:45 +0800760#: merge-recursive.c:1807
Jiang Xin3b6137f2012-08-02 09:35:23 +0800761msgid "Already up-to-date!"
762msgstr ""
763
Jiang Xin28b3cff2013-07-26 08:56:45 +0800764#: merge-recursive.c:1816
Jiang Xin3b6137f2012-08-02 09:35:23 +0800765#, c-format
766msgid "merging of trees %s and %s failed"
767msgstr ""
768
Jiang Xin28b3cff2013-07-26 08:56:45 +0800769#: merge-recursive.c:1846
Jiang Xin3b6137f2012-08-02 09:35:23 +0800770#, c-format
771msgid "Unprocessed path??? %s"
772msgstr ""
773
Jiang Xin28b3cff2013-07-26 08:56:45 +0800774#: merge-recursive.c:1891
Jiang Xin3b6137f2012-08-02 09:35:23 +0800775msgid "Merging:"
776msgstr ""
777
Jiang Xin28b3cff2013-07-26 08:56:45 +0800778#: merge-recursive.c:1904
Jiang Xin3b6137f2012-08-02 09:35:23 +0800779#, c-format
Jiang Xinbb2ba062012-08-06 23:48:08 +0800780msgid "found %u common ancestor:"
781msgid_plural "found %u common ancestors:"
782msgstr[0] ""
783msgstr[1] ""
Jiang Xin3b6137f2012-08-02 09:35:23 +0800784
Jiang Xin28b3cff2013-07-26 08:56:45 +0800785#: merge-recursive.c:1941
Jiang Xin3b6137f2012-08-02 09:35:23 +0800786msgid "merge returned no commit"
787msgstr ""
788
Jiang Xin28b3cff2013-07-26 08:56:45 +0800789#: merge-recursive.c:1998
Jiang Xin3b6137f2012-08-02 09:35:23 +0800790#, c-format
791msgid "Could not parse object '%s'"
792msgstr ""
793
Jiang Xin28b3cff2013-07-26 08:56:45 +0800794#: merge-recursive.c:2010 builtin/merge.c:672
Jiang Xin3b6137f2012-08-02 09:35:23 +0800795msgid "Unable to write index."
796msgstr ""
797
Jiang Xin28b3cff2013-07-26 08:56:45 +0800798#: notes-utils.c:40
799msgid "Cannot commit uninitialized/unreferenced notes tree"
800msgstr ""
801
802#: notes-utils.c:81
803#, c-format
804msgid "Bad notes.rewriteMode value: '%s'"
805msgstr ""
806
807#: notes-utils.c:91
808#, c-format
809msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
810msgstr ""
811
812#. TRANSLATORS: The first %s is the name of the
813#. environment variable, the second %s is its value
814#: notes-utils.c:118
815#, c-format
816msgid "Bad %s value: '%s'"
817msgstr ""
818
819#: object.c:204
Jiang Xinc138af52013-04-10 15:19:54 +0800820#, c-format
821msgid "unable to parse object: %s"
822msgstr ""
823
Jiang Xin235537a2013-02-19 13:36:11 +0800824#: parse-options.c:489
Jiang Xin6f6731e2012-05-21 09:00:39 +0800825msgid "..."
826msgstr ""
827
Jiang Xin235537a2013-02-19 13:36:11 +0800828#: parse-options.c:507
Jiang Xin6f6731e2012-05-21 09:00:39 +0800829#, c-format
830msgid "usage: %s"
831msgstr ""
832
833#. TRANSLATORS: the colon here should align with the
834#. one in "usage: %s" translation
Jiang Xin235537a2013-02-19 13:36:11 +0800835#: parse-options.c:511
Jiang Xin6f6731e2012-05-21 09:00:39 +0800836#, c-format
837msgid " or: %s"
838msgstr ""
839
Jiang Xin235537a2013-02-19 13:36:11 +0800840#: parse-options.c:514
Jiang Xin6f6731e2012-05-21 09:00:39 +0800841#, c-format
842msgid " %s"
843msgstr ""
844
Jiang Xin235537a2013-02-19 13:36:11 +0800845#: parse-options.c:548
846msgid "-NUM"
847msgstr ""
848
Jiang Xin9caaf232013-02-14 14:49:45 +0800849#: pathspec.c:83
850#, c-format
851msgid "Path '%s' is in submodule '%.*s'"
852msgstr ""
853
854#: pathspec.c:99
855#, c-format
856msgid "'%s' is beyond a symbolic link"
857msgstr ""
858
Jiang Xin28b3cff2013-07-26 08:56:45 +0800859#: remote.c:1788
Jiang Xindce37b62012-02-13 14:37:59 +0800860#, c-format
861msgid "Your branch is ahead of '%s' by %d commit.\n"
862msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
863msgstr[0] ""
864msgstr[1] ""
865
Jiang Xin28b3cff2013-07-26 08:56:45 +0800866#: remote.c:1794
Jiang Xinf9472e32012-11-30 12:41:47 +0800867msgid " (use \"git push\" to publish your local commits)\n"
868msgstr ""
869
Jiang Xin28b3cff2013-07-26 08:56:45 +0800870#: remote.c:1797
Jiang Xindce37b62012-02-13 14:37:59 +0800871#, c-format
872msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
873msgid_plural ""
874"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
875msgstr[0] ""
876msgstr[1] ""
877
Jiang Xin28b3cff2013-07-26 08:56:45 +0800878#: remote.c:1805
Jiang Xinf9472e32012-11-30 12:41:47 +0800879msgid " (use \"git pull\" to update your local branch)\n"
880msgstr ""
881
Jiang Xin28b3cff2013-07-26 08:56:45 +0800882#: remote.c:1808
Jiang Xindce37b62012-02-13 14:37:59 +0800883#, c-format
884msgid ""
885"Your branch and '%s' have diverged,\n"
886"and have %d and %d different commit each, respectively.\n"
887msgid_plural ""
888"Your branch and '%s' have diverged,\n"
889"and have %d and %d different commits each, respectively.\n"
890msgstr[0] ""
891msgstr[1] ""
892
Jiang Xin28b3cff2013-07-26 08:56:45 +0800893#: remote.c:1818
Jiang Xinf9472e32012-11-30 12:41:47 +0800894msgid " (use \"git pull\" to merge the remote branch into yours)\n"
895msgstr ""
896
Jiang Xin28b3cff2013-07-26 08:56:45 +0800897#: run-command.c:80
898msgid "open /dev/null failed"
899msgstr ""
900
901#: run-command.c:82
902#, c-format
903msgid "dup2(%d,%d) failed"
904msgstr ""
905
906#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903
907#: builtin/merge.c:1013 builtin/merge.c:1023
Jiang Xindce37b62012-02-13 14:37:59 +0800908#, c-format
909msgid "Could not open '%s' for writing"
910msgstr ""
911
Jiang Xin28b3cff2013-07-26 08:56:45 +0800912#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793
913#: builtin/merge.c:1015 builtin/merge.c:1028
Jiang Xindce37b62012-02-13 14:37:59 +0800914#, c-format
915msgid "Could not write to '%s'"
916msgstr ""
917
Jiang Xinc138af52013-04-10 15:19:54 +0800918#: sequencer.c:229
Jiang Xin2b911f82012-03-08 10:20:20 +0800919msgid ""
920"after resolving the conflicts, mark the corrected paths\n"
921"with 'git add <paths>' or 'git rm <paths>'"
922msgstr ""
923
Jiang Xinc138af52013-04-10 15:19:54 +0800924#: sequencer.c:232
Jiang Xindce37b62012-02-13 14:37:59 +0800925msgid ""
926"after resolving the conflicts, mark the corrected paths\n"
927"with 'git add <paths>' or 'git rm <paths>'\n"
928"and commit the result with 'git commit'"
929msgstr ""
930
Jiang Xin28b3cff2013-07-26 08:56:45 +0800931#: sequencer.c:245 sequencer.c:869 sequencer.c:952
Jiang Xindce37b62012-02-13 14:37:59 +0800932#, c-format
933msgid "Could not write to %s"
934msgstr ""
935
Jiang Xinc138af52013-04-10 15:19:54 +0800936#: sequencer.c:248
Jiang Xindce37b62012-02-13 14:37:59 +0800937#, c-format
938msgid "Error wrapping up %s"
939msgstr ""
940
Jiang Xinc138af52013-04-10 15:19:54 +0800941#: sequencer.c:263
Jiang Xindce37b62012-02-13 14:37:59 +0800942msgid "Your local changes would be overwritten by cherry-pick."
943msgstr ""
944
Jiang Xinc138af52013-04-10 15:19:54 +0800945#: sequencer.c:265
Jiang Xindce37b62012-02-13 14:37:59 +0800946msgid "Your local changes would be overwritten by revert."
947msgstr ""
948
Jiang Xinc138af52013-04-10 15:19:54 +0800949#: sequencer.c:268
Jiang Xindce37b62012-02-13 14:37:59 +0800950msgid "Commit your changes or stash them to proceed."
951msgstr ""
952
953#. TRANSLATORS: %s will be "revert" or "cherry-pick"
Jiang Xin28b3cff2013-07-26 08:56:45 +0800954#: sequencer.c:324
Jiang Xindce37b62012-02-13 14:37:59 +0800955#, c-format
956msgid "%s: Unable to write new index file"
957msgstr ""
958
Jiang Xin28b3cff2013-07-26 08:56:45 +0800959#: sequencer.c:355
Jiang Xin822e4a62012-05-08 16:10:22 +0800960msgid "Could not resolve HEAD commit\n"
961msgstr ""
962
Jiang Xin28b3cff2013-07-26 08:56:45 +0800963#: sequencer.c:377
Jiang Xin822e4a62012-05-08 16:10:22 +0800964msgid "Unable to update cache tree\n"
965msgstr ""
966
Jiang Xin28b3cff2013-07-26 08:56:45 +0800967#: sequencer.c:422
Jiang Xin822e4a62012-05-08 16:10:22 +0800968#, c-format
Jiang Xin9306b5b2012-10-16 08:39:10 +0800969msgid "Could not parse commit %s\n"
970msgstr ""
971
Jiang Xin28b3cff2013-07-26 08:56:45 +0800972#: sequencer.c:427
Jiang Xin9306b5b2012-10-16 08:39:10 +0800973#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +0800974msgid "Could not parse parent commit %s\n"
975msgstr ""
976
Jiang Xin28b3cff2013-07-26 08:56:45 +0800977#: sequencer.c:493
Jiang Xindce37b62012-02-13 14:37:59 +0800978msgid "Your index file is unmerged."
979msgstr ""
980
Jiang Xin28b3cff2013-07-26 08:56:45 +0800981#: sequencer.c:512
Jiang Xindce37b62012-02-13 14:37:59 +0800982#, c-format
983msgid "Commit %s is a merge but no -m option was given."
984msgstr ""
985
Jiang Xin28b3cff2013-07-26 08:56:45 +0800986#: sequencer.c:520
Jiang Xindce37b62012-02-13 14:37:59 +0800987#, c-format
988msgid "Commit %s does not have parent %d"
989msgstr ""
990
Jiang Xin28b3cff2013-07-26 08:56:45 +0800991#: sequencer.c:524
Jiang Xindce37b62012-02-13 14:37:59 +0800992#, c-format
993msgid "Mainline was specified but commit %s is not a merge."
994msgstr ""
995
996#. TRANSLATORS: The first %s will be "revert" or
997#. "cherry-pick", the second %s a SHA1
Jiang Xin28b3cff2013-07-26 08:56:45 +0800998#: sequencer.c:537
Jiang Xindce37b62012-02-13 14:37:59 +0800999#, c-format
1000msgid "%s: cannot parse parent commit %s"
1001msgstr ""
1002
Jiang Xin28b3cff2013-07-26 08:56:45 +08001003#: sequencer.c:541
Jiang Xindce37b62012-02-13 14:37:59 +08001004#, c-format
1005msgid "Cannot get commit message for %s"
1006msgstr ""
1007
Jiang Xin28b3cff2013-07-26 08:56:45 +08001008#: sequencer.c:627
Jiang Xindce37b62012-02-13 14:37:59 +08001009#, c-format
1010msgid "could not revert %s... %s"
1011msgstr ""
1012
Jiang Xin28b3cff2013-07-26 08:56:45 +08001013#: sequencer.c:628
Jiang Xindce37b62012-02-13 14:37:59 +08001014#, c-format
1015msgid "could not apply %s... %s"
1016msgstr ""
1017
Jiang Xin28b3cff2013-07-26 08:56:45 +08001018#: sequencer.c:664
Jiang Xindce37b62012-02-13 14:37:59 +08001019msgid "empty commit set passed"
1020msgstr ""
1021
Jiang Xin28b3cff2013-07-26 08:56:45 +08001022#: sequencer.c:672
Jiang Xindce37b62012-02-13 14:37:59 +08001023#, c-format
Jiang Xinc138af52013-04-10 15:19:54 +08001024msgid "git %s: failed to read the index"
Jiang Xindce37b62012-02-13 14:37:59 +08001025msgstr ""
1026
Jiang Xin28b3cff2013-07-26 08:56:45 +08001027#: sequencer.c:677
Jiang Xinc138af52013-04-10 15:19:54 +08001028#, c-format
1029msgid "git %s: failed to refresh the index"
1030msgstr ""
1031
Jiang Xin28b3cff2013-07-26 08:56:45 +08001032#: sequencer.c:735
Jiang Xinc138af52013-04-10 15:19:54 +08001033#, c-format
1034msgid "Cannot %s during a %s"
1035msgstr ""
1036
Jiang Xin28b3cff2013-07-26 08:56:45 +08001037#: sequencer.c:757
Jiang Xinc138af52013-04-10 15:19:54 +08001038#, c-format
1039msgid "Could not parse line %d."
1040msgstr ""
1041
Jiang Xin28b3cff2013-07-26 08:56:45 +08001042#: sequencer.c:762
Jiang Xindce37b62012-02-13 14:37:59 +08001043msgid "No commits parsed."
1044msgstr ""
1045
Jiang Xin28b3cff2013-07-26 08:56:45 +08001046#: sequencer.c:775
Jiang Xindce37b62012-02-13 14:37:59 +08001047#, c-format
Jiang Xin46bc4032013-01-25 12:33:58 +08001048msgid "Could not open %s"
1049msgstr ""
1050
Jiang Xin28b3cff2013-07-26 08:56:45 +08001051#: sequencer.c:779
Jiang Xin46bc4032013-01-25 12:33:58 +08001052#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08001053msgid "Could not read %s."
1054msgstr ""
1055
Jiang Xin28b3cff2013-07-26 08:56:45 +08001056#: sequencer.c:786
Jiang Xindce37b62012-02-13 14:37:59 +08001057#, c-format
1058msgid "Unusable instruction sheet: %s"
1059msgstr ""
1060
Jiang Xin28b3cff2013-07-26 08:56:45 +08001061#: sequencer.c:814
Jiang Xindce37b62012-02-13 14:37:59 +08001062#, c-format
1063msgid "Invalid key: %s"
1064msgstr ""
1065
Jiang Xin28b3cff2013-07-26 08:56:45 +08001066#: sequencer.c:817
Jiang Xindce37b62012-02-13 14:37:59 +08001067#, c-format
1068msgid "Invalid value for %s: %s"
1069msgstr ""
1070
Jiang Xin28b3cff2013-07-26 08:56:45 +08001071#: sequencer.c:829
Jiang Xindce37b62012-02-13 14:37:59 +08001072#, c-format
1073msgid "Malformed options sheet: %s"
1074msgstr ""
1075
Jiang Xin28b3cff2013-07-26 08:56:45 +08001076#: sequencer.c:850
Jiang Xindce37b62012-02-13 14:37:59 +08001077msgid "a cherry-pick or revert is already in progress"
1078msgstr ""
1079
Jiang Xin28b3cff2013-07-26 08:56:45 +08001080#: sequencer.c:851
Jiang Xindce37b62012-02-13 14:37:59 +08001081msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1082msgstr ""
1083
Jiang Xin28b3cff2013-07-26 08:56:45 +08001084#: sequencer.c:855
Jiang Xindce37b62012-02-13 14:37:59 +08001085#, c-format
1086msgid "Could not create sequencer directory %s"
1087msgstr ""
1088
Jiang Xin28b3cff2013-07-26 08:56:45 +08001089#: sequencer.c:871 sequencer.c:956
Jiang Xindce37b62012-02-13 14:37:59 +08001090#, c-format
1091msgid "Error wrapping up %s."
1092msgstr ""
1093
Jiang Xin28b3cff2013-07-26 08:56:45 +08001094#: sequencer.c:890 sequencer.c:1024
Jiang Xindce37b62012-02-13 14:37:59 +08001095msgid "no cherry-pick or revert in progress"
1096msgstr ""
1097
Jiang Xin28b3cff2013-07-26 08:56:45 +08001098#: sequencer.c:892
Jiang Xindce37b62012-02-13 14:37:59 +08001099msgid "cannot resolve HEAD"
1100msgstr ""
1101
Jiang Xin28b3cff2013-07-26 08:56:45 +08001102#: sequencer.c:894
Jiang Xindce37b62012-02-13 14:37:59 +08001103msgid "cannot abort from a branch yet to be born"
1104msgstr ""
1105
Jiang Xin28b3cff2013-07-26 08:56:45 +08001106#: sequencer.c:916 builtin/apply.c:4061
Jiang Xindce37b62012-02-13 14:37:59 +08001107#, c-format
1108msgid "cannot open %s: %s"
1109msgstr ""
1110
Jiang Xin28b3cff2013-07-26 08:56:45 +08001111#: sequencer.c:919
Jiang Xindce37b62012-02-13 14:37:59 +08001112#, c-format
1113msgid "cannot read %s: %s"
1114msgstr ""
1115
Jiang Xin28b3cff2013-07-26 08:56:45 +08001116#: sequencer.c:920
Jiang Xindce37b62012-02-13 14:37:59 +08001117msgid "unexpected end of file"
1118msgstr ""
1119
Jiang Xin28b3cff2013-07-26 08:56:45 +08001120#: sequencer.c:926
Jiang Xindce37b62012-02-13 14:37:59 +08001121#, c-format
1122msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1123msgstr ""
1124
Jiang Xin28b3cff2013-07-26 08:56:45 +08001125#: sequencer.c:949
Jiang Xindce37b62012-02-13 14:37:59 +08001126#, c-format
1127msgid "Could not format %s."
1128msgstr ""
1129
Jiang Xin28b3cff2013-07-26 08:56:45 +08001130#: sequencer.c:1092
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001131#, c-format
1132msgid "%s: can't cherry-pick a %s"
1133msgstr ""
1134
Jiang Xin28b3cff2013-07-26 08:56:45 +08001135#: sequencer.c:1095
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001136#, c-format
1137msgid "%s: bad revision"
1138msgstr ""
1139
Jiang Xin28b3cff2013-07-26 08:56:45 +08001140#: sequencer.c:1129
Jiang Xindce37b62012-02-13 14:37:59 +08001141msgid "Can't revert as initial commit"
1142msgstr ""
1143
Jiang Xin28b3cff2013-07-26 08:56:45 +08001144#: sequencer.c:1130
Jiang Xindce37b62012-02-13 14:37:59 +08001145msgid "Can't cherry-pick into empty head"
1146msgstr ""
1147
Jiang Xin28b3cff2013-07-26 08:56:45 +08001148#: sha1_name.c:440
1149msgid ""
1150"Git normally never creates a ref that ends with 40 hex characters\n"
1151"because it will be ignored when you just specify 40-hex. These refs\n"
1152"may be created by mistake. For example,\n"
1153"\n"
1154" git checkout -b $br $(git rev-parse ...)\n"
1155"\n"
1156"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
1157"examine these refs and maybe delete them. Turn this message off by\n"
Jiang Xinb8ecf232013-08-06 14:13:23 +08001158"running \"git config advice.objectNameWarning false\""
Jiang Xin28b3cff2013-07-26 08:56:45 +08001159msgstr ""
1160
1161#: sha1_name.c:1097
Jiang Xincd1e7482012-04-28 20:27:01 +08001162msgid "HEAD does not point to a branch"
1163msgstr ""
1164
Jiang Xin28b3cff2013-07-26 08:56:45 +08001165#: sha1_name.c:1100
Jiang Xincd1e7482012-04-28 20:27:01 +08001166#, c-format
1167msgid "No such branch: '%s'"
1168msgstr ""
1169
Jiang Xin28b3cff2013-07-26 08:56:45 +08001170#: sha1_name.c:1102
Jiang Xincd1e7482012-04-28 20:27:01 +08001171#, c-format
1172msgid "No upstream configured for branch '%s'"
1173msgstr ""
1174
Jiang Xin28b3cff2013-07-26 08:56:45 +08001175#: sha1_name.c:1106
Jiang Xincd1e7482012-04-28 20:27:01 +08001176#, c-format
1177msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1178msgstr ""
1179
Jiang Xincc760112012-09-15 10:26:13 +08001180#: wrapper.c:408
1181#, c-format
1182msgid "unable to access '%s': %s"
1183msgstr ""
1184
Jiang Xin28b3cff2013-07-26 08:56:45 +08001185#: wrapper.c:429
Jiang Xin46bc4032013-01-25 12:33:58 +08001186#, c-format
1187msgid "unable to access '%s'"
1188msgstr ""
1189
Jiang Xin28b3cff2013-07-26 08:56:45 +08001190#: wrapper.c:440
Jiang Xin75f7b4b2012-06-02 07:07:27 +08001191#, c-format
1192msgid "unable to look up current user in the passwd file: %s"
1193msgstr ""
1194
Jiang Xin28b3cff2013-07-26 08:56:45 +08001195#: wrapper.c:441
Jiang Xin75f7b4b2012-06-02 07:07:27 +08001196msgid "no such user"
1197msgstr ""
1198
Jiang Xin28b3cff2013-07-26 08:56:45 +08001199#: wt-status.c:141
Jiang Xindce37b62012-02-13 14:37:59 +08001200msgid "Unmerged paths:"
1201msgstr ""
1202
Jiang Xin28b3cff2013-07-26 08:56:45 +08001203#: wt-status.c:168 wt-status.c:195
Jiang Xindce37b62012-02-13 14:37:59 +08001204#, c-format
1205msgid " (use \"git reset %s <file>...\" to unstage)"
1206msgstr ""
1207
Jiang Xin28b3cff2013-07-26 08:56:45 +08001208#: wt-status.c:170 wt-status.c:197
Jiang Xindce37b62012-02-13 14:37:59 +08001209msgid " (use \"git rm --cached <file>...\" to unstage)"
1210msgstr ""
1211
Jiang Xin28b3cff2013-07-26 08:56:45 +08001212#: wt-status.c:174
Jiang Xin11b90172012-07-03 10:31:59 +08001213msgid " (use \"git add <file>...\" to mark resolution)"
1214msgstr ""
1215
Jiang Xin28b3cff2013-07-26 08:56:45 +08001216#: wt-status.c:176 wt-status.c:180
Jiang Xindce37b62012-02-13 14:37:59 +08001217msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
1218msgstr ""
1219
Jiang Xin28b3cff2013-07-26 08:56:45 +08001220#: wt-status.c:178
Jiang Xin11b90172012-07-03 10:31:59 +08001221msgid " (use \"git rm <file>...\" to mark resolution)"
1222msgstr ""
1223
Jiang Xin28b3cff2013-07-26 08:56:45 +08001224#: wt-status.c:189
Jiang Xindce37b62012-02-13 14:37:59 +08001225msgid "Changes to be committed:"
1226msgstr ""
1227
Jiang Xin28b3cff2013-07-26 08:56:45 +08001228#: wt-status.c:207
Jiang Xindce37b62012-02-13 14:37:59 +08001229msgid "Changes not staged for commit:"
1230msgstr ""
1231
Jiang Xin28b3cff2013-07-26 08:56:45 +08001232#: wt-status.c:211
Jiang Xindce37b62012-02-13 14:37:59 +08001233msgid " (use \"git add <file>...\" to update what will be committed)"
1234msgstr ""
1235
Jiang Xin28b3cff2013-07-26 08:56:45 +08001236#: wt-status.c:213
Jiang Xindce37b62012-02-13 14:37:59 +08001237msgid " (use \"git add/rm <file>...\" to update what will be committed)"
1238msgstr ""
1239
Jiang Xin28b3cff2013-07-26 08:56:45 +08001240#: wt-status.c:214
Jiang Xindce37b62012-02-13 14:37:59 +08001241msgid ""
1242" (use \"git checkout -- <file>...\" to discard changes in working directory)"
1243msgstr ""
1244
Jiang Xin28b3cff2013-07-26 08:56:45 +08001245#: wt-status.c:216
Jiang Xindce37b62012-02-13 14:37:59 +08001246msgid " (commit or discard the untracked or modified content in submodules)"
1247msgstr ""
1248
Jiang Xin28b3cff2013-07-26 08:56:45 +08001249#: wt-status.c:228
Jiang Xindce37b62012-02-13 14:37:59 +08001250#, c-format
1251msgid " (use \"git %s <file>...\" to include in what will be committed)"
1252msgstr ""
1253
Jiang Xin28b3cff2013-07-26 08:56:45 +08001254#: wt-status.c:245
Jiang Xindce37b62012-02-13 14:37:59 +08001255msgid "bug"
1256msgstr ""
1257
Jiang Xin28b3cff2013-07-26 08:56:45 +08001258#: wt-status.c:250
Jiang Xindce37b62012-02-13 14:37:59 +08001259msgid "both deleted:"
1260msgstr ""
1261
Jiang Xin28b3cff2013-07-26 08:56:45 +08001262#: wt-status.c:251
Jiang Xindce37b62012-02-13 14:37:59 +08001263msgid "added by us:"
1264msgstr ""
1265
Jiang Xin28b3cff2013-07-26 08:56:45 +08001266#: wt-status.c:252
Jiang Xindce37b62012-02-13 14:37:59 +08001267msgid "deleted by them:"
1268msgstr ""
1269
Jiang Xin28b3cff2013-07-26 08:56:45 +08001270#: wt-status.c:253
Jiang Xindce37b62012-02-13 14:37:59 +08001271msgid "added by them:"
1272msgstr ""
1273
Jiang Xin28b3cff2013-07-26 08:56:45 +08001274#: wt-status.c:254
Jiang Xindce37b62012-02-13 14:37:59 +08001275msgid "deleted by us:"
1276msgstr ""
1277
Jiang Xin28b3cff2013-07-26 08:56:45 +08001278#: wt-status.c:255
Jiang Xindce37b62012-02-13 14:37:59 +08001279msgid "both added:"
1280msgstr ""
1281
Jiang Xin28b3cff2013-07-26 08:56:45 +08001282#: wt-status.c:256
Jiang Xindce37b62012-02-13 14:37:59 +08001283msgid "both modified:"
1284msgstr ""
1285
Jiang Xin28b3cff2013-07-26 08:56:45 +08001286#: wt-status.c:286
Jiang Xindce37b62012-02-13 14:37:59 +08001287msgid "new commits, "
1288msgstr ""
1289
Jiang Xin28b3cff2013-07-26 08:56:45 +08001290#: wt-status.c:288
Jiang Xindce37b62012-02-13 14:37:59 +08001291msgid "modified content, "
1292msgstr ""
1293
Jiang Xin28b3cff2013-07-26 08:56:45 +08001294#: wt-status.c:290
Jiang Xindce37b62012-02-13 14:37:59 +08001295msgid "untracked content, "
1296msgstr ""
1297
Jiang Xin28b3cff2013-07-26 08:56:45 +08001298#: wt-status.c:307
Jiang Xindce37b62012-02-13 14:37:59 +08001299#, c-format
1300msgid "new file: %s"
1301msgstr ""
1302
Jiang Xin28b3cff2013-07-26 08:56:45 +08001303#: wt-status.c:310
Jiang Xindce37b62012-02-13 14:37:59 +08001304#, c-format
1305msgid "copied: %s -> %s"
1306msgstr ""
1307
Jiang Xin28b3cff2013-07-26 08:56:45 +08001308#: wt-status.c:313
Jiang Xindce37b62012-02-13 14:37:59 +08001309#, c-format
1310msgid "deleted: %s"
1311msgstr ""
1312
Jiang Xin28b3cff2013-07-26 08:56:45 +08001313#: wt-status.c:316
Jiang Xindce37b62012-02-13 14:37:59 +08001314#, c-format
1315msgid "modified: %s"
1316msgstr ""
1317
Jiang Xin28b3cff2013-07-26 08:56:45 +08001318#: wt-status.c:319
Jiang Xindce37b62012-02-13 14:37:59 +08001319#, c-format
1320msgid "renamed: %s -> %s"
1321msgstr ""
1322
Jiang Xin28b3cff2013-07-26 08:56:45 +08001323#: wt-status.c:322
Jiang Xindce37b62012-02-13 14:37:59 +08001324#, c-format
1325msgid "typechange: %s"
1326msgstr ""
1327
Jiang Xin28b3cff2013-07-26 08:56:45 +08001328#: wt-status.c:325
Jiang Xindce37b62012-02-13 14:37:59 +08001329#, c-format
1330msgid "unknown: %s"
1331msgstr ""
1332
Jiang Xin28b3cff2013-07-26 08:56:45 +08001333#: wt-status.c:328
Jiang Xindce37b62012-02-13 14:37:59 +08001334#, c-format
1335msgid "unmerged: %s"
1336msgstr ""
1337
Jiang Xin28b3cff2013-07-26 08:56:45 +08001338#: wt-status.c:331
Jiang Xindce37b62012-02-13 14:37:59 +08001339#, c-format
1340msgid "bug: unhandled diff status %c"
1341msgstr ""
1342
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001343#: wt-status.c:803
Jiang Xin11b90172012-07-03 10:31:59 +08001344msgid "You have unmerged paths."
1345msgstr ""
1346
Jiang Xin28b3cff2013-07-26 08:56:45 +08001347#: wt-status.c:806
Jiang Xin11b90172012-07-03 10:31:59 +08001348msgid " (fix conflicts and run \"git commit\")"
1349msgstr ""
1350
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001351#: wt-status.c:809
Jiang Xin11b90172012-07-03 10:31:59 +08001352msgid "All conflicts fixed but you are still merging."
1353msgstr ""
1354
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001355#: wt-status.c:812
Jiang Xin11b90172012-07-03 10:31:59 +08001356msgid " (use \"git commit\" to conclude merge)"
1357msgstr ""
1358
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001359#: wt-status.c:822
Jiang Xin11b90172012-07-03 10:31:59 +08001360msgid "You are in the middle of an am session."
1361msgstr ""
1362
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001363#: wt-status.c:825
Jiang Xin11b90172012-07-03 10:31:59 +08001364msgid "The current patch is empty."
1365msgstr ""
1366
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001367#: wt-status.c:829
Jiang Xin28b3cff2013-07-26 08:56:45 +08001368msgid " (fix conflicts and then run \"git am --continue\")"
Jiang Xin11b90172012-07-03 10:31:59 +08001369msgstr ""
1370
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001371#: wt-status.c:831
Jiang Xin11b90172012-07-03 10:31:59 +08001372msgid " (use \"git am --skip\" to skip this patch)"
1373msgstr ""
1374
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001375#: wt-status.c:833
Jiang Xin11b90172012-07-03 10:31:59 +08001376msgid " (use \"git am --abort\" to restore the original branch)"
1377msgstr ""
1378
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001379#: wt-status.c:893 wt-status.c:910
Jiang Xin235537a2013-02-19 13:36:11 +08001380#, c-format
1381msgid "You are currently rebasing branch '%s' on '%s'."
1382msgstr ""
1383
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001384#: wt-status.c:898 wt-status.c:915
Jiang Xin11b90172012-07-03 10:31:59 +08001385msgid "You are currently rebasing."
1386msgstr ""
1387
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001388#: wt-status.c:901
Jiang Xin11b90172012-07-03 10:31:59 +08001389msgid " (fix conflicts and then run \"git rebase --continue\")"
1390msgstr ""
1391
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001392#: wt-status.c:903
Jiang Xin11b90172012-07-03 10:31:59 +08001393msgid " (use \"git rebase --skip\" to skip this patch)"
1394msgstr ""
1395
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001396#: wt-status.c:905
Jiang Xin11b90172012-07-03 10:31:59 +08001397msgid " (use \"git rebase --abort\" to check out the original branch)"
1398msgstr ""
1399
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001400#: wt-status.c:918
Jiang Xin11b90172012-07-03 10:31:59 +08001401msgid " (all conflicts fixed: run \"git rebase --continue\")"
1402msgstr ""
1403
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001404#: wt-status.c:922
Jiang Xin235537a2013-02-19 13:36:11 +08001405#, c-format
1406msgid ""
1407"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1408msgstr ""
1409
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001410#: wt-status.c:927
Jiang Xin11b90172012-07-03 10:31:59 +08001411msgid "You are currently splitting a commit during a rebase."
1412msgstr ""
1413
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001414#: wt-status.c:930
Jiang Xin11b90172012-07-03 10:31:59 +08001415msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1416msgstr ""
1417
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001418#: wt-status.c:934
Jiang Xin235537a2013-02-19 13:36:11 +08001419#, c-format
1420msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1421msgstr ""
1422
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001423#: wt-status.c:939
Jiang Xin11b90172012-07-03 10:31:59 +08001424msgid "You are currently editing a commit during a rebase."
1425msgstr ""
1426
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001427#: wt-status.c:942
Jiang Xin11b90172012-07-03 10:31:59 +08001428msgid " (use \"git commit --amend\" to amend the current commit)"
1429msgstr ""
1430
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001431#: wt-status.c:944
Jiang Xin11b90172012-07-03 10:31:59 +08001432msgid ""
1433" (use \"git rebase --continue\" once you are satisfied with your changes)"
1434msgstr ""
1435
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001436#: wt-status.c:954
Jiang Xin11b90172012-07-03 10:31:59 +08001437msgid "You are currently cherry-picking."
1438msgstr ""
1439
Jiang Xin28b3cff2013-07-26 08:56:45 +08001440#: wt-status.c:958
1441msgid " (fix conflicts and run \"git cherry-pick --continue\")"
Jiang Xin11b90172012-07-03 10:31:59 +08001442msgstr ""
1443
Jiang Xin28b3cff2013-07-26 08:56:45 +08001444#: wt-status.c:961
1445msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1446msgstr ""
1447
1448#: wt-status.c:963
1449msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1450msgstr ""
1451
1452#: wt-status.c:972
Jiang Xin235537a2013-02-19 13:36:11 +08001453#, c-format
Jiang Xinc138af52013-04-10 15:19:54 +08001454msgid "You are currently reverting commit %s."
Jiang Xin235537a2013-02-19 13:36:11 +08001455msgstr ""
1456
Jiang Xin28b3cff2013-07-26 08:56:45 +08001457#: wt-status.c:977
Jiang Xinc138af52013-04-10 15:19:54 +08001458msgid " (fix conflicts and run \"git revert --continue\")"
1459msgstr ""
1460
Jiang Xin28b3cff2013-07-26 08:56:45 +08001461#: wt-status.c:980
Jiang Xinc138af52013-04-10 15:19:54 +08001462msgid " (all conflicts fixed: run \"git revert --continue\")"
1463msgstr ""
1464
Jiang Xin28b3cff2013-07-26 08:56:45 +08001465#: wt-status.c:982
Jiang Xinc138af52013-04-10 15:19:54 +08001466msgid " (use \"git revert --abort\" to cancel the revert operation)"
1467msgstr ""
1468
Jiang Xin28b3cff2013-07-26 08:56:45 +08001469#: wt-status.c:993
Jiang Xinc138af52013-04-10 15:19:54 +08001470#, c-format
1471msgid "You are currently bisecting, started from branch '%s'."
1472msgstr ""
1473
Jiang Xin28b3cff2013-07-26 08:56:45 +08001474#: wt-status.c:997
Jiang Xin11b90172012-07-03 10:31:59 +08001475msgid "You are currently bisecting."
1476msgstr ""
1477
Jiang Xin28b3cff2013-07-26 08:56:45 +08001478#: wt-status.c:1000
Jiang Xin11b90172012-07-03 10:31:59 +08001479msgid " (use \"git bisect reset\" to get back to the original branch)"
1480msgstr ""
1481
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001482#: wt-status.c:1173
Jiang Xindce37b62012-02-13 14:37:59 +08001483msgid "On branch "
1484msgstr ""
1485
Jiang Xin28b3cff2013-07-26 08:56:45 +08001486#: wt-status.c:1180
1487msgid "rebase in progress; onto "
1488msgstr ""
1489
1490#: wt-status.c:1187
Jiang Xinc138af52013-04-10 15:19:54 +08001491msgid "HEAD detached at "
1492msgstr ""
1493
Jiang Xin28b3cff2013-07-26 08:56:45 +08001494#: wt-status.c:1189
Jiang Xinc138af52013-04-10 15:19:54 +08001495msgid "HEAD detached from "
1496msgstr ""
1497
Jiang Xin28b3cff2013-07-26 08:56:45 +08001498#: wt-status.c:1192
Jiang Xindce37b62012-02-13 14:37:59 +08001499msgid "Not currently on any branch."
1500msgstr ""
1501
Jiang Xin28b3cff2013-07-26 08:56:45 +08001502#: wt-status.c:1209
Jiang Xindce37b62012-02-13 14:37:59 +08001503msgid "Initial commit"
1504msgstr ""
1505
Jiang Xin28b3cff2013-07-26 08:56:45 +08001506#: wt-status.c:1223
Jiang Xincc760112012-09-15 10:26:13 +08001507msgid "Untracked files"
Jiang Xindce37b62012-02-13 14:37:59 +08001508msgstr ""
1509
Jiang Xin28b3cff2013-07-26 08:56:45 +08001510#: wt-status.c:1225
Jiang Xincc760112012-09-15 10:26:13 +08001511msgid "Ignored files"
Jiang Xindce37b62012-02-13 14:37:59 +08001512msgstr ""
1513
Jiang Xin28b3cff2013-07-26 08:56:45 +08001514#: wt-status.c:1229
Jiang Xinc138af52013-04-10 15:19:54 +08001515#, c-format
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001516msgid ""
1517"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1518"may speed it up, but you have to be careful not to forget to add\n"
1519"new files yourself (see 'git help status')."
Jiang Xinc138af52013-04-10 15:19:54 +08001520msgstr ""
1521
Jiang Xin28b3cff2013-07-26 08:56:45 +08001522#: wt-status.c:1235
Jiang Xindce37b62012-02-13 14:37:59 +08001523#, c-format
1524msgid "Untracked files not listed%s"
1525msgstr ""
1526
Jiang Xin28b3cff2013-07-26 08:56:45 +08001527#: wt-status.c:1237
Jiang Xindce37b62012-02-13 14:37:59 +08001528msgid " (use -u option to show untracked files)"
1529msgstr ""
1530
Jiang Xin28b3cff2013-07-26 08:56:45 +08001531#: wt-status.c:1243
Jiang Xindce37b62012-02-13 14:37:59 +08001532msgid "No changes"
1533msgstr ""
1534
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001535#: wt-status.c:1248
Jiang Xindce37b62012-02-13 14:37:59 +08001536#, c-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08001537msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
Jiang Xindce37b62012-02-13 14:37:59 +08001538msgstr ""
1539
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001540#: wt-status.c:1251
Jiang Xindce37b62012-02-13 14:37:59 +08001541#, c-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08001542msgid "no changes added to commit\n"
1543msgstr ""
1544
1545#: wt-status.c:1254
1546#, c-format
Jiang Xincc760112012-09-15 10:26:13 +08001547msgid ""
1548"nothing added to commit but untracked files present (use \"git add\" to "
1549"track)\n"
Jiang Xindce37b62012-02-13 14:37:59 +08001550msgstr ""
1551
Jiang Xin28b3cff2013-07-26 08:56:45 +08001552#: wt-status.c:1257
Jiang Xincc760112012-09-15 10:26:13 +08001553#, c-format
1554msgid "nothing added to commit but untracked files present\n"
Jiang Xindce37b62012-02-13 14:37:59 +08001555msgstr ""
1556
Jiang Xin28b3cff2013-07-26 08:56:45 +08001557#: wt-status.c:1260
Jiang Xincc760112012-09-15 10:26:13 +08001558#, c-format
1559msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
Jiang Xindce37b62012-02-13 14:37:59 +08001560msgstr ""
1561
Jiang Xin28b3cff2013-07-26 08:56:45 +08001562#: wt-status.c:1263 wt-status.c:1268
Jiang Xincc760112012-09-15 10:26:13 +08001563#, c-format
1564msgid "nothing to commit\n"
Jiang Xindce37b62012-02-13 14:37:59 +08001565msgstr ""
1566
Jiang Xin28b3cff2013-07-26 08:56:45 +08001567#: wt-status.c:1266
Jiang Xincc760112012-09-15 10:26:13 +08001568#, c-format
1569msgid "nothing to commit (use -u to show untracked files)\n"
1570msgstr ""
1571
Jiang Xin28b3cff2013-07-26 08:56:45 +08001572#: wt-status.c:1270
Jiang Xincc760112012-09-15 10:26:13 +08001573#, c-format
1574msgid "nothing to commit, working directory clean\n"
1575msgstr ""
1576
Jiang Xin28b3cff2013-07-26 08:56:45 +08001577#: wt-status.c:1378
Jiang Xindce37b62012-02-13 14:37:59 +08001578msgid "HEAD (no branch)"
1579msgstr ""
1580
Jiang Xin28b3cff2013-07-26 08:56:45 +08001581#: wt-status.c:1384
Jiang Xindce37b62012-02-13 14:37:59 +08001582msgid "Initial commit on "
1583msgstr ""
1584
Jiang Xin28b3cff2013-07-26 08:56:45 +08001585#: wt-status.c:1399
Jiang Xindce37b62012-02-13 14:37:59 +08001586msgid "behind "
1587msgstr ""
1588
Jiang Xin28b3cff2013-07-26 08:56:45 +08001589#: wt-status.c:1402 wt-status.c:1405
Jiang Xindce37b62012-02-13 14:37:59 +08001590msgid "ahead "
1591msgstr ""
1592
Jiang Xin28b3cff2013-07-26 08:56:45 +08001593#: wt-status.c:1407
Jiang Xindce37b62012-02-13 14:37:59 +08001594msgid ", behind "
1595msgstr ""
1596
Jiang Xin28b3cff2013-07-26 08:56:45 +08001597#: compat/precompose_utf8.c:58 builtin/clone.c:351
Jiang Xin9caaf232013-02-14 14:49:45 +08001598#, c-format
1599msgid "failed to unlink '%s'"
Jiang Xincc760112012-09-15 10:26:13 +08001600msgstr ""
1601
Jiang Xin9caaf232013-02-14 14:49:45 +08001602#: builtin/add.c:20
1603msgid "git add [options] [--] <pathspec>..."
1604msgstr ""
1605
Jiang Xin9caaf232013-02-14 14:49:45 +08001606#.
1607#. * To be consistent with "git add -p" and most Git
1608#. * commands, we should default to being tree-wide, but
1609#. * this is not the original behavior and can't be
1610#. * changed until users trained themselves not to type
1611#. * "git add -u" or "git add -A". For now, we warn and
Jiang Xinc138af52013-04-10 15:19:54 +08001612#. * keep the old behavior. Later, the behavior can be changed
1613#. * to tree-wide, keeping the warning for a while, and
1614#. * eventually we can drop the warning.
Jiang Xin9caaf232013-02-14 14:49:45 +08001615#.
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001616#: builtin/add.c:58
Jiang Xin9caaf232013-02-14 14:49:45 +08001617#, c-format
1618msgid ""
1619"The behavior of 'git add %s (or %s)' with no path argument from a\n"
1620"subdirectory of the tree will change in Git 2.0 and should not be used "
1621"anymore.\n"
1622"To add content for the whole tree, run:\n"
1623"\n"
1624" git add %s :/\n"
1625" (or git add %s :/)\n"
1626"\n"
1627"To restrict the command to the current directory, run:\n"
1628"\n"
1629" git add %s .\n"
1630" (or git add %s .)\n"
1631"\n"
1632"With the current Git version, the command is restricted to the current "
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001633"directory.\n"
Jiang Xin9caaf232013-02-14 14:49:45 +08001634msgstr ""
1635
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001636#: builtin/add.c:100
1637#, c-format
1638msgid ""
1639"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
1640"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
1641"Paths like '%s' that are\n"
1642"removed from your working tree are ignored with this version of Git.\n"
1643"\n"
1644"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
1645" ignores paths you removed from your working tree.\n"
1646"\n"
1647"* 'git add --all <pathspec>' will let you also record the removals.\n"
1648"\n"
1649"Run 'git status' to check the paths you removed from your working tree.\n"
1650msgstr ""
1651
1652#: builtin/add.c:144
1653#, c-format
1654msgid "unexpected diff status %c"
1655msgstr ""
1656
Jiang Xinb8ecf232013-08-06 14:13:23 +08001657#: builtin/add.c:149 builtin/commit.c:252
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001658msgid "updating files failed"
1659msgstr ""
1660
1661#: builtin/add.c:163
1662#, c-format
1663msgid "remove '%s'\n"
1664msgstr ""
1665
1666#: builtin/add.c:253
1667msgid "Unstaged changes after refreshing the index:"
1668msgstr ""
1669
Jiang Xin28b3cff2013-07-26 08:56:45 +08001670#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001671#, c-format
1672msgid "pathspec '%s' did not match any files"
1673msgstr ""
1674
1675#: builtin/add.c:339
1676msgid "Could not read the index"
1677msgstr ""
1678
Jiang Xin28b3cff2013-07-26 08:56:45 +08001679#: builtin/add.c:350
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001680#, c-format
1681msgid "Could not open '%s' for writing."
1682msgstr ""
1683
Jiang Xin28b3cff2013-07-26 08:56:45 +08001684#: builtin/add.c:354
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001685msgid "Could not write patch"
1686msgstr ""
1687
Jiang Xin28b3cff2013-07-26 08:56:45 +08001688#: builtin/add.c:359
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001689#, c-format
1690msgid "Could not stat '%s'"
1691msgstr ""
1692
Jiang Xin28b3cff2013-07-26 08:56:45 +08001693#: builtin/add.c:361
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001694msgid "Empty patch. Aborted."
1695msgstr ""
1696
Jiang Xin28b3cff2013-07-26 08:56:45 +08001697#: builtin/add.c:367
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001698#, c-format
1699msgid "Could not apply '%s'"
1700msgstr ""
1701
Jiang Xin28b3cff2013-07-26 08:56:45 +08001702#: builtin/add.c:377
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001703msgid "The following paths are ignored by one of your .gitignore files:\n"
1704msgstr ""
1705
Jiang Xinb8ecf232013-08-06 14:13:23 +08001706#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63
Jiang Xin28b3cff2013-07-26 08:56:45 +08001707#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253
1708#: builtin/rm.c:268
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001709msgid "dry run"
1710msgstr ""
1711
Jiang Xin28b3cff2013-07-26 08:56:45 +08001712#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19
Jiang Xinb8ecf232013-08-06 14:13:23 +08001713#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613
Jiang Xin28b3cff2013-07-26 08:56:45 +08001714#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001715msgid "be verbose"
1716msgstr ""
1717
Jiang Xin28b3cff2013-07-26 08:56:45 +08001718#: builtin/add.c:397
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001719msgid "interactive picking"
1720msgstr ""
1721
Jiang Xin28b3cff2013-07-26 08:56:45 +08001722#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001723msgid "select hunks interactively"
1724msgstr ""
1725
Jiang Xin28b3cff2013-07-26 08:56:45 +08001726#: builtin/add.c:399
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001727msgid "edit current diff and apply"
1728msgstr ""
1729
Jiang Xin28b3cff2013-07-26 08:56:45 +08001730#: builtin/add.c:400
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001731msgid "allow adding otherwise ignored files"
1732msgstr ""
1733
Jiang Xin28b3cff2013-07-26 08:56:45 +08001734#: builtin/add.c:401
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001735msgid "update tracked files"
1736msgstr ""
1737
Jiang Xin28b3cff2013-07-26 08:56:45 +08001738#: builtin/add.c:402
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001739msgid "record only the fact that the path will be added later"
1740msgstr ""
1741
Jiang Xin28b3cff2013-07-26 08:56:45 +08001742#: builtin/add.c:403
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001743msgid "add changes from all tracked and untracked files"
1744msgstr ""
1745
1746#. takes no arguments
Jiang Xin28b3cff2013-07-26 08:56:45 +08001747#: builtin/add.c:406
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001748msgid "ignore paths removed in the working tree (same as --no-all)"
1749msgstr ""
1750
Jiang Xin28b3cff2013-07-26 08:56:45 +08001751#: builtin/add.c:408
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001752msgid "don't add, only refresh the index"
1753msgstr ""
1754
Jiang Xin28b3cff2013-07-26 08:56:45 +08001755#: builtin/add.c:409
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001756msgid "just skip files which cannot be added because of errors"
1757msgstr ""
1758
Jiang Xin28b3cff2013-07-26 08:56:45 +08001759#: builtin/add.c:410
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001760msgid "check if - even missing - files are ignored in dry run"
1761msgstr ""
1762
Jiang Xin28b3cff2013-07-26 08:56:45 +08001763#: builtin/add.c:432
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001764#, c-format
1765msgid "Use -f if you really want to add them.\n"
1766msgstr ""
1767
Jiang Xin28b3cff2013-07-26 08:56:45 +08001768#: builtin/add.c:433
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001769msgid "no files added"
1770msgstr ""
1771
Jiang Xin28b3cff2013-07-26 08:56:45 +08001772#: builtin/add.c:439
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001773msgid "adding files failed"
1774msgstr ""
1775
Jiang Xin28b3cff2013-07-26 08:56:45 +08001776#: builtin/add.c:478
Jiang Xindce37b62012-02-13 14:37:59 +08001777msgid "-A and -u are mutually incompatible"
1778msgstr ""
1779
Jiang Xin28b3cff2013-07-26 08:56:45 +08001780#: builtin/add.c:496
Jiang Xindce37b62012-02-13 14:37:59 +08001781msgid "Option --ignore-missing can only be used together with --dry-run"
1782msgstr ""
1783
Jiang Xinc6bc7d42013-04-30 08:31:19 +08001784#: builtin/add.c:526
Jiang Xincc760112012-09-15 10:26:13 +08001785#, c-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08001786msgid "Nothing specified, nothing added.\n"
1787msgstr ""
1788
1789#: builtin/add.c:527
1790#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08001791msgid "Maybe you wanted to say 'git add .'?\n"
1792msgstr ""
1793
Jiang Xinb8ecf232013-08-06 14:13:23 +08001794#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919
1795#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297
Jiang Xindce37b62012-02-13 14:37:59 +08001796msgid "index file corrupt"
1797msgstr ""
1798
Jiang Xin28b3cff2013-07-26 08:56:45 +08001799#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432
Jiang Xindce37b62012-02-13 14:37:59 +08001800msgid "Unable to write new index file"
1801msgstr ""
1802
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001803#: builtin/apply.c:57
Jiang Xin6f6731e2012-05-21 09:00:39 +08001804msgid "git apply [options] [<patch>...]"
1805msgstr ""
1806
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001807#: builtin/apply.c:110
Jiang Xin822e4a62012-05-08 16:10:22 +08001808#, c-format
1809msgid "unrecognized whitespace option '%s'"
1810msgstr ""
1811
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001812#: builtin/apply.c:125
Jiang Xin822e4a62012-05-08 16:10:22 +08001813#, c-format
1814msgid "unrecognized whitespace ignore option '%s'"
1815msgstr ""
1816
Jiang Xinccfca8d2012-09-05 06:20:57 +08001817#: builtin/apply.c:823
Jiang Xin822e4a62012-05-08 16:10:22 +08001818#, c-format
1819msgid "Cannot prepare timestamp regexp %s"
1820msgstr ""
1821
Jiang Xinccfca8d2012-09-05 06:20:57 +08001822#: builtin/apply.c:832
Jiang Xin822e4a62012-05-08 16:10:22 +08001823#, c-format
1824msgid "regexec returned %d for input: %s"
1825msgstr ""
1826
Jiang Xinccfca8d2012-09-05 06:20:57 +08001827#: builtin/apply.c:913
Jiang Xin822e4a62012-05-08 16:10:22 +08001828#, c-format
1829msgid "unable to find filename in patch at line %d"
1830msgstr ""
1831
Jiang Xinccfca8d2012-09-05 06:20:57 +08001832#: builtin/apply.c:945
Jiang Xin822e4a62012-05-08 16:10:22 +08001833#, c-format
1834msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1835msgstr ""
1836
Jiang Xinccfca8d2012-09-05 06:20:57 +08001837#: builtin/apply.c:949
Jiang Xin822e4a62012-05-08 16:10:22 +08001838#, c-format
Jiang Xin93329722012-05-15 06:43:03 +08001839msgid "git apply: bad git-diff - inconsistent new filename on line %d"
Jiang Xin822e4a62012-05-08 16:10:22 +08001840msgstr ""
1841
Jiang Xinccfca8d2012-09-05 06:20:57 +08001842#: builtin/apply.c:950
Jiang Xin93329722012-05-15 06:43:03 +08001843#, c-format
1844msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1845msgstr ""
1846
Jiang Xinccfca8d2012-09-05 06:20:57 +08001847#: builtin/apply.c:957
Jiang Xin822e4a62012-05-08 16:10:22 +08001848#, c-format
1849msgid "git apply: bad git-diff - expected /dev/null on line %d"
1850msgstr ""
1851
Jiang Xin9caaf232013-02-14 14:49:45 +08001852#: builtin/apply.c:1422
Jiang Xin822e4a62012-05-08 16:10:22 +08001853#, c-format
1854msgid "recount: unexpected line: %.*s"
1855msgstr ""
1856
Jiang Xin9caaf232013-02-14 14:49:45 +08001857#: builtin/apply.c:1479
Jiang Xin822e4a62012-05-08 16:10:22 +08001858#, c-format
1859msgid "patch fragment without header at line %d: %.*s"
1860msgstr ""
1861
Jiang Xin9caaf232013-02-14 14:49:45 +08001862#: builtin/apply.c:1496
Jiang Xin822e4a62012-05-08 16:10:22 +08001863#, c-format
1864msgid ""
1865"git diff header lacks filename information when removing %d leading pathname "
1866"component (line %d)"
1867msgid_plural ""
1868"git diff header lacks filename information when removing %d leading pathname "
1869"components (line %d)"
1870msgstr[0] ""
1871msgstr[1] ""
1872
Jiang Xin9caaf232013-02-14 14:49:45 +08001873#: builtin/apply.c:1656
Jiang Xin822e4a62012-05-08 16:10:22 +08001874msgid "new file depends on old contents"
1875msgstr ""
1876
Jiang Xin9caaf232013-02-14 14:49:45 +08001877#: builtin/apply.c:1658
Jiang Xin822e4a62012-05-08 16:10:22 +08001878msgid "deleted file still has contents"
1879msgstr ""
1880
Jiang Xin9caaf232013-02-14 14:49:45 +08001881#: builtin/apply.c:1684
Jiang Xin822e4a62012-05-08 16:10:22 +08001882#, c-format
1883msgid "corrupt patch at line %d"
1884msgstr ""
1885
Jiang Xin9caaf232013-02-14 14:49:45 +08001886#: builtin/apply.c:1720
Jiang Xin822e4a62012-05-08 16:10:22 +08001887#, c-format
1888msgid "new file %s depends on old contents"
1889msgstr ""
1890
Jiang Xin9caaf232013-02-14 14:49:45 +08001891#: builtin/apply.c:1722
Jiang Xin822e4a62012-05-08 16:10:22 +08001892#, c-format
1893msgid "deleted file %s still has contents"
1894msgstr ""
1895
Jiang Xin9caaf232013-02-14 14:49:45 +08001896#: builtin/apply.c:1725
Jiang Xin822e4a62012-05-08 16:10:22 +08001897#, c-format
1898msgid "** warning: file %s becomes empty but is not deleted"
1899msgstr ""
1900
Jiang Xin9caaf232013-02-14 14:49:45 +08001901#: builtin/apply.c:1871
Jiang Xin822e4a62012-05-08 16:10:22 +08001902#, c-format
1903msgid "corrupt binary patch at line %d: %.*s"
1904msgstr ""
1905
1906#. there has to be one hunk (forward hunk)
Jiang Xin9caaf232013-02-14 14:49:45 +08001907#: builtin/apply.c:1900
Jiang Xin822e4a62012-05-08 16:10:22 +08001908#, c-format
1909msgid "unrecognized binary patch at line %d"
1910msgstr ""
1911
Jiang Xin9caaf232013-02-14 14:49:45 +08001912#: builtin/apply.c:1986
Jiang Xin822e4a62012-05-08 16:10:22 +08001913#, c-format
1914msgid "patch with only garbage at line %d"
1915msgstr ""
1916
Jiang Xin9caaf232013-02-14 14:49:45 +08001917#: builtin/apply.c:2076
Jiang Xin822e4a62012-05-08 16:10:22 +08001918#, c-format
1919msgid "unable to read symlink %s"
1920msgstr ""
1921
Jiang Xin9caaf232013-02-14 14:49:45 +08001922#: builtin/apply.c:2080
Jiang Xin822e4a62012-05-08 16:10:22 +08001923#, c-format
1924msgid "unable to open or read %s"
1925msgstr ""
1926
Jiang Xinc138af52013-04-10 15:19:54 +08001927#: builtin/apply.c:2688
Jiang Xin822e4a62012-05-08 16:10:22 +08001928#, c-format
1929msgid "invalid start of line: '%c'"
1930msgstr ""
1931
Jiang Xinc138af52013-04-10 15:19:54 +08001932#: builtin/apply.c:2806
Jiang Xin822e4a62012-05-08 16:10:22 +08001933#, c-format
1934msgid "Hunk #%d succeeded at %d (offset %d line)."
1935msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1936msgstr[0] ""
1937msgstr[1] ""
1938
Jiang Xinc138af52013-04-10 15:19:54 +08001939#: builtin/apply.c:2818
Jiang Xin822e4a62012-05-08 16:10:22 +08001940#, c-format
1941msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1942msgstr ""
1943
Jiang Xinc138af52013-04-10 15:19:54 +08001944#: builtin/apply.c:2824
Jiang Xin822e4a62012-05-08 16:10:22 +08001945#, c-format
1946msgid ""
1947"while searching for:\n"
1948"%.*s"
1949msgstr ""
1950
Jiang Xinc138af52013-04-10 15:19:54 +08001951#: builtin/apply.c:2843
Jiang Xin822e4a62012-05-08 16:10:22 +08001952#, c-format
1953msgid "missing binary patch data for '%s'"
1954msgstr ""
1955
Jiang Xinc138af52013-04-10 15:19:54 +08001956#: builtin/apply.c:2946
Jiang Xin822e4a62012-05-08 16:10:22 +08001957#, c-format
1958msgid "binary patch does not apply to '%s'"
1959msgstr ""
1960
Jiang Xinc138af52013-04-10 15:19:54 +08001961#: builtin/apply.c:2952
Jiang Xin822e4a62012-05-08 16:10:22 +08001962#, c-format
1963msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1964msgstr ""
1965
Jiang Xinc138af52013-04-10 15:19:54 +08001966#: builtin/apply.c:2973
Jiang Xin822e4a62012-05-08 16:10:22 +08001967#, c-format
1968msgid "patch failed: %s:%ld"
1969msgstr ""
1970
Jiang Xinc138af52013-04-10 15:19:54 +08001971#: builtin/apply.c:3095
Jiang Xin822e4a62012-05-08 16:10:22 +08001972#, c-format
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001973msgid "cannot checkout %s"
Jiang Xin822e4a62012-05-08 16:10:22 +08001974msgstr ""
1975
Jiang Xin28b3cff2013-07-26 08:56:45 +08001976#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194
Jiang Xin822e4a62012-05-08 16:10:22 +08001977#, c-format
1978msgid "read of %s failed"
1979msgstr ""
1980
Jiang Xin28b3cff2013-07-26 08:56:45 +08001981#: builtin/apply.c:3174 builtin/apply.c:3396
Jiang Xin822e4a62012-05-08 16:10:22 +08001982#, c-format
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001983msgid "path %s has been renamed/deleted"
Jiang Xin822e4a62012-05-08 16:10:22 +08001984msgstr ""
1985
Jiang Xin28b3cff2013-07-26 08:56:45 +08001986#: builtin/apply.c:3255 builtin/apply.c:3410
Jiang Xin822e4a62012-05-08 16:10:22 +08001987#, c-format
1988msgid "%s: does not exist in index"
1989msgstr ""
1990
Jiang Xin28b3cff2013-07-26 08:56:45 +08001991#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424
Jiang Xin0bbe5b42012-07-30 10:24:47 +08001992#, c-format
1993msgid "%s: %s"
1994msgstr ""
1995
Jiang Xin28b3cff2013-07-26 08:56:45 +08001996#: builtin/apply.c:3264 builtin/apply.c:3418
Jiang Xin822e4a62012-05-08 16:10:22 +08001997#, c-format
1998msgid "%s: does not match index"
1999msgstr ""
2000
Jiang Xin28b3cff2013-07-26 08:56:45 +08002001#: builtin/apply.c:3366
Jiang Xin0bbe5b42012-07-30 10:24:47 +08002002msgid "removal patch leaves file contents"
2003msgstr ""
2004
Jiang Xin28b3cff2013-07-26 08:56:45 +08002005#: builtin/apply.c:3435
Jiang Xin822e4a62012-05-08 16:10:22 +08002006#, c-format
Jiang Xin9caaf232013-02-14 14:49:45 +08002007msgid "%s: wrong type"
2008msgstr ""
2009
Jiang Xin28b3cff2013-07-26 08:56:45 +08002010#: builtin/apply.c:3437
Jiang Xin9caaf232013-02-14 14:49:45 +08002011#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +08002012msgid "%s has type %o, expected %o"
2013msgstr ""
2014
Jiang Xin28b3cff2013-07-26 08:56:45 +08002015#: builtin/apply.c:3538
Jiang Xin822e4a62012-05-08 16:10:22 +08002016#, c-format
2017msgid "%s: already exists in index"
2018msgstr ""
2019
Jiang Xin28b3cff2013-07-26 08:56:45 +08002020#: builtin/apply.c:3541
Jiang Xin0bbe5b42012-07-30 10:24:47 +08002021#, c-format
2022msgid "%s: already exists in working directory"
2023msgstr ""
2024
Jiang Xin28b3cff2013-07-26 08:56:45 +08002025#: builtin/apply.c:3561
Jiang Xin822e4a62012-05-08 16:10:22 +08002026#, c-format
Jiang Xin75f7b4b2012-06-02 07:07:27 +08002027msgid "new mode (%o) of %s does not match old mode (%o)"
Jiang Xin822e4a62012-05-08 16:10:22 +08002028msgstr ""
2029
Jiang Xin28b3cff2013-07-26 08:56:45 +08002030#: builtin/apply.c:3566
Jiang Xin822e4a62012-05-08 16:10:22 +08002031#, c-format
Jiang Xin75f7b4b2012-06-02 07:07:27 +08002032msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2033msgstr ""
2034
Jiang Xin28b3cff2013-07-26 08:56:45 +08002035#: builtin/apply.c:3574
Jiang Xin75f7b4b2012-06-02 07:07:27 +08002036#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +08002037msgid "%s: patch does not apply"
2038msgstr ""
2039
Jiang Xin28b3cff2013-07-26 08:56:45 +08002040#: builtin/apply.c:3587
Jiang Xin822e4a62012-05-08 16:10:22 +08002041#, c-format
2042msgid "Checking patch %s..."
2043msgstr ""
2044
Jiang Xin28b3cff2013-07-26 08:56:45 +08002045#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127
Jiang Xin822e4a62012-05-08 16:10:22 +08002046#, c-format
2047msgid "make_cache_entry failed for path '%s'"
2048msgstr ""
2049
Jiang Xin28b3cff2013-07-26 08:56:45 +08002050#: builtin/apply.c:3823
Jiang Xin822e4a62012-05-08 16:10:22 +08002051#, c-format
2052msgid "unable to remove %s from index"
2053msgstr ""
2054
Jiang Xin28b3cff2013-07-26 08:56:45 +08002055#: builtin/apply.c:3851
Jiang Xin822e4a62012-05-08 16:10:22 +08002056#, c-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08002057msgid "corrupt patch for submodule %s"
Jiang Xin822e4a62012-05-08 16:10:22 +08002058msgstr ""
2059
Jiang Xin28b3cff2013-07-26 08:56:45 +08002060#: builtin/apply.c:3855
Jiang Xin822e4a62012-05-08 16:10:22 +08002061#, c-format
2062msgid "unable to stat newly created file '%s'"
2063msgstr ""
2064
Jiang Xin28b3cff2013-07-26 08:56:45 +08002065#: builtin/apply.c:3860
Jiang Xin822e4a62012-05-08 16:10:22 +08002066#, c-format
2067msgid "unable to create backing store for newly created file %s"
2068msgstr ""
2069
Jiang Xin28b3cff2013-07-26 08:56:45 +08002070#: builtin/apply.c:3863 builtin/apply.c:3971
Jiang Xin822e4a62012-05-08 16:10:22 +08002071#, c-format
2072msgid "unable to add cache entry for %s"
2073msgstr ""
2074
Jiang Xin28b3cff2013-07-26 08:56:45 +08002075#: builtin/apply.c:3896
Jiang Xin822e4a62012-05-08 16:10:22 +08002076#, c-format
2077msgid "closing file '%s'"
2078msgstr ""
2079
Jiang Xin28b3cff2013-07-26 08:56:45 +08002080#: builtin/apply.c:3945
Jiang Xin822e4a62012-05-08 16:10:22 +08002081#, c-format
2082msgid "unable to write file '%s' mode %o"
2083msgstr ""
2084
Jiang Xin28b3cff2013-07-26 08:56:45 +08002085#: builtin/apply.c:4032
Jiang Xin822e4a62012-05-08 16:10:22 +08002086#, c-format
2087msgid "Applied patch %s cleanly."
2088msgstr ""
2089
Jiang Xin28b3cff2013-07-26 08:56:45 +08002090#: builtin/apply.c:4040
Jiang Xin822e4a62012-05-08 16:10:22 +08002091msgid "internal error"
2092msgstr ""
2093
2094#. Say this even without --verbose
Jiang Xin28b3cff2013-07-26 08:56:45 +08002095#: builtin/apply.c:4043
Jiang Xin822e4a62012-05-08 16:10:22 +08002096#, c-format
2097msgid "Applying patch %%s with %d reject..."
2098msgid_plural "Applying patch %%s with %d rejects..."
2099msgstr[0] ""
2100msgstr[1] ""
2101
Jiang Xin28b3cff2013-07-26 08:56:45 +08002102#: builtin/apply.c:4053
Jiang Xin822e4a62012-05-08 16:10:22 +08002103#, c-format
2104msgid "truncating .rej filename to %.*s.rej"
2105msgstr ""
2106
Jiang Xin28b3cff2013-07-26 08:56:45 +08002107#: builtin/apply.c:4074
Jiang Xin822e4a62012-05-08 16:10:22 +08002108#, c-format
2109msgid "Hunk #%d applied cleanly."
2110msgstr ""
2111
Jiang Xin28b3cff2013-07-26 08:56:45 +08002112#: builtin/apply.c:4077
Jiang Xin822e4a62012-05-08 16:10:22 +08002113#, c-format
2114msgid "Rejected hunk #%d."
2115msgstr ""
2116
Jiang Xin28b3cff2013-07-26 08:56:45 +08002117#: builtin/apply.c:4227
Jiang Xin822e4a62012-05-08 16:10:22 +08002118msgid "unrecognized input"
2119msgstr ""
2120
Jiang Xin28b3cff2013-07-26 08:56:45 +08002121#: builtin/apply.c:4238
Jiang Xin822e4a62012-05-08 16:10:22 +08002122msgid "unable to read index file"
2123msgstr ""
2124
Jiang Xin28b3cff2013-07-26 08:56:45 +08002125#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91
Jiang Xincc760112012-09-15 10:26:13 +08002126#: builtin/fetch.c:63
Jiang Xin6f6731e2012-05-21 09:00:39 +08002127msgid "path"
2128msgstr ""
2129
Jiang Xin28b3cff2013-07-26 08:56:45 +08002130#: builtin/apply.c:4358
Jiang Xin6f6731e2012-05-21 09:00:39 +08002131msgid "don't apply changes matching the given path"
2132msgstr ""
2133
Jiang Xin28b3cff2013-07-26 08:56:45 +08002134#: builtin/apply.c:4361
Jiang Xin6f6731e2012-05-21 09:00:39 +08002135msgid "apply changes matching the given path"
2136msgstr ""
2137
Jiang Xin28b3cff2013-07-26 08:56:45 +08002138#: builtin/apply.c:4363
Jiang Xin6f6731e2012-05-21 09:00:39 +08002139msgid "num"
2140msgstr ""
2141
Jiang Xin28b3cff2013-07-26 08:56:45 +08002142#: builtin/apply.c:4364
Jiang Xin6f6731e2012-05-21 09:00:39 +08002143msgid "remove <num> leading slashes from traditional diff paths"
2144msgstr ""
2145
Jiang Xin28b3cff2013-07-26 08:56:45 +08002146#: builtin/apply.c:4367
Jiang Xin6f6731e2012-05-21 09:00:39 +08002147msgid "ignore additions made by the patch"
2148msgstr ""
2149
Jiang Xin28b3cff2013-07-26 08:56:45 +08002150#: builtin/apply.c:4369
Jiang Xin6f6731e2012-05-21 09:00:39 +08002151msgid "instead of applying the patch, output diffstat for the input"
2152msgstr ""
2153
Jiang Xin28b3cff2013-07-26 08:56:45 +08002154#: builtin/apply.c:4373
Jiang Xincc760112012-09-15 10:26:13 +08002155msgid "show number of added and deleted lines in decimal notation"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002156msgstr ""
2157
Jiang Xin28b3cff2013-07-26 08:56:45 +08002158#: builtin/apply.c:4375
Jiang Xincc760112012-09-15 10:26:13 +08002159msgid "instead of applying the patch, output a summary for the input"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002160msgstr ""
2161
Jiang Xin28b3cff2013-07-26 08:56:45 +08002162#: builtin/apply.c:4377
Jiang Xincc760112012-09-15 10:26:13 +08002163msgid "instead of applying the patch, see if the patch is applicable"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002164msgstr ""
2165
Jiang Xin28b3cff2013-07-26 08:56:45 +08002166#: builtin/apply.c:4379
Jiang Xincc760112012-09-15 10:26:13 +08002167msgid "make sure the patch is applicable to the current index"
2168msgstr ""
2169
Jiang Xin28b3cff2013-07-26 08:56:45 +08002170#: builtin/apply.c:4381
Jiang Xincc760112012-09-15 10:26:13 +08002171msgid "apply a patch without touching the working tree"
2172msgstr ""
2173
Jiang Xin28b3cff2013-07-26 08:56:45 +08002174#: builtin/apply.c:4383
Jiang Xincc760112012-09-15 10:26:13 +08002175msgid "also apply the patch (use with --stat/--summary/--check)"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002176msgstr ""
2177
Jiang Xin28b3cff2013-07-26 08:56:45 +08002178#: builtin/apply.c:4385
Jiang Xincc760112012-09-15 10:26:13 +08002179msgid "attempt three-way merge if a patch does not apply"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002180msgstr ""
2181
Jiang Xin28b3cff2013-07-26 08:56:45 +08002182#: builtin/apply.c:4387
Jiang Xincc760112012-09-15 10:26:13 +08002183msgid "build a temporary index based on embedded index information"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002184msgstr ""
2185
Jiang Xin28b3cff2013-07-26 08:56:45 +08002186#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462
Jiang Xincc760112012-09-15 10:26:13 +08002187msgid "paths are separated with NUL character"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002188msgstr ""
2189
Jiang Xin28b3cff2013-07-26 08:56:45 +08002190#: builtin/apply.c:4392
Jiang Xincc760112012-09-15 10:26:13 +08002191msgid "ensure at least <n> lines of context match"
2192msgstr ""
2193
Jiang Xin28b3cff2013-07-26 08:56:45 +08002194#: builtin/apply.c:4393
Jiang Xincc760112012-09-15 10:26:13 +08002195msgid "action"
Jiang Xin6f6731e2012-05-21 09:00:39 +08002196msgstr ""
2197
Jiang Xin28b3cff2013-07-26 08:56:45 +08002198#: builtin/apply.c:4394
Jiang Xincc760112012-09-15 10:26:13 +08002199msgid "detect new or modified lines that have whitespace errors"
2200msgstr ""
2201
Jiang Xin28b3cff2013-07-26 08:56:45 +08002202#: builtin/apply.c:4397 builtin/apply.c:4400
Jiang Xincc760112012-09-15 10:26:13 +08002203msgid "ignore changes in whitespace when finding context"
2204msgstr ""
2205
Jiang Xin28b3cff2013-07-26 08:56:45 +08002206#: builtin/apply.c:4403
Jiang Xincc760112012-09-15 10:26:13 +08002207msgid "apply the patch in reverse"
2208msgstr ""
2209
Jiang Xin28b3cff2013-07-26 08:56:45 +08002210#: builtin/apply.c:4405
Jiang Xincc760112012-09-15 10:26:13 +08002211msgid "don't expect at least one line of context"
2212msgstr ""
2213
Jiang Xin28b3cff2013-07-26 08:56:45 +08002214#: builtin/apply.c:4407
Jiang Xincc760112012-09-15 10:26:13 +08002215msgid "leave the rejected hunks in corresponding *.rej files"
2216msgstr ""
2217
Jiang Xin28b3cff2013-07-26 08:56:45 +08002218#: builtin/apply.c:4409
Jiang Xincc760112012-09-15 10:26:13 +08002219msgid "allow overlapping hunks"
2220msgstr ""
2221
Jiang Xin28b3cff2013-07-26 08:56:45 +08002222#: builtin/apply.c:4412
Jiang Xin6f6731e2012-05-21 09:00:39 +08002223msgid "tolerate incorrectly detected missing new-line at the end of file"
2224msgstr ""
2225
Jiang Xin28b3cff2013-07-26 08:56:45 +08002226#: builtin/apply.c:4415
Jiang Xin6f6731e2012-05-21 09:00:39 +08002227msgid "do not trust the line counts in the hunk headers"
2228msgstr ""
2229
Jiang Xin28b3cff2013-07-26 08:56:45 +08002230#: builtin/apply.c:4417
Jiang Xin6f6731e2012-05-21 09:00:39 +08002231msgid "root"
2232msgstr ""
2233
Jiang Xin28b3cff2013-07-26 08:56:45 +08002234#: builtin/apply.c:4418
Jiang Xin6f6731e2012-05-21 09:00:39 +08002235msgid "prepend <root> to all filenames"
2236msgstr ""
2237
Jiang Xin28b3cff2013-07-26 08:56:45 +08002238#: builtin/apply.c:4440
Jiang Xin0bbe5b42012-07-30 10:24:47 +08002239msgid "--3way outside a repository"
2240msgstr ""
2241
Jiang Xin28b3cff2013-07-26 08:56:45 +08002242#: builtin/apply.c:4448
Jiang Xin822e4a62012-05-08 16:10:22 +08002243msgid "--index outside a repository"
2244msgstr ""
2245
Jiang Xin28b3cff2013-07-26 08:56:45 +08002246#: builtin/apply.c:4451
Jiang Xin822e4a62012-05-08 16:10:22 +08002247msgid "--cached outside a repository"
2248msgstr ""
2249
Jiang Xin28b3cff2013-07-26 08:56:45 +08002250#: builtin/apply.c:4467
Jiang Xin822e4a62012-05-08 16:10:22 +08002251#, c-format
2252msgid "can't open patch '%s'"
2253msgstr ""
2254
Jiang Xin28b3cff2013-07-26 08:56:45 +08002255#: builtin/apply.c:4481
Jiang Xin822e4a62012-05-08 16:10:22 +08002256#, c-format
2257msgid "squelched %d whitespace error"
2258msgid_plural "squelched %d whitespace errors"
2259msgstr[0] ""
2260msgstr[1] ""
2261
Jiang Xin28b3cff2013-07-26 08:56:45 +08002262#: builtin/apply.c:4487 builtin/apply.c:4497
Jiang Xin822e4a62012-05-08 16:10:22 +08002263#, c-format
2264msgid "%d line adds whitespace errors."
2265msgid_plural "%d lines add whitespace errors."
2266msgstr[0] ""
2267msgstr[1] ""
2268
Jiang Xindce37b62012-02-13 14:37:59 +08002269#: builtin/archive.c:17
2270#, c-format
2271msgid "could not create archive file '%s'"
2272msgstr ""
2273
2274#: builtin/archive.c:20
2275msgid "could not redirect output"
2276msgstr ""
2277
2278#: builtin/archive.c:37
2279msgid "git archive: Remote with no URL"
2280msgstr ""
2281
2282#: builtin/archive.c:58
2283msgid "git archive: expected ACK/NAK, got EOF"
2284msgstr ""
2285
Jiang Xinc138af52013-04-10 15:19:54 +08002286#: builtin/archive.c:61
Jiang Xindce37b62012-02-13 14:37:59 +08002287#, c-format
2288msgid "git archive: NACK %s"
2289msgstr ""
2290
Jiang Xinc138af52013-04-10 15:19:54 +08002291#: builtin/archive.c:63
Jiang Xindce37b62012-02-13 14:37:59 +08002292#, c-format
2293msgid "remote error: %s"
2294msgstr ""
2295
Jiang Xinc138af52013-04-10 15:19:54 +08002296#: builtin/archive.c:64
Jiang Xindce37b62012-02-13 14:37:59 +08002297msgid "git archive: protocol error"
2298msgstr ""
2299
Jiang Xinc138af52013-04-10 15:19:54 +08002300#: builtin/archive.c:68
Jiang Xindce37b62012-02-13 14:37:59 +08002301msgid "git archive: expected a flush"
2302msgstr ""
2303
Jiang Xincc760112012-09-15 10:26:13 +08002304#: builtin/bisect--helper.c:7
2305msgid "git bisect--helper --next-all [--no-checkout]"
2306msgstr ""
2307
2308#: builtin/bisect--helper.c:17
2309msgid "perform 'git bisect next'"
2310msgstr ""
2311
2312#: builtin/bisect--helper.c:19
2313msgid "update BISECT_HEAD instead of checking out the current commit"
2314msgstr ""
2315
Jiang Xin28b3cff2013-07-26 08:56:45 +08002316#: builtin/blame.c:26
Jiang Xincc760112012-09-15 10:26:13 +08002317msgid "git blame [options] [rev-opts] [rev] [--] file"
2318msgstr ""
2319
Jiang Xin28b3cff2013-07-26 08:56:45 +08002320#: builtin/blame.c:31
Jiang Xincc760112012-09-15 10:26:13 +08002321msgid "[rev-opts] are documented in git-rev-list(1)"
2322msgstr ""
2323
Jiang Xin28b3cff2013-07-26 08:56:45 +08002324#: builtin/blame.c:2276
Jiang Xincc760112012-09-15 10:26:13 +08002325msgid "Show blame entries as we find them, incrementally"
2326msgstr ""
2327
Jiang Xin28b3cff2013-07-26 08:56:45 +08002328#: builtin/blame.c:2277
Jiang Xincc760112012-09-15 10:26:13 +08002329msgid "Show blank SHA-1 for boundary commits (Default: off)"
2330msgstr ""
2331
Jiang Xin28b3cff2013-07-26 08:56:45 +08002332#: builtin/blame.c:2278
Jiang Xincc760112012-09-15 10:26:13 +08002333msgid "Do not treat root commits as boundaries (Default: off)"
2334msgstr ""
2335
Jiang Xin28b3cff2013-07-26 08:56:45 +08002336#: builtin/blame.c:2279
Jiang Xincc760112012-09-15 10:26:13 +08002337msgid "Show work cost statistics"
2338msgstr ""
2339
Jiang Xin28b3cff2013-07-26 08:56:45 +08002340#: builtin/blame.c:2280
Jiang Xincc760112012-09-15 10:26:13 +08002341msgid "Show output score for blame entries"
2342msgstr ""
2343
Jiang Xin28b3cff2013-07-26 08:56:45 +08002344#: builtin/blame.c:2281
Jiang Xincc760112012-09-15 10:26:13 +08002345msgid "Show original filename (Default: auto)"
2346msgstr ""
2347
Jiang Xin28b3cff2013-07-26 08:56:45 +08002348#: builtin/blame.c:2282
Jiang Xincc760112012-09-15 10:26:13 +08002349msgid "Show original linenumber (Default: off)"
2350msgstr ""
2351
Jiang Xin28b3cff2013-07-26 08:56:45 +08002352#: builtin/blame.c:2283
Jiang Xincc760112012-09-15 10:26:13 +08002353msgid "Show in a format designed for machine consumption"
2354msgstr ""
2355
Jiang Xin28b3cff2013-07-26 08:56:45 +08002356#: builtin/blame.c:2284
Jiang Xincc760112012-09-15 10:26:13 +08002357msgid "Show porcelain format with per-line commit information"
2358msgstr ""
2359
Jiang Xin28b3cff2013-07-26 08:56:45 +08002360#: builtin/blame.c:2285
Jiang Xincc760112012-09-15 10:26:13 +08002361msgid "Use the same output mode as git-annotate (Default: off)"
2362msgstr ""
2363
Jiang Xin28b3cff2013-07-26 08:56:45 +08002364#: builtin/blame.c:2286
Jiang Xincc760112012-09-15 10:26:13 +08002365msgid "Show raw timestamp (Default: off)"
2366msgstr ""
2367
Jiang Xin28b3cff2013-07-26 08:56:45 +08002368#: builtin/blame.c:2287
Jiang Xincc760112012-09-15 10:26:13 +08002369msgid "Show long commit SHA1 (Default: off)"
2370msgstr ""
2371
Jiang Xin28b3cff2013-07-26 08:56:45 +08002372#: builtin/blame.c:2288
Jiang Xincc760112012-09-15 10:26:13 +08002373msgid "Suppress author name and timestamp (Default: off)"
2374msgstr ""
2375
Jiang Xin28b3cff2013-07-26 08:56:45 +08002376#: builtin/blame.c:2289
Jiang Xincc760112012-09-15 10:26:13 +08002377msgid "Show author email instead of name (Default: off)"
2378msgstr ""
2379
Jiang Xin28b3cff2013-07-26 08:56:45 +08002380#: builtin/blame.c:2290
Jiang Xincc760112012-09-15 10:26:13 +08002381msgid "Ignore whitespace differences"
2382msgstr ""
2383
Jiang Xin28b3cff2013-07-26 08:56:45 +08002384#: builtin/blame.c:2291
Jiang Xincc760112012-09-15 10:26:13 +08002385msgid "Spend extra cycles to find better match"
2386msgstr ""
2387
Jiang Xin28b3cff2013-07-26 08:56:45 +08002388#: builtin/blame.c:2292
Jiang Xincc760112012-09-15 10:26:13 +08002389msgid "Use revisions from <file> instead of calling git-rev-list"
2390msgstr ""
2391
Jiang Xin28b3cff2013-07-26 08:56:45 +08002392#: builtin/blame.c:2293
Jiang Xincc760112012-09-15 10:26:13 +08002393msgid "Use <file>'s contents as the final image"
2394msgstr ""
2395
Jiang Xin28b3cff2013-07-26 08:56:45 +08002396#: builtin/blame.c:2294 builtin/blame.c:2295
Jiang Xincc760112012-09-15 10:26:13 +08002397msgid "score"
2398msgstr ""
2399
Jiang Xin28b3cff2013-07-26 08:56:45 +08002400#: builtin/blame.c:2294
Jiang Xincc760112012-09-15 10:26:13 +08002401msgid "Find line copies within and across files"
2402msgstr ""
2403
Jiang Xin28b3cff2013-07-26 08:56:45 +08002404#: builtin/blame.c:2295
Jiang Xincc760112012-09-15 10:26:13 +08002405msgid "Find line movements within and across files"
2406msgstr ""
2407
Jiang Xin28b3cff2013-07-26 08:56:45 +08002408#: builtin/blame.c:2296
Jiang Xincc760112012-09-15 10:26:13 +08002409msgid "n,m"
2410msgstr ""
2411
Jiang Xin28b3cff2013-07-26 08:56:45 +08002412#: builtin/blame.c:2296
Jiang Xincc760112012-09-15 10:26:13 +08002413msgid "Process only line range n,m, counting from 1"
2414msgstr ""
2415
Jiang Xinc138af52013-04-10 15:19:54 +08002416#: builtin/branch.c:24
Jiang Xincc760112012-09-15 10:26:13 +08002417msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2418msgstr ""
2419
Jiang Xinc138af52013-04-10 15:19:54 +08002420#: builtin/branch.c:25
Jiang Xincc760112012-09-15 10:26:13 +08002421msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2422msgstr ""
2423
Jiang Xinc138af52013-04-10 15:19:54 +08002424#: builtin/branch.c:26
Jiang Xincc760112012-09-15 10:26:13 +08002425msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2426msgstr ""
2427
Jiang Xinc138af52013-04-10 15:19:54 +08002428#: builtin/branch.c:27
Jiang Xincc760112012-09-15 10:26:13 +08002429msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2430msgstr ""
2431
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002432#: builtin/branch.c:150
Jiang Xindce37b62012-02-13 14:37:59 +08002433#, c-format
2434msgid ""
2435"deleting branch '%s' that has been merged to\n"
2436" '%s', but not yet merged to HEAD."
2437msgstr ""
2438
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002439#: builtin/branch.c:154
Jiang Xindce37b62012-02-13 14:37:59 +08002440#, c-format
2441msgid ""
2442"not deleting branch '%s' that is not yet merged to\n"
2443" '%s', even though it is merged to HEAD."
2444msgstr ""
2445
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002446#: builtin/branch.c:168
Jiang Xindce37b62012-02-13 14:37:59 +08002447#, c-format
2448msgid "Couldn't look up commit object for '%s'"
2449msgstr ""
2450
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002451#: builtin/branch.c:172
Jiang Xindce37b62012-02-13 14:37:59 +08002452#, c-format
2453msgid ""
2454"The branch '%s' is not fully merged.\n"
2455"If you are sure you want to delete it, run 'git branch -D %s'."
2456msgstr ""
2457
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002458#: builtin/branch.c:185
Jiang Xinfe52cd62012-11-23 14:29:02 +08002459msgid "Update of config-file failed"
Jiang Xindce37b62012-02-13 14:37:59 +08002460msgstr ""
2461
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002462#: builtin/branch.c:213
Jiang Xinfe52cd62012-11-23 14:29:02 +08002463msgid "cannot use -a with -d"
Jiang Xin822e4a62012-05-08 16:10:22 +08002464msgstr ""
2465
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002466#: builtin/branch.c:219
Jiang Xinfe52cd62012-11-23 14:29:02 +08002467msgid "Couldn't look up commit object for HEAD"
2468msgstr ""
2469
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002470#: builtin/branch.c:227
Jiang Xin822e4a62012-05-08 16:10:22 +08002471#, c-format
Jiang Xinfe52cd62012-11-23 14:29:02 +08002472msgid "Cannot delete the branch '%s' which you are currently on."
Jiang Xin822e4a62012-05-08 16:10:22 +08002473msgstr ""
2474
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002475#: builtin/branch.c:240
Jiang Xin822e4a62012-05-08 16:10:22 +08002476#, c-format
Jiang Xinfe52cd62012-11-23 14:29:02 +08002477msgid "remote branch '%s' not found."
2478msgstr ""
2479
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002480#: builtin/branch.c:241
Jiang Xinfe52cd62012-11-23 14:29:02 +08002481#, c-format
2482msgid "branch '%s' not found."
2483msgstr ""
2484
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002485#: builtin/branch.c:255
Jiang Xinfe52cd62012-11-23 14:29:02 +08002486#, c-format
2487msgid "Error deleting remote branch '%s'"
2488msgstr ""
2489
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002490#: builtin/branch.c:256
Jiang Xinfe52cd62012-11-23 14:29:02 +08002491#, c-format
2492msgid "Error deleting branch '%s'"
2493msgstr ""
2494
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002495#: builtin/branch.c:263
Jiang Xinfe52cd62012-11-23 14:29:02 +08002496#, c-format
2497msgid "Deleted remote branch %s (was %s).\n"
2498msgstr ""
2499
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002500#: builtin/branch.c:264
Jiang Xinfe52cd62012-11-23 14:29:02 +08002501#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +08002502msgid "Deleted branch %s (was %s).\n"
2503msgstr ""
2504
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002505#: builtin/branch.c:366
Jiang Xindce37b62012-02-13 14:37:59 +08002506#, c-format
2507msgid "branch '%s' does not point at a commit"
2508msgstr ""
2509
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002510#: builtin/branch.c:453
Jiang Xindce37b62012-02-13 14:37:59 +08002511#, c-format
Jiang Xin93329722012-05-15 06:43:03 +08002512msgid "[%s: behind %d]"
Jiang Xindce37b62012-02-13 14:37:59 +08002513msgstr ""
2514
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002515#: builtin/branch.c:455
Jiang Xindce37b62012-02-13 14:37:59 +08002516#, c-format
Jiang Xin93329722012-05-15 06:43:03 +08002517msgid "[behind %d]"
Jiang Xindce37b62012-02-13 14:37:59 +08002518msgstr ""
2519
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002520#: builtin/branch.c:459
Jiang Xindce37b62012-02-13 14:37:59 +08002521#, c-format
Jiang Xin93329722012-05-15 06:43:03 +08002522msgid "[%s: ahead %d]"
Jiang Xindce37b62012-02-13 14:37:59 +08002523msgstr ""
2524
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002525#: builtin/branch.c:461
Jiang Xin93329722012-05-15 06:43:03 +08002526#, c-format
2527msgid "[ahead %d]"
2528msgstr ""
2529
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002530#: builtin/branch.c:464
Jiang Xin93329722012-05-15 06:43:03 +08002531#, c-format
2532msgid "[%s: ahead %d, behind %d]"
2533msgstr ""
2534
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002535#: builtin/branch.c:467
Jiang Xin93329722012-05-15 06:43:03 +08002536#, c-format
2537msgid "[ahead %d, behind %d]"
2538msgstr ""
2539
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002540#: builtin/branch.c:490
Jiang Xin9caaf232013-02-14 14:49:45 +08002541msgid " **** invalid ref ****"
2542msgstr ""
2543
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002544#: builtin/branch.c:582
Jiang Xinc138af52013-04-10 15:19:54 +08002545#, c-format
2546msgid "(no branch, rebasing %s)"
2547msgstr ""
2548
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002549#: builtin/branch.c:585
Jiang Xinc138af52013-04-10 15:19:54 +08002550#, c-format
2551msgid "(no branch, bisect started on %s)"
2552msgstr ""
2553
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002554#: builtin/branch.c:588
Jiang Xinc138af52013-04-10 15:19:54 +08002555#, c-format
2556msgid "(detached from %s)"
2557msgstr ""
2558
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002559#: builtin/branch.c:591
Jiang Xindce37b62012-02-13 14:37:59 +08002560msgid "(no branch)"
2561msgstr ""
2562
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002563#: builtin/branch.c:637
Jiang Xin9caaf232013-02-14 14:49:45 +08002564#, c-format
2565msgid "object '%s' does not point to a commit"
2566msgstr ""
2567
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002568#: builtin/branch.c:669
Jiang Xindce37b62012-02-13 14:37:59 +08002569msgid "some refs could not be read"
2570msgstr ""
2571
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002572#: builtin/branch.c:682
Jiang Xindce37b62012-02-13 14:37:59 +08002573msgid "cannot rename the current branch while not on any."
2574msgstr ""
2575
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002576#: builtin/branch.c:692
Jiang Xin2b911f82012-03-08 10:20:20 +08002577#, c-format
Jiang Xinfe52cd62012-11-23 14:29:02 +08002578msgid "Invalid branch name: '%s'"
2579msgstr ""
2580
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002581#: builtin/branch.c:707
Jiang Xinfe52cd62012-11-23 14:29:02 +08002582msgid "Branch rename failed"
2583msgstr ""
2584
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002585#: builtin/branch.c:711
Jiang Xinfe52cd62012-11-23 14:29:02 +08002586#, c-format
2587msgid "Renamed a misnamed branch '%s' away"
2588msgstr ""
2589
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002590#: builtin/branch.c:715
Jiang Xinfe52cd62012-11-23 14:29:02 +08002591#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08002592msgid "Branch renamed to %s, but HEAD is not updated!"
2593msgstr ""
2594
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002595#: builtin/branch.c:722
Jiang Xindce37b62012-02-13 14:37:59 +08002596msgid "Branch is renamed, but update of config-file failed"
2597msgstr ""
2598
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002599#: builtin/branch.c:737
Jiang Xindce37b62012-02-13 14:37:59 +08002600#, c-format
Jiang Xinc138af52013-04-10 15:19:54 +08002601msgid "malformed object name %s"
2602msgstr ""
2603
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002604#: builtin/branch.c:761
Jiang Xinc138af52013-04-10 15:19:54 +08002605#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +08002606msgid "could not write branch description template: %s"
Jiang Xindce37b62012-02-13 14:37:59 +08002607msgstr ""
2608
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002609#: builtin/branch.c:791
Jiang Xincc760112012-09-15 10:26:13 +08002610msgid "Generic options"
2611msgstr ""
2612
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002613#: builtin/branch.c:793
Jiang Xincc760112012-09-15 10:26:13 +08002614msgid "show hash and subject, give twice for upstream branch"
2615msgstr ""
2616
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002617#: builtin/branch.c:794
Jiang Xincc760112012-09-15 10:26:13 +08002618msgid "suppress informational messages"
2619msgstr ""
2620
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002621#: builtin/branch.c:795
Jiang Xincc760112012-09-15 10:26:13 +08002622msgid "set up tracking mode (see git-pull(1))"
2623msgstr ""
2624
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002625#: builtin/branch.c:797
Jiang Xincc760112012-09-15 10:26:13 +08002626msgid "change upstream info"
2627msgstr ""
2628
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002629#: builtin/branch.c:801
Jiang Xincc760112012-09-15 10:26:13 +08002630msgid "use colored output"
2631msgstr ""
2632
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002633#: builtin/branch.c:802
Jiang Xincc760112012-09-15 10:26:13 +08002634msgid "act on remote-tracking branches"
2635msgstr ""
2636
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002637#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
Jiang Xinb8ecf232013-08-06 14:13:23 +08002638#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434
2639#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468
Jiang Xincc760112012-09-15 10:26:13 +08002640msgid "commit"
2641msgstr ""
2642
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002643#: builtin/branch.c:806 builtin/branch.c:812
Jiang Xincc760112012-09-15 10:26:13 +08002644msgid "print only branches that contain the commit"
2645msgstr ""
2646
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002647#: builtin/branch.c:818
Jiang Xincc760112012-09-15 10:26:13 +08002648msgid "Specific git-branch actions:"
2649msgstr ""
2650
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002651#: builtin/branch.c:819
Jiang Xincc760112012-09-15 10:26:13 +08002652msgid "list both remote-tracking and local branches"
2653msgstr ""
2654
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002655#: builtin/branch.c:821
Jiang Xincc760112012-09-15 10:26:13 +08002656msgid "delete fully merged branch"
2657msgstr ""
2658
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002659#: builtin/branch.c:822
Jiang Xincc760112012-09-15 10:26:13 +08002660msgid "delete branch (even if not merged)"
2661msgstr ""
2662
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002663#: builtin/branch.c:823
Jiang Xincc760112012-09-15 10:26:13 +08002664msgid "move/rename a branch and its reflog"
2665msgstr ""
2666
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002667#: builtin/branch.c:824
Jiang Xincc760112012-09-15 10:26:13 +08002668msgid "move/rename a branch, even if target exists"
2669msgstr ""
2670
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002671#: builtin/branch.c:825
Jiang Xincc760112012-09-15 10:26:13 +08002672msgid "list branch names"
2673msgstr ""
2674
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002675#: builtin/branch.c:826
Jiang Xincc760112012-09-15 10:26:13 +08002676msgid "create the branch's reflog"
2677msgstr ""
2678
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002679#: builtin/branch.c:828
Jiang Xincc760112012-09-15 10:26:13 +08002680msgid "edit the description for the branch"
2681msgstr ""
2682
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002683#: builtin/branch.c:829
Jiang Xincc760112012-09-15 10:26:13 +08002684msgid "force creation (when already exists)"
2685msgstr ""
2686
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002687#: builtin/branch.c:832
Jiang Xincc760112012-09-15 10:26:13 +08002688msgid "print only not merged branches"
2689msgstr ""
2690
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002691#: builtin/branch.c:838
Jiang Xincc760112012-09-15 10:26:13 +08002692msgid "print only merged branches"
2693msgstr ""
2694
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002695#: builtin/branch.c:842
Jiang Xincc760112012-09-15 10:26:13 +08002696msgid "list branches in columns"
2697msgstr ""
2698
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002699#: builtin/branch.c:855
Jiang Xindce37b62012-02-13 14:37:59 +08002700msgid "Failed to resolve HEAD as a valid ref."
2701msgstr ""
2702
Jiang Xin28b3cff2013-07-26 08:56:45 +08002703#: builtin/branch.c:860 builtin/clone.c:630
Jiang Xindce37b62012-02-13 14:37:59 +08002704msgid "HEAD not found below refs/heads!"
2705msgstr ""
2706
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002707#: builtin/branch.c:883
Jiang Xin822e4a62012-05-08 16:10:22 +08002708msgid "--column and --verbose are incompatible"
2709msgstr ""
2710
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002711#: builtin/branch.c:889 builtin/branch.c:928
Jiang Xin9caaf232013-02-14 14:49:45 +08002712msgid "branch name required"
2713msgstr ""
2714
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002715#: builtin/branch.c:904
Jiang Xin9caaf232013-02-14 14:49:45 +08002716msgid "Cannot give description to detached HEAD"
2717msgstr ""
2718
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002719#: builtin/branch.c:909
Jiang Xin9caaf232013-02-14 14:49:45 +08002720msgid "cannot edit description of more than one branch"
2721msgstr ""
2722
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002723#: builtin/branch.c:916
Jiang Xin9caaf232013-02-14 14:49:45 +08002724#, c-format
2725msgid "No commit on branch '%s' yet."
2726msgstr ""
2727
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002728#: builtin/branch.c:919
Jiang Xin9caaf232013-02-14 14:49:45 +08002729#, c-format
2730msgid "No branch named '%s'."
2731msgstr ""
2732
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002733#: builtin/branch.c:934
Jiang Xin9caaf232013-02-14 14:49:45 +08002734msgid "too many branches for a rename operation"
2735msgstr ""
2736
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002737#: builtin/branch.c:939
Jiang Xinc138af52013-04-10 15:19:54 +08002738msgid "too many branches to set new upstream"
2739msgstr ""
2740
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002741#: builtin/branch.c:943
Jiang Xinc138af52013-04-10 15:19:54 +08002742#, c-format
2743msgid ""
2744"could not set upstream of HEAD to %s when it does not point to any branch."
2745msgstr ""
2746
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002747#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
Jiang Xinc138af52013-04-10 15:19:54 +08002748#, c-format
2749msgid "no such branch '%s'"
2750msgstr ""
2751
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002752#: builtin/branch.c:950
Jiang Xincc760112012-09-15 10:26:13 +08002753#, c-format
2754msgid "branch '%s' does not exist"
2755msgstr ""
2756
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002757#: builtin/branch.c:962
Jiang Xinc138af52013-04-10 15:19:54 +08002758msgid "too many branches to unset upstream"
2759msgstr ""
2760
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002761#: builtin/branch.c:966
Jiang Xinc138af52013-04-10 15:19:54 +08002762msgid "could not unset upstream of HEAD when it does not point to any branch."
2763msgstr ""
2764
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002765#: builtin/branch.c:972
Jiang Xincc760112012-09-15 10:26:13 +08002766#, c-format
2767msgid "Branch '%s' has no upstream information"
2768msgstr ""
2769
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002770#: builtin/branch.c:987
Jiang Xinc138af52013-04-10 15:19:54 +08002771msgid "it does not make sense to create 'HEAD' manually"
2772msgstr ""
2773
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002774#: builtin/branch.c:993
Jiang Xindce37b62012-02-13 14:37:59 +08002775msgid "-a and -r options to 'git branch' do not make sense with a branch name"
2776msgstr ""
2777
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002778#: builtin/branch.c:996
Jiang Xincc760112012-09-15 10:26:13 +08002779#, c-format
2780msgid ""
2781"The --set-upstream flag is deprecated and will be removed. Consider using --"
2782"track or --set-upstream-to\n"
2783msgstr ""
2784
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002785#: builtin/branch.c:1013
Jiang Xincc760112012-09-15 10:26:13 +08002786#, c-format
2787msgid ""
2788"\n"
2789"If you wanted to make '%s' track '%s', do this:\n"
2790"\n"
2791msgstr ""
2792
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002793#: builtin/branch.c:1014
Jiang Xincc760112012-09-15 10:26:13 +08002794#, c-format
2795msgid " git branch -d %s\n"
2796msgstr ""
2797
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002798#: builtin/branch.c:1015
Jiang Xincc760112012-09-15 10:26:13 +08002799#, c-format
2800msgid " git branch --set-upstream-to %s\n"
2801msgstr ""
2802
Jiang Xindce37b62012-02-13 14:37:59 +08002803#: builtin/bundle.c:47
2804#, c-format
2805msgid "%s is okay\n"
2806msgstr ""
2807
2808#: builtin/bundle.c:56
2809msgid "Need a repository to create a bundle."
2810msgstr ""
2811
2812#: builtin/bundle.c:60
2813msgid "Need a repository to unbundle."
2814msgstr ""
2815
Jiang Xinb8ecf232013-08-06 14:13:23 +08002816#: builtin/cat-file.c:285
Jiang Xincc760112012-09-15 10:26:13 +08002817msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2818msgstr ""
2819
Jiang Xinb8ecf232013-08-06 14:13:23 +08002820#: builtin/cat-file.c:286
Jiang Xincc760112012-09-15 10:26:13 +08002821msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2822msgstr ""
2823
Jiang Xinb8ecf232013-08-06 14:13:23 +08002824#: builtin/cat-file.c:323
Jiang Xincc760112012-09-15 10:26:13 +08002825msgid "<type> can be one of: blob, tree, commit, tag"
2826msgstr ""
2827
Jiang Xinb8ecf232013-08-06 14:13:23 +08002828#: builtin/cat-file.c:324
Jiang Xincc760112012-09-15 10:26:13 +08002829msgid "show object type"
2830msgstr ""
2831
Jiang Xinb8ecf232013-08-06 14:13:23 +08002832#: builtin/cat-file.c:325
Jiang Xincc760112012-09-15 10:26:13 +08002833msgid "show object size"
2834msgstr ""
2835
Jiang Xinb8ecf232013-08-06 14:13:23 +08002836#: builtin/cat-file.c:327
Jiang Xincc760112012-09-15 10:26:13 +08002837msgid "exit with zero when there's no error"
2838msgstr ""
2839
Jiang Xinb8ecf232013-08-06 14:13:23 +08002840#: builtin/cat-file.c:328
Jiang Xincc760112012-09-15 10:26:13 +08002841msgid "pretty-print object's content"
2842msgstr ""
2843
Jiang Xinb8ecf232013-08-06 14:13:23 +08002844#: builtin/cat-file.c:330
Jiang Xincc760112012-09-15 10:26:13 +08002845msgid "for blob objects, run textconv on object's content"
2846msgstr ""
2847
Jiang Xinb8ecf232013-08-06 14:13:23 +08002848#: builtin/cat-file.c:332
Jiang Xincc760112012-09-15 10:26:13 +08002849msgid "show info and content of objects fed from the standard input"
2850msgstr ""
2851
Jiang Xinb8ecf232013-08-06 14:13:23 +08002852#: builtin/cat-file.c:335
Jiang Xincc760112012-09-15 10:26:13 +08002853msgid "show info about objects fed from the standard input"
2854msgstr ""
2855
2856#: builtin/check-attr.c:11
2857msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2858msgstr ""
2859
2860#: builtin/check-attr.c:12
Jiang Xin9306b5b2012-10-16 08:39:10 +08002861msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
Jiang Xincc760112012-09-15 10:26:13 +08002862msgstr ""
2863
2864#: builtin/check-attr.c:19
2865msgid "report all attributes set on file"
2866msgstr ""
2867
2868#: builtin/check-attr.c:20
2869msgid "use .gitattributes only from the index"
2870msgstr ""
2871
Jiang Xin9caaf232013-02-14 14:49:45 +08002872#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
Jiang Xincc760112012-09-15 10:26:13 +08002873msgid "read file names from stdin"
2874msgstr ""
2875
Jiang Xin9caaf232013-02-14 14:49:45 +08002876#: builtin/check-attr.c:23 builtin/check-ignore.c:24
Jiang Xincc760112012-09-15 10:26:13 +08002877msgid "input paths are terminated by a null character"
2878msgstr ""
2879
Jiang Xin28b3cff2013-07-26 08:56:45 +08002880#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177
Jiang Xin9caaf232013-02-14 14:49:45 +08002881msgid "suppress progress reporting"
2882msgstr ""
2883
Jiang Xin28b3cff2013-07-26 08:56:45 +08002884#: builtin/check-ignore.c:26
2885msgid "show non-matching input paths"
2886msgstr ""
2887
2888#: builtin/check-ignore.c:143
Jiang Xin9caaf232013-02-14 14:49:45 +08002889msgid "cannot specify pathnames with --stdin"
2890msgstr ""
2891
Jiang Xin28b3cff2013-07-26 08:56:45 +08002892#: builtin/check-ignore.c:146
Jiang Xin9caaf232013-02-14 14:49:45 +08002893msgid "-z only makes sense with --stdin"
2894msgstr ""
2895
Jiang Xin28b3cff2013-07-26 08:56:45 +08002896#: builtin/check-ignore.c:148
Jiang Xin9caaf232013-02-14 14:49:45 +08002897msgid "no path specified"
2898msgstr ""
2899
Jiang Xin28b3cff2013-07-26 08:56:45 +08002900#: builtin/check-ignore.c:152
Jiang Xin9caaf232013-02-14 14:49:45 +08002901msgid "--quiet is only valid with a single pathname"
2902msgstr ""
2903
Jiang Xin28b3cff2013-07-26 08:56:45 +08002904#: builtin/check-ignore.c:154
Jiang Xin9caaf232013-02-14 14:49:45 +08002905msgid "cannot have both --quiet and --verbose"
2906msgstr ""
2907
Jiang Xin28b3cff2013-07-26 08:56:45 +08002908#: builtin/check-ignore.c:157
2909msgid "--non-matching is only valid with --verbose"
2910msgstr ""
2911
2912#: builtin/check-mailmap.c:8
2913msgid "git check-mailmap [options] <contact>..."
2914msgstr ""
2915
2916#: builtin/check-mailmap.c:13
2917msgid "also read contacts from stdin"
2918msgstr ""
2919
2920#: builtin/check-mailmap.c:24
2921#, c-format
2922msgid "unable to parse contact: %s"
2923msgstr ""
2924
2925#: builtin/check-mailmap.c:47
2926msgid "no contacts specified"
2927msgstr ""
2928
Jiang Xincc760112012-09-15 10:26:13 +08002929#: builtin/checkout-index.c:126
2930msgid "git checkout-index [options] [--] [<file>...]"
2931msgstr ""
2932
2933#: builtin/checkout-index.c:187
2934msgid "check out all files in the index"
2935msgstr ""
2936
2937#: builtin/checkout-index.c:188
2938msgid "force overwrite of existing files"
2939msgstr ""
2940
2941#: builtin/checkout-index.c:190
2942msgid "no warning for existing files and files not in index"
2943msgstr ""
2944
2945#: builtin/checkout-index.c:192
2946msgid "don't checkout new files"
2947msgstr ""
2948
2949#: builtin/checkout-index.c:194
2950msgid "update stat information in the index file"
2951msgstr ""
2952
2953#: builtin/checkout-index.c:200
2954msgid "read list of paths from the standard input"
2955msgstr ""
2956
2957#: builtin/checkout-index.c:202
2958msgid "write the content to temporary files"
2959msgstr ""
2960
2961#: builtin/checkout-index.c:203 builtin/column.c:30
2962msgid "string"
2963msgstr ""
2964
2965#: builtin/checkout-index.c:204
2966msgid "when creating files, prepend <string>"
2967msgstr ""
2968
2969#: builtin/checkout-index.c:207
2970msgid "copy out the files from named stage"
2971msgstr ""
2972
2973#: builtin/checkout.c:25
2974msgid "git checkout [options] <branch>"
2975msgstr ""
2976
2977#: builtin/checkout.c:26
2978msgid "git checkout [options] [<branch>] -- <file>..."
Jiang Xindce37b62012-02-13 14:37:59 +08002979msgstr ""
2980
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002981#: builtin/checkout.c:117 builtin/checkout.c:150
Jiang Xindce37b62012-02-13 14:37:59 +08002982#, c-format
Jiang Xincc760112012-09-15 10:26:13 +08002983msgid "path '%s' does not have our version"
2984msgstr ""
2985
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002986#: builtin/checkout.c:119 builtin/checkout.c:152
Jiang Xincc760112012-09-15 10:26:13 +08002987#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08002988msgid "path '%s' does not have their version"
2989msgstr ""
2990
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002991#: builtin/checkout.c:135
Jiang Xindce37b62012-02-13 14:37:59 +08002992#, c-format
2993msgid "path '%s' does not have all necessary versions"
2994msgstr ""
2995
Jiang Xinc6bc7d42013-04-30 08:31:19 +08002996#: builtin/checkout.c:179
Jiang Xindce37b62012-02-13 14:37:59 +08002997#, c-format
2998msgid "path '%s' does not have necessary versions"
2999msgstr ""
3000
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003001#: builtin/checkout.c:196
Jiang Xindce37b62012-02-13 14:37:59 +08003002#, c-format
3003msgid "path '%s': cannot merge"
3004msgstr ""
3005
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003006#: builtin/checkout.c:213
Jiang Xindce37b62012-02-13 14:37:59 +08003007#, c-format
3008msgid "Unable to add merge result for '%s'"
3009msgstr ""
3010
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003011#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
3012#: builtin/checkout.c:246
Jiang Xincc760112012-09-15 10:26:13 +08003013#, c-format
3014msgid "'%s' cannot be used with updating paths"
3015msgstr ""
3016
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003017#: builtin/checkout.c:249 builtin/checkout.c:252
Jiang Xincc760112012-09-15 10:26:13 +08003018#, c-format
3019msgid "'%s' cannot be used with %s"
3020msgstr ""
3021
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003022#: builtin/checkout.c:255
Jiang Xincc760112012-09-15 10:26:13 +08003023#, c-format
3024msgid "Cannot update paths and switch to branch '%s' at the same time."
3025msgstr ""
3026
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003027#: builtin/checkout.c:266 builtin/checkout.c:458
Jiang Xindce37b62012-02-13 14:37:59 +08003028msgid "corrupt index file"
3029msgstr ""
3030
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003031#: builtin/checkout.c:329 builtin/checkout.c:336
Jiang Xindce37b62012-02-13 14:37:59 +08003032#, c-format
3033msgid "path '%s' is unmerged"
3034msgstr ""
3035
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003036#: builtin/checkout.c:480
Jiang Xindce37b62012-02-13 14:37:59 +08003037msgid "you need to resolve your current index first"
3038msgstr ""
3039
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003040#: builtin/checkout.c:601
Jiang Xindce37b62012-02-13 14:37:59 +08003041#, c-format
3042msgid "Can not do reflog for '%s'\n"
3043msgstr ""
3044
Jiang Xin28b3cff2013-07-26 08:56:45 +08003045#: builtin/checkout.c:639
Jiang Xindce37b62012-02-13 14:37:59 +08003046msgid "HEAD is now at"
3047msgstr ""
3048
Jiang Xin28b3cff2013-07-26 08:56:45 +08003049#: builtin/checkout.c:646
Jiang Xindce37b62012-02-13 14:37:59 +08003050#, c-format
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003051msgid "Reset branch '%s'\n"
3052msgstr ""
3053
Jiang Xin28b3cff2013-07-26 08:56:45 +08003054#: builtin/checkout.c:649
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003055#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08003056msgid "Already on '%s'\n"
3057msgstr ""
3058
Jiang Xin28b3cff2013-07-26 08:56:45 +08003059#: builtin/checkout.c:653
Jiang Xindce37b62012-02-13 14:37:59 +08003060#, c-format
3061msgid "Switched to and reset branch '%s'\n"
3062msgstr ""
3063
Jiang Xin28b3cff2013-07-26 08:56:45 +08003064#: builtin/checkout.c:655 builtin/checkout.c:997
Jiang Xindce37b62012-02-13 14:37:59 +08003065#, c-format
3066msgid "Switched to a new branch '%s'\n"
3067msgstr ""
3068
Jiang Xin28b3cff2013-07-26 08:56:45 +08003069#: builtin/checkout.c:657
Jiang Xindce37b62012-02-13 14:37:59 +08003070#, c-format
3071msgid "Switched to branch '%s'\n"
3072msgstr ""
3073
Jiang Xin28b3cff2013-07-26 08:56:45 +08003074#: builtin/checkout.c:713
Jiang Xindce37b62012-02-13 14:37:59 +08003075#, c-format
3076msgid " ... and %d more.\n"
3077msgstr ""
3078
3079#. The singular version
Jiang Xin28b3cff2013-07-26 08:56:45 +08003080#: builtin/checkout.c:719
Jiang Xindce37b62012-02-13 14:37:59 +08003081#, c-format
3082msgid ""
3083"Warning: you are leaving %d commit behind, not connected to\n"
3084"any of your branches:\n"
3085"\n"
3086"%s\n"
3087msgid_plural ""
3088"Warning: you are leaving %d commits behind, not connected to\n"
3089"any of your branches:\n"
3090"\n"
3091"%s\n"
3092msgstr[0] ""
3093msgstr[1] ""
3094
Jiang Xin28b3cff2013-07-26 08:56:45 +08003095#: builtin/checkout.c:737
Jiang Xindce37b62012-02-13 14:37:59 +08003096#, c-format
3097msgid ""
3098"If you want to keep them by creating a new branch, this may be a good time\n"
3099"to do so with:\n"
3100"\n"
3101" git branch new_branch_name %s\n"
3102"\n"
3103msgstr ""
3104
Jiang Xin28b3cff2013-07-26 08:56:45 +08003105#: builtin/checkout.c:767
Jiang Xindce37b62012-02-13 14:37:59 +08003106msgid "internal error in revision walk"
3107msgstr ""
3108
Jiang Xin28b3cff2013-07-26 08:56:45 +08003109#: builtin/checkout.c:771
Jiang Xindce37b62012-02-13 14:37:59 +08003110msgid "Previous HEAD position was"
3111msgstr ""
3112
Jiang Xin28b3cff2013-07-26 08:56:45 +08003113#: builtin/checkout.c:798 builtin/checkout.c:992
Jiang Xindce37b62012-02-13 14:37:59 +08003114msgid "You are on a branch yet to be born"
3115msgstr ""
3116
3117#. case (1)
Jiang Xin28b3cff2013-07-26 08:56:45 +08003118#: builtin/checkout.c:928
Jiang Xindce37b62012-02-13 14:37:59 +08003119#, c-format
3120msgid "invalid reference: %s"
3121msgstr ""
3122
3123#. case (1): want a tree
Jiang Xin28b3cff2013-07-26 08:56:45 +08003124#: builtin/checkout.c:967
Jiang Xindce37b62012-02-13 14:37:59 +08003125#, c-format
3126msgid "reference is not a tree: %s"
3127msgstr ""
3128
Jiang Xin28b3cff2013-07-26 08:56:45 +08003129#: builtin/checkout.c:1006
Jiang Xincc760112012-09-15 10:26:13 +08003130msgid "paths cannot be used with switching branches"
Jiang Xindce37b62012-02-13 14:37:59 +08003131msgstr ""
3132
Jiang Xin28b3cff2013-07-26 08:56:45 +08003133#: builtin/checkout.c:1009 builtin/checkout.c:1013
Jiang Xincc760112012-09-15 10:26:13 +08003134#, c-format
3135msgid "'%s' cannot be used with switching branches"
3136msgstr ""
3137
Jiang Xin28b3cff2013-07-26 08:56:45 +08003138#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025
3139#: builtin/checkout.c:1028
Jiang Xincc760112012-09-15 10:26:13 +08003140#, c-format
3141msgid "'%s' cannot be used with '%s'"
Jiang Xindce37b62012-02-13 14:37:59 +08003142msgstr ""
3143
Jiang Xin28b3cff2013-07-26 08:56:45 +08003144#: builtin/checkout.c:1033
Jiang Xincc760112012-09-15 10:26:13 +08003145#, c-format
3146msgid "Cannot switch branch to a non-commit '%s'"
Jiang Xindce37b62012-02-13 14:37:59 +08003147msgstr ""
3148
Jiang Xin28b3cff2013-07-26 08:56:45 +08003149#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89
Jiang Xincc760112012-09-15 10:26:13 +08003150#: builtin/remote.c:169 builtin/remote.c:171
3151msgid "branch"
Jiang Xindce37b62012-02-13 14:37:59 +08003152msgstr ""
3153
Jiang Xin28b3cff2013-07-26 08:56:45 +08003154#: builtin/checkout.c:1056
Jiang Xincc760112012-09-15 10:26:13 +08003155msgid "create and checkout a new branch"
3156msgstr ""
3157
Jiang Xin28b3cff2013-07-26 08:56:45 +08003158#: builtin/checkout.c:1058
Jiang Xincc760112012-09-15 10:26:13 +08003159msgid "create/reset and checkout a branch"
3160msgstr ""
3161
Jiang Xin28b3cff2013-07-26 08:56:45 +08003162#: builtin/checkout.c:1059
Jiang Xincc760112012-09-15 10:26:13 +08003163msgid "create reflog for new branch"
3164msgstr ""
3165
Jiang Xin28b3cff2013-07-26 08:56:45 +08003166#: builtin/checkout.c:1060
Jiang Xincc760112012-09-15 10:26:13 +08003167msgid "detach the HEAD at named commit"
3168msgstr ""
3169
Jiang Xin28b3cff2013-07-26 08:56:45 +08003170#: builtin/checkout.c:1061
Jiang Xincc760112012-09-15 10:26:13 +08003171msgid "set upstream info for new branch"
3172msgstr ""
3173
Jiang Xin28b3cff2013-07-26 08:56:45 +08003174#: builtin/checkout.c:1063
Jiang Xincc760112012-09-15 10:26:13 +08003175msgid "new branch"
3176msgstr ""
3177
Jiang Xin28b3cff2013-07-26 08:56:45 +08003178#: builtin/checkout.c:1063
Jiang Xincc760112012-09-15 10:26:13 +08003179msgid "new unparented branch"
3180msgstr ""
3181
Jiang Xin28b3cff2013-07-26 08:56:45 +08003182#: builtin/checkout.c:1064
Jiang Xincc760112012-09-15 10:26:13 +08003183msgid "checkout our version for unmerged files"
Jiang Xindce37b62012-02-13 14:37:59 +08003184msgstr ""
3185
Jiang Xin28b3cff2013-07-26 08:56:45 +08003186#: builtin/checkout.c:1066
Jiang Xincc760112012-09-15 10:26:13 +08003187msgid "checkout their version for unmerged files"
Jiang Xindce37b62012-02-13 14:37:59 +08003188msgstr ""
3189
Jiang Xin28b3cff2013-07-26 08:56:45 +08003190#: builtin/checkout.c:1068
Jiang Xincc760112012-09-15 10:26:13 +08003191msgid "force checkout (throw away local modifications)"
3192msgstr ""
3193
Jiang Xin28b3cff2013-07-26 08:56:45 +08003194#: builtin/checkout.c:1069
Jiang Xincc760112012-09-15 10:26:13 +08003195msgid "perform a 3-way merge with the new branch"
3196msgstr ""
3197
Jiang Xin28b3cff2013-07-26 08:56:45 +08003198#: builtin/checkout.c:1070 builtin/merge.c:232
Jiang Xincc760112012-09-15 10:26:13 +08003199msgid "update ignored files (default)"
3200msgstr ""
3201
Jiang Xin28b3cff2013-07-26 08:56:45 +08003202#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249
Jiang Xincc760112012-09-15 10:26:13 +08003203msgid "style"
3204msgstr ""
3205
Jiang Xin28b3cff2013-07-26 08:56:45 +08003206#: builtin/checkout.c:1072
Jiang Xincc760112012-09-15 10:26:13 +08003207msgid "conflict style (merge or diff3)"
3208msgstr ""
3209
Jiang Xin28b3cff2013-07-26 08:56:45 +08003210#: builtin/checkout.c:1075
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003211msgid "do not limit pathspecs to sparse entries only"
3212msgstr ""
3213
Jiang Xin28b3cff2013-07-26 08:56:45 +08003214#: builtin/checkout.c:1077
Jiang Xincc760112012-09-15 10:26:13 +08003215msgid "second guess 'git checkout no-such-branch'"
3216msgstr ""
3217
Jiang Xin28b3cff2013-07-26 08:56:45 +08003218#: builtin/checkout.c:1101
Jiang Xincc760112012-09-15 10:26:13 +08003219msgid "-b, -B and --orphan are mutually exclusive"
3220msgstr ""
3221
Jiang Xin28b3cff2013-07-26 08:56:45 +08003222#: builtin/checkout.c:1118
Jiang Xincc760112012-09-15 10:26:13 +08003223msgid "--track needs a branch name"
3224msgstr ""
3225
Jiang Xin28b3cff2013-07-26 08:56:45 +08003226#: builtin/checkout.c:1125
Jiang Xincc760112012-09-15 10:26:13 +08003227msgid "Missing branch name; try -b"
3228msgstr ""
3229
Jiang Xin28b3cff2013-07-26 08:56:45 +08003230#: builtin/checkout.c:1160
Jiang Xindce37b62012-02-13 14:37:59 +08003231msgid "invalid path specification"
3232msgstr ""
3233
Jiang Xin28b3cff2013-07-26 08:56:45 +08003234#: builtin/checkout.c:1167
Jiang Xindce37b62012-02-13 14:37:59 +08003235#, c-format
3236msgid ""
Jiang Xincc760112012-09-15 10:26:13 +08003237"Cannot update paths and switch to branch '%s' at the same time.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08003238"Did you intend to checkout '%s' which can not be resolved as commit?"
3239msgstr ""
3240
Jiang Xin28b3cff2013-07-26 08:56:45 +08003241#: builtin/checkout.c:1172
Jiang Xincc760112012-09-15 10:26:13 +08003242#, c-format
3243msgid "git checkout: --detach does not take a path argument '%s'"
Jiang Xindce37b62012-02-13 14:37:59 +08003244msgstr ""
3245
Jiang Xin28b3cff2013-07-26 08:56:45 +08003246#: builtin/checkout.c:1176
Jiang Xindce37b62012-02-13 14:37:59 +08003247msgid ""
3248"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3249"checking out of the index."
3250msgstr ""
3251
Jiang Xin28b3cff2013-07-26 08:56:45 +08003252#: builtin/clean.c:25
3253msgid ""
3254"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
Jiang Xindce37b62012-02-13 14:37:59 +08003255msgstr ""
3256
Jiang Xin28b3cff2013-07-26 08:56:45 +08003257#: builtin/clean.c:29
Jiang Xindce37b62012-02-13 14:37:59 +08003258#, c-format
3259msgid "Removing %s\n"
3260msgstr ""
3261
Jiang Xin28b3cff2013-07-26 08:56:45 +08003262#: builtin/clean.c:30
Jiang Xin46bc4032013-01-25 12:33:58 +08003263#, c-format
3264msgid "Would remove %s\n"
3265msgstr ""
3266
Jiang Xin28b3cff2013-07-26 08:56:45 +08003267#: builtin/clean.c:31
Jiang Xin46bc4032013-01-25 12:33:58 +08003268#, c-format
3269msgid "Skipping repository %s\n"
3270msgstr ""
3271
Jiang Xin28b3cff2013-07-26 08:56:45 +08003272#: builtin/clean.c:32
Jiang Xin46bc4032013-01-25 12:33:58 +08003273#, c-format
3274msgid "Would skip repository %s\n"
3275msgstr ""
3276
Jiang Xin28b3cff2013-07-26 08:56:45 +08003277#: builtin/clean.c:33
Jiang Xindce37b62012-02-13 14:37:59 +08003278#, c-format
3279msgid "failed to remove %s"
3280msgstr ""
3281
Jiang Xin28b3cff2013-07-26 08:56:45 +08003282#: builtin/clean.c:293
3283msgid ""
3284"Prompt help:\n"
3285"1 - select a numbered item\n"
3286"foo - select item based on unique prefix\n"
3287" - (empty) select nothing"
3288msgstr ""
3289
3290#: builtin/clean.c:297
3291msgid ""
3292"Prompt help:\n"
3293"1 - select a single item\n"
3294"3-5 - select a range of items\n"
3295"2-3,6-9 - select multiple ranges\n"
3296"foo - select item based on unique prefix\n"
3297"-... - unselect specified items\n"
3298"* - choose all items\n"
3299" - (empty) finish selecting"
3300msgstr ""
3301
Jiang Xinb8ecf232013-08-06 14:13:23 +08003302#: builtin/clean.c:515
Jiang Xin28b3cff2013-07-26 08:56:45 +08003303#, c-format
3304msgid "Huh (%s)?"
3305msgstr ""
3306
Jiang Xinb8ecf232013-08-06 14:13:23 +08003307#: builtin/clean.c:658
Jiang Xin28b3cff2013-07-26 08:56:45 +08003308#, c-format
3309msgid "Input ignore patterns>> "
3310msgstr ""
3311
Jiang Xinb8ecf232013-08-06 14:13:23 +08003312#: builtin/clean.c:695
Jiang Xin28b3cff2013-07-26 08:56:45 +08003313#, c-format
3314msgid "WARNING: Cannot find items matched by: %s"
3315msgstr ""
3316
Jiang Xinb8ecf232013-08-06 14:13:23 +08003317#: builtin/clean.c:716
Jiang Xin28b3cff2013-07-26 08:56:45 +08003318msgid "Select items to delete"
3319msgstr ""
3320
Jiang Xinb8ecf232013-08-06 14:13:23 +08003321#: builtin/clean.c:756
Jiang Xin28b3cff2013-07-26 08:56:45 +08003322#, c-format
3323msgid "remove %s? "
3324msgstr ""
3325
Jiang Xinb8ecf232013-08-06 14:13:23 +08003326#: builtin/clean.c:781
Jiang Xin28b3cff2013-07-26 08:56:45 +08003327msgid "Bye."
3328msgstr ""
3329
Jiang Xinb8ecf232013-08-06 14:13:23 +08003330#: builtin/clean.c:789
Jiang Xin28b3cff2013-07-26 08:56:45 +08003331msgid ""
3332"clean - start cleaning\n"
3333"filter by pattern - exclude items from deletion\n"
3334"select by numbers - select items to be deleted by numbers\n"
3335"ask each - confirm each deletion (like \"rm -i\")\n"
3336"quit - stop cleaning\n"
3337"help - this screen\n"
3338"? - help for prompt selection"
3339msgstr ""
3340
Jiang Xinb8ecf232013-08-06 14:13:23 +08003341#: builtin/clean.c:816
Jiang Xin28b3cff2013-07-26 08:56:45 +08003342msgid "*** Commands ***"
3343msgstr ""
3344
Jiang Xinb8ecf232013-08-06 14:13:23 +08003345#: builtin/clean.c:817
Jiang Xin28b3cff2013-07-26 08:56:45 +08003346msgid "What now"
3347msgstr ""
3348
Jiang Xinb8ecf232013-08-06 14:13:23 +08003349#: builtin/clean.c:825
Jiang Xin28b3cff2013-07-26 08:56:45 +08003350msgid "Would remove the following item:"
3351msgid_plural "Would remove the following items:"
3352msgstr[0] ""
3353msgstr[1] ""
3354
Jiang Xinb8ecf232013-08-06 14:13:23 +08003355#: builtin/clean.c:842
Jiang Xin28b3cff2013-07-26 08:56:45 +08003356msgid "No more files to clean, exiting."
3357msgstr ""
3358
Jiang Xinb8ecf232013-08-06 14:13:23 +08003359#: builtin/clean.c:874
Jiang Xin46bc4032013-01-25 12:33:58 +08003360msgid "do not print names of files removed"
3361msgstr ""
3362
Jiang Xinb8ecf232013-08-06 14:13:23 +08003363#: builtin/clean.c:876
Jiang Xin46bc4032013-01-25 12:33:58 +08003364msgid "force"
3365msgstr ""
3366
Jiang Xinb8ecf232013-08-06 14:13:23 +08003367#: builtin/clean.c:877
Jiang Xin28b3cff2013-07-26 08:56:45 +08003368msgid "interactive cleaning"
3369msgstr ""
3370
Jiang Xinb8ecf232013-08-06 14:13:23 +08003371#: builtin/clean.c:879
Jiang Xin46bc4032013-01-25 12:33:58 +08003372msgid "remove whole directories"
3373msgstr ""
3374
Jiang Xinb8ecf232013-08-06 14:13:23 +08003375#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716
Jiang Xin28b3cff2013-07-26 08:56:45 +08003376#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186
Jiang Xin46bc4032013-01-25 12:33:58 +08003377msgid "pattern"
3378msgstr ""
3379
Jiang Xinb8ecf232013-08-06 14:13:23 +08003380#: builtin/clean.c:881
Jiang Xin46bc4032013-01-25 12:33:58 +08003381msgid "add <pattern> to ignore rules"
3382msgstr ""
3383
Jiang Xinb8ecf232013-08-06 14:13:23 +08003384#: builtin/clean.c:882
Jiang Xin46bc4032013-01-25 12:33:58 +08003385msgid "remove ignored files, too"
Jiang Xindce37b62012-02-13 14:37:59 +08003386msgstr ""
3387
Jiang Xinb8ecf232013-08-06 14:13:23 +08003388#: builtin/clean.c:884
Jiang Xin46bc4032013-01-25 12:33:58 +08003389msgid "remove only ignored files"
3390msgstr ""
3391
Jiang Xinb8ecf232013-08-06 14:13:23 +08003392#: builtin/clean.c:902
Jiang Xin46bc4032013-01-25 12:33:58 +08003393msgid "-x and -X cannot be used together"
3394msgstr ""
3395
Jiang Xinb8ecf232013-08-06 14:13:23 +08003396#: builtin/clean.c:906
Jiang Xin46bc4032013-01-25 12:33:58 +08003397msgid ""
Jiang Xin28b3cff2013-07-26 08:56:45 +08003398"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "
Jiang Xin46bc4032013-01-25 12:33:58 +08003399"clean"
Jiang Xindce37b62012-02-13 14:37:59 +08003400msgstr ""
3401
Jiang Xinb8ecf232013-08-06 14:13:23 +08003402#: builtin/clean.c:909
Jiang Xin28b3cff2013-07-26 08:56:45 +08003403msgid ""
3404"clean.requireForce defaults to true and neither -i, -n nor -f given; "
3405"refusing to clean"
3406msgstr ""
3407
3408#: builtin/clone.c:36
Jiang Xincc760112012-09-15 10:26:13 +08003409msgid "git clone [options] [--] <repo> [<dir>]"
3410msgstr ""
3411
Jiang Xin28b3cff2013-07-26 08:56:45 +08003412#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229
3413#: builtin/push.c:462
Jiang Xincc760112012-09-15 10:26:13 +08003414msgid "force progress reporting"
3415msgstr ""
3416
Jiang Xin28b3cff2013-07-26 08:56:45 +08003417#: builtin/clone.c:66
Jiang Xincc760112012-09-15 10:26:13 +08003418msgid "don't create a checkout"
3419msgstr ""
3420
Jiang Xin28b3cff2013-07-26 08:56:45 +08003421#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
Jiang Xincc760112012-09-15 10:26:13 +08003422msgid "create a bare repository"
3423msgstr ""
3424
Jiang Xin28b3cff2013-07-26 08:56:45 +08003425#: builtin/clone.c:72
Jiang Xincc760112012-09-15 10:26:13 +08003426msgid "create a mirror repository (implies bare)"
3427msgstr ""
3428
Jiang Xin28b3cff2013-07-26 08:56:45 +08003429#: builtin/clone.c:74
Jiang Xincc760112012-09-15 10:26:13 +08003430msgid "to clone from a local repository"
3431msgstr ""
3432
Jiang Xin28b3cff2013-07-26 08:56:45 +08003433#: builtin/clone.c:76
Jiang Xincc760112012-09-15 10:26:13 +08003434msgid "don't use local hardlinks, always copy"
3435msgstr ""
3436
Jiang Xin28b3cff2013-07-26 08:56:45 +08003437#: builtin/clone.c:78
Jiang Xincc760112012-09-15 10:26:13 +08003438msgid "setup as shared repository"
3439msgstr ""
3440
Jiang Xin28b3cff2013-07-26 08:56:45 +08003441#: builtin/clone.c:80 builtin/clone.c:82
Jiang Xincc760112012-09-15 10:26:13 +08003442msgid "initialize submodules in the clone"
3443msgstr ""
3444
Jiang Xin28b3cff2013-07-26 08:56:45 +08003445#: builtin/clone.c:83 builtin/init-db.c:485
Jiang Xincc760112012-09-15 10:26:13 +08003446msgid "template-directory"
3447msgstr ""
3448
Jiang Xin28b3cff2013-07-26 08:56:45 +08003449#: builtin/clone.c:84 builtin/init-db.c:486
Jiang Xincc760112012-09-15 10:26:13 +08003450msgid "directory from which templates will be used"
3451msgstr ""
3452
Jiang Xin28b3cff2013-07-26 08:56:45 +08003453#: builtin/clone.c:86
Jiang Xincc760112012-09-15 10:26:13 +08003454msgid "reference repository"
3455msgstr ""
3456
Jiang Xin28b3cff2013-07-26 08:56:45 +08003457#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44
Jiang Xincc760112012-09-15 10:26:13 +08003458msgid "name"
3459msgstr ""
3460
Jiang Xin28b3cff2013-07-26 08:56:45 +08003461#: builtin/clone.c:88
Jiang Xincc760112012-09-15 10:26:13 +08003462msgid "use <name> instead of 'origin' to track upstream"
3463msgstr ""
3464
Jiang Xin28b3cff2013-07-26 08:56:45 +08003465#: builtin/clone.c:90
Jiang Xincc760112012-09-15 10:26:13 +08003466msgid "checkout <branch> instead of the remote's HEAD"
3467msgstr ""
3468
Jiang Xin28b3cff2013-07-26 08:56:45 +08003469#: builtin/clone.c:92
Jiang Xincc760112012-09-15 10:26:13 +08003470msgid "path to git-upload-pack on the remote"
3471msgstr ""
3472
Jiang Xin28b3cff2013-07-26 08:56:45 +08003473#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661
Jiang Xincc760112012-09-15 10:26:13 +08003474msgid "depth"
3475msgstr ""
3476
Jiang Xin28b3cff2013-07-26 08:56:45 +08003477#: builtin/clone.c:94
Jiang Xincc760112012-09-15 10:26:13 +08003478msgid "create a shallow clone of that depth"
3479msgstr ""
3480
Jiang Xin28b3cff2013-07-26 08:56:45 +08003481#: builtin/clone.c:96
Jiang Xincc760112012-09-15 10:26:13 +08003482msgid "clone only one branch, HEAD or --branch"
3483msgstr ""
3484
Jiang Xin28b3cff2013-07-26 08:56:45 +08003485#: builtin/clone.c:97 builtin/init-db.c:494
Jiang Xincc760112012-09-15 10:26:13 +08003486msgid "gitdir"
3487msgstr ""
3488
Jiang Xin28b3cff2013-07-26 08:56:45 +08003489#: builtin/clone.c:98 builtin/init-db.c:495
Jiang Xincc760112012-09-15 10:26:13 +08003490msgid "separate git dir from working tree"
3491msgstr ""
3492
Jiang Xin28b3cff2013-07-26 08:56:45 +08003493#: builtin/clone.c:99
Jiang Xincc760112012-09-15 10:26:13 +08003494msgid "key=value"
3495msgstr ""
3496
Jiang Xin28b3cff2013-07-26 08:56:45 +08003497#: builtin/clone.c:100
Jiang Xincc760112012-09-15 10:26:13 +08003498msgid "set config inside the new repository"
3499msgstr ""
3500
Jiang Xin28b3cff2013-07-26 08:56:45 +08003501#: builtin/clone.c:253
Jiang Xindce37b62012-02-13 14:37:59 +08003502#, c-format
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003503msgid "reference repository '%s' is not a local repository."
Jiang Xindce37b62012-02-13 14:37:59 +08003504msgstr ""
3505
Jiang Xin28b3cff2013-07-26 08:56:45 +08003506#: builtin/clone.c:316
Jiang Xindce37b62012-02-13 14:37:59 +08003507#, c-format
3508msgid "failed to create directory '%s'"
3509msgstr ""
3510
Jiang Xin28b3cff2013-07-26 08:56:45 +08003511#: builtin/clone.c:318 builtin/diff.c:77
Jiang Xindce37b62012-02-13 14:37:59 +08003512#, c-format
3513msgid "failed to stat '%s'"
3514msgstr ""
3515
Jiang Xin28b3cff2013-07-26 08:56:45 +08003516#: builtin/clone.c:320
Jiang Xindce37b62012-02-13 14:37:59 +08003517#, c-format
3518msgid "%s exists and is not a directory"
3519msgstr ""
3520
Jiang Xin28b3cff2013-07-26 08:56:45 +08003521#: builtin/clone.c:334
Jiang Xindce37b62012-02-13 14:37:59 +08003522#, c-format
3523msgid "failed to stat %s\n"
3524msgstr ""
3525
Jiang Xin28b3cff2013-07-26 08:56:45 +08003526#: builtin/clone.c:356
Jiang Xindce37b62012-02-13 14:37:59 +08003527#, c-format
3528msgid "failed to create link '%s'"
3529msgstr ""
3530
Jiang Xin28b3cff2013-07-26 08:56:45 +08003531#: builtin/clone.c:360
Jiang Xindce37b62012-02-13 14:37:59 +08003532#, c-format
3533msgid "failed to copy file to '%s'"
3534msgstr ""
3535
Jiang Xin28b3cff2013-07-26 08:56:45 +08003536#: builtin/clone.c:383
Jiang Xindce37b62012-02-13 14:37:59 +08003537#, c-format
3538msgid "done.\n"
3539msgstr ""
3540
Jiang Xin28b3cff2013-07-26 08:56:45 +08003541#: builtin/clone.c:396
Jiang Xinc138af52013-04-10 15:19:54 +08003542msgid ""
3543"Clone succeeded, but checkout failed.\n"
3544"You can inspect what was checked out with 'git status'\n"
3545"and retry the checkout with 'git checkout -f HEAD'\n"
3546msgstr ""
3547
Jiang Xin28b3cff2013-07-26 08:56:45 +08003548#: builtin/clone.c:475
Jiang Xindce37b62012-02-13 14:37:59 +08003549#, c-format
3550msgid "Could not find remote branch %s to clone."
3551msgstr ""
3552
Jiang Xin28b3cff2013-07-26 08:56:45 +08003553#: builtin/clone.c:555
3554#, c-format
3555msgid "Checking connectivity... "
3556msgstr ""
3557
3558#: builtin/clone.c:558
Jiang Xinc138af52013-04-10 15:19:54 +08003559msgid "remote did not send all necessary objects"
3560msgstr ""
3561
Jiang Xin28b3cff2013-07-26 08:56:45 +08003562#: builtin/clone.c:560
3563#, c-format
3564msgid "done\n"
3565msgstr ""
3566
3567#: builtin/clone.c:621
Jiang Xindce37b62012-02-13 14:37:59 +08003568msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3569msgstr ""
3570
Jiang Xin28b3cff2013-07-26 08:56:45 +08003571#: builtin/clone.c:652
Jiang Xinc138af52013-04-10 15:19:54 +08003572msgid "unable to checkout working tree"
3573msgstr ""
3574
Jiang Xin28b3cff2013-07-26 08:56:45 +08003575#: builtin/clone.c:760
Jiang Xindce37b62012-02-13 14:37:59 +08003576msgid "Too many arguments."
3577msgstr ""
3578
Jiang Xin28b3cff2013-07-26 08:56:45 +08003579#: builtin/clone.c:764
Jiang Xindce37b62012-02-13 14:37:59 +08003580msgid "You must specify a repository to clone."
3581msgstr ""
3582
Jiang Xin28b3cff2013-07-26 08:56:45 +08003583#: builtin/clone.c:775
Jiang Xindce37b62012-02-13 14:37:59 +08003584#, c-format
3585msgid "--bare and --origin %s options are incompatible."
3586msgstr ""
3587
Jiang Xin28b3cff2013-07-26 08:56:45 +08003588#: builtin/clone.c:778
Jiang Xin46bc4032013-01-25 12:33:58 +08003589msgid "--bare and --separate-git-dir are incompatible."
3590msgstr ""
3591
Jiang Xin28b3cff2013-07-26 08:56:45 +08003592#: builtin/clone.c:791
Jiang Xindce37b62012-02-13 14:37:59 +08003593#, c-format
3594msgid "repository '%s' does not exist"
3595msgstr ""
3596
Jiang Xin28b3cff2013-07-26 08:56:45 +08003597#: builtin/clone.c:796
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003598msgid "--depth is ignored in local clones; use file:// instead."
Jiang Xindce37b62012-02-13 14:37:59 +08003599msgstr ""
3600
Jiang Xin28b3cff2013-07-26 08:56:45 +08003601#: builtin/clone.c:798
3602msgid "--local is ignored"
3603msgstr ""
3604
3605#: builtin/clone.c:808
Jiang Xindce37b62012-02-13 14:37:59 +08003606#, c-format
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003607msgid "destination path '%s' already exists and is not an empty directory."
3608msgstr ""
3609
Jiang Xin28b3cff2013-07-26 08:56:45 +08003610#: builtin/clone.c:818
Jiang Xinc6bc7d42013-04-30 08:31:19 +08003611#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08003612msgid "working tree '%s' already exists."
3613msgstr ""
3614
Jiang Xin28b3cff2013-07-26 08:56:45 +08003615#: builtin/clone.c:831 builtin/clone.c:843
Jiang Xindce37b62012-02-13 14:37:59 +08003616#, c-format
3617msgid "could not create leading directories of '%s'"
3618msgstr ""
3619
Jiang Xin28b3cff2013-07-26 08:56:45 +08003620#: builtin/clone.c:834
Jiang Xindce37b62012-02-13 14:37:59 +08003621#, c-format
3622msgid "could not create work tree dir '%s'."
3623msgstr ""
3624
Jiang Xin28b3cff2013-07-26 08:56:45 +08003625#: builtin/clone.c:853
Jiang Xindce37b62012-02-13 14:37:59 +08003626#, c-format
3627msgid "Cloning into bare repository '%s'...\n"
3628msgstr ""
3629
Jiang Xin28b3cff2013-07-26 08:56:45 +08003630#: builtin/clone.c:855
Jiang Xindce37b62012-02-13 14:37:59 +08003631#, c-format
3632msgid "Cloning into '%s'...\n"
3633msgstr ""
3634
Jiang Xin28b3cff2013-07-26 08:56:45 +08003635#: builtin/clone.c:890
Jiang Xindce37b62012-02-13 14:37:59 +08003636#, c-format
3637msgid "Don't know how to clone %s"
3638msgstr ""
3639
Jiang Xin28b3cff2013-07-26 08:56:45 +08003640#: builtin/clone.c:942
Jiang Xindce37b62012-02-13 14:37:59 +08003641#, c-format
3642msgid "Remote branch %s not found in upstream %s"
3643msgstr ""
3644
Jiang Xin28b3cff2013-07-26 08:56:45 +08003645#: builtin/clone.c:949
Jiang Xindce37b62012-02-13 14:37:59 +08003646msgid "You appear to have cloned an empty repository."
3647msgstr ""
3648
Jiang Xincc760112012-09-15 10:26:13 +08003649#: builtin/column.c:9
3650msgid "git column [options]"
3651msgstr ""
3652
3653#: builtin/column.c:26
3654msgid "lookup config vars"
3655msgstr ""
3656
3657#: builtin/column.c:27 builtin/column.c:28
3658msgid "layout to use"
3659msgstr ""
3660
3661#: builtin/column.c:29
3662msgid "Maximum width"
3663msgstr ""
3664
3665#: builtin/column.c:30
3666msgid "Padding space on left border"
3667msgstr ""
3668
3669#: builtin/column.c:31
3670msgid "Padding space on right border"
3671msgstr ""
3672
3673#: builtin/column.c:32
3674msgid "Padding space between columns"
3675msgstr ""
3676
Jiang Xin822e4a62012-05-08 16:10:22 +08003677#: builtin/column.c:51
3678msgid "--command must be the first argument"
3679msgstr ""
3680
Jiang Xin28b3cff2013-07-26 08:56:45 +08003681#: builtin/commit.c:35
Jiang Xin9caaf232013-02-14 14:49:45 +08003682msgid "git commit [options] [--] <pathspec>..."
Jiang Xincc760112012-09-15 10:26:13 +08003683msgstr ""
3684
Jiang Xin28b3cff2013-07-26 08:56:45 +08003685#: builtin/commit.c:40
Jiang Xin9caaf232013-02-14 14:49:45 +08003686msgid "git status [options] [--] <pathspec>..."
Jiang Xincc760112012-09-15 10:26:13 +08003687msgstr ""
3688
Jiang Xin28b3cff2013-07-26 08:56:45 +08003689#: builtin/commit.c:45
Jiang Xindce37b62012-02-13 14:37:59 +08003690msgid ""
3691"Your name and email address were configured automatically based\n"
3692"on your username and hostname. Please check that they are accurate.\n"
3693"You can suppress this message by setting them explicitly:\n"
3694"\n"
3695" git config --global user.name \"Your Name\"\n"
3696" git config --global user.email you@example.com\n"
3697"\n"
3698"After doing this, you may fix the identity used for this commit with:\n"
3699"\n"
3700" git commit --amend --reset-author\n"
3701msgstr ""
3702
Jiang Xin28b3cff2013-07-26 08:56:45 +08003703#: builtin/commit.c:57
Jiang Xindce37b62012-02-13 14:37:59 +08003704msgid ""
3705"You asked to amend the most recent commit, but doing so would make\n"
3706"it empty. You can repeat your command with --allow-empty, or you can\n"
3707"remove the commit entirely with \"git reset HEAD^\".\n"
3708msgstr ""
3709
Jiang Xin28b3cff2013-07-26 08:56:45 +08003710#: builtin/commit.c:62
Jiang Xindce37b62012-02-13 14:37:59 +08003711msgid ""
3712"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
3713"If you wish to commit it anyway, use:\n"
3714"\n"
3715" git commit --allow-empty\n"
3716"\n"
Jiang Xindce37b62012-02-13 14:37:59 +08003717msgstr ""
3718
Jiang Xinb8ecf232013-08-06 14:13:23 +08003719#: builtin/commit.c:69
3720msgid "Otherwise, please use 'git reset'\n"
3721msgstr ""
3722
3723#: builtin/commit.c:72
3724msgid ""
3725"If you wish to skip this commit, use:\n"
3726"\n"
3727" git reset\n"
3728"\n"
3729"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
3730"the remaining commits.\n"
3731msgstr ""
3732
3733#: builtin/commit.c:279
Jiang Xindce37b62012-02-13 14:37:59 +08003734msgid "failed to unpack HEAD tree object"
3735msgstr ""
3736
Jiang Xinb8ecf232013-08-06 14:13:23 +08003737#: builtin/commit.c:321
Jiang Xindce37b62012-02-13 14:37:59 +08003738msgid "unable to create temporary index"
3739msgstr ""
3740
Jiang Xinb8ecf232013-08-06 14:13:23 +08003741#: builtin/commit.c:327
Jiang Xindce37b62012-02-13 14:37:59 +08003742msgid "interactive add failed"
3743msgstr ""
3744
Jiang Xinb8ecf232013-08-06 14:13:23 +08003745#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431
Jiang Xindce37b62012-02-13 14:37:59 +08003746msgid "unable to write new_index file"
3747msgstr ""
3748
Jiang Xinb8ecf232013-08-06 14:13:23 +08003749#: builtin/commit.c:412
Jiang Xin822e4a62012-05-08 16:10:22 +08003750msgid "cannot do a partial commit during a merge."
Jiang Xindce37b62012-02-13 14:37:59 +08003751msgstr ""
3752
Jiang Xinb8ecf232013-08-06 14:13:23 +08003753#: builtin/commit.c:414
Jiang Xin822e4a62012-05-08 16:10:22 +08003754msgid "cannot do a partial commit during a cherry-pick."
3755msgstr ""
3756
Jiang Xinb8ecf232013-08-06 14:13:23 +08003757#: builtin/commit.c:424
Jiang Xindce37b62012-02-13 14:37:59 +08003758msgid "cannot read the index"
3759msgstr ""
3760
Jiang Xinb8ecf232013-08-06 14:13:23 +08003761#: builtin/commit.c:444
Jiang Xindce37b62012-02-13 14:37:59 +08003762msgid "unable to write temporary index file"
3763msgstr ""
3764
Jiang Xinb8ecf232013-08-06 14:13:23 +08003765#: builtin/commit.c:535 builtin/commit.c:541
Jiang Xindce37b62012-02-13 14:37:59 +08003766#, c-format
3767msgid "invalid commit: %s"
3768msgstr ""
3769
Jiang Xinb8ecf232013-08-06 14:13:23 +08003770#: builtin/commit.c:563
Jiang Xindce37b62012-02-13 14:37:59 +08003771msgid "malformed --author parameter"
3772msgstr ""
3773
Jiang Xinb8ecf232013-08-06 14:13:23 +08003774#: builtin/commit.c:583
Jiang Xindce37b62012-02-13 14:37:59 +08003775#, c-format
3776msgid "Malformed ident string: '%s'"
3777msgstr ""
3778
Jiang Xinb8ecf232013-08-06 14:13:23 +08003779#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982
Jiang Xindce37b62012-02-13 14:37:59 +08003780#, c-format
3781msgid "could not lookup commit %s"
3782msgstr ""
3783
Jiang Xinb8ecf232013-08-06 14:13:23 +08003784#: builtin/commit.c:633 builtin/shortlog.c:271
Jiang Xindce37b62012-02-13 14:37:59 +08003785#, c-format
3786msgid "(reading log message from standard input)\n"
3787msgstr ""
3788
Jiang Xinb8ecf232013-08-06 14:13:23 +08003789#: builtin/commit.c:635
Jiang Xindce37b62012-02-13 14:37:59 +08003790msgid "could not read log from standard input"
3791msgstr ""
3792
Jiang Xinb8ecf232013-08-06 14:13:23 +08003793#: builtin/commit.c:639
Jiang Xindce37b62012-02-13 14:37:59 +08003794#, c-format
3795msgid "could not read log file '%s'"
3796msgstr ""
3797
Jiang Xinb8ecf232013-08-06 14:13:23 +08003798#: builtin/commit.c:645
Jiang Xindce37b62012-02-13 14:37:59 +08003799msgid "commit has empty message"
3800msgstr ""
3801
Jiang Xinb8ecf232013-08-06 14:13:23 +08003802#: builtin/commit.c:661
Jiang Xindce37b62012-02-13 14:37:59 +08003803msgid "could not read MERGE_MSG"
3804msgstr ""
3805
Jiang Xinb8ecf232013-08-06 14:13:23 +08003806#: builtin/commit.c:665
Jiang Xindce37b62012-02-13 14:37:59 +08003807msgid "could not read SQUASH_MSG"
3808msgstr ""
3809
Jiang Xinb8ecf232013-08-06 14:13:23 +08003810#: builtin/commit.c:669
Jiang Xindce37b62012-02-13 14:37:59 +08003811#, c-format
3812msgid "could not read '%s'"
3813msgstr ""
3814
Jiang Xinb8ecf232013-08-06 14:13:23 +08003815#: builtin/commit.c:730
Jiang Xindce37b62012-02-13 14:37:59 +08003816msgid "could not write commit template"
3817msgstr ""
3818
Jiang Xinb8ecf232013-08-06 14:13:23 +08003819#: builtin/commit.c:741
Jiang Xindce37b62012-02-13 14:37:59 +08003820#, c-format
3821msgid ""
3822"\n"
Jiang Xin822e4a62012-05-08 16:10:22 +08003823"It looks like you may be committing a merge.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08003824"If this is not correct, please remove the file\n"
3825"\t%s\n"
3826"and try again.\n"
3827msgstr ""
3828
Jiang Xinb8ecf232013-08-06 14:13:23 +08003829#: builtin/commit.c:746
Jiang Xin822e4a62012-05-08 16:10:22 +08003830#, c-format
3831msgid ""
3832"\n"
3833"It looks like you may be committing a cherry-pick.\n"
3834"If this is not correct, please remove the file\n"
3835"\t%s\n"
3836"and try again.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08003837msgstr ""
3838
Jiang Xinb8ecf232013-08-06 14:13:23 +08003839#: builtin/commit.c:758
Jiang Xin9caaf232013-02-14 14:49:45 +08003840#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08003841msgid ""
Jiang Xin822e4a62012-05-08 16:10:22 +08003842"Please enter the commit message for your changes. Lines starting\n"
Jiang Xin9caaf232013-02-14 14:49:45 +08003843"with '%c' will be ignored, and an empty message aborts the commit.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08003844msgstr ""
3845
Jiang Xinb8ecf232013-08-06 14:13:23 +08003846#: builtin/commit.c:763
Jiang Xin9caaf232013-02-14 14:49:45 +08003847#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08003848msgid ""
Jiang Xin822e4a62012-05-08 16:10:22 +08003849"Please enter the commit message for your changes. Lines starting\n"
Jiang Xin9caaf232013-02-14 14:49:45 +08003850"with '%c' will be kept; you may remove them yourself if you want to.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08003851"An empty message aborts the commit.\n"
3852msgstr ""
3853
Jiang Xinb8ecf232013-08-06 14:13:23 +08003854#: builtin/commit.c:776
Jiang Xindce37b62012-02-13 14:37:59 +08003855#, c-format
3856msgid "%sAuthor: %s"
3857msgstr ""
3858
Jiang Xinb8ecf232013-08-06 14:13:23 +08003859#: builtin/commit.c:783
Jiang Xindce37b62012-02-13 14:37:59 +08003860#, c-format
3861msgid "%sCommitter: %s"
3862msgstr ""
3863
Jiang Xinb8ecf232013-08-06 14:13:23 +08003864#: builtin/commit.c:803
Jiang Xindce37b62012-02-13 14:37:59 +08003865msgid "Cannot read index"
3866msgstr ""
3867
Jiang Xinb8ecf232013-08-06 14:13:23 +08003868#: builtin/commit.c:845
Jiang Xindce37b62012-02-13 14:37:59 +08003869msgid "Error building trees"
3870msgstr ""
3871
Jiang Xinb8ecf232013-08-06 14:13:23 +08003872#: builtin/commit.c:860 builtin/tag.c:359
Jiang Xindce37b62012-02-13 14:37:59 +08003873#, c-format
3874msgid "Please supply the message using either -m or -F option.\n"
3875msgstr ""
3876
Jiang Xinb8ecf232013-08-06 14:13:23 +08003877#: builtin/commit.c:957
Jiang Xindce37b62012-02-13 14:37:59 +08003878#, c-format
3879msgid "No existing author found with '%s'"
3880msgstr ""
3881
Jiang Xinb8ecf232013-08-06 14:13:23 +08003882#: builtin/commit.c:972 builtin/commit.c:1208
Jiang Xindce37b62012-02-13 14:37:59 +08003883#, c-format
3884msgid "Invalid untracked files mode '%s'"
3885msgstr ""
3886
Jiang Xinb8ecf232013-08-06 14:13:23 +08003887#: builtin/commit.c:1009
Jiang Xin28b3cff2013-07-26 08:56:45 +08003888msgid "--long and -z are incompatible"
3889msgstr ""
3890
Jiang Xinb8ecf232013-08-06 14:13:23 +08003891#: builtin/commit.c:1039
Jiang Xindce37b62012-02-13 14:37:59 +08003892msgid "Using both --reset-author and --author does not make sense"
3893msgstr ""
3894
Jiang Xinb8ecf232013-08-06 14:13:23 +08003895#: builtin/commit.c:1050
Jiang Xindce37b62012-02-13 14:37:59 +08003896msgid "You have nothing to amend."
3897msgstr ""
3898
Jiang Xinb8ecf232013-08-06 14:13:23 +08003899#: builtin/commit.c:1053
Jiang Xin822e4a62012-05-08 16:10:22 +08003900msgid "You are in the middle of a merge -- cannot amend."
Jiang Xindce37b62012-02-13 14:37:59 +08003901msgstr ""
3902
Jiang Xinb8ecf232013-08-06 14:13:23 +08003903#: builtin/commit.c:1055
Jiang Xin822e4a62012-05-08 16:10:22 +08003904msgid "You are in the middle of a cherry-pick -- cannot amend."
3905msgstr ""
3906
Jiang Xinb8ecf232013-08-06 14:13:23 +08003907#: builtin/commit.c:1058
Jiang Xindce37b62012-02-13 14:37:59 +08003908msgid "Options --squash and --fixup cannot be used together"
3909msgstr ""
3910
Jiang Xinb8ecf232013-08-06 14:13:23 +08003911#: builtin/commit.c:1068
Jiang Xindce37b62012-02-13 14:37:59 +08003912msgid "Only one of -c/-C/-F/--fixup can be used."
3913msgstr ""
3914
Jiang Xinb8ecf232013-08-06 14:13:23 +08003915#: builtin/commit.c:1070
Jiang Xindce37b62012-02-13 14:37:59 +08003916msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
3917msgstr ""
3918
Jiang Xinb8ecf232013-08-06 14:13:23 +08003919#: builtin/commit.c:1078
Jiang Xindce37b62012-02-13 14:37:59 +08003920msgid "--reset-author can be used only with -C, -c or --amend."
3921msgstr ""
3922
Jiang Xinb8ecf232013-08-06 14:13:23 +08003923#: builtin/commit.c:1095
Jiang Xindce37b62012-02-13 14:37:59 +08003924msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
3925msgstr ""
3926
Jiang Xinb8ecf232013-08-06 14:13:23 +08003927#: builtin/commit.c:1097
Jiang Xindce37b62012-02-13 14:37:59 +08003928msgid "No paths with --include/--only does not make sense."
3929msgstr ""
3930
Jiang Xinb8ecf232013-08-06 14:13:23 +08003931#: builtin/commit.c:1099
Jiang Xindce37b62012-02-13 14:37:59 +08003932msgid "Clever... amending the last one with dirty index."
3933msgstr ""
3934
Jiang Xinb8ecf232013-08-06 14:13:23 +08003935#: builtin/commit.c:1101
Jiang Xindce37b62012-02-13 14:37:59 +08003936msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
3937msgstr ""
3938
Jiang Xinb8ecf232013-08-06 14:13:23 +08003939#: builtin/commit.c:1111 builtin/tag.c:575
Jiang Xindce37b62012-02-13 14:37:59 +08003940#, c-format
3941msgid "Invalid cleanup mode %s"
3942msgstr ""
3943
Jiang Xinb8ecf232013-08-06 14:13:23 +08003944#: builtin/commit.c:1116
Jiang Xindce37b62012-02-13 14:37:59 +08003945msgid "Paths with -a does not make sense."
3946msgstr ""
3947
Jiang Xinb8ecf232013-08-06 14:13:23 +08003948#: builtin/commit.c:1222 builtin/commit.c:1455
Jiang Xincc760112012-09-15 10:26:13 +08003949msgid "show status concisely"
3950msgstr ""
3951
Jiang Xinb8ecf232013-08-06 14:13:23 +08003952#: builtin/commit.c:1224 builtin/commit.c:1457
Jiang Xincc760112012-09-15 10:26:13 +08003953msgid "show branch information"
3954msgstr ""
3955
Jiang Xinb8ecf232013-08-06 14:13:23 +08003956#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452
Jiang Xincc760112012-09-15 10:26:13 +08003957msgid "machine-readable output"
3958msgstr ""
3959
Jiang Xinb8ecf232013-08-06 14:13:23 +08003960#: builtin/commit.c:1229 builtin/commit.c:1461
Jiang Xinfe52cd62012-11-23 14:29:02 +08003961msgid "show status in long format (default)"
3962msgstr ""
3963
Jiang Xinb8ecf232013-08-06 14:13:23 +08003964#: builtin/commit.c:1232 builtin/commit.c:1464
Jiang Xincc760112012-09-15 10:26:13 +08003965msgid "terminate entries with NUL"
3966msgstr ""
3967
Jiang Xinb8ecf232013-08-06 14:13:23 +08003968#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667
Jiang Xin28b3cff2013-07-26 08:56:45 +08003969#: builtin/fast-export.c:670 builtin/tag.c:459
Jiang Xincc760112012-09-15 10:26:13 +08003970msgid "mode"
3971msgstr ""
3972
Jiang Xinb8ecf232013-08-06 14:13:23 +08003973#: builtin/commit.c:1235 builtin/commit.c:1467
Jiang Xincc760112012-09-15 10:26:13 +08003974msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3975msgstr ""
3976
Jiang Xinb8ecf232013-08-06 14:13:23 +08003977#: builtin/commit.c:1238
Jiang Xincc760112012-09-15 10:26:13 +08003978msgid "show ignored files"
3979msgstr ""
3980
Jiang Xinb8ecf232013-08-06 14:13:23 +08003981#: builtin/commit.c:1239 parse-options.h:154
Jiang Xincc760112012-09-15 10:26:13 +08003982msgid "when"
3983msgstr ""
3984
Jiang Xinb8ecf232013-08-06 14:13:23 +08003985#: builtin/commit.c:1240
Jiang Xincc760112012-09-15 10:26:13 +08003986msgid ""
3987"ignore changes to submodules, optional when: all, dirty, untracked. "
3988"(Default: all)"
3989msgstr ""
3990
Jiang Xinb8ecf232013-08-06 14:13:23 +08003991#: builtin/commit.c:1242
Jiang Xincc760112012-09-15 10:26:13 +08003992msgid "list untracked files in columns"
3993msgstr ""
3994
Jiang Xinb8ecf232013-08-06 14:13:23 +08003995#: builtin/commit.c:1313
Jiang Xindce37b62012-02-13 14:37:59 +08003996msgid "couldn't look up newly created commit"
3997msgstr ""
3998
Jiang Xinb8ecf232013-08-06 14:13:23 +08003999#: builtin/commit.c:1315
Jiang Xindce37b62012-02-13 14:37:59 +08004000msgid "could not parse newly created commit"
4001msgstr ""
4002
Jiang Xinb8ecf232013-08-06 14:13:23 +08004003#: builtin/commit.c:1356
Jiang Xindce37b62012-02-13 14:37:59 +08004004msgid "detached HEAD"
4005msgstr ""
4006
Jiang Xinb8ecf232013-08-06 14:13:23 +08004007#: builtin/commit.c:1358
Jiang Xindce37b62012-02-13 14:37:59 +08004008msgid " (root-commit)"
4009msgstr ""
4010
Jiang Xinb8ecf232013-08-06 14:13:23 +08004011#: builtin/commit.c:1425
Jiang Xincc760112012-09-15 10:26:13 +08004012msgid "suppress summary after successful commit"
4013msgstr ""
4014
Jiang Xinb8ecf232013-08-06 14:13:23 +08004015#: builtin/commit.c:1426
Jiang Xincc760112012-09-15 10:26:13 +08004016msgid "show diff in commit message template"
4017msgstr ""
4018
Jiang Xinb8ecf232013-08-06 14:13:23 +08004019#: builtin/commit.c:1428
Jiang Xincc760112012-09-15 10:26:13 +08004020msgid "Commit message options"
4021msgstr ""
4022
Jiang Xinb8ecf232013-08-06 14:13:23 +08004023#: builtin/commit.c:1429 builtin/tag.c:457
Jiang Xincc760112012-09-15 10:26:13 +08004024msgid "read message from file"
4025msgstr ""
4026
Jiang Xinb8ecf232013-08-06 14:13:23 +08004027#: builtin/commit.c:1430
Jiang Xincc760112012-09-15 10:26:13 +08004028msgid "author"
4029msgstr ""
4030
Jiang Xinb8ecf232013-08-06 14:13:23 +08004031#: builtin/commit.c:1430
Jiang Xincc760112012-09-15 10:26:13 +08004032msgid "override author for commit"
4033msgstr ""
4034
Jiang Xinb8ecf232013-08-06 14:13:23 +08004035#: builtin/commit.c:1431 builtin/gc.c:178
Jiang Xincc760112012-09-15 10:26:13 +08004036msgid "date"
4037msgstr ""
4038
Jiang Xinb8ecf232013-08-06 14:13:23 +08004039#: builtin/commit.c:1431
Jiang Xincc760112012-09-15 10:26:13 +08004040msgid "override date for commit"
4041msgstr ""
4042
Jiang Xinb8ecf232013-08-06 14:13:23 +08004043#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405
Jiang Xin28b3cff2013-07-26 08:56:45 +08004044#: builtin/notes.c:562 builtin/tag.c:455
Jiang Xincc760112012-09-15 10:26:13 +08004045msgid "message"
4046msgstr ""
4047
Jiang Xinb8ecf232013-08-06 14:13:23 +08004048#: builtin/commit.c:1432
Jiang Xincc760112012-09-15 10:26:13 +08004049msgid "commit message"
4050msgstr ""
4051
Jiang Xinb8ecf232013-08-06 14:13:23 +08004052#: builtin/commit.c:1433
Jiang Xincc760112012-09-15 10:26:13 +08004053msgid "reuse and edit message from specified commit"
4054msgstr ""
4055
Jiang Xinb8ecf232013-08-06 14:13:23 +08004056#: builtin/commit.c:1434
Jiang Xincc760112012-09-15 10:26:13 +08004057msgid "reuse message from specified commit"
4058msgstr ""
4059
Jiang Xinb8ecf232013-08-06 14:13:23 +08004060#: builtin/commit.c:1435
Jiang Xincc760112012-09-15 10:26:13 +08004061msgid "use autosquash formatted message to fixup specified commit"
4062msgstr ""
4063
Jiang Xinb8ecf232013-08-06 14:13:23 +08004064#: builtin/commit.c:1436
Jiang Xincc760112012-09-15 10:26:13 +08004065msgid "use autosquash formatted message to squash specified commit"
4066msgstr ""
4067
Jiang Xinb8ecf232013-08-06 14:13:23 +08004068#: builtin/commit.c:1437
Jiang Xincc760112012-09-15 10:26:13 +08004069msgid "the commit is authored by me now (used with -C/-c/--amend)"
4070msgstr ""
4071
Jiang Xinb8ecf232013-08-06 14:13:23 +08004072#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111
Jiang Xincc760112012-09-15 10:26:13 +08004073msgid "add Signed-off-by:"
4074msgstr ""
4075
Jiang Xinb8ecf232013-08-06 14:13:23 +08004076#: builtin/commit.c:1439
Jiang Xincc760112012-09-15 10:26:13 +08004077msgid "use specified template file"
4078msgstr ""
4079
Jiang Xinb8ecf232013-08-06 14:13:23 +08004080#: builtin/commit.c:1440
Jiang Xincc760112012-09-15 10:26:13 +08004081msgid "force edit of commit"
4082msgstr ""
4083
Jiang Xinb8ecf232013-08-06 14:13:23 +08004084#: builtin/commit.c:1441
Jiang Xincc760112012-09-15 10:26:13 +08004085msgid "default"
4086msgstr ""
4087
Jiang Xinb8ecf232013-08-06 14:13:23 +08004088#: builtin/commit.c:1441 builtin/tag.c:460
Jiang Xincc760112012-09-15 10:26:13 +08004089msgid "how to strip spaces and #comments from message"
4090msgstr ""
4091
Jiang Xinb8ecf232013-08-06 14:13:23 +08004092#: builtin/commit.c:1442
Jiang Xincc760112012-09-15 10:26:13 +08004093msgid "include status in commit message template"
4094msgstr ""
4095
Jiang Xinb8ecf232013-08-06 14:13:23 +08004096#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461
Jiang Xincc760112012-09-15 10:26:13 +08004097msgid "key id"
4098msgstr ""
4099
Jiang Xinb8ecf232013-08-06 14:13:23 +08004100#: builtin/commit.c:1444 builtin/merge.c:231
Jiang Xincc760112012-09-15 10:26:13 +08004101msgid "GPG sign commit"
4102msgstr ""
4103
4104#. end commit message options
Jiang Xinb8ecf232013-08-06 14:13:23 +08004105#: builtin/commit.c:1447
Jiang Xincc760112012-09-15 10:26:13 +08004106msgid "Commit contents options"
4107msgstr ""
4108
Jiang Xinb8ecf232013-08-06 14:13:23 +08004109#: builtin/commit.c:1448
Jiang Xincc760112012-09-15 10:26:13 +08004110msgid "commit all changed files"
4111msgstr ""
4112
Jiang Xinb8ecf232013-08-06 14:13:23 +08004113#: builtin/commit.c:1449
Jiang Xincc760112012-09-15 10:26:13 +08004114msgid "add specified files to index for commit"
4115msgstr ""
4116
Jiang Xinb8ecf232013-08-06 14:13:23 +08004117#: builtin/commit.c:1450
Jiang Xincc760112012-09-15 10:26:13 +08004118msgid "interactively add files"
4119msgstr ""
4120
Jiang Xinb8ecf232013-08-06 14:13:23 +08004121#: builtin/commit.c:1451
Jiang Xincc760112012-09-15 10:26:13 +08004122msgid "interactively add changes"
4123msgstr ""
4124
Jiang Xinb8ecf232013-08-06 14:13:23 +08004125#: builtin/commit.c:1452
Jiang Xincc760112012-09-15 10:26:13 +08004126msgid "commit only specified files"
4127msgstr ""
4128
Jiang Xinb8ecf232013-08-06 14:13:23 +08004129#: builtin/commit.c:1453
Jiang Xincc760112012-09-15 10:26:13 +08004130msgid "bypass pre-commit hook"
4131msgstr ""
4132
Jiang Xinb8ecf232013-08-06 14:13:23 +08004133#: builtin/commit.c:1454
Jiang Xincc760112012-09-15 10:26:13 +08004134msgid "show what would be committed"
4135msgstr ""
4136
Jiang Xinb8ecf232013-08-06 14:13:23 +08004137#: builtin/commit.c:1465
Jiang Xincc760112012-09-15 10:26:13 +08004138msgid "amend previous commit"
4139msgstr ""
4140
Jiang Xinb8ecf232013-08-06 14:13:23 +08004141#: builtin/commit.c:1466
Jiang Xincc760112012-09-15 10:26:13 +08004142msgid "bypass post-rewrite hook"
4143msgstr ""
4144
Jiang Xinb8ecf232013-08-06 14:13:23 +08004145#: builtin/commit.c:1471
Jiang Xincc760112012-09-15 10:26:13 +08004146msgid "ok to record an empty change"
4147msgstr ""
4148
Jiang Xinb8ecf232013-08-06 14:13:23 +08004149#: builtin/commit.c:1474
Jiang Xincc760112012-09-15 10:26:13 +08004150msgid "ok to record a change with an empty message"
4151msgstr ""
4152
Jiang Xinb8ecf232013-08-06 14:13:23 +08004153#: builtin/commit.c:1507
Jiang Xindce37b62012-02-13 14:37:59 +08004154msgid "could not parse HEAD commit"
4155msgstr ""
4156
Jiang Xinb8ecf232013-08-06 14:13:23 +08004157#: builtin/commit.c:1545 builtin/merge.c:525
Jiang Xindce37b62012-02-13 14:37:59 +08004158#, c-format
4159msgid "could not open '%s' for reading"
4160msgstr ""
4161
Jiang Xinb8ecf232013-08-06 14:13:23 +08004162#: builtin/commit.c:1552
Jiang Xindce37b62012-02-13 14:37:59 +08004163#, c-format
4164msgid "Corrupt MERGE_HEAD file (%s)"
4165msgstr ""
4166
Jiang Xin28b3cff2013-07-26 08:56:45 +08004167#: builtin/commit.c:1559
Jiang Xinb8ecf232013-08-06 14:13:23 +08004168msgid "could not read MERGE_MODE"
Jiang Xincd1e7482012-04-28 20:27:01 +08004169msgstr ""
4170
Jiang Xin28b3cff2013-07-26 08:56:45 +08004171#: builtin/commit.c:1578
Jiang Xindce37b62012-02-13 14:37:59 +08004172#, c-format
Jiang Xinb8ecf232013-08-06 14:13:23 +08004173msgid "could not read commit message: %s"
4174msgstr ""
4175
4176#: builtin/commit.c:1592
4177#, c-format
4178msgid "Aborting commit; you did not edit the message.\n"
4179msgstr ""
4180
4181#: builtin/commit.c:1597
4182#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08004183msgid "Aborting commit due to empty commit message.\n"
4184msgstr ""
4185
Jiang Xinb8ecf232013-08-06 14:13:23 +08004186#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886
Jiang Xindce37b62012-02-13 14:37:59 +08004187msgid "failed to write commit object"
4188msgstr ""
4189
Jiang Xinb8ecf232013-08-06 14:13:23 +08004190#: builtin/commit.c:1633
Jiang Xindce37b62012-02-13 14:37:59 +08004191msgid "cannot lock HEAD ref"
4192msgstr ""
4193
Jiang Xinb8ecf232013-08-06 14:13:23 +08004194#: builtin/commit.c:1637
Jiang Xindce37b62012-02-13 14:37:59 +08004195msgid "cannot update HEAD ref"
4196msgstr ""
4197
Jiang Xinb8ecf232013-08-06 14:13:23 +08004198#: builtin/commit.c:1648
Jiang Xindce37b62012-02-13 14:37:59 +08004199msgid ""
4200"Repository has been updated, but unable to write\n"
4201"new_index file. Check that disk is not full or quota is\n"
4202"not exceeded, and then \"git reset HEAD\" to recover."
4203msgstr ""
4204
Jiang Xincc760112012-09-15 10:26:13 +08004205#: builtin/config.c:7
4206msgid "git config [options]"
4207msgstr ""
4208
Jiang Xin28b3cff2013-07-26 08:56:45 +08004209#: builtin/config.c:52
Jiang Xincc760112012-09-15 10:26:13 +08004210msgid "Config file location"
4211msgstr ""
4212
Jiang Xin28b3cff2013-07-26 08:56:45 +08004213#: builtin/config.c:53
Jiang Xincc760112012-09-15 10:26:13 +08004214msgid "use global config file"
4215msgstr ""
4216
Jiang Xin28b3cff2013-07-26 08:56:45 +08004217#: builtin/config.c:54
Jiang Xincc760112012-09-15 10:26:13 +08004218msgid "use system config file"
4219msgstr ""
4220
Jiang Xin28b3cff2013-07-26 08:56:45 +08004221#: builtin/config.c:55
Jiang Xincc760112012-09-15 10:26:13 +08004222msgid "use repository config file"
4223msgstr ""
4224
Jiang Xin28b3cff2013-07-26 08:56:45 +08004225#: builtin/config.c:56
Jiang Xincc760112012-09-15 10:26:13 +08004226msgid "use given config file"
4227msgstr ""
4228
Jiang Xin28b3cff2013-07-26 08:56:45 +08004229#: builtin/config.c:57
4230msgid "blob-id"
Jiang Xincc760112012-09-15 10:26:13 +08004231msgstr ""
4232
Jiang Xinfe52cd62012-11-23 14:29:02 +08004233#: builtin/config.c:57
Jiang Xin28b3cff2013-07-26 08:56:45 +08004234msgid "read config from given blob object"
Jiang Xincc760112012-09-15 10:26:13 +08004235msgstr ""
4236
Jiang Xinfe52cd62012-11-23 14:29:02 +08004237#: builtin/config.c:58
Jiang Xin28b3cff2013-07-26 08:56:45 +08004238msgid "Action"
Jiang Xincc760112012-09-15 10:26:13 +08004239msgstr ""
4240
Jiang Xinfe52cd62012-11-23 14:29:02 +08004241#: builtin/config.c:59
Jiang Xin28b3cff2013-07-26 08:56:45 +08004242msgid "get value: name [value-regex]"
Jiang Xincc760112012-09-15 10:26:13 +08004243msgstr ""
4244
Jiang Xinfe52cd62012-11-23 14:29:02 +08004245#: builtin/config.c:60
Jiang Xin28b3cff2013-07-26 08:56:45 +08004246msgid "get all values: key [value-regex]"
Jiang Xincc760112012-09-15 10:26:13 +08004247msgstr ""
4248
Jiang Xinfe52cd62012-11-23 14:29:02 +08004249#: builtin/config.c:61
Jiang Xin28b3cff2013-07-26 08:56:45 +08004250msgid "get values for regexp: name-regex [value-regex]"
Jiang Xincc760112012-09-15 10:26:13 +08004251msgstr ""
4252
Jiang Xinfe52cd62012-11-23 14:29:02 +08004253#: builtin/config.c:62
Jiang Xin28b3cff2013-07-26 08:56:45 +08004254msgid "replace all matching variables: name value [value_regex]"
Jiang Xincc760112012-09-15 10:26:13 +08004255msgstr ""
4256
Jiang Xinfe52cd62012-11-23 14:29:02 +08004257#: builtin/config.c:63
Jiang Xin28b3cff2013-07-26 08:56:45 +08004258msgid "add a new variable: name value"
Jiang Xincc760112012-09-15 10:26:13 +08004259msgstr ""
4260
Jiang Xinfe52cd62012-11-23 14:29:02 +08004261#: builtin/config.c:64
Jiang Xin28b3cff2013-07-26 08:56:45 +08004262msgid "remove a variable: name [value-regex]"
Jiang Xincc760112012-09-15 10:26:13 +08004263msgstr ""
4264
Jiang Xinfe52cd62012-11-23 14:29:02 +08004265#: builtin/config.c:65
Jiang Xin28b3cff2013-07-26 08:56:45 +08004266msgid "remove all matches: name [value-regex]"
Jiang Xincc760112012-09-15 10:26:13 +08004267msgstr ""
4268
Jiang Xinfe52cd62012-11-23 14:29:02 +08004269#: builtin/config.c:66
Jiang Xin28b3cff2013-07-26 08:56:45 +08004270msgid "rename section: old-name new-name"
Jiang Xincc760112012-09-15 10:26:13 +08004271msgstr ""
4272
Jiang Xinfe52cd62012-11-23 14:29:02 +08004273#: builtin/config.c:67
Jiang Xin28b3cff2013-07-26 08:56:45 +08004274msgid "remove a section: name"
Jiang Xincc760112012-09-15 10:26:13 +08004275msgstr ""
4276
Jiang Xinfe52cd62012-11-23 14:29:02 +08004277#: builtin/config.c:68
Jiang Xin28b3cff2013-07-26 08:56:45 +08004278msgid "list all"
Jiang Xincc760112012-09-15 10:26:13 +08004279msgstr ""
4280
Jiang Xinfe52cd62012-11-23 14:29:02 +08004281#: builtin/config.c:69
Jiang Xin28b3cff2013-07-26 08:56:45 +08004282msgid "open an editor"
4283msgstr ""
4284
4285#: builtin/config.c:70 builtin/config.c:71
4286msgid "slot"
Jiang Xincc760112012-09-15 10:26:13 +08004287msgstr ""
4288
Jiang Xinfe52cd62012-11-23 14:29:02 +08004289#: builtin/config.c:70
Jiang Xin28b3cff2013-07-26 08:56:45 +08004290msgid "find the color configured: [default]"
Jiang Xincc760112012-09-15 10:26:13 +08004291msgstr ""
4292
Jiang Xinfe52cd62012-11-23 14:29:02 +08004293#: builtin/config.c:71
Jiang Xin28b3cff2013-07-26 08:56:45 +08004294msgid "find the color setting: [stdout-is-tty]"
Jiang Xincc760112012-09-15 10:26:13 +08004295msgstr ""
4296
Jiang Xinfe52cd62012-11-23 14:29:02 +08004297#: builtin/config.c:72
Jiang Xin28b3cff2013-07-26 08:56:45 +08004298msgid "Type"
Jiang Xincc760112012-09-15 10:26:13 +08004299msgstr ""
4300
Jiang Xinfe52cd62012-11-23 14:29:02 +08004301#: builtin/config.c:73
Jiang Xin28b3cff2013-07-26 08:56:45 +08004302msgid "value is \"true\" or \"false\""
Jiang Xincc760112012-09-15 10:26:13 +08004303msgstr ""
4304
Jiang Xinfe52cd62012-11-23 14:29:02 +08004305#: builtin/config.c:74
Jiang Xin28b3cff2013-07-26 08:56:45 +08004306msgid "value is decimal number"
Jiang Xincc760112012-09-15 10:26:13 +08004307msgstr ""
4308
Jiang Xinfe52cd62012-11-23 14:29:02 +08004309#: builtin/config.c:75
Jiang Xin28b3cff2013-07-26 08:56:45 +08004310msgid "value is --bool or --int"
Jiang Xincc760112012-09-15 10:26:13 +08004311msgstr ""
4312
Jiang Xinfe52cd62012-11-23 14:29:02 +08004313#: builtin/config.c:76
Jiang Xin28b3cff2013-07-26 08:56:45 +08004314msgid "value is a path (file or directory name)"
Jiang Xincc760112012-09-15 10:26:13 +08004315msgstr ""
4316
Jiang Xinfe52cd62012-11-23 14:29:02 +08004317#: builtin/config.c:77
Jiang Xin28b3cff2013-07-26 08:56:45 +08004318msgid "Other"
4319msgstr ""
4320
4321#: builtin/config.c:78
4322msgid "terminate values with NUL byte"
4323msgstr ""
4324
4325#: builtin/config.c:79
Jiang Xincc760112012-09-15 10:26:13 +08004326msgid "respect include directives on lookup"
4327msgstr ""
4328
Jiang Xinc138af52013-04-10 15:19:54 +08004329#: builtin/count-objects.c:82
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004330msgid "git count-objects [-v] [-H | --human-readable]"
4331msgstr ""
4332
4333#: builtin/count-objects.c:97
4334msgid "print sizes in human readable format"
Jiang Xincc760112012-09-15 10:26:13 +08004335msgstr ""
4336
Jiang Xin28b3cff2013-07-26 08:56:45 +08004337#: builtin/describe.c:16
Richard Hansena8a54062013-09-04 15:04:31 -04004338msgid "git describe [options] <commit-ish>*"
Jiang Xincc760112012-09-15 10:26:13 +08004339msgstr ""
4340
Jiang Xin28b3cff2013-07-26 08:56:45 +08004341#: builtin/describe.c:17
Jiang Xincc760112012-09-15 10:26:13 +08004342msgid "git describe [options] --dirty"
4343msgstr ""
4344
Jiang Xinc138af52013-04-10 15:19:54 +08004345#: builtin/describe.c:237
Jiang Xindce37b62012-02-13 14:37:59 +08004346#, c-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08004347msgid "annotated tag %s not available"
4348msgstr ""
4349
4350#: builtin/describe.c:241
4351#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08004352msgid "annotated tag %s has no embedded name"
4353msgstr ""
4354
Jiang Xin28b3cff2013-07-26 08:56:45 +08004355#: builtin/describe.c:243
Jiang Xindce37b62012-02-13 14:37:59 +08004356#, c-format
4357msgid "tag '%s' is really '%s' here"
4358msgstr ""
4359
Jiang Xin28b3cff2013-07-26 08:56:45 +08004360#: builtin/describe.c:270
Jiang Xindce37b62012-02-13 14:37:59 +08004361#, c-format
4362msgid "Not a valid object name %s"
4363msgstr ""
4364
Jiang Xin28b3cff2013-07-26 08:56:45 +08004365#: builtin/describe.c:273
Jiang Xindce37b62012-02-13 14:37:59 +08004366#, c-format
4367msgid "%s is not a valid '%s' object"
4368msgstr ""
4369
Jiang Xin28b3cff2013-07-26 08:56:45 +08004370#: builtin/describe.c:290
Jiang Xindce37b62012-02-13 14:37:59 +08004371#, c-format
4372msgid "no tag exactly matches '%s'"
4373msgstr ""
4374
Jiang Xin28b3cff2013-07-26 08:56:45 +08004375#: builtin/describe.c:292
Jiang Xindce37b62012-02-13 14:37:59 +08004376#, c-format
4377msgid "searching to describe %s\n"
4378msgstr ""
4379
Jiang Xin28b3cff2013-07-26 08:56:45 +08004380#: builtin/describe.c:332
Jiang Xindce37b62012-02-13 14:37:59 +08004381#, c-format
4382msgid "finished search at %s\n"
4383msgstr ""
4384
Jiang Xin28b3cff2013-07-26 08:56:45 +08004385#: builtin/describe.c:359
Jiang Xindce37b62012-02-13 14:37:59 +08004386#, c-format
4387msgid ""
4388"No annotated tags can describe '%s'.\n"
4389"However, there were unannotated tags: try --tags."
4390msgstr ""
4391
Jiang Xin28b3cff2013-07-26 08:56:45 +08004392#: builtin/describe.c:363
Jiang Xindce37b62012-02-13 14:37:59 +08004393#, c-format
4394msgid ""
4395"No tags can describe '%s'.\n"
4396"Try --always, or create some tags."
4397msgstr ""
4398
Jiang Xin28b3cff2013-07-26 08:56:45 +08004399#: builtin/describe.c:384
Jiang Xindce37b62012-02-13 14:37:59 +08004400#, c-format
4401msgid "traversed %lu commits\n"
4402msgstr ""
4403
Jiang Xin28b3cff2013-07-26 08:56:45 +08004404#: builtin/describe.c:387
Jiang Xindce37b62012-02-13 14:37:59 +08004405#, c-format
4406msgid ""
4407"more than %i tags found; listed %i most recent\n"
4408"gave up search at %s\n"
4409msgstr ""
4410
Jiang Xin28b3cff2013-07-26 08:56:45 +08004411#: builtin/describe.c:409
Jiang Xincc760112012-09-15 10:26:13 +08004412msgid "find the tag that comes after the commit"
4413msgstr ""
4414
Jiang Xin28b3cff2013-07-26 08:56:45 +08004415#: builtin/describe.c:410
Jiang Xincc760112012-09-15 10:26:13 +08004416msgid "debug search strategy on stderr"
4417msgstr ""
4418
Jiang Xin28b3cff2013-07-26 08:56:45 +08004419#: builtin/describe.c:411
Jiang Xinc138af52013-04-10 15:19:54 +08004420msgid "use any ref"
4421msgstr ""
4422
Jiang Xin28b3cff2013-07-26 08:56:45 +08004423#: builtin/describe.c:412
Jiang Xinc138af52013-04-10 15:19:54 +08004424msgid "use any tag, even unannotated"
Jiang Xincc760112012-09-15 10:26:13 +08004425msgstr ""
4426
Jiang Xin28b3cff2013-07-26 08:56:45 +08004427#: builtin/describe.c:413
Jiang Xincc760112012-09-15 10:26:13 +08004428msgid "always use long format"
4429msgstr ""
4430
Jiang Xin28b3cff2013-07-26 08:56:45 +08004431#: builtin/describe.c:414
4432msgid "only follow first parent"
Jiang Xincc760112012-09-15 10:26:13 +08004433msgstr ""
4434
Jiang Xinc138af52013-04-10 15:19:54 +08004435#: builtin/describe.c:417
Jiang Xin28b3cff2013-07-26 08:56:45 +08004436msgid "only output exact matches"
4437msgstr ""
4438
4439#: builtin/describe.c:419
4440msgid "consider <n> most recent tags (default: 10)"
4441msgstr ""
4442
4443#: builtin/describe.c:421
4444msgid "only consider tags matching <pattern>"
4445msgstr ""
4446
4447#: builtin/describe.c:423 builtin/name-rev.c:322
4448msgid "show abbreviated commit object as fallback"
4449msgstr ""
4450
4451#: builtin/describe.c:424
4452msgid "mark"
4453msgstr ""
4454
4455#: builtin/describe.c:425
Jiang Xincc760112012-09-15 10:26:13 +08004456msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4457msgstr ""
4458
Jiang Xin28b3cff2013-07-26 08:56:45 +08004459#: builtin/describe.c:443
Jiang Xindce37b62012-02-13 14:37:59 +08004460msgid "--long is incompatible with --abbrev=0"
4461msgstr ""
4462
Jiang Xin28b3cff2013-07-26 08:56:45 +08004463#: builtin/describe.c:469
Jiang Xindce37b62012-02-13 14:37:59 +08004464msgid "No names found, cannot describe anything."
4465msgstr ""
4466
Jiang Xin28b3cff2013-07-26 08:56:45 +08004467#: builtin/describe.c:489
Richard Hansena8a54062013-09-04 15:04:31 -04004468msgid "--dirty is incompatible with commit-ishes"
Jiang Xindce37b62012-02-13 14:37:59 +08004469msgstr ""
4470
Jiang Xinccfca8d2012-09-05 06:20:57 +08004471#: builtin/diff.c:79
Jiang Xindce37b62012-02-13 14:37:59 +08004472#, c-format
4473msgid "'%s': not a regular file or symlink"
4474msgstr ""
4475
Jiang Xin28b3cff2013-07-26 08:56:45 +08004476#: builtin/diff.c:230
Jiang Xindce37b62012-02-13 14:37:59 +08004477#, c-format
4478msgid "invalid option: %s"
4479msgstr ""
4480
Jiang Xin28b3cff2013-07-26 08:56:45 +08004481#: builtin/diff.c:307
Jiang Xindce37b62012-02-13 14:37:59 +08004482msgid "Not a git repository"
4483msgstr ""
4484
Jiang Xin28b3cff2013-07-26 08:56:45 +08004485#: builtin/diff.c:350
Jiang Xindce37b62012-02-13 14:37:59 +08004486#, c-format
4487msgid "invalid object '%s' given."
4488msgstr ""
4489
Jiang Xin28b3cff2013-07-26 08:56:45 +08004490#: builtin/diff.c:359
Jiang Xindce37b62012-02-13 14:37:59 +08004491#, c-format
4492msgid "more than two blobs given: '%s'"
4493msgstr ""
4494
Jiang Xin28b3cff2013-07-26 08:56:45 +08004495#: builtin/diff.c:366
Jiang Xindce37b62012-02-13 14:37:59 +08004496#, c-format
4497msgid "unhandled object '%s' given."
4498msgstr ""
4499
Jiang Xincc760112012-09-15 10:26:13 +08004500#: builtin/fast-export.c:22
4501msgid "git fast-export [rev-list-opts]"
4502msgstr ""
4503
Jiang Xin28b3cff2013-07-26 08:56:45 +08004504#: builtin/fast-export.c:666
Jiang Xincc760112012-09-15 10:26:13 +08004505msgid "show progress after <n> objects"
4506msgstr ""
4507
Jiang Xin28b3cff2013-07-26 08:56:45 +08004508#: builtin/fast-export.c:668
Jiang Xincc760112012-09-15 10:26:13 +08004509msgid "select handling of signed tags"
4510msgstr ""
4511
Jiang Xin28b3cff2013-07-26 08:56:45 +08004512#: builtin/fast-export.c:671
Jiang Xincc760112012-09-15 10:26:13 +08004513msgid "select handling of tags that tag filtered objects"
4514msgstr ""
4515
Jiang Xin28b3cff2013-07-26 08:56:45 +08004516#: builtin/fast-export.c:674
Jiang Xincc760112012-09-15 10:26:13 +08004517msgid "Dump marks to this file"
4518msgstr ""
4519
Jiang Xin28b3cff2013-07-26 08:56:45 +08004520#: builtin/fast-export.c:676
Jiang Xincc760112012-09-15 10:26:13 +08004521msgid "Import marks from this file"
4522msgstr ""
4523
Jiang Xin28b3cff2013-07-26 08:56:45 +08004524#: builtin/fast-export.c:678
Jiang Xincc760112012-09-15 10:26:13 +08004525msgid "Fake a tagger when tags lack one"
4526msgstr ""
4527
Jiang Xin28b3cff2013-07-26 08:56:45 +08004528#: builtin/fast-export.c:680
Jiang Xincc760112012-09-15 10:26:13 +08004529msgid "Output full tree for each commit"
4530msgstr ""
4531
Jiang Xin28b3cff2013-07-26 08:56:45 +08004532#: builtin/fast-export.c:682
Jiang Xincc760112012-09-15 10:26:13 +08004533msgid "Use the done feature to terminate the stream"
4534msgstr ""
4535
Jiang Xin28b3cff2013-07-26 08:56:45 +08004536#: builtin/fast-export.c:683
Jiang Xincc760112012-09-15 10:26:13 +08004537msgid "Skip output of blob data"
4538msgstr ""
4539
4540#: builtin/fetch.c:20
4541msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4542msgstr ""
4543
4544#: builtin/fetch.c:21
4545msgid "git fetch [<options>] <group>"
4546msgstr ""
4547
4548#: builtin/fetch.c:22
4549msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4550msgstr ""
4551
4552#: builtin/fetch.c:23
4553msgid "git fetch --all [<options>]"
4554msgstr ""
4555
4556#: builtin/fetch.c:60
4557msgid "fetch from all remotes"
4558msgstr ""
4559
4560#: builtin/fetch.c:62
4561msgid "append to .git/FETCH_HEAD instead of overwriting"
4562msgstr ""
4563
4564#: builtin/fetch.c:64
4565msgid "path to upload pack on remote end"
4566msgstr ""
4567
4568#: builtin/fetch.c:65
4569msgid "force overwrite of local branch"
4570msgstr ""
4571
4572#: builtin/fetch.c:67
4573msgid "fetch from multiple remotes"
4574msgstr ""
4575
4576#: builtin/fetch.c:69
4577msgid "fetch all tags and associated objects"
4578msgstr ""
4579
4580#: builtin/fetch.c:71
4581msgid "do not fetch all tags (--no-tags)"
4582msgstr ""
4583
4584#: builtin/fetch.c:73
4585msgid "prune remote-tracking branches no longer on remote"
4586msgstr ""
4587
4588#: builtin/fetch.c:74
4589msgid "on-demand"
4590msgstr ""
4591
4592#: builtin/fetch.c:75
4593msgid "control recursive fetching of submodules"
4594msgstr ""
4595
4596#: builtin/fetch.c:79
4597msgid "keep downloaded pack"
4598msgstr ""
4599
4600#: builtin/fetch.c:81
4601msgid "allow updating of HEAD ref"
4602msgstr ""
4603
4604#: builtin/fetch.c:84
4605msgid "deepen history of shallow clone"
4606msgstr ""
4607
Jiang Xin9caaf232013-02-14 14:49:45 +08004608#: builtin/fetch.c:86
4609msgid "convert to a complete repository"
4610msgstr ""
4611
Jiang Xin28b3cff2013-07-26 08:56:45 +08004612#: builtin/fetch.c:88 builtin/log.c:1177
Jiang Xincc760112012-09-15 10:26:13 +08004613msgid "dir"
4614msgstr ""
4615
Jiang Xin9caaf232013-02-14 14:49:45 +08004616#: builtin/fetch.c:89
Jiang Xincc760112012-09-15 10:26:13 +08004617msgid "prepend this to submodule path output"
4618msgstr ""
4619
Jiang Xin9caaf232013-02-14 14:49:45 +08004620#: builtin/fetch.c:92
Jiang Xincc760112012-09-15 10:26:13 +08004621msgid "default mode for recursion"
4622msgstr ""
4623
Jiang Xin28b3cff2013-07-26 08:56:45 +08004624#: builtin/fetch.c:220
Jiang Xindce37b62012-02-13 14:37:59 +08004625msgid "Couldn't find remote ref HEAD"
4626msgstr ""
4627
Jiang Xin28b3cff2013-07-26 08:56:45 +08004628#: builtin/fetch.c:273
Jiang Xindce37b62012-02-13 14:37:59 +08004629#, c-format
4630msgid "object %s not found"
4631msgstr ""
4632
Jiang Xin28b3cff2013-07-26 08:56:45 +08004633#: builtin/fetch.c:278
Jiang Xindce37b62012-02-13 14:37:59 +08004634msgid "[up to date]"
4635msgstr ""
4636
Jiang Xin28b3cff2013-07-26 08:56:45 +08004637#: builtin/fetch.c:292
Jiang Xindce37b62012-02-13 14:37:59 +08004638#, c-format
4639msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4640msgstr ""
4641
Jiang Xin28b3cff2013-07-26 08:56:45 +08004642#: builtin/fetch.c:293 builtin/fetch.c:379
Jiang Xindce37b62012-02-13 14:37:59 +08004643msgid "[rejected]"
4644msgstr ""
4645
Jiang Xin28b3cff2013-07-26 08:56:45 +08004646#: builtin/fetch.c:304
Jiang Xindce37b62012-02-13 14:37:59 +08004647msgid "[tag update]"
4648msgstr ""
4649
Jiang Xin28b3cff2013-07-26 08:56:45 +08004650#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359
Jiang Xindce37b62012-02-13 14:37:59 +08004651msgid " (unable to update local ref)"
4652msgstr ""
4653
Jiang Xin28b3cff2013-07-26 08:56:45 +08004654#: builtin/fetch.c:324
Jiang Xindce37b62012-02-13 14:37:59 +08004655msgid "[new tag]"
4656msgstr ""
4657
Jiang Xin28b3cff2013-07-26 08:56:45 +08004658#: builtin/fetch.c:327
Jiang Xindce37b62012-02-13 14:37:59 +08004659msgid "[new branch]"
4660msgstr ""
4661
Jiang Xin28b3cff2013-07-26 08:56:45 +08004662#: builtin/fetch.c:330
Jiang Xincd1e7482012-04-28 20:27:01 +08004663msgid "[new ref]"
4664msgstr ""
4665
Jiang Xin28b3cff2013-07-26 08:56:45 +08004666#: builtin/fetch.c:375
Jiang Xindce37b62012-02-13 14:37:59 +08004667msgid "unable to update local ref"
4668msgstr ""
4669
Jiang Xin28b3cff2013-07-26 08:56:45 +08004670#: builtin/fetch.c:375
Jiang Xindce37b62012-02-13 14:37:59 +08004671msgid "forced update"
4672msgstr ""
4673
Jiang Xin28b3cff2013-07-26 08:56:45 +08004674#: builtin/fetch.c:381
Jiang Xindce37b62012-02-13 14:37:59 +08004675msgid "(non-fast-forward)"
4676msgstr ""
4677
Jiang Xin28b3cff2013-07-26 08:56:45 +08004678#: builtin/fetch.c:412 builtin/fetch.c:718
Jiang Xindce37b62012-02-13 14:37:59 +08004679#, c-format
4680msgid "cannot open %s: %s\n"
4681msgstr ""
4682
Jiang Xin28b3cff2013-07-26 08:56:45 +08004683#: builtin/fetch.c:421
Jiang Xindce37b62012-02-13 14:37:59 +08004684#, c-format
4685msgid "%s did not send all necessary objects\n"
4686msgstr ""
4687
Jiang Xin28b3cff2013-07-26 08:56:45 +08004688#: builtin/fetch.c:520
Jiang Xindce37b62012-02-13 14:37:59 +08004689#, c-format
4690msgid "From %.*s\n"
4691msgstr ""
4692
Jiang Xin28b3cff2013-07-26 08:56:45 +08004693#: builtin/fetch.c:531
Jiang Xindce37b62012-02-13 14:37:59 +08004694#, c-format
4695msgid ""
4696"some local refs could not be updated; try running\n"
4697" 'git remote prune %s' to remove any old, conflicting branches"
4698msgstr ""
4699
Jiang Xin28b3cff2013-07-26 08:56:45 +08004700#: builtin/fetch.c:581
Jiang Xindce37b62012-02-13 14:37:59 +08004701#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +08004702msgid " (%s will become dangling)"
Jiang Xindce37b62012-02-13 14:37:59 +08004703msgstr ""
4704
Jiang Xin28b3cff2013-07-26 08:56:45 +08004705#: builtin/fetch.c:582
Jiang Xindce37b62012-02-13 14:37:59 +08004706#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +08004707msgid " (%s has become dangling)"
Jiang Xindce37b62012-02-13 14:37:59 +08004708msgstr ""
4709
Jiang Xin28b3cff2013-07-26 08:56:45 +08004710#: builtin/fetch.c:589
Jiang Xindce37b62012-02-13 14:37:59 +08004711msgid "[deleted]"
4712msgstr ""
4713
Jiang Xin28b3cff2013-07-26 08:56:45 +08004714#: builtin/fetch.c:590 builtin/remote.c:1055
Jiang Xindce37b62012-02-13 14:37:59 +08004715msgid "(none)"
4716msgstr ""
4717
Jiang Xin28b3cff2013-07-26 08:56:45 +08004718#: builtin/fetch.c:708
Jiang Xindce37b62012-02-13 14:37:59 +08004719#, c-format
4720msgid "Refusing to fetch into current branch %s of non-bare repository"
4721msgstr ""
4722
Jiang Xin28b3cff2013-07-26 08:56:45 +08004723#: builtin/fetch.c:742
Jiang Xindce37b62012-02-13 14:37:59 +08004724#, c-format
4725msgid "Don't know how to fetch from %s"
4726msgstr ""
4727
Jiang Xin28b3cff2013-07-26 08:56:45 +08004728#: builtin/fetch.c:823
Jiang Xindce37b62012-02-13 14:37:59 +08004729#, c-format
4730msgid "Option \"%s\" value \"%s\" is not valid for %s"
4731msgstr ""
4732
Jiang Xin28b3cff2013-07-26 08:56:45 +08004733#: builtin/fetch.c:826
Jiang Xindce37b62012-02-13 14:37:59 +08004734#, c-format
4735msgid "Option \"%s\" is ignored for %s\n"
4736msgstr ""
4737
Jiang Xin28b3cff2013-07-26 08:56:45 +08004738#: builtin/fetch.c:928
Jiang Xindce37b62012-02-13 14:37:59 +08004739#, c-format
4740msgid "Fetching %s\n"
4741msgstr ""
4742
Jiang Xin28b3cff2013-07-26 08:56:45 +08004743#: builtin/fetch.c:930 builtin/remote.c:100
Jiang Xindce37b62012-02-13 14:37:59 +08004744#, c-format
4745msgid "Could not fetch %s"
4746msgstr ""
4747
Jiang Xin28b3cff2013-07-26 08:56:45 +08004748#: builtin/fetch.c:949
Jiang Xindce37b62012-02-13 14:37:59 +08004749msgid ""
4750"No remote repository specified. Please, specify either a URL or a\n"
4751"remote name from which new revisions should be fetched."
4752msgstr ""
4753
Jiang Xin28b3cff2013-07-26 08:56:45 +08004754#: builtin/fetch.c:969
Jiang Xindce37b62012-02-13 14:37:59 +08004755msgid "You need to specify a tag name."
4756msgstr ""
4757
Jiang Xin28b3cff2013-07-26 08:56:45 +08004758#: builtin/fetch.c:1015
Jiang Xin9caaf232013-02-14 14:49:45 +08004759msgid "--depth and --unshallow cannot be used together"
4760msgstr ""
4761
Jiang Xin28b3cff2013-07-26 08:56:45 +08004762#: builtin/fetch.c:1017
Jiang Xin9caaf232013-02-14 14:49:45 +08004763msgid "--unshallow on a complete repository does not make sense"
4764msgstr ""
4765
Jiang Xin28b3cff2013-07-26 08:56:45 +08004766#: builtin/fetch.c:1036
Jiang Xindce37b62012-02-13 14:37:59 +08004767msgid "fetch --all does not take a repository argument"
4768msgstr ""
4769
Jiang Xin28b3cff2013-07-26 08:56:45 +08004770#: builtin/fetch.c:1038
Jiang Xindce37b62012-02-13 14:37:59 +08004771msgid "fetch --all does not make sense with refspecs"
4772msgstr ""
4773
Jiang Xin28b3cff2013-07-26 08:56:45 +08004774#: builtin/fetch.c:1049
Jiang Xindce37b62012-02-13 14:37:59 +08004775#, c-format
4776msgid "No such remote or remote group: %s"
4777msgstr ""
4778
Jiang Xin28b3cff2013-07-26 08:56:45 +08004779#: builtin/fetch.c:1057
Jiang Xindce37b62012-02-13 14:37:59 +08004780msgid "Fetching a group and specifying refspecs does not make sense"
4781msgstr ""
4782
Jiang Xincc760112012-09-15 10:26:13 +08004783#: builtin/fmt-merge-msg.c:13
4784msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4785msgstr ""
4786
Jiang Xin28b3cff2013-07-26 08:56:45 +08004787#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700
4788#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179
4789#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243
Jiang Xincc760112012-09-15 10:26:13 +08004790msgid "n"
4791msgstr ""
4792
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004793#: builtin/fmt-merge-msg.c:664
Jiang Xincc760112012-09-15 10:26:13 +08004794msgid "populate log with at most <n> entries from shortlog"
4795msgstr ""
4796
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004797#: builtin/fmt-merge-msg.c:667
Jiang Xincc760112012-09-15 10:26:13 +08004798msgid "alias for --log (deprecated)"
4799msgstr ""
4800
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004801#: builtin/fmt-merge-msg.c:670
Jiang Xincc760112012-09-15 10:26:13 +08004802msgid "text"
4803msgstr ""
4804
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004805#: builtin/fmt-merge-msg.c:671
Jiang Xincc760112012-09-15 10:26:13 +08004806msgid "use <text> as start of message"
4807msgstr ""
4808
Jiang Xinc6bc7d42013-04-30 08:31:19 +08004809#: builtin/fmt-merge-msg.c:672
Jiang Xincc760112012-09-15 10:26:13 +08004810msgid "file to read from"
4811msgstr ""
4812
4813#: builtin/for-each-ref.c:979
4814msgid "git for-each-ref [options] [<pattern>]"
4815msgstr ""
4816
4817#: builtin/for-each-ref.c:994
4818msgid "quote placeholders suitably for shells"
4819msgstr ""
4820
4821#: builtin/for-each-ref.c:996
4822msgid "quote placeholders suitably for perl"
4823msgstr ""
4824
4825#: builtin/for-each-ref.c:998
4826msgid "quote placeholders suitably for python"
4827msgstr ""
4828
4829#: builtin/for-each-ref.c:1000
4830msgid "quote placeholders suitably for tcl"
4831msgstr ""
4832
4833#: builtin/for-each-ref.c:1003
4834msgid "show only <n> matched refs"
4835msgstr ""
4836
4837#: builtin/for-each-ref.c:1004
4838msgid "format"
4839msgstr ""
4840
4841#: builtin/for-each-ref.c:1004
4842msgid "format to use for the output"
4843msgstr ""
4844
4845#: builtin/for-each-ref.c:1005
4846msgid "key"
4847msgstr ""
4848
4849#: builtin/for-each-ref.c:1006
4850msgid "field name to sort on"
4851msgstr ""
4852
4853#: builtin/fsck.c:608
4854msgid "git fsck [options] [<object>...]"
4855msgstr ""
4856
4857#: builtin/fsck.c:614
4858msgid "show unreachable objects"
4859msgstr ""
4860
4861#: builtin/fsck.c:615
4862msgid "show dangling objects"
4863msgstr ""
4864
4865#: builtin/fsck.c:616
4866msgid "report tags"
4867msgstr ""
4868
4869#: builtin/fsck.c:617
4870msgid "report root nodes"
4871msgstr ""
4872
4873#: builtin/fsck.c:618
4874msgid "make index objects head nodes"
4875msgstr ""
4876
4877#: builtin/fsck.c:619
4878msgid "make reflogs head nodes (default)"
4879msgstr ""
4880
4881#: builtin/fsck.c:620
4882msgid "also consider packs and alternate objects"
4883msgstr ""
4884
4885#: builtin/fsck.c:621
4886msgid "enable more strict checking"
4887msgstr ""
4888
4889#: builtin/fsck.c:623
4890msgid "write dangling objects in .git/lost-found"
4891msgstr ""
4892
4893#: builtin/fsck.c:624 builtin/prune.c:134
4894msgid "show progress"
4895msgstr ""
4896
4897#: builtin/gc.c:22
4898msgid "git gc [options]"
4899msgstr ""
4900
Jiang Xindce37b62012-02-13 14:37:59 +08004901#: builtin/gc.c:63
4902#, c-format
4903msgid "Invalid %s: '%s'"
4904msgstr ""
4905
Jiang Xin822e4a62012-05-08 16:10:22 +08004906#: builtin/gc.c:90
Jiang Xindce37b62012-02-13 14:37:59 +08004907#, c-format
4908msgid "insanely long object directory %.*s"
4909msgstr ""
4910
Jiang Xincc760112012-09-15 10:26:13 +08004911#: builtin/gc.c:179
4912msgid "prune unreferenced objects"
4913msgstr ""
4914
4915#: builtin/gc.c:181
4916msgid "be more thorough (increased runtime)"
4917msgstr ""
4918
4919#: builtin/gc.c:182
4920msgid "enable auto-gc mode"
4921msgstr ""
4922
Jiang Xin9306b5b2012-10-16 08:39:10 +08004923#: builtin/gc.c:222
Jiang Xindce37b62012-02-13 14:37:59 +08004924#, c-format
4925msgid ""
4926"Auto packing the repository for optimum performance. You may also\n"
4927"run \"git gc\" manually. See \"git help gc\" for more information.\n"
4928msgstr ""
4929
Jiang Xin9306b5b2012-10-16 08:39:10 +08004930#: builtin/gc.c:249
Jiang Xindce37b62012-02-13 14:37:59 +08004931msgid ""
4932"There are too many unreachable loose objects; run 'git prune' to remove them."
4933msgstr ""
4934
Jiang Xincc760112012-09-15 10:26:13 +08004935#: builtin/grep.c:22
4936msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4937msgstr ""
4938
Jiang Xin9306b5b2012-10-16 08:39:10 +08004939#: builtin/grep.c:217
Jiang Xindce37b62012-02-13 14:37:59 +08004940#, c-format
4941msgid "grep: failed to create thread: %s"
4942msgstr ""
4943
Jiang Xin28b3cff2013-07-26 08:56:45 +08004944#: builtin/grep.c:364
Jiang Xindce37b62012-02-13 14:37:59 +08004945#, c-format
4946msgid "Failed to chdir: %s"
4947msgstr ""
4948
Jiang Xin28b3cff2013-07-26 08:56:45 +08004949#: builtin/grep.c:442 builtin/grep.c:477
Jiang Xindce37b62012-02-13 14:37:59 +08004950#, c-format
4951msgid "unable to read tree (%s)"
4952msgstr ""
4953
Jiang Xin28b3cff2013-07-26 08:56:45 +08004954#: builtin/grep.c:492
Jiang Xindce37b62012-02-13 14:37:59 +08004955#, c-format
4956msgid "unable to grep from object of type %s"
4957msgstr ""
4958
Jiang Xin28b3cff2013-07-26 08:56:45 +08004959#: builtin/grep.c:550
Jiang Xindce37b62012-02-13 14:37:59 +08004960#, c-format
4961msgid "switch `%c' expects a numerical value"
4962msgstr ""
4963
Jiang Xin28b3cff2013-07-26 08:56:45 +08004964#: builtin/grep.c:567
Jiang Xindce37b62012-02-13 14:37:59 +08004965#, c-format
4966msgid "cannot open '%s'"
4967msgstr ""
4968
Jiang Xin28b3cff2013-07-26 08:56:45 +08004969#: builtin/grep.c:642
Jiang Xincc760112012-09-15 10:26:13 +08004970msgid "search in index instead of in the work tree"
4971msgstr ""
4972
Jiang Xin28b3cff2013-07-26 08:56:45 +08004973#: builtin/grep.c:644
Jiang Xincc760112012-09-15 10:26:13 +08004974msgid "find in contents not managed by git"
4975msgstr ""
4976
Jiang Xin28b3cff2013-07-26 08:56:45 +08004977#: builtin/grep.c:646
Jiang Xincc760112012-09-15 10:26:13 +08004978msgid "search in both tracked and untracked files"
4979msgstr ""
4980
Jiang Xin28b3cff2013-07-26 08:56:45 +08004981#: builtin/grep.c:648
Jiang Xincc760112012-09-15 10:26:13 +08004982msgid "search also in ignored files"
4983msgstr ""
4984
Jiang Xin28b3cff2013-07-26 08:56:45 +08004985#: builtin/grep.c:651
Jiang Xincc760112012-09-15 10:26:13 +08004986msgid "show non-matching lines"
4987msgstr ""
4988
Jiang Xin28b3cff2013-07-26 08:56:45 +08004989#: builtin/grep.c:653
Jiang Xincc760112012-09-15 10:26:13 +08004990msgid "case insensitive matching"
4991msgstr ""
4992
Jiang Xin28b3cff2013-07-26 08:56:45 +08004993#: builtin/grep.c:655
Jiang Xincc760112012-09-15 10:26:13 +08004994msgid "match patterns only at word boundaries"
4995msgstr ""
4996
Jiang Xin28b3cff2013-07-26 08:56:45 +08004997#: builtin/grep.c:657
Jiang Xincc760112012-09-15 10:26:13 +08004998msgid "process binary files as text"
4999msgstr ""
5000
Jiang Xin28b3cff2013-07-26 08:56:45 +08005001#: builtin/grep.c:659
Jiang Xincc760112012-09-15 10:26:13 +08005002msgid "don't match patterns in binary files"
5003msgstr ""
5004
Jiang Xin28b3cff2013-07-26 08:56:45 +08005005#: builtin/grep.c:662
Jiang Xincc760112012-09-15 10:26:13 +08005006msgid "descend at most <depth> levels"
5007msgstr ""
5008
Jiang Xin28b3cff2013-07-26 08:56:45 +08005009#: builtin/grep.c:666
Jiang Xincc760112012-09-15 10:26:13 +08005010msgid "use extended POSIX regular expressions"
5011msgstr ""
5012
Jiang Xin28b3cff2013-07-26 08:56:45 +08005013#: builtin/grep.c:669
Jiang Xincc760112012-09-15 10:26:13 +08005014msgid "use basic POSIX regular expressions (default)"
5015msgstr ""
5016
Jiang Xin28b3cff2013-07-26 08:56:45 +08005017#: builtin/grep.c:672
Jiang Xincc760112012-09-15 10:26:13 +08005018msgid "interpret patterns as fixed strings"
5019msgstr ""
5020
Jiang Xin28b3cff2013-07-26 08:56:45 +08005021#: builtin/grep.c:675
Jiang Xincc760112012-09-15 10:26:13 +08005022msgid "use Perl-compatible regular expressions"
5023msgstr ""
5024
Jiang Xin28b3cff2013-07-26 08:56:45 +08005025#: builtin/grep.c:678
Jiang Xincc760112012-09-15 10:26:13 +08005026msgid "show line numbers"
5027msgstr ""
5028
Jiang Xin28b3cff2013-07-26 08:56:45 +08005029#: builtin/grep.c:679
Jiang Xincc760112012-09-15 10:26:13 +08005030msgid "don't show filenames"
5031msgstr ""
5032
Jiang Xin28b3cff2013-07-26 08:56:45 +08005033#: builtin/grep.c:680
Jiang Xincc760112012-09-15 10:26:13 +08005034msgid "show filenames"
5035msgstr ""
5036
Jiang Xin28b3cff2013-07-26 08:56:45 +08005037#: builtin/grep.c:682
Jiang Xincc760112012-09-15 10:26:13 +08005038msgid "show filenames relative to top directory"
5039msgstr ""
5040
Jiang Xin28b3cff2013-07-26 08:56:45 +08005041#: builtin/grep.c:684
Jiang Xincc760112012-09-15 10:26:13 +08005042msgid "show only filenames instead of matching lines"
5043msgstr ""
5044
Jiang Xin28b3cff2013-07-26 08:56:45 +08005045#: builtin/grep.c:686
Jiang Xincc760112012-09-15 10:26:13 +08005046msgid "synonym for --files-with-matches"
5047msgstr ""
5048
Jiang Xin28b3cff2013-07-26 08:56:45 +08005049#: builtin/grep.c:689
Jiang Xincc760112012-09-15 10:26:13 +08005050msgid "show only the names of files without match"
5051msgstr ""
5052
Jiang Xin28b3cff2013-07-26 08:56:45 +08005053#: builtin/grep.c:691
Jiang Xincc760112012-09-15 10:26:13 +08005054msgid "print NUL after filenames"
5055msgstr ""
5056
Jiang Xin28b3cff2013-07-26 08:56:45 +08005057#: builtin/grep.c:693
Jiang Xincc760112012-09-15 10:26:13 +08005058msgid "show the number of matches instead of matching lines"
5059msgstr ""
5060
Jiang Xin28b3cff2013-07-26 08:56:45 +08005061#: builtin/grep.c:694
Jiang Xincc760112012-09-15 10:26:13 +08005062msgid "highlight matches"
5063msgstr ""
5064
Jiang Xin28b3cff2013-07-26 08:56:45 +08005065#: builtin/grep.c:696
Jiang Xincc760112012-09-15 10:26:13 +08005066msgid "print empty line between matches from different files"
5067msgstr ""
5068
Jiang Xin28b3cff2013-07-26 08:56:45 +08005069#: builtin/grep.c:698
Jiang Xincc760112012-09-15 10:26:13 +08005070msgid "show filename only once above matches from same file"
5071msgstr ""
5072
Jiang Xin28b3cff2013-07-26 08:56:45 +08005073#: builtin/grep.c:701
Jiang Xincc760112012-09-15 10:26:13 +08005074msgid "show <n> context lines before and after matches"
5075msgstr ""
5076
Jiang Xin28b3cff2013-07-26 08:56:45 +08005077#: builtin/grep.c:704
Jiang Xincc760112012-09-15 10:26:13 +08005078msgid "show <n> context lines before matches"
5079msgstr ""
5080
Jiang Xin28b3cff2013-07-26 08:56:45 +08005081#: builtin/grep.c:706
Jiang Xincc760112012-09-15 10:26:13 +08005082msgid "show <n> context lines after matches"
5083msgstr ""
5084
Jiang Xin28b3cff2013-07-26 08:56:45 +08005085#: builtin/grep.c:707
Jiang Xincc760112012-09-15 10:26:13 +08005086msgid "shortcut for -C NUM"
5087msgstr ""
5088
Jiang Xin28b3cff2013-07-26 08:56:45 +08005089#: builtin/grep.c:710
Jiang Xincc760112012-09-15 10:26:13 +08005090msgid "show a line with the function name before matches"
5091msgstr ""
5092
Jiang Xin28b3cff2013-07-26 08:56:45 +08005093#: builtin/grep.c:712
Jiang Xincc760112012-09-15 10:26:13 +08005094msgid "show the surrounding function"
5095msgstr ""
5096
Jiang Xin28b3cff2013-07-26 08:56:45 +08005097#: builtin/grep.c:715
Jiang Xincc760112012-09-15 10:26:13 +08005098msgid "read patterns from file"
5099msgstr ""
5100
Jiang Xin28b3cff2013-07-26 08:56:45 +08005101#: builtin/grep.c:717
Jiang Xincc760112012-09-15 10:26:13 +08005102msgid "match <pattern>"
5103msgstr ""
5104
Jiang Xin28b3cff2013-07-26 08:56:45 +08005105#: builtin/grep.c:719
Jiang Xincc760112012-09-15 10:26:13 +08005106msgid "combine patterns specified with -e"
5107msgstr ""
5108
Jiang Xin28b3cff2013-07-26 08:56:45 +08005109#: builtin/grep.c:731
Jiang Xincc760112012-09-15 10:26:13 +08005110msgid "indicate hit with exit status without output"
5111msgstr ""
5112
Jiang Xin28b3cff2013-07-26 08:56:45 +08005113#: builtin/grep.c:733
Jiang Xincc760112012-09-15 10:26:13 +08005114msgid "show only matches from files that match all patterns"
5115msgstr ""
5116
Jiang Xin28b3cff2013-07-26 08:56:45 +08005117#: builtin/grep.c:735
Jiang Xin9306b5b2012-10-16 08:39:10 +08005118msgid "show parse tree for grep expression"
5119msgstr ""
5120
Jiang Xin28b3cff2013-07-26 08:56:45 +08005121#: builtin/grep.c:739
Jiang Xincc760112012-09-15 10:26:13 +08005122msgid "pager"
5123msgstr ""
5124
Jiang Xin28b3cff2013-07-26 08:56:45 +08005125#: builtin/grep.c:739
Jiang Xincc760112012-09-15 10:26:13 +08005126msgid "show matching files in the pager"
5127msgstr ""
5128
Jiang Xin28b3cff2013-07-26 08:56:45 +08005129#: builtin/grep.c:742
Jiang Xincc760112012-09-15 10:26:13 +08005130msgid "allow calling of grep(1) (ignored by this build)"
5131msgstr ""
5132
Jiang Xin28b3cff2013-07-26 08:56:45 +08005133#: builtin/grep.c:743 builtin/show-ref.c:188
Jiang Xincc760112012-09-15 10:26:13 +08005134msgid "show usage"
5135msgstr ""
5136
Jiang Xin28b3cff2013-07-26 08:56:45 +08005137#: builtin/grep.c:810
Jiang Xindce37b62012-02-13 14:37:59 +08005138msgid "no pattern given."
5139msgstr ""
5140
Jiang Xin28b3cff2013-07-26 08:56:45 +08005141#: builtin/grep.c:865
Jiang Xindce37b62012-02-13 14:37:59 +08005142msgid "--open-files-in-pager only works on the worktree"
5143msgstr ""
5144
Jiang Xin28b3cff2013-07-26 08:56:45 +08005145#: builtin/grep.c:888
Jiang Xindce37b62012-02-13 14:37:59 +08005146msgid "--cached or --untracked cannot be used with --no-index."
5147msgstr ""
5148
Jiang Xin28b3cff2013-07-26 08:56:45 +08005149#: builtin/grep.c:893
Jiang Xindce37b62012-02-13 14:37:59 +08005150msgid "--no-index or --untracked cannot be used with revs."
5151msgstr ""
5152
Jiang Xin28b3cff2013-07-26 08:56:45 +08005153#: builtin/grep.c:896
Jiang Xindce37b62012-02-13 14:37:59 +08005154msgid "--[no-]exclude-standard cannot be used for tracked contents."
5155msgstr ""
5156
Jiang Xin28b3cff2013-07-26 08:56:45 +08005157#: builtin/grep.c:904
Jiang Xindce37b62012-02-13 14:37:59 +08005158msgid "both --cached and trees are given."
5159msgstr ""
5160
Jiang Xincc760112012-09-15 10:26:13 +08005161#: builtin/hash-object.c:60
5162msgid ""
5163"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
5164"<file>..."
5165msgstr ""
5166
5167#: builtin/hash-object.c:61
5168msgid "git hash-object --stdin-paths < <list-of-paths>"
5169msgstr ""
5170
5171#: builtin/hash-object.c:72
5172msgid "type"
5173msgstr ""
5174
5175#: builtin/hash-object.c:72
5176msgid "object type"
5177msgstr ""
5178
5179#: builtin/hash-object.c:73
5180msgid "write the object into the object database"
5181msgstr ""
5182
5183#: builtin/hash-object.c:74
5184msgid "read the object from stdin"
5185msgstr ""
5186
5187#: builtin/hash-object.c:76
5188msgid "store file as is without filters"
5189msgstr ""
5190
5191#: builtin/hash-object.c:77
5192msgid "process file as it were from this path"
5193msgstr ""
5194
Jiang Xin28b3cff2013-07-26 08:56:45 +08005195#: builtin/help.c:41
Jiang Xincc760112012-09-15 10:26:13 +08005196msgid "print all available commands"
5197msgstr ""
5198
Jiang Xin28b3cff2013-07-26 08:56:45 +08005199#: builtin/help.c:42
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005200msgid "print list of useful guides"
5201msgstr ""
5202
Jiang Xin28b3cff2013-07-26 08:56:45 +08005203#: builtin/help.c:43
Jiang Xincc760112012-09-15 10:26:13 +08005204msgid "show man page"
5205msgstr ""
5206
Jiang Xin28b3cff2013-07-26 08:56:45 +08005207#: builtin/help.c:44
Jiang Xincc760112012-09-15 10:26:13 +08005208msgid "show manual in web browser"
5209msgstr ""
5210
Jiang Xin28b3cff2013-07-26 08:56:45 +08005211#: builtin/help.c:46
Jiang Xincc760112012-09-15 10:26:13 +08005212msgid "show info page"
5213msgstr ""
5214
Jiang Xin28b3cff2013-07-26 08:56:45 +08005215#: builtin/help.c:52
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005216msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
Jiang Xincc760112012-09-15 10:26:13 +08005217msgstr ""
5218
Jiang Xin28b3cff2013-07-26 08:56:45 +08005219#: builtin/help.c:64
Jiang Xin822e4a62012-05-08 16:10:22 +08005220#, c-format
5221msgid "unrecognized help format '%s'"
5222msgstr ""
5223
Jiang Xin28b3cff2013-07-26 08:56:45 +08005224#: builtin/help.c:92
Jiang Xin822e4a62012-05-08 16:10:22 +08005225msgid "Failed to start emacsclient."
5226msgstr ""
5227
Jiang Xin28b3cff2013-07-26 08:56:45 +08005228#: builtin/help.c:105
Jiang Xin822e4a62012-05-08 16:10:22 +08005229msgid "Failed to parse emacsclient version."
5230msgstr ""
5231
Jiang Xin28b3cff2013-07-26 08:56:45 +08005232#: builtin/help.c:113
Jiang Xin822e4a62012-05-08 16:10:22 +08005233#, c-format
5234msgid "emacsclient version '%d' too old (< 22)."
5235msgstr ""
5236
Jiang Xin28b3cff2013-07-26 08:56:45 +08005237#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176
Jiang Xin822e4a62012-05-08 16:10:22 +08005238#, c-format
5239msgid "failed to exec '%s': %s"
5240msgstr ""
5241
Jiang Xin28b3cff2013-07-26 08:56:45 +08005242#: builtin/help.c:216
Jiang Xin822e4a62012-05-08 16:10:22 +08005243#, c-format
5244msgid ""
5245"'%s': path for unsupported man viewer.\n"
5246"Please consider using 'man.<tool>.cmd' instead."
5247msgstr ""
5248
Jiang Xin28b3cff2013-07-26 08:56:45 +08005249#: builtin/help.c:228
Jiang Xin822e4a62012-05-08 16:10:22 +08005250#, c-format
5251msgid ""
5252"'%s': cmd for supported man viewer.\n"
5253"Please consider using 'man.<tool>.path' instead."
5254msgstr ""
5255
Jiang Xin28b3cff2013-07-26 08:56:45 +08005256#: builtin/help.c:349
Jiang Xin822e4a62012-05-08 16:10:22 +08005257#, c-format
5258msgid "'%s': unknown man viewer."
5259msgstr ""
5260
Jiang Xin28b3cff2013-07-26 08:56:45 +08005261#: builtin/help.c:366
Jiang Xin822e4a62012-05-08 16:10:22 +08005262msgid "no man viewer handled the request"
5263msgstr ""
5264
Jiang Xin28b3cff2013-07-26 08:56:45 +08005265#: builtin/help.c:374
Jiang Xin822e4a62012-05-08 16:10:22 +08005266msgid "no info viewer handled the request"
5267msgstr ""
5268
Jiang Xin28b3cff2013-07-26 08:56:45 +08005269#: builtin/help.c:420
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005270msgid "Defining attributes per path"
5271msgstr ""
5272
Jiang Xin28b3cff2013-07-26 08:56:45 +08005273#: builtin/help.c:421
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005274msgid "A Git glossary"
5275msgstr ""
5276
Jiang Xin28b3cff2013-07-26 08:56:45 +08005277#: builtin/help.c:422
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005278msgid "Specifies intentionally untracked files to ignore"
5279msgstr ""
5280
Jiang Xin28b3cff2013-07-26 08:56:45 +08005281#: builtin/help.c:423
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005282msgid "Defining submodule properties"
5283msgstr ""
5284
Jiang Xin28b3cff2013-07-26 08:56:45 +08005285#: builtin/help.c:424
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005286msgid "Specifying revisions and ranges for Git"
5287msgstr ""
5288
Jiang Xin28b3cff2013-07-26 08:56:45 +08005289#: builtin/help.c:425
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005290msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5291msgstr ""
5292
Jiang Xin28b3cff2013-07-26 08:56:45 +08005293#: builtin/help.c:426
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005294msgid "An overview of recommended workflows with Git"
5295msgstr ""
5296
Jiang Xin28b3cff2013-07-26 08:56:45 +08005297#: builtin/help.c:438
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005298msgid "The common Git guides are:\n"
5299msgstr ""
5300
Jiang Xin28b3cff2013-07-26 08:56:45 +08005301#: builtin/help.c:460 builtin/help.c:476
Jiang Xin822e4a62012-05-08 16:10:22 +08005302#, c-format
5303msgid "usage: %s%s"
5304msgstr ""
5305
Jiang Xin28b3cff2013-07-26 08:56:45 +08005306#: builtin/help.c:492
Jiang Xin822e4a62012-05-08 16:10:22 +08005307#, c-format
5308msgid "`git %s' is aliased to `%s'"
5309msgstr ""
5310
Jiang Xin28b3cff2013-07-26 08:56:45 +08005311#: builtin/index-pack.c:184
Jiang Xin822e4a62012-05-08 16:10:22 +08005312#, c-format
5313msgid "object type mismatch at %s"
5314msgstr ""
5315
Jiang Xin28b3cff2013-07-26 08:56:45 +08005316#: builtin/index-pack.c:204
Jiang Xin822e4a62012-05-08 16:10:22 +08005317msgid "object of unexpected type"
5318msgstr ""
5319
Jiang Xin28b3cff2013-07-26 08:56:45 +08005320#: builtin/index-pack.c:244
Jiang Xin822e4a62012-05-08 16:10:22 +08005321#, c-format
5322msgid "cannot fill %d byte"
5323msgid_plural "cannot fill %d bytes"
5324msgstr[0] ""
5325msgstr[1] ""
5326
Jiang Xin28b3cff2013-07-26 08:56:45 +08005327#: builtin/index-pack.c:254
Jiang Xin822e4a62012-05-08 16:10:22 +08005328msgid "early EOF"
5329msgstr ""
5330
Jiang Xin28b3cff2013-07-26 08:56:45 +08005331#: builtin/index-pack.c:255
Jiang Xin822e4a62012-05-08 16:10:22 +08005332msgid "read error on input"
5333msgstr ""
5334
Jiang Xin28b3cff2013-07-26 08:56:45 +08005335#: builtin/index-pack.c:267
Jiang Xin822e4a62012-05-08 16:10:22 +08005336msgid "used more bytes than were available"
5337msgstr ""
5338
Jiang Xin28b3cff2013-07-26 08:56:45 +08005339#: builtin/index-pack.c:274
Jiang Xin822e4a62012-05-08 16:10:22 +08005340msgid "pack too large for current definition of off_t"
5341msgstr ""
5342
Jiang Xinc138af52013-04-10 15:19:54 +08005343#: builtin/index-pack.c:290
Jiang Xin822e4a62012-05-08 16:10:22 +08005344#, c-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08005345msgid "unable to create '%s'"
5346msgstr ""
5347
5348#: builtin/index-pack.c:295
5349#, c-format
Jiang Xin822e4a62012-05-08 16:10:22 +08005350msgid "cannot open packfile '%s'"
5351msgstr ""
5352
Jiang Xin28b3cff2013-07-26 08:56:45 +08005353#: builtin/index-pack.c:309
Jiang Xin822e4a62012-05-08 16:10:22 +08005354msgid "pack signature mismatch"
5355msgstr ""
5356
Jiang Xin28b3cff2013-07-26 08:56:45 +08005357#: builtin/index-pack.c:311
Jiang Xincc760112012-09-15 10:26:13 +08005358#, c-format
5359msgid "pack version %<PRIu32> unsupported"
5360msgstr ""
5361
Jiang Xin28b3cff2013-07-26 08:56:45 +08005362#: builtin/index-pack.c:329
Jiang Xin822e4a62012-05-08 16:10:22 +08005363#, c-format
5364msgid "pack has bad object at offset %lu: %s"
5365msgstr ""
5366
Jiang Xin28b3cff2013-07-26 08:56:45 +08005367#: builtin/index-pack.c:451
Jiang Xin822e4a62012-05-08 16:10:22 +08005368#, c-format
5369msgid "inflate returned %d"
5370msgstr ""
5371
Jiang Xin28b3cff2013-07-26 08:56:45 +08005372#: builtin/index-pack.c:500
Jiang Xin822e4a62012-05-08 16:10:22 +08005373msgid "offset value overflow for delta base object"
5374msgstr ""
5375
Jiang Xin28b3cff2013-07-26 08:56:45 +08005376#: builtin/index-pack.c:508
Jiang Xin822e4a62012-05-08 16:10:22 +08005377msgid "delta base offset is out of bound"
5378msgstr ""
5379
Jiang Xin28b3cff2013-07-26 08:56:45 +08005380#: builtin/index-pack.c:516
Jiang Xin822e4a62012-05-08 16:10:22 +08005381#, c-format
5382msgid "unknown object type %d"
5383msgstr ""
5384
Jiang Xin28b3cff2013-07-26 08:56:45 +08005385#: builtin/index-pack.c:547
Jiang Xin822e4a62012-05-08 16:10:22 +08005386msgid "cannot pread pack file"
5387msgstr ""
5388
Jiang Xin28b3cff2013-07-26 08:56:45 +08005389#: builtin/index-pack.c:549
Jiang Xin822e4a62012-05-08 16:10:22 +08005390#, c-format
5391msgid "premature end of pack file, %lu byte missing"
5392msgid_plural "premature end of pack file, %lu bytes missing"
5393msgstr[0] ""
5394msgstr[1] ""
5395
Jiang Xin28b3cff2013-07-26 08:56:45 +08005396#: builtin/index-pack.c:575
Jiang Xin822e4a62012-05-08 16:10:22 +08005397msgid "serious inflate inconsistency"
5398msgstr ""
5399
Jiang Xin28b3cff2013-07-26 08:56:45 +08005400#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695
5401#: builtin/index-pack.c:729 builtin/index-pack.c:738
Jiang Xin822e4a62012-05-08 16:10:22 +08005402#, c-format
5403msgid "SHA1 COLLISION FOUND WITH %s !"
5404msgstr ""
5405
Jiang Xin28b3cff2013-07-26 08:56:45 +08005406#: builtin/index-pack.c:669 builtin/pack-objects.c:170
Jiang Xin11b90172012-07-03 10:31:59 +08005407#: builtin/pack-objects.c:262
5408#, c-format
5409msgid "unable to read %s"
5410msgstr ""
5411
Jiang Xin28b3cff2013-07-26 08:56:45 +08005412#: builtin/index-pack.c:735
Jiang Xin11b90172012-07-03 10:31:59 +08005413#, c-format
5414msgid "cannot read existing object %s"
5415msgstr ""
5416
Jiang Xin28b3cff2013-07-26 08:56:45 +08005417#: builtin/index-pack.c:749
Jiang Xin822e4a62012-05-08 16:10:22 +08005418#, c-format
5419msgid "invalid blob object %s"
5420msgstr ""
5421
Jiang Xin28b3cff2013-07-26 08:56:45 +08005422#: builtin/index-pack.c:763
Jiang Xin822e4a62012-05-08 16:10:22 +08005423#, c-format
5424msgid "invalid %s"
5425msgstr ""
5426
Jiang Xin28b3cff2013-07-26 08:56:45 +08005427#: builtin/index-pack.c:766
Jiang Xin822e4a62012-05-08 16:10:22 +08005428msgid "Error in object"
5429msgstr ""
5430
Jiang Xin28b3cff2013-07-26 08:56:45 +08005431#: builtin/index-pack.c:768
Jiang Xin822e4a62012-05-08 16:10:22 +08005432#, c-format
5433msgid "Not all child objects of %s are reachable"
5434msgstr ""
5435
Jiang Xin28b3cff2013-07-26 08:56:45 +08005436#: builtin/index-pack.c:838 builtin/index-pack.c:868
Jiang Xin822e4a62012-05-08 16:10:22 +08005437msgid "failed to apply delta"
5438msgstr ""
5439
Jiang Xin28b3cff2013-07-26 08:56:45 +08005440#: builtin/index-pack.c:1009
Jiang Xin822e4a62012-05-08 16:10:22 +08005441msgid "Receiving objects"
5442msgstr ""
5443
Jiang Xin28b3cff2013-07-26 08:56:45 +08005444#: builtin/index-pack.c:1009
Jiang Xin822e4a62012-05-08 16:10:22 +08005445msgid "Indexing objects"
5446msgstr ""
5447
Jiang Xin28b3cff2013-07-26 08:56:45 +08005448#: builtin/index-pack.c:1035
Jiang Xin822e4a62012-05-08 16:10:22 +08005449msgid "pack is corrupted (SHA1 mismatch)"
5450msgstr ""
5451
Jiang Xin28b3cff2013-07-26 08:56:45 +08005452#: builtin/index-pack.c:1040
Jiang Xin822e4a62012-05-08 16:10:22 +08005453msgid "cannot fstat packfile"
5454msgstr ""
5455
Jiang Xin28b3cff2013-07-26 08:56:45 +08005456#: builtin/index-pack.c:1043
Jiang Xin822e4a62012-05-08 16:10:22 +08005457msgid "pack has junk at the end"
5458msgstr ""
5459
Jiang Xin28b3cff2013-07-26 08:56:45 +08005460#: builtin/index-pack.c:1054
Jiang Xin11b90172012-07-03 10:31:59 +08005461msgid "confusion beyond insanity in parse_pack_objects()"
5462msgstr ""
5463
Jiang Xin28b3cff2013-07-26 08:56:45 +08005464#: builtin/index-pack.c:1077
Jiang Xin822e4a62012-05-08 16:10:22 +08005465msgid "Resolving deltas"
5466msgstr ""
5467
Jiang Xin28b3cff2013-07-26 08:56:45 +08005468#: builtin/index-pack.c:1087
Jiang Xincc760112012-09-15 10:26:13 +08005469#, c-format
5470msgid "unable to create thread: %s"
5471msgstr ""
5472
Jiang Xin28b3cff2013-07-26 08:56:45 +08005473#: builtin/index-pack.c:1129
Jiang Xin93329722012-05-15 06:43:03 +08005474msgid "confusion beyond insanity"
5475msgstr ""
5476
Jiang Xin28b3cff2013-07-26 08:56:45 +08005477#: builtin/index-pack.c:1137
Jiang Xincc760112012-09-15 10:26:13 +08005478#, c-format
5479msgid "completed with %d local objects"
5480msgstr ""
5481
Jiang Xin28b3cff2013-07-26 08:56:45 +08005482#: builtin/index-pack.c:1147
Jiang Xincc760112012-09-15 10:26:13 +08005483#, c-format
5484msgid "Unexpected tail checksum for %s (disk corruption?)"
5485msgstr ""
5486
Jiang Xin28b3cff2013-07-26 08:56:45 +08005487#: builtin/index-pack.c:1151
Jiang Xin93329722012-05-15 06:43:03 +08005488#, c-format
5489msgid "pack has %d unresolved delta"
5490msgid_plural "pack has %d unresolved deltas"
5491msgstr[0] ""
5492msgstr[1] ""
5493
Jiang Xin28b3cff2013-07-26 08:56:45 +08005494#: builtin/index-pack.c:1176
Jiang Xin822e4a62012-05-08 16:10:22 +08005495#, c-format
5496msgid "unable to deflate appended object (%d)"
5497msgstr ""
5498
Jiang Xin28b3cff2013-07-26 08:56:45 +08005499#: builtin/index-pack.c:1255
Jiang Xin822e4a62012-05-08 16:10:22 +08005500#, c-format
5501msgid "local object %s is corrupt"
5502msgstr ""
5503
Jiang Xin28b3cff2013-07-26 08:56:45 +08005504#: builtin/index-pack.c:1279
Jiang Xin822e4a62012-05-08 16:10:22 +08005505msgid "error while closing pack file"
5506msgstr ""
5507
Jiang Xin28b3cff2013-07-26 08:56:45 +08005508#: builtin/index-pack.c:1292
Jiang Xin822e4a62012-05-08 16:10:22 +08005509#, c-format
5510msgid "cannot write keep file '%s'"
5511msgstr ""
5512
Jiang Xin28b3cff2013-07-26 08:56:45 +08005513#: builtin/index-pack.c:1300
Jiang Xin822e4a62012-05-08 16:10:22 +08005514#, c-format
5515msgid "cannot close written keep file '%s'"
5516msgstr ""
5517
Jiang Xin28b3cff2013-07-26 08:56:45 +08005518#: builtin/index-pack.c:1313
Jiang Xin822e4a62012-05-08 16:10:22 +08005519msgid "cannot store pack file"
5520msgstr ""
5521
Jiang Xin28b3cff2013-07-26 08:56:45 +08005522#: builtin/index-pack.c:1324
Jiang Xin822e4a62012-05-08 16:10:22 +08005523msgid "cannot store index file"
5524msgstr ""
5525
Jiang Xin28b3cff2013-07-26 08:56:45 +08005526#: builtin/index-pack.c:1357
Jiang Xincc760112012-09-15 10:26:13 +08005527#, c-format
5528msgid "bad pack.indexversion=%<PRIu32>"
5529msgstr ""
5530
Jiang Xin28b3cff2013-07-26 08:56:45 +08005531#: builtin/index-pack.c:1363
Jiang Xincc760112012-09-15 10:26:13 +08005532#, c-format
5533msgid "invalid number of threads specified (%d)"
5534msgstr ""
5535
Jiang Xin28b3cff2013-07-26 08:56:45 +08005536#: builtin/index-pack.c:1367 builtin/index-pack.c:1545
Jiang Xincc760112012-09-15 10:26:13 +08005537#, c-format
5538msgid "no threads support, ignoring %s"
5539msgstr ""
5540
Jiang Xin28b3cff2013-07-26 08:56:45 +08005541#: builtin/index-pack.c:1425
Jiang Xin822e4a62012-05-08 16:10:22 +08005542#, c-format
5543msgid "Cannot open existing pack file '%s'"
5544msgstr ""
5545
Jiang Xin28b3cff2013-07-26 08:56:45 +08005546#: builtin/index-pack.c:1427
Jiang Xin822e4a62012-05-08 16:10:22 +08005547#, c-format
5548msgid "Cannot open existing pack idx file for '%s'"
5549msgstr ""
5550
Jiang Xin28b3cff2013-07-26 08:56:45 +08005551#: builtin/index-pack.c:1474
Jiang Xin822e4a62012-05-08 16:10:22 +08005552#, c-format
5553msgid "non delta: %d object"
5554msgid_plural "non delta: %d objects"
5555msgstr[0] ""
5556msgstr[1] ""
5557
Jiang Xin28b3cff2013-07-26 08:56:45 +08005558#: builtin/index-pack.c:1481
Jiang Xin822e4a62012-05-08 16:10:22 +08005559#, c-format
5560msgid "chain length = %d: %lu object"
5561msgid_plural "chain length = %d: %lu objects"
5562msgstr[0] ""
5563msgstr[1] ""
5564
Jiang Xin28b3cff2013-07-26 08:56:45 +08005565#: builtin/index-pack.c:1509
Jiang Xin822e4a62012-05-08 16:10:22 +08005566msgid "Cannot come back to cwd"
5567msgstr ""
5568
Jiang Xin28b3cff2013-07-26 08:56:45 +08005569#: builtin/index-pack.c:1557 builtin/index-pack.c:1560
5570#: builtin/index-pack.c:1572 builtin/index-pack.c:1576
Jiang Xin822e4a62012-05-08 16:10:22 +08005571#, c-format
5572msgid "bad %s"
5573msgstr ""
5574
Jiang Xin28b3cff2013-07-26 08:56:45 +08005575#: builtin/index-pack.c:1590
Jiang Xin822e4a62012-05-08 16:10:22 +08005576msgid "--fix-thin cannot be used without --stdin"
5577msgstr ""
5578
Jiang Xin28b3cff2013-07-26 08:56:45 +08005579#: builtin/index-pack.c:1594 builtin/index-pack.c:1604
Jiang Xin822e4a62012-05-08 16:10:22 +08005580#, c-format
5581msgid "packfile name '%s' does not end with '.pack'"
5582msgstr ""
5583
Jiang Xin28b3cff2013-07-26 08:56:45 +08005584#: builtin/index-pack.c:1613
Jiang Xin822e4a62012-05-08 16:10:22 +08005585msgid "--verify with no packfile name given"
5586msgstr ""
5587
Jiang Xindce37b62012-02-13 14:37:59 +08005588#: builtin/init-db.c:35
5589#, c-format
5590msgid "Could not make %s writable by group"
5591msgstr ""
5592
5593#: builtin/init-db.c:62
5594#, c-format
5595msgid "insanely long template name %s"
5596msgstr ""
5597
5598#: builtin/init-db.c:67
5599#, c-format
5600msgid "cannot stat '%s'"
5601msgstr ""
5602
5603#: builtin/init-db.c:73
5604#, c-format
5605msgid "cannot stat template '%s'"
5606msgstr ""
5607
5608#: builtin/init-db.c:80
5609#, c-format
5610msgid "cannot opendir '%s'"
5611msgstr ""
5612
5613#: builtin/init-db.c:97
5614#, c-format
5615msgid "cannot readlink '%s'"
5616msgstr ""
5617
5618#: builtin/init-db.c:99
5619#, c-format
5620msgid "insanely long symlink %s"
5621msgstr ""
5622
5623#: builtin/init-db.c:102
5624#, c-format
5625msgid "cannot symlink '%s' '%s'"
5626msgstr ""
5627
5628#: builtin/init-db.c:106
5629#, c-format
5630msgid "cannot copy '%s' to '%s'"
5631msgstr ""
5632
5633#: builtin/init-db.c:110
5634#, c-format
5635msgid "ignoring template %s"
5636msgstr ""
5637
5638#: builtin/init-db.c:133
5639#, c-format
5640msgid "insanely long template path %s"
5641msgstr ""
5642
5643#: builtin/init-db.c:141
5644#, c-format
5645msgid "templates not found %s"
5646msgstr ""
5647
5648#: builtin/init-db.c:154
5649#, c-format
5650msgid "not copying templates of a wrong format version %d from '%s'"
5651msgstr ""
5652
5653#: builtin/init-db.c:192
5654#, c-format
5655msgid "insane git directory %s"
5656msgstr ""
5657
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005658#: builtin/init-db.c:323 builtin/init-db.c:326
Jiang Xindce37b62012-02-13 14:37:59 +08005659#, c-format
5660msgid "%s already exists"
5661msgstr ""
5662
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005663#: builtin/init-db.c:355
Jiang Xindce37b62012-02-13 14:37:59 +08005664#, c-format
5665msgid "unable to handle file type %d"
5666msgstr ""
5667
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005668#: builtin/init-db.c:358
Jiang Xindce37b62012-02-13 14:37:59 +08005669#, c-format
5670msgid "unable to move %s to %s"
5671msgstr ""
5672
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005673#: builtin/init-db.c:363
Jiang Xindce37b62012-02-13 14:37:59 +08005674#, c-format
5675msgid "Could not create git link %s"
5676msgstr ""
5677
5678#.
5679#. * TRANSLATORS: The first '%s' is either "Reinitialized
5680#. * existing" or "Initialized empty", the second " shared" or
5681#. * "", and the last '%s%s' is the verbatim directory name.
5682#.
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005683#: builtin/init-db.c:420
Jiang Xindce37b62012-02-13 14:37:59 +08005684#, c-format
5685msgid "%s%s Git repository in %s%s\n"
5686msgstr ""
5687
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005688#: builtin/init-db.c:421
Jiang Xindce37b62012-02-13 14:37:59 +08005689msgid "Reinitialized existing"
5690msgstr ""
5691
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005692#: builtin/init-db.c:421
Jiang Xindce37b62012-02-13 14:37:59 +08005693msgid "Initialized empty"
5694msgstr ""
5695
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005696#: builtin/init-db.c:422
Jiang Xindce37b62012-02-13 14:37:59 +08005697msgid " shared"
5698msgstr ""
5699
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005700#: builtin/init-db.c:441
Jiang Xindce37b62012-02-13 14:37:59 +08005701msgid "cannot tell cwd"
5702msgstr ""
5703
Jiang Xincc760112012-09-15 10:26:13 +08005704#: builtin/init-db.c:467
5705msgid ""
Jiang Xin9caaf232013-02-14 14:49:45 +08005706"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5707"shared[=<permissions>]] [directory]"
Jiang Xincc760112012-09-15 10:26:13 +08005708msgstr ""
5709
5710#: builtin/init-db.c:490
5711msgid "permissions"
5712msgstr ""
5713
5714#: builtin/init-db.c:491
5715msgid "specify that the git repository is to be shared amongst several users"
5716msgstr ""
5717
Jiang Xin28b3cff2013-07-26 08:56:45 +08005718#: builtin/init-db.c:493 builtin/prune-packed.c:75
Jiang Xincc760112012-09-15 10:26:13 +08005719msgid "be quiet"
5720msgstr ""
5721
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005722#: builtin/init-db.c:522 builtin/init-db.c:529
Jiang Xindce37b62012-02-13 14:37:59 +08005723#, c-format
5724msgid "cannot mkdir %s"
5725msgstr ""
5726
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005727#: builtin/init-db.c:533
Jiang Xindce37b62012-02-13 14:37:59 +08005728#, c-format
5729msgid "cannot chdir to %s"
5730msgstr ""
5731
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005732#: builtin/init-db.c:555
Jiang Xindce37b62012-02-13 14:37:59 +08005733#, c-format
5734msgid ""
5735"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
5736"dir=<directory>)"
5737msgstr ""
5738
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005739#: builtin/init-db.c:579
Jiang Xindce37b62012-02-13 14:37:59 +08005740msgid "Cannot access current working directory"
5741msgstr ""
5742
Jiang Xin0bbe5b42012-07-30 10:24:47 +08005743#: builtin/init-db.c:586
Jiang Xindce37b62012-02-13 14:37:59 +08005744#, c-format
5745msgid "Cannot access work tree '%s'"
5746msgstr ""
5747
Jiang Xin28b3cff2013-07-26 08:56:45 +08005748#: builtin/log.c:41
Jiang Xinc6bc7d42013-04-30 08:31:19 +08005749msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
Jiang Xincc760112012-09-15 10:26:13 +08005750msgstr ""
5751
Jiang Xin28b3cff2013-07-26 08:56:45 +08005752#: builtin/log.c:42
Jiang Xincc760112012-09-15 10:26:13 +08005753msgid " or: git show [options] <object>..."
5754msgstr ""
5755
Jiang Xin28b3cff2013-07-26 08:56:45 +08005756#: builtin/log.c:124
Jiang Xincc760112012-09-15 10:26:13 +08005757msgid "suppress diff output"
5758msgstr ""
5759
Jiang Xin28b3cff2013-07-26 08:56:45 +08005760#: builtin/log.c:125
Jiang Xincc760112012-09-15 10:26:13 +08005761msgid "show source"
5762msgstr ""
5763
Jiang Xin28b3cff2013-07-26 08:56:45 +08005764#: builtin/log.c:126
Jiang Xin46bc4032013-01-25 12:33:58 +08005765msgid "Use mail map file"
5766msgstr ""
5767
Jiang Xin28b3cff2013-07-26 08:56:45 +08005768#: builtin/log.c:127
Jiang Xincc760112012-09-15 10:26:13 +08005769msgid "decorate options"
5770msgstr ""
5771
Jiang Xin28b3cff2013-07-26 08:56:45 +08005772#: builtin/log.c:230
Jiang Xindce37b62012-02-13 14:37:59 +08005773#, c-format
5774msgid "Final output: %d %s\n"
5775msgstr ""
5776
Jiang Xin28b3cff2013-07-26 08:56:45 +08005777#: builtin/log.c:453 builtin/log.c:545
Jiang Xindce37b62012-02-13 14:37:59 +08005778#, c-format
5779msgid "Could not read object %s"
5780msgstr ""
5781
Jiang Xin28b3cff2013-07-26 08:56:45 +08005782#: builtin/log.c:569
Jiang Xindce37b62012-02-13 14:37:59 +08005783#, c-format
5784msgid "Unknown type: %d"
5785msgstr ""
5786
Jiang Xin28b3cff2013-07-26 08:56:45 +08005787#: builtin/log.c:669
Jiang Xindce37b62012-02-13 14:37:59 +08005788msgid "format.headers without value"
5789msgstr ""
5790
Jiang Xin28b3cff2013-07-26 08:56:45 +08005791#: builtin/log.c:751
Jiang Xindce37b62012-02-13 14:37:59 +08005792msgid "name of output directory is too long"
5793msgstr ""
5794
Jiang Xin28b3cff2013-07-26 08:56:45 +08005795#: builtin/log.c:767
Jiang Xindce37b62012-02-13 14:37:59 +08005796#, c-format
5797msgid "Cannot open patch file %s"
5798msgstr ""
5799
Jiang Xin28b3cff2013-07-26 08:56:45 +08005800#: builtin/log.c:781
Jiang Xindce37b62012-02-13 14:37:59 +08005801msgid "Need exactly one range."
5802msgstr ""
5803
Jiang Xin28b3cff2013-07-26 08:56:45 +08005804#: builtin/log.c:789
Jiang Xindce37b62012-02-13 14:37:59 +08005805msgid "Not a range."
5806msgstr ""
5807
Jiang Xin28b3cff2013-07-26 08:56:45 +08005808#: builtin/log.c:891
Jiang Xindce37b62012-02-13 14:37:59 +08005809msgid "Cover letter needs email format"
5810msgstr ""
5811
Jiang Xin28b3cff2013-07-26 08:56:45 +08005812#: builtin/log.c:967
Jiang Xindce37b62012-02-13 14:37:59 +08005813#, c-format
5814msgid "insane in-reply-to: %s"
5815msgstr ""
5816
Jiang Xin28b3cff2013-07-26 08:56:45 +08005817#: builtin/log.c:995
Jiang Xincc760112012-09-15 10:26:13 +08005818msgid "git format-patch [options] [<since> | <revision range>]"
5819msgstr ""
5820
Jiang Xin28b3cff2013-07-26 08:56:45 +08005821#: builtin/log.c:1040
Jiang Xindce37b62012-02-13 14:37:59 +08005822msgid "Two output directories?"
5823msgstr ""
5824
Jiang Xin28b3cff2013-07-26 08:56:45 +08005825#: builtin/log.c:1155
Jiang Xincc760112012-09-15 10:26:13 +08005826msgid "use [PATCH n/m] even with a single patch"
5827msgstr ""
5828
Jiang Xin28b3cff2013-07-26 08:56:45 +08005829#: builtin/log.c:1158
Jiang Xincc760112012-09-15 10:26:13 +08005830msgid "use [PATCH] even with multiple patches"
5831msgstr ""
5832
Jiang Xin28b3cff2013-07-26 08:56:45 +08005833#: builtin/log.c:1162
Jiang Xincc760112012-09-15 10:26:13 +08005834msgid "print patches to standard out"
5835msgstr ""
5836
Jiang Xin28b3cff2013-07-26 08:56:45 +08005837#: builtin/log.c:1164
Jiang Xincc760112012-09-15 10:26:13 +08005838msgid "generate a cover letter"
5839msgstr ""
5840
Jiang Xin28b3cff2013-07-26 08:56:45 +08005841#: builtin/log.c:1166
Jiang Xincc760112012-09-15 10:26:13 +08005842msgid "use simple number sequence for output file names"
5843msgstr ""
5844
Jiang Xin28b3cff2013-07-26 08:56:45 +08005845#: builtin/log.c:1167
Jiang Xincc760112012-09-15 10:26:13 +08005846msgid "sfx"
5847msgstr ""
5848
Jiang Xin28b3cff2013-07-26 08:56:45 +08005849#: builtin/log.c:1168
Jiang Xincc760112012-09-15 10:26:13 +08005850msgid "use <sfx> instead of '.patch'"
5851msgstr ""
5852
Jiang Xin28b3cff2013-07-26 08:56:45 +08005853#: builtin/log.c:1170
Jiang Xincc760112012-09-15 10:26:13 +08005854msgid "start numbering patches at <n> instead of 1"
5855msgstr ""
5856
Jiang Xin28b3cff2013-07-26 08:56:45 +08005857#: builtin/log.c:1172
Jiang Xin46bc4032013-01-25 12:33:58 +08005858msgid "mark the series as Nth re-roll"
5859msgstr ""
5860
Jiang Xin28b3cff2013-07-26 08:56:45 +08005861#: builtin/log.c:1174
Jiang Xincc760112012-09-15 10:26:13 +08005862msgid "Use [<prefix>] instead of [PATCH]"
5863msgstr ""
5864
Jiang Xin28b3cff2013-07-26 08:56:45 +08005865#: builtin/log.c:1177
Jiang Xincc760112012-09-15 10:26:13 +08005866msgid "store resulting files in <dir>"
5867msgstr ""
5868
Jiang Xin28b3cff2013-07-26 08:56:45 +08005869#: builtin/log.c:1180
Jiang Xincc760112012-09-15 10:26:13 +08005870msgid "don't strip/add [PATCH]"
5871msgstr ""
5872
Jiang Xin28b3cff2013-07-26 08:56:45 +08005873#: builtin/log.c:1183
Jiang Xincc760112012-09-15 10:26:13 +08005874msgid "don't output binary diffs"
5875msgstr ""
5876
Jiang Xin28b3cff2013-07-26 08:56:45 +08005877#: builtin/log.c:1185
Jiang Xincc760112012-09-15 10:26:13 +08005878msgid "don't include a patch matching a commit upstream"
5879msgstr ""
5880
Jiang Xin28b3cff2013-07-26 08:56:45 +08005881#: builtin/log.c:1187
Jiang Xincc760112012-09-15 10:26:13 +08005882msgid "show patch format instead of default (patch + stat)"
5883msgstr ""
5884
Jiang Xin28b3cff2013-07-26 08:56:45 +08005885#: builtin/log.c:1189
Jiang Xincc760112012-09-15 10:26:13 +08005886msgid "Messaging"
5887msgstr ""
5888
Jiang Xin28b3cff2013-07-26 08:56:45 +08005889#: builtin/log.c:1190
Jiang Xincc760112012-09-15 10:26:13 +08005890msgid "header"
5891msgstr ""
5892
Jiang Xin28b3cff2013-07-26 08:56:45 +08005893#: builtin/log.c:1191
Jiang Xincc760112012-09-15 10:26:13 +08005894msgid "add email header"
5895msgstr ""
5896
Jiang Xin28b3cff2013-07-26 08:56:45 +08005897#: builtin/log.c:1192 builtin/log.c:1194
Jiang Xincc760112012-09-15 10:26:13 +08005898msgid "email"
5899msgstr ""
5900
Jiang Xin28b3cff2013-07-26 08:56:45 +08005901#: builtin/log.c:1192
Jiang Xincc760112012-09-15 10:26:13 +08005902msgid "add To: header"
5903msgstr ""
5904
Jiang Xin28b3cff2013-07-26 08:56:45 +08005905#: builtin/log.c:1194
Jiang Xincc760112012-09-15 10:26:13 +08005906msgid "add Cc: header"
5907msgstr ""
5908
Jiang Xin28b3cff2013-07-26 08:56:45 +08005909#: builtin/log.c:1196
5910msgid "ident"
5911msgstr ""
5912
5913#: builtin/log.c:1197
5914msgid "set From address to <ident> (or committer ident if absent)"
5915msgstr ""
5916
5917#: builtin/log.c:1199
Jiang Xincc760112012-09-15 10:26:13 +08005918msgid "message-id"
5919msgstr ""
5920
Jiang Xin28b3cff2013-07-26 08:56:45 +08005921#: builtin/log.c:1200
Jiang Xincc760112012-09-15 10:26:13 +08005922msgid "make first mail a reply to <message-id>"
5923msgstr ""
5924
Jiang Xin28b3cff2013-07-26 08:56:45 +08005925#: builtin/log.c:1201 builtin/log.c:1204
Jiang Xincc760112012-09-15 10:26:13 +08005926msgid "boundary"
5927msgstr ""
5928
Jiang Xin28b3cff2013-07-26 08:56:45 +08005929#: builtin/log.c:1202
Jiang Xincc760112012-09-15 10:26:13 +08005930msgid "attach the patch"
5931msgstr ""
5932
Jiang Xin28b3cff2013-07-26 08:56:45 +08005933#: builtin/log.c:1205
Jiang Xincc760112012-09-15 10:26:13 +08005934msgid "inline the patch"
5935msgstr ""
5936
Jiang Xin28b3cff2013-07-26 08:56:45 +08005937#: builtin/log.c:1209
Jiang Xincc760112012-09-15 10:26:13 +08005938msgid "enable message threading, styles: shallow, deep"
5939msgstr ""
5940
Jiang Xin28b3cff2013-07-26 08:56:45 +08005941#: builtin/log.c:1211
Jiang Xincc760112012-09-15 10:26:13 +08005942msgid "signature"
5943msgstr ""
5944
Jiang Xin28b3cff2013-07-26 08:56:45 +08005945#: builtin/log.c:1212
Jiang Xincc760112012-09-15 10:26:13 +08005946msgid "add a signature"
5947msgstr ""
5948
Jiang Xin28b3cff2013-07-26 08:56:45 +08005949#: builtin/log.c:1214
Jiang Xincc760112012-09-15 10:26:13 +08005950msgid "don't print the patch filenames"
5951msgstr ""
5952
Jiang Xin28b3cff2013-07-26 08:56:45 +08005953#: builtin/log.c:1288
5954#, c-format
5955msgid "invalid ident line: %s"
5956msgstr ""
5957
5958#: builtin/log.c:1303
Jiang Xindce37b62012-02-13 14:37:59 +08005959msgid "-n and -k are mutually exclusive."
5960msgstr ""
5961
Jiang Xin28b3cff2013-07-26 08:56:45 +08005962#: builtin/log.c:1305
Jiang Xindce37b62012-02-13 14:37:59 +08005963msgid "--subject-prefix and -k are mutually exclusive."
5964msgstr ""
5965
Jiang Xin28b3cff2013-07-26 08:56:45 +08005966#: builtin/log.c:1313
Jiang Xindce37b62012-02-13 14:37:59 +08005967msgid "--name-only does not make sense"
5968msgstr ""
5969
Jiang Xin28b3cff2013-07-26 08:56:45 +08005970#: builtin/log.c:1315
Jiang Xindce37b62012-02-13 14:37:59 +08005971msgid "--name-status does not make sense"
5972msgstr ""
5973
Jiang Xin28b3cff2013-07-26 08:56:45 +08005974#: builtin/log.c:1317
Jiang Xindce37b62012-02-13 14:37:59 +08005975msgid "--check does not make sense"
5976msgstr ""
5977
Jiang Xin28b3cff2013-07-26 08:56:45 +08005978#: builtin/log.c:1340
Jiang Xindce37b62012-02-13 14:37:59 +08005979msgid "standard output, or directory, which one?"
5980msgstr ""
5981
Jiang Xin28b3cff2013-07-26 08:56:45 +08005982#: builtin/log.c:1342
Jiang Xindce37b62012-02-13 14:37:59 +08005983#, c-format
5984msgid "Could not create directory '%s'"
5985msgstr ""
5986
Jiang Xin28b3cff2013-07-26 08:56:45 +08005987#: builtin/log.c:1490
Jiang Xindce37b62012-02-13 14:37:59 +08005988msgid "Failed to create output files"
5989msgstr ""
5990
Jiang Xin28b3cff2013-07-26 08:56:45 +08005991#: builtin/log.c:1539
Jiang Xincc760112012-09-15 10:26:13 +08005992msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5993msgstr ""
5994
Jiang Xin28b3cff2013-07-26 08:56:45 +08005995#: builtin/log.c:1594
Jiang Xindce37b62012-02-13 14:37:59 +08005996#, c-format
5997msgid ""
5998"Could not find a tracked remote branch, please specify <upstream> manually.\n"
5999msgstr ""
6000
Jiang Xin28b3cff2013-07-26 08:56:45 +08006001#: builtin/log.c:1607 builtin/log.c:1609 builtin/log.c:1621
Jiang Xindce37b62012-02-13 14:37:59 +08006002#, c-format
6003msgid "Unknown commit %s"
6004msgstr ""
6005
Jiang Xin28b3cff2013-07-26 08:56:45 +08006006#: builtin/ls-files.c:408
Jiang Xincc760112012-09-15 10:26:13 +08006007msgid "git ls-files [options] [<file>...]"
6008msgstr ""
6009
Jiang Xin28b3cff2013-07-26 08:56:45 +08006010#: builtin/ls-files.c:465
Jiang Xincc760112012-09-15 10:26:13 +08006011msgid "identify the file status with tags"
6012msgstr ""
6013
Jiang Xin28b3cff2013-07-26 08:56:45 +08006014#: builtin/ls-files.c:467
Jiang Xincc760112012-09-15 10:26:13 +08006015msgid "use lowercase letters for 'assume unchanged' files"
6016msgstr ""
6017
Jiang Xin28b3cff2013-07-26 08:56:45 +08006018#: builtin/ls-files.c:469
Jiang Xincc760112012-09-15 10:26:13 +08006019msgid "show cached files in the output (default)"
6020msgstr ""
6021
Jiang Xin28b3cff2013-07-26 08:56:45 +08006022#: builtin/ls-files.c:471
Jiang Xincc760112012-09-15 10:26:13 +08006023msgid "show deleted files in the output"
6024msgstr ""
6025
Jiang Xin28b3cff2013-07-26 08:56:45 +08006026#: builtin/ls-files.c:473
Jiang Xincc760112012-09-15 10:26:13 +08006027msgid "show modified files in the output"
6028msgstr ""
6029
Jiang Xin28b3cff2013-07-26 08:56:45 +08006030#: builtin/ls-files.c:475
Jiang Xincc760112012-09-15 10:26:13 +08006031msgid "show other files in the output"
6032msgstr ""
6033
Jiang Xin28b3cff2013-07-26 08:56:45 +08006034#: builtin/ls-files.c:477
Jiang Xincc760112012-09-15 10:26:13 +08006035msgid "show ignored files in the output"
6036msgstr ""
6037
Jiang Xin28b3cff2013-07-26 08:56:45 +08006038#: builtin/ls-files.c:480
Jiang Xincc760112012-09-15 10:26:13 +08006039msgid "show staged contents' object name in the output"
6040msgstr ""
6041
Jiang Xin28b3cff2013-07-26 08:56:45 +08006042#: builtin/ls-files.c:482
Jiang Xincc760112012-09-15 10:26:13 +08006043msgid "show files on the filesystem that need to be removed"
6044msgstr ""
6045
Jiang Xin28b3cff2013-07-26 08:56:45 +08006046#: builtin/ls-files.c:484
Jiang Xincc760112012-09-15 10:26:13 +08006047msgid "show 'other' directories' name only"
6048msgstr ""
6049
Jiang Xin28b3cff2013-07-26 08:56:45 +08006050#: builtin/ls-files.c:487
Jiang Xincc760112012-09-15 10:26:13 +08006051msgid "don't show empty directories"
6052msgstr ""
6053
Jiang Xin28b3cff2013-07-26 08:56:45 +08006054#: builtin/ls-files.c:490
Jiang Xincc760112012-09-15 10:26:13 +08006055msgid "show unmerged files in the output"
6056msgstr ""
6057
Jiang Xin28b3cff2013-07-26 08:56:45 +08006058#: builtin/ls-files.c:492
Jiang Xincc760112012-09-15 10:26:13 +08006059msgid "show resolve-undo information"
6060msgstr ""
6061
Jiang Xin28b3cff2013-07-26 08:56:45 +08006062#: builtin/ls-files.c:494
Jiang Xincc760112012-09-15 10:26:13 +08006063msgid "skip files matching pattern"
6064msgstr ""
6065
Jiang Xin28b3cff2013-07-26 08:56:45 +08006066#: builtin/ls-files.c:497
Jiang Xincc760112012-09-15 10:26:13 +08006067msgid "exclude patterns are read from <file>"
6068msgstr ""
6069
Jiang Xin28b3cff2013-07-26 08:56:45 +08006070#: builtin/ls-files.c:500
Jiang Xincc760112012-09-15 10:26:13 +08006071msgid "read additional per-directory exclude patterns in <file>"
6072msgstr ""
6073
Jiang Xin28b3cff2013-07-26 08:56:45 +08006074#: builtin/ls-files.c:502
Jiang Xincc760112012-09-15 10:26:13 +08006075msgid "add the standard git exclusions"
6076msgstr ""
6077
Jiang Xin28b3cff2013-07-26 08:56:45 +08006078#: builtin/ls-files.c:505
Jiang Xincc760112012-09-15 10:26:13 +08006079msgid "make the output relative to the project top directory"
6080msgstr ""
6081
Jiang Xin28b3cff2013-07-26 08:56:45 +08006082#: builtin/ls-files.c:508
Jiang Xincc760112012-09-15 10:26:13 +08006083msgid "if any <file> is not in the index, treat this as an error"
6084msgstr ""
6085
Jiang Xin28b3cff2013-07-26 08:56:45 +08006086#: builtin/ls-files.c:509
Jiang Xincc760112012-09-15 10:26:13 +08006087msgid "tree-ish"
6088msgstr ""
6089
Jiang Xin28b3cff2013-07-26 08:56:45 +08006090#: builtin/ls-files.c:510
Jiang Xincc760112012-09-15 10:26:13 +08006091msgid "pretend that paths removed since <tree-ish> are still present"
6092msgstr ""
6093
Jiang Xin28b3cff2013-07-26 08:56:45 +08006094#: builtin/ls-files.c:512
Jiang Xincc760112012-09-15 10:26:13 +08006095msgid "show debugging data"
6096msgstr ""
6097
6098#: builtin/ls-tree.c:27
6099msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
6100msgstr ""
6101
6102#: builtin/ls-tree.c:125
6103msgid "only show trees"
6104msgstr ""
6105
6106#: builtin/ls-tree.c:127
6107msgid "recurse into subtrees"
6108msgstr ""
6109
6110#: builtin/ls-tree.c:129
6111msgid "show trees when recursing"
6112msgstr ""
6113
6114#: builtin/ls-tree.c:132
6115msgid "terminate entries with NUL byte"
6116msgstr ""
6117
6118#: builtin/ls-tree.c:133
6119msgid "include object size"
6120msgstr ""
6121
6122#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
6123msgid "list only filenames"
6124msgstr ""
6125
6126#: builtin/ls-tree.c:140
6127msgid "use full path names"
6128msgstr ""
6129
6130#: builtin/ls-tree.c:142
6131msgid "list entire tree; not just current directory (implies --full-name)"
6132msgstr ""
6133
6134#: builtin/merge.c:43
6135msgid "git merge [options] [<commit>...]"
6136msgstr ""
6137
6138#: builtin/merge.c:44
6139msgid "git merge [options] <msg> HEAD <commit>"
6140msgstr ""
6141
6142#: builtin/merge.c:45
6143msgid "git merge --abort"
6144msgstr ""
6145
Jiang Xin28b3cff2013-07-26 08:56:45 +08006146#: builtin/merge.c:98
Jiang Xindce37b62012-02-13 14:37:59 +08006147msgid "switch `m' requires a value"
6148msgstr ""
6149
Jiang Xin28b3cff2013-07-26 08:56:45 +08006150#: builtin/merge.c:135
Jiang Xindce37b62012-02-13 14:37:59 +08006151#, c-format
6152msgid "Could not find merge strategy '%s'.\n"
6153msgstr ""
6154
Jiang Xin28b3cff2013-07-26 08:56:45 +08006155#: builtin/merge.c:136
Jiang Xindce37b62012-02-13 14:37:59 +08006156#, c-format
6157msgid "Available strategies are:"
6158msgstr ""
6159
Jiang Xin28b3cff2013-07-26 08:56:45 +08006160#: builtin/merge.c:141
Jiang Xindce37b62012-02-13 14:37:59 +08006161#, c-format
6162msgid "Available custom strategies are:"
6163msgstr ""
6164
Jiang Xin28b3cff2013-07-26 08:56:45 +08006165#: builtin/merge.c:198
Jiang Xincc760112012-09-15 10:26:13 +08006166msgid "do not show a diffstat at the end of the merge"
6167msgstr ""
6168
Jiang Xin28b3cff2013-07-26 08:56:45 +08006169#: builtin/merge.c:201
Jiang Xincc760112012-09-15 10:26:13 +08006170msgid "show a diffstat at the end of the merge"
6171msgstr ""
6172
Jiang Xin28b3cff2013-07-26 08:56:45 +08006173#: builtin/merge.c:202
Jiang Xincc760112012-09-15 10:26:13 +08006174msgid "(synonym to --stat)"
6175msgstr ""
6176
Jiang Xin28b3cff2013-07-26 08:56:45 +08006177#: builtin/merge.c:204
Jiang Xincc760112012-09-15 10:26:13 +08006178msgid "add (at most <n>) entries from shortlog to merge commit message"
6179msgstr ""
6180
Jiang Xin28b3cff2013-07-26 08:56:45 +08006181#: builtin/merge.c:207
Jiang Xincc760112012-09-15 10:26:13 +08006182msgid "create a single commit instead of doing a merge"
6183msgstr ""
6184
Jiang Xin28b3cff2013-07-26 08:56:45 +08006185#: builtin/merge.c:209
Jiang Xincc760112012-09-15 10:26:13 +08006186msgid "perform a commit if the merge succeeds (default)"
6187msgstr ""
6188
Jiang Xin28b3cff2013-07-26 08:56:45 +08006189#: builtin/merge.c:211
Jiang Xincc760112012-09-15 10:26:13 +08006190msgid "edit message before committing"
6191msgstr ""
6192
Jiang Xin28b3cff2013-07-26 08:56:45 +08006193#: builtin/merge.c:212
Jiang Xincc760112012-09-15 10:26:13 +08006194msgid "allow fast-forward (default)"
6195msgstr ""
6196
Jiang Xin28b3cff2013-07-26 08:56:45 +08006197#: builtin/merge.c:214
Jiang Xincc760112012-09-15 10:26:13 +08006198msgid "abort if fast-forward is not possible"
6199msgstr ""
6200
Jiang Xin28b3cff2013-07-26 08:56:45 +08006201#: builtin/merge.c:218
Jiang Xinc138af52013-04-10 15:19:54 +08006202msgid "Verify that the named commit has a valid GPG signature"
6203msgstr ""
6204
Jiang Xin28b3cff2013-07-26 08:56:45 +08006205#: builtin/merge.c:219 builtin/notes.c:738 builtin/revert.c:114
Jiang Xincc760112012-09-15 10:26:13 +08006206msgid "strategy"
6207msgstr ""
6208
Jiang Xin28b3cff2013-07-26 08:56:45 +08006209#: builtin/merge.c:220
Jiang Xincc760112012-09-15 10:26:13 +08006210msgid "merge strategy to use"
6211msgstr ""
6212
Jiang Xin28b3cff2013-07-26 08:56:45 +08006213#: builtin/merge.c:221
Jiang Xincc760112012-09-15 10:26:13 +08006214msgid "option=value"
6215msgstr ""
6216
Jiang Xin28b3cff2013-07-26 08:56:45 +08006217#: builtin/merge.c:222
Jiang Xincc760112012-09-15 10:26:13 +08006218msgid "option for selected merge strategy"
6219msgstr ""
6220
Jiang Xin28b3cff2013-07-26 08:56:45 +08006221#: builtin/merge.c:224
Jiang Xincc760112012-09-15 10:26:13 +08006222msgid "merge commit message (for a non-fast-forward merge)"
6223msgstr ""
6224
Jiang Xin28b3cff2013-07-26 08:56:45 +08006225#: builtin/merge.c:228
Jiang Xincc760112012-09-15 10:26:13 +08006226msgid "abort the current in-progress merge"
6227msgstr ""
6228
Jiang Xin28b3cff2013-07-26 08:56:45 +08006229#: builtin/merge.c:257
Jiang Xindce37b62012-02-13 14:37:59 +08006230msgid "could not run stash."
6231msgstr ""
6232
Jiang Xin28b3cff2013-07-26 08:56:45 +08006233#: builtin/merge.c:262
Jiang Xindce37b62012-02-13 14:37:59 +08006234msgid "stash failed"
6235msgstr ""
6236
Jiang Xin28b3cff2013-07-26 08:56:45 +08006237#: builtin/merge.c:267
Jiang Xindce37b62012-02-13 14:37:59 +08006238#, c-format
6239msgid "not a valid object: %s"
6240msgstr ""
6241
Jiang Xin28b3cff2013-07-26 08:56:45 +08006242#: builtin/merge.c:286 builtin/merge.c:303
Jiang Xindce37b62012-02-13 14:37:59 +08006243msgid "read-tree failed"
6244msgstr ""
6245
Jiang Xin28b3cff2013-07-26 08:56:45 +08006246#: builtin/merge.c:333
Jiang Xindce37b62012-02-13 14:37:59 +08006247msgid " (nothing to squash)"
6248msgstr ""
6249
Jiang Xin28b3cff2013-07-26 08:56:45 +08006250#: builtin/merge.c:346
Jiang Xindce37b62012-02-13 14:37:59 +08006251#, c-format
6252msgid "Squash commit -- not updating HEAD\n"
6253msgstr ""
6254
Jiang Xin28b3cff2013-07-26 08:56:45 +08006255#: builtin/merge.c:378
Jiang Xindce37b62012-02-13 14:37:59 +08006256msgid "Writing SQUASH_MSG"
6257msgstr ""
6258
Jiang Xin28b3cff2013-07-26 08:56:45 +08006259#: builtin/merge.c:380
Jiang Xindce37b62012-02-13 14:37:59 +08006260msgid "Finishing SQUASH_MSG"
6261msgstr ""
6262
Jiang Xin28b3cff2013-07-26 08:56:45 +08006263#: builtin/merge.c:403
Jiang Xindce37b62012-02-13 14:37:59 +08006264#, c-format
6265msgid "No merge message -- not updating HEAD\n"
6266msgstr ""
6267
Jiang Xin28b3cff2013-07-26 08:56:45 +08006268#: builtin/merge.c:453
Jiang Xindce37b62012-02-13 14:37:59 +08006269#, c-format
6270msgid "'%s' does not point to a commit"
6271msgstr ""
6272
Jiang Xin28b3cff2013-07-26 08:56:45 +08006273#: builtin/merge.c:565
Jiang Xindce37b62012-02-13 14:37:59 +08006274#, c-format
6275msgid "Bad branch.%s.mergeoptions string: %s"
6276msgstr ""
6277
Jiang Xin28b3cff2013-07-26 08:56:45 +08006278#: builtin/merge.c:657
Jiang Xindce37b62012-02-13 14:37:59 +08006279msgid "git write-tree failed to write a tree"
6280msgstr ""
6281
Jiang Xinc138af52013-04-10 15:19:54 +08006282#: builtin/merge.c:685
Jiang Xin28b3cff2013-07-26 08:56:45 +08006283msgid "Not handling anything other than two heads merge."
Jiang Xindce37b62012-02-13 14:37:59 +08006284msgstr ""
6285
Jiang Xinc138af52013-04-10 15:19:54 +08006286#: builtin/merge.c:699
Jiang Xindce37b62012-02-13 14:37:59 +08006287#, c-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08006288msgid "Unknown option for merge-recursive: -X%s"
6289msgstr ""
6290
6291#: builtin/merge.c:713
6292#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08006293msgid "unable to write %s"
6294msgstr ""
6295
Jiang Xin28b3cff2013-07-26 08:56:45 +08006296#: builtin/merge.c:802
Jiang Xindce37b62012-02-13 14:37:59 +08006297#, c-format
6298msgid "Could not read from '%s'"
6299msgstr ""
6300
Jiang Xin28b3cff2013-07-26 08:56:45 +08006301#: builtin/merge.c:811
Jiang Xindce37b62012-02-13 14:37:59 +08006302#, c-format
6303msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6304msgstr ""
6305
Jiang Xin28b3cff2013-07-26 08:56:45 +08006306#: builtin/merge.c:817
Jiang Xin9caaf232013-02-14 14:49:45 +08006307#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08006308msgid ""
6309"Please enter a commit message to explain why this merge is necessary,\n"
6310"especially if it merges an updated upstream into a topic branch.\n"
6311"\n"
Jiang Xin9caaf232013-02-14 14:49:45 +08006312"Lines starting with '%c' will be ignored, and an empty message aborts\n"
Jiang Xindce37b62012-02-13 14:37:59 +08006313"the commit.\n"
6314msgstr ""
6315
Jiang Xin28b3cff2013-07-26 08:56:45 +08006316#: builtin/merge.c:841
Jiang Xindce37b62012-02-13 14:37:59 +08006317msgid "Empty commit message."
6318msgstr ""
6319
Jiang Xin28b3cff2013-07-26 08:56:45 +08006320#: builtin/merge.c:853
Jiang Xindce37b62012-02-13 14:37:59 +08006321#, c-format
6322msgid "Wonderful.\n"
6323msgstr ""
6324
Jiang Xin28b3cff2013-07-26 08:56:45 +08006325#: builtin/merge.c:918
Jiang Xindce37b62012-02-13 14:37:59 +08006326#, c-format
6327msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6328msgstr ""
6329
Jiang Xin28b3cff2013-07-26 08:56:45 +08006330#: builtin/merge.c:934
Jiang Xindce37b62012-02-13 14:37:59 +08006331#, c-format
6332msgid "'%s' is not a commit"
6333msgstr ""
6334
Jiang Xin28b3cff2013-07-26 08:56:45 +08006335#: builtin/merge.c:975
Jiang Xindce37b62012-02-13 14:37:59 +08006336msgid "No current branch."
6337msgstr ""
6338
Jiang Xin28b3cff2013-07-26 08:56:45 +08006339#: builtin/merge.c:977
Jiang Xindce37b62012-02-13 14:37:59 +08006340msgid "No remote for the current branch."
6341msgstr ""
6342
Jiang Xin28b3cff2013-07-26 08:56:45 +08006343#: builtin/merge.c:979
Jiang Xindce37b62012-02-13 14:37:59 +08006344msgid "No default upstream defined for the current branch."
6345msgstr ""
6346
Jiang Xin28b3cff2013-07-26 08:56:45 +08006347#: builtin/merge.c:984
Jiang Xindce37b62012-02-13 14:37:59 +08006348#, c-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08006349msgid "No remote-tracking branch for %s from %s"
Jiang Xindce37b62012-02-13 14:37:59 +08006350msgstr ""
6351
Jiang Xin28b3cff2013-07-26 08:56:45 +08006352#: builtin/merge.c:1140
Jiang Xindce37b62012-02-13 14:37:59 +08006353msgid "There is no merge to abort (MERGE_HEAD missing)."
6354msgstr ""
6355
Jiang Xin28b3cff2013-07-26 08:56:45 +08006356#: builtin/merge.c:1156 git-pull.sh:31
Jiang Xindce37b62012-02-13 14:37:59 +08006357msgid ""
6358"You have not concluded your merge (MERGE_HEAD exists).\n"
6359"Please, commit your changes before you can merge."
6360msgstr ""
6361
Jiang Xin28b3cff2013-07-26 08:56:45 +08006362#: builtin/merge.c:1159 git-pull.sh:34
Jiang Xindce37b62012-02-13 14:37:59 +08006363msgid "You have not concluded your merge (MERGE_HEAD exists)."
6364msgstr ""
6365
Jiang Xin28b3cff2013-07-26 08:56:45 +08006366#: builtin/merge.c:1163
Jiang Xindce37b62012-02-13 14:37:59 +08006367msgid ""
6368"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6369"Please, commit your changes before you can merge."
6370msgstr ""
6371
Jiang Xin28b3cff2013-07-26 08:56:45 +08006372#: builtin/merge.c:1166
Jiang Xindce37b62012-02-13 14:37:59 +08006373msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6374msgstr ""
6375
Jiang Xin28b3cff2013-07-26 08:56:45 +08006376#: builtin/merge.c:1175
Jiang Xindce37b62012-02-13 14:37:59 +08006377msgid "You cannot combine --squash with --no-ff."
6378msgstr ""
6379
Jiang Xin28b3cff2013-07-26 08:56:45 +08006380#: builtin/merge.c:1184
Jiang Xindce37b62012-02-13 14:37:59 +08006381msgid "No commit specified and merge.defaultToUpstream not set."
6382msgstr ""
6383
Jiang Xin28b3cff2013-07-26 08:56:45 +08006384#: builtin/merge.c:1216
Jiang Xindce37b62012-02-13 14:37:59 +08006385msgid "Can merge only exactly one commit into empty head"
6386msgstr ""
6387
Jiang Xin28b3cff2013-07-26 08:56:45 +08006388#: builtin/merge.c:1219
Jiang Xindce37b62012-02-13 14:37:59 +08006389msgid "Squash commit into empty head not supported yet"
6390msgstr ""
6391
Jiang Xin28b3cff2013-07-26 08:56:45 +08006392#: builtin/merge.c:1221
Jiang Xindce37b62012-02-13 14:37:59 +08006393msgid "Non-fast-forward commit does not make sense into an empty head"
6394msgstr ""
6395
Jiang Xin28b3cff2013-07-26 08:56:45 +08006396#: builtin/merge.c:1226
6397#, c-format
6398msgid "%s - not something we can merge"
6399msgstr ""
6400
6401#: builtin/merge.c:1277
Jiang Xinc138af52013-04-10 15:19:54 +08006402#, c-format
6403msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6404msgstr ""
6405
Jiang Xin28b3cff2013-07-26 08:56:45 +08006406#: builtin/merge.c:1280
Jiang Xinc138af52013-04-10 15:19:54 +08006407#, c-format
6408msgid "Commit %s has a bad GPG signature allegedly by %s."
6409msgstr ""
6410
6411#. 'N'
Jiang Xin28b3cff2013-07-26 08:56:45 +08006412#: builtin/merge.c:1283
Jiang Xinc138af52013-04-10 15:19:54 +08006413#, c-format
6414msgid "Commit %s does not have a GPG signature."
6415msgstr ""
6416
Jiang Xin28b3cff2013-07-26 08:56:45 +08006417#: builtin/merge.c:1286
Jiang Xinc138af52013-04-10 15:19:54 +08006418#, c-format
6419msgid "Commit %s has a good GPG signature by %s\n"
6420msgstr ""
6421
Jiang Xin28b3cff2013-07-26 08:56:45 +08006422#: builtin/merge.c:1370
Jiang Xindce37b62012-02-13 14:37:59 +08006423#, c-format
6424msgid "Updating %s..%s\n"
6425msgstr ""
6426
Jiang Xin28b3cff2013-07-26 08:56:45 +08006427#: builtin/merge.c:1409
Jiang Xindce37b62012-02-13 14:37:59 +08006428#, c-format
6429msgid "Trying really trivial in-index merge...\n"
6430msgstr ""
6431
Jiang Xin28b3cff2013-07-26 08:56:45 +08006432#: builtin/merge.c:1416
Jiang Xindce37b62012-02-13 14:37:59 +08006433#, c-format
6434msgid "Nope.\n"
6435msgstr ""
6436
Jiang Xin28b3cff2013-07-26 08:56:45 +08006437#: builtin/merge.c:1448
Jiang Xindce37b62012-02-13 14:37:59 +08006438msgid "Not possible to fast-forward, aborting."
6439msgstr ""
6440
Jiang Xin28b3cff2013-07-26 08:56:45 +08006441#: builtin/merge.c:1471 builtin/merge.c:1550
Jiang Xindce37b62012-02-13 14:37:59 +08006442#, c-format
6443msgid "Rewinding the tree to pristine...\n"
6444msgstr ""
6445
Jiang Xin28b3cff2013-07-26 08:56:45 +08006446#: builtin/merge.c:1475
Jiang Xindce37b62012-02-13 14:37:59 +08006447#, c-format
6448msgid "Trying merge strategy %s...\n"
6449msgstr ""
6450
Jiang Xin28b3cff2013-07-26 08:56:45 +08006451#: builtin/merge.c:1541
Jiang Xindce37b62012-02-13 14:37:59 +08006452#, c-format
6453msgid "No merge strategy handled the merge.\n"
6454msgstr ""
6455
Jiang Xin28b3cff2013-07-26 08:56:45 +08006456#: builtin/merge.c:1543
Jiang Xindce37b62012-02-13 14:37:59 +08006457#, c-format
6458msgid "Merge with strategy %s failed.\n"
6459msgstr ""
6460
Jiang Xin28b3cff2013-07-26 08:56:45 +08006461#: builtin/merge.c:1552
Jiang Xindce37b62012-02-13 14:37:59 +08006462#, c-format
6463msgid "Using the %s to prepare resolving by hand.\n"
6464msgstr ""
6465
Jiang Xin28b3cff2013-07-26 08:56:45 +08006466#: builtin/merge.c:1564
Jiang Xindce37b62012-02-13 14:37:59 +08006467#, c-format
6468msgid "Automatic merge went well; stopped before committing as requested\n"
6469msgstr ""
6470
Jiang Xincc760112012-09-15 10:26:13 +08006471#: builtin/merge-base.c:26
6472msgid "git merge-base [-a|--all] <commit> <commit>..."
6473msgstr ""
6474
6475#: builtin/merge-base.c:27
6476msgid "git merge-base [-a|--all] --octopus <commit>..."
6477msgstr ""
6478
6479#: builtin/merge-base.c:28
6480msgid "git merge-base --independent <commit>..."
6481msgstr ""
6482
6483#: builtin/merge-base.c:29
6484msgid "git merge-base --is-ancestor <commit> <commit>"
6485msgstr ""
6486
6487#: builtin/merge-base.c:98
6488msgid "output all common ancestors"
6489msgstr ""
6490
6491#: builtin/merge-base.c:99
6492msgid "find ancestors for a single n-way merge"
6493msgstr ""
6494
6495#: builtin/merge-base.c:100
6496msgid "list revs not reachable from others"
6497msgstr ""
6498
6499#: builtin/merge-base.c:102
6500msgid "is the first one ancestor of the other?"
6501msgstr ""
6502
6503#: builtin/merge-file.c:8
6504msgid ""
6505"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6506"file2"
6507msgstr ""
6508
6509#: builtin/merge-file.c:33
6510msgid "send results to standard output"
6511msgstr ""
6512
6513#: builtin/merge-file.c:34
6514msgid "use a diff3 based merge"
6515msgstr ""
6516
6517#: builtin/merge-file.c:35
6518msgid "for conflicts, use our version"
6519msgstr ""
6520
6521#: builtin/merge-file.c:37
6522msgid "for conflicts, use their version"
6523msgstr ""
6524
6525#: builtin/merge-file.c:39
6526msgid "for conflicts, use a union version"
6527msgstr ""
6528
6529#: builtin/merge-file.c:42
6530msgid "for conflicts, use this marker size"
6531msgstr ""
6532
6533#: builtin/merge-file.c:43
6534msgid "do not warn about conflicts"
6535msgstr ""
6536
6537#: builtin/merge-file.c:45
6538msgid "set labels for file1/orig_file/file2"
6539msgstr ""
6540
6541#: builtin/mktree.c:67
6542msgid "git mktree [-z] [--missing] [--batch]"
6543msgstr ""
6544
6545#: builtin/mktree.c:153
6546msgid "input is NUL terminated"
6547msgstr ""
6548
6549#: builtin/mktree.c:154 builtin/write-tree.c:24
6550msgid "allow missing objects"
6551msgstr ""
6552
6553#: builtin/mktree.c:155
6554msgid "allow creation of more than one tree"
6555msgstr ""
6556
6557#: builtin/mv.c:14
6558msgid "git mv [options] <source>... <destination>"
6559msgstr ""
6560
6561#: builtin/mv.c:64
6562msgid "force move/rename even if target exists"
6563msgstr ""
6564
6565#: builtin/mv.c:65
6566msgid "skip move/rename errors"
6567msgstr ""
6568
Jiang Xindce37b62012-02-13 14:37:59 +08006569#: builtin/mv.c:108
6570#, c-format
6571msgid "Checking rename of '%s' to '%s'\n"
6572msgstr ""
6573
6574#: builtin/mv.c:112
6575msgid "bad source"
6576msgstr ""
6577
6578#: builtin/mv.c:115
6579msgid "can not move directory into itself"
6580msgstr ""
6581
6582#: builtin/mv.c:118
6583msgid "cannot move directory over file"
6584msgstr ""
6585
6586#: builtin/mv.c:128
6587#, c-format
6588msgid "Huh? %.*s is in index?"
6589msgstr ""
6590
6591#: builtin/mv.c:140
6592msgid "source directory is empty"
6593msgstr ""
6594
6595#: builtin/mv.c:171
6596msgid "not under version control"
6597msgstr ""
6598
6599#: builtin/mv.c:173
6600msgid "destination exists"
6601msgstr ""
6602
6603#: builtin/mv.c:181
6604#, c-format
6605msgid "overwriting '%s'"
6606msgstr ""
6607
6608#: builtin/mv.c:184
6609msgid "Cannot overwrite"
6610msgstr ""
6611
6612#: builtin/mv.c:187
6613msgid "multiple sources for the same target"
6614msgstr ""
6615
6616#: builtin/mv.c:202
6617#, c-format
6618msgid "%s, source=%s, destination=%s"
6619msgstr ""
6620
6621#: builtin/mv.c:212
6622#, c-format
6623msgid "Renaming %s to %s\n"
6624msgstr ""
6625
Jiang Xin822e4a62012-05-08 16:10:22 +08006626#: builtin/mv.c:215 builtin/remote.c:731
Jiang Xindce37b62012-02-13 14:37:59 +08006627#, c-format
6628msgid "renaming '%s' failed"
6629msgstr ""
6630
Jiang Xin28b3cff2013-07-26 08:56:45 +08006631#: builtin/name-rev.c:259
Jiang Xincc760112012-09-15 10:26:13 +08006632msgid "git name-rev [options] <commit>..."
6633msgstr ""
6634
Jiang Xin28b3cff2013-07-26 08:56:45 +08006635#: builtin/name-rev.c:260
Jiang Xincc760112012-09-15 10:26:13 +08006636msgid "git name-rev [options] --all"
6637msgstr ""
6638
Jiang Xin28b3cff2013-07-26 08:56:45 +08006639#: builtin/name-rev.c:261
Jiang Xincc760112012-09-15 10:26:13 +08006640msgid "git name-rev [options] --stdin"
6641msgstr ""
6642
Jiang Xin28b3cff2013-07-26 08:56:45 +08006643#: builtin/name-rev.c:313
Jiang Xincc760112012-09-15 10:26:13 +08006644msgid "print only names (no SHA-1)"
6645msgstr ""
6646
Jiang Xin28b3cff2013-07-26 08:56:45 +08006647#: builtin/name-rev.c:314
Jiang Xincc760112012-09-15 10:26:13 +08006648msgid "only use tags to name the commits"
6649msgstr ""
6650
Jiang Xin28b3cff2013-07-26 08:56:45 +08006651#: builtin/name-rev.c:316
Jiang Xincc760112012-09-15 10:26:13 +08006652msgid "only use refs matching <pattern>"
6653msgstr ""
6654
Jiang Xin28b3cff2013-07-26 08:56:45 +08006655#: builtin/name-rev.c:318
Jiang Xincc760112012-09-15 10:26:13 +08006656msgid "list all commits reachable from all refs"
6657msgstr ""
6658
Jiang Xin28b3cff2013-07-26 08:56:45 +08006659#: builtin/name-rev.c:319
Jiang Xincc760112012-09-15 10:26:13 +08006660msgid "read from stdin"
6661msgstr ""
6662
Jiang Xin28b3cff2013-07-26 08:56:45 +08006663#: builtin/name-rev.c:320
Jiang Xincc760112012-09-15 10:26:13 +08006664msgid "allow to print `undefined` names"
6665msgstr ""
6666
Jiang Xin28b3cff2013-07-26 08:56:45 +08006667#: builtin/name-rev.c:326
6668msgid "dereference tags in the input (internal use)"
6669msgstr ""
6670
6671#: builtin/notes.c:24
Jiang Xincc760112012-09-15 10:26:13 +08006672msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6673msgstr ""
6674
Jiang Xin28b3cff2013-07-26 08:56:45 +08006675#: builtin/notes.c:25
Jiang Xincc760112012-09-15 10:26:13 +08006676msgid ""
6677"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6678"<object>] [<object>]"
6679msgstr ""
6680
Jiang Xin28b3cff2013-07-26 08:56:45 +08006681#: builtin/notes.c:26
Jiang Xincc760112012-09-15 10:26:13 +08006682msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6683msgstr ""
6684
Jiang Xin28b3cff2013-07-26 08:56:45 +08006685#: builtin/notes.c:27
Jiang Xincc760112012-09-15 10:26:13 +08006686msgid ""
6687"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6688"<object>] [<object>]"
6689msgstr ""
6690
Jiang Xin28b3cff2013-07-26 08:56:45 +08006691#: builtin/notes.c:28
Jiang Xincc760112012-09-15 10:26:13 +08006692msgid "git notes [--ref <notes_ref>] edit [<object>]"
6693msgstr ""
6694
Jiang Xin28b3cff2013-07-26 08:56:45 +08006695#: builtin/notes.c:29
Jiang Xincc760112012-09-15 10:26:13 +08006696msgid "git notes [--ref <notes_ref>] show [<object>]"
6697msgstr ""
6698
Jiang Xin28b3cff2013-07-26 08:56:45 +08006699#: builtin/notes.c:30
Jiang Xincc760112012-09-15 10:26:13 +08006700msgid ""
6701"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6702msgstr ""
6703
Jiang Xin28b3cff2013-07-26 08:56:45 +08006704#: builtin/notes.c:31
Jiang Xincc760112012-09-15 10:26:13 +08006705msgid "git notes merge --commit [-v | -q]"
6706msgstr ""
6707
Jiang Xin28b3cff2013-07-26 08:56:45 +08006708#: builtin/notes.c:32
Jiang Xincc760112012-09-15 10:26:13 +08006709msgid "git notes merge --abort [-v | -q]"
6710msgstr ""
6711
Jiang Xin28b3cff2013-07-26 08:56:45 +08006712#: builtin/notes.c:33
Jiang Xincc760112012-09-15 10:26:13 +08006713msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6714msgstr ""
6715
Jiang Xin28b3cff2013-07-26 08:56:45 +08006716#: builtin/notes.c:34
Jiang Xincc760112012-09-15 10:26:13 +08006717msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6718msgstr ""
6719
Jiang Xin28b3cff2013-07-26 08:56:45 +08006720#: builtin/notes.c:35
Jiang Xincc760112012-09-15 10:26:13 +08006721msgid "git notes [--ref <notes_ref>] get-ref"
6722msgstr ""
6723
Jiang Xin28b3cff2013-07-26 08:56:45 +08006724#: builtin/notes.c:40
Jiang Xincc760112012-09-15 10:26:13 +08006725msgid "git notes [list [<object>]]"
6726msgstr ""
6727
Jiang Xin28b3cff2013-07-26 08:56:45 +08006728#: builtin/notes.c:45
Jiang Xincc760112012-09-15 10:26:13 +08006729msgid "git notes add [<options>] [<object>]"
6730msgstr ""
6731
Jiang Xin28b3cff2013-07-26 08:56:45 +08006732#: builtin/notes.c:50
Jiang Xincc760112012-09-15 10:26:13 +08006733msgid "git notes copy [<options>] <from-object> <to-object>"
6734msgstr ""
6735
Jiang Xin28b3cff2013-07-26 08:56:45 +08006736#: builtin/notes.c:51
Jiang Xincc760112012-09-15 10:26:13 +08006737msgid "git notes copy --stdin [<from-object> <to-object>]..."
6738msgstr ""
6739
Jiang Xin28b3cff2013-07-26 08:56:45 +08006740#: builtin/notes.c:56
Jiang Xincc760112012-09-15 10:26:13 +08006741msgid "git notes append [<options>] [<object>]"
6742msgstr ""
6743
Jiang Xin28b3cff2013-07-26 08:56:45 +08006744#: builtin/notes.c:61
Jiang Xincc760112012-09-15 10:26:13 +08006745msgid "git notes edit [<object>]"
6746msgstr ""
6747
Jiang Xin28b3cff2013-07-26 08:56:45 +08006748#: builtin/notes.c:66
Jiang Xincc760112012-09-15 10:26:13 +08006749msgid "git notes show [<object>]"
6750msgstr ""
6751
Jiang Xin28b3cff2013-07-26 08:56:45 +08006752#: builtin/notes.c:71
Jiang Xincc760112012-09-15 10:26:13 +08006753msgid "git notes merge [<options>] <notes_ref>"
6754msgstr ""
6755
Jiang Xin28b3cff2013-07-26 08:56:45 +08006756#: builtin/notes.c:72
Jiang Xincc760112012-09-15 10:26:13 +08006757msgid "git notes merge --commit [<options>]"
6758msgstr ""
6759
Jiang Xin28b3cff2013-07-26 08:56:45 +08006760#: builtin/notes.c:73
Jiang Xincc760112012-09-15 10:26:13 +08006761msgid "git notes merge --abort [<options>]"
6762msgstr ""
6763
Jiang Xin28b3cff2013-07-26 08:56:45 +08006764#: builtin/notes.c:78
Jiang Xincc760112012-09-15 10:26:13 +08006765msgid "git notes remove [<object>]"
6766msgstr ""
6767
Jiang Xin28b3cff2013-07-26 08:56:45 +08006768#: builtin/notes.c:83
Jiang Xincc760112012-09-15 10:26:13 +08006769msgid "git notes prune [<options>]"
6770msgstr ""
6771
Jiang Xin28b3cff2013-07-26 08:56:45 +08006772#: builtin/notes.c:88
Jiang Xincc760112012-09-15 10:26:13 +08006773msgid "git notes get-ref"
6774msgstr ""
6775
Jiang Xin28b3cff2013-07-26 08:56:45 +08006776#: builtin/notes.c:137
Jiang Xindce37b62012-02-13 14:37:59 +08006777#, c-format
6778msgid "unable to start 'show' for object '%s'"
6779msgstr ""
6780
Jiang Xin28b3cff2013-07-26 08:56:45 +08006781#: builtin/notes.c:141
Jiang Xin9caaf232013-02-14 14:49:45 +08006782msgid "could not read 'show' output"
Jiang Xindce37b62012-02-13 14:37:59 +08006783msgstr ""
6784
Jiang Xin28b3cff2013-07-26 08:56:45 +08006785#: builtin/notes.c:149
Jiang Xin9306b5b2012-10-16 08:39:10 +08006786#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08006787msgid "failed to finish 'show' for object '%s'"
6788msgstr ""
6789
Jiang Xin28b3cff2013-07-26 08:56:45 +08006790#: builtin/notes.c:167 builtin/tag.c:341
Jiang Xindce37b62012-02-13 14:37:59 +08006791#, c-format
6792msgid "could not create file '%s'"
6793msgstr ""
6794
Jiang Xin28b3cff2013-07-26 08:56:45 +08006795#: builtin/notes.c:186
Jiang Xindce37b62012-02-13 14:37:59 +08006796msgid "Please supply the note contents using either -m or -F option"
6797msgstr ""
6798
Jiang Xin28b3cff2013-07-26 08:56:45 +08006799#: builtin/notes.c:207 builtin/notes.c:844
Jiang Xindce37b62012-02-13 14:37:59 +08006800#, c-format
6801msgid "Removing note for object %s\n"
6802msgstr ""
6803
Jiang Xin28b3cff2013-07-26 08:56:45 +08006804#: builtin/notes.c:212
Jiang Xindce37b62012-02-13 14:37:59 +08006805msgid "unable to write note object"
6806msgstr ""
6807
Jiang Xin28b3cff2013-07-26 08:56:45 +08006808#: builtin/notes.c:214
Jiang Xindce37b62012-02-13 14:37:59 +08006809#, c-format
6810msgid "The note contents has been left in %s"
6811msgstr ""
6812
Jiang Xin28b3cff2013-07-26 08:56:45 +08006813#: builtin/notes.c:248 builtin/tag.c:540
Jiang Xindce37b62012-02-13 14:37:59 +08006814#, c-format
6815msgid "cannot read '%s'"
6816msgstr ""
6817
Jiang Xin28b3cff2013-07-26 08:56:45 +08006818#: builtin/notes.c:250 builtin/tag.c:543
Jiang Xindce37b62012-02-13 14:37:59 +08006819#, c-format
6820msgid "could not open or read '%s'"
6821msgstr ""
6822
Jiang Xin28b3cff2013-07-26 08:56:45 +08006823#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
6824#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
6825#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
6826#: builtin/notes.c:839 builtin/tag.c:556
Jiang Xindce37b62012-02-13 14:37:59 +08006827#, c-format
6828msgid "Failed to resolve '%s' as a valid ref."
6829msgstr ""
6830
Jiang Xin28b3cff2013-07-26 08:56:45 +08006831#: builtin/notes.c:272
Jiang Xindce37b62012-02-13 14:37:59 +08006832#, c-format
6833msgid "Failed to read object '%s'."
6834msgstr ""
6835
Jiang Xin28b3cff2013-07-26 08:56:45 +08006836#: builtin/notes.c:312
Jiang Xindce37b62012-02-13 14:37:59 +08006837#, c-format
6838msgid "Malformed input line: '%s'."
6839msgstr ""
6840
Jiang Xin28b3cff2013-07-26 08:56:45 +08006841#: builtin/notes.c:327
Jiang Xindce37b62012-02-13 14:37:59 +08006842#, c-format
6843msgid "Failed to copy notes from '%s' to '%s'"
6844msgstr ""
6845
Jiang Xin28b3cff2013-07-26 08:56:45 +08006846#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498
6847#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630
6848#: builtin/notes.c:904
Jiang Xindce37b62012-02-13 14:37:59 +08006849msgid "too many parameters"
6850msgstr ""
6851
Jiang Xin28b3cff2013-07-26 08:56:45 +08006852#: builtin/notes.c:384 builtin/notes.c:643
Jiang Xindce37b62012-02-13 14:37:59 +08006853#, c-format
6854msgid "No note found for object %s."
6855msgstr ""
6856
Jiang Xin28b3cff2013-07-26 08:56:45 +08006857#: builtin/notes.c:406 builtin/notes.c:563
Jiang Xincc760112012-09-15 10:26:13 +08006858msgid "note contents as a string"
6859msgstr ""
6860
Jiang Xin28b3cff2013-07-26 08:56:45 +08006861#: builtin/notes.c:409 builtin/notes.c:566
Jiang Xincc760112012-09-15 10:26:13 +08006862msgid "note contents in a file"
6863msgstr ""
6864
Jiang Xin28b3cff2013-07-26 08:56:45 +08006865#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568
6866#: builtin/notes.c:571 builtin/tag.c:474
Jiang Xincc760112012-09-15 10:26:13 +08006867msgid "object"
6868msgstr ""
6869
Jiang Xin28b3cff2013-07-26 08:56:45 +08006870#: builtin/notes.c:412 builtin/notes.c:569
Jiang Xincc760112012-09-15 10:26:13 +08006871msgid "reuse and edit specified note object"
6872msgstr ""
6873
Jiang Xin28b3cff2013-07-26 08:56:45 +08006874#: builtin/notes.c:415 builtin/notes.c:572
Jiang Xincc760112012-09-15 10:26:13 +08006875msgid "reuse specified note object"
6876msgstr ""
6877
Jiang Xin28b3cff2013-07-26 08:56:45 +08006878#: builtin/notes.c:417 builtin/notes.c:485
Jiang Xincc760112012-09-15 10:26:13 +08006879msgid "replace existing notes"
6880msgstr ""
6881
Jiang Xin28b3cff2013-07-26 08:56:45 +08006882#: builtin/notes.c:451
Jiang Xindce37b62012-02-13 14:37:59 +08006883#, c-format
6884msgid ""
6885"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
6886"existing notes"
6887msgstr ""
6888
Jiang Xin28b3cff2013-07-26 08:56:45 +08006889#: builtin/notes.c:456 builtin/notes.c:533
Jiang Xindce37b62012-02-13 14:37:59 +08006890#, c-format
6891msgid "Overwriting existing notes for object %s\n"
6892msgstr ""
6893
Jiang Xin28b3cff2013-07-26 08:56:45 +08006894#: builtin/notes.c:486
Jiang Xincc760112012-09-15 10:26:13 +08006895msgid "read objects from stdin"
6896msgstr ""
6897
Jiang Xin28b3cff2013-07-26 08:56:45 +08006898#: builtin/notes.c:488
Jiang Xincc760112012-09-15 10:26:13 +08006899msgid "load rewriting config for <command> (implies --stdin)"
6900msgstr ""
6901
Jiang Xin28b3cff2013-07-26 08:56:45 +08006902#: builtin/notes.c:506
Jiang Xindce37b62012-02-13 14:37:59 +08006903msgid "too few parameters"
6904msgstr ""
6905
Jiang Xin28b3cff2013-07-26 08:56:45 +08006906#: builtin/notes.c:527
Jiang Xindce37b62012-02-13 14:37:59 +08006907#, c-format
6908msgid ""
6909"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
6910"existing notes"
6911msgstr ""
6912
Jiang Xin28b3cff2013-07-26 08:56:45 +08006913#: builtin/notes.c:539
Jiang Xindce37b62012-02-13 14:37:59 +08006914#, c-format
6915msgid "Missing notes on source object %s. Cannot copy."
6916msgstr ""
6917
Jiang Xin28b3cff2013-07-26 08:56:45 +08006918#: builtin/notes.c:588
Jiang Xindce37b62012-02-13 14:37:59 +08006919#, c-format
6920msgid ""
6921"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
6922"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
6923msgstr ""
6924
Jiang Xin28b3cff2013-07-26 08:56:45 +08006925#: builtin/notes.c:735
Jiang Xincc760112012-09-15 10:26:13 +08006926msgid "General options"
6927msgstr ""
6928
Jiang Xin28b3cff2013-07-26 08:56:45 +08006929#: builtin/notes.c:737
Jiang Xincc760112012-09-15 10:26:13 +08006930msgid "Merge options"
6931msgstr ""
6932
Jiang Xin28b3cff2013-07-26 08:56:45 +08006933#: builtin/notes.c:739
Jiang Xincc760112012-09-15 10:26:13 +08006934msgid ""
6935"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6936"cat_sort_uniq)"
6937msgstr ""
6938
Jiang Xin28b3cff2013-07-26 08:56:45 +08006939#: builtin/notes.c:741
Jiang Xincc760112012-09-15 10:26:13 +08006940msgid "Committing unmerged notes"
6941msgstr ""
6942
Jiang Xin28b3cff2013-07-26 08:56:45 +08006943#: builtin/notes.c:743
Jiang Xincc760112012-09-15 10:26:13 +08006944msgid "finalize notes merge by committing unmerged notes"
6945msgstr ""
6946
Jiang Xin28b3cff2013-07-26 08:56:45 +08006947#: builtin/notes.c:745
Jiang Xincc760112012-09-15 10:26:13 +08006948msgid "Aborting notes merge resolution"
6949msgstr ""
6950
Jiang Xin28b3cff2013-07-26 08:56:45 +08006951#: builtin/notes.c:747
Jiang Xincc760112012-09-15 10:26:13 +08006952msgid "abort notes merge"
6953msgstr ""
6954
Jiang Xin28b3cff2013-07-26 08:56:45 +08006955#: builtin/notes.c:842
Jiang Xindce37b62012-02-13 14:37:59 +08006956#, c-format
6957msgid "Object %s has no note\n"
6958msgstr ""
6959
Jiang Xin28b3cff2013-07-26 08:56:45 +08006960#: builtin/notes.c:854
Jiang Xincc760112012-09-15 10:26:13 +08006961msgid "attempt to remove non-existent note is not an error"
6962msgstr ""
6963
Jiang Xin28b3cff2013-07-26 08:56:45 +08006964#: builtin/notes.c:857
Jiang Xincc760112012-09-15 10:26:13 +08006965msgid "read object names from the standard input"
6966msgstr ""
6967
Jiang Xin28b3cff2013-07-26 08:56:45 +08006968#: builtin/notes.c:938
Jiang Xincc760112012-09-15 10:26:13 +08006969msgid "notes_ref"
6970msgstr ""
6971
Jiang Xin28b3cff2013-07-26 08:56:45 +08006972#: builtin/notes.c:939
Jiang Xincc760112012-09-15 10:26:13 +08006973msgid "use notes from <notes_ref>"
6974msgstr ""
6975
Jiang Xin28b3cff2013-07-26 08:56:45 +08006976#: builtin/notes.c:974 builtin/remote.c:1598
Jiang Xindce37b62012-02-13 14:37:59 +08006977#, c-format
6978msgid "Unknown subcommand: %s"
6979msgstr ""
6980
Jiang Xincc760112012-09-15 10:26:13 +08006981#: builtin/pack-objects.c:23
6982msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6983msgstr ""
6984
6985#: builtin/pack-objects.c:24
6986msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6987msgstr ""
6988
Jiang Xin11b90172012-07-03 10:31:59 +08006989#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6990#, c-format
6991msgid "deflate error (%d)"
6992msgstr ""
6993
Jiang Xinfe52cd62012-11-23 14:29:02 +08006994#: builtin/pack-objects.c:2397
Jiang Xin1d4ac882012-02-28 12:24:20 +08006995#, c-format
6996msgid "unsupported index version %s"
6997msgstr ""
6998
Jiang Xinfe52cd62012-11-23 14:29:02 +08006999#: builtin/pack-objects.c:2401
Jiang Xin1d4ac882012-02-28 12:24:20 +08007000#, c-format
7001msgid "bad index version '%s'"
7002msgstr ""
7003
Jiang Xinfe52cd62012-11-23 14:29:02 +08007004#: builtin/pack-objects.c:2424
Jiang Xin1d4ac882012-02-28 12:24:20 +08007005#, c-format
7006msgid "option %s does not accept negative form"
7007msgstr ""
7008
Jiang Xinfe52cd62012-11-23 14:29:02 +08007009#: builtin/pack-objects.c:2428
Jiang Xin1d4ac882012-02-28 12:24:20 +08007010#, c-format
7011msgid "unable to parse value '%s' for option %s"
7012msgstr ""
7013
Jiang Xinfe52cd62012-11-23 14:29:02 +08007014#: builtin/pack-objects.c:2447
Jiang Xincc760112012-09-15 10:26:13 +08007015msgid "do not show progress meter"
7016msgstr ""
7017
Jiang Xinfe52cd62012-11-23 14:29:02 +08007018#: builtin/pack-objects.c:2449
Jiang Xincc760112012-09-15 10:26:13 +08007019msgid "show progress meter"
7020msgstr ""
7021
Jiang Xinfe52cd62012-11-23 14:29:02 +08007022#: builtin/pack-objects.c:2451
Jiang Xincc760112012-09-15 10:26:13 +08007023msgid "show progress meter during object writing phase"
7024msgstr ""
7025
Jiang Xinfe52cd62012-11-23 14:29:02 +08007026#: builtin/pack-objects.c:2454
Jiang Xincc760112012-09-15 10:26:13 +08007027msgid "similar to --all-progress when progress meter is shown"
7028msgstr ""
7029
Jiang Xinfe52cd62012-11-23 14:29:02 +08007030#: builtin/pack-objects.c:2455
Jiang Xincc760112012-09-15 10:26:13 +08007031msgid "version[,offset]"
7032msgstr ""
7033
Jiang Xinfe52cd62012-11-23 14:29:02 +08007034#: builtin/pack-objects.c:2456
Jiang Xincc760112012-09-15 10:26:13 +08007035msgid "write the pack index file in the specified idx format version"
7036msgstr ""
7037
Jiang Xinfe52cd62012-11-23 14:29:02 +08007038#: builtin/pack-objects.c:2459
Jiang Xincc760112012-09-15 10:26:13 +08007039msgid "maximum size of each output pack file"
7040msgstr ""
7041
Jiang Xinfe52cd62012-11-23 14:29:02 +08007042#: builtin/pack-objects.c:2461
Jiang Xincc760112012-09-15 10:26:13 +08007043msgid "ignore borrowed objects from alternate object store"
7044msgstr ""
7045
Jiang Xinfe52cd62012-11-23 14:29:02 +08007046#: builtin/pack-objects.c:2463
Jiang Xincc760112012-09-15 10:26:13 +08007047msgid "ignore packed objects"
7048msgstr ""
7049
Jiang Xinfe52cd62012-11-23 14:29:02 +08007050#: builtin/pack-objects.c:2465
Jiang Xincc760112012-09-15 10:26:13 +08007051msgid "limit pack window by objects"
7052msgstr ""
7053
Jiang Xinfe52cd62012-11-23 14:29:02 +08007054#: builtin/pack-objects.c:2467
Jiang Xincc760112012-09-15 10:26:13 +08007055msgid "limit pack window by memory in addition to object limit"
7056msgstr ""
7057
Jiang Xinfe52cd62012-11-23 14:29:02 +08007058#: builtin/pack-objects.c:2469
Jiang Xincc760112012-09-15 10:26:13 +08007059msgid "maximum length of delta chain allowed in the resulting pack"
7060msgstr ""
7061
Jiang Xinfe52cd62012-11-23 14:29:02 +08007062#: builtin/pack-objects.c:2471
Jiang Xincc760112012-09-15 10:26:13 +08007063msgid "reuse existing deltas"
7064msgstr ""
7065
Jiang Xinfe52cd62012-11-23 14:29:02 +08007066#: builtin/pack-objects.c:2473
Jiang Xincc760112012-09-15 10:26:13 +08007067msgid "reuse existing objects"
7068msgstr ""
7069
Jiang Xinfe52cd62012-11-23 14:29:02 +08007070#: builtin/pack-objects.c:2475
Jiang Xincc760112012-09-15 10:26:13 +08007071msgid "use OFS_DELTA objects"
7072msgstr ""
7073
Jiang Xinfe52cd62012-11-23 14:29:02 +08007074#: builtin/pack-objects.c:2477
Jiang Xincc760112012-09-15 10:26:13 +08007075msgid "use threads when searching for best delta matches"
7076msgstr ""
7077
Jiang Xinfe52cd62012-11-23 14:29:02 +08007078#: builtin/pack-objects.c:2479
Jiang Xincc760112012-09-15 10:26:13 +08007079msgid "do not create an empty pack output"
7080msgstr ""
7081
Jiang Xinfe52cd62012-11-23 14:29:02 +08007082#: builtin/pack-objects.c:2481
Jiang Xincc760112012-09-15 10:26:13 +08007083msgid "read revision arguments from standard input"
7084msgstr ""
7085
Jiang Xinfe52cd62012-11-23 14:29:02 +08007086#: builtin/pack-objects.c:2483
Jiang Xincc760112012-09-15 10:26:13 +08007087msgid "limit the objects to those that are not yet packed"
7088msgstr ""
7089
Jiang Xinfe52cd62012-11-23 14:29:02 +08007090#: builtin/pack-objects.c:2486
Jiang Xincc760112012-09-15 10:26:13 +08007091msgid "include objects reachable from any reference"
7092msgstr ""
7093
Jiang Xinfe52cd62012-11-23 14:29:02 +08007094#: builtin/pack-objects.c:2489
Jiang Xincc760112012-09-15 10:26:13 +08007095msgid "include objects referred by reflog entries"
7096msgstr ""
7097
Jiang Xinfe52cd62012-11-23 14:29:02 +08007098#: builtin/pack-objects.c:2492
Jiang Xincc760112012-09-15 10:26:13 +08007099msgid "output pack to stdout"
7100msgstr ""
7101
Jiang Xinfe52cd62012-11-23 14:29:02 +08007102#: builtin/pack-objects.c:2494
Jiang Xincc760112012-09-15 10:26:13 +08007103msgid "include tag objects that refer to objects to be packed"
7104msgstr ""
7105
Jiang Xinfe52cd62012-11-23 14:29:02 +08007106#: builtin/pack-objects.c:2496
Jiang Xincc760112012-09-15 10:26:13 +08007107msgid "keep unreachable objects"
7108msgstr ""
7109
Jiang Xinfe52cd62012-11-23 14:29:02 +08007110#: builtin/pack-objects.c:2497 parse-options.h:141
Jiang Xincc760112012-09-15 10:26:13 +08007111msgid "time"
7112msgstr ""
7113
Jiang Xinfe52cd62012-11-23 14:29:02 +08007114#: builtin/pack-objects.c:2498
Jiang Xincc760112012-09-15 10:26:13 +08007115msgid "unpack unreachable objects newer than <time>"
7116msgstr ""
7117
Jiang Xinfe52cd62012-11-23 14:29:02 +08007118#: builtin/pack-objects.c:2501
Jiang Xincc760112012-09-15 10:26:13 +08007119msgid "create thin packs"
7120msgstr ""
7121
Jiang Xinfe52cd62012-11-23 14:29:02 +08007122#: builtin/pack-objects.c:2503
Jiang Xincc760112012-09-15 10:26:13 +08007123msgid "ignore packs that have companion .keep file"
7124msgstr ""
7125
Jiang Xinfe52cd62012-11-23 14:29:02 +08007126#: builtin/pack-objects.c:2505
Jiang Xincc760112012-09-15 10:26:13 +08007127msgid "pack compression level"
7128msgstr ""
7129
Jiang Xinfe52cd62012-11-23 14:29:02 +08007130#: builtin/pack-objects.c:2507
Jiang Xincc760112012-09-15 10:26:13 +08007131msgid "do not hide commits by grafts"
7132msgstr ""
7133
7134#: builtin/pack-refs.c:6
7135msgid "git pack-refs [options]"
7136msgstr ""
7137
7138#: builtin/pack-refs.c:14
7139msgid "pack everything"
7140msgstr ""
7141
7142#: builtin/pack-refs.c:15
7143msgid "prune loose refs (default)"
7144msgstr ""
7145
7146#: builtin/prune-packed.c:7
7147msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
7148msgstr ""
7149
7150#: builtin/prune.c:12
7151msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
7152msgstr ""
7153
7154#: builtin/prune.c:132
7155msgid "do not remove, show only"
7156msgstr ""
7157
7158#: builtin/prune.c:133
7159msgid "report pruned objects"
7160msgstr ""
7161
7162#: builtin/prune.c:136
7163msgid "expire objects older than <time>"
7164msgstr ""
7165
7166#: builtin/push.c:14
7167msgid "git push [<options>] [<repository> [<refspec>...]]"
7168msgstr ""
7169
Jiang Xincd1e7482012-04-28 20:27:01 +08007170#: builtin/push.c:45
Jiang Xindce37b62012-02-13 14:37:59 +08007171msgid "tag shorthand without <tag>"
7172msgstr ""
7173
Jiang Xincd1e7482012-04-28 20:27:01 +08007174#: builtin/push.c:64
Jiang Xindce37b62012-02-13 14:37:59 +08007175msgid "--delete only accepts plain target ref names"
7176msgstr ""
7177
Jiang Xin822e4a62012-05-08 16:10:22 +08007178#: builtin/push.c:99
7179msgid ""
7180"\n"
7181"To choose either option permanently, see push.default in 'git help config'."
7182msgstr ""
7183
7184#: builtin/push.c:102
7185#, c-format
7186msgid ""
7187"The upstream branch of your current branch does not match\n"
7188"the name of your current branch. To push to the upstream branch\n"
7189"on the remote, use\n"
7190"\n"
7191" git push %s HEAD:%s\n"
7192"\n"
7193"To push to the branch of the same name on the remote, use\n"
7194"\n"
7195" git push %s %s\n"
7196"%s"
7197msgstr ""
7198
Jiang Xin28b3cff2013-07-26 08:56:45 +08007199#: builtin/push.c:117
Jiang Xindce37b62012-02-13 14:37:59 +08007200#, c-format
7201msgid ""
7202"You are not currently on a branch.\n"
7203"To push the history leading to the current (detached HEAD)\n"
7204"state now, use\n"
7205"\n"
7206" git push %s HEAD:<name-of-remote-branch>\n"
7207msgstr ""
7208
Jiang Xin28b3cff2013-07-26 08:56:45 +08007209#: builtin/push.c:131
Jiang Xindce37b62012-02-13 14:37:59 +08007210#, c-format
7211msgid ""
7212"The current branch %s has no upstream branch.\n"
7213"To push the current branch and set the remote as upstream, use\n"
7214"\n"
7215" git push --set-upstream %s %s\n"
7216msgstr ""
7217
Jiang Xin28b3cff2013-07-26 08:56:45 +08007218#: builtin/push.c:139
Jiang Xindce37b62012-02-13 14:37:59 +08007219#, c-format
7220msgid "The current branch %s has multiple upstream branches, refusing to push."
7221msgstr ""
7222
Jiang Xin28b3cff2013-07-26 08:56:45 +08007223#: builtin/push.c:142
Jiang Xincd1e7482012-04-28 20:27:01 +08007224#, c-format
7225msgid ""
7226"You are pushing to remote '%s', which is not the upstream of\n"
7227"your current branch '%s', without telling me what to push\n"
7228"to update which remote branch."
7229msgstr ""
7230
Jiang Xin28b3cff2013-07-26 08:56:45 +08007231#: builtin/push.c:165
Jiang Xinccfca8d2012-09-05 06:20:57 +08007232msgid ""
7233"push.default is unset; its implicit value is changing in\n"
7234"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7235"and maintain the current behavior after the default changes, use:\n"
7236"\n"
7237" git config --global push.default matching\n"
7238"\n"
7239"To squelch this message and adopt the new behavior now, use:\n"
7240"\n"
7241" git config --global push.default simple\n"
7242"\n"
7243"See 'git help config' and search for 'push.default' for further "
7244"information.\n"
7245"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7246"'current' instead of 'simple' if you sometimes use older versions of Git)"
7247msgstr ""
7248
Jiang Xin28b3cff2013-07-26 08:56:45 +08007249#: builtin/push.c:225
Jiang Xindce37b62012-02-13 14:37:59 +08007250msgid ""
7251"You didn't specify any refspecs to push, and push.default is \"nothing\"."
7252msgstr ""
7253
Jiang Xin28b3cff2013-07-26 08:56:45 +08007254#: builtin/push.c:232
Jiang Xincd1e7482012-04-28 20:27:01 +08007255msgid ""
7256"Updates were rejected because the tip of your current branch is behind\n"
Jiang Xin28b3cff2013-07-26 08:56:45 +08007257"its remote counterpart. Integrate the remote changes (e.g.\n"
7258"'git pull ...') before pushing again.\n"
Jiang Xincd1e7482012-04-28 20:27:01 +08007259"See the 'Note about fast-forwards' in 'git push --help' for details."
7260msgstr ""
7261
Jiang Xin28b3cff2013-07-26 08:56:45 +08007262#: builtin/push.c:238
Jiang Xincd1e7482012-04-28 20:27:01 +08007263msgid ""
7264"Updates were rejected because a pushed branch tip is behind its remote\n"
7265"counterpart. If you did not intend to push that branch, you may want to\n"
Jiang Xinccfca8d2012-09-05 06:20:57 +08007266"specify branches to push or set the 'push.default' configuration variable\n"
7267"to 'simple', 'current' or 'upstream' to push only the current branch."
Jiang Xincd1e7482012-04-28 20:27:01 +08007268msgstr ""
7269
Jiang Xin28b3cff2013-07-26 08:56:45 +08007270#: builtin/push.c:244
Jiang Xincd1e7482012-04-28 20:27:01 +08007271msgid ""
7272"Updates were rejected because a pushed branch tip is behind its remote\n"
Jiang Xin28b3cff2013-07-26 08:56:45 +08007273"counterpart. Check out this branch and integrate the remote changes\n"
7274"(e.g. 'git pull ...') before pushing again.\n"
Jiang Xincd1e7482012-04-28 20:27:01 +08007275"See the 'Note about fast-forwards' in 'git push --help' for details."
7276msgstr ""
7277
Jiang Xin28b3cff2013-07-26 08:56:45 +08007278#: builtin/push.c:250
Jiang Xin46bc4032013-01-25 12:33:58 +08007279msgid ""
Jiang Xin9caaf232013-02-14 14:49:45 +08007280"Updates were rejected because the remote contains work that you do\n"
7281"not have locally. This is usually caused by another repository pushing\n"
Jiang Xin28b3cff2013-07-26 08:56:45 +08007282"to the same ref. You may want to first integrate the remote changes\n"
7283"(e.g., 'git pull ...') before pushing again.\n"
Jiang Xin9caaf232013-02-14 14:49:45 +08007284"See the 'Note about fast-forwards' in 'git push --help' for details."
Jiang Xin46bc4032013-01-25 12:33:58 +08007285msgstr ""
7286
Jiang Xin28b3cff2013-07-26 08:56:45 +08007287#: builtin/push.c:257
Jiang Xin9caaf232013-02-14 14:49:45 +08007288msgid "Updates were rejected because the tag already exists in the remote."
7289msgstr ""
7290
Jiang Xin28b3cff2013-07-26 08:56:45 +08007291#: builtin/push.c:260
Jiang Xin9caaf232013-02-14 14:49:45 +08007292msgid ""
7293"You cannot update a remote ref that points at a non-commit object,\n"
7294"or update a remote ref to make it point at a non-commit object,\n"
7295"without using the '--force' option.\n"
7296msgstr ""
7297
Jiang Xin28b3cff2013-07-26 08:56:45 +08007298#: builtin/push.c:320
Jiang Xindce37b62012-02-13 14:37:59 +08007299#, c-format
7300msgid "Pushing to %s\n"
7301msgstr ""
7302
Jiang Xin28b3cff2013-07-26 08:56:45 +08007303#: builtin/push.c:324
Jiang Xindce37b62012-02-13 14:37:59 +08007304#, c-format
7305msgid "failed to push some refs to '%s'"
7306msgstr ""
7307
Jiang Xin28b3cff2013-07-26 08:56:45 +08007308#: builtin/push.c:357
Jiang Xindce37b62012-02-13 14:37:59 +08007309#, c-format
7310msgid "bad repository '%s'"
7311msgstr ""
7312
Jiang Xin28b3cff2013-07-26 08:56:45 +08007313#: builtin/push.c:358
Jiang Xindce37b62012-02-13 14:37:59 +08007314msgid ""
7315"No configured push destination.\n"
7316"Either specify the URL from the command-line or configure a remote "
7317"repository using\n"
7318"\n"
7319" git remote add <name> <url>\n"
7320"\n"
7321"and then push using the remote name\n"
7322"\n"
7323" git push <name>\n"
7324msgstr ""
7325
Jiang Xin28b3cff2013-07-26 08:56:45 +08007326#: builtin/push.c:373
Jiang Xindce37b62012-02-13 14:37:59 +08007327msgid "--all and --tags are incompatible"
7328msgstr ""
7329
Jiang Xin28b3cff2013-07-26 08:56:45 +08007330#: builtin/push.c:374
Jiang Xindce37b62012-02-13 14:37:59 +08007331msgid "--all can't be combined with refspecs"
7332msgstr ""
7333
Jiang Xin28b3cff2013-07-26 08:56:45 +08007334#: builtin/push.c:379
Jiang Xindce37b62012-02-13 14:37:59 +08007335msgid "--mirror and --tags are incompatible"
7336msgstr ""
7337
Jiang Xin28b3cff2013-07-26 08:56:45 +08007338#: builtin/push.c:380
Jiang Xindce37b62012-02-13 14:37:59 +08007339msgid "--mirror can't be combined with refspecs"
7340msgstr ""
7341
Jiang Xin28b3cff2013-07-26 08:56:45 +08007342#: builtin/push.c:385
Jiang Xindce37b62012-02-13 14:37:59 +08007343msgid "--all and --mirror are incompatible"
7344msgstr ""
7345
Jiang Xin28b3cff2013-07-26 08:56:45 +08007346#: builtin/push.c:445
Jiang Xincc760112012-09-15 10:26:13 +08007347msgid "repository"
7348msgstr ""
7349
Jiang Xin28b3cff2013-07-26 08:56:45 +08007350#: builtin/push.c:446
Jiang Xincc760112012-09-15 10:26:13 +08007351msgid "push all refs"
7352msgstr ""
7353
Jiang Xin28b3cff2013-07-26 08:56:45 +08007354#: builtin/push.c:447
Jiang Xincc760112012-09-15 10:26:13 +08007355msgid "mirror all refs"
7356msgstr ""
7357
Jiang Xin28b3cff2013-07-26 08:56:45 +08007358#: builtin/push.c:449
Jiang Xincc760112012-09-15 10:26:13 +08007359msgid "delete refs"
7360msgstr ""
7361
Jiang Xin28b3cff2013-07-26 08:56:45 +08007362#: builtin/push.c:450
Jiang Xincc760112012-09-15 10:26:13 +08007363msgid "push tags (can't be used with --all or --mirror)"
7364msgstr ""
7365
Jiang Xin28b3cff2013-07-26 08:56:45 +08007366#: builtin/push.c:453
Jiang Xincc760112012-09-15 10:26:13 +08007367msgid "force updates"
7368msgstr ""
7369
Jiang Xin28b3cff2013-07-26 08:56:45 +08007370#: builtin/push.c:454
Jiang Xincc760112012-09-15 10:26:13 +08007371msgid "check"
7372msgstr ""
7373
Jiang Xin28b3cff2013-07-26 08:56:45 +08007374#: builtin/push.c:455
Jiang Xincc760112012-09-15 10:26:13 +08007375msgid "control recursive pushing of submodules"
7376msgstr ""
7377
Jiang Xin28b3cff2013-07-26 08:56:45 +08007378#: builtin/push.c:457
Jiang Xincc760112012-09-15 10:26:13 +08007379msgid "use thin pack"
7380msgstr ""
7381
Jiang Xin28b3cff2013-07-26 08:56:45 +08007382#: builtin/push.c:458 builtin/push.c:459
Jiang Xincc760112012-09-15 10:26:13 +08007383msgid "receive pack program"
7384msgstr ""
7385
Jiang Xin28b3cff2013-07-26 08:56:45 +08007386#: builtin/push.c:460
Jiang Xincc760112012-09-15 10:26:13 +08007387msgid "set upstream for git pull/status"
7388msgstr ""
7389
Jiang Xin28b3cff2013-07-26 08:56:45 +08007390#: builtin/push.c:463
Jiang Xincc760112012-09-15 10:26:13 +08007391msgid "prune locally removed refs"
7392msgstr ""
7393
Jiang Xin28b3cff2013-07-26 08:56:45 +08007394#: builtin/push.c:465
Jiang Xin9caaf232013-02-14 14:49:45 +08007395msgid "bypass pre-push hook"
7396msgstr ""
7397
Jiang Xin28b3cff2013-07-26 08:56:45 +08007398#: builtin/push.c:466
Jiang Xinc138af52013-04-10 15:19:54 +08007399msgid "push missing but relevant tags"
Jiang Xindce37b62012-02-13 14:37:59 +08007400msgstr ""
7401
Jiang Xin28b3cff2013-07-26 08:56:45 +08007402#: builtin/push.c:476
Jiang Xinc138af52013-04-10 15:19:54 +08007403msgid "--delete is incompatible with --all, --mirror and --tags"
7404msgstr ""
7405
Jiang Xin28b3cff2013-07-26 08:56:45 +08007406#: builtin/push.c:478
Jiang Xindce37b62012-02-13 14:37:59 +08007407msgid "--delete doesn't make sense without any refs"
7408msgstr ""
7409
Jiang Xincc760112012-09-15 10:26:13 +08007410#: builtin/read-tree.c:36
7411msgid ""
7412"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7413"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7414"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7415msgstr ""
7416
Jiang Xin28b3cff2013-07-26 08:56:45 +08007417#: builtin/read-tree.c:109
Jiang Xincc760112012-09-15 10:26:13 +08007418msgid "write resulting index to <file>"
7419msgstr ""
7420
Jiang Xin28b3cff2013-07-26 08:56:45 +08007421#: builtin/read-tree.c:112
Jiang Xincc760112012-09-15 10:26:13 +08007422msgid "only empty the index"
7423msgstr ""
7424
Jiang Xin28b3cff2013-07-26 08:56:45 +08007425#: builtin/read-tree.c:114
Jiang Xincc760112012-09-15 10:26:13 +08007426msgid "Merging"
7427msgstr ""
7428
Jiang Xin28b3cff2013-07-26 08:56:45 +08007429#: builtin/read-tree.c:116
Jiang Xincc760112012-09-15 10:26:13 +08007430msgid "perform a merge in addition to a read"
7431msgstr ""
7432
Jiang Xin28b3cff2013-07-26 08:56:45 +08007433#: builtin/read-tree.c:118
Jiang Xincc760112012-09-15 10:26:13 +08007434msgid "3-way merge if no file level merging required"
7435msgstr ""
7436
Jiang Xin28b3cff2013-07-26 08:56:45 +08007437#: builtin/read-tree.c:120
Jiang Xincc760112012-09-15 10:26:13 +08007438msgid "3-way merge in presence of adds and removes"
7439msgstr ""
7440
Jiang Xin28b3cff2013-07-26 08:56:45 +08007441#: builtin/read-tree.c:122
Jiang Xincc760112012-09-15 10:26:13 +08007442msgid "same as -m, but discard unmerged entries"
7443msgstr ""
7444
Jiang Xin28b3cff2013-07-26 08:56:45 +08007445#: builtin/read-tree.c:123
Jiang Xincc760112012-09-15 10:26:13 +08007446msgid "<subdirectory>/"
7447msgstr ""
7448
Jiang Xin28b3cff2013-07-26 08:56:45 +08007449#: builtin/read-tree.c:124
Jiang Xincc760112012-09-15 10:26:13 +08007450msgid "read the tree into the index under <subdirectory>/"
7451msgstr ""
7452
Jiang Xin28b3cff2013-07-26 08:56:45 +08007453#: builtin/read-tree.c:127
Jiang Xincc760112012-09-15 10:26:13 +08007454msgid "update working tree with merge result"
7455msgstr ""
7456
Jiang Xin28b3cff2013-07-26 08:56:45 +08007457#: builtin/read-tree.c:129
Jiang Xincc760112012-09-15 10:26:13 +08007458msgid "gitignore"
7459msgstr ""
7460
Jiang Xin28b3cff2013-07-26 08:56:45 +08007461#: builtin/read-tree.c:130
Jiang Xincc760112012-09-15 10:26:13 +08007462msgid "allow explicitly ignored files to be overwritten"
7463msgstr ""
7464
Jiang Xin28b3cff2013-07-26 08:56:45 +08007465#: builtin/read-tree.c:133
Jiang Xincc760112012-09-15 10:26:13 +08007466msgid "don't check the working tree after merging"
7467msgstr ""
7468
Jiang Xin28b3cff2013-07-26 08:56:45 +08007469#: builtin/read-tree.c:134
Jiang Xincc760112012-09-15 10:26:13 +08007470msgid "don't update the index or the work tree"
7471msgstr ""
7472
Jiang Xin28b3cff2013-07-26 08:56:45 +08007473#: builtin/read-tree.c:136
Jiang Xincc760112012-09-15 10:26:13 +08007474msgid "skip applying sparse checkout filter"
7475msgstr ""
7476
Jiang Xin28b3cff2013-07-26 08:56:45 +08007477#: builtin/read-tree.c:138
Jiang Xincc760112012-09-15 10:26:13 +08007478msgid "debug unpack-trees"
7479msgstr ""
7480
Jiang Xin28b3cff2013-07-26 08:56:45 +08007481#: builtin/reflog.c:500
7482#, c-format
7483msgid "%s' for '%s' is not a valid timestamp"
7484msgstr ""
7485
7486#: builtin/reflog.c:616 builtin/reflog.c:621
7487#, c-format
7488msgid "'%s' is not a valid timestamp"
7489msgstr ""
7490
Jiang Xincc760112012-09-15 10:26:13 +08007491#: builtin/remote.c:11
7492msgid "git remote [-v | --verbose]"
7493msgstr ""
7494
7495#: builtin/remote.c:12
7496msgid ""
7497"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7498"mirror=<fetch|push>] <name> <url>"
7499msgstr ""
7500
7501#: builtin/remote.c:13 builtin/remote.c:32
7502msgid "git remote rename <old> <new>"
7503msgstr ""
7504
7505#: builtin/remote.c:14 builtin/remote.c:37
7506msgid "git remote remove <name>"
7507msgstr ""
7508
Jiang Xinf9472e32012-11-30 12:41:47 +08007509#: builtin/remote.c:15 builtin/remote.c:42
Jiang Xincc760112012-09-15 10:26:13 +08007510msgid "git remote set-head <name> (-a | -d | <branch>)"
7511msgstr ""
7512
7513#: builtin/remote.c:16
7514msgid "git remote [-v | --verbose] show [-n] <name>"
7515msgstr ""
7516
7517#: builtin/remote.c:17
7518msgid "git remote prune [-n | --dry-run] <name>"
7519msgstr ""
7520
7521#: builtin/remote.c:18
7522msgid ""
7523"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7524msgstr ""
7525
7526#: builtin/remote.c:19
7527msgid "git remote set-branches [--add] <name> <branch>..."
7528msgstr ""
7529
7530#: builtin/remote.c:20 builtin/remote.c:68
7531msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7532msgstr ""
7533
7534#: builtin/remote.c:21 builtin/remote.c:69
7535msgid "git remote set-url --add <name> <newurl>"
7536msgstr ""
7537
7538#: builtin/remote.c:22 builtin/remote.c:70
7539msgid "git remote set-url --delete <name> <url>"
7540msgstr ""
7541
7542#: builtin/remote.c:27
7543msgid "git remote add [<options>] <name> <url>"
7544msgstr ""
7545
Jiang Xincc760112012-09-15 10:26:13 +08007546#: builtin/remote.c:47
7547msgid "git remote set-branches <name> <branch>..."
7548msgstr ""
7549
7550#: builtin/remote.c:48
7551msgid "git remote set-branches --add <name> <branch>..."
7552msgstr ""
7553
7554#: builtin/remote.c:53
7555msgid "git remote show [<options>] <name>"
7556msgstr ""
7557
7558#: builtin/remote.c:58
7559msgid "git remote prune [<options>] <name>"
7560msgstr ""
7561
7562#: builtin/remote.c:63
7563msgid "git remote update [<options>] [<group> | <remote>]..."
7564msgstr ""
7565
Jiang Xin822e4a62012-05-08 16:10:22 +08007566#: builtin/remote.c:98
7567#, c-format
7568msgid "Updating %s"
7569msgstr ""
7570
7571#: builtin/remote.c:130
7572msgid ""
7573"--mirror is dangerous and deprecated; please\n"
7574"\t use --mirror=fetch or --mirror=push instead"
7575msgstr ""
7576
7577#: builtin/remote.c:147
7578#, c-format
7579msgid "unknown mirror argument: %s"
7580msgstr ""
7581
Jiang Xincc760112012-09-15 10:26:13 +08007582#: builtin/remote.c:163
7583msgid "fetch the remote branches"
7584msgstr ""
7585
7586#: builtin/remote.c:165
7587msgid "import all tags and associated objects when fetching"
7588msgstr ""
7589
7590#: builtin/remote.c:168
7591msgid "or do not fetch any tag at all (--no-tags)"
7592msgstr ""
7593
7594#: builtin/remote.c:170
7595msgid "branch(es) to track"
7596msgstr ""
7597
7598#: builtin/remote.c:171
7599msgid "master branch"
7600msgstr ""
7601
7602#: builtin/remote.c:172
7603msgid "push|fetch"
7604msgstr ""
7605
7606#: builtin/remote.c:173
7607msgid "set up remote as a mirror to push to or fetch from"
7608msgstr ""
7609
Jiang Xin822e4a62012-05-08 16:10:22 +08007610#: builtin/remote.c:185
7611msgid "specifying a master branch makes no sense with --mirror"
7612msgstr ""
7613
7614#: builtin/remote.c:187
7615msgid "specifying branches to track makes sense only with fetch mirrors"
7616msgstr ""
7617
7618#: builtin/remote.c:195 builtin/remote.c:646
7619#, c-format
7620msgid "remote %s already exists."
7621msgstr ""
7622
7623#: builtin/remote.c:199 builtin/remote.c:650
7624#, c-format
7625msgid "'%s' is not a valid remote name"
7626msgstr ""
7627
7628#: builtin/remote.c:243
7629#, c-format
7630msgid "Could not setup master '%s'"
7631msgstr ""
7632
7633#: builtin/remote.c:299
7634#, c-format
7635msgid "more than one %s"
7636msgstr ""
7637
7638#: builtin/remote.c:339
7639#, c-format
7640msgid "Could not get fetch map for refspec %s"
7641msgstr ""
7642
7643#: builtin/remote.c:440 builtin/remote.c:448
7644msgid "(matching)"
7645msgstr ""
7646
7647#: builtin/remote.c:452
7648msgid "(delete)"
7649msgstr ""
7650
7651#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7652#, c-format
7653msgid "Could not append '%s' to '%s'"
7654msgstr ""
7655
7656#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7657#, c-format
7658msgid "No such remote: %s"
7659msgstr ""
7660
7661#: builtin/remote.c:656
7662#, c-format
7663msgid "Could not rename config section '%s' to '%s'"
7664msgstr ""
7665
7666#: builtin/remote.c:662 builtin/remote.c:799
7667#, c-format
7668msgid "Could not remove config section '%s'"
7669msgstr ""
7670
7671#: builtin/remote.c:677
7672#, c-format
7673msgid ""
Jiang Xin75f7b4b2012-06-02 07:07:27 +08007674"Not updating non-default fetch refspec\n"
Jiang Xin822e4a62012-05-08 16:10:22 +08007675"\t%s\n"
7676"\tPlease update the configuration manually if necessary."
7677msgstr ""
7678
7679#: builtin/remote.c:683
7680#, c-format
7681msgid "Could not append '%s'"
7682msgstr ""
7683
7684#: builtin/remote.c:694
7685#, c-format
7686msgid "Could not set '%s'"
7687msgstr ""
7688
7689#: builtin/remote.c:716
7690#, c-format
7691msgid "deleting '%s' failed"
7692msgstr ""
7693
7694#: builtin/remote.c:750
7695#, c-format
7696msgid "creating '%s' failed"
7697msgstr ""
7698
7699#: builtin/remote.c:764
7700#, c-format
7701msgid "Could not remove branch %s"
7702msgstr ""
7703
7704#: builtin/remote.c:834
7705msgid ""
7706"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7707"to delete it, use:"
7708msgid_plural ""
7709"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7710"to delete them, use:"
7711msgstr[0] ""
7712msgstr[1] ""
7713
7714#: builtin/remote.c:943
7715#, c-format
7716msgid " new (next fetch will store in remotes/%s)"
7717msgstr ""
7718
7719#: builtin/remote.c:946
7720msgid " tracked"
7721msgstr ""
7722
7723#: builtin/remote.c:948
7724msgid " stale (use 'git remote prune' to remove)"
7725msgstr ""
7726
7727#: builtin/remote.c:950
7728msgid " ???"
7729msgstr ""
7730
7731#: builtin/remote.c:991
7732#, c-format
7733msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7734msgstr ""
7735
7736#: builtin/remote.c:998
7737#, c-format
7738msgid "rebases onto remote %s"
7739msgstr ""
7740
7741#: builtin/remote.c:1001
7742#, c-format
7743msgid " merges with remote %s"
7744msgstr ""
7745
7746#: builtin/remote.c:1002
7747msgid " and with remote"
7748msgstr ""
7749
7750#: builtin/remote.c:1004
7751#, c-format
7752msgid "merges with remote %s"
7753msgstr ""
7754
7755#: builtin/remote.c:1005
7756msgid " and with remote"
7757msgstr ""
7758
7759#: builtin/remote.c:1051
7760msgid "create"
7761msgstr ""
7762
7763#: builtin/remote.c:1054
7764msgid "delete"
7765msgstr ""
7766
7767#: builtin/remote.c:1058
7768msgid "up to date"
7769msgstr ""
7770
7771#: builtin/remote.c:1061
7772msgid "fast-forwardable"
7773msgstr ""
7774
7775#: builtin/remote.c:1064
7776msgid "local out of date"
7777msgstr ""
7778
7779#: builtin/remote.c:1071
7780#, c-format
7781msgid " %-*s forces to %-*s (%s)"
7782msgstr ""
7783
7784#: builtin/remote.c:1074
7785#, c-format
7786msgid " %-*s pushes to %-*s (%s)"
7787msgstr ""
7788
7789#: builtin/remote.c:1078
7790#, c-format
7791msgid " %-*s forces to %s"
7792msgstr ""
7793
7794#: builtin/remote.c:1081
7795#, c-format
7796msgid " %-*s pushes to %s"
7797msgstr ""
7798
Jiang Xincc760112012-09-15 10:26:13 +08007799#: builtin/remote.c:1091
7800msgid "do not query remotes"
7801msgstr ""
7802
Jiang Xin822e4a62012-05-08 16:10:22 +08007803#: builtin/remote.c:1118
7804#, c-format
7805msgid "* remote %s"
7806msgstr ""
7807
7808#: builtin/remote.c:1119
7809#, c-format
7810msgid " Fetch URL: %s"
7811msgstr ""
7812
7813#: builtin/remote.c:1120 builtin/remote.c:1285
7814msgid "(no URL)"
7815msgstr ""
7816
7817#: builtin/remote.c:1129 builtin/remote.c:1131
7818#, c-format
7819msgid " Push URL: %s"
7820msgstr ""
7821
7822#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7823#, c-format
7824msgid " HEAD branch: %s"
7825msgstr ""
7826
7827#: builtin/remote.c:1139
7828#, c-format
7829msgid ""
7830" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7831msgstr ""
7832
7833#: builtin/remote.c:1151
7834#, c-format
7835msgid " Remote branch:%s"
7836msgid_plural " Remote branches:%s"
7837msgstr[0] ""
7838msgstr[1] ""
7839
7840#: builtin/remote.c:1154 builtin/remote.c:1181
7841msgid " (status not queried)"
7842msgstr ""
7843
7844#: builtin/remote.c:1163
7845msgid " Local branch configured for 'git pull':"
7846msgid_plural " Local branches configured for 'git pull':"
7847msgstr[0] ""
7848msgstr[1] ""
7849
7850#: builtin/remote.c:1171
7851msgid " Local refs will be mirrored by 'git push'"
7852msgstr ""
7853
7854#: builtin/remote.c:1178
7855#, c-format
7856msgid " Local ref configured for 'git push'%s:"
7857msgid_plural " Local refs configured for 'git push'%s:"
7858msgstr[0] ""
7859msgstr[1] ""
7860
Jiang Xincc760112012-09-15 10:26:13 +08007861#: builtin/remote.c:1199
7862msgid "set refs/remotes/<name>/HEAD according to remote"
7863msgstr ""
7864
7865#: builtin/remote.c:1201
7866msgid "delete refs/remotes/<name>/HEAD"
7867msgstr ""
7868
Jiang Xin822e4a62012-05-08 16:10:22 +08007869#: builtin/remote.c:1216
7870msgid "Cannot determine remote HEAD"
7871msgstr ""
7872
7873#: builtin/remote.c:1218
7874msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7875msgstr ""
7876
7877#: builtin/remote.c:1228
7878#, c-format
7879msgid "Could not delete %s"
7880msgstr ""
7881
7882#: builtin/remote.c:1236
7883#, c-format
7884msgid "Not a valid ref: %s"
7885msgstr ""
7886
7887#: builtin/remote.c:1238
7888#, c-format
7889msgid "Could not setup %s"
7890msgstr ""
7891
7892#: builtin/remote.c:1274
7893#, c-format
7894msgid " %s will become dangling!"
7895msgstr ""
7896
7897#: builtin/remote.c:1275
7898#, c-format
7899msgid " %s has become dangling!"
7900msgstr ""
7901
7902#: builtin/remote.c:1281
7903#, c-format
7904msgid "Pruning %s"
7905msgstr ""
7906
7907#: builtin/remote.c:1282
7908#, c-format
7909msgid "URL: %s"
7910msgstr ""
7911
7912#: builtin/remote.c:1295
7913#, c-format
7914msgid " * [would prune] %s"
7915msgstr ""
7916
7917#: builtin/remote.c:1298
7918#, c-format
7919msgid " * [pruned] %s"
7920msgstr ""
7921
Jiang Xincc760112012-09-15 10:26:13 +08007922#: builtin/remote.c:1321
7923msgid "prune remotes after fetching"
7924msgstr ""
7925
Jiang Xin822e4a62012-05-08 16:10:22 +08007926#: builtin/remote.c:1387 builtin/remote.c:1461
7927#, c-format
7928msgid "No such remote '%s'"
7929msgstr ""
7930
Jiang Xincc760112012-09-15 10:26:13 +08007931#: builtin/remote.c:1407
7932msgid "add branch"
7933msgstr ""
7934
Jiang Xin822e4a62012-05-08 16:10:22 +08007935#: builtin/remote.c:1414
7936msgid "no remote specified"
7937msgstr ""
7938
Jiang Xincc760112012-09-15 10:26:13 +08007939#: builtin/remote.c:1436
7940msgid "manipulate push URLs"
7941msgstr ""
7942
7943#: builtin/remote.c:1438
7944msgid "add URL"
7945msgstr ""
7946
7947#: builtin/remote.c:1440
7948msgid "delete URLs"
7949msgstr ""
7950
Jiang Xin822e4a62012-05-08 16:10:22 +08007951#: builtin/remote.c:1447
7952msgid "--add --delete doesn't make sense"
7953msgstr ""
7954
7955#: builtin/remote.c:1487
7956#, c-format
7957msgid "Invalid old URL pattern: %s"
7958msgstr ""
7959
7960#: builtin/remote.c:1495
7961#, c-format
7962msgid "No such URL found: %s"
7963msgstr ""
7964
7965#: builtin/remote.c:1497
7966msgid "Will not delete all non-push URLs"
7967msgstr ""
7968
Jiang Xincc760112012-09-15 10:26:13 +08007969#: builtin/remote.c:1569
7970msgid "be verbose; must be placed before a subcommand"
7971msgstr ""
7972
7973#: builtin/replace.c:17
7974msgid "git replace [-f] <object> <replacement>"
7975msgstr ""
7976
7977#: builtin/replace.c:18
7978msgid "git replace -d <object>..."
7979msgstr ""
7980
7981#: builtin/replace.c:19
7982msgid "git replace -l [<pattern>]"
7983msgstr ""
7984
Jiang Xinfe52cd62012-11-23 14:29:02 +08007985#: builtin/replace.c:121
Jiang Xincc760112012-09-15 10:26:13 +08007986msgid "list replace refs"
7987msgstr ""
7988
Jiang Xinfe52cd62012-11-23 14:29:02 +08007989#: builtin/replace.c:122
Jiang Xincc760112012-09-15 10:26:13 +08007990msgid "delete replace refs"
7991msgstr ""
7992
Jiang Xinfe52cd62012-11-23 14:29:02 +08007993#: builtin/replace.c:123
Jiang Xincc760112012-09-15 10:26:13 +08007994msgid "replace the ref if it exists"
7995msgstr ""
7996
7997#: builtin/rerere.c:11
7998msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7999msgstr ""
8000
8001#: builtin/rerere.c:56
8002msgid "register clean resolutions in index"
8003msgstr ""
8004
8005#: builtin/reset.c:25
8006msgid ""
8007"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
8008msgstr ""
8009
8010#: builtin/reset.c:26
Jiang Xin46bc4032013-01-25 12:33:58 +08008011msgid "git reset [-q] <tree-ish> [--] <paths>..."
Jiang Xincc760112012-09-15 10:26:13 +08008012msgstr ""
8013
8014#: builtin/reset.c:27
Jiang Xin46bc4032013-01-25 12:33:58 +08008015msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
Jiang Xincc760112012-09-15 10:26:13 +08008016msgstr ""
8017
Jiang Xindce37b62012-02-13 14:37:59 +08008018#: builtin/reset.c:33
8019msgid "mixed"
8020msgstr ""
8021
8022#: builtin/reset.c:33
8023msgid "soft"
8024msgstr ""
8025
8026#: builtin/reset.c:33
8027msgid "hard"
8028msgstr ""
8029
8030#: builtin/reset.c:33
Jiang Xin822e4a62012-05-08 16:10:22 +08008031msgid "merge"
8032msgstr ""
8033
8034#: builtin/reset.c:33
Jiang Xindce37b62012-02-13 14:37:59 +08008035msgid "keep"
8036msgstr ""
8037
Jiang Xin46bc4032013-01-25 12:33:58 +08008038#: builtin/reset.c:73
Jiang Xindce37b62012-02-13 14:37:59 +08008039msgid "You do not have a valid HEAD."
8040msgstr ""
8041
Jiang Xin46bc4032013-01-25 12:33:58 +08008042#: builtin/reset.c:75
Jiang Xindce37b62012-02-13 14:37:59 +08008043msgid "Failed to find tree of HEAD."
8044msgstr ""
8045
Jiang Xin46bc4032013-01-25 12:33:58 +08008046#: builtin/reset.c:81
Jiang Xindce37b62012-02-13 14:37:59 +08008047#, c-format
8048msgid "Failed to find tree of %s."
8049msgstr ""
8050
Jiang Xin28b3cff2013-07-26 08:56:45 +08008051#: builtin/reset.c:99
Jiang Xindce37b62012-02-13 14:37:59 +08008052#, c-format
8053msgid "HEAD is now at %s"
8054msgstr ""
8055
Jiang Xin28b3cff2013-07-26 08:56:45 +08008056#: builtin/reset.c:172
Jiang Xindce37b62012-02-13 14:37:59 +08008057#, c-format
8058msgid "Cannot do a %s reset in the middle of a merge."
8059msgstr ""
8060
Jiang Xin28b3cff2013-07-26 08:56:45 +08008061#: builtin/reset.c:251
Jiang Xincc760112012-09-15 10:26:13 +08008062msgid "be quiet, only report errors"
8063msgstr ""
8064
Jiang Xin28b3cff2013-07-26 08:56:45 +08008065#: builtin/reset.c:253
Jiang Xincc760112012-09-15 10:26:13 +08008066msgid "reset HEAD and index"
8067msgstr ""
8068
Jiang Xin28b3cff2013-07-26 08:56:45 +08008069#: builtin/reset.c:254
Jiang Xincc760112012-09-15 10:26:13 +08008070msgid "reset only HEAD"
8071msgstr ""
8072
Jiang Xin28b3cff2013-07-26 08:56:45 +08008073#: builtin/reset.c:256 builtin/reset.c:258
Jiang Xincc760112012-09-15 10:26:13 +08008074msgid "reset HEAD, index and working tree"
8075msgstr ""
8076
Jiang Xin28b3cff2013-07-26 08:56:45 +08008077#: builtin/reset.c:260
Jiang Xincc760112012-09-15 10:26:13 +08008078msgid "reset HEAD but keep local changes"
8079msgstr ""
8080
Jiang Xin28b3cff2013-07-26 08:56:45 +08008081#: builtin/reset.c:278
Jiang Xin46bc4032013-01-25 12:33:58 +08008082#, c-format
8083msgid "Failed to resolve '%s' as a valid revision."
8084msgstr ""
8085
Jiang Xin28b3cff2013-07-26 08:56:45 +08008086#: builtin/reset.c:281 builtin/reset.c:289
Jiang Xindce37b62012-02-13 14:37:59 +08008087#, c-format
8088msgid "Could not parse object '%s'."
8089msgstr ""
8090
Jiang Xin28b3cff2013-07-26 08:56:45 +08008091#: builtin/reset.c:286
Jiang Xin46bc4032013-01-25 12:33:58 +08008092#, c-format
8093msgid "Failed to resolve '%s' as a valid tree."
8094msgstr ""
8095
Jiang Xin28b3cff2013-07-26 08:56:45 +08008096#: builtin/reset.c:295
Jiang Xindce37b62012-02-13 14:37:59 +08008097msgid "--patch is incompatible with --{hard,mixed,soft}"
8098msgstr ""
8099
Jiang Xin28b3cff2013-07-26 08:56:45 +08008100#: builtin/reset.c:304
Jiang Xindce37b62012-02-13 14:37:59 +08008101msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8102msgstr ""
8103
Jiang Xin28b3cff2013-07-26 08:56:45 +08008104#: builtin/reset.c:306
Jiang Xindce37b62012-02-13 14:37:59 +08008105#, c-format
8106msgid "Cannot do %s reset with paths."
8107msgstr ""
8108
Jiang Xin28b3cff2013-07-26 08:56:45 +08008109#: builtin/reset.c:316
Jiang Xindce37b62012-02-13 14:37:59 +08008110#, c-format
8111msgid "%s reset is not allowed in a bare repository"
8112msgstr ""
8113
Jiang Xin28b3cff2013-07-26 08:56:45 +08008114#: builtin/reset.c:336
Jiang Xindce37b62012-02-13 14:37:59 +08008115#, c-format
8116msgid "Could not reset index file to revision '%s'."
8117msgstr ""
8118
Jiang Xin28b3cff2013-07-26 08:56:45 +08008119#: builtin/reset.c:342
Jiang Xin46bc4032013-01-25 12:33:58 +08008120msgid "Unstaged changes after reset:"
8121msgstr ""
8122
Jiang Xin28b3cff2013-07-26 08:56:45 +08008123#: builtin/reset.c:347
Jiang Xin46bc4032013-01-25 12:33:58 +08008124msgid "Could not write new index file."
8125msgstr ""
8126
Jiang Xin28b3cff2013-07-26 08:56:45 +08008127#: builtin/rev-parse.c:345
Jiang Xincc760112012-09-15 10:26:13 +08008128msgid "git rev-parse --parseopt [options] -- [<args>...]"
8129msgstr ""
8130
Jiang Xin28b3cff2013-07-26 08:56:45 +08008131#: builtin/rev-parse.c:350
Jiang Xincc760112012-09-15 10:26:13 +08008132msgid "keep the `--` passed as an arg"
8133msgstr ""
8134
Jiang Xin28b3cff2013-07-26 08:56:45 +08008135#: builtin/rev-parse.c:352
Jiang Xincc760112012-09-15 10:26:13 +08008136msgid "stop parsing after the first non-option argument"
8137msgstr ""
8138
Jiang Xin28b3cff2013-07-26 08:56:45 +08008139#: builtin/rev-parse.c:470
Jiang Xincc760112012-09-15 10:26:13 +08008140msgid ""
8141"git rev-parse --parseopt [options] -- [<args>...]\n"
8142" or: git rev-parse --sq-quote [<arg>...]\n"
8143" or: git rev-parse [options] [<arg>...]\n"
8144"\n"
8145"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
8146msgstr ""
8147
8148#: builtin/revert.c:22
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008149msgid "git revert [options] <commit-ish>..."
Jiang Xincc760112012-09-15 10:26:13 +08008150msgstr ""
8151
8152#: builtin/revert.c:23
8153msgid "git revert <subcommand>"
8154msgstr ""
8155
8156#: builtin/revert.c:28
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008157msgid "git cherry-pick [options] <commit-ish>..."
Jiang Xincc760112012-09-15 10:26:13 +08008158msgstr ""
8159
8160#: builtin/revert.c:29
8161msgid "git cherry-pick <subcommand>"
8162msgstr ""
8163
Jiang Xin28b3cff2013-07-26 08:56:45 +08008164#: builtin/revert.c:71 builtin/revert.c:94
Jiang Xindce37b62012-02-13 14:37:59 +08008165#, c-format
8166msgid "%s: %s cannot be used with %s"
8167msgstr ""
8168
Jiang Xin28b3cff2013-07-26 08:56:45 +08008169#: builtin/revert.c:105
Jiang Xincc760112012-09-15 10:26:13 +08008170msgid "end revert or cherry-pick sequence"
8171msgstr ""
8172
Jiang Xin28b3cff2013-07-26 08:56:45 +08008173#: builtin/revert.c:106
Jiang Xincc760112012-09-15 10:26:13 +08008174msgid "resume revert or cherry-pick sequence"
8175msgstr ""
8176
Jiang Xin28b3cff2013-07-26 08:56:45 +08008177#: builtin/revert.c:107
Jiang Xincc760112012-09-15 10:26:13 +08008178msgid "cancel revert or cherry-pick sequence"
8179msgstr ""
8180
Jiang Xin28b3cff2013-07-26 08:56:45 +08008181#: builtin/revert.c:108
Jiang Xincc760112012-09-15 10:26:13 +08008182msgid "don't automatically commit"
8183msgstr ""
8184
Jiang Xin28b3cff2013-07-26 08:56:45 +08008185#: builtin/revert.c:109
Jiang Xincc760112012-09-15 10:26:13 +08008186msgid "edit the commit message"
8187msgstr ""
8188
Jiang Xin28b3cff2013-07-26 08:56:45 +08008189#: builtin/revert.c:112
Jiang Xincc760112012-09-15 10:26:13 +08008190msgid "parent number"
8191msgstr ""
8192
Jiang Xin28b3cff2013-07-26 08:56:45 +08008193#: builtin/revert.c:114
Jiang Xincc760112012-09-15 10:26:13 +08008194msgid "merge strategy"
8195msgstr ""
8196
Jiang Xin28b3cff2013-07-26 08:56:45 +08008197#: builtin/revert.c:115
Jiang Xincc760112012-09-15 10:26:13 +08008198msgid "option"
8199msgstr ""
8200
Jiang Xin28b3cff2013-07-26 08:56:45 +08008201#: builtin/revert.c:116
Jiang Xincc760112012-09-15 10:26:13 +08008202msgid "option for merge strategy"
8203msgstr ""
8204
Jiang Xin28b3cff2013-07-26 08:56:45 +08008205#: builtin/revert.c:127
Jiang Xincc760112012-09-15 10:26:13 +08008206msgid "append commit name"
8207msgstr ""
8208
Jiang Xin28b3cff2013-07-26 08:56:45 +08008209#: builtin/revert.c:128
Jiang Xincc760112012-09-15 10:26:13 +08008210msgid "allow fast-forward"
8211msgstr ""
8212
Jiang Xin28b3cff2013-07-26 08:56:45 +08008213#: builtin/revert.c:129
Jiang Xincc760112012-09-15 10:26:13 +08008214msgid "preserve initially empty commits"
8215msgstr ""
8216
Jiang Xin28b3cff2013-07-26 08:56:45 +08008217#: builtin/revert.c:130
Jiang Xincc760112012-09-15 10:26:13 +08008218msgid "allow commits with empty messages"
8219msgstr ""
8220
Jiang Xin28b3cff2013-07-26 08:56:45 +08008221#: builtin/revert.c:131
Jiang Xincc760112012-09-15 10:26:13 +08008222msgid "keep redundant, empty commits"
8223msgstr ""
8224
Jiang Xin28b3cff2013-07-26 08:56:45 +08008225#: builtin/revert.c:135
Jiang Xindce37b62012-02-13 14:37:59 +08008226msgid "program error"
8227msgstr ""
8228
Jiang Xin28b3cff2013-07-26 08:56:45 +08008229#: builtin/revert.c:225
Jiang Xindce37b62012-02-13 14:37:59 +08008230msgid "revert failed"
8231msgstr ""
8232
Jiang Xin28b3cff2013-07-26 08:56:45 +08008233#: builtin/revert.c:240
Jiang Xindce37b62012-02-13 14:37:59 +08008234msgid "cherry-pick failed"
8235msgstr ""
8236
Jiang Xin28b3cff2013-07-26 08:56:45 +08008237#: builtin/rm.c:16
Jiang Xincc760112012-09-15 10:26:13 +08008238msgid "git rm [options] [--] <file>..."
8239msgstr ""
8240
Jiang Xin28b3cff2013-07-26 08:56:45 +08008241#: builtin/rm.c:64
Jiang Xinfe52cd62012-11-23 14:29:02 +08008242msgid ""
Jiang Xin28b3cff2013-07-26 08:56:45 +08008243"the following submodule (or one of its nested submodules)\n"
8244"uses a .git directory:"
8245msgid_plural ""
8246"the following submodules (or one of its nested submodules)\n"
8247"use a .git directory:"
8248msgstr[0] ""
8249msgstr[1] ""
8250
8251#: builtin/rm.c:70
8252msgid ""
8253"\n"
Jiang Xinfe52cd62012-11-23 14:29:02 +08008254"(use 'rm -rf' if you really want to remove it including all of its history)"
8255msgstr ""
8256
Jiang Xin28b3cff2013-07-26 08:56:45 +08008257#: builtin/rm.c:230
Jiang Xindce37b62012-02-13 14:37:59 +08008258msgid ""
Jiang Xin28b3cff2013-07-26 08:56:45 +08008259"the following file has staged content different from both the\n"
8260"file and the HEAD:"
8261msgid_plural ""
8262"the following files have staged content different from both the\n"
8263"file and the HEAD:"
8264msgstr[0] ""
8265msgstr[1] ""
8266
8267#: builtin/rm.c:235
8268msgid ""
8269"\n"
Jiang Xindce37b62012-02-13 14:37:59 +08008270"(use -f to force removal)"
8271msgstr ""
8272
Jiang Xin28b3cff2013-07-26 08:56:45 +08008273#: builtin/rm.c:239
8274msgid "the following file has changes staged in the index:"
8275msgid_plural "the following files have changes staged in the index:"
8276msgstr[0] ""
8277msgstr[1] ""
8278
8279#: builtin/rm.c:243 builtin/rm.c:254
Jiang Xindce37b62012-02-13 14:37:59 +08008280msgid ""
Jiang Xin28b3cff2013-07-26 08:56:45 +08008281"\n"
Jiang Xindce37b62012-02-13 14:37:59 +08008282"(use --cached to keep the file, or -f to force removal)"
8283msgstr ""
8284
Jiang Xin28b3cff2013-07-26 08:56:45 +08008285#: builtin/rm.c:251
8286msgid "the following file has local modifications:"
8287msgid_plural "the following files have local modifications:"
8288msgstr[0] ""
8289msgstr[1] ""
Jiang Xindce37b62012-02-13 14:37:59 +08008290
Jiang Xin28b3cff2013-07-26 08:56:45 +08008291#: builtin/rm.c:269
Jiang Xincc760112012-09-15 10:26:13 +08008292msgid "do not list removed files"
8293msgstr ""
8294
Jiang Xin28b3cff2013-07-26 08:56:45 +08008295#: builtin/rm.c:270
Jiang Xincc760112012-09-15 10:26:13 +08008296msgid "only remove from the index"
8297msgstr ""
8298
Jiang Xin28b3cff2013-07-26 08:56:45 +08008299#: builtin/rm.c:271
Jiang Xincc760112012-09-15 10:26:13 +08008300msgid "override the up-to-date check"
8301msgstr ""
8302
Jiang Xin28b3cff2013-07-26 08:56:45 +08008303#: builtin/rm.c:272
Jiang Xincc760112012-09-15 10:26:13 +08008304msgid "allow recursive removal"
8305msgstr ""
8306
Jiang Xin28b3cff2013-07-26 08:56:45 +08008307#: builtin/rm.c:274
Jiang Xincc760112012-09-15 10:26:13 +08008308msgid "exit with a zero status even if nothing matched"
8309msgstr ""
8310
Jiang Xin28b3cff2013-07-26 08:56:45 +08008311#: builtin/rm.c:345
Jiang Xindce37b62012-02-13 14:37:59 +08008312#, c-format
8313msgid "not removing '%s' recursively without -r"
8314msgstr ""
8315
Jiang Xin28b3cff2013-07-26 08:56:45 +08008316#: builtin/rm.c:384
Jiang Xindce37b62012-02-13 14:37:59 +08008317#, c-format
8318msgid "git rm: unable to remove %s"
8319msgstr ""
8320
Jiang Xincc760112012-09-15 10:26:13 +08008321#: builtin/shortlog.c:13
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008322msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
Jiang Xincc760112012-09-15 10:26:13 +08008323msgstr ""
8324
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008325#: builtin/shortlog.c:131
Jiang Xindce37b62012-02-13 14:37:59 +08008326#, c-format
8327msgid "Missing author: %s"
8328msgstr ""
8329
Jiang Xin28b3cff2013-07-26 08:56:45 +08008330#: builtin/shortlog.c:228
Jiang Xincc760112012-09-15 10:26:13 +08008331msgid "sort output according to the number of commits per author"
8332msgstr ""
8333
Jiang Xin28b3cff2013-07-26 08:56:45 +08008334#: builtin/shortlog.c:230
Jiang Xincc760112012-09-15 10:26:13 +08008335msgid "Suppress commit descriptions, only provides commit count"
8336msgstr ""
8337
Jiang Xin28b3cff2013-07-26 08:56:45 +08008338#: builtin/shortlog.c:232
Jiang Xincc760112012-09-15 10:26:13 +08008339msgid "Show the email address of each author"
8340msgstr ""
8341
Jiang Xin28b3cff2013-07-26 08:56:45 +08008342#: builtin/shortlog.c:233
Jiang Xincc760112012-09-15 10:26:13 +08008343msgid "w[,i1[,i2]]"
8344msgstr ""
8345
Jiang Xin28b3cff2013-07-26 08:56:45 +08008346#: builtin/shortlog.c:234
Jiang Xincc760112012-09-15 10:26:13 +08008347msgid "Linewrap output"
8348msgstr ""
8349
8350#: builtin/show-branch.c:9
8351msgid ""
8352"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8353"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8354"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8355"<glob>)...]"
8356msgstr ""
8357
8358#: builtin/show-branch.c:10
8359msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8360msgstr ""
8361
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008362#: builtin/show-branch.c:650
Jiang Xincc760112012-09-15 10:26:13 +08008363msgid "show remote-tracking and local branches"
8364msgstr ""
8365
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008366#: builtin/show-branch.c:652
Jiang Xincc760112012-09-15 10:26:13 +08008367msgid "show remote-tracking branches"
8368msgstr ""
8369
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008370#: builtin/show-branch.c:654
Jiang Xincc760112012-09-15 10:26:13 +08008371msgid "color '*!+-' corresponding to the branch"
8372msgstr ""
8373
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008374#: builtin/show-branch.c:656
Jiang Xincc760112012-09-15 10:26:13 +08008375msgid "show <n> more commits after the common ancestor"
8376msgstr ""
8377
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008378#: builtin/show-branch.c:658
Jiang Xincc760112012-09-15 10:26:13 +08008379msgid "synonym to more=-1"
8380msgstr ""
8381
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008382#: builtin/show-branch.c:659
Jiang Xincc760112012-09-15 10:26:13 +08008383msgid "suppress naming strings"
8384msgstr ""
8385
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008386#: builtin/show-branch.c:661
Jiang Xincc760112012-09-15 10:26:13 +08008387msgid "include the current branch"
8388msgstr ""
8389
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008390#: builtin/show-branch.c:663
Jiang Xincc760112012-09-15 10:26:13 +08008391msgid "name commits with their object names"
8392msgstr ""
8393
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008394#: builtin/show-branch.c:665
Jiang Xincc760112012-09-15 10:26:13 +08008395msgid "show possible merge bases"
8396msgstr ""
8397
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008398#: builtin/show-branch.c:667
Jiang Xincc760112012-09-15 10:26:13 +08008399msgid "show refs unreachable from any other ref"
8400msgstr ""
8401
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008402#: builtin/show-branch.c:669
Jiang Xincc760112012-09-15 10:26:13 +08008403msgid "show commits in topological order"
8404msgstr ""
8405
Jiang Xin28b3cff2013-07-26 08:56:45 +08008406#: builtin/show-branch.c:672
Jiang Xincc760112012-09-15 10:26:13 +08008407msgid "show only commits not on the first branch"
8408msgstr ""
8409
Jiang Xin28b3cff2013-07-26 08:56:45 +08008410#: builtin/show-branch.c:674
Jiang Xincc760112012-09-15 10:26:13 +08008411msgid "show merges reachable from only one tip"
8412msgstr ""
8413
Jiang Xin28b3cff2013-07-26 08:56:45 +08008414#: builtin/show-branch.c:676
8415msgid "topologically sort, maintaining date order where possible"
Jiang Xincc760112012-09-15 10:26:13 +08008416msgstr ""
8417
Jiang Xin28b3cff2013-07-26 08:56:45 +08008418#: builtin/show-branch.c:679
Jiang Xincc760112012-09-15 10:26:13 +08008419msgid "<n>[,<base>]"
8420msgstr ""
8421
Jiang Xin28b3cff2013-07-26 08:56:45 +08008422#: builtin/show-branch.c:680
Jiang Xincc760112012-09-15 10:26:13 +08008423msgid "show <n> most recent ref-log entries starting at base"
8424msgstr ""
8425
8426#: builtin/show-ref.c:10
8427msgid ""
Jiang Xin9caaf232013-02-14 14:49:45 +08008428"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8429"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
Jiang Xincc760112012-09-15 10:26:13 +08008430msgstr ""
8431
8432#: builtin/show-ref.c:11
8433msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8434msgstr ""
8435
Jiang Xin28b3cff2013-07-26 08:56:45 +08008436#: builtin/show-ref.c:168
Jiang Xincc760112012-09-15 10:26:13 +08008437msgid "only show tags (can be combined with heads)"
8438msgstr ""
8439
Jiang Xin28b3cff2013-07-26 08:56:45 +08008440#: builtin/show-ref.c:169
Jiang Xincc760112012-09-15 10:26:13 +08008441msgid "only show heads (can be combined with tags)"
8442msgstr ""
8443
Jiang Xin28b3cff2013-07-26 08:56:45 +08008444#: builtin/show-ref.c:170
Jiang Xincc760112012-09-15 10:26:13 +08008445msgid "stricter reference checking, requires exact ref path"
8446msgstr ""
8447
Jiang Xin28b3cff2013-07-26 08:56:45 +08008448#: builtin/show-ref.c:173 builtin/show-ref.c:176
8449msgid "show the HEAD reference, even if it would be filtered out"
Jiang Xincc760112012-09-15 10:26:13 +08008450msgstr ""
8451
Jiang Xin28b3cff2013-07-26 08:56:45 +08008452#: builtin/show-ref.c:178
Jiang Xincc760112012-09-15 10:26:13 +08008453msgid "dereference tags into object IDs"
8454msgstr ""
8455
Jiang Xin28b3cff2013-07-26 08:56:45 +08008456#: builtin/show-ref.c:180
Jiang Xincc760112012-09-15 10:26:13 +08008457msgid "only show SHA1 hash using <n> digits"
8458msgstr ""
8459
Jiang Xin28b3cff2013-07-26 08:56:45 +08008460#: builtin/show-ref.c:184
Jiang Xincc760112012-09-15 10:26:13 +08008461msgid "do not print results to stdout (useful with --verify)"
8462msgstr ""
8463
Jiang Xin28b3cff2013-07-26 08:56:45 +08008464#: builtin/show-ref.c:186
Jiang Xincc760112012-09-15 10:26:13 +08008465msgid "show refs from stdin that aren't in local repository"
8466msgstr ""
8467
8468#: builtin/symbolic-ref.c:7
8469msgid "git symbolic-ref [options] name [ref]"
8470msgstr ""
8471
Jiang Xinfe52cd62012-11-23 14:29:02 +08008472#: builtin/symbolic-ref.c:8
8473msgid "git symbolic-ref -d [-q] name"
8474msgstr ""
8475
8476#: builtin/symbolic-ref.c:40
Jiang Xincc760112012-09-15 10:26:13 +08008477msgid "suppress error message for non-symbolic (detached) refs"
8478msgstr ""
8479
Jiang Xinfe52cd62012-11-23 14:29:02 +08008480#: builtin/symbolic-ref.c:41
8481msgid "delete symbolic ref"
8482msgstr ""
8483
8484#: builtin/symbolic-ref.c:42
Jiang Xincc760112012-09-15 10:26:13 +08008485msgid "shorten ref output"
8486msgstr ""
8487
Jiang Xinfe52cd62012-11-23 14:29:02 +08008488#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
Jiang Xincc760112012-09-15 10:26:13 +08008489msgid "reason"
8490msgstr ""
8491
Jiang Xinfe52cd62012-11-23 14:29:02 +08008492#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
Jiang Xincc760112012-09-15 10:26:13 +08008493msgid "reason of the update"
8494msgstr ""
8495
8496#: builtin/tag.c:22
8497msgid ""
8498"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8499msgstr ""
8500
8501#: builtin/tag.c:23
8502msgid "git tag -d <tagname>..."
8503msgstr ""
8504
8505#: builtin/tag.c:24
8506msgid ""
8507"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8508"\t\t[<pattern>...]"
8509msgstr ""
8510
8511#: builtin/tag.c:26
8512msgid "git tag -v <tagname>..."
8513msgstr ""
8514
Jiang Xin822e4a62012-05-08 16:10:22 +08008515#: builtin/tag.c:60
Jiang Xin1d4ac882012-02-28 12:24:20 +08008516#, c-format
8517msgid "malformed object at '%s'"
8518msgstr ""
8519
Jiang Xin822e4a62012-05-08 16:10:22 +08008520#: builtin/tag.c:207
Jiang Xindce37b62012-02-13 14:37:59 +08008521#, c-format
8522msgid "tag name too long: %.*s..."
8523msgstr ""
8524
Jiang Xin822e4a62012-05-08 16:10:22 +08008525#: builtin/tag.c:212
Jiang Xindce37b62012-02-13 14:37:59 +08008526#, c-format
8527msgid "tag '%s' not found."
8528msgstr ""
8529
Jiang Xin822e4a62012-05-08 16:10:22 +08008530#: builtin/tag.c:227
Jiang Xindce37b62012-02-13 14:37:59 +08008531#, c-format
8532msgid "Deleted tag '%s' (was %s)\n"
8533msgstr ""
8534
Jiang Xin822e4a62012-05-08 16:10:22 +08008535#: builtin/tag.c:239
Jiang Xindce37b62012-02-13 14:37:59 +08008536#, c-format
8537msgid "could not verify the tag '%s'"
8538msgstr ""
8539
Jiang Xin822e4a62012-05-08 16:10:22 +08008540#: builtin/tag.c:249
Jiang Xin9caaf232013-02-14 14:49:45 +08008541#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08008542msgid ""
8543"\n"
Jiang Xin9caaf232013-02-14 14:49:45 +08008544"Write a tag message\n"
8545"Lines starting with '%c' will be ignored.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08008546msgstr ""
8547
Jiang Xin9caaf232013-02-14 14:49:45 +08008548#: builtin/tag.c:253
8549#, c-format
Jiang Xindce37b62012-02-13 14:37:59 +08008550msgid ""
8551"\n"
Jiang Xin9caaf232013-02-14 14:49:45 +08008552"Write a tag message\n"
8553"Lines starting with '%c' will be kept; you may remove them yourself if you "
Jiang Xindce37b62012-02-13 14:37:59 +08008554"want to.\n"
Jiang Xindce37b62012-02-13 14:37:59 +08008555msgstr ""
8556
Jiang Xin9caaf232013-02-14 14:49:45 +08008557#: builtin/tag.c:292
Jiang Xindce37b62012-02-13 14:37:59 +08008558msgid "unable to sign the tag"
8559msgstr ""
8560
Jiang Xin9caaf232013-02-14 14:49:45 +08008561#: builtin/tag.c:294
Jiang Xindce37b62012-02-13 14:37:59 +08008562msgid "unable to write tag file"
8563msgstr ""
8564
Jiang Xin9caaf232013-02-14 14:49:45 +08008565#: builtin/tag.c:319
Jiang Xindce37b62012-02-13 14:37:59 +08008566msgid "bad object type."
8567msgstr ""
8568
Jiang Xin9caaf232013-02-14 14:49:45 +08008569#: builtin/tag.c:332
Jiang Xindce37b62012-02-13 14:37:59 +08008570msgid "tag header too big."
8571msgstr ""
8572
Jiang Xin9caaf232013-02-14 14:49:45 +08008573#: builtin/tag.c:368
Jiang Xindce37b62012-02-13 14:37:59 +08008574msgid "no tag message?"
8575msgstr ""
8576
Jiang Xin9caaf232013-02-14 14:49:45 +08008577#: builtin/tag.c:374
Jiang Xindce37b62012-02-13 14:37:59 +08008578#, c-format
8579msgid "The tag message has been left in %s\n"
8580msgstr ""
8581
Jiang Xin9caaf232013-02-14 14:49:45 +08008582#: builtin/tag.c:423
Jiang Xin1d4ac882012-02-28 12:24:20 +08008583msgid "switch 'points-at' requires an object"
8584msgstr ""
8585
Jiang Xin9caaf232013-02-14 14:49:45 +08008586#: builtin/tag.c:425
Jiang Xin1d4ac882012-02-28 12:24:20 +08008587#, c-format
8588msgid "malformed object name '%s'"
8589msgstr ""
8590
Jiang Xin9caaf232013-02-14 14:49:45 +08008591#: builtin/tag.c:445
Jiang Xincc760112012-09-15 10:26:13 +08008592msgid "list tag names"
8593msgstr ""
8594
Jiang Xin9caaf232013-02-14 14:49:45 +08008595#: builtin/tag.c:447
Jiang Xincc760112012-09-15 10:26:13 +08008596msgid "print <n> lines of each tag message"
8597msgstr ""
8598
Jiang Xin9caaf232013-02-14 14:49:45 +08008599#: builtin/tag.c:449
Jiang Xincc760112012-09-15 10:26:13 +08008600msgid "delete tags"
8601msgstr ""
8602
Jiang Xin9caaf232013-02-14 14:49:45 +08008603#: builtin/tag.c:450
Jiang Xincc760112012-09-15 10:26:13 +08008604msgid "verify tags"
8605msgstr ""
8606
Jiang Xin9caaf232013-02-14 14:49:45 +08008607#: builtin/tag.c:452
Jiang Xincc760112012-09-15 10:26:13 +08008608msgid "Tag creation options"
8609msgstr ""
8610
Jiang Xin9caaf232013-02-14 14:49:45 +08008611#: builtin/tag.c:454
Jiang Xincc760112012-09-15 10:26:13 +08008612msgid "annotated tag, needs a message"
8613msgstr ""
8614
Jiang Xin9caaf232013-02-14 14:49:45 +08008615#: builtin/tag.c:456
Jiang Xincc760112012-09-15 10:26:13 +08008616msgid "tag message"
8617msgstr ""
8618
Jiang Xin9caaf232013-02-14 14:49:45 +08008619#: builtin/tag.c:458
Jiang Xincc760112012-09-15 10:26:13 +08008620msgid "annotated and GPG-signed tag"
8621msgstr ""
8622
Jiang Xin9caaf232013-02-14 14:49:45 +08008623#: builtin/tag.c:462
Jiang Xincc760112012-09-15 10:26:13 +08008624msgid "use another key to sign the tag"
8625msgstr ""
8626
Jiang Xin9caaf232013-02-14 14:49:45 +08008627#: builtin/tag.c:463
Jiang Xincc760112012-09-15 10:26:13 +08008628msgid "replace the tag if exists"
8629msgstr ""
8630
Jiang Xin9caaf232013-02-14 14:49:45 +08008631#: builtin/tag.c:464
Jiang Xincc760112012-09-15 10:26:13 +08008632msgid "show tag list in columns"
8633msgstr ""
8634
Jiang Xin9caaf232013-02-14 14:49:45 +08008635#: builtin/tag.c:466
Jiang Xincc760112012-09-15 10:26:13 +08008636msgid "Tag listing options"
8637msgstr ""
8638
Jiang Xin9caaf232013-02-14 14:49:45 +08008639#: builtin/tag.c:469
Jiang Xincc760112012-09-15 10:26:13 +08008640msgid "print only tags that contain the commit"
8641msgstr ""
8642
Jiang Xin9caaf232013-02-14 14:49:45 +08008643#: builtin/tag.c:475
Jiang Xincc760112012-09-15 10:26:13 +08008644msgid "print only tags of the object"
8645msgstr ""
8646
Jiang Xin9caaf232013-02-14 14:49:45 +08008647#: builtin/tag.c:504
Jiang Xin822e4a62012-05-08 16:10:22 +08008648msgid "--column and -n are incompatible"
8649msgstr ""
8650
Jiang Xin9caaf232013-02-14 14:49:45 +08008651#: builtin/tag.c:521
Jiang Xindce37b62012-02-13 14:37:59 +08008652msgid "-n option is only allowed with -l."
8653msgstr ""
8654
Jiang Xin9caaf232013-02-14 14:49:45 +08008655#: builtin/tag.c:523
Jiang Xindce37b62012-02-13 14:37:59 +08008656msgid "--contains option is only allowed with -l."
8657msgstr ""
8658
Jiang Xin9caaf232013-02-14 14:49:45 +08008659#: builtin/tag.c:525
Jiang Xin1d4ac882012-02-28 12:24:20 +08008660msgid "--points-at option is only allowed with -l."
8661msgstr ""
8662
Jiang Xin9caaf232013-02-14 14:49:45 +08008663#: builtin/tag.c:533
Jiang Xindce37b62012-02-13 14:37:59 +08008664msgid "only one -F or -m option is allowed."
8665msgstr ""
8666
Jiang Xin9caaf232013-02-14 14:49:45 +08008667#: builtin/tag.c:553
Jiang Xindce37b62012-02-13 14:37:59 +08008668msgid "too many params"
8669msgstr ""
8670
Jiang Xin9caaf232013-02-14 14:49:45 +08008671#: builtin/tag.c:559
Jiang Xindce37b62012-02-13 14:37:59 +08008672#, c-format
8673msgid "'%s' is not a valid tag name."
8674msgstr ""
8675
Jiang Xin9caaf232013-02-14 14:49:45 +08008676#: builtin/tag.c:564
Jiang Xindce37b62012-02-13 14:37:59 +08008677#, c-format
8678msgid "tag '%s' already exists"
8679msgstr ""
8680
Jiang Xin9caaf232013-02-14 14:49:45 +08008681#: builtin/tag.c:582
Jiang Xindce37b62012-02-13 14:37:59 +08008682#, c-format
8683msgid "%s: cannot lock the ref"
8684msgstr ""
8685
Jiang Xin9caaf232013-02-14 14:49:45 +08008686#: builtin/tag.c:584
Jiang Xindce37b62012-02-13 14:37:59 +08008687#, c-format
8688msgid "%s: cannot update the ref"
8689msgstr ""
8690
Jiang Xin9caaf232013-02-14 14:49:45 +08008691#: builtin/tag.c:586
Jiang Xindce37b62012-02-13 14:37:59 +08008692#, c-format
8693msgid "Updated tag '%s' (was %s)\n"
8694msgstr ""
8695
Jiang Xincc760112012-09-15 10:26:13 +08008696#: builtin/update-index.c:401
8697msgid "git update-index [options] [--] [<file>...]"
8698msgstr ""
8699
Jiang Xinfe52cd62012-11-23 14:29:02 +08008700#: builtin/update-index.c:718
Jiang Xincc760112012-09-15 10:26:13 +08008701msgid "continue refresh even when index needs update"
8702msgstr ""
8703
Jiang Xinfe52cd62012-11-23 14:29:02 +08008704#: builtin/update-index.c:721
Jiang Xincc760112012-09-15 10:26:13 +08008705msgid "refresh: ignore submodules"
8706msgstr ""
8707
Jiang Xinfe52cd62012-11-23 14:29:02 +08008708#: builtin/update-index.c:724
Jiang Xincc760112012-09-15 10:26:13 +08008709msgid "do not ignore new files"
8710msgstr ""
8711
Jiang Xinfe52cd62012-11-23 14:29:02 +08008712#: builtin/update-index.c:726
Jiang Xincc760112012-09-15 10:26:13 +08008713msgid "let files replace directories and vice-versa"
8714msgstr ""
8715
Jiang Xinfe52cd62012-11-23 14:29:02 +08008716#: builtin/update-index.c:728
Jiang Xincc760112012-09-15 10:26:13 +08008717msgid "notice files missing from worktree"
8718msgstr ""
8719
Jiang Xinfe52cd62012-11-23 14:29:02 +08008720#: builtin/update-index.c:730
Jiang Xincc760112012-09-15 10:26:13 +08008721msgid "refresh even if index contains unmerged entries"
8722msgstr ""
8723
Jiang Xinfe52cd62012-11-23 14:29:02 +08008724#: builtin/update-index.c:733
Jiang Xincc760112012-09-15 10:26:13 +08008725msgid "refresh stat information"
8726msgstr ""
8727
Jiang Xinfe52cd62012-11-23 14:29:02 +08008728#: builtin/update-index.c:737
Jiang Xincc760112012-09-15 10:26:13 +08008729msgid "like --refresh, but ignore assume-unchanged setting"
8730msgstr ""
8731
Jiang Xinfe52cd62012-11-23 14:29:02 +08008732#: builtin/update-index.c:741
Jiang Xincc760112012-09-15 10:26:13 +08008733msgid "<mode> <object> <path>"
8734msgstr ""
8735
Jiang Xinfe52cd62012-11-23 14:29:02 +08008736#: builtin/update-index.c:742
Jiang Xincc760112012-09-15 10:26:13 +08008737msgid "add the specified entry to the index"
8738msgstr ""
8739
Jiang Xinfe52cd62012-11-23 14:29:02 +08008740#: builtin/update-index.c:746
Jiang Xincc760112012-09-15 10:26:13 +08008741msgid "(+/-)x"
8742msgstr ""
8743
Jiang Xinfe52cd62012-11-23 14:29:02 +08008744#: builtin/update-index.c:747
Jiang Xincc760112012-09-15 10:26:13 +08008745msgid "override the executable bit of the listed files"
8746msgstr ""
8747
Jiang Xinfe52cd62012-11-23 14:29:02 +08008748#: builtin/update-index.c:751
Jiang Xincc760112012-09-15 10:26:13 +08008749msgid "mark files as \"not changing\""
8750msgstr ""
8751
Jiang Xinfe52cd62012-11-23 14:29:02 +08008752#: builtin/update-index.c:754
Jiang Xincc760112012-09-15 10:26:13 +08008753msgid "clear assumed-unchanged bit"
8754msgstr ""
8755
Jiang Xinfe52cd62012-11-23 14:29:02 +08008756#: builtin/update-index.c:757
Jiang Xincc760112012-09-15 10:26:13 +08008757msgid "mark files as \"index-only\""
8758msgstr ""
8759
Jiang Xinfe52cd62012-11-23 14:29:02 +08008760#: builtin/update-index.c:760
Jiang Xincc760112012-09-15 10:26:13 +08008761msgid "clear skip-worktree bit"
8762msgstr ""
8763
Jiang Xinfe52cd62012-11-23 14:29:02 +08008764#: builtin/update-index.c:763
Jiang Xincc760112012-09-15 10:26:13 +08008765msgid "add to index only; do not add content to object database"
8766msgstr ""
8767
Jiang Xinfe52cd62012-11-23 14:29:02 +08008768#: builtin/update-index.c:765
Jiang Xincc760112012-09-15 10:26:13 +08008769msgid "remove named paths even if present in worktree"
8770msgstr ""
8771
Jiang Xinfe52cd62012-11-23 14:29:02 +08008772#: builtin/update-index.c:767
Jiang Xincc760112012-09-15 10:26:13 +08008773msgid "with --stdin: input lines are terminated by null bytes"
8774msgstr ""
8775
Jiang Xinfe52cd62012-11-23 14:29:02 +08008776#: builtin/update-index.c:769
Jiang Xincc760112012-09-15 10:26:13 +08008777msgid "read list of paths to be updated from standard input"
8778msgstr ""
8779
Jiang Xinfe52cd62012-11-23 14:29:02 +08008780#: builtin/update-index.c:773
Jiang Xincc760112012-09-15 10:26:13 +08008781msgid "add entries from standard input to the index"
8782msgstr ""
8783
Jiang Xinfe52cd62012-11-23 14:29:02 +08008784#: builtin/update-index.c:777
Jiang Xincc760112012-09-15 10:26:13 +08008785msgid "repopulate stages #2 and #3 for the listed paths"
8786msgstr ""
8787
Jiang Xinfe52cd62012-11-23 14:29:02 +08008788#: builtin/update-index.c:781
Jiang Xincc760112012-09-15 10:26:13 +08008789msgid "only update entries that differ from HEAD"
8790msgstr ""
8791
Jiang Xinfe52cd62012-11-23 14:29:02 +08008792#: builtin/update-index.c:785
Jiang Xincc760112012-09-15 10:26:13 +08008793msgid "ignore files missing from worktree"
8794msgstr ""
8795
Jiang Xinfe52cd62012-11-23 14:29:02 +08008796#: builtin/update-index.c:788
Jiang Xincc760112012-09-15 10:26:13 +08008797msgid "report actions to standard output"
8798msgstr ""
8799
Jiang Xinfe52cd62012-11-23 14:29:02 +08008800#: builtin/update-index.c:790
Jiang Xincc760112012-09-15 10:26:13 +08008801msgid "(for porcelains) forget saved unresolved conflicts"
8802msgstr ""
8803
Jiang Xinfe52cd62012-11-23 14:29:02 +08008804#: builtin/update-index.c:794
Jiang Xincc760112012-09-15 10:26:13 +08008805msgid "write index in this format"
8806msgstr ""
8807
8808#: builtin/update-ref.c:7
8809msgid "git update-ref [options] -d <refname> [<oldval>]"
8810msgstr ""
8811
8812#: builtin/update-ref.c:8
8813msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8814msgstr ""
8815
8816#: builtin/update-ref.c:19
8817msgid "delete the reference"
8818msgstr ""
8819
8820#: builtin/update-ref.c:21
8821msgid "update <refname> not the one it points to"
8822msgstr ""
8823
8824#: builtin/update-server-info.c:6
8825msgid "git update-server-info [--force]"
8826msgstr ""
8827
8828#: builtin/update-server-info.c:14
8829msgid "update the info files from scratch"
8830msgstr ""
8831
8832#: builtin/verify-pack.c:56
8833msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8834msgstr ""
8835
8836#: builtin/verify-pack.c:66
8837msgid "verbose"
8838msgstr ""
8839
8840#: builtin/verify-pack.c:68
8841msgid "show statistics only"
8842msgstr ""
8843
8844#: builtin/verify-tag.c:17
8845msgid "git verify-tag [-v|--verbose] <tag>..."
8846msgstr ""
8847
8848#: builtin/verify-tag.c:73
8849msgid "print tag contents"
8850msgstr ""
8851
8852#: builtin/write-tree.c:13
8853msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8854msgstr ""
8855
8856#: builtin/write-tree.c:26
8857msgid "<prefix>/"
8858msgstr ""
8859
8860#: builtin/write-tree.c:27
8861msgid "write tree object for a subdirectory <prefix>"
8862msgstr ""
8863
8864#: builtin/write-tree.c:30
8865msgid "only useful for debugging"
8866msgstr ""
8867
Jiang Xin28b3cff2013-07-26 08:56:45 +08008868#: git.c:17
Jiang Xinc6bc7d42013-04-30 08:31:19 +08008869msgid ""
8870"'git help -a' and 'git help -g' lists available subcommands and some\n"
8871"concept guides. See 'git help <command>' or 'git help <concept>'\n"
8872"to read about a specific subcommand or concept."
Jiang Xin822e4a62012-05-08 16:10:22 +08008873msgstr ""
8874
Jiang Xin28b3cff2013-07-26 08:56:45 +08008875#: parse-options.h:144
8876msgid "expiry date"
8877msgstr ""
8878
8879#: parse-options.h:159
Jiang Xin6f6731e2012-05-21 09:00:39 +08008880msgid "no-op (backward compatibility)"
8881msgstr ""
8882
Jiang Xin28b3cff2013-07-26 08:56:45 +08008883#: parse-options.h:236
Jiang Xin6f6731e2012-05-21 09:00:39 +08008884msgid "be more verbose"
8885msgstr ""
8886
Jiang Xin28b3cff2013-07-26 08:56:45 +08008887#: parse-options.h:238
Jiang Xin6f6731e2012-05-21 09:00:39 +08008888msgid "be more quiet"
8889msgstr ""
8890
Jiang Xin28b3cff2013-07-26 08:56:45 +08008891#: parse-options.h:244
Jiang Xin6f6731e2012-05-21 09:00:39 +08008892msgid "use <n> digits to display SHA-1s"
8893msgstr ""
8894
Jiang Xin822e4a62012-05-08 16:10:22 +08008895#: common-cmds.h:8
8896msgid "Add file contents to the index"
8897msgstr ""
8898
8899#: common-cmds.h:9
8900msgid "Find by binary search the change that introduced a bug"
8901msgstr ""
8902
8903#: common-cmds.h:10
8904msgid "List, create, or delete branches"
8905msgstr ""
8906
8907#: common-cmds.h:11
8908msgid "Checkout a branch or paths to the working tree"
8909msgstr ""
8910
8911#: common-cmds.h:12
8912msgid "Clone a repository into a new directory"
8913msgstr ""
8914
8915#: common-cmds.h:13
8916msgid "Record changes to the repository"
8917msgstr ""
8918
8919#: common-cmds.h:14
8920msgid "Show changes between commits, commit and working tree, etc"
8921msgstr ""
8922
8923#: common-cmds.h:15
8924msgid "Download objects and refs from another repository"
8925msgstr ""
8926
8927#: common-cmds.h:16
8928msgid "Print lines matching a pattern"
8929msgstr ""
8930
8931#: common-cmds.h:17
Jiang Xin9caaf232013-02-14 14:49:45 +08008932msgid "Create an empty Git repository or reinitialize an existing one"
Jiang Xin822e4a62012-05-08 16:10:22 +08008933msgstr ""
8934
8935#: common-cmds.h:18
8936msgid "Show commit logs"
8937msgstr ""
8938
8939#: common-cmds.h:19
8940msgid "Join two or more development histories together"
8941msgstr ""
8942
8943#: common-cmds.h:20
8944msgid "Move or rename a file, a directory, or a symlink"
8945msgstr ""
8946
8947#: common-cmds.h:21
Jiang Xin28b3cff2013-07-26 08:56:45 +08008948msgid "Fetch from and integrate with another repository or a local branch"
Jiang Xin822e4a62012-05-08 16:10:22 +08008949msgstr ""
8950
8951#: common-cmds.h:22
8952msgid "Update remote refs along with associated objects"
8953msgstr ""
8954
8955#: common-cmds.h:23
8956msgid "Forward-port local commits to the updated upstream head"
8957msgstr ""
8958
8959#: common-cmds.h:24
8960msgid "Reset current HEAD to the specified state"
8961msgstr ""
8962
8963#: common-cmds.h:25
8964msgid "Remove files from the working tree and from the index"
8965msgstr ""
8966
8967#: common-cmds.h:26
8968msgid "Show various types of objects"
8969msgstr ""
8970
8971#: common-cmds.h:27
8972msgid "Show the working tree status"
8973msgstr ""
8974
8975#: common-cmds.h:28
8976msgid "Create, list, delete or verify a tag object signed with GPG"
8977msgstr ""
8978
Jiang Xincd1e7482012-04-28 20:27:01 +08008979#: git-am.sh:50
Jiang Xindce37b62012-02-13 14:37:59 +08008980msgid "You need to set your committer info first"
8981msgstr ""
8982
Jiang Xin7256fd72012-06-08 10:40:20 +08008983#: git-am.sh:95
8984msgid ""
8985"You seem to have moved HEAD since the last 'am' failure.\n"
8986"Not rewinding to ORIG_HEAD"
8987msgstr ""
8988
8989#: git-am.sh:105
8990#, sh-format
8991msgid ""
Jiang Xin28b3cff2013-07-26 08:56:45 +08008992"When you have resolved this problem, run \"$cmdline --continue\".\n"
Jiang Xin3b6137f2012-08-02 09:35:23 +08008993"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8994"To restore the original branch and stop patching, run \"$cmdline --abort\"."
Jiang Xin7256fd72012-06-08 10:40:20 +08008995msgstr ""
8996
8997#: git-am.sh:121
8998msgid "Cannot fall back to three-way merge."
8999msgstr ""
9000
Jiang Xincd1e7482012-04-28 20:27:01 +08009001#: git-am.sh:137
Jiang Xindce37b62012-02-13 14:37:59 +08009002msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9003msgstr ""
9004
Jiang Xin3b6137f2012-08-02 09:35:23 +08009005#: git-am.sh:139
9006msgid "Using index info to reconstruct a base tree..."
9007msgstr ""
9008
Jiang Xincd1e7482012-04-28 20:27:01 +08009009#: git-am.sh:154
Jiang Xindce37b62012-02-13 14:37:59 +08009010msgid ""
9011"Did you hand edit your patch?\n"
9012"It does not apply to blobs recorded in its index."
9013msgstr ""
9014
Jiang Xincd1e7482012-04-28 20:27:01 +08009015#: git-am.sh:163
Jiang Xindce37b62012-02-13 14:37:59 +08009016msgid "Falling back to patching base and 3-way merge..."
9017msgstr ""
9018
Jiang Xin3b6137f2012-08-02 09:35:23 +08009019#: git-am.sh:179
9020msgid "Failed to merge in the changes."
9021msgstr ""
9022
9023#: git-am.sh:274
Jiang Xindce37b62012-02-13 14:37:59 +08009024msgid "Only one StGIT patch series can be applied at once"
9025msgstr ""
9026
Jiang Xin3b6137f2012-08-02 09:35:23 +08009027#: git-am.sh:361
Jiang Xindce37b62012-02-13 14:37:59 +08009028#, sh-format
9029msgid "Patch format $patch_format is not supported."
9030msgstr ""
9031
Jiang Xin3b6137f2012-08-02 09:35:23 +08009032#: git-am.sh:363
Jiang Xindce37b62012-02-13 14:37:59 +08009033msgid "Patch format detection failed."
9034msgstr ""
9035
Jiang Xin3b6137f2012-08-02 09:35:23 +08009036#: git-am.sh:389
9037msgid ""
9038"The -b/--binary option has been a no-op for long time, and\n"
9039"it will be removed. Please do not use it anymore."
Jiang Xindce37b62012-02-13 14:37:59 +08009040msgstr ""
9041
Jiang Xin28b3cff2013-07-26 08:56:45 +08009042#: git-am.sh:479
Jiang Xindce37b62012-02-13 14:37:59 +08009043#, sh-format
9044msgid "previous rebase directory $dotest still exists but mbox given."
9045msgstr ""
9046
Jiang Xin28b3cff2013-07-26 08:56:45 +08009047#: git-am.sh:484
Jiang Xindce37b62012-02-13 14:37:59 +08009048msgid "Please make up your mind. --skip or --abort?"
9049msgstr ""
9050
Jiang Xin28b3cff2013-07-26 08:56:45 +08009051#: git-am.sh:520
9052#, sh-format
9053msgid ""
9054"Stray $dotest directory found.\n"
9055"Use \"git am --abort\" to remove it."
9056msgstr ""
9057
9058#: git-am.sh:528
Jiang Xindce37b62012-02-13 14:37:59 +08009059msgid "Resolve operation not in progress, we are not resuming."
9060msgstr ""
9061
Jiang Xin28b3cff2013-07-26 08:56:45 +08009062#: git-am.sh:594
Jiang Xindce37b62012-02-13 14:37:59 +08009063#, sh-format
9064msgid "Dirty index: cannot apply patches (dirty: $files)"
9065msgstr ""
9066
Jiang Xin28b3cff2013-07-26 08:56:45 +08009067#: git-am.sh:698
Jiang Xin7256fd72012-06-08 10:40:20 +08009068#, sh-format
9069msgid ""
9070"Patch is empty. Was it split wrong?\n"
9071"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
9072"To restore the original branch and stop patching run \"$cmdline --abort\"."
9073msgstr ""
9074
Jiang Xin28b3cff2013-07-26 08:56:45 +08009075#: git-am.sh:725
Jiang Xin7256fd72012-06-08 10:40:20 +08009076msgid "Patch does not have a valid e-mail address."
9077msgstr ""
9078
Jiang Xin28b3cff2013-07-26 08:56:45 +08009079#: git-am.sh:772
Jiang Xindce37b62012-02-13 14:37:59 +08009080msgid "cannot be interactive without stdin connected to a terminal."
9081msgstr ""
9082
Jiang Xin28b3cff2013-07-26 08:56:45 +08009083#: git-am.sh:776
Jiang Xin7256fd72012-06-08 10:40:20 +08009084msgid "Commit Body is:"
9085msgstr ""
9086
Jiang Xindce37b62012-02-13 14:37:59 +08009087#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9088#. in your translation. The program will only accept English
9089#. input at this point.
Jiang Xin28b3cff2013-07-26 08:56:45 +08009090#: git-am.sh:783
Jiang Xindce37b62012-02-13 14:37:59 +08009091msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9092msgstr ""
9093
Jiang Xin28b3cff2013-07-26 08:56:45 +08009094#: git-am.sh:819
Jiang Xindce37b62012-02-13 14:37:59 +08009095#, sh-format
9096msgid "Applying: $FIRSTLINE"
9097msgstr ""
9098
Jiang Xin28b3cff2013-07-26 08:56:45 +08009099#: git-am.sh:840
Jiang Xin7256fd72012-06-08 10:40:20 +08009100msgid ""
9101"No changes - did you forget to use 'git add'?\n"
9102"If there is nothing left to stage, chances are that something else\n"
9103"already introduced the same changes; you might want to skip this patch."
9104msgstr ""
9105
Jiang Xin28b3cff2013-07-26 08:56:45 +08009106#: git-am.sh:848
Jiang Xin7256fd72012-06-08 10:40:20 +08009107msgid ""
9108"You still have unmerged paths in your index\n"
9109"did you forget to use 'git add'?"
9110msgstr ""
9111
Jiang Xin28b3cff2013-07-26 08:56:45 +08009112#: git-am.sh:864
Jiang Xindce37b62012-02-13 14:37:59 +08009113msgid "No changes -- Patch already applied."
9114msgstr ""
9115
Jiang Xin28b3cff2013-07-26 08:56:45 +08009116#: git-am.sh:874
Jiang Xin7256fd72012-06-08 10:40:20 +08009117#, sh-format
9118msgid "Patch failed at $msgnum $FIRSTLINE"
9119msgstr ""
9120
Jiang Xin28b3cff2013-07-26 08:56:45 +08009121#: git-am.sh:877
Jiang Xincc760112012-09-15 10:26:13 +08009122#, sh-format
9123msgid ""
9124"The copy of the patch that failed is found in:\n"
9125" $dotest/patch"
9126msgstr ""
9127
Jiang Xin28b3cff2013-07-26 08:56:45 +08009128#: git-am.sh:895
Jiang Xindce37b62012-02-13 14:37:59 +08009129msgid "applying to an empty history"
9130msgstr ""
9131
Jiang Xin7256fd72012-06-08 10:40:20 +08009132#: git-bisect.sh:48
9133msgid "You need to start by \"git bisect start\""
9134msgstr ""
9135
Jiang Xindce37b62012-02-13 14:37:59 +08009136#. TRANSLATORS: Make sure to include [Y] and [n] in your
9137#. translation. The program will only accept English input
9138#. at this point.
9139#: git-bisect.sh:54
9140msgid "Do you want me to do it for you [Y/n]? "
9141msgstr ""
9142
9143#: git-bisect.sh:95
9144#, sh-format
9145msgid "unrecognised option: '$arg'"
9146msgstr ""
9147
9148#: git-bisect.sh:99
9149#, sh-format
9150msgid "'$arg' does not appear to be a valid revision"
9151msgstr ""
9152
9153#: git-bisect.sh:117
9154msgid "Bad HEAD - I need a HEAD"
9155msgstr ""
9156
9157#: git-bisect.sh:130
9158#, sh-format
9159msgid ""
9160"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
9161msgstr ""
9162
9163#: git-bisect.sh:140
9164msgid "won't bisect on seeked tree"
9165msgstr ""
9166
9167#: git-bisect.sh:144
9168msgid "Bad HEAD - strange symbolic ref"
9169msgstr ""
9170
9171#: git-bisect.sh:189
9172#, sh-format
9173msgid "Bad bisect_write argument: $state"
9174msgstr ""
9175
9176#: git-bisect.sh:218
9177#, sh-format
9178msgid "Bad rev input: $arg"
9179msgstr ""
9180
9181#: git-bisect.sh:232
9182msgid "Please call 'bisect_state' with at least one argument."
9183msgstr ""
9184
9185#: git-bisect.sh:244
9186#, sh-format
9187msgid "Bad rev input: $rev"
9188msgstr ""
9189
9190#: git-bisect.sh:250
9191msgid "'git bisect bad' can take only one argument."
9192msgstr ""
9193
Jiang Xin7256fd72012-06-08 10:40:20 +08009194#. have bad but not good. we could bisect although
9195#. this is less optimum.
9196#: git-bisect.sh:273
9197msgid "Warning: bisecting only with a bad commit."
9198msgstr ""
9199
Jiang Xindce37b62012-02-13 14:37:59 +08009200#. TRANSLATORS: Make sure to include [Y] and [n] in your
9201#. translation. The program will only accept English input
9202#. at this point.
9203#: git-bisect.sh:279
9204msgid "Are you sure [Y/n]? "
9205msgstr ""
9206
Jiang Xin7256fd72012-06-08 10:40:20 +08009207#: git-bisect.sh:289
9208msgid ""
9209"You need to give me at least one good and one bad revisions.\n"
9210"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9211msgstr ""
9212
9213#: git-bisect.sh:292
9214msgid ""
9215"You need to start by \"git bisect start\".\n"
9216"You then need to give me at least one good and one bad revisions.\n"
9217"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
9218msgstr ""
9219
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009220#: git-bisect.sh:363 git-bisect.sh:490
Jiang Xin7256fd72012-06-08 10:40:20 +08009221msgid "We are not bisecting."
9222msgstr ""
9223
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009224#: git-bisect.sh:370
Jiang Xindce37b62012-02-13 14:37:59 +08009225#, sh-format
9226msgid "'$invalid' is not a valid commit"
9227msgstr ""
9228
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009229#: git-bisect.sh:379
Jiang Xindce37b62012-02-13 14:37:59 +08009230#, sh-format
9231msgid ""
9232"Could not check out original HEAD '$branch'.\n"
9233"Try 'git bisect reset <commit>'."
9234msgstr ""
9235
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009236#: git-bisect.sh:406
Jiang Xindce37b62012-02-13 14:37:59 +08009237msgid "No logfile given"
9238msgstr ""
9239
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009240#: git-bisect.sh:407
Jiang Xindce37b62012-02-13 14:37:59 +08009241#, sh-format
9242msgid "cannot read $file for replaying"
9243msgstr ""
9244
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009245#: git-bisect.sh:424
Jiang Xindce37b62012-02-13 14:37:59 +08009246msgid "?? what are you talking about?"
9247msgstr ""
9248
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009249#: git-bisect.sh:436
Jiang Xin7256fd72012-06-08 10:40:20 +08009250#, sh-format
9251msgid "running $command"
9252msgstr ""
9253
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009254#: git-bisect.sh:443
Jiang Xin7256fd72012-06-08 10:40:20 +08009255#, sh-format
9256msgid ""
9257"bisect run failed:\n"
9258"exit code $res from '$command' is < 0 or >= 128"
9259msgstr ""
9260
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009261#: git-bisect.sh:469
Jiang Xin7256fd72012-06-08 10:40:20 +08009262msgid "bisect run cannot continue any more"
9263msgstr ""
9264
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009265#: git-bisect.sh:475
Jiang Xin7256fd72012-06-08 10:40:20 +08009266#, sh-format
9267msgid ""
9268"bisect run failed:\n"
9269"'bisect_state $state' exited with error code $res"
9270msgstr ""
9271
Jiang Xinc6bc7d42013-04-30 08:31:19 +08009272#: git-bisect.sh:482
Jiang Xin7256fd72012-06-08 10:40:20 +08009273msgid "bisect run success"
Jiang Xindce37b62012-02-13 14:37:59 +08009274msgstr ""
9275
9276#: git-pull.sh:21
9277msgid ""
9278"Pull is not possible because you have unmerged files.\n"
9279"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
9280"as appropriate to mark resolution, or use 'git commit -a'."
9281msgstr ""
9282
9283#: git-pull.sh:25
9284msgid "Pull is not possible because you have unmerged files."
9285msgstr ""
9286
Jiang Xinc138af52013-04-10 15:19:54 +08009287#: git-pull.sh:203
Jiang Xindce37b62012-02-13 14:37:59 +08009288msgid "updating an unborn branch with changes added to the index"
9289msgstr ""
9290
Jiang Xin7256fd72012-06-08 10:40:20 +08009291#. The fetch involved updating the current branch.
9292#. The working tree and the index file is still based on the
9293#. $orig_head commit, but we are merging into $curr_head.
9294#. First update the working tree to match $curr_head.
Jiang Xinc138af52013-04-10 15:19:54 +08009295#: git-pull.sh:235
Jiang Xin7256fd72012-06-08 10:40:20 +08009296#, sh-format
9297msgid ""
9298"Warning: fetch updated the current branch head.\n"
9299"Warning: fast-forwarding your working tree from\n"
9300"Warning: commit $orig_head."
9301msgstr ""
9302
Jiang Xinc138af52013-04-10 15:19:54 +08009303#: git-pull.sh:260
Jiang Xindce37b62012-02-13 14:37:59 +08009304msgid "Cannot merge multiple branches into empty head"
9305msgstr ""
9306
Jiang Xinc138af52013-04-10 15:19:54 +08009307#: git-pull.sh:264
Jiang Xindce37b62012-02-13 14:37:59 +08009308msgid "Cannot rebase onto multiple branches"
9309msgstr ""
9310
Jiang Xin28b3cff2013-07-26 08:56:45 +08009311#: git-rebase.sh:54
Jiang Xin3b6137f2012-08-02 09:35:23 +08009312msgid ""
9313"When you have resolved this problem, run \"git rebase --continue\".\n"
9314"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9315"To check out the original branch and stop rebasing, run \"git rebase --abort"
9316"\"."
9317msgstr ""
9318
Jiang Xin28b3cff2013-07-26 08:56:45 +08009319#: git-rebase.sh:156
9320msgid "Applied autostash."
9321msgstr ""
9322
9323#: git-rebase.sh:159
9324#, sh-format
9325msgid "Cannot store $stash_sha1"
9326msgstr ""
9327
Jiang Xin9306b5b2012-10-16 08:39:10 +08009328#: git-rebase.sh:160
Jiang Xin28b3cff2013-07-26 08:56:45 +08009329msgid ""
9330"Applying autostash resulted in conflicts.\n"
9331"Your changes are safe in the stash.\n"
Jiang Xinb8ecf232013-08-06 14:13:23 +08009332"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
Jiang Xin28b3cff2013-07-26 08:56:45 +08009333msgstr ""
9334
9335#: git-rebase.sh:190
Jiang Xin3b6137f2012-08-02 09:35:23 +08009336msgid "The pre-rebase hook refused to rebase."
9337msgstr ""
9338
Jiang Xin28b3cff2013-07-26 08:56:45 +08009339#: git-rebase.sh:195
Jiang Xin3b6137f2012-08-02 09:35:23 +08009340msgid "It looks like git-am is in progress. Cannot rebase."
9341msgstr ""
9342
Jiang Xin28b3cff2013-07-26 08:56:45 +08009343#: git-rebase.sh:329
Jiang Xin3b6137f2012-08-02 09:35:23 +08009344msgid "The --exec option must be used with the --interactive option"
9345msgstr ""
9346
Jiang Xin28b3cff2013-07-26 08:56:45 +08009347#: git-rebase.sh:334
Jiang Xin3b6137f2012-08-02 09:35:23 +08009348msgid "No rebase in progress?"
9349msgstr ""
9350
Jiang Xin28b3cff2013-07-26 08:56:45 +08009351#: git-rebase.sh:345
Jiang Xin9306b5b2012-10-16 08:39:10 +08009352msgid "The --edit-todo action can only be used during interactive rebase."
9353msgstr ""
9354
Jiang Xin28b3cff2013-07-26 08:56:45 +08009355#: git-rebase.sh:352
Jiang Xin3b6137f2012-08-02 09:35:23 +08009356msgid "Cannot read HEAD"
9357msgstr ""
9358
Jiang Xin28b3cff2013-07-26 08:56:45 +08009359#: git-rebase.sh:355
Jiang Xin3b6137f2012-08-02 09:35:23 +08009360msgid ""
9361"You must edit all merge conflicts and then\n"
9362"mark them as resolved using git add"
9363msgstr ""
9364
Jiang Xin28b3cff2013-07-26 08:56:45 +08009365#: git-rebase.sh:373
Jiang Xin3b6137f2012-08-02 09:35:23 +08009366#, sh-format
9367msgid "Could not move back to $head_name"
9368msgstr ""
9369
Jiang Xin28b3cff2013-07-26 08:56:45 +08009370#: git-rebase.sh:392
Jiang Xin3b6137f2012-08-02 09:35:23 +08009371#, sh-format
9372msgid ""
9373"It seems that there is already a $state_dir_base directory, and\n"
9374"I wonder if you are in the middle of another rebase. If that is the\n"
9375"case, please try\n"
9376"\t$cmd_live_rebase\n"
9377"If that is not the case, please\n"
9378"\t$cmd_clear_stale_rebase\n"
9379"and run me again. I am stopping in case you still have something\n"
9380"valuable there."
9381msgstr ""
9382
Jiang Xin28b3cff2013-07-26 08:56:45 +08009383#: git-rebase.sh:437
Jiang Xin3b6137f2012-08-02 09:35:23 +08009384#, sh-format
9385msgid "invalid upstream $upstream_name"
9386msgstr ""
9387
Jiang Xin28b3cff2013-07-26 08:56:45 +08009388#: git-rebase.sh:461
Jiang Xin3b6137f2012-08-02 09:35:23 +08009389#, sh-format
9390msgid "$onto_name: there are more than one merge bases"
9391msgstr ""
9392
Jiang Xin28b3cff2013-07-26 08:56:45 +08009393#: git-rebase.sh:464 git-rebase.sh:468
Jiang Xin3b6137f2012-08-02 09:35:23 +08009394#, sh-format
9395msgid "$onto_name: there is no merge base"
9396msgstr ""
9397
Jiang Xin28b3cff2013-07-26 08:56:45 +08009398#: git-rebase.sh:473
Jiang Xin3b6137f2012-08-02 09:35:23 +08009399#, sh-format
9400msgid "Does not point to a valid commit: $onto_name"
9401msgstr ""
9402
Jiang Xin28b3cff2013-07-26 08:56:45 +08009403#: git-rebase.sh:496
Jiang Xin3b6137f2012-08-02 09:35:23 +08009404#, sh-format
9405msgid "fatal: no such branch: $branch_name"
9406msgstr ""
9407
Jiang Xin28b3cff2013-07-26 08:56:45 +08009408#: git-rebase.sh:519
9409msgid "Cannot autostash"
9410msgstr ""
9411
9412#: git-rebase.sh:524
9413#, sh-format
9414msgid "Created autostash: $stash_abbrev"
9415msgstr ""
9416
9417#: git-rebase.sh:528
Jiang Xin3b6137f2012-08-02 09:35:23 +08009418msgid "Please commit or stash them."
9419msgstr ""
9420
Jiang Xin28b3cff2013-07-26 08:56:45 +08009421#: git-rebase.sh:548
Jiang Xin3b6137f2012-08-02 09:35:23 +08009422#, sh-format
9423msgid "Current branch $branch_name is up to date."
9424msgstr ""
9425
Jiang Xin28b3cff2013-07-26 08:56:45 +08009426#: git-rebase.sh:552
Jiang Xin3b6137f2012-08-02 09:35:23 +08009427#, sh-format
9428msgid "Current branch $branch_name is up to date, rebase forced."
9429msgstr ""
9430
Jiang Xin28b3cff2013-07-26 08:56:45 +08009431#: git-rebase.sh:563
Jiang Xin3b6137f2012-08-02 09:35:23 +08009432#, sh-format
9433msgid "Changes from $mb to $onto:"
9434msgstr ""
9435
9436#. Detach HEAD and reset the tree
Jiang Xin28b3cff2013-07-26 08:56:45 +08009437#: git-rebase.sh:572
Jiang Xin3b6137f2012-08-02 09:35:23 +08009438msgid "First, rewinding head to replay your work on top of it..."
9439msgstr ""
9440
Jiang Xin28b3cff2013-07-26 08:56:45 +08009441#: git-rebase.sh:582
Jiang Xin3b6137f2012-08-02 09:35:23 +08009442#, sh-format
9443msgid "Fast-forwarded $branch_name to $onto_name."
9444msgstr ""
9445
Jiang Xindce37b62012-02-13 14:37:59 +08009446#: git-stash.sh:51
9447msgid "git stash clear with parameters is unimplemented"
9448msgstr ""
9449
9450#: git-stash.sh:74
9451msgid "You do not have the initial commit yet"
9452msgstr ""
9453
9454#: git-stash.sh:89
9455msgid "Cannot save the current index state"
9456msgstr ""
9457
9458#: git-stash.sh:123 git-stash.sh:136
9459msgid "Cannot save the current worktree state"
9460msgstr ""
9461
9462#: git-stash.sh:140
9463msgid "No changes selected"
9464msgstr ""
9465
9466#: git-stash.sh:143
9467msgid "Cannot remove temporary index (can't happen)"
9468msgstr ""
9469
9470#: git-stash.sh:156
9471msgid "Cannot record working tree state"
9472msgstr ""
9473
Jiang Xin28b3cff2013-07-26 08:56:45 +08009474#: git-stash.sh:190
9475#, sh-format
9476msgid "Cannot update $ref_stash with $w_commit"
9477msgstr ""
9478
Jiang Xin7256fd72012-06-08 10:40:20 +08009479#. TRANSLATORS: $option is an invalid option, like
9480#. `--blah-blah'. The 7 spaces at the beginning of the
9481#. second line correspond to "error: ". So you should line
9482#. up the second line with however many characters the
9483#. translation of "error: " takes in your language. E.g. in
9484#. English this is:
9485#.
9486#. $ git stash save --blah-blah 2>&1 | head -n 2
9487#. error: unknown option for 'stash save': --blah-blah
9488#. To provide a message, use git stash save -- '--blah-blah'
Jiang Xin28b3cff2013-07-26 08:56:45 +08009489#: git-stash.sh:241
Jiang Xin7256fd72012-06-08 10:40:20 +08009490#, sh-format
9491msgid ""
9492"error: unknown option for 'stash save': $option\n"
9493" To provide a message, use git stash save -- '$option'"
9494msgstr ""
9495
Jiang Xin28b3cff2013-07-26 08:56:45 +08009496#: git-stash.sh:262
Jiang Xindce37b62012-02-13 14:37:59 +08009497msgid "No local changes to save"
9498msgstr ""
9499
Jiang Xin28b3cff2013-07-26 08:56:45 +08009500#: git-stash.sh:268
9501msgid ""
9502"The following untracked files would NOT be saved but need to be removed by "
9503"stash save:"
9504msgstr ""
9505
9506#: git-stash.sh:270
9507msgid ""
9508"Aborting. Consider using either the --force or --include-untracked option."
9509msgstr ""
9510
9511#: git-stash.sh:274
Jiang Xindce37b62012-02-13 14:37:59 +08009512msgid "Cannot initialize stash"
9513msgstr ""
9514
Jiang Xin28b3cff2013-07-26 08:56:45 +08009515#: git-stash.sh:278
Jiang Xindce37b62012-02-13 14:37:59 +08009516msgid "Cannot save the current status"
9517msgstr ""
9518
Jiang Xin28b3cff2013-07-26 08:56:45 +08009519#: git-stash.sh:296
Jiang Xindce37b62012-02-13 14:37:59 +08009520msgid "Cannot remove worktree changes"
9521msgstr ""
9522
Jiang Xin28b3cff2013-07-26 08:56:45 +08009523#: git-stash.sh:395
Jiang Xindce37b62012-02-13 14:37:59 +08009524msgid "No stash found."
9525msgstr ""
9526
Jiang Xin28b3cff2013-07-26 08:56:45 +08009527#: git-stash.sh:402
Jiang Xindce37b62012-02-13 14:37:59 +08009528#, sh-format
9529msgid "Too many revisions specified: $REV"
9530msgstr ""
9531
Jiang Xin28b3cff2013-07-26 08:56:45 +08009532#: git-stash.sh:408
Jiang Xindce37b62012-02-13 14:37:59 +08009533#, sh-format
9534msgid "$reference is not valid reference"
9535msgstr ""
9536
Jiang Xin28b3cff2013-07-26 08:56:45 +08009537#: git-stash.sh:436
Jiang Xindce37b62012-02-13 14:37:59 +08009538#, sh-format
9539msgid "'$args' is not a stash-like commit"
9540msgstr ""
9541
Jiang Xin28b3cff2013-07-26 08:56:45 +08009542#: git-stash.sh:447
Jiang Xindce37b62012-02-13 14:37:59 +08009543#, sh-format
9544msgid "'$args' is not a stash reference"
9545msgstr ""
9546
Jiang Xin28b3cff2013-07-26 08:56:45 +08009547#: git-stash.sh:455
Jiang Xindce37b62012-02-13 14:37:59 +08009548msgid "unable to refresh index"
9549msgstr ""
9550
Jiang Xin28b3cff2013-07-26 08:56:45 +08009551#: git-stash.sh:459
Jiang Xindce37b62012-02-13 14:37:59 +08009552msgid "Cannot apply a stash in the middle of a merge"
9553msgstr ""
9554
Jiang Xin28b3cff2013-07-26 08:56:45 +08009555#: git-stash.sh:467
Jiang Xindce37b62012-02-13 14:37:59 +08009556msgid "Conflicts in index. Try without --index."
9557msgstr ""
9558
Jiang Xin28b3cff2013-07-26 08:56:45 +08009559#: git-stash.sh:469
Jiang Xindce37b62012-02-13 14:37:59 +08009560msgid "Could not save index tree"
9561msgstr ""
9562
Jiang Xin28b3cff2013-07-26 08:56:45 +08009563#: git-stash.sh:503
Jiang Xindce37b62012-02-13 14:37:59 +08009564msgid "Cannot unstage modified files"
9565msgstr ""
9566
Jiang Xin28b3cff2013-07-26 08:56:45 +08009567#: git-stash.sh:518
Jiang Xin7256fd72012-06-08 10:40:20 +08009568msgid "Index was not unstashed."
9569msgstr ""
9570
Jiang Xin28b3cff2013-07-26 08:56:45 +08009571#: git-stash.sh:535
Jiang Xindce37b62012-02-13 14:37:59 +08009572#, sh-format
Jiang Xincc760112012-09-15 10:26:13 +08009573msgid "Dropped ${REV} ($s)"
9574msgstr ""
9575
Jiang Xin28b3cff2013-07-26 08:56:45 +08009576#: git-stash.sh:536
Jiang Xincc760112012-09-15 10:26:13 +08009577#, sh-format
Jiang Xindce37b62012-02-13 14:37:59 +08009578msgid "${REV}: Could not drop stash entry"
9579msgstr ""
9580
Jiang Xin28b3cff2013-07-26 08:56:45 +08009581#: git-stash.sh:543
Jiang Xindce37b62012-02-13 14:37:59 +08009582msgid "No branch name specified"
9583msgstr ""
9584
Jiang Xin28b3cff2013-07-26 08:56:45 +08009585#: git-stash.sh:615
Jiang Xindce37b62012-02-13 14:37:59 +08009586msgid "(To restore them type \"git stash apply\")"
9587msgstr ""
9588
Jiang Xin28b3cff2013-07-26 08:56:45 +08009589#: git-submodule.sh:95
Jiang Xindce37b62012-02-13 14:37:59 +08009590#, sh-format
9591msgid "cannot strip one component off url '$remoteurl'"
9592msgstr ""
9593
Jiang Xin28b3cff2013-07-26 08:56:45 +08009594#: git-submodule.sh:237
Jiang Xindce37b62012-02-13 14:37:59 +08009595#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009596msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009597msgstr ""
9598
Jiang Xin28b3cff2013-07-26 08:56:45 +08009599#: git-submodule.sh:281
Jiang Xindce37b62012-02-13 14:37:59 +08009600#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009601msgid "Clone of '$url' into submodule path '$sm_path' failed"
Jiang Xindce37b62012-02-13 14:37:59 +08009602msgstr ""
9603
Jiang Xin28b3cff2013-07-26 08:56:45 +08009604#: git-submodule.sh:293
Jiang Xina2c01b52012-03-16 20:28:05 +08009605#, sh-format
9606msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
9607msgstr ""
9608
Jiang Xin28b3cff2013-07-26 08:56:45 +08009609#: git-submodule.sh:403
9610msgid "Relative path can only be used from the toplevel of the working tree"
9611msgstr ""
9612
9613#: git-submodule.sh:413
Jiang Xindce37b62012-02-13 14:37:59 +08009614#, sh-format
9615msgid "repo URL: '$repo' must be absolute or begin with ./|../"
9616msgstr ""
9617
Jiang Xin28b3cff2013-07-26 08:56:45 +08009618#: git-submodule.sh:430
Jiang Xindce37b62012-02-13 14:37:59 +08009619#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009620msgid "'$sm_path' already exists in the index"
Jiang Xindce37b62012-02-13 14:37:59 +08009621msgstr ""
9622
Jiang Xin28b3cff2013-07-26 08:56:45 +08009623#: git-submodule.sh:434
Jiang Xin7256fd72012-06-08 10:40:20 +08009624#, sh-format
9625msgid ""
9626"The following path is ignored by one of your .gitignore files:\n"
9627"$sm_path\n"
9628"Use -f if you really want to add it."
9629msgstr ""
9630
Jiang Xin28b3cff2013-07-26 08:56:45 +08009631#: git-submodule.sh:452
Jiang Xin7256fd72012-06-08 10:40:20 +08009632#, sh-format
9633msgid "Adding existing repo at '$sm_path' to the index"
9634msgstr ""
9635
Jiang Xin28b3cff2013-07-26 08:56:45 +08009636#: git-submodule.sh:454
Jiang Xindce37b62012-02-13 14:37:59 +08009637#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009638msgid "'$sm_path' already exists and is not a valid git repo"
Jiang Xindce37b62012-02-13 14:37:59 +08009639msgstr ""
9640
Jiang Xin28b3cff2013-07-26 08:56:45 +08009641#: git-submodule.sh:462
Jiang Xindce37b62012-02-13 14:37:59 +08009642#, sh-format
Jiang Xinfe52cd62012-11-23 14:29:02 +08009643msgid "A git directory for '$sm_name' is found locally with remote(s):"
9644msgstr ""
9645
Jiang Xin28b3cff2013-07-26 08:56:45 +08009646#: git-submodule.sh:464
Jiang Xinfe52cd62012-11-23 14:29:02 +08009647#, sh-format
9648msgid ""
9649"If you want to reuse this local git directory instead of cloning again from"
9650msgstr ""
9651
Jiang Xin28b3cff2013-07-26 08:56:45 +08009652#: git-submodule.sh:466
Jiang Xinfe52cd62012-11-23 14:29:02 +08009653#, sh-format
9654msgid ""
9655"use the '--force' option. If the local git directory is not the correct repo"
Jiang Xindce37b62012-02-13 14:37:59 +08009656msgstr ""
9657
Jiang Xin28b3cff2013-07-26 08:56:45 +08009658#: git-submodule.sh:467
Jiang Xindce37b62012-02-13 14:37:59 +08009659#, sh-format
Jiang Xinfe52cd62012-11-23 14:29:02 +08009660msgid ""
9661"or you are unsure what this means choose another name with the '--name' "
9662"option."
9663msgstr ""
9664
Jiang Xin28b3cff2013-07-26 08:56:45 +08009665#: git-submodule.sh:469
Jiang Xinfe52cd62012-11-23 14:29:02 +08009666#, sh-format
9667msgid "Reactivating local git directory for submodule '$sm_name'."
9668msgstr ""
9669
Jiang Xin28b3cff2013-07-26 08:56:45 +08009670#: git-submodule.sh:481
Jiang Xinfe52cd62012-11-23 14:29:02 +08009671#, sh-format
9672msgid "Unable to checkout submodule '$sm_path'"
9673msgstr ""
9674
Jiang Xin28b3cff2013-07-26 08:56:45 +08009675#: git-submodule.sh:486
Jiang Xinfe52cd62012-11-23 14:29:02 +08009676#, sh-format
9677msgid "Failed to add submodule '$sm_path'"
9678msgstr ""
9679
Jiang Xin28b3cff2013-07-26 08:56:45 +08009680#: git-submodule.sh:495
Jiang Xinfe52cd62012-11-23 14:29:02 +08009681#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009682msgid "Failed to register submodule '$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009683msgstr ""
9684
Jiang Xin28b3cff2013-07-26 08:56:45 +08009685#: git-submodule.sh:539
Jiang Xindce37b62012-02-13 14:37:59 +08009686#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009687msgid "Entering '$prefix$displaypath'"
Jiang Xindce37b62012-02-13 14:37:59 +08009688msgstr ""
9689
Jiang Xin28b3cff2013-07-26 08:56:45 +08009690#: git-submodule.sh:554
Jiang Xindce37b62012-02-13 14:37:59 +08009691#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009692msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
Jiang Xindce37b62012-02-13 14:37:59 +08009693msgstr ""
9694
Jiang Xin28b3cff2013-07-26 08:56:45 +08009695#: git-submodule.sh:600
Jiang Xindce37b62012-02-13 14:37:59 +08009696#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009697msgid "No url found for submodule path '$displaypath' in .gitmodules"
Jiang Xindce37b62012-02-13 14:37:59 +08009698msgstr ""
9699
Jiang Xin28b3cff2013-07-26 08:56:45 +08009700#: git-submodule.sh:609
Jiang Xindce37b62012-02-13 14:37:59 +08009701#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009702msgid "Failed to register url for submodule path '$displaypath'"
Jiang Xindce37b62012-02-13 14:37:59 +08009703msgstr ""
9704
Jiang Xin28b3cff2013-07-26 08:56:45 +08009705#: git-submodule.sh:611
Jiang Xindce37b62012-02-13 14:37:59 +08009706#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009707msgid "Submodule '$name' ($url) registered for path '$displaypath'"
Jiang Xindce37b62012-02-13 14:37:59 +08009708msgstr ""
9709
Jiang Xin28b3cff2013-07-26 08:56:45 +08009710#: git-submodule.sh:619
Jiang Xin75f7b4b2012-06-02 07:07:27 +08009711#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009712msgid "Failed to register update mode for submodule path '$displaypath'"
Jiang Xin75f7b4b2012-06-02 07:07:27 +08009713msgstr ""
9714
Jiang Xin28b3cff2013-07-26 08:56:45 +08009715#: git-submodule.sh:656
Jiang Xinc138af52013-04-10 15:19:54 +08009716#, sh-format
9717msgid "Use '.' if you really want to deinitialize all submodules"
9718msgstr ""
9719
Jiang Xin28b3cff2013-07-26 08:56:45 +08009720#: git-submodule.sh:673
Jiang Xinc138af52013-04-10 15:19:54 +08009721#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009722msgid "Submodule work tree '$displaypath' contains a .git directory"
Jiang Xinc138af52013-04-10 15:19:54 +08009723msgstr ""
9724
Jiang Xin28b3cff2013-07-26 08:56:45 +08009725#: git-submodule.sh:674
Jiang Xindce37b62012-02-13 14:37:59 +08009726#, sh-format
9727msgid ""
Jiang Xinc138af52013-04-10 15:19:54 +08009728"(use 'rm -rf' if you really want to remove it including all of its history)"
9729msgstr ""
9730
Jiang Xin28b3cff2013-07-26 08:56:45 +08009731#: git-submodule.sh:680
Jiang Xinc138af52013-04-10 15:19:54 +08009732#, sh-format
9733msgid ""
Jiang Xin28b3cff2013-07-26 08:56:45 +08009734"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
Jiang Xinc138af52013-04-10 15:19:54 +08009735"discard them"
9736msgstr ""
9737
Jiang Xin28b3cff2013-07-26 08:56:45 +08009738#: git-submodule.sh:683
Jiang Xinc138af52013-04-10 15:19:54 +08009739#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009740msgid "Cleared directory '$displaypath'"
Jiang Xinc138af52013-04-10 15:19:54 +08009741msgstr ""
9742
Jiang Xin28b3cff2013-07-26 08:56:45 +08009743#: git-submodule.sh:684
Jiang Xinc138af52013-04-10 15:19:54 +08009744#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009745msgid "Could not remove submodule work tree '$displaypath'"
Jiang Xinc138af52013-04-10 15:19:54 +08009746msgstr ""
9747
Jiang Xin28b3cff2013-07-26 08:56:45 +08009748#: git-submodule.sh:687
Jiang Xinc138af52013-04-10 15:19:54 +08009749#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009750msgid "Could not create empty submodule directory '$displaypath'"
Jiang Xinc138af52013-04-10 15:19:54 +08009751msgstr ""
9752
Jiang Xin28b3cff2013-07-26 08:56:45 +08009753#: git-submodule.sh:696
Jiang Xinc138af52013-04-10 15:19:54 +08009754#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009755msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
Jiang Xinc138af52013-04-10 15:19:54 +08009756msgstr ""
9757
Jiang Xin28b3cff2013-07-26 08:56:45 +08009758#: git-submodule.sh:811
Jiang Xinc138af52013-04-10 15:19:54 +08009759#, sh-format
9760msgid ""
Jiang Xin28b3cff2013-07-26 08:56:45 +08009761"Submodule path '$displaypath' not initialized\n"
Jiang Xindce37b62012-02-13 14:37:59 +08009762"Maybe you want to use 'update --init'?"
9763msgstr ""
9764
Jiang Xin28b3cff2013-07-26 08:56:45 +08009765#: git-submodule.sh:824
Jiang Xindce37b62012-02-13 14:37:59 +08009766#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009767msgid "Unable to find current revision in submodule path '$displaypath'"
Jiang Xindce37b62012-02-13 14:37:59 +08009768msgstr ""
9769
Jiang Xin28b3cff2013-07-26 08:56:45 +08009770#: git-submodule.sh:833
Jiang Xindce37b62012-02-13 14:37:59 +08009771#, sh-format
Jiang Xincd1e7482012-04-28 20:27:01 +08009772msgid "Unable to fetch in submodule path '$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009773msgstr ""
9774
Jiang Xin28b3cff2013-07-26 08:56:45 +08009775#: git-submodule.sh:857
Jiang Xindce37b62012-02-13 14:37:59 +08009776#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009777msgid "Unable to fetch in submodule path '$displaypath'"
Jiang Xindce37b62012-02-13 14:37:59 +08009778msgstr ""
9779
Jiang Xin28b3cff2013-07-26 08:56:45 +08009780#: git-submodule.sh:871
Jiang Xindce37b62012-02-13 14:37:59 +08009781#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009782msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
Jiang Xindce37b62012-02-13 14:37:59 +08009783msgstr ""
9784
Jiang Xin28b3cff2013-07-26 08:56:45 +08009785#: git-submodule.sh:872
Jiang Xindce37b62012-02-13 14:37:59 +08009786#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009787msgid "Submodule path '$displaypath': rebased into '$sha1'"
Jiang Xindce37b62012-02-13 14:37:59 +08009788msgstr ""
9789
Jiang Xin28b3cff2013-07-26 08:56:45 +08009790#: git-submodule.sh:877
Jiang Xindce37b62012-02-13 14:37:59 +08009791#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009792msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
Jiang Xindce37b62012-02-13 14:37:59 +08009793msgstr ""
9794
Jiang Xin28b3cff2013-07-26 08:56:45 +08009795#: git-submodule.sh:878
Jiang Xindce37b62012-02-13 14:37:59 +08009796#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009797msgid "Submodule path '$displaypath': merged in '$sha1'"
Jiang Xindce37b62012-02-13 14:37:59 +08009798msgstr ""
9799
Jiang Xin28b3cff2013-07-26 08:56:45 +08009800#: git-submodule.sh:883
Jiang Xindce37b62012-02-13 14:37:59 +08009801#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009802msgid ""
9803"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
Jiang Xindce37b62012-02-13 14:37:59 +08009804msgstr ""
9805
Jiang Xin28b3cff2013-07-26 08:56:45 +08009806#: git-submodule.sh:884
Jiang Xindce37b62012-02-13 14:37:59 +08009807#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009808msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
Jiang Xindce37b62012-02-13 14:37:59 +08009809msgstr ""
9810
Jiang Xin28b3cff2013-07-26 08:56:45 +08009811#: git-submodule.sh:889
Jiang Xinc138af52013-04-10 15:19:54 +08009812#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009813msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
Jiang Xinc138af52013-04-10 15:19:54 +08009814msgstr ""
9815
Jiang Xin28b3cff2013-07-26 08:56:45 +08009816#: git-submodule.sh:890
9817#, sh-format
9818msgid "Submodule path '$displaypath': checked out '$sha1'"
9819msgstr ""
9820
9821#: git-submodule.sh:917
9822#, sh-format
9823msgid "Failed to recurse into submodule path '$displaypath'"
9824msgstr ""
9825
9826#: git-submodule.sh:1025
Jiang Xin3b6137f2012-08-02 09:35:23 +08009827msgid "The --cached option cannot be used with the --files option"
Jiang Xin7256fd72012-06-08 10:40:20 +08009828msgstr ""
9829
9830#. unexpected type
Jiang Xin28b3cff2013-07-26 08:56:45 +08009831#: git-submodule.sh:1066
Jiang Xin7256fd72012-06-08 10:40:20 +08009832#, sh-format
9833msgid "unexpected mode $mod_dst"
Jiang Xindce37b62012-02-13 14:37:59 +08009834msgstr ""
9835
Jiang Xin28b3cff2013-07-26 08:56:45 +08009836#: git-submodule.sh:1086
Jiang Xindce37b62012-02-13 14:37:59 +08009837#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009838msgid " Warn: $display_name doesn't contain commit $sha1_src"
Jiang Xindce37b62012-02-13 14:37:59 +08009839msgstr ""
9840
Jiang Xin28b3cff2013-07-26 08:56:45 +08009841#: git-submodule.sh:1089
Jiang Xindce37b62012-02-13 14:37:59 +08009842#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009843msgid " Warn: $display_name doesn't contain commit $sha1_dst"
Jiang Xindce37b62012-02-13 14:37:59 +08009844msgstr ""
9845
Jiang Xin28b3cff2013-07-26 08:56:45 +08009846#: git-submodule.sh:1092
Jiang Xindce37b62012-02-13 14:37:59 +08009847#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009848msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
Jiang Xindce37b62012-02-13 14:37:59 +08009849msgstr ""
9850
Jiang Xin28b3cff2013-07-26 08:56:45 +08009851#: git-submodule.sh:1117
Jiang Xindce37b62012-02-13 14:37:59 +08009852msgid "blob"
9853msgstr ""
9854
Jiang Xin28b3cff2013-07-26 08:56:45 +08009855#: git-submodule.sh:1155
Jiang Xin9caaf232013-02-14 14:49:45 +08009856msgid "Submodules changed but not updated:"
Jiang Xin7256fd72012-06-08 10:40:20 +08009857msgstr ""
9858
Jiang Xin28b3cff2013-07-26 08:56:45 +08009859#: git-submodule.sh:1157
Jiang Xin9caaf232013-02-14 14:49:45 +08009860msgid "Submodule changes to be committed:"
Jiang Xin7256fd72012-06-08 10:40:20 +08009861msgstr ""
9862
Jiang Xin28b3cff2013-07-26 08:56:45 +08009863#: git-submodule.sh:1242
Jiang Xinc138af52013-04-10 15:19:54 +08009864#, sh-format
9865msgid "Failed to recurse into submodule path '$sm_path'"
9866msgstr ""
9867
Jiang Xin28b3cff2013-07-26 08:56:45 +08009868#: git-submodule.sh:1306
Jiang Xindce37b62012-02-13 14:37:59 +08009869#, sh-format
Jiang Xin28b3cff2013-07-26 08:56:45 +08009870msgid "Synchronizing submodule url for '$displaypath'"
Jiang Xindce37b62012-02-13 14:37:59 +08009871msgstr ""