« back to all changes in this revision
Viewing changes to po/git.pot
- browse files at revision 29
- compare with another revision
- download diff
- download tarball
- view history from revision 29
- Committer: Package Import Robot
- Author(s): Jonathan Nieder
- Date: 2013-06-12 07:50:53 UTC
- mfrom: (1.2.19) (2.1.31 experimental)
- Revision ID: package-import@ubuntu.com-20130612075053-uue9xe0dq0rvm44y
Tags: 1:1.8.3.1-1
* merge branch debian-experimental
* new upstream point release (see RelNotes/1.8.3.1.txt).
* debian/watch: use xz-compressed tarballs from kernel.org.
* new upstream point release (see RelNotes/1.8.3.1.txt).
* debian/watch: use xz-compressed tarballs from kernel.org.
- files added:
- .pc
- compat/poll
- contrib/credential/gnome-keyring
- contrib/credential/netrc
- contrib/credential/wincred
- contrib/mw-to-git/t
- contrib/mw-to-git/t/install-wiki
- contrib/persistent-https
- contrib/remote-helpers
- contrib/subtree
- contrib/subtree/t
- debian/source
- perl/Git/SVN
- perl/Git/SVN/Memoize
- t/Git-SVN
- t/Git-SVN/Utils
- t/t4034/ada
- t/t5003
- t/t5004
- t/t9604
- t/t9604/cvsroot
- t/t9604/cvsroot/CVSROOT
- t/t9604/cvsroot/module
- files removed:
- Documentation/git-remote-helpers.txt
- Documentation/pt_BR
- files modified:
- .gitignore
- debian/changelog.upstream.sh *
- debian/git-core.postinst *
- debian/git-core.preinst *
- debian/git-daemon/log/run *
- debian/git-daemon/run *
- debian/gitweb.postinst *
added
removed
po/git.pot
8
8
msgstr ""
9
9
"Project-Id-Version: PACKAGE VERSION\n"
10
10
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11
"POT-Creation-Date: 2012-05-15 06:31+0800\n"
11
"POT-Creation-Date: 2013-04-30 08:25+0800\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
18
18
"Content-Transfer-Encoding: 8bit\n"
19
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
20
21
#: advice.c:40
21
#: advice.c:53
22
22
#, c-format
23
23
msgid "hint: %.*s\n"
24
24
msgstr ""
27
27
#. * Message used both when 'git commit' fails and when
28
28
#. * other commands doing a merge do.
29
29
#.
30
#: advice.c:70
30
#: advice.c:83
31
31
msgid ""
32
32
"Fix them up in the work tree,\n"
33
33
"and then use 'git add/rm <file>' as\n"
35
35
"or use 'git commit -a'."
36
36
msgstr ""
37
37
38
#: commit.c:47
38
#: archive.c:10
39
msgid "git archive [options] <tree-ish> [<path>...]"
40
msgstr ""
41
42
#: archive.c:11
43
msgid "git archive --list"
44
msgstr ""
45
46
#: archive.c:12
47
msgid ""
48
"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"
49
msgstr ""
50
51
#: archive.c:13
52
msgid "git archive --remote <repo> [--exec <cmd>] --list"
53
msgstr ""
54
55
#: archive.c:323
56
msgid "fmt"
57
msgstr ""
58
59
#: archive.c:323
60
msgid "archive format"
61
msgstr ""
62
63
#: archive.c:324 builtin/log.c:1126
64
msgid "prefix"
65
msgstr ""
66
67
#: archive.c:325
68
msgid "prepend prefix to each pathname in the archive"
69
msgstr ""
70
71
#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371
72
#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665
73
#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77
74
#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536
75
#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149
76
msgid "file"
77
msgstr ""
78
79
#: archive.c:327 builtin/archive.c:89
80
msgid "write the archive to this file"
81
msgstr ""
82
83
#: archive.c:329
84
msgid "read .gitattributes in working directory"
85
msgstr ""
86
87
#: archive.c:330
88
msgid "report archived files on stderr"
89
msgstr ""
90
91
#: archive.c:331
92
msgid "store only"
93
msgstr ""
94
95
#: archive.c:332
96
msgid "compress faster"
97
msgstr ""
98
99
#: archive.c:340
100
msgid "compress better"
101
msgstr ""
102
103
#: archive.c:343
104
msgid "list supported archive formats"
105
msgstr ""
106
107
#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86
108
msgid "repo"
109
msgstr ""
110
111
#: archive.c:346 builtin/archive.c:91
112
msgid "retrieve the archive from remote repository <repo>"
113
msgstr ""
114
115
#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615
116
msgid "command"
117
msgstr ""
118
119
#: archive.c:348 builtin/archive.c:93
120
msgid "path to the remote git-upload-archive command"
121
msgstr ""
122
123
#: attr.c:259
124
msgid ""
125
"Negative patterns are ignored in git attributes\n"
126
"Use '\\!' for literal leading exclamation."
127
msgstr ""
128
129
#: branch.c:60
130
#, c-format
131
msgid "Not setting branch %s as its own upstream."
132
msgstr ""
133
134
#: branch.c:82
135
#, c-format
136
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
137
msgstr ""
138
139
#: branch.c:83
140
#, c-format
141
msgid "Branch %s set up to track remote branch %s from %s."
142
msgstr ""
143
144
#: branch.c:87
145
#, c-format
146
msgid "Branch %s set up to track local branch %s by rebasing."
147
msgstr ""
148
149
#: branch.c:88
150
#, c-format
151
msgid "Branch %s set up to track local branch %s."
152
msgstr ""
153
154
#: branch.c:92
155
#, c-format
156
msgid "Branch %s set up to track remote ref %s by rebasing."
157
msgstr ""
158
159
#: branch.c:93
160
#, c-format
161
msgid "Branch %s set up to track remote ref %s."
162
msgstr ""
163
164
#: branch.c:97
165
#, c-format
166
msgid "Branch %s set up to track local ref %s by rebasing."
167
msgstr ""
168
169
#: branch.c:98
170
#, c-format
171
msgid "Branch %s set up to track local ref %s."
172
msgstr ""
173
174
#: branch.c:118
175
#, c-format
176
msgid "Tracking not set up: name too long: %s"
177
msgstr ""
178
179
#: branch.c:137
180
#, c-format
181
msgid "Not tracking: ambiguous information for ref %s"
182
msgstr ""
183
184
#: branch.c:182
185
#, c-format
186
msgid "'%s' is not a valid branch name."
187
msgstr ""
188
189
#: branch.c:187
190
#, c-format
191
msgid "A branch named '%s' already exists."
192
msgstr ""
193
194
#: branch.c:195
195
msgid "Cannot force update the current branch."
196
msgstr ""
197
198
#: branch.c:201
199
#, c-format
200
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
201
msgstr ""
202
203
#: branch.c:203
204
#, c-format
205
msgid "the requested upstream branch '%s' does not exist"
206
msgstr ""
207
208
#: branch.c:205
209
msgid ""
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."
218
msgstr ""
219
220
#: branch.c:250
221
#, c-format
222
msgid "Not a valid object name: '%s'."
223
msgstr ""
224
225
#: branch.c:270
226
#, c-format
227
msgid "Ambiguous object name: '%s'."
228
msgstr ""
229
230
#: branch.c:275
231
#, c-format
232
msgid "Not a valid branch point: '%s'."
233
msgstr ""
234
235
#: branch.c:281
236
msgid "Failed to lock ref for update"
237
msgstr ""
238
239
#: branch.c:299
240
msgid "Failed to write ref"
241
msgstr ""
242
243
#: bundle.c:36
244
#, c-format
245
msgid "'%s' does not look like a v2 bundle file"
246
msgstr ""
247
248
#: bundle.c:63
249
#, c-format
250
msgid "unrecognized header: %s%s (%d)"
251
msgstr ""
252
253
#: bundle.c:89 builtin/commit.c:676
254
#, c-format
255
msgid "could not open '%s'"
256
msgstr ""
257
258
#: bundle.c:140
259
msgid "Repository lacks these prerequisite commits:"
260
msgstr ""
261
262
#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300
263
#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349
264
#: builtin/shortlog.c:155
265
msgid "revision walk setup failed"
266
msgstr ""
267
268
#: bundle.c:186
269
#, c-format
270
msgid "The bundle contains this ref:"
271
msgid_plural "The bundle contains these %d refs:"
272
msgstr[0] ""
273
msgstr[1] ""
274
275
#: bundle.c:193
276
msgid "The bundle records a complete history."
277
msgstr ""
278
279
#: bundle.c:195
280
#, c-format
281
msgid "The bundle requires this ref:"
282
msgid_plural "The bundle requires these %d refs:"
283
msgstr[0] ""
284
msgstr[1] ""
285
286
#: bundle.c:294
287
msgid "rev-list died"
288
msgstr ""
289
290
#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258
291
#, c-format
292
msgid "unrecognized argument: %s"
293
msgstr ""
294
295
#: bundle.c:335
296
#, c-format
297
msgid "ref '%s' is excluded by the rev-list options"
298
msgstr ""
299
300
#: bundle.c:380
301
msgid "Refusing to create empty bundle."
302
msgstr ""
303
304
#: bundle.c:398
305
msgid "Could not spawn pack-objects"
306
msgstr ""
307
308
#: bundle.c:416
309
msgid "pack-objects died"
310
msgstr ""
311
312
#: bundle.c:419
313
#, c-format
314
msgid "cannot create '%s'"
315
msgstr ""
316
317
#: bundle.c:441
318
msgid "index-pack died"
319
msgstr ""
320
321
#: commit.c:50
39
322
#, c-format
40
323
msgid "could not parse %s"
41
324
msgstr ""
42
325
43
#: commit.c:49
326
#: commit.c:52
44
327
#, c-format
45
328
msgid "%s %s is not a commit!"
46
329
msgstr ""
63
346
msgid "failed to close rev-list's stdin: %s"
64
347
msgstr ""
65
348
66
#: diff.c:105
67
#, c-format
68
msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
69
msgstr ""
70
71
#: diff.c:110
72
#, c-format
73
msgid " Unknown dirstat parameter '%.*s'\n"
349
#: date.c:95
350
msgid "in the future"
351
msgstr ""
352
353
#: date.c:101
354
#, c-format
355
msgid "%lu second ago"
356
msgid_plural "%lu seconds ago"
357
msgstr[0] ""
358
msgstr[1] ""
359
360
#: date.c:108
361
#, c-format
362
msgid "%lu minute ago"
363
msgid_plural "%lu minutes ago"
364
msgstr[0] ""
365
msgstr[1] ""
366
367
#: date.c:115
368
#, c-format
369
msgid "%lu hour ago"
370
msgid_plural "%lu hours ago"
371
msgstr[0] ""
372
msgstr[1] ""
373
374
#: date.c:122
375
#, c-format
376
msgid "%lu day ago"
377
msgid_plural "%lu days ago"
378
msgstr[0] ""
379
msgstr[1] ""
380
381
#: date.c:128
382
#, c-format
383
msgid "%lu week ago"
384
msgid_plural "%lu weeks ago"
385
msgstr[0] ""
386
msgstr[1] ""
387
388
#: date.c:135
389
#, c-format
390
msgid "%lu month ago"
391
msgid_plural "%lu months ago"
392
msgstr[0] ""
393
msgstr[1] ""
394
395
#: date.c:146
396
#, c-format
397
msgid "%lu year"
398
msgid_plural "%lu years"
399
msgstr[0] ""
400
msgstr[1] ""
401
402
#: date.c:149
403
#, c-format
404
msgid "%s, %lu month ago"
405
msgid_plural "%s, %lu months ago"
406
msgstr[0] ""
407
msgstr[1] ""
408
409
#: date.c:154 date.c:159
410
#, c-format
411
msgid "%lu year ago"
412
msgid_plural "%lu years ago"
413
msgstr[0] ""
414
msgstr[1] ""
415
416
#: diff.c:112
417
#, c-format
418
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
419
msgstr ""
420
421
#: diff.c:117
422
#, c-format
423
msgid " Unknown dirstat parameter '%s'\n"
74
424
msgstr ""
75
425
76
426
#: diff.c:210
77
427
#, c-format
428
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
429
msgstr ""
430
431
#: diff.c:260
432
#, c-format
78
433
msgid ""
79
434
"Found errors in 'diff.dirstat' config variable:\n"
80
435
"%s"
81
436
msgstr ""
82
437
83
#: diff.c:1400
84
msgid " 0 files changed\n"
85
msgstr ""
86
87
#: diff.c:1404
88
#, c-format
89
msgid " %d file changed"
90
msgid_plural " %d files changed"
91
msgstr[0] ""
92
msgstr[1] ""
93
94
#: diff.c:1421
95
#, c-format
96
msgid ", %d insertion(+)"
97
msgid_plural ", %d insertions(+)"
98
msgstr[0] ""
99
msgstr[1] ""
100
101
#: diff.c:1432
102
#, c-format
103
msgid ", %d deletion(-)"
104
msgid_plural ", %d deletions(-)"
105
msgstr[0] ""
106
msgstr[1] ""
107
108
#: diff.c:3439
438
#: diff.c:3481
109
439
#, c-format
110
440
msgid ""
111
441
"Failed to parse --dirstat/-X option parameter:\n"
112
442
"%s"
113
443
msgstr ""
114
444
115
#: gpg-interface.c:59
445
#: diff.c:3495
446
#, c-format
447
msgid "Failed to parse --submodule option parameter: '%s'"
448
msgstr ""
449
450
#: gpg-interface.c:59 gpg-interface.c:131
116
451
msgid "could not run gpg."
117
452
msgstr ""
118
453
124
459
msgid "gpg failed to sign the data"
125
460
msgstr ""
126
461
127
#: grep.c:1280
462
#: gpg-interface.c:115
463
#, c-format
464
msgid "could not create temporary file '%s': %s"
465
msgstr ""
466
467
#: gpg-interface.c:118
468
#, c-format
469
msgid "failed writing detached signature to '%s': %s"
470
msgstr ""
471
472
#: grep.c:1623
128
473
#, c-format
129
474
msgid "'%s': unable to read %s"
130
475
msgstr ""
131
476
132
#: grep.c:1297
477
#: grep.c:1640
133
478
#, c-format
134
479
msgid "'%s': %s"
135
480
msgstr ""
136
481
137
#: grep.c:1308
482
#: grep.c:1651
138
483
#, c-format
139
484
msgid "'%s': short read %s"
140
485
msgstr ""
141
486
142
#: help.c:287
487
#: help.c:212
488
#, c-format
489
msgid "available git commands in '%s'"
490
msgstr ""
491
492
#: help.c:219
493
msgid "git commands available from elsewhere on your $PATH"
494
msgstr ""
495
496
#: help.c:235
497
msgid "The most commonly used git commands are:"
498
msgstr ""
499
500
#: help.c:292
143
501
#, c-format
144
502
msgid ""
145
503
"'%s' appears to be a git command, but we were not\n"
146
504
"able to execute it. Maybe git-%s is broken?"
147
505
msgstr ""
148
506
149
#: remote.c:1607
507
#: help.c:349
508
msgid "Uh oh. Your system reports no Git commands at all."
509
msgstr ""
510
511
#: help.c:371
512
#, c-format
513
msgid ""
514
"WARNING: You called a Git command named '%s', which does not exist.\n"
515
"Continuing under the assumption that you meant '%s'"
516
msgstr ""
517
518
#: help.c:376
519
#, c-format
520
msgid "in %0.1f seconds automatically..."
521
msgstr ""
522
523
#: help.c:383
524
#, c-format
525
msgid "git: '%s' is not a git command. See 'git --help'."
526
msgstr ""
527
528
#: help.c:387
529
msgid ""
530
"\n"
531
"Did you mean this?"
532
msgid_plural ""
533
"\n"
534
"Did you mean one of these?"
535
msgstr[0] ""
536
msgstr[1] ""
537
538
#: merge.c:56
539
msgid "failed to read the cache"
540
msgstr ""
541
542
#: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566
543
#: builtin/clone.c:645
544
msgid "unable to write new index file"
545
msgstr ""
546
547
#: merge-recursive.c:190
548
#, c-format
549
msgid "(bad commit)\n"
550
msgstr ""
551
552
#: merge-recursive.c:206
553
#, c-format
554
msgid "addinfo_cache failed for path '%s'"
555
msgstr ""
556
557
#: merge-recursive.c:268
558
msgid "error building trees"
559
msgstr ""
560
561
#: merge-recursive.c:672
562
#, c-format
563
msgid "failed to create path '%s'%s"
564
msgstr ""
565
566
#: merge-recursive.c:683
567
#, c-format
568
msgid "Removing %s to make room for subdirectory\n"
569
msgstr ""
570
571
#. something else exists
572
#. .. but not some other error (who really cares what?)
573
#: merge-recursive.c:697 merge-recursive.c:718
574
msgid ": perhaps a D/F conflict?"
575
msgstr ""
576
577
#: merge-recursive.c:708
578
#, c-format
579
msgid "refusing to lose untracked file at '%s'"
580
msgstr ""
581
582
#: merge-recursive.c:748
583
#, c-format
584
msgid "cannot read object %s '%s'"
585
msgstr ""
586
587
#: merge-recursive.c:750
588
#, c-format
589
msgid "blob expected for %s '%s'"
590
msgstr ""
591
592
#: merge-recursive.c:773 builtin/clone.c:313
593
#, c-format
594
msgid "failed to open '%s'"
595
msgstr ""
596
597
#: merge-recursive.c:781
598
#, c-format
599
msgid "failed to symlink '%s'"
600
msgstr ""
601
602
#: merge-recursive.c:784
603
#, c-format
604
msgid "do not know what to do with %06o %s '%s'"
605
msgstr ""
606
607
#: merge-recursive.c:922
608
msgid "Failed to execute internal merge"
609
msgstr ""
610
611
#: merge-recursive.c:926
612
#, c-format
613
msgid "Unable to add %s to database"
614
msgstr ""
615
616
#: merge-recursive.c:942
617
msgid "unsupported object type in the tree"
618
msgstr ""
619
620
#: merge-recursive.c:1021 merge-recursive.c:1035
621
#, c-format
622
msgid ""
623
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
624
"in tree."
625
msgstr ""
626
627
#: merge-recursive.c:1027 merge-recursive.c:1040
628
#, c-format
629
msgid ""
630
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
631
"in tree at %s."
632
msgstr ""
633
634
#: merge-recursive.c:1081
635
msgid "rename"
636
msgstr ""
637
638
#: merge-recursive.c:1081
639
msgid "renamed"
640
msgstr ""
641
642
#: merge-recursive.c:1137
643
#, c-format
644
msgid "%s is a directory in %s adding as %s instead"
645
msgstr ""
646
647
#: merge-recursive.c:1159
648
#, c-format
649
msgid ""
650
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
651
"\"->\"%s\" in \"%s\"%s"
652
msgstr ""
653
654
#: merge-recursive.c:1164
655
msgid " (left unresolved)"
656
msgstr ""
657
658
#: merge-recursive.c:1218
659
#, c-format
660
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
661
msgstr ""
662
663
#: merge-recursive.c:1248
664
#, c-format
665
msgid "Renaming %s to %s and %s to %s instead"
666
msgstr ""
667
668
#: merge-recursive.c:1447
669
#, c-format
670
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
671
msgstr ""
672
673
#: merge-recursive.c:1457
674
#, c-format
675
msgid "Adding merged %s"
676
msgstr ""
677
678
#: merge-recursive.c:1462 merge-recursive.c:1660
679
#, c-format
680
msgid "Adding as %s instead"
681
msgstr ""
682
683
#: merge-recursive.c:1513
684
#, c-format
685
msgid "cannot read object %s"
686
msgstr ""
687
688
#: merge-recursive.c:1516
689
#, c-format
690
msgid "object %s is not a blob"
691
msgstr ""
692
693
#: merge-recursive.c:1564
694
msgid "modify"
695
msgstr ""
696
697
#: merge-recursive.c:1564
698
msgid "modified"
699
msgstr ""
700
701
#: merge-recursive.c:1574
702
msgid "content"
703
msgstr ""
704
705
#: merge-recursive.c:1581
706
msgid "add/add"
707
msgstr ""
708
709
#: merge-recursive.c:1615
710
#, c-format
711
msgid "Skipped %s (merged same as existing)"
712
msgstr ""
713
714
#: merge-recursive.c:1629
715
#, c-format
716
msgid "Auto-merging %s"
717
msgstr ""
718
719
#: merge-recursive.c:1633 git-submodule.sh:1029
720
msgid "submodule"
721
msgstr ""
722
723
#: merge-recursive.c:1634
724
#, c-format
725
msgid "CONFLICT (%s): Merge conflict in %s"
726
msgstr ""
727
728
#: merge-recursive.c:1724
729
#, c-format
730
msgid "Removing %s"
731
msgstr ""
732
733
#: merge-recursive.c:1749
734
msgid "file/directory"
735
msgstr ""
736
737
#: merge-recursive.c:1755
738
msgid "directory/file"
739
msgstr ""
740
741
#: merge-recursive.c:1760
742
#, c-format
743
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
744
msgstr ""
745
746
#: merge-recursive.c:1770
747
#, c-format
748
msgid "Adding %s"
749
msgstr ""
750
751
#: merge-recursive.c:1787
752
msgid "Fatal merge failure, shouldn't happen."
753
msgstr ""
754
755
#: merge-recursive.c:1806
756
msgid "Already up-to-date!"
757
msgstr ""
758
759
#: merge-recursive.c:1815
760
#, c-format
761
msgid "merging of trees %s and %s failed"
762
msgstr ""
763
764
#: merge-recursive.c:1845
765
#, c-format
766
msgid "Unprocessed path??? %s"
767
msgstr ""
768
769
#: merge-recursive.c:1890
770
msgid "Merging:"
771
msgstr ""
772
773
#: merge-recursive.c:1903
774
#, c-format
775
msgid "found %u common ancestor:"
776
msgid_plural "found %u common ancestors:"
777
msgstr[0] ""
778
msgstr[1] ""
779
780
#: merge-recursive.c:1940
781
msgid "merge returned no commit"
782
msgstr ""
783
784
#: merge-recursive.c:1997
785
#, c-format
786
msgid "Could not parse object '%s'"
787
msgstr ""
788
789
#: merge-recursive.c:2009 builtin/merge.c:658
790
msgid "Unable to write index."
791
msgstr ""
792
793
#: object.c:195
794
#, c-format
795
msgid "unable to parse object: %s"
796
msgstr ""
797
798
#: parse-options.c:489
799
msgid "..."
800
msgstr ""
801
802
#: parse-options.c:507
803
#, c-format
804
msgid "usage: %s"
805
msgstr ""
806
807
#. TRANSLATORS: the colon here should align with the
808
#. one in "usage: %s" translation
809
#: parse-options.c:511
810
#, c-format
811
msgid " or: %s"
812
msgstr ""
813
814
#: parse-options.c:514
815
#, c-format
816
msgid " %s"
817
msgstr ""
818
819
#: parse-options.c:548
820
msgid "-NUM"
821
msgstr ""
822
823
#: pathspec.c:83
824
#, c-format
825
msgid "Path '%s' is in submodule '%.*s'"
826
msgstr ""
827
828
#: pathspec.c:99
829
#, c-format
830
msgid "'%s' is beyond a symbolic link"
831
msgstr ""
832
833
#: remote.c:1781
150
834
#, c-format
151
835
msgid "Your branch is ahead of '%s' by %d commit.\n"
152
836
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
153
837
msgstr[0] ""
154
838
msgstr[1] ""
155
839
156
#: remote.c:1613
840
#: remote.c:1787
841
msgid " (use \"git push\" to publish your local commits)\n"
842
msgstr ""
843
844
#: remote.c:1790
157
845
#, c-format
158
846
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
159
847
msgid_plural ""
161
849
msgstr[0] ""
162
850
msgstr[1] ""
163
851
164
#: remote.c:1621
852
#: remote.c:1798
853
msgid " (use \"git pull\" to update your local branch)\n"
854
msgstr ""
855
856
#: remote.c:1801
165
857
#, c-format
166
858
msgid ""
167
859
"Your branch and '%s' have diverged,\n"
172
864
msgstr[0] ""
173
865
msgstr[1] ""
174
866
175
#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978
176
#: builtin/merge.c:1088 builtin/merge.c:1098
867
#: remote.c:1811
868
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
869
msgstr ""
870
871
#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999
872
#: builtin/merge.c:1009
177
873
#, c-format
178
874
msgid "Could not open '%s' for writing"
179
875
msgstr ""
180
876
181
#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868
182
#: builtin/merge.c:1090 builtin/merge.c:1103
877
#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779
878
#: builtin/merge.c:1001 builtin/merge.c:1014
183
879
#, c-format
184
880
msgid "Could not write to '%s'"
185
881
msgstr ""
186
882
187
#: sequencer.c:143
883
#: sequencer.c:229
188
884
msgid ""
189
885
"after resolving the conflicts, mark the corrected paths\n"
190
886
"with 'git add <paths>' or 'git rm <paths>'"
191
887
msgstr ""
192
888
193
#: sequencer.c:146
889
#: sequencer.c:232
194
890
msgid ""
195
891
"after resolving the conflicts, mark the corrected paths\n"
196
892
"with 'git add <paths>' or 'git rm <paths>'\n"
197
893
"and commit the result with 'git commit'"
198
894
msgstr ""
199
895
200
#: sequencer.c:159 sequencer.c:685 sequencer.c:768
896
#: sequencer.c:245 sequencer.c:859 sequencer.c:942
201
897
#, c-format
202
898
msgid "Could not write to %s"
203
899
msgstr ""
204
900
205
#: sequencer.c:162
901
#: sequencer.c:248
206
902
#, c-format
207
903
msgid "Error wrapping up %s"
208
904
msgstr ""
209
905
210
#: sequencer.c:177
906
#: sequencer.c:263
211
907
msgid "Your local changes would be overwritten by cherry-pick."
212
908
msgstr ""
213
909
214
#: sequencer.c:179
910
#: sequencer.c:265
215
911
msgid "Your local changes would be overwritten by revert."
216
912
msgstr ""
217
913
218
#: sequencer.c:182
914
#: sequencer.c:268
219
915
msgid "Commit your changes or stash them to proceed."
220
916
msgstr ""
221
917
222
918
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
223
#: sequencer.c:232
919
#: sequencer.c:319
224
920
#, c-format
225
921
msgid "%s: Unable to write new index file"
226
922
msgstr ""
227
923
228
#: sequencer.c:298
924
#: sequencer.c:350
925
msgid "Could not resolve HEAD commit\n"
926
msgstr ""
927
928
#: sequencer.c:371
929
msgid "Unable to update cache tree\n"
930
msgstr ""
931
932
#: sequencer.c:416
933
#, c-format
934
msgid "Could not parse commit %s\n"
935
msgstr ""
936
937
#: sequencer.c:421
938
#, c-format
939
msgid "Could not parse parent commit %s\n"
940
msgstr ""
941
942
#: sequencer.c:487
229
943
msgid "Your index file is unmerged."
230
944
msgstr ""
231
945
232
#: sequencer.c:301
233
msgid "You do not have a valid HEAD"
234
msgstr ""
235
236
#: sequencer.c:316
946
#: sequencer.c:506
237
947
#, c-format
238
948
msgid "Commit %s is a merge but no -m option was given."
239
949
msgstr ""
240
950
241
#: sequencer.c:324
951
#: sequencer.c:514
242
952
#, c-format
243
953
msgid "Commit %s does not have parent %d"
244
954
msgstr ""
245
955
246
#: sequencer.c:328
956
#: sequencer.c:518
247
957
#, c-format
248
958
msgid "Mainline was specified but commit %s is not a merge."
249
959
msgstr ""
250
960
251
961
#. TRANSLATORS: The first %s will be "revert" or
252
962
#. "cherry-pick", the second %s a SHA1
253
#: sequencer.c:339
963
#: sequencer.c:531
254
964
#, c-format
255
965
msgid "%s: cannot parse parent commit %s"
256
966
msgstr ""
257
967
258
#: sequencer.c:343
968
#: sequencer.c:535
259
969
#, c-format
260
970
msgid "Cannot get commit message for %s"
261
971
msgstr ""
262
972
263
#: sequencer.c:427
973
#: sequencer.c:621
264
974
#, c-format
265
975
msgid "could not revert %s... %s"
266
976
msgstr ""
267
977
268
#: sequencer.c:428
978
#: sequencer.c:622
269
979
#, c-format
270
980
msgid "could not apply %s... %s"
271
981
msgstr ""
272
982
273
#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713
274
#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:347
275
#: builtin/shortlog.c:181
276
msgid "revision walk setup failed"
277
msgstr ""
278
279
#: sequencer.c:453
983
#: sequencer.c:654
280
984
msgid "empty commit set passed"
281
985
msgstr ""
282
986
283
#: sequencer.c:461
987
#: sequencer.c:662
284
988
#, c-format
285
989
msgid "git %s: failed to read the index"
286
990
msgstr ""
287
991
288
#: sequencer.c:466
992
#: sequencer.c:667
289
993
#, c-format
290
994
msgid "git %s: failed to refresh the index"
291
995
msgstr ""
292
996
293
#: sequencer.c:551
997
#: sequencer.c:725
294
998
#, c-format
295
999
msgid "Cannot %s during a %s"
296
1000
msgstr ""
297
1001
298
#: sequencer.c:573
1002
#: sequencer.c:747
299
1003
#, c-format
300
1004
msgid "Could not parse line %d."
301
1005
msgstr ""
302
1006
303
#: sequencer.c:578
1007
#: sequencer.c:752
304
1008
msgid "No commits parsed."
305
1009
msgstr ""
306
1010
307
#: sequencer.c:591
1011
#: sequencer.c:765
308
1012
#, c-format
309
1013
msgid "Could not open %s"
310
1014
msgstr ""
311
1015
312
#: sequencer.c:595
1016
#: sequencer.c:769
313
1017
#, c-format
314
1018
msgid "Could not read %s."
315
1019
msgstr ""
316
1020
317
#: sequencer.c:602
1021
#: sequencer.c:776
318
1022
#, c-format
319
1023
msgid "Unusable instruction sheet: %s"
320
1024
msgstr ""
321
1025
322
#: sequencer.c:630
1026
#: sequencer.c:804
323
1027
#, c-format
324
1028
msgid "Invalid key: %s"
325
1029
msgstr ""
326
1030
327
#: sequencer.c:633
1031
#: sequencer.c:807
328
1032
#, c-format
329
1033
msgid "Invalid value for %s: %s"
330
1034
msgstr ""
331
1035
332
#: sequencer.c:645
1036
#: sequencer.c:819
333
1037
#, c-format
334
1038
msgid "Malformed options sheet: %s"
335
1039
msgstr ""
336
1040
337
#: sequencer.c:666
1041
#: sequencer.c:840
338
1042
msgid "a cherry-pick or revert is already in progress"
339
1043
msgstr ""
340
1044
341
#: sequencer.c:667
1045
#: sequencer.c:841
342
1046
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
343
1047
msgstr ""
344
1048
345
#: sequencer.c:671
1049
#: sequencer.c:845
346
1050
#, c-format
347
1051
msgid "Could not create sequencer directory %s"
348
1052
msgstr ""
349
1053
350
#: sequencer.c:687 sequencer.c:772
1054
#: sequencer.c:861 sequencer.c:946
351
1055
#, c-format
352
1056
msgid "Error wrapping up %s."
353
1057
msgstr ""
354
1058
355
#: sequencer.c:706 sequencer.c:840
1059
#: sequencer.c:880 sequencer.c:1014
356
1060
msgid "no cherry-pick or revert in progress"
357
1061
msgstr ""
358
1062
359
#: sequencer.c:708
1063
#: sequencer.c:882
360
1064
msgid "cannot resolve HEAD"
361
1065
msgstr ""
362
1066
363
#: sequencer.c:710
1067
#: sequencer.c:884
364
1068
msgid "cannot abort from a branch yet to be born"
365
1069
msgstr ""
366
1070
367
#: sequencer.c:732
1071
#: sequencer.c:906 builtin/apply.c:4060
368
1072
#, c-format
369
1073
msgid "cannot open %s: %s"
370
1074
msgstr ""
371
1075
372
#: sequencer.c:735
1076
#: sequencer.c:909
373
1077
#, c-format
374
1078
msgid "cannot read %s: %s"
375
1079
msgstr ""
376
1080
377
#: sequencer.c:736
1081
#: sequencer.c:910
378
1082
msgid "unexpected end of file"
379
1083
msgstr ""
380
1084
381
#: sequencer.c:742
1085
#: sequencer.c:916
382
1086
#, c-format
383
1087
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
384
1088
msgstr ""
385
1089
386
#: sequencer.c:765
1090
#: sequencer.c:939
387
1091
#, c-format
388
1092
msgid "Could not format %s."
389
1093
msgstr ""
390
1094
391
#: sequencer.c:927
1095
#: sequencer.c:1083
1096
#, c-format
1097
msgid "%s: can't cherry-pick a %s"
1098
msgstr ""
1099
1100
#: sequencer.c:1085
1101
#, c-format
1102
msgid "%s: bad revision"
1103
msgstr ""
1104
1105
#: sequencer.c:1119
392
1106
msgid "Can't revert as initial commit"
393
1107
msgstr ""
394
1108
395
#: sequencer.c:928
1109
#: sequencer.c:1120
396
1110
msgid "Can't cherry-pick into empty head"
397
1111
msgstr ""
398
1112
399
#: wt-status.c:134
1113
#: sha1_name.c:1036
1114
msgid "HEAD does not point to a branch"
1115
msgstr ""
1116
1117
#: sha1_name.c:1039
1118
#, c-format
1119
msgid "No such branch: '%s'"
1120
msgstr ""
1121
1122
#: sha1_name.c:1041
1123
#, c-format
1124
msgid "No upstream configured for branch '%s'"
1125
msgstr ""
1126
1127
#: sha1_name.c:1044
1128
#, c-format
1129
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1130
msgstr ""
1131
1132
#: wrapper.c:408
1133
#, c-format
1134
msgid "unable to access '%s': %s"
1135
msgstr ""
1136
1137
#: wrapper.c:423
1138
#, c-format
1139
msgid "unable to access '%s'"
1140
msgstr ""
1141
1142
#: wrapper.c:434
1143
#, c-format
1144
msgid "unable to look up current user in the passwd file: %s"
1145
msgstr ""
1146
1147
#: wrapper.c:435
1148
msgid "no such user"
1149
msgstr ""
1150
1151
#: wt-status.c:140
400
1152
msgid "Unmerged paths:"
401
1153
msgstr ""
402
1154
403
#: wt-status.c:140 wt-status.c:157
1155
#: wt-status.c:167 wt-status.c:194
404
1156
#, c-format
405
1157
msgid " (use \"git reset %s <file>...\" to unstage)"
406
1158
msgstr ""
407
1159
408
#: wt-status.c:142 wt-status.c:159
1160
#: wt-status.c:169 wt-status.c:196
409
1161
msgid " (use \"git rm --cached <file>...\" to unstage)"
410
1162
msgstr ""
411
1163
412
#: wt-status.c:143
1164
#: wt-status.c:173
1165
msgid " (use \"git add <file>...\" to mark resolution)"
1166
msgstr ""
1167
1168
#: wt-status.c:175 wt-status.c:179
413
1169
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
414
1170
msgstr ""
415
1171
416
#: wt-status.c:151
1172
#: wt-status.c:177
1173
msgid " (use \"git rm <file>...\" to mark resolution)"
1174
msgstr ""
1175
1176
#: wt-status.c:188
417
1177
msgid "Changes to be committed:"
418
1178
msgstr ""
419
1179
420
#: wt-status.c:169
1180
#: wt-status.c:206
421
1181
msgid "Changes not staged for commit:"
422
1182
msgstr ""
423
1183
424
#: wt-status.c:173
1184
#: wt-status.c:210
425
1185
msgid " (use \"git add <file>...\" to update what will be committed)"
426
1186
msgstr ""
427
1187
428
#: wt-status.c:175
1188
#: wt-status.c:212
429
1189
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
430
1190
msgstr ""
431
1191
432
#: wt-status.c:176
1192
#: wt-status.c:213
433
1193
msgid ""
434
1194
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
435
1195
msgstr ""
436
1196
437
#: wt-status.c:178
1197
#: wt-status.c:215
438
1198
msgid " (commit or discard the untracked or modified content in submodules)"
439
1199
msgstr ""
440
1200
441
#: wt-status.c:187
442
#, c-format
443
msgid "%s files:"
444
msgstr ""
445
446
#: wt-status.c:190
1201
#: wt-status.c:227
447
1202
#, c-format
448
1203
msgid " (use \"git %s <file>...\" to include in what will be committed)"
449
1204
msgstr ""
450
1205
451
#: wt-status.c:207
1206
#: wt-status.c:244
452
1207
msgid "bug"
453
1208
msgstr ""
454
1209
455
#: wt-status.c:212
1210
#: wt-status.c:249
456
1211
msgid "both deleted:"
457
1212
msgstr ""
458
1213
459
#: wt-status.c:213
1214
#: wt-status.c:250
460
1215
msgid "added by us:"
461
1216
msgstr ""
462
1217
463
#: wt-status.c:214
1218
#: wt-status.c:251
464
1219
msgid "deleted by them:"
465
1220
msgstr ""
466
1221
467
#: wt-status.c:215
1222
#: wt-status.c:252
468
1223
msgid "added by them:"
469
1224
msgstr ""
470
1225
471
#: wt-status.c:216
1226
#: wt-status.c:253
472
1227
msgid "deleted by us:"
473
1228
msgstr ""
474
1229
475
#: wt-status.c:217
1230
#: wt-status.c:254
476
1231
msgid "both added:"
477
1232
msgstr ""
478
1233
479
#: wt-status.c:218
1234
#: wt-status.c:255
480
1235
msgid "both modified:"
481
1236
msgstr ""
482
1237
483
#: wt-status.c:248
1238
#: wt-status.c:285
484
1239
msgid "new commits, "
485
1240
msgstr ""
486
1241
487
#: wt-status.c:250
1242
#: wt-status.c:287
488
1243
msgid "modified content, "
489
1244
msgstr ""
490
1245
491
#: wt-status.c:252
1246
#: wt-status.c:289
492
1247
msgid "untracked content, "
493
1248
msgstr ""
494
1249
495
#: wt-status.c:266
1250
#: wt-status.c:306
496
1251
#, c-format
497
1252
msgid "new file: %s"
498
1253
msgstr ""
499
1254
500
#: wt-status.c:269
1255
#: wt-status.c:309
501
1256
#, c-format
502
1257
msgid "copied: %s -> %s"
503
1258
msgstr ""
504
1259
505
#: wt-status.c:272
1260
#: wt-status.c:312
506
1261
#, c-format
507
1262
msgid "deleted: %s"
508
1263
msgstr ""
509
1264
510
#: wt-status.c:275
1265
#: wt-status.c:315
511
1266
#, c-format
512
1267
msgid "modified: %s"
513
1268
msgstr ""
514
1269
515
#: wt-status.c:278
1270
#: wt-status.c:318
516
1271
#, c-format
517
1272
msgid "renamed: %s -> %s"
518
1273
msgstr ""
519
1274
520
#: wt-status.c:281
1275
#: wt-status.c:321
521
1276
#, c-format
522
1277
msgid "typechange: %s"
523
1278
msgstr ""
524
1279
525
#: wt-status.c:284
1280
#: wt-status.c:324
526
1281
#, c-format
527
1282
msgid "unknown: %s"
528
1283
msgstr ""
529
1284
530
#: wt-status.c:287
1285
#: wt-status.c:327
531
1286
#, c-format
532
1287
msgid "unmerged: %s"
533
1288
msgstr ""
534
1289
535
#: wt-status.c:290
1290
#: wt-status.c:330
536
1291
#, c-format
537
1292
msgid "bug: unhandled diff status %c"
538
1293
msgstr ""
539
1294
540
#: wt-status.c:713
1295
#: wt-status.c:803
1296
msgid "You have unmerged paths."
1297
msgstr ""
1298
1299
#: wt-status.c:806 wt-status.c:958
1300
msgid " (fix conflicts and run \"git commit\")"
1301
msgstr ""
1302
1303
#: wt-status.c:809
1304
msgid "All conflicts fixed but you are still merging."
1305
msgstr ""
1306
1307
#: wt-status.c:812
1308
msgid " (use \"git commit\" to conclude merge)"
1309
msgstr ""
1310
1311
#: wt-status.c:822
1312
msgid "You are in the middle of an am session."
1313
msgstr ""
1314
1315
#: wt-status.c:825
1316
msgid "The current patch is empty."
1317
msgstr ""
1318
1319
#: wt-status.c:829
1320
msgid " (fix conflicts and then run \"git am --resolved\")"
1321
msgstr ""
1322
1323
#: wt-status.c:831
1324
msgid " (use \"git am --skip\" to skip this patch)"
1325
msgstr ""
1326
1327
#: wt-status.c:833
1328
msgid " (use \"git am --abort\" to restore the original branch)"
1329
msgstr ""
1330
1331
#: wt-status.c:893 wt-status.c:910
1332
#, c-format
1333
msgid "You are currently rebasing branch '%s' on '%s'."
1334
msgstr ""
1335
1336
#: wt-status.c:898 wt-status.c:915
1337
msgid "You are currently rebasing."
1338
msgstr ""
1339
1340
#: wt-status.c:901
1341
msgid " (fix conflicts and then run \"git rebase --continue\")"
1342
msgstr ""
1343
1344
#: wt-status.c:903
1345
msgid " (use \"git rebase --skip\" to skip this patch)"
1346
msgstr ""
1347
1348
#: wt-status.c:905
1349
msgid " (use \"git rebase --abort\" to check out the original branch)"
1350
msgstr ""
1351
1352
#: wt-status.c:918
1353
msgid " (all conflicts fixed: run \"git rebase --continue\")"
1354
msgstr ""
1355
1356
#: wt-status.c:922
1357
#, c-format
1358
msgid ""
1359
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1360
msgstr ""
1361
1362
#: wt-status.c:927
1363
msgid "You are currently splitting a commit during a rebase."
1364
msgstr ""
1365
1366
#: wt-status.c:930
1367
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
1368
msgstr ""
1369
1370
#: wt-status.c:934
1371
#, c-format
1372
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
1373
msgstr ""
1374
1375
#: wt-status.c:939
1376
msgid "You are currently editing a commit during a rebase."
1377
msgstr ""
1378
1379
#: wt-status.c:942
1380
msgid " (use \"git commit --amend\" to amend the current commit)"
1381
msgstr ""
1382
1383
#: wt-status.c:944
1384
msgid ""
1385
" (use \"git rebase --continue\" once you are satisfied with your changes)"
1386
msgstr ""
1387
1388
#: wt-status.c:954
1389
msgid "You are currently cherry-picking."
1390
msgstr ""
1391
1392
#: wt-status.c:961
1393
msgid " (all conflicts fixed: run \"git commit\")"
1394
msgstr ""
1395
1396
#: wt-status.c:970
1397
#, c-format
1398
msgid "You are currently reverting commit %s."
1399
msgstr ""
1400
1401
#: wt-status.c:975
1402
msgid " (fix conflicts and run \"git revert --continue\")"
1403
msgstr ""
1404
1405
#: wt-status.c:978
1406
msgid " (all conflicts fixed: run \"git revert --continue\")"
1407
msgstr ""
1408
1409
#: wt-status.c:980
1410
msgid " (use \"git revert --abort\" to cancel the revert operation)"
1411
msgstr ""
1412
1413
#: wt-status.c:991
1414
#, c-format
1415
msgid "You are currently bisecting, started from branch '%s'."
1416
msgstr ""
1417
1418
#: wt-status.c:995
1419
msgid "You are currently bisecting."
1420
msgstr ""
1421
1422
#: wt-status.c:998
1423
msgid " (use \"git bisect reset\" to get back to the original branch)"
1424
msgstr ""
1425
1426
#: wt-status.c:1173
541
1427
msgid "On branch "
542
1428
msgstr ""
543
1429
544
#: wt-status.c:720
1430
#: wt-status.c:1184
1431
msgid "HEAD detached at "
1432
msgstr ""
1433
1434
#: wt-status.c:1186
1435
msgid "HEAD detached from "
1436
msgstr ""
1437
1438
#: wt-status.c:1189
545
1439
msgid "Not currently on any branch."
546
1440
msgstr ""
547
1441
548
#: wt-status.c:731
1442
#: wt-status.c:1206
549
1443
msgid "Initial commit"
550
1444
msgstr ""
551
1445
552
#: wt-status.c:745
553
msgid "Untracked"
554
msgstr ""
555
556
#: wt-status.c:747
557
msgid "Ignored"
558
msgstr ""
559
560
#: wt-status.c:749
1446
#: wt-status.c:1220
1447
msgid "Untracked files"
1448
msgstr ""
1449
1450
#: wt-status.c:1222
1451
msgid "Ignored files"
1452
msgstr ""
1453
1454
#: wt-status.c:1226
1455
#, c-format
1456
msgid ""
1457
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1458
"may speed it up, but you have to be careful not to forget to add\n"
1459
"new files yourself (see 'git help status')."
1460
msgstr ""
1461
1462
#: wt-status.c:1232
561
1463
#, c-format
562
1464
msgid "Untracked files not listed%s"
563
1465
msgstr ""
564
1466
565
#: wt-status.c:751
1467
#: wt-status.c:1234
566
1468
msgid " (use -u option to show untracked files)"
567
1469
msgstr ""
568
1470
569
#: wt-status.c:757
1471
#: wt-status.c:1240
570
1472
msgid "No changes"
571
1473
msgstr ""
572
1474
573
#: wt-status.c:761
574
#, c-format
575
msgid "no changes added to commit%s\n"
576
msgstr ""
577
578
#: wt-status.c:763
579
msgid " (use \"git add\" and/or \"git commit -a\")"
580
msgstr ""
581
582
#: wt-status.c:765
583
#, c-format
584
msgid "nothing added to commit but untracked files present%s\n"
585
msgstr ""
586
587
#: wt-status.c:767
588
msgid " (use \"git add\" to track)"
589
msgstr ""
590
591
#: wt-status.c:769 wt-status.c:772 wt-status.c:775
592
#, c-format
593
msgid "nothing to commit%s\n"
594
msgstr ""
595
596
#: wt-status.c:770
597
msgid " (create/copy files and use \"git add\" to track)"
598
msgstr ""
599
600
#: wt-status.c:773
601
msgid " (use -u to show untracked files)"
602
msgstr ""
603
604
#: wt-status.c:776
605
msgid " (working directory clean)"
606
msgstr ""
607
608
#: wt-status.c:884
1475
#: wt-status.c:1245
1476
#, c-format
1477
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1478
msgstr ""
1479
1480
#: wt-status.c:1248
1481
#, c-format
1482
msgid "no changes added to commit\n"
1483
msgstr ""
1484
1485
#: wt-status.c:1251
1486
#, c-format
1487
msgid ""
1488
"nothing added to commit but untracked files present (use \"git add\" to "
1489
"track)\n"
1490
msgstr ""
1491
1492
#: wt-status.c:1254
1493
#, c-format
1494
msgid "nothing added to commit but untracked files present\n"
1495
msgstr ""
1496
1497
#: wt-status.c:1257
1498
#, c-format
1499
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1500
msgstr ""
1501
1502
#: wt-status.c:1260 wt-status.c:1265
1503
#, c-format
1504
msgid "nothing to commit\n"
1505
msgstr ""
1506
1507
#: wt-status.c:1263
1508
#, c-format
1509
msgid "nothing to commit (use -u to show untracked files)\n"
1510
msgstr ""
1511
1512
#: wt-status.c:1267
1513
#, c-format
1514
msgid "nothing to commit, working directory clean\n"
1515
msgstr ""
1516
1517
#: wt-status.c:1375
609
1518
msgid "HEAD (no branch)"
610
1519
msgstr ""
611
1520
612
#: wt-status.c:890
1521
#: wt-status.c:1381
613
1522
msgid "Initial commit on "
614
1523
msgstr ""
615
1524
616
#: wt-status.c:905
1525
#: wt-status.c:1396
617
1526
msgid "behind "
618
1527
msgstr ""
619
1528
620
#: wt-status.c:908 wt-status.c:911
1529
#: wt-status.c:1399 wt-status.c:1402
621
1530
msgid "ahead "
622
1531
msgstr ""
623
1532
624
#: wt-status.c:913
1533
#: wt-status.c:1404
625
1534
msgid ", behind "
626
1535
msgstr ""
627
1536
628
#: builtin/add.c:62
1537
#: compat/precompose_utf8.c:58 builtin/clone.c:352
1538
#, c-format
1539
msgid "failed to unlink '%s'"
1540
msgstr ""
1541
1542
#: builtin/add.c:20
1543
msgid "git add [options] [--] <pathspec>..."
1544
msgstr ""
1545
1546
#.
1547
#. * To be consistent with "git add -p" and most Git
1548
#. * commands, we should default to being tree-wide, but
1549
#. * this is not the original behavior and can't be
1550
#. * changed until users trained themselves not to type
1551
#. * "git add -u" or "git add -A". For now, we warn and
1552
#. * keep the old behavior. Later, the behavior can be changed
1553
#. * to tree-wide, keeping the warning for a while, and
1554
#. * eventually we can drop the warning.
1555
#.
1556
#: builtin/add.c:58
1557
#, c-format
1558
msgid ""
1559
"The behavior of 'git add %s (or %s)' with no path argument from a\n"
1560
"subdirectory of the tree will change in Git 2.0 and should not be used "
1561
"anymore.\n"
1562
"To add content for the whole tree, run:\n"
1563
"\n"
1564
" git add %s :/\n"
1565
" (or git add %s :/)\n"
1566
"\n"
1567
"To restrict the command to the current directory, run:\n"
1568
"\n"
1569
" git add %s .\n"
1570
" (or git add %s .)\n"
1571
"\n"
1572
"With the current Git version, the command is restricted to the current "
1573
"directory.\n"
1574
msgstr ""
1575
1576
#: builtin/add.c:100
1577
#, c-format
1578
msgid ""
1579
"You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
1580
"whose behaviour will change in Git 2.0 with respect to paths you removed.\n"
1581
"Paths like '%s' that are\n"
1582
"removed from your working tree are ignored with this version of Git.\n"
1583
"\n"
1584
"* 'git add --ignore-removal <pathspec>', which is the current default,\n"
1585
" ignores paths you removed from your working tree.\n"
1586
"\n"
1587
"* 'git add --all <pathspec>' will let you also record the removals.\n"
1588
"\n"
1589
"Run 'git status' to check the paths you removed from your working tree.\n"
1590
msgstr ""
1591
1592
#: builtin/add.c:144
629
1593
#, c-format
630
1594
msgid "unexpected diff status %c"
631
1595
msgstr ""
632
1596
633
#: builtin/add.c:67 builtin/commit.c:298
1597
#: builtin/add.c:149 builtin/commit.c:233
634
1598
msgid "updating files failed"
635
1599
msgstr ""
636
1600
637
#: builtin/add.c:77
1601
#: builtin/add.c:163
638
1602
#, c-format
639
1603
msgid "remove '%s'\n"
640
1604
msgstr ""
641
1605
642
#: builtin/add.c:176
643
#, c-format
644
msgid "Path '%s' is in submodule '%.*s'"
645
msgstr ""
646
647
#: builtin/add.c:192
1606
#: builtin/add.c:253
648
1607
msgid "Unstaged changes after refreshing the index:"
649
1608
msgstr ""
650
1609
651
#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186
1610
#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275
652
1611
#, c-format
653
1612
msgid "pathspec '%s' did not match any files"
654
1613
msgstr ""
655
1614
656
#: builtin/add.c:209
657
#, c-format
658
msgid "'%s' is beyond a symbolic link"
659
msgstr ""
660
661
#: builtin/add.c:276
1615
#: builtin/add.c:339
662
1616
msgid "Could not read the index"
663
1617
msgstr ""
664
1618
665
#: builtin/add.c:286
1619
#: builtin/add.c:349
666
1620
#, c-format
667
1621
msgid "Could not open '%s' for writing."
668
1622
msgstr ""
669
1623
670
#: builtin/add.c:290
1624
#: builtin/add.c:353
671
1625
msgid "Could not write patch"
672
1626
msgstr ""
673
1627
674
#: builtin/add.c:295
1628
#: builtin/add.c:358
675
1629
#, c-format
676
1630
msgid "Could not stat '%s'"
677
1631
msgstr ""
678
1632
679
#: builtin/add.c:297
1633
#: builtin/add.c:360
680
1634
msgid "Empty patch. Aborted."
681
1635
msgstr ""
682
1636
683
#: builtin/add.c:303
1637
#: builtin/add.c:366
684
1638
#, c-format
685
1639
msgid "Could not apply '%s'"
686
1640
msgstr ""
687
1641
688
#: builtin/add.c:312
1642
#: builtin/add.c:376
689
1643
msgid "The following paths are ignored by one of your .gitignore files:\n"
690
1644
msgstr ""
691
1645
692
#: builtin/add.c:352
1646
#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63
1647
#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253
1648
#: builtin/rm.c:206
1649
msgid "dry run"
1650
msgstr ""
1651
1652
#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19
1653
#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613
1654
#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112
1655
msgid "be verbose"
1656
msgstr ""
1657
1658
#: builtin/add.c:396
1659
msgid "interactive picking"
1660
msgstr ""
1661
1662
#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258
1663
msgid "select hunks interactively"
1664
msgstr ""
1665
1666
#: builtin/add.c:398
1667
msgid "edit current diff and apply"
1668
msgstr ""
1669
1670
#: builtin/add.c:399
1671
msgid "allow adding otherwise ignored files"
1672
msgstr ""
1673
1674
#: builtin/add.c:400
1675
msgid "update tracked files"
1676
msgstr ""
1677
1678
#: builtin/add.c:401
1679
msgid "record only the fact that the path will be added later"
1680
msgstr ""
1681
1682
#: builtin/add.c:402
1683
msgid "add changes from all tracked and untracked files"
1684
msgstr ""
1685
1686
#. takes no arguments
1687
#: builtin/add.c:405
1688
msgid "ignore paths removed in the working tree (same as --no-all)"
1689
msgstr ""
1690
1691
#: builtin/add.c:407
1692
msgid "don't add, only refresh the index"
1693
msgstr ""
1694
1695
#: builtin/add.c:408
1696
msgid "just skip files which cannot be added because of errors"
1697
msgstr ""
1698
1699
#: builtin/add.c:409
1700
msgid "check if - even missing - files are ignored in dry run"
1701
msgstr ""
1702
1703
#: builtin/add.c:431
693
1704
#, c-format
694
1705
msgid "Use -f if you really want to add them.\n"
695
1706
msgstr ""
696
1707
697
#: builtin/add.c:353
1708
#: builtin/add.c:432
698
1709
msgid "no files added"
699
1710
msgstr ""
700
1711
701
#: builtin/add.c:359
1712
#: builtin/add.c:438
702
1713
msgid "adding files failed"
703
1714
msgstr ""
704
1715
705
#: builtin/add.c:391
1716
#: builtin/add.c:477
706
1717
msgid "-A and -u are mutually incompatible"
707
1718
msgstr ""
708
1719
709
#: builtin/add.c:393
1720
#: builtin/add.c:495
710
1721
msgid "Option --ignore-missing can only be used together with --dry-run"
711
1722
msgstr ""
712
1723
713
#: builtin/add.c:413
1724
#: builtin/add.c:525
714
1725
#, c-format
715
1726
msgid "Nothing specified, nothing added.\n"
716
1727
msgstr ""
717
1728
718
#: builtin/add.c:414
1729
#: builtin/add.c:526
719
1730
#, c-format
720
1731
msgid "Maybe you wanted to say 'git add .'?\n"
721
1732
msgstr ""
722
1733
723
#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82
724
#: builtin/rm.c:162
1734
#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204
1735
#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235
725
1736
msgid "index file corrupt"
726
1737
msgstr ""
727
1738
728
#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260
1739
#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370
729
1740
msgid "Unable to write new index file"
730
1741
msgstr ""
731
1742
1743
#: builtin/apply.c:57
1744
msgid "git apply [options] [<patch>...]"
1745
msgstr ""
1746
1747
#: builtin/apply.c:110
1748
#, c-format
1749
msgid "unrecognized whitespace option '%s'"
1750
msgstr ""
1751
1752
#: builtin/apply.c:125
1753
#, c-format
1754
msgid "unrecognized whitespace ignore option '%s'"
1755
msgstr ""
1756
1757
#: builtin/apply.c:823
1758
#, c-format
1759
msgid "Cannot prepare timestamp regexp %s"
1760
msgstr ""
1761
1762
#: builtin/apply.c:832
1763
#, c-format
1764
msgid "regexec returned %d for input: %s"
1765
msgstr ""
1766
1767
#: builtin/apply.c:913
1768
#, c-format
1769
msgid "unable to find filename in patch at line %d"
1770
msgstr ""
1771
1772
#: builtin/apply.c:945
1773
#, c-format
1774
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1775
msgstr ""
1776
1777
#: builtin/apply.c:949
1778
#, c-format
1779
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1780
msgstr ""
1781
1782
#: builtin/apply.c:950
1783
#, c-format
1784
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1785
msgstr ""
1786
1787
#: builtin/apply.c:957
1788
#, c-format
1789
msgid "git apply: bad git-diff - expected /dev/null on line %d"
1790
msgstr ""
1791
1792
#: builtin/apply.c:1422
1793
#, c-format
1794
msgid "recount: unexpected line: %.*s"
1795
msgstr ""
1796
1797
#: builtin/apply.c:1479
1798
#, c-format
1799
msgid "patch fragment without header at line %d: %.*s"
1800
msgstr ""
1801
1802
#: builtin/apply.c:1496
1803
#, c-format
1804
msgid ""
1805
"git diff header lacks filename information when removing %d leading pathname "
1806
"component (line %d)"
1807
msgid_plural ""
1808
"git diff header lacks filename information when removing %d leading pathname "
1809
"components (line %d)"
1810
msgstr[0] ""
1811
msgstr[1] ""
1812
1813
#: builtin/apply.c:1656
1814
msgid "new file depends on old contents"
1815
msgstr ""
1816
1817
#: builtin/apply.c:1658
1818
msgid "deleted file still has contents"
1819
msgstr ""
1820
1821
#: builtin/apply.c:1684
1822
#, c-format
1823
msgid "corrupt patch at line %d"
1824
msgstr ""
1825
1826
#: builtin/apply.c:1720
1827
#, c-format
1828
msgid "new file %s depends on old contents"
1829
msgstr ""
1830
1831
#: builtin/apply.c:1722
1832
#, c-format
1833
msgid "deleted file %s still has contents"
1834
msgstr ""
1835
1836
#: builtin/apply.c:1725
1837
#, c-format
1838
msgid "** warning: file %s becomes empty but is not deleted"
1839
msgstr ""
1840
1841
#: builtin/apply.c:1871
1842
#, c-format
1843
msgid "corrupt binary patch at line %d: %.*s"
1844
msgstr ""
1845
1846
#. there has to be one hunk (forward hunk)
1847
#: builtin/apply.c:1900
1848
#, c-format
1849
msgid "unrecognized binary patch at line %d"
1850
msgstr ""
1851
1852
#: builtin/apply.c:1986
1853
#, c-format
1854
msgid "patch with only garbage at line %d"
1855
msgstr ""
1856
1857
#: builtin/apply.c:2076
1858
#, c-format
1859
msgid "unable to read symlink %s"
1860
msgstr ""
1861
1862
#: builtin/apply.c:2080
1863
#, c-format
1864
msgid "unable to open or read %s"
1865
msgstr ""
1866
1867
#: builtin/apply.c:2688
1868
#, c-format
1869
msgid "invalid start of line: '%c'"
1870
msgstr ""
1871
1872
#: builtin/apply.c:2806
1873
#, c-format
1874
msgid "Hunk #%d succeeded at %d (offset %d line)."
1875
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1876
msgstr[0] ""
1877
msgstr[1] ""
1878
1879
#: builtin/apply.c:2818
1880
#, c-format
1881
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1882
msgstr ""
1883
1884
#: builtin/apply.c:2824
1885
#, c-format
1886
msgid ""
1887
"while searching for:\n"
1888
"%.*s"
1889
msgstr ""
1890
1891
#: builtin/apply.c:2843
1892
#, c-format
1893
msgid "missing binary patch data for '%s'"
1894
msgstr ""
1895
1896
#: builtin/apply.c:2946
1897
#, c-format
1898
msgid "binary patch does not apply to '%s'"
1899
msgstr ""
1900
1901
#: builtin/apply.c:2952
1902
#, c-format
1903
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1904
msgstr ""
1905
1906
#: builtin/apply.c:2973
1907
#, c-format
1908
msgid "patch failed: %s:%ld"
1909
msgstr ""
1910
1911
#: builtin/apply.c:3095
1912
#, c-format
1913
msgid "cannot checkout %s"
1914
msgstr ""
1915
1916
#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193
1917
#, c-format
1918
msgid "read of %s failed"
1919
msgstr ""
1920
1921
#: builtin/apply.c:3173 builtin/apply.c:3395
1922
#, c-format
1923
msgid "path %s has been renamed/deleted"
1924
msgstr ""
1925
1926
#: builtin/apply.c:3254 builtin/apply.c:3409
1927
#, c-format
1928
msgid "%s: does not exist in index"
1929
msgstr ""
1930
1931
#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423
1932
#, c-format
1933
msgid "%s: %s"
1934
msgstr ""
1935
1936
#: builtin/apply.c:3263 builtin/apply.c:3417
1937
#, c-format
1938
msgid "%s: does not match index"
1939
msgstr ""
1940
1941
#: builtin/apply.c:3365
1942
msgid "removal patch leaves file contents"
1943
msgstr ""
1944
1945
#: builtin/apply.c:3434
1946
#, c-format
1947
msgid "%s: wrong type"
1948
msgstr ""
1949
1950
#: builtin/apply.c:3436
1951
#, c-format
1952
msgid "%s has type %o, expected %o"
1953
msgstr ""
1954
1955
#: builtin/apply.c:3537
1956
#, c-format
1957
msgid "%s: already exists in index"
1958
msgstr ""
1959
1960
#: builtin/apply.c:3540
1961
#, c-format
1962
msgid "%s: already exists in working directory"
1963
msgstr ""
1964
1965
#: builtin/apply.c:3560
1966
#, c-format
1967
msgid "new mode (%o) of %s does not match old mode (%o)"
1968
msgstr ""
1969
1970
#: builtin/apply.c:3565
1971
#, c-format
1972
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1973
msgstr ""
1974
1975
#: builtin/apply.c:3573
1976
#, c-format
1977
msgid "%s: patch does not apply"
1978
msgstr ""
1979
1980
#: builtin/apply.c:3586
1981
#, c-format
1982
msgid "Checking patch %s..."
1983
msgstr ""
1984
1985
#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124
1986
#, c-format
1987
msgid "make_cache_entry failed for path '%s'"
1988
msgstr ""
1989
1990
#: builtin/apply.c:3822
1991
#, c-format
1992
msgid "unable to remove %s from index"
1993
msgstr ""
1994
1995
#: builtin/apply.c:3850
1996
#, c-format
1997
msgid "corrupt patch for subproject %s"
1998
msgstr ""
1999
2000
#: builtin/apply.c:3854
2001
#, c-format
2002
msgid "unable to stat newly created file '%s'"
2003
msgstr ""
2004
2005
#: builtin/apply.c:3859
2006
#, c-format
2007
msgid "unable to create backing store for newly created file %s"
2008
msgstr ""
2009
2010
#: builtin/apply.c:3862 builtin/apply.c:3970
2011
#, c-format
2012
msgid "unable to add cache entry for %s"
2013
msgstr ""
2014
2015
#: builtin/apply.c:3895
2016
#, c-format
2017
msgid "closing file '%s'"
2018
msgstr ""
2019
2020
#: builtin/apply.c:3944
2021
#, c-format
2022
msgid "unable to write file '%s' mode %o"
2023
msgstr ""
2024
2025
#: builtin/apply.c:4031
2026
#, c-format
2027
msgid "Applied patch %s cleanly."
2028
msgstr ""
2029
2030
#: builtin/apply.c:4039
2031
msgid "internal error"
2032
msgstr ""
2033
2034
#. Say this even without --verbose
2035
#: builtin/apply.c:4042
2036
#, c-format
2037
msgid "Applying patch %%s with %d reject..."
2038
msgid_plural "Applying patch %%s with %d rejects..."
2039
msgstr[0] ""
2040
msgstr[1] ""
2041
2042
#: builtin/apply.c:4052
2043
#, c-format
2044
msgid "truncating .rej filename to %.*s.rej"
2045
msgstr ""
2046
2047
#: builtin/apply.c:4073
2048
#, c-format
2049
msgid "Hunk #%d applied cleanly."
2050
msgstr ""
2051
2052
#: builtin/apply.c:4076
2053
#, c-format
2054
msgid "Rejected hunk #%d."
2055
msgstr ""
2056
2057
#: builtin/apply.c:4226
2058
msgid "unrecognized input"
2059
msgstr ""
2060
2061
#: builtin/apply.c:4237
2062
msgid "unable to read index file"
2063
msgstr ""
2064
2065
#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92
2066
#: builtin/fetch.c:63
2067
msgid "path"
2068
msgstr ""
2069
2070
#: builtin/apply.c:4357
2071
msgid "don't apply changes matching the given path"
2072
msgstr ""
2073
2074
#: builtin/apply.c:4360
2075
msgid "apply changes matching the given path"
2076
msgstr ""
2077
2078
#: builtin/apply.c:4362
2079
msgid "num"
2080
msgstr ""
2081
2082
#: builtin/apply.c:4363
2083
msgid "remove <num> leading slashes from traditional diff paths"
2084
msgstr ""
2085
2086
#: builtin/apply.c:4366
2087
msgid "ignore additions made by the patch"
2088
msgstr ""
2089
2090
#: builtin/apply.c:4368
2091
msgid "instead of applying the patch, output diffstat for the input"
2092
msgstr ""
2093
2094
#: builtin/apply.c:4372
2095
msgid "show number of added and deleted lines in decimal notation"
2096
msgstr ""
2097
2098
#: builtin/apply.c:4374
2099
msgid "instead of applying the patch, output a summary for the input"
2100
msgstr ""
2101
2102
#: builtin/apply.c:4376
2103
msgid "instead of applying the patch, see if the patch is applicable"
2104
msgstr ""
2105
2106
#: builtin/apply.c:4378
2107
msgid "make sure the patch is applicable to the current index"
2108
msgstr ""
2109
2110
#: builtin/apply.c:4380
2111
msgid "apply a patch without touching the working tree"
2112
msgstr ""
2113
2114
#: builtin/apply.c:4382
2115
msgid "also apply the patch (use with --stat/--summary/--check)"
2116
msgstr ""
2117
2118
#: builtin/apply.c:4384
2119
msgid "attempt three-way merge if a patch does not apply"
2120
msgstr ""
2121
2122
#: builtin/apply.c:4386
2123
msgid "build a temporary index based on embedded index information"
2124
msgstr ""
2125
2126
#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456
2127
msgid "paths are separated with NUL character"
2128
msgstr ""
2129
2130
#: builtin/apply.c:4391
2131
msgid "ensure at least <n> lines of context match"
2132
msgstr ""
2133
2134
#: builtin/apply.c:4392
2135
msgid "action"
2136
msgstr ""
2137
2138
#: builtin/apply.c:4393
2139
msgid "detect new or modified lines that have whitespace errors"
2140
msgstr ""
2141
2142
#: builtin/apply.c:4396 builtin/apply.c:4399
2143
msgid "ignore changes in whitespace when finding context"
2144
msgstr ""
2145
2146
#: builtin/apply.c:4402
2147
msgid "apply the patch in reverse"
2148
msgstr ""
2149
2150
#: builtin/apply.c:4404
2151
msgid "don't expect at least one line of context"
2152
msgstr ""
2153
2154
#: builtin/apply.c:4406
2155
msgid "leave the rejected hunks in corresponding *.rej files"
2156
msgstr ""
2157
2158
#: builtin/apply.c:4408
2159
msgid "allow overlapping hunks"
2160
msgstr ""
2161
2162
#: builtin/apply.c:4411
2163
msgid "tolerate incorrectly detected missing new-line at the end of file"
2164
msgstr ""
2165
2166
#: builtin/apply.c:4414
2167
msgid "do not trust the line counts in the hunk headers"
2168
msgstr ""
2169
2170
#: builtin/apply.c:4416
2171
msgid "root"
2172
msgstr ""
2173
2174
#: builtin/apply.c:4417
2175
msgid "prepend <root> to all filenames"
2176
msgstr ""
2177
2178
#: builtin/apply.c:4439
2179
msgid "--3way outside a repository"
2180
msgstr ""
2181
2182
#: builtin/apply.c:4447
2183
msgid "--index outside a repository"
2184
msgstr ""
2185
2186
#: builtin/apply.c:4450
2187
msgid "--cached outside a repository"
2188
msgstr ""
2189
2190
#: builtin/apply.c:4466
2191
#, c-format
2192
msgid "can't open patch '%s'"
2193
msgstr ""
2194
2195
#: builtin/apply.c:4480
2196
#, c-format
2197
msgid "squelched %d whitespace error"
2198
msgid_plural "squelched %d whitespace errors"
2199
msgstr[0] ""
2200
msgstr[1] ""
2201
2202
#: builtin/apply.c:4486 builtin/apply.c:4496
2203
#, c-format
2204
msgid "%d line adds whitespace errors."
2205
msgid_plural "%d lines add whitespace errors."
2206
msgstr[0] ""
2207
msgstr[1] ""
2208
732
2209
#: builtin/archive.c:17
733
2210
#, c-format
734
2211
msgid "could not create archive file '%s'"
746
2223
msgid "git archive: expected ACK/NAK, got EOF"
747
2224
msgstr ""
748
2225
2226
#: builtin/archive.c:61
2227
#, c-format
2228
msgid "git archive: NACK %s"
2229
msgstr ""
2230
749
2231
#: builtin/archive.c:63
750
2232
#, c-format
751
msgid "git archive: NACK %s"
752
msgstr ""
753
754
#: builtin/archive.c:65
755
#, c-format
756
2233
msgid "remote error: %s"
757
2234
msgstr ""
758
2235
759
#: builtin/archive.c:66
2236
#: builtin/archive.c:64
760
2237
msgid "git archive: protocol error"
761
2238
msgstr ""
762
2239
763
#: builtin/archive.c:71
2240
#: builtin/archive.c:68
764
2241
msgid "git archive: expected a flush"
765
2242
msgstr ""
766
2243
767
#: builtin/branch.c:137
2244
#: builtin/bisect--helper.c:7
2245
msgid "git bisect--helper --next-all [--no-checkout]"
2246
msgstr ""
2247
2248
#: builtin/bisect--helper.c:17
2249
msgid "perform 'git bisect next'"
2250
msgstr ""
2251
2252
#: builtin/bisect--helper.c:19
2253
msgid "update BISECT_HEAD instead of checking out the current commit"
2254
msgstr ""
2255
2256
#: builtin/blame.c:25
2257
msgid "git blame [options] [rev-opts] [rev] [--] file"
2258
msgstr ""
2259
2260
#: builtin/blame.c:30
2261
msgid "[rev-opts] are documented in git-rev-list(1)"
2262
msgstr ""
2263
2264
#: builtin/blame.c:2355
2265
msgid "Show blame entries as we find them, incrementally"
2266
msgstr ""
2267
2268
#: builtin/blame.c:2356
2269
msgid "Show blank SHA-1 for boundary commits (Default: off)"
2270
msgstr ""
2271
2272
#: builtin/blame.c:2357
2273
msgid "Do not treat root commits as boundaries (Default: off)"
2274
msgstr ""
2275
2276
#: builtin/blame.c:2358
2277
msgid "Show work cost statistics"
2278
msgstr ""
2279
2280
#: builtin/blame.c:2359
2281
msgid "Show output score for blame entries"
2282
msgstr ""
2283
2284
#: builtin/blame.c:2360
2285
msgid "Show original filename (Default: auto)"
2286
msgstr ""
2287
2288
#: builtin/blame.c:2361
2289
msgid "Show original linenumber (Default: off)"
2290
msgstr ""
2291
2292
#: builtin/blame.c:2362
2293
msgid "Show in a format designed for machine consumption"
2294
msgstr ""
2295
2296
#: builtin/blame.c:2363
2297
msgid "Show porcelain format with per-line commit information"
2298
msgstr ""
2299
2300
#: builtin/blame.c:2364
2301
msgid "Use the same output mode as git-annotate (Default: off)"
2302
msgstr ""
2303
2304
#: builtin/blame.c:2365
2305
msgid "Show raw timestamp (Default: off)"
2306
msgstr ""
2307
2308
#: builtin/blame.c:2366
2309
msgid "Show long commit SHA1 (Default: off)"
2310
msgstr ""
2311
2312
#: builtin/blame.c:2367
2313
msgid "Suppress author name and timestamp (Default: off)"
2314
msgstr ""
2315
2316
#: builtin/blame.c:2368
2317
msgid "Show author email instead of name (Default: off)"
2318
msgstr ""
2319
2320
#: builtin/blame.c:2369
2321
msgid "Ignore whitespace differences"
2322
msgstr ""
2323
2324
#: builtin/blame.c:2370
2325
msgid "Spend extra cycles to find better match"
2326
msgstr ""
2327
2328
#: builtin/blame.c:2371
2329
msgid "Use revisions from <file> instead of calling git-rev-list"
2330
msgstr ""
2331
2332
#: builtin/blame.c:2372
2333
msgid "Use <file>'s contents as the final image"
2334
msgstr ""
2335
2336
#: builtin/blame.c:2373 builtin/blame.c:2374
2337
msgid "score"
2338
msgstr ""
2339
2340
#: builtin/blame.c:2373
2341
msgid "Find line copies within and across files"
2342
msgstr ""
2343
2344
#: builtin/blame.c:2374
2345
msgid "Find line movements within and across files"
2346
msgstr ""
2347
2348
#: builtin/blame.c:2375
2349
msgid "n,m"
2350
msgstr ""
2351
2352
#: builtin/blame.c:2375
2353
msgid "Process only line range n,m, counting from 1"
2354
msgstr ""
2355
2356
#: builtin/branch.c:24
2357
msgid "git branch [options] [-r | -a] [--merged | --no-merged]"
2358
msgstr ""
2359
2360
#: builtin/branch.c:25
2361
msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"
2362
msgstr ""
2363
2364
#: builtin/branch.c:26
2365
msgid "git branch [options] [-r] (-d | -D) <branchname>..."
2366
msgstr ""
2367
2368
#: builtin/branch.c:27
2369
msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"
2370
msgstr ""
2371
2372
#: builtin/branch.c:150
768
2373
#, c-format
769
2374
msgid ""
770
2375
"deleting branch '%s' that has been merged to\n"
771
2376
" '%s', but not yet merged to HEAD."
772
2377
msgstr ""
773
2378
774
#: builtin/branch.c:141
2379
#: builtin/branch.c:154
775
2380
#, c-format
776
2381
msgid ""
777
2382
"not deleting branch '%s' that is not yet merged to\n"
778
2383
" '%s', even though it is merged to HEAD."
779
2384
msgstr ""
780
2385
781
#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
782
#: builtin/branch.c:163
783
msgid "remote "
784
msgstr ""
785
786
#: builtin/branch.c:171
787
msgid "cannot use -a with -d"
788
msgstr ""
789
790
#: builtin/branch.c:177
791
msgid "Couldn't look up commit object for HEAD"
792
msgstr ""
793
794
#: builtin/branch.c:182
795
#, c-format
796
msgid "Cannot delete the branch '%s' which you are currently on."
797
msgstr ""
798
799
#: builtin/branch.c:192
800
#, c-format
801
msgid "%sbranch '%s' not found."
802
msgstr ""
803
804
#: builtin/branch.c:200
2386
#: builtin/branch.c:168
805
2387
#, c-format
806
2388
msgid "Couldn't look up commit object for '%s'"
807
2389
msgstr ""
808
2390
809
#: builtin/branch.c:206
2391
#: builtin/branch.c:172
810
2392
#, c-format
811
2393
msgid ""
812
2394
"The branch '%s' is not fully merged.\n"
813
2395
"If you are sure you want to delete it, run 'git branch -D %s'."
814
2396
msgstr ""
815
2397
816
#: builtin/branch.c:214
817
#, c-format
818
msgid "Error deleting %sbranch '%s'"
2398
#: builtin/branch.c:185
2399
msgid "Update of config-file failed"
2400
msgstr ""
2401
2402
#: builtin/branch.c:213
2403
msgid "cannot use -a with -d"
819
2404
msgstr ""
820
2405
821
2406
#: builtin/branch.c:219
822
#, c-format
823
msgid "Deleted %sbranch %s (was %s).\n"
824
msgstr ""
825
826
#: builtin/branch.c:224
827
msgid "Update of config-file failed"
828
msgstr ""
829
830
#: builtin/branch.c:322
2407
msgid "Couldn't look up commit object for HEAD"
2408
msgstr ""
2409
2410
#: builtin/branch.c:227
2411
#, c-format
2412
msgid "Cannot delete the branch '%s' which you are currently on."
2413
msgstr ""
2414
2415
#: builtin/branch.c:240
2416
#, c-format
2417
msgid "remote branch '%s' not found."
2418
msgstr ""
2419
2420
#: builtin/branch.c:241
2421
#, c-format
2422
msgid "branch '%s' not found."
2423
msgstr ""
2424
2425
#: builtin/branch.c:255
2426
#, c-format
2427
msgid "Error deleting remote branch '%s'"
2428
msgstr ""
2429
2430
#: builtin/branch.c:256
2431
#, c-format
2432
msgid "Error deleting branch '%s'"
2433
msgstr ""
2434
2435
#: builtin/branch.c:263
2436
#, c-format
2437
msgid "Deleted remote branch %s (was %s).\n"
2438
msgstr ""
2439
2440
#: builtin/branch.c:264
2441
#, c-format
2442
msgid "Deleted branch %s (was %s).\n"
2443
msgstr ""
2444
2445
#: builtin/branch.c:366
831
2446
#, c-format
832
2447
msgid "branch '%s' does not point at a commit"
833
2448
msgstr ""
834
2449
835
#: builtin/branch.c:394
836
#, c-format
837
msgid "behind %d] "
838
msgstr ""
839
840
#: builtin/branch.c:396
841
#, c-format
842
msgid "ahead %d] "
843
msgstr ""
844
845
#: builtin/branch.c:398
846
#, c-format
847
msgid "ahead %d, behind %d] "
848
msgstr ""
849
850
#: builtin/branch.c:501
2450
#: builtin/branch.c:453
2451
#, c-format
2452
msgid "[%s: behind %d]"
2453
msgstr ""
2454
2455
#: builtin/branch.c:455
2456
#, c-format
2457
msgid "[behind %d]"
2458
msgstr ""
2459
2460
#: builtin/branch.c:459
2461
#, c-format
2462
msgid "[%s: ahead %d]"
2463
msgstr ""
2464
2465
#: builtin/branch.c:461
2466
#, c-format
2467
msgid "[ahead %d]"
2468
msgstr ""
2469
2470
#: builtin/branch.c:464
2471
#, c-format
2472
msgid "[%s: ahead %d, behind %d]"
2473
msgstr ""
2474
2475
#: builtin/branch.c:467
2476
#, c-format
2477
msgid "[ahead %d, behind %d]"
2478
msgstr ""
2479
2480
#: builtin/branch.c:490
2481
msgid " **** invalid ref ****"
2482
msgstr ""
2483
2484
#: builtin/branch.c:582
2485
#, c-format
2486
msgid "(no branch, rebasing %s)"
2487
msgstr ""
2488
2489
#: builtin/branch.c:585
2490
#, c-format
2491
msgid "(no branch, bisect started on %s)"
2492
msgstr ""
2493
2494
#: builtin/branch.c:588
2495
#, c-format
2496
msgid "(detached from %s)"
2497
msgstr ""
2498
2499
#: builtin/branch.c:591
851
2500
msgid "(no branch)"
852
2501
msgstr ""
853
2502
854
#: builtin/branch.c:566
2503
#: builtin/branch.c:637
2504
#, c-format
2505
msgid "object '%s' does not point to a commit"
2506
msgstr ""
2507
2508
#: builtin/branch.c:669
855
2509
msgid "some refs could not be read"
856
2510
msgstr ""
857
2511
858
#: builtin/branch.c:579
2512
#: builtin/branch.c:682
859
2513
msgid "cannot rename the current branch while not on any."
860
2514
msgstr ""
861
2515
862
#: builtin/branch.c:589
2516
#: builtin/branch.c:692
863
2517
#, c-format
864
2518
msgid "Invalid branch name: '%s'"
865
2519
msgstr ""
866
2520
867
#: builtin/branch.c:604
2521
#: builtin/branch.c:707
868
2522
msgid "Branch rename failed"
869
2523
msgstr ""
870
2524
871
#: builtin/branch.c:608
2525
#: builtin/branch.c:711
872
2526
#, c-format
873
2527
msgid "Renamed a misnamed branch '%s' away"
874
2528
msgstr ""
875
2529
876
#: builtin/branch.c:612
2530
#: builtin/branch.c:715
877
2531
#, c-format
878
2532
msgid "Branch renamed to %s, but HEAD is not updated!"
879
2533
msgstr ""
880
2534
881
#: builtin/branch.c:619
2535
#: builtin/branch.c:722
882
2536
msgid "Branch is renamed, but update of config-file failed"
883
2537
msgstr ""
884
2538
885
#: builtin/branch.c:634
2539
#: builtin/branch.c:737
886
2540
#, c-format
887
2541
msgid "malformed object name %s"
888
2542
msgstr ""
889
2543
890
#: builtin/branch.c:658
2544
#: builtin/branch.c:761
891
2545
#, c-format
892
msgid "could not write branch description template: %s\n"
893
msgstr ""
894
895
#: builtin/branch.c:746
2546
msgid "could not write branch description template: %s"
2547
msgstr ""
2548
2549
#: builtin/branch.c:791
2550
msgid "Generic options"
2551
msgstr ""
2552
2553
#: builtin/branch.c:793
2554
msgid "show hash and subject, give twice for upstream branch"
2555
msgstr ""
2556
2557
#: builtin/branch.c:794
2558
msgid "suppress informational messages"
2559
msgstr ""
2560
2561
#: builtin/branch.c:795
2562
msgid "set up tracking mode (see git-pull(1))"
2563
msgstr ""
2564
2565
#: builtin/branch.c:797
2566
msgid "change upstream info"
2567
msgstr ""
2568
2569
#: builtin/branch.c:801
2570
msgid "use colored output"
2571
msgstr ""
2572
2573
#: builtin/branch.c:802
2574
msgid "act on remote-tracking branches"
2575
msgstr ""
2576
2577
#: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832
2578
#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369
2579
#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468
2580
msgid "commit"
2581
msgstr ""
2582
2583
#: builtin/branch.c:806 builtin/branch.c:812
2584
msgid "print only branches that contain the commit"
2585
msgstr ""
2586
2587
#: builtin/branch.c:818
2588
msgid "Specific git-branch actions:"
2589
msgstr ""
2590
2591
#: builtin/branch.c:819
2592
msgid "list both remote-tracking and local branches"
2593
msgstr ""
2594
2595
#: builtin/branch.c:821
2596
msgid "delete fully merged branch"
2597
msgstr ""
2598
2599
#: builtin/branch.c:822
2600
msgid "delete branch (even if not merged)"
2601
msgstr ""
2602
2603
#: builtin/branch.c:823
2604
msgid "move/rename a branch and its reflog"
2605
msgstr ""
2606
2607
#: builtin/branch.c:824
2608
msgid "move/rename a branch, even if target exists"
2609
msgstr ""
2610
2611
#: builtin/branch.c:825
2612
msgid "list branch names"
2613
msgstr ""
2614
2615
#: builtin/branch.c:826
2616
msgid "create the branch's reflog"
2617
msgstr ""
2618
2619
#: builtin/branch.c:828
2620
msgid "edit the description for the branch"
2621
msgstr ""
2622
2623
#: builtin/branch.c:829
2624
msgid "force creation (when already exists)"
2625
msgstr ""
2626
2627
#: builtin/branch.c:832
2628
msgid "print only not merged branches"
2629
msgstr ""
2630
2631
#: builtin/branch.c:838
2632
msgid "print only merged branches"
2633
msgstr ""
2634
2635
#: builtin/branch.c:842
2636
msgid "list branches in columns"
2637
msgstr ""
2638
2639
#: builtin/branch.c:855
896
2640
msgid "Failed to resolve HEAD as a valid ref."
897
2641
msgstr ""
898
2642
899
#: builtin/branch.c:751 builtin/clone.c:558
2643
#: builtin/branch.c:860 builtin/clone.c:619
900
2644
msgid "HEAD not found below refs/heads!"
901
2645
msgstr ""
902
2646
903
#: builtin/branch.c:809
2647
#: builtin/branch.c:883
2648
msgid "--column and --verbose are incompatible"
2649
msgstr ""
2650
2651
#: builtin/branch.c:889 builtin/branch.c:928
2652
msgid "branch name required"
2653
msgstr ""
2654
2655
#: builtin/branch.c:904
2656
msgid "Cannot give description to detached HEAD"
2657
msgstr ""
2658
2659
#: builtin/branch.c:909
2660
msgid "cannot edit description of more than one branch"
2661
msgstr ""
2662
2663
#: builtin/branch.c:916
2664
#, c-format
2665
msgid "No commit on branch '%s' yet."
2666
msgstr ""
2667
2668
#: builtin/branch.c:919
2669
#, c-format
2670
msgid "No branch named '%s'."
2671
msgstr ""
2672
2673
#: builtin/branch.c:934
2674
msgid "too many branches for a rename operation"
2675
msgstr ""
2676
2677
#: builtin/branch.c:939
2678
msgid "too many branches to set new upstream"
2679
msgstr ""
2680
2681
#: builtin/branch.c:943
2682
#, c-format
2683
msgid ""
2684
"could not set upstream of HEAD to %s when it does not point to any branch."
2685
msgstr ""
2686
2687
#: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990
2688
#, c-format
2689
msgid "no such branch '%s'"
2690
msgstr ""
2691
2692
#: builtin/branch.c:950
2693
#, c-format
2694
msgid "branch '%s' does not exist"
2695
msgstr ""
2696
2697
#: builtin/branch.c:962
2698
msgid "too many branches to unset upstream"
2699
msgstr ""
2700
2701
#: builtin/branch.c:966
2702
msgid "could not unset upstream of HEAD when it does not point to any branch."
2703
msgstr ""
2704
2705
#: builtin/branch.c:972
2706
#, c-format
2707
msgid "Branch '%s' has no upstream information"
2708
msgstr ""
2709
2710
#: builtin/branch.c:987
2711
msgid "it does not make sense to create 'HEAD' manually"
2712
msgstr ""
2713
2714
#: builtin/branch.c:993
904
2715
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
905
2716
msgstr ""
906
2717
2718
#: builtin/branch.c:996
2719
#, c-format
2720
msgid ""
2721
"The --set-upstream flag is deprecated and will be removed. Consider using --"
2722
"track or --set-upstream-to\n"
2723
msgstr ""
2724
2725
#: builtin/branch.c:1013
2726
#, c-format
2727
msgid ""
2728
"\n"
2729
"If you wanted to make '%s' track '%s', do this:\n"
2730
"\n"
2731
msgstr ""
2732
2733
#: builtin/branch.c:1014
2734
#, c-format
2735
msgid " git branch -d %s\n"
2736
msgstr ""
2737
2738
#: builtin/branch.c:1015
2739
#, c-format
2740
msgid " git branch --set-upstream-to %s\n"
2741
msgstr ""
2742
907
2743
#: builtin/bundle.c:47
908
2744
#, c-format
909
2745
msgid "%s is okay\n"
917
2753
msgid "Need a repository to unbundle."
918
2754
msgstr ""
919
2755
920
#: builtin/checkout.c:113 builtin/checkout.c:146
2756
#: builtin/cat-file.c:176
2757
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2758
msgstr ""
2759
2760
#: builtin/cat-file.c:177
2761
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2762
msgstr ""
2763
2764
#: builtin/cat-file.c:195
2765
msgid "<type> can be one of: blob, tree, commit, tag"
2766
msgstr ""
2767
2768
#: builtin/cat-file.c:196
2769
msgid "show object type"
2770
msgstr ""
2771
2772
#: builtin/cat-file.c:197
2773
msgid "show object size"
2774
msgstr ""
2775
2776
#: builtin/cat-file.c:199
2777
msgid "exit with zero when there's no error"
2778
msgstr ""
2779
2780
#: builtin/cat-file.c:200
2781
msgid "pretty-print object's content"
2782
msgstr ""
2783
2784
#: builtin/cat-file.c:202
2785
msgid "for blob objects, run textconv on object's content"
2786
msgstr ""
2787
2788
#: builtin/cat-file.c:204
2789
msgid "show info and content of objects fed from the standard input"
2790
msgstr ""
2791
2792
#: builtin/cat-file.c:207
2793
msgid "show info about objects fed from the standard input"
2794
msgstr ""
2795
2796
#: builtin/check-attr.c:11
2797
msgid "git check-attr [-a | --all | attr...] [--] pathname..."
2798
msgstr ""
2799
2800
#: builtin/check-attr.c:12
2801
msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"
2802
msgstr ""
2803
2804
#: builtin/check-attr.c:19
2805
msgid "report all attributes set on file"
2806
msgstr ""
2807
2808
#: builtin/check-attr.c:20
2809
msgid "use .gitattributes only from the index"
2810
msgstr ""
2811
2812
#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75
2813
msgid "read file names from stdin"
2814
msgstr ""
2815
2816
#: builtin/check-attr.c:23 builtin/check-ignore.c:24
2817
msgid "input paths are terminated by a null character"
2818
msgstr ""
2819
2820
#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177
2821
msgid "suppress progress reporting"
2822
msgstr ""
2823
2824
#: builtin/check-ignore.c:146
2825
msgid "cannot specify pathnames with --stdin"
2826
msgstr ""
2827
2828
#: builtin/check-ignore.c:149
2829
msgid "-z only makes sense with --stdin"
2830
msgstr ""
2831
2832
#: builtin/check-ignore.c:151
2833
msgid "no path specified"
2834
msgstr ""
2835
2836
#: builtin/check-ignore.c:155
2837
msgid "--quiet is only valid with a single pathname"
2838
msgstr ""
2839
2840
#: builtin/check-ignore.c:157
2841
msgid "cannot have both --quiet and --verbose"
2842
msgstr ""
2843
2844
#: builtin/checkout-index.c:126
2845
msgid "git checkout-index [options] [--] [<file>...]"
2846
msgstr ""
2847
2848
#: builtin/checkout-index.c:187
2849
msgid "check out all files in the index"
2850
msgstr ""
2851
2852
#: builtin/checkout-index.c:188
2853
msgid "force overwrite of existing files"
2854
msgstr ""
2855
2856
#: builtin/checkout-index.c:190
2857
msgid "no warning for existing files and files not in index"
2858
msgstr ""
2859
2860
#: builtin/checkout-index.c:192
2861
msgid "don't checkout new files"
2862
msgstr ""
2863
2864
#: builtin/checkout-index.c:194
2865
msgid "update stat information in the index file"
2866
msgstr ""
2867
2868
#: builtin/checkout-index.c:200
2869
msgid "read list of paths from the standard input"
2870
msgstr ""
2871
2872
#: builtin/checkout-index.c:202
2873
msgid "write the content to temporary files"
2874
msgstr ""
2875
2876
#: builtin/checkout-index.c:203 builtin/column.c:30
2877
msgid "string"
2878
msgstr ""
2879
2880
#: builtin/checkout-index.c:204
2881
msgid "when creating files, prepend <string>"
2882
msgstr ""
2883
2884
#: builtin/checkout-index.c:207
2885
msgid "copy out the files from named stage"
2886
msgstr ""
2887
2888
#: builtin/checkout.c:25
2889
msgid "git checkout [options] <branch>"
2890
msgstr ""
2891
2892
#: builtin/checkout.c:26
2893
msgid "git checkout [options] [<branch>] -- <file>..."
2894
msgstr ""
2895
2896
#: builtin/checkout.c:117 builtin/checkout.c:150
921
2897
#, c-format
922
2898
msgid "path '%s' does not have our version"
923
2899
msgstr ""
924
2900
925
#: builtin/checkout.c:115 builtin/checkout.c:148
2901
#: builtin/checkout.c:119 builtin/checkout.c:152
926
2902
#, c-format
927
2903
msgid "path '%s' does not have their version"
928
2904
msgstr ""
929
2905
930
#: builtin/checkout.c:131
2906
#: builtin/checkout.c:135
931
2907
#, c-format
932
2908
msgid "path '%s' does not have all necessary versions"
933
2909
msgstr ""
934
2910
935
#: builtin/checkout.c:175
2911
#: builtin/checkout.c:179
936
2912
#, c-format
937
2913
msgid "path '%s' does not have necessary versions"
938
2914
msgstr ""
939
2915
940
#: builtin/checkout.c:192
2916
#: builtin/checkout.c:196
941
2917
#, c-format
942
2918
msgid "path '%s': cannot merge"
943
2919
msgstr ""
944
2920
945
#: builtin/checkout.c:209
2921
#: builtin/checkout.c:213
946
2922
#, c-format
947
2923
msgid "Unable to add merge result for '%s'"
948
2924
msgstr ""
949
2925
950
#: builtin/checkout.c:212 builtin/reset.c:158
951
#, c-format
952
msgid "make_cache_entry failed for path '%s'"
953
msgstr ""
954
955
#: builtin/checkout.c:234 builtin/checkout.c:392
2926
#: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243
2927
#: builtin/checkout.c:246
2928
#, c-format
2929
msgid "'%s' cannot be used with updating paths"
2930
msgstr ""
2931
2932
#: builtin/checkout.c:249 builtin/checkout.c:252
2933
#, c-format
2934
msgid "'%s' cannot be used with %s"
2935
msgstr ""
2936
2937
#: builtin/checkout.c:255
2938
#, c-format
2939
msgid "Cannot update paths and switch to branch '%s' at the same time."
2940
msgstr ""
2941
2942
#: builtin/checkout.c:266 builtin/checkout.c:458
956
2943
msgid "corrupt index file"
957
2944
msgstr ""
958
2945
959
#: builtin/checkout.c:264 builtin/checkout.c:271
2946
#: builtin/checkout.c:329 builtin/checkout.c:336
960
2947
#, c-format
961
2948
msgid "path '%s' is unmerged"
962
2949
msgstr ""
963
2950
964
#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
965
#: builtin/merge.c:812
966
msgid "unable to write new index file"
967
msgstr ""
968
969
#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408
970
msgid "diff_setup_done failed"
971
msgstr ""
972
973
#: builtin/checkout.c:414
2951
#: builtin/checkout.c:480
974
2952
msgid "you need to resolve your current index first"
975
2953
msgstr ""
976
2954
977
#: builtin/checkout.c:533
2955
#: builtin/checkout.c:601
978
2956
#, c-format
979
2957
msgid "Can not do reflog for '%s'\n"
980
2958
msgstr ""
981
2959
982
#: builtin/checkout.c:565
2960
#: builtin/checkout.c:634
983
2961
msgid "HEAD is now at"
984
2962
msgstr ""
985
2963
986
#: builtin/checkout.c:572
2964
#: builtin/checkout.c:641
987
2965
#, c-format
988
2966
msgid "Reset branch '%s'\n"
989
2967
msgstr ""
990
2968
991
#: builtin/checkout.c:575
2969
#: builtin/checkout.c:644
992
2970
#, c-format
993
2971
msgid "Already on '%s'\n"
994
2972
msgstr ""
995
2973
996
#: builtin/checkout.c:579
2974
#: builtin/checkout.c:648
997
2975
#, c-format
998
2976
msgid "Switched to and reset branch '%s'\n"
999
2977
msgstr ""
1000
2978
1001
#: builtin/checkout.c:581
2979
#: builtin/checkout.c:650 builtin/checkout.c:987
1002
2980
#, c-format
1003
2981
msgid "Switched to a new branch '%s'\n"
1004
2982
msgstr ""
1005
2983
1006
#: builtin/checkout.c:583
2984
#: builtin/checkout.c:652
1007
2985
#, c-format
1008
2986
msgid "Switched to branch '%s'\n"
1009
2987
msgstr ""
1010
2988
1011
#: builtin/checkout.c:639
2989
#: builtin/checkout.c:708
1012
2990
#, c-format
1013
2991
msgid " ... and %d more.\n"
1014
2992
msgstr ""
1015
2993
1016
2994
#. The singular version
1017
#: builtin/checkout.c:645
2995
#: builtin/checkout.c:714
1018
2996
#, c-format
1019
2997
msgid ""
1020
2998
"Warning: you are leaving %d commit behind, not connected to\n"
1029
3007
msgstr[0] ""
1030
3008
msgstr[1] ""
1031
3009
1032
#: builtin/checkout.c:663
3010
#: builtin/checkout.c:732
1033
3011
#, c-format
1034
3012
msgid ""
1035
3013
"If you want to keep them by creating a new branch, this may be a good time\n"
1039
3017
"\n"
1040
3018
msgstr ""
1041
3019
1042
#: builtin/checkout.c:693
3020
#: builtin/checkout.c:762
1043
3021
msgid "internal error in revision walk"
1044
3022
msgstr ""
1045
3023
1046
#: builtin/checkout.c:697
3024
#: builtin/checkout.c:766
1047
3025
msgid "Previous HEAD position was"
1048
3026
msgstr ""
1049
3027
1050
#: builtin/checkout.c:723
3028
#: builtin/checkout.c:793 builtin/checkout.c:982
1051
3029
msgid "You are on a branch yet to be born"
1052
3030
msgstr ""
1053
3031
1054
3032
#. case (1)
1055
#: builtin/checkout.c:854
3033
#: builtin/checkout.c:918
1056
3034
#, c-format
1057
3035
msgid "invalid reference: %s"
1058
3036
msgstr ""
1059
3037
1060
3038
#. case (1): want a tree
1061
#: builtin/checkout.c:893
3039
#: builtin/checkout.c:957
1062
3040
#, c-format
1063
3041
msgid "reference is not a tree: %s"
1064
3042
msgstr ""
1065
3043
1066
#: builtin/checkout.c:973
1067
msgid "-B cannot be used with -b"
1068
msgstr ""
1069
1070
#: builtin/checkout.c:982
1071
msgid "--patch is incompatible with all other options"
1072
msgstr ""
1073
1074
#: builtin/checkout.c:985
1075
msgid "--detach cannot be used with -b/-B/--orphan"
1076
msgstr ""
1077
1078
#: builtin/checkout.c:987
1079
msgid "--detach cannot be used with -t"
1080
msgstr ""
1081
1082
#: builtin/checkout.c:993
3044
#: builtin/checkout.c:996
3045
msgid "paths cannot be used with switching branches"
3046
msgstr ""
3047
3048
#: builtin/checkout.c:999 builtin/checkout.c:1003
3049
#, c-format
3050
msgid "'%s' cannot be used with switching branches"
3051
msgstr ""
3052
3053
#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015
3054
#: builtin/checkout.c:1018
3055
#, c-format
3056
msgid "'%s' cannot be used with '%s'"
3057
msgstr ""
3058
3059
#: builtin/checkout.c:1023
3060
#, c-format
3061
msgid "Cannot switch branch to a non-commit '%s'"
3062
msgstr ""
3063
3064
#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90
3065
#: builtin/remote.c:169 builtin/remote.c:171
3066
msgid "branch"
3067
msgstr ""
3068
3069
#: builtin/checkout.c:1046
3070
msgid "create and checkout a new branch"
3071
msgstr ""
3072
3073
#: builtin/checkout.c:1048
3074
msgid "create/reset and checkout a branch"
3075
msgstr ""
3076
3077
#: builtin/checkout.c:1049
3078
msgid "create reflog for new branch"
3079
msgstr ""
3080
3081
#: builtin/checkout.c:1050
3082
msgid "detach the HEAD at named commit"
3083
msgstr ""
3084
3085
#: builtin/checkout.c:1051
3086
msgid "set upstream info for new branch"
3087
msgstr ""
3088
3089
#: builtin/checkout.c:1053
3090
msgid "new branch"
3091
msgstr ""
3092
3093
#: builtin/checkout.c:1053
3094
msgid "new unparented branch"
3095
msgstr ""
3096
3097
#: builtin/checkout.c:1054
3098
msgid "checkout our version for unmerged files"
3099
msgstr ""
3100
3101
#: builtin/checkout.c:1056
3102
msgid "checkout their version for unmerged files"
3103
msgstr ""
3104
3105
#: builtin/checkout.c:1058
3106
msgid "force checkout (throw away local modifications)"
3107
msgstr ""
3108
3109
#: builtin/checkout.c:1059
3110
msgid "perform a 3-way merge with the new branch"
3111
msgstr ""
3112
3113
#: builtin/checkout.c:1060 builtin/merge.c:217
3114
msgid "update ignored files (default)"
3115
msgstr ""
3116
3117
#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245
3118
msgid "style"
3119
msgstr ""
3120
3121
#: builtin/checkout.c:1062
3122
msgid "conflict style (merge or diff3)"
3123
msgstr ""
3124
3125
#: builtin/checkout.c:1065
3126
msgid "do not limit pathspecs to sparse entries only"
3127
msgstr ""
3128
3129
#: builtin/checkout.c:1067
3130
msgid "second guess 'git checkout no-such-branch'"
3131
msgstr ""
3132
3133
#: builtin/checkout.c:1091
3134
msgid "-b, -B and --orphan are mutually exclusive"
3135
msgstr ""
3136
3137
#: builtin/checkout.c:1108
1083
3138
msgid "--track needs a branch name"
1084
3139
msgstr ""
1085
3140
1086
#: builtin/checkout.c:1000
3141
#: builtin/checkout.c:1115
1087
3142
msgid "Missing branch name; try -b"
1088
3143
msgstr ""
1089
3144
1090
#: builtin/checkout.c:1006
1091
msgid "--orphan and -b|-B are mutually exclusive"
1092
msgstr ""
1093
1094
#: builtin/checkout.c:1008
1095
msgid "--orphan cannot be used with -t"
1096
msgstr ""
1097
1098
#: builtin/checkout.c:1018
1099
msgid "git checkout: -f and -m are incompatible"
1100
msgstr ""
1101
1102
#: builtin/checkout.c:1052
3145
#: builtin/checkout.c:1150
1103
3146
msgid "invalid path specification"
1104
3147
msgstr ""
1105
3148
1106
#: builtin/checkout.c:1060
3149
#: builtin/checkout.c:1157
1107
3150
#, c-format
1108
3151
msgid ""
1109
"git checkout: updating paths is incompatible with switching branches.\n"
3152
"Cannot update paths and switch to branch '%s' at the same time.\n"
1110
3153
"Did you intend to checkout '%s' which can not be resolved as commit?"
1111
3154
msgstr ""
1112
3155
1113
#: builtin/checkout.c:1062
1114
msgid "git checkout: updating paths is incompatible with switching branches."
1115
msgstr ""
1116
1117
#: builtin/checkout.c:1067
1118
msgid "git checkout: --detach does not take a path argument"
1119
msgstr ""
1120
1121
#: builtin/checkout.c:1070
3156
#: builtin/checkout.c:1162
3157
#, c-format
3158
msgid "git checkout: --detach does not take a path argument '%s'"
3159
msgstr ""
3160
3161
#: builtin/checkout.c:1166
1122
3162
msgid ""
1123
3163
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1124
3164
"checking out of the index."
1125
3165
msgstr ""
1126
3166
1127
#: builtin/checkout.c:1089
1128
msgid "Cannot switch branch to a non-commit."
1129
msgstr ""
1130
1131
#: builtin/checkout.c:1092
1132
msgid "--ours/--theirs is incompatible with switching branches."
1133
msgstr ""
1134
1135
#: builtin/clean.c:78
3167
#: builtin/clean.c:20
3168
msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
3169
msgstr ""
3170
3171
#: builtin/clean.c:24
3172
#, c-format
3173
msgid "Removing %s\n"
3174
msgstr ""
3175
3176
#: builtin/clean.c:25
3177
#, c-format
3178
msgid "Would remove %s\n"
3179
msgstr ""
3180
3181
#: builtin/clean.c:26
3182
#, c-format
3183
msgid "Skipping repository %s\n"
3184
msgstr ""
3185
3186
#: builtin/clean.c:27
3187
#, c-format
3188
msgid "Would skip repository %s\n"
3189
msgstr ""
3190
3191
#: builtin/clean.c:28
3192
#, c-format
3193
msgid "failed to remove %s"
3194
msgstr ""
3195
3196
#: builtin/clean.c:160
3197
msgid "do not print names of files removed"
3198
msgstr ""
3199
3200
#: builtin/clean.c:162
3201
msgid "force"
3202
msgstr ""
3203
3204
#: builtin/clean.c:164
3205
msgid "remove whole directories"
3206
msgstr ""
3207
3208
#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717
3209
#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182
3210
msgid "pattern"
3211
msgstr ""
3212
3213
#: builtin/clean.c:166
3214
msgid "add <pattern> to ignore rules"
3215
msgstr ""
3216
3217
#: builtin/clean.c:167
3218
msgid "remove ignored files, too"
3219
msgstr ""
3220
3221
#: builtin/clean.c:169
3222
msgid "remove only ignored files"
3223
msgstr ""
3224
3225
#: builtin/clean.c:187
1136
3226
msgid "-x and -X cannot be used together"
1137
3227
msgstr ""
1138
3228
1139
#: builtin/clean.c:82
3229
#: builtin/clean.c:191
1140
3230
msgid ""
1141
3231
"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
1142
3232
msgstr ""
1143
3233
1144
#: builtin/clean.c:85
3234
#: builtin/clean.c:194
1145
3235
msgid ""
1146
3236
"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
1147
3237
"clean"
1148
3238
msgstr ""
1149
3239
1150
#: builtin/clean.c:155 builtin/clean.c:176
1151
#, c-format
1152
msgid "Would remove %s\n"
1153
msgstr ""
1154
1155
#: builtin/clean.c:159 builtin/clean.c:179
1156
#, c-format
1157
msgid "Removing %s\n"
1158
msgstr ""
1159
1160
#: builtin/clean.c:162 builtin/clean.c:182
1161
#, c-format
1162
msgid "failed to remove %s"
1163
msgstr ""
1164
1165
#: builtin/clean.c:166
1166
#, c-format
1167
msgid "Would not remove %s\n"
1168
msgstr ""
1169
1170
#: builtin/clean.c:168
1171
#, c-format
1172
msgid "Not removing %s\n"
1173
msgstr ""
1174
1175
#: builtin/clone.c:243
1176
#, c-format
1177
msgid "reference repository '%s' is not a local directory."
1178
msgstr ""
1179
1180
#: builtin/clone.c:302
1181
#, c-format
1182
msgid "failed to open '%s'"
1183
msgstr ""
1184
1185
#: builtin/clone.c:306
3240
#: builtin/clone.c:37
3241
msgid "git clone [options] [--] <repo> [<dir>]"
3242
msgstr ""
3243
3244
#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214
3245
#: builtin/push.c:436
3246
msgid "force progress reporting"
3247
msgstr ""
3248
3249
#: builtin/clone.c:67
3250
msgid "don't create a checkout"
3251
msgstr ""
3252
3253
#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488
3254
msgid "create a bare repository"
3255
msgstr ""
3256
3257
#: builtin/clone.c:73
3258
msgid "create a mirror repository (implies bare)"
3259
msgstr ""
3260
3261
#: builtin/clone.c:75
3262
msgid "to clone from a local repository"
3263
msgstr ""
3264
3265
#: builtin/clone.c:77
3266
msgid "don't use local hardlinks, always copy"
3267
msgstr ""
3268
3269
#: builtin/clone.c:79
3270
msgid "setup as shared repository"
3271
msgstr ""
3272
3273
#: builtin/clone.c:81 builtin/clone.c:83
3274
msgid "initialize submodules in the clone"
3275
msgstr ""
3276
3277
#: builtin/clone.c:84 builtin/init-db.c:485
3278
msgid "template-directory"
3279
msgstr ""
3280
3281
#: builtin/clone.c:85 builtin/init-db.c:486
3282
msgid "directory from which templates will be used"
3283
msgstr ""
3284
3285
#: builtin/clone.c:87
3286
msgid "reference repository"
3287
msgstr ""
3288
3289
#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44
3290
msgid "name"
3291
msgstr ""
3292
3293
#: builtin/clone.c:89
3294
msgid "use <name> instead of 'origin' to track upstream"
3295
msgstr ""
3296
3297
#: builtin/clone.c:91
3298
msgid "checkout <branch> instead of the remote's HEAD"
3299
msgstr ""
3300
3301
#: builtin/clone.c:93
3302
msgid "path to git-upload-pack on the remote"
3303
msgstr ""
3304
3305
#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662
3306
msgid "depth"
3307
msgstr ""
3308
3309
#: builtin/clone.c:95
3310
msgid "create a shallow clone of that depth"
3311
msgstr ""
3312
3313
#: builtin/clone.c:97
3314
msgid "clone only one branch, HEAD or --branch"
3315
msgstr ""
3316
3317
#: builtin/clone.c:98 builtin/init-db.c:494
3318
msgid "gitdir"
3319
msgstr ""
3320
3321
#: builtin/clone.c:99 builtin/init-db.c:495
3322
msgid "separate git dir from working tree"
3323
msgstr ""
3324
3325
#: builtin/clone.c:100
3326
msgid "key=value"
3327
msgstr ""
3328
3329
#: builtin/clone.c:101
3330
msgid "set config inside the new repository"
3331
msgstr ""
3332
3333
#: builtin/clone.c:254
3334
#, c-format
3335
msgid "reference repository '%s' is not a local repository."
3336
msgstr ""
3337
3338
#: builtin/clone.c:317
1186
3339
#, c-format
1187
3340
msgid "failed to create directory '%s'"
1188
3341
msgstr ""
1189
3342
1190
#: builtin/clone.c:308 builtin/diff.c:75
3343
#: builtin/clone.c:319 builtin/diff.c:77
1191
3344
#, c-format
1192
3345
msgid "failed to stat '%s'"
1193
3346
msgstr ""
1194
3347
1195
#: builtin/clone.c:310
3348
#: builtin/clone.c:321
1196
3349
#, c-format
1197
3350
msgid "%s exists and is not a directory"
1198
3351
msgstr ""
1199
3352
1200
#: builtin/clone.c:324
3353
#: builtin/clone.c:335
1201
3354
#, c-format
1202
3355
msgid "failed to stat %s\n"
1203
3356
msgstr ""
1204
3357
1205
#: builtin/clone.c:341
1206
#, c-format
1207
msgid "failed to unlink '%s'"
1208
msgstr ""
1209
1210
#: builtin/clone.c:346
3358
#: builtin/clone.c:357
1211
3359
#, c-format
1212
3360
msgid "failed to create link '%s'"
1213
3361
msgstr ""
1214
3362
1215
#: builtin/clone.c:350
3363
#: builtin/clone.c:361
1216
3364
#, c-format
1217
3365
msgid "failed to copy file to '%s'"
1218
3366
msgstr ""
1219
3367
1220
#: builtin/clone.c:373
3368
#: builtin/clone.c:384
1221
3369
#, c-format
1222
3370
msgid "done.\n"
1223
3371
msgstr ""
1224
3372
1225
#: builtin/clone.c:440
3373
#: builtin/clone.c:397
3374
msgid ""
3375
"Clone succeeded, but checkout failed.\n"
3376
"You can inspect what was checked out with 'git status'\n"
3377
"and retry the checkout with 'git checkout -f HEAD'\n"
3378
msgstr ""
3379
3380
#: builtin/clone.c:476
1226
3381
#, c-format
1227
3382
msgid "Could not find remote branch %s to clone."
1228
3383
msgstr ""
1229
3384
1230
#: builtin/clone.c:549
3385
#: builtin/clone.c:550
3386
msgid "remote did not send all necessary objects"
3387
msgstr ""
3388
3389
#: builtin/clone.c:610
1231
3390
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
1232
3391
msgstr ""
1233
3392
1234
#: builtin/clone.c:639
3393
#: builtin/clone.c:641
3394
msgid "unable to checkout working tree"
3395
msgstr ""
3396
3397
#: builtin/clone.c:749
1235
3398
msgid "Too many arguments."
1236
3399
msgstr ""
1237
3400
1238
#: builtin/clone.c:643
3401
#: builtin/clone.c:753
1239
3402
msgid "You must specify a repository to clone."
1240
3403
msgstr ""
1241
3404
1242
#: builtin/clone.c:654
3405
#: builtin/clone.c:764
1243
3406
#, c-format
1244
3407
msgid "--bare and --origin %s options are incompatible."
1245
3408
msgstr ""
1246
3409
1247
#: builtin/clone.c:668
3410
#: builtin/clone.c:767
3411
msgid "--bare and --separate-git-dir are incompatible."
3412
msgstr ""
3413
3414
#: builtin/clone.c:780
1248
3415
#, c-format
1249
3416
msgid "repository '%s' does not exist"
1250
3417
msgstr ""
1251
3418
1252
#: builtin/clone.c:673
3419
#: builtin/clone.c:785
1253
3420
msgid "--depth is ignored in local clones; use file:// instead."
1254
3421
msgstr ""
1255
3422
1256
#: builtin/clone.c:683
3423
#: builtin/clone.c:795
1257
3424
#, c-format
1258
3425
msgid "destination path '%s' already exists and is not an empty directory."
1259
3426
msgstr ""
1260
3427
1261
#: builtin/clone.c:693
3428
#: builtin/clone.c:805
1262
3429
#, c-format
1263
3430
msgid "working tree '%s' already exists."
1264
3431
msgstr ""
1265
3432
1266
#: builtin/clone.c:706 builtin/clone.c:720
3433
#: builtin/clone.c:818 builtin/clone.c:830
1267
3434
#, c-format
1268
3435
msgid "could not create leading directories of '%s'"
1269
3436
msgstr ""
1270
3437
1271
#: builtin/clone.c:709
3438
#: builtin/clone.c:821
1272
3439
#, c-format
1273
3440
msgid "could not create work tree dir '%s'."
1274
3441
msgstr ""
1275
3442
1276
#: builtin/clone.c:728
3443
#: builtin/clone.c:840
1277
3444
#, c-format
1278
3445
msgid "Cloning into bare repository '%s'...\n"
1279
3446
msgstr ""
1280
3447
1281
#: builtin/clone.c:730
3448
#: builtin/clone.c:842
1282
3449
#, c-format
1283
3450
msgid "Cloning into '%s'...\n"
1284
3451
msgstr ""
1285
3452
1286
#: builtin/clone.c:786
3453
#: builtin/clone.c:877
1287
3454
#, c-format
1288
3455
msgid "Don't know how to clone %s"
1289
3456
msgstr ""
1290
3457
1291
#: builtin/clone.c:835
3458
#: builtin/clone.c:926
1292
3459
#, c-format
1293
3460
msgid "Remote branch %s not found in upstream %s"
1294
3461
msgstr ""
1295
3462
1296
#: builtin/clone.c:842
3463
#: builtin/clone.c:933
1297
3464
msgid "You appear to have cloned an empty repository."
1298
3465
msgstr ""
1299
3466
1300
#: builtin/commit.c:42
3467
#: builtin/column.c:9
3468
msgid "git column [options]"
3469
msgstr ""
3470
3471
#: builtin/column.c:26
3472
msgid "lookup config vars"
3473
msgstr ""
3474
3475
#: builtin/column.c:27 builtin/column.c:28
3476
msgid "layout to use"
3477
msgstr ""
3478
3479
#: builtin/column.c:29
3480
msgid "Maximum width"
3481
msgstr ""
3482
3483
#: builtin/column.c:30
3484
msgid "Padding space on left border"
3485
msgstr ""
3486
3487
#: builtin/column.c:31
3488
msgid "Padding space on right border"
3489
msgstr ""
3490
3491
#: builtin/column.c:32
3492
msgid "Padding space between columns"
3493
msgstr ""
3494
3495
#: builtin/column.c:51
3496
msgid "--command must be the first argument"
3497
msgstr ""
3498
3499
#: builtin/commit.c:34
3500
msgid "git commit [options] [--] <pathspec>..."
3501
msgstr ""
3502
3503
#: builtin/commit.c:39
3504
msgid "git status [options] [--] <pathspec>..."
3505
msgstr ""
3506
3507
#: builtin/commit.c:44
1301
3508
msgid ""
1302
3509
"Your name and email address were configured automatically based\n"
1303
3510
"on your username and hostname. Please check that they are accurate.\n"
1311
3518
" git commit --amend --reset-author\n"
1312
3519
msgstr ""
1313
3520
1314
#: builtin/commit.c:54
3521
#: builtin/commit.c:56
1315
3522
msgid ""
1316
3523
"You asked to amend the most recent commit, but doing so would make\n"
1317
3524
"it empty. You can repeat your command with --allow-empty, or you can\n"
1318
3525
"remove the commit entirely with \"git reset HEAD^\".\n"
1319
3526
msgstr ""
1320
3527
1321
#: builtin/commit.c:59
3528
#: builtin/commit.c:61
1322
3529
msgid ""
1323
3530
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
1324
3531
"If you wish to commit it anyway, use:\n"
1328
3535
"Otherwise, please use 'git reset'\n"
1329
3536
msgstr ""
1330
3537
1331
#: builtin/commit.c:205 builtin/reset.c:33
1332
msgid "merge"
1333
msgstr ""
1334
1335
#: builtin/commit.c:208
1336
msgid "cherry-pick"
1337
msgstr ""
1338
1339
#: builtin/commit.c:325
3538
#: builtin/commit.c:260
1340
3539
msgid "failed to unpack HEAD tree object"
1341
3540
msgstr ""
1342
3541
1343
#: builtin/commit.c:367
3542
#: builtin/commit.c:302
1344
3543
msgid "unable to create temporary index"
1345
3544
msgstr ""
1346
3545
1347
#: builtin/commit.c:373
3546
#: builtin/commit.c:308
1348
3547
msgid "interactive add failed"
1349
3548
msgstr ""
1350
3549
1351
#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473
3550
#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412
1352
3551
msgid "unable to write new_index file"
1353
3552
msgstr ""
1354
3553
1355
#: builtin/commit.c:457
1356
#, c-format
1357
msgid "cannot do a partial commit during a %s."
1358
msgstr ""
1359
1360
#: builtin/commit.c:466
3554
#: builtin/commit.c:393
3555
msgid "cannot do a partial commit during a merge."
3556
msgstr ""
3557
3558
#: builtin/commit.c:395
3559
msgid "cannot do a partial commit during a cherry-pick."
3560
msgstr ""
3561
3562
#: builtin/commit.c:405
1361
3563
msgid "cannot read the index"
1362
3564
msgstr ""
1363
3565
1364
#: builtin/commit.c:486
3566
#: builtin/commit.c:425
1365
3567
msgid "unable to write temporary index file"
1366
3568
msgstr ""
1367
3569
1368
#: builtin/commit.c:561 builtin/commit.c:567
3570
#: builtin/commit.c:513 builtin/commit.c:519
1369
3571
#, c-format
1370
3572
msgid "invalid commit: %s"
1371
3573
msgstr ""
1372
3574
1373
#: builtin/commit.c:590
3575
#: builtin/commit.c:542
1374
3576
msgid "malformed --author parameter"
1375
3577
msgstr ""
1376
3578
1377
#: builtin/commit.c:651
3579
#: builtin/commit.c:562
1378
3580
#, c-format
1379
3581
msgid "Malformed ident string: '%s'"
1380
3582
msgstr ""
1381
3583
1382
#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033
3584
#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956
1383
3585
#, c-format
1384
3586
msgid "could not lookup commit %s"
1385
3587
msgstr ""
1386
3588
1387
#: builtin/commit.c:701 builtin/shortlog.c:296
3589
#: builtin/commit.c:612 builtin/shortlog.c:270
1388
3590
#, c-format
1389
3591
msgid "(reading log message from standard input)\n"
1390
3592
msgstr ""
1391
3593
1392
#: builtin/commit.c:703
3594
#: builtin/commit.c:614
1393
3595
msgid "could not read log from standard input"
1394
3596
msgstr ""
1395
3597
1396
#: builtin/commit.c:707
3598
#: builtin/commit.c:618
1397
3599
#, c-format
1398
3600
msgid "could not read log file '%s'"
1399
3601
msgstr ""
1400
3602
1401
#: builtin/commit.c:713
3603
#: builtin/commit.c:624
1402
3604
msgid "commit has empty message"
1403
3605
msgstr ""
1404
3606
1405
#: builtin/commit.c:729
3607
#: builtin/commit.c:640
1406
3608
msgid "could not read MERGE_MSG"
1407
3609
msgstr ""
1408
3610
1409
#: builtin/commit.c:733
3611
#: builtin/commit.c:644
1410
3612
msgid "could not read SQUASH_MSG"
1411
3613
msgstr ""
1412
3614
1413
#: builtin/commit.c:737
3615
#: builtin/commit.c:648
1414
3616
#, c-format
1415
3617
msgid "could not read '%s'"
1416
3618
msgstr ""
1417
3619
1418
#: builtin/commit.c:765
1419
#, c-format
1420
msgid "could not open '%s'"
1421
msgstr ""
1422
1423
#: builtin/commit.c:789
3620
#: builtin/commit.c:709
1424
3621
msgid "could not write commit template"
1425
3622
msgstr ""
1426
3623
1427
#: builtin/commit.c:799
1428
#, c-format
1429
msgid ""
1430
"\n"
1431
"It looks like you may be committing a %s.\n"
1432
"If this is not correct, please remove the file\n"
1433
"\t%s\n"
1434
"and try again.\n"
1435
msgstr ""
1436
1437
#: builtin/commit.c:812
1438
msgid "Please enter the commit message for your changes."
1439
msgstr ""
1440
1441
#: builtin/commit.c:815
1442
msgid ""
1443
" Lines starting\n"
1444
"with '#' will be ignored, and an empty message aborts the commit.\n"
1445
msgstr ""
1446
1447
#: builtin/commit.c:820
1448
msgid ""
1449
" Lines starting\n"
1450
"with '#' will be kept; you may remove them yourself if you want to.\n"
3624
#: builtin/commit.c:720
3625
#, c-format
3626
msgid ""
3627
"\n"
3628
"It looks like you may be committing a merge.\n"
3629
"If this is not correct, please remove the file\n"
3630
"\t%s\n"
3631
"and try again.\n"
3632
msgstr ""
3633
3634
#: builtin/commit.c:725
3635
#, c-format
3636
msgid ""
3637
"\n"
3638
"It looks like you may be committing a cherry-pick.\n"
3639
"If this is not correct, please remove the file\n"
3640
"\t%s\n"
3641
"and try again.\n"
3642
msgstr ""
3643
3644
#: builtin/commit.c:737
3645
#, c-format
3646
msgid ""
3647
"Please enter the commit message for your changes. Lines starting\n"
3648
"with '%c' will be ignored, and an empty message aborts the commit.\n"
3649
msgstr ""
3650
3651
#: builtin/commit.c:742
3652
#, c-format
3653
msgid ""
3654
"Please enter the commit message for your changes. Lines starting\n"
3655
"with '%c' will be kept; you may remove them yourself if you want to.\n"
1451
3656
"An empty message aborts the commit.\n"
1452
3657
msgstr ""
1453
3658
1454
#: builtin/commit.c:832
3659
#: builtin/commit.c:755
1455
3660
#, c-format
1456
3661
msgid "%sAuthor: %s"
1457
3662
msgstr ""
1458
3663
1459
#: builtin/commit.c:839
3664
#: builtin/commit.c:762
1460
3665
#, c-format
1461
3666
msgid "%sCommitter: %s"
1462
3667
msgstr ""
1463
3668
1464
#: builtin/commit.c:859
3669
#: builtin/commit.c:782
1465
3670
msgid "Cannot read index"
1466
3671
msgstr ""
1467
3672
1468
#: builtin/commit.c:896
3673
#: builtin/commit.c:819
1469
3674
msgid "Error building trees"
1470
3675
msgstr ""
1471
3676
1472
#: builtin/commit.c:911 builtin/tag.c:357
3677
#: builtin/commit.c:834 builtin/tag.c:359
1473
3678
#, c-format
1474
3679
msgid "Please supply the message using either -m or -F option.\n"
1475
3680
msgstr ""
1476
3681
1477
#: builtin/commit.c:1008
3682
#: builtin/commit.c:931
1478
3683
#, c-format
1479
3684
msgid "No existing author found with '%s'"
1480
3685
msgstr ""
1481
3686
1482
#: builtin/commit.c:1023 builtin/commit.c:1217
3687
#: builtin/commit.c:946 builtin/commit.c:1140
1483
3688
#, c-format
1484
3689
msgid "Invalid untracked files mode '%s'"
1485
3690
msgstr ""
1486
3691
1487
#: builtin/commit.c:1063
3692
#: builtin/commit.c:976
1488
3693
msgid "Using both --reset-author and --author does not make sense"
1489
3694
msgstr ""
1490
3695
1491
#: builtin/commit.c:1074
3696
#: builtin/commit.c:987
1492
3697
msgid "You have nothing to amend."
1493
3698
msgstr ""
1494
3699
1495
#: builtin/commit.c:1076
1496
#, c-format
1497
msgid "You are in the middle of a %s -- cannot amend."
1498
msgstr ""
1499
1500
#: builtin/commit.c:1078
3700
#: builtin/commit.c:990
3701
msgid "You are in the middle of a merge -- cannot amend."
3702
msgstr ""
3703
3704
#: builtin/commit.c:992
3705
msgid "You are in the middle of a cherry-pick -- cannot amend."
3706
msgstr ""
3707
3708
#: builtin/commit.c:995
1501
3709
msgid "Options --squash and --fixup cannot be used together"
1502
3710
msgstr ""
1503
3711
1504
#: builtin/commit.c:1088
3712
#: builtin/commit.c:1005
1505
3713
msgid "Only one of -c/-C/-F/--fixup can be used."
1506
3714
msgstr ""
1507
3715
1508
#: builtin/commit.c:1090
3716
#: builtin/commit.c:1007
1509
3717
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
1510
3718
msgstr ""
1511
3719
1512
#: builtin/commit.c:1098
3720
#: builtin/commit.c:1015
1513
3721
msgid "--reset-author can be used only with -C, -c or --amend."
1514
3722
msgstr ""
1515
3723
1516
#: builtin/commit.c:1115
3724
#: builtin/commit.c:1032
1517
3725
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
1518
3726
msgstr ""
1519
3727
1520
#: builtin/commit.c:1117
3728
#: builtin/commit.c:1034
1521
3729
msgid "No paths with --include/--only does not make sense."
1522
3730
msgstr ""
1523
3731
1524
#: builtin/commit.c:1119
3732
#: builtin/commit.c:1036
1525
3733
msgid "Clever... amending the last one with dirty index."
1526
3734
msgstr ""
1527
3735
1528
#: builtin/commit.c:1121
3736
#: builtin/commit.c:1038
1529
3737
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
1530
3738
msgstr ""
1531
3739
1532
#: builtin/commit.c:1131 builtin/tag.c:556
3740
#: builtin/commit.c:1048 builtin/tag.c:575
1533
3741
#, c-format
1534
3742
msgid "Invalid cleanup mode %s"
1535
3743
msgstr ""
1536
3744
1537
#: builtin/commit.c:1136
3745
#: builtin/commit.c:1053
1538
3746
msgid "Paths with -a does not make sense."
1539
3747
msgstr ""
1540
3748
1541
#: builtin/commit.c:1315
3749
#: builtin/commit.c:1059 builtin/commit.c:1194
3750
msgid "--long and -z are incompatible"
3751
msgstr ""
3752
3753
#: builtin/commit.c:1154 builtin/commit.c:1390
3754
msgid "show status concisely"
3755
msgstr ""
3756
3757
#: builtin/commit.c:1156 builtin/commit.c:1392
3758
msgid "show branch information"
3759
msgstr ""
3760
3761
#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426
3762
msgid "machine-readable output"
3763
msgstr ""
3764
3765
#: builtin/commit.c:1161 builtin/commit.c:1396
3766
msgid "show status in long format (default)"
3767
msgstr ""
3768
3769
#: builtin/commit.c:1164 builtin/commit.c:1399
3770
msgid "terminate entries with NUL"
3771
msgstr ""
3772
3773
#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659
3774
#: builtin/fast-export.c:662 builtin/tag.c:459
3775
msgid "mode"
3776
msgstr ""
3777
3778
#: builtin/commit.c:1167 builtin/commit.c:1402
3779
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
3780
msgstr ""
3781
3782
#: builtin/commit.c:1170
3783
msgid "show ignored files"
3784
msgstr ""
3785
3786
#: builtin/commit.c:1171 parse-options.h:151
3787
msgid "when"
3788
msgstr ""
3789
3790
#: builtin/commit.c:1172
3791
msgid ""
3792
"ignore changes to submodules, optional when: all, dirty, untracked. "
3793
"(Default: all)"
3794
msgstr ""
3795
3796
#: builtin/commit.c:1174
3797
msgid "list untracked files in columns"
3798
msgstr ""
3799
3800
#: builtin/commit.c:1248
1542
3801
msgid "couldn't look up newly created commit"
1543
3802
msgstr ""
1544
3803
1545
#: builtin/commit.c:1317
3804
#: builtin/commit.c:1250
1546
3805
msgid "could not parse newly created commit"
1547
3806
msgstr ""
1548
3807
1549
#: builtin/commit.c:1358
3808
#: builtin/commit.c:1291
1550
3809
msgid "detached HEAD"
1551
3810
msgstr ""
1552
3811
3812
#: builtin/commit.c:1293
3813
msgid " (root-commit)"
3814
msgstr ""
3815
1553
3816
#: builtin/commit.c:1360
1554
msgid " (root-commit)"
1555
msgstr ""
1556
1557
#: builtin/commit.c:1450
3817
msgid "suppress summary after successful commit"
3818
msgstr ""
3819
3820
#: builtin/commit.c:1361
3821
msgid "show diff in commit message template"
3822
msgstr ""
3823
3824
#: builtin/commit.c:1363
3825
msgid "Commit message options"
3826
msgstr ""
3827
3828
#: builtin/commit.c:1364 builtin/tag.c:457
3829
msgid "read message from file"
3830
msgstr ""
3831
3832
#: builtin/commit.c:1365
3833
msgid "author"
3834
msgstr ""
3835
3836
#: builtin/commit.c:1365
3837
msgid "override author for commit"
3838
msgstr ""
3839
3840
#: builtin/commit.c:1366 builtin/gc.c:178
3841
msgid "date"
3842
msgstr ""
3843
3844
#: builtin/commit.c:1366
3845
msgid "override date for commit"
3846
msgstr ""
3847
3848
#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533
3849
#: builtin/notes.c:690 builtin/tag.c:455
3850
msgid "message"
3851
msgstr ""
3852
3853
#: builtin/commit.c:1367
3854
msgid "commit message"
3855
msgstr ""
3856
3857
#: builtin/commit.c:1368
3858
msgid "reuse and edit message from specified commit"
3859
msgstr ""
3860
3861
#: builtin/commit.c:1369
3862
msgid "reuse message from specified commit"
3863
msgstr ""
3864
3865
#: builtin/commit.c:1370
3866
msgid "use autosquash formatted message to fixup specified commit"
3867
msgstr ""
3868
3869
#: builtin/commit.c:1371
3870
msgid "use autosquash formatted message to squash specified commit"
3871
msgstr ""
3872
3873
#: builtin/commit.c:1372
3874
msgid "the commit is authored by me now (used with -C/-c/--amend)"
3875
msgstr ""
3876
3877
#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109
3878
msgid "add Signed-off-by:"
3879
msgstr ""
3880
3881
#: builtin/commit.c:1374
3882
msgid "use specified template file"
3883
msgstr ""
3884
3885
#: builtin/commit.c:1375
3886
msgid "force edit of commit"
3887
msgstr ""
3888
3889
#: builtin/commit.c:1376
3890
msgid "default"
3891
msgstr ""
3892
3893
#: builtin/commit.c:1376 builtin/tag.c:460
3894
msgid "how to strip spaces and #comments from message"
3895
msgstr ""
3896
3897
#: builtin/commit.c:1377
3898
msgid "include status in commit message template"
3899
msgstr ""
3900
3901
#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461
3902
msgid "key id"
3903
msgstr ""
3904
3905
#: builtin/commit.c:1379 builtin/merge.c:216
3906
msgid "GPG sign commit"
3907
msgstr ""
3908
3909
#. end commit message options
3910
#: builtin/commit.c:1382
3911
msgid "Commit contents options"
3912
msgstr ""
3913
3914
#: builtin/commit.c:1383
3915
msgid "commit all changed files"
3916
msgstr ""
3917
3918
#: builtin/commit.c:1384
3919
msgid "add specified files to index for commit"
3920
msgstr ""
3921
3922
#: builtin/commit.c:1385
3923
msgid "interactively add files"
3924
msgstr ""
3925
3926
#: builtin/commit.c:1386
3927
msgid "interactively add changes"
3928
msgstr ""
3929
3930
#: builtin/commit.c:1387
3931
msgid "commit only specified files"
3932
msgstr ""
3933
3934
#: builtin/commit.c:1388
3935
msgid "bypass pre-commit hook"
3936
msgstr ""
3937
3938
#: builtin/commit.c:1389
3939
msgid "show what would be committed"
3940
msgstr ""
3941
3942
#: builtin/commit.c:1400
3943
msgid "amend previous commit"
3944
msgstr ""
3945
3946
#: builtin/commit.c:1401
3947
msgid "bypass post-rewrite hook"
3948
msgstr ""
3949
3950
#: builtin/commit.c:1406
3951
msgid "ok to record an empty change"
3952
msgstr ""
3953
3954
#: builtin/commit.c:1409
3955
msgid "ok to record a change with an empty message"
3956
msgstr ""
3957
3958
#: builtin/commit.c:1441
1558
3959
msgid "could not parse HEAD commit"
1559
3960
msgstr ""
1560
3961
1561
#: builtin/commit.c:1487 builtin/merge.c:509
3962
#: builtin/commit.c:1479 builtin/merge.c:510
1562
3963
#, c-format
1563
3964
msgid "could not open '%s' for reading"
1564
3965
msgstr ""
1565
3966
1566
#: builtin/commit.c:1494
3967
#: builtin/commit.c:1486
1567
3968
#, c-format
1568
3969
msgid "Corrupt MERGE_HEAD file (%s)"
1569
3970
msgstr ""
1570
3971
1571
#: builtin/commit.c:1501
3972
#: builtin/commit.c:1493
1572
3973
msgid "could not read MERGE_MODE"
1573
3974
msgstr ""
1574
3975
1575
#: builtin/commit.c:1520
3976
#: builtin/commit.c:1512
1576
3977
#, c-format
1577
3978
msgid "could not read commit message: %s"
1578
3979
msgstr ""
1579
3980
1580
#: builtin/commit.c:1534
3981
#: builtin/commit.c:1526
1581
3982
#, c-format
1582
3983
msgid "Aborting commit; you did not edit the message.\n"
1583
3984
msgstr ""
1584
3985
1585
#: builtin/commit.c:1539
3986
#: builtin/commit.c:1531
1586
3987
#, c-format
1587
3988
msgid "Aborting commit due to empty commit message.\n"
1588
3989
msgstr ""
1589
3990
1590
#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
3991
#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872
1591
3992
msgid "failed to write commit object"
1592
3993
msgstr ""
1593
3994
1594
#: builtin/commit.c:1575
3995
#: builtin/commit.c:1567
1595
3996
msgid "cannot lock HEAD ref"
1596
3997
msgstr ""
1597
3998
1598
#: builtin/commit.c:1579
3999
#: builtin/commit.c:1571
1599
4000
msgid "cannot update HEAD ref"
1600
4001
msgstr ""
1601
4002
1602
#: builtin/commit.c:1590
4003
#: builtin/commit.c:1582
1603
4004
msgid ""
1604
4005
"Repository has been updated, but unable to write\n"
1605
4006
"new_index file. Check that disk is not full or quota is\n"
1606
4007
"not exceeded, and then \"git reset HEAD\" to recover."
1607
4008
msgstr ""
1608
4009
1609
#: builtin/describe.c:234
4010
#: builtin/config.c:7
4011
msgid "git config [options]"
4012
msgstr ""
4013
4014
#: builtin/config.c:51
4015
msgid "Config file location"
4016
msgstr ""
4017
4018
#: builtin/config.c:52
4019
msgid "use global config file"
4020
msgstr ""
4021
4022
#: builtin/config.c:53
4023
msgid "use system config file"
4024
msgstr ""
4025
4026
#: builtin/config.c:54
4027
msgid "use repository config file"
4028
msgstr ""
4029
4030
#: builtin/config.c:55
4031
msgid "use given config file"
4032
msgstr ""
4033
4034
#: builtin/config.c:56
4035
msgid "Action"
4036
msgstr ""
4037
4038
#: builtin/config.c:57
4039
msgid "get value: name [value-regex]"
4040
msgstr ""
4041
4042
#: builtin/config.c:58
4043
msgid "get all values: key [value-regex]"
4044
msgstr ""
4045
4046
#: builtin/config.c:59
4047
msgid "get values for regexp: name-regex [value-regex]"
4048
msgstr ""
4049
4050
#: builtin/config.c:60
4051
msgid "replace all matching variables: name value [value_regex]"
4052
msgstr ""
4053
4054
#: builtin/config.c:61
4055
msgid "add a new variable: name value"
4056
msgstr ""
4057
4058
#: builtin/config.c:62
4059
msgid "remove a variable: name [value-regex]"
4060
msgstr ""
4061
4062
#: builtin/config.c:63
4063
msgid "remove all matches: name [value-regex]"
4064
msgstr ""
4065
4066
#: builtin/config.c:64
4067
msgid "rename section: old-name new-name"
4068
msgstr ""
4069
4070
#: builtin/config.c:65
4071
msgid "remove a section: name"
4072
msgstr ""
4073
4074
#: builtin/config.c:66
4075
msgid "list all"
4076
msgstr ""
4077
4078
#: builtin/config.c:67
4079
msgid "open an editor"
4080
msgstr ""
4081
4082
#: builtin/config.c:68 builtin/config.c:69
4083
msgid "slot"
4084
msgstr ""
4085
4086
#: builtin/config.c:68
4087
msgid "find the color configured: [default]"
4088
msgstr ""
4089
4090
#: builtin/config.c:69
4091
msgid "find the color setting: [stdout-is-tty]"
4092
msgstr ""
4093
4094
#: builtin/config.c:70
4095
msgid "Type"
4096
msgstr ""
4097
4098
#: builtin/config.c:71
4099
msgid "value is \"true\" or \"false\""
4100
msgstr ""
4101
4102
#: builtin/config.c:72
4103
msgid "value is decimal number"
4104
msgstr ""
4105
4106
#: builtin/config.c:73
4107
msgid "value is --bool or --int"
4108
msgstr ""
4109
4110
#: builtin/config.c:74
4111
msgid "value is a path (file or directory name)"
4112
msgstr ""
4113
4114
#: builtin/config.c:75
4115
msgid "Other"
4116
msgstr ""
4117
4118
#: builtin/config.c:76
4119
msgid "terminate values with NUL byte"
4120
msgstr ""
4121
4122
#: builtin/config.c:77
4123
msgid "respect include directives on lookup"
4124
msgstr ""
4125
4126
#: builtin/count-objects.c:82
4127
msgid "git count-objects [-v] [-H | --human-readable]"
4128
msgstr ""
4129
4130
#: builtin/count-objects.c:97
4131
msgid "print sizes in human readable format"
4132
msgstr ""
4133
4134
#: builtin/describe.c:15
4135
msgid "git describe [options] <committish>*"
4136
msgstr ""
4137
4138
#: builtin/describe.c:16
4139
msgid "git describe [options] --dirty"
4140
msgstr ""
4141
4142
#: builtin/describe.c:233
1610
4143
#, c-format
1611
4144
msgid "annotated tag %s not available"
1612
4145
msgstr ""
1613
4146
1614
#: builtin/describe.c:238
4147
#: builtin/describe.c:237
1615
4148
#, c-format
1616
4149
msgid "annotated tag %s has no embedded name"
1617
4150
msgstr ""
1618
4151
1619
#: builtin/describe.c:240
4152
#: builtin/describe.c:239
1620
4153
#, c-format
1621
4154
msgid "tag '%s' is really '%s' here"
1622
4155
msgstr ""
1623
4156
1624
#: builtin/describe.c:267
4157
#: builtin/describe.c:266
1625
4158
#, c-format
1626
4159
msgid "Not a valid object name %s"
1627
4160
msgstr ""
1628
4161
1629
#: builtin/describe.c:270
4162
#: builtin/describe.c:269
1630
4163
#, c-format
1631
4164
msgid "%s is not a valid '%s' object"
1632
4165
msgstr ""
1633
4166
1634
#: builtin/describe.c:287
4167
#: builtin/describe.c:286
1635
4168
#, c-format
1636
4169
msgid "no tag exactly matches '%s'"
1637
4170
msgstr ""
1638
4171
1639
#: builtin/describe.c:289
4172
#: builtin/describe.c:288
1640
4173
#, c-format
1641
4174
msgid "searching to describe %s\n"
1642
4175
msgstr ""
1643
4176
1644
#: builtin/describe.c:329
4177
#: builtin/describe.c:328
1645
4178
#, c-format
1646
4179
msgid "finished search at %s\n"
1647
4180
msgstr ""
1648
4181
1649
#: builtin/describe.c:353
4182
#: builtin/describe.c:352
1650
4183
#, c-format
1651
4184
msgid ""
1652
4185
"No annotated tags can describe '%s'.\n"
1653
4186
"However, there were unannotated tags: try --tags."
1654
4187
msgstr ""
1655
4188
1656
#: builtin/describe.c:357
4189
#: builtin/describe.c:356
1657
4190
#, c-format
1658
4191
msgid ""
1659
4192
"No tags can describe '%s'.\n"
1660
4193
"Try --always, or create some tags."
1661
4194
msgstr ""
1662
4195
1663
#: builtin/describe.c:378
4196
#: builtin/describe.c:377
1664
4197
#, c-format
1665
4198
msgid "traversed %lu commits\n"
1666
4199
msgstr ""
1667
4200
1668
#: builtin/describe.c:381
4201
#: builtin/describe.c:380
1669
4202
#, c-format
1670
4203
msgid ""
1671
4204
"more than %i tags found; listed %i most recent\n"
1672
4205
"gave up search at %s\n"
1673
4206
msgstr ""
1674
4207
1675
#: builtin/describe.c:436
4208
#: builtin/describe.c:402
4209
msgid "find the tag that comes after the commit"
4210
msgstr ""
4211
4212
#: builtin/describe.c:403
4213
msgid "debug search strategy on stderr"
4214
msgstr ""
4215
4216
#: builtin/describe.c:404
4217
msgid "use any ref"
4218
msgstr ""
4219
4220
#: builtin/describe.c:405
4221
msgid "use any tag, even unannotated"
4222
msgstr ""
4223
4224
#: builtin/describe.c:406
4225
msgid "always use long format"
4226
msgstr ""
4227
4228
#: builtin/describe.c:409
4229
msgid "only output exact matches"
4230
msgstr ""
4231
4232
#: builtin/describe.c:411
4233
msgid "consider <n> most recent tags (default: 10)"
4234
msgstr ""
4235
4236
#: builtin/describe.c:413
4237
msgid "only consider tags matching <pattern>"
4238
msgstr ""
4239
4240
#: builtin/describe.c:415 builtin/name-rev.c:238
4241
msgid "show abbreviated commit object as fallback"
4242
msgstr ""
4243
4244
#: builtin/describe.c:416
4245
msgid "mark"
4246
msgstr ""
4247
4248
#: builtin/describe.c:417
4249
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4250
msgstr ""
4251
4252
#: builtin/describe.c:435
1676
4253
msgid "--long is incompatible with --abbrev=0"
1677
4254
msgstr ""
1678
4255
1679
#: builtin/describe.c:462
4256
#: builtin/describe.c:461
1680
4257
msgid "No names found, cannot describe anything."
1681
4258
msgstr ""
1682
4259
1683
#: builtin/describe.c:482
4260
#: builtin/describe.c:481
1684
4261
msgid "--dirty is incompatible with committishes"
1685
4262
msgstr ""
1686
4263
1687
#: builtin/diff.c:77
4264
#: builtin/diff.c:79
1688
4265
#, c-format
1689
4266
msgid "'%s': not a regular file or symlink"
1690
4267
msgstr ""
1691
4268
1692
#: builtin/diff.c:220
4269
#: builtin/diff.c:228
1693
4270
#, c-format
1694
4271
msgid "invalid option: %s"
1695
4272
msgstr ""
1696
4273
1697
#: builtin/diff.c:297
4274
#: builtin/diff.c:305
1698
4275
msgid "Not a git repository"
1699
4276
msgstr ""
1700
4277
1701
#: builtin/diff.c:347
4278
#: builtin/diff.c:348
1702
4279
#, c-format
1703
4280
msgid "invalid object '%s' given."
1704
4281
msgstr ""
1705
4282
1706
#: builtin/diff.c:352
4283
#: builtin/diff.c:353
1707
4284
#, c-format
1708
4285
msgid "more than %d trees given: '%s'"
1709
4286
msgstr ""
1710
4287
1711
#: builtin/diff.c:362
4288
#: builtin/diff.c:363
1712
4289
#, c-format
1713
4290
msgid "more than two blobs given: '%s'"
1714
4291
msgstr ""
1715
4292
1716
#: builtin/diff.c:370
4293
#: builtin/diff.c:371
1717
4294
#, c-format
1718
4295
msgid "unhandled object '%s' given."
1719
4296
msgstr ""
1720
4297
1721
#: builtin/fetch.c:200
4298
#: builtin/fast-export.c:22
4299
msgid "git fast-export [rev-list-opts]"
4300
msgstr ""
4301
4302
#: builtin/fast-export.c:658
4303
msgid "show progress after <n> objects"
4304
msgstr ""
4305
4306
#: builtin/fast-export.c:660
4307
msgid "select handling of signed tags"
4308
msgstr ""
4309
4310
#: builtin/fast-export.c:663
4311
msgid "select handling of tags that tag filtered objects"
4312
msgstr ""
4313
4314
#: builtin/fast-export.c:666
4315
msgid "Dump marks to this file"
4316
msgstr ""
4317
4318
#: builtin/fast-export.c:668
4319
msgid "Import marks from this file"
4320
msgstr ""
4321
4322
#: builtin/fast-export.c:670
4323
msgid "Fake a tagger when tags lack one"
4324
msgstr ""
4325
4326
#: builtin/fast-export.c:672
4327
msgid "Output full tree for each commit"
4328
msgstr ""
4329
4330
#: builtin/fast-export.c:674
4331
msgid "Use the done feature to terminate the stream"
4332
msgstr ""
4333
4334
#: builtin/fast-export.c:675
4335
msgid "Skip output of blob data"
4336
msgstr ""
4337
4338
#: builtin/fetch.c:20
4339
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
4340
msgstr ""
4341
4342
#: builtin/fetch.c:21
4343
msgid "git fetch [<options>] <group>"
4344
msgstr ""
4345
4346
#: builtin/fetch.c:22
4347
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
4348
msgstr ""
4349
4350
#: builtin/fetch.c:23
4351
msgid "git fetch --all [<options>]"
4352
msgstr ""
4353
4354
#: builtin/fetch.c:60
4355
msgid "fetch from all remotes"
4356
msgstr ""
4357
4358
#: builtin/fetch.c:62
4359
msgid "append to .git/FETCH_HEAD instead of overwriting"
4360
msgstr ""
4361
4362
#: builtin/fetch.c:64
4363
msgid "path to upload pack on remote end"
4364
msgstr ""
4365
4366
#: builtin/fetch.c:65
4367
msgid "force overwrite of local branch"
4368
msgstr ""
4369
4370
#: builtin/fetch.c:67
4371
msgid "fetch from multiple remotes"
4372
msgstr ""
4373
4374
#: builtin/fetch.c:69
4375
msgid "fetch all tags and associated objects"
4376
msgstr ""
4377
4378
#: builtin/fetch.c:71
4379
msgid "do not fetch all tags (--no-tags)"
4380
msgstr ""
4381
4382
#: builtin/fetch.c:73
4383
msgid "prune remote-tracking branches no longer on remote"
4384
msgstr ""
4385
4386
#: builtin/fetch.c:74
4387
msgid "on-demand"
4388
msgstr ""
4389
4390
#: builtin/fetch.c:75
4391
msgid "control recursive fetching of submodules"
4392
msgstr ""
4393
4394
#: builtin/fetch.c:79
4395
msgid "keep downloaded pack"
4396
msgstr ""
4397
4398
#: builtin/fetch.c:81
4399
msgid "allow updating of HEAD ref"
4400
msgstr ""
4401
4402
#: builtin/fetch.c:84
4403
msgid "deepen history of shallow clone"
4404
msgstr ""
4405
4406
#: builtin/fetch.c:86
4407
msgid "convert to a complete repository"
4408
msgstr ""
4409
4410
#: builtin/fetch.c:88 builtin/log.c:1130
4411
msgid "dir"
4412
msgstr ""
4413
4414
#: builtin/fetch.c:89
4415
msgid "prepend this to submodule path output"
4416
msgstr ""
4417
4418
#: builtin/fetch.c:92
4419
msgid "default mode for recursion"
4420
msgstr ""
4421
4422
#: builtin/fetch.c:204
1722
4423
msgid "Couldn't find remote ref HEAD"
1723
4424
msgstr ""
1724
4425
1725
#: builtin/fetch.c:253
4426
#: builtin/fetch.c:257
1726
4427
#, c-format
1727
4428
msgid "object %s not found"
1728
4429
msgstr ""
1729
4430
1730
#: builtin/fetch.c:259
4431
#: builtin/fetch.c:262
1731
4432
msgid "[up to date]"
1732
4433
msgstr ""
1733
4434
1734
#: builtin/fetch.c:273
4435
#: builtin/fetch.c:276
1735
4436
#, c-format
1736
4437
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
1737
4438
msgstr ""
1738
4439
1739
#: builtin/fetch.c:274 builtin/fetch.c:360
4440
#: builtin/fetch.c:277 builtin/fetch.c:363
1740
4441
msgid "[rejected]"
1741
4442
msgstr ""
1742
4443
1743
#: builtin/fetch.c:285
4444
#: builtin/fetch.c:288
1744
4445
msgid "[tag update]"
1745
4446
msgstr ""
1746
4447
1747
#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
4448
#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343
1748
4449
msgid " (unable to update local ref)"
1749
4450
msgstr ""
1750
4451
1751
#: builtin/fetch.c:305
4452
#: builtin/fetch.c:308
1752
4453
msgid "[new tag]"
1753
4454
msgstr ""
1754
4455
1755
#: builtin/fetch.c:308
4456
#: builtin/fetch.c:311
1756
4457
msgid "[new branch]"
1757
4458
msgstr ""
1758
4459
1759
#: builtin/fetch.c:311
4460
#: builtin/fetch.c:314
1760
4461
msgid "[new ref]"
1761
4462
msgstr ""
1762
4463
1763
#: builtin/fetch.c:356
4464
#: builtin/fetch.c:359
1764
4465
msgid "unable to update local ref"
1765
4466
msgstr ""
1766
4467
1767
#: builtin/fetch.c:356
4468
#: builtin/fetch.c:359
1768
4469
msgid "forced update"
1769
4470
msgstr ""
1770
4471
1771
#: builtin/fetch.c:362
4472
#: builtin/fetch.c:365
1772
4473
msgid "(non-fast-forward)"
1773
4474
msgstr ""
1774
4475
1775
#: builtin/fetch.c:393 builtin/fetch.c:685
4476
#: builtin/fetch.c:396 builtin/fetch.c:688
1776
4477
#, c-format
1777
4478
msgid "cannot open %s: %s\n"
1778
4479
msgstr ""
1779
4480
1780
#: builtin/fetch.c:402
4481
#: builtin/fetch.c:405
1781
4482
#, c-format
1782
4483
msgid "%s did not send all necessary objects\n"
1783
4484
msgstr ""
1784
4485
1785
#: builtin/fetch.c:488
4486
#: builtin/fetch.c:491
1786
4487
#, c-format
1787
4488
msgid "From %.*s\n"
1788
4489
msgstr ""
1789
4490
1790
#: builtin/fetch.c:499
4491
#: builtin/fetch.c:502
1791
4492
#, c-format
1792
4493
msgid ""
1793
4494
"some local refs could not be updated; try running\n"
1794
4495
" 'git remote prune %s' to remove any old, conflicting branches"
1795
4496
msgstr ""
1796
4497
1797
#: builtin/fetch.c:549
1798
#, c-format
1799
msgid " (%s will become dangling)\n"
1800
msgstr ""
1801
1802
#: builtin/fetch.c:550
1803
#, c-format
1804
msgid " (%s has become dangling)\n"
1805
msgstr ""
1806
1807
#: builtin/fetch.c:557
4498
#: builtin/fetch.c:552
4499
#, c-format
4500
msgid " (%s will become dangling)"
4501
msgstr ""
4502
4503
#: builtin/fetch.c:553
4504
#, c-format
4505
msgid " (%s has become dangling)"
4506
msgstr ""
4507
4508
#: builtin/fetch.c:560
1808
4509
msgid "[deleted]"
1809
4510
msgstr ""
1810
4511
1811
#: builtin/fetch.c:558
4512
#: builtin/fetch.c:561 builtin/remote.c:1055
1812
4513
msgid "(none)"
1813
4514
msgstr ""
1814
4515
1815
#: builtin/fetch.c:675
4516
#: builtin/fetch.c:678
1816
4517
#, c-format
1817
4518
msgid "Refusing to fetch into current branch %s of non-bare repository"
1818
4519
msgstr ""
1819
4520
1820
#: builtin/fetch.c:709
4521
#: builtin/fetch.c:712
1821
4522
#, c-format
1822
4523
msgid "Don't know how to fetch from %s"
1823
4524
msgstr ""
1824
4525
1825
#: builtin/fetch.c:786
4526
#: builtin/fetch.c:789
1826
4527
#, c-format
1827
4528
msgid "Option \"%s\" value \"%s\" is not valid for %s"
1828
4529
msgstr ""
1829
4530
1830
#: builtin/fetch.c:789
4531
#: builtin/fetch.c:792
1831
4532
#, c-format
1832
4533
msgid "Option \"%s\" is ignored for %s\n"
1833
4534
msgstr ""
1834
4535
1835
#: builtin/fetch.c:888
4536
#: builtin/fetch.c:894
1836
4537
#, c-format
1837
4538
msgid "Fetching %s\n"
1838
4539
msgstr ""
1839
4540
1840
#: builtin/fetch.c:890
4541
#: builtin/fetch.c:896 builtin/remote.c:100
1841
4542
#, c-format
1842
4543
msgid "Could not fetch %s"
1843
4544
msgstr ""
1844
4545
1845
#: builtin/fetch.c:907
4546
#: builtin/fetch.c:915
1846
4547
msgid ""
1847
4548
"No remote repository specified. Please, specify either a URL or a\n"
1848
4549
"remote name from which new revisions should be fetched."
1849
4550
msgstr ""
1850
4551
1851
#: builtin/fetch.c:927
4552
#: builtin/fetch.c:935
1852
4553
msgid "You need to specify a tag name."
1853
4554
msgstr ""
1854
4555
1855
#: builtin/fetch.c:979
4556
#: builtin/fetch.c:981
4557
msgid "--depth and --unshallow cannot be used together"
4558
msgstr ""
4559
4560
#: builtin/fetch.c:983
4561
msgid "--unshallow on a complete repository does not make sense"
4562
msgstr ""
4563
4564
#: builtin/fetch.c:1002
1856
4565
msgid "fetch --all does not take a repository argument"
1857
4566
msgstr ""
1858
4567
1859
#: builtin/fetch.c:981
4568
#: builtin/fetch.c:1004
1860
4569
msgid "fetch --all does not make sense with refspecs"
1861
4570
msgstr ""
1862
4571
1863
#: builtin/fetch.c:992
4572
#: builtin/fetch.c:1015
1864
4573
#, c-format
1865
4574
msgid "No such remote or remote group: %s"
1866
4575
msgstr ""
1867
4576
1868
#: builtin/fetch.c:1000
4577
#: builtin/fetch.c:1023
1869
4578
msgid "Fetching a group and specifying refspecs does not make sense"
1870
4579
msgstr ""
1871
4580
4581
#: builtin/fmt-merge-msg.c:13
4582
msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
4583
msgstr ""
4584
4585
#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701
4586
#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175
4587
#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239
4588
msgid "n"
4589
msgstr ""
4590
4591
#: builtin/fmt-merge-msg.c:664
4592
msgid "populate log with at most <n> entries from shortlog"
4593
msgstr ""
4594
4595
#: builtin/fmt-merge-msg.c:667
4596
msgid "alias for --log (deprecated)"
4597
msgstr ""
4598
4599
#: builtin/fmt-merge-msg.c:670
4600
msgid "text"
4601
msgstr ""
4602
4603
#: builtin/fmt-merge-msg.c:671
4604
msgid "use <text> as start of message"
4605
msgstr ""
4606
4607
#: builtin/fmt-merge-msg.c:672
4608
msgid "file to read from"
4609
msgstr ""
4610
4611
#: builtin/for-each-ref.c:979
4612
msgid "git for-each-ref [options] [<pattern>]"
4613
msgstr ""
4614
4615
#: builtin/for-each-ref.c:994
4616
msgid "quote placeholders suitably for shells"
4617
msgstr ""
4618
4619
#: builtin/for-each-ref.c:996
4620
msgid "quote placeholders suitably for perl"
4621
msgstr ""
4622
4623
#: builtin/for-each-ref.c:998
4624
msgid "quote placeholders suitably for python"
4625
msgstr ""
4626
4627
#: builtin/for-each-ref.c:1000
4628
msgid "quote placeholders suitably for tcl"
4629
msgstr ""
4630
4631
#: builtin/for-each-ref.c:1003
4632
msgid "show only <n> matched refs"
4633
msgstr ""
4634
4635
#: builtin/for-each-ref.c:1004
4636
msgid "format"
4637
msgstr ""
4638
4639
#: builtin/for-each-ref.c:1004
4640
msgid "format to use for the output"
4641
msgstr ""
4642
4643
#: builtin/for-each-ref.c:1005
4644
msgid "key"
4645
msgstr ""
4646
4647
#: builtin/for-each-ref.c:1006
4648
msgid "field name to sort on"
4649
msgstr ""
4650
4651
#: builtin/fsck.c:608
4652
msgid "git fsck [options] [<object>...]"
4653
msgstr ""
4654
4655
#: builtin/fsck.c:614
4656
msgid "show unreachable objects"
4657
msgstr ""
4658
4659
#: builtin/fsck.c:615
4660
msgid "show dangling objects"
4661
msgstr ""
4662
4663
#: builtin/fsck.c:616
4664
msgid "report tags"
4665
msgstr ""
4666
4667
#: builtin/fsck.c:617
4668
msgid "report root nodes"
4669
msgstr ""
4670
4671
#: builtin/fsck.c:618
4672
msgid "make index objects head nodes"
4673
msgstr ""
4674
4675
#: builtin/fsck.c:619
4676
msgid "make reflogs head nodes (default)"
4677
msgstr ""
4678
4679
#: builtin/fsck.c:620
4680
msgid "also consider packs and alternate objects"
4681
msgstr ""
4682
4683
#: builtin/fsck.c:621
4684
msgid "enable more strict checking"
4685
msgstr ""
4686
4687
#: builtin/fsck.c:623
4688
msgid "write dangling objects in .git/lost-found"
4689
msgstr ""
4690
4691
#: builtin/fsck.c:624 builtin/prune.c:134
4692
msgid "show progress"
4693
msgstr ""
4694
4695
#: builtin/gc.c:22
4696
msgid "git gc [options]"
4697
msgstr ""
4698
1872
4699
#: builtin/gc.c:63
1873
4700
#, c-format
1874
4701
msgid "Invalid %s: '%s'"
1879
4706
msgid "insanely long object directory %.*s"
1880
4707
msgstr ""
1881
4708
1882
#: builtin/gc.c:221
1883
#, c-format
1884
msgid "Auto packing the repository for optimum performance.\n"
1885
msgstr ""
1886
1887
#: builtin/gc.c:224
4709
#: builtin/gc.c:179
4710
msgid "prune unreferenced objects"
4711
msgstr ""
4712
4713
#: builtin/gc.c:181
4714
msgid "be more thorough (increased runtime)"
4715
msgstr ""
4716
4717
#: builtin/gc.c:182
4718
msgid "enable auto-gc mode"
4719
msgstr ""
4720
4721
#: builtin/gc.c:222
1888
4722
#, c-format
1889
4723
msgid ""
1890
4724
"Auto packing the repository for optimum performance. You may also\n"
1891
4725
"run \"git gc\" manually. See \"git help gc\" for more information.\n"
1892
4726
msgstr ""
1893
4727
1894
#: builtin/gc.c:251
4728
#: builtin/gc.c:249
1895
4729
msgid ""
1896
4730
"There are too many unreachable loose objects; run 'git prune' to remove them."
1897
4731
msgstr ""
1898
4732
1899
#: builtin/grep.c:216
4733
#: builtin/grep.c:22
4734
msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"
4735
msgstr ""
4736
4737
#: builtin/grep.c:217
1900
4738
#, c-format
1901
4739
msgid "grep: failed to create thread: %s"
1902
4740
msgstr ""
1903
4741
1904
#: builtin/grep.c:402
4742
#: builtin/grep.c:365
1905
4743
#, c-format
1906
4744
msgid "Failed to chdir: %s"
1907
4745
msgstr ""
1908
4746
1909
#: builtin/grep.c:478 builtin/grep.c:512
4747
#: builtin/grep.c:443 builtin/grep.c:478
1910
4748
#, c-format
1911
4749
msgid "unable to read tree (%s)"
1912
4750
msgstr ""
1913
4751
1914
#: builtin/grep.c:526
4752
#: builtin/grep.c:493
1915
4753
#, c-format
1916
4754
msgid "unable to grep from object of type %s"
1917
4755
msgstr ""
1918
4756
1919
#: builtin/grep.c:584
4757
#: builtin/grep.c:551
1920
4758
#, c-format
1921
4759
msgid "switch `%c' expects a numerical value"
1922
4760
msgstr ""
1923
4761
1924
#: builtin/grep.c:601
4762
#: builtin/grep.c:568
1925
4763
#, c-format
1926
4764
msgid "cannot open '%s'"
1927
4765
msgstr ""
1928
4766
1929
#: builtin/grep.c:888
4767
#: builtin/grep.c:643
4768
msgid "search in index instead of in the work tree"
4769
msgstr ""
4770
4771
#: builtin/grep.c:645
4772
msgid "find in contents not managed by git"
4773
msgstr ""
4774
4775
#: builtin/grep.c:647
4776
msgid "search in both tracked and untracked files"
4777
msgstr ""
4778
4779
#: builtin/grep.c:649
4780
msgid "search also in ignored files"
4781
msgstr ""
4782
4783
#: builtin/grep.c:652
4784
msgid "show non-matching lines"
4785
msgstr ""
4786
4787
#: builtin/grep.c:654
4788
msgid "case insensitive matching"
4789
msgstr ""
4790
4791
#: builtin/grep.c:656
4792
msgid "match patterns only at word boundaries"
4793
msgstr ""
4794
4795
#: builtin/grep.c:658
4796
msgid "process binary files as text"
4797
msgstr ""
4798
4799
#: builtin/grep.c:660
4800
msgid "don't match patterns in binary files"
4801
msgstr ""
4802
4803
#: builtin/grep.c:663
4804
msgid "descend at most <depth> levels"
4805
msgstr ""
4806
4807
#: builtin/grep.c:667
4808
msgid "use extended POSIX regular expressions"
4809
msgstr ""
4810
4811
#: builtin/grep.c:670
4812
msgid "use basic POSIX regular expressions (default)"
4813
msgstr ""
4814
4815
#: builtin/grep.c:673
4816
msgid "interpret patterns as fixed strings"
4817
msgstr ""
4818
4819
#: builtin/grep.c:676
4820
msgid "use Perl-compatible regular expressions"
4821
msgstr ""
4822
4823
#: builtin/grep.c:679
4824
msgid "show line numbers"
4825
msgstr ""
4826
4827
#: builtin/grep.c:680
4828
msgid "don't show filenames"
4829
msgstr ""
4830
4831
#: builtin/grep.c:681
4832
msgid "show filenames"
4833
msgstr ""
4834
4835
#: builtin/grep.c:683
4836
msgid "show filenames relative to top directory"
4837
msgstr ""
4838
4839
#: builtin/grep.c:685
4840
msgid "show only filenames instead of matching lines"
4841
msgstr ""
4842
4843
#: builtin/grep.c:687
4844
msgid "synonym for --files-with-matches"
4845
msgstr ""
4846
4847
#: builtin/grep.c:690
4848
msgid "show only the names of files without match"
4849
msgstr ""
4850
4851
#: builtin/grep.c:692
4852
msgid "print NUL after filenames"
4853
msgstr ""
4854
4855
#: builtin/grep.c:694
4856
msgid "show the number of matches instead of matching lines"
4857
msgstr ""
4858
4859
#: builtin/grep.c:695
4860
msgid "highlight matches"
4861
msgstr ""
4862
4863
#: builtin/grep.c:697
4864
msgid "print empty line between matches from different files"
4865
msgstr ""
4866
4867
#: builtin/grep.c:699
4868
msgid "show filename only once above matches from same file"
4869
msgstr ""
4870
4871
#: builtin/grep.c:702
4872
msgid "show <n> context lines before and after matches"
4873
msgstr ""
4874
4875
#: builtin/grep.c:705
4876
msgid "show <n> context lines before matches"
4877
msgstr ""
4878
4879
#: builtin/grep.c:707
4880
msgid "show <n> context lines after matches"
4881
msgstr ""
4882
4883
#: builtin/grep.c:708
4884
msgid "shortcut for -C NUM"
4885
msgstr ""
4886
4887
#: builtin/grep.c:711
4888
msgid "show a line with the function name before matches"
4889
msgstr ""
4890
4891
#: builtin/grep.c:713
4892
msgid "show the surrounding function"
4893
msgstr ""
4894
4895
#: builtin/grep.c:716
4896
msgid "read patterns from file"
4897
msgstr ""
4898
4899
#: builtin/grep.c:718
4900
msgid "match <pattern>"
4901
msgstr ""
4902
4903
#: builtin/grep.c:720
4904
msgid "combine patterns specified with -e"
4905
msgstr ""
4906
4907
#: builtin/grep.c:732
4908
msgid "indicate hit with exit status without output"
4909
msgstr ""
4910
4911
#: builtin/grep.c:734
4912
msgid "show only matches from files that match all patterns"
4913
msgstr ""
4914
4915
#: builtin/grep.c:736
4916
msgid "show parse tree for grep expression"
4917
msgstr ""
4918
4919
#: builtin/grep.c:740
4920
msgid "pager"
4921
msgstr ""
4922
4923
#: builtin/grep.c:740
4924
msgid "show matching files in the pager"
4925
msgstr ""
4926
4927
#: builtin/grep.c:743
4928
msgid "allow calling of grep(1) (ignored by this build)"
4929
msgstr ""
4930
4931
#: builtin/grep.c:744 builtin/show-ref.c:184
4932
msgid "show usage"
4933
msgstr ""
4934
4935
#: builtin/grep.c:811
1930
4936
msgid "no pattern given."
1931
4937
msgstr ""
1932
4938
1933
#: builtin/grep.c:902
1934
#, c-format
1935
msgid "bad object %s"
1936
msgstr ""
1937
1938
#: builtin/grep.c:943
4939
#: builtin/grep.c:866
1939
4940
msgid "--open-files-in-pager only works on the worktree"
1940
4941
msgstr ""
1941
4942
1942
#: builtin/grep.c:966
4943
#: builtin/grep.c:889
1943
4944
msgid "--cached or --untracked cannot be used with --no-index."
1944
4945
msgstr ""
1945
4946
1946
#: builtin/grep.c:971
4947
#: builtin/grep.c:894
1947
4948
msgid "--no-index or --untracked cannot be used with revs."
1948
4949
msgstr ""
1949
4950
1950
#: builtin/grep.c:974
4951
#: builtin/grep.c:897
1951
4952
msgid "--[no-]exclude-standard cannot be used for tracked contents."
1952
4953
msgstr ""
1953
4954
1954
#: builtin/grep.c:982
4955
#: builtin/grep.c:905
1955
4956
msgid "both --cached and trees are given."
1956
4957
msgstr ""
1957
4958
4959
#: builtin/hash-object.c:60
4960
msgid ""
4961
"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "
4962
"<file>..."
4963
msgstr ""
4964
4965
#: builtin/hash-object.c:61
4966
msgid "git hash-object --stdin-paths < <list-of-paths>"
4967
msgstr ""
4968
4969
#: builtin/hash-object.c:72
4970
msgid "type"
4971
msgstr ""
4972
4973
#: builtin/hash-object.c:72
4974
msgid "object type"
4975
msgstr ""
4976
4977
#: builtin/hash-object.c:73
4978
msgid "write the object into the object database"
4979
msgstr ""
4980
4981
#: builtin/hash-object.c:74
4982
msgid "read the object from stdin"
4983
msgstr ""
4984
4985
#: builtin/hash-object.c:76
4986
msgid "store file as is without filters"
4987
msgstr ""
4988
4989
#: builtin/hash-object.c:77
4990
msgid "process file as it were from this path"
4991
msgstr ""
4992
4993
#: builtin/help.c:43
4994
msgid "print all available commands"
4995
msgstr ""
4996
4997
#: builtin/help.c:44
4998
msgid "print list of useful guides"
4999
msgstr ""
5000
5001
#: builtin/help.c:45
5002
msgid "show man page"
5003
msgstr ""
5004
5005
#: builtin/help.c:46
5006
msgid "show manual in web browser"
5007
msgstr ""
5008
5009
#: builtin/help.c:48
5010
msgid "show info page"
5011
msgstr ""
5012
5013
#: builtin/help.c:54
5014
msgid "git help [--all] [--guides] [--man|--web|--info] [command]"
5015
msgstr ""
5016
5017
#: builtin/help.c:66
5018
#, c-format
5019
msgid "unrecognized help format '%s'"
5020
msgstr ""
5021
5022
#: builtin/help.c:94
5023
msgid "Failed to start emacsclient."
5024
msgstr ""
5025
5026
#: builtin/help.c:107
5027
msgid "Failed to parse emacsclient version."
5028
msgstr ""
5029
5030
#: builtin/help.c:115
5031
#, c-format
5032
msgid "emacsclient version '%d' too old (< 22)."
5033
msgstr ""
5034
5035
#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178
5036
#, c-format
5037
msgid "failed to exec '%s': %s"
5038
msgstr ""
5039
5040
#: builtin/help.c:218
5041
#, c-format
5042
msgid ""
5043
"'%s': path for unsupported man viewer.\n"
5044
"Please consider using 'man.<tool>.cmd' instead."
5045
msgstr ""
5046
5047
#: builtin/help.c:230
5048
#, c-format
5049
msgid ""
5050
"'%s': cmd for supported man viewer.\n"
5051
"Please consider using 'man.<tool>.path' instead."
5052
msgstr ""
5053
5054
#: builtin/help.c:351
5055
#, c-format
5056
msgid "'%s': unknown man viewer."
5057
msgstr ""
5058
5059
#: builtin/help.c:368
5060
msgid "no man viewer handled the request"
5061
msgstr ""
5062
5063
#: builtin/help.c:376
5064
msgid "no info viewer handled the request"
5065
msgstr ""
5066
5067
#: builtin/help.c:422
5068
msgid "Defining attributes per path"
5069
msgstr ""
5070
5071
#: builtin/help.c:423
5072
msgid "A Git glossary"
5073
msgstr ""
5074
5075
#: builtin/help.c:424
5076
msgid "Specifies intentionally untracked files to ignore"
5077
msgstr ""
5078
5079
#: builtin/help.c:425
5080
msgid "Defining submodule properties"
5081
msgstr ""
5082
5083
#: builtin/help.c:426
5084
msgid "Specifying revisions and ranges for Git"
5085
msgstr ""
5086
5087
#: builtin/help.c:427
5088
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
5089
msgstr ""
5090
5091
#: builtin/help.c:428
5092
msgid "An overview of recommended workflows with Git"
5093
msgstr ""
5094
5095
#: builtin/help.c:440
5096
msgid "The common Git guides are:\n"
5097
msgstr ""
5098
5099
#: builtin/help.c:462 builtin/help.c:478
5100
#, c-format
5101
msgid "usage: %s%s"
5102
msgstr ""
5103
5104
#: builtin/help.c:494
5105
#, c-format
5106
msgid "`git %s' is aliased to `%s'"
5107
msgstr ""
5108
5109
#: builtin/index-pack.c:182
5110
#, c-format
5111
msgid "object type mismatch at %s"
5112
msgstr ""
5113
5114
#: builtin/index-pack.c:202
5115
msgid "object of unexpected type"
5116
msgstr ""
5117
5118
#: builtin/index-pack.c:239
5119
#, c-format
5120
msgid "cannot fill %d byte"
5121
msgid_plural "cannot fill %d bytes"
5122
msgstr[0] ""
5123
msgstr[1] ""
5124
5125
#: builtin/index-pack.c:249
5126
msgid "early EOF"
5127
msgstr ""
5128
5129
#: builtin/index-pack.c:250
5130
msgid "read error on input"
5131
msgstr ""
5132
5133
#: builtin/index-pack.c:262
5134
msgid "used more bytes than were available"
5135
msgstr ""
5136
5137
#: builtin/index-pack.c:269
5138
msgid "pack too large for current definition of off_t"
5139
msgstr ""
5140
5141
#: builtin/index-pack.c:285
5142
#, c-format
5143
msgid "unable to create '%s'"
5144
msgstr ""
5145
5146
#: builtin/index-pack.c:290
5147
#, c-format
5148
msgid "cannot open packfile '%s'"
5149
msgstr ""
5150
5151
#: builtin/index-pack.c:304
5152
msgid "pack signature mismatch"
5153
msgstr ""
5154
5155
#: builtin/index-pack.c:306
5156
#, c-format
5157
msgid "pack version %<PRIu32> unsupported"
5158
msgstr ""
5159
5160
#: builtin/index-pack.c:324
5161
#, c-format
5162
msgid "pack has bad object at offset %lu: %s"
5163
msgstr ""
5164
5165
#: builtin/index-pack.c:446
5166
#, c-format
5167
msgid "inflate returned %d"
5168
msgstr ""
5169
5170
#: builtin/index-pack.c:495
5171
msgid "offset value overflow for delta base object"
5172
msgstr ""
5173
5174
#: builtin/index-pack.c:503
5175
msgid "delta base offset is out of bound"
5176
msgstr ""
5177
5178
#: builtin/index-pack.c:511
5179
#, c-format
5180
msgid "unknown object type %d"
5181
msgstr ""
5182
5183
#: builtin/index-pack.c:542
5184
msgid "cannot pread pack file"
5185
msgstr ""
5186
5187
#: builtin/index-pack.c:544
5188
#, c-format
5189
msgid "premature end of pack file, %lu byte missing"
5190
msgid_plural "premature end of pack file, %lu bytes missing"
5191
msgstr[0] ""
5192
msgstr[1] ""
5193
5194
#: builtin/index-pack.c:570
5195
msgid "serious inflate inconsistency"
5196
msgstr ""
5197
5198
#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690
5199
#: builtin/index-pack.c:724 builtin/index-pack.c:733
5200
#, c-format
5201
msgid "SHA1 COLLISION FOUND WITH %s !"
5202
msgstr ""
5203
5204
#: builtin/index-pack.c:664 builtin/pack-objects.c:170
5205
#: builtin/pack-objects.c:262
5206
#, c-format
5207
msgid "unable to read %s"
5208
msgstr ""
5209
5210
#: builtin/index-pack.c:730
5211
#, c-format
5212
msgid "cannot read existing object %s"
5213
msgstr ""
5214
5215
#: builtin/index-pack.c:744
5216
#, c-format
5217
msgid "invalid blob object %s"
5218
msgstr ""
5219
5220
#: builtin/index-pack.c:759
5221
#, c-format
5222
msgid "invalid %s"
5223
msgstr ""
5224
5225
#: builtin/index-pack.c:761
5226
msgid "Error in object"
5227
msgstr ""
5228
5229
#: builtin/index-pack.c:763
5230
#, c-format
5231
msgid "Not all child objects of %s are reachable"
5232
msgstr ""
5233
5234
#: builtin/index-pack.c:833 builtin/index-pack.c:863
5235
msgid "failed to apply delta"
5236
msgstr ""
5237
5238
#: builtin/index-pack.c:1004
5239
msgid "Receiving objects"
5240
msgstr ""
5241
5242
#: builtin/index-pack.c:1004
5243
msgid "Indexing objects"
5244
msgstr ""
5245
5246
#: builtin/index-pack.c:1030
5247
msgid "pack is corrupted (SHA1 mismatch)"
5248
msgstr ""
5249
5250
#: builtin/index-pack.c:1035
5251
msgid "cannot fstat packfile"
5252
msgstr ""
5253
5254
#: builtin/index-pack.c:1038
5255
msgid "pack has junk at the end"
5256
msgstr ""
5257
5258
#: builtin/index-pack.c:1049
5259
msgid "confusion beyond insanity in parse_pack_objects()"
5260
msgstr ""
5261
5262
#: builtin/index-pack.c:1072
5263
msgid "Resolving deltas"
5264
msgstr ""
5265
5266
#: builtin/index-pack.c:1082
5267
#, c-format
5268
msgid "unable to create thread: %s"
5269
msgstr ""
5270
5271
#: builtin/index-pack.c:1124
5272
msgid "confusion beyond insanity"
5273
msgstr ""
5274
5275
#: builtin/index-pack.c:1132
5276
#, c-format
5277
msgid "completed with %d local objects"
5278
msgstr ""
5279
5280
#: builtin/index-pack.c:1142
5281
#, c-format
5282
msgid "Unexpected tail checksum for %s (disk corruption?)"
5283
msgstr ""
5284
5285
#: builtin/index-pack.c:1146
5286
#, c-format
5287
msgid "pack has %d unresolved delta"
5288
msgid_plural "pack has %d unresolved deltas"
5289
msgstr[0] ""
5290
msgstr[1] ""
5291
5292
#: builtin/index-pack.c:1171
5293
#, c-format
5294
msgid "unable to deflate appended object (%d)"
5295
msgstr ""
5296
5297
#: builtin/index-pack.c:1250
5298
#, c-format
5299
msgid "local object %s is corrupt"
5300
msgstr ""
5301
5302
#: builtin/index-pack.c:1274
5303
msgid "error while closing pack file"
5304
msgstr ""
5305
5306
#: builtin/index-pack.c:1287
5307
#, c-format
5308
msgid "cannot write keep file '%s'"
5309
msgstr ""
5310
5311
#: builtin/index-pack.c:1295
5312
#, c-format
5313
msgid "cannot close written keep file '%s'"
5314
msgstr ""
5315
5316
#: builtin/index-pack.c:1308
5317
msgid "cannot store pack file"
5318
msgstr ""
5319
5320
#: builtin/index-pack.c:1319
5321
msgid "cannot store index file"
5322
msgstr ""
5323
5324
#: builtin/index-pack.c:1352
5325
#, c-format
5326
msgid "bad pack.indexversion=%<PRIu32>"
5327
msgstr ""
5328
5329
#: builtin/index-pack.c:1358
5330
#, c-format
5331
msgid "invalid number of threads specified (%d)"
5332
msgstr ""
5333
5334
#: builtin/index-pack.c:1362 builtin/index-pack.c:1535
5335
#, c-format
5336
msgid "no threads support, ignoring %s"
5337
msgstr ""
5338
5339
#: builtin/index-pack.c:1420
5340
#, c-format
5341
msgid "Cannot open existing pack file '%s'"
5342
msgstr ""
5343
5344
#: builtin/index-pack.c:1422
5345
#, c-format
5346
msgid "Cannot open existing pack idx file for '%s'"
5347
msgstr ""
5348
5349
#: builtin/index-pack.c:1469
5350
#, c-format
5351
msgid "non delta: %d object"
5352
msgid_plural "non delta: %d objects"
5353
msgstr[0] ""
5354
msgstr[1] ""
5355
5356
#: builtin/index-pack.c:1476
5357
#, c-format
5358
msgid "chain length = %d: %lu object"
5359
msgid_plural "chain length = %d: %lu objects"
5360
msgstr[0] ""
5361
msgstr[1] ""
5362
5363
#: builtin/index-pack.c:1503
5364
msgid "Cannot come back to cwd"
5365
msgstr ""
5366
5367
#: builtin/index-pack.c:1547 builtin/index-pack.c:1550
5368
#: builtin/index-pack.c:1562 builtin/index-pack.c:1566
5369
#, c-format
5370
msgid "bad %s"
5371
msgstr ""
5372
5373
#: builtin/index-pack.c:1580
5374
msgid "--fix-thin cannot be used without --stdin"
5375
msgstr ""
5376
5377
#: builtin/index-pack.c:1584 builtin/index-pack.c:1594
5378
#, c-format
5379
msgid "packfile name '%s' does not end with '.pack'"
5380
msgstr ""
5381
5382
#: builtin/index-pack.c:1603
5383
msgid "--verify with no packfile name given"
5384
msgstr ""
5385
1958
5386
#: builtin/init-db.c:35
1959
5387
#, c-format
1960
5388
msgid "Could not make %s writable by group"
2025
5453
msgid "insane git directory %s"
2026
5454
msgstr ""
2027
5455
2028
#: builtin/init-db.c:322 builtin/init-db.c:325
5456
#: builtin/init-db.c:323 builtin/init-db.c:326
2029
5457
#, c-format
2030
5458
msgid "%s already exists"
2031
5459
msgstr ""
2032
5460
2033
#: builtin/init-db.c:354
5461
#: builtin/init-db.c:355
2034
5462
#, c-format
2035
5463
msgid "unable to handle file type %d"
2036
5464
msgstr ""
2037
5465
2038
#: builtin/init-db.c:357
5466
#: builtin/init-db.c:358
2039
5467
#, c-format
2040
5468
msgid "unable to move %s to %s"
2041
5469
msgstr ""
2042
5470
2043
#: builtin/init-db.c:362
5471
#: builtin/init-db.c:363
2044
5472
#, c-format
2045
5473
msgid "Could not create git link %s"
2046
5474
msgstr ""
2050
5478
#. * existing" or "Initialized empty", the second " shared" or
2051
5479
#. * "", and the last '%s%s' is the verbatim directory name.
2052
5480
#.
2053
#: builtin/init-db.c:419
5481
#: builtin/init-db.c:420
2054
5482
#, c-format
2055
5483
msgid "%s%s Git repository in %s%s\n"
2056
5484
msgstr ""
2057
5485
2058
#: builtin/init-db.c:420
5486
#: builtin/init-db.c:421
2059
5487
msgid "Reinitialized existing"
2060
5488
msgstr ""
2061
5489
2062
#: builtin/init-db.c:420
5490
#: builtin/init-db.c:421
2063
5491
msgid "Initialized empty"
2064
5492
msgstr ""
2065
5493
2066
#: builtin/init-db.c:421
5494
#: builtin/init-db.c:422
2067
5495
msgid " shared"
2068
5496
msgstr ""
2069
5497
2070
#: builtin/init-db.c:440
5498
#: builtin/init-db.c:441
2071
5499
msgid "cannot tell cwd"
2072
5500
msgstr ""
2073
5501
2074
#: builtin/init-db.c:521 builtin/init-db.c:528
5502
#: builtin/init-db.c:467
5503
msgid ""
5504
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5505
"shared[=<permissions>]] [directory]"
5506
msgstr ""
5507
5508
#: builtin/init-db.c:490
5509
msgid "permissions"
5510
msgstr ""
5511
5512
#: builtin/init-db.c:491
5513
msgid "specify that the git repository is to be shared amongst several users"
5514
msgstr ""
5515
5516
#: builtin/init-db.c:493 builtin/prune-packed.c:77
5517
msgid "be quiet"
5518
msgstr ""
5519
5520
#: builtin/init-db.c:522 builtin/init-db.c:529
2075
5521
#, c-format
2076
5522
msgid "cannot mkdir %s"
2077
5523
msgstr ""
2078
5524
2079
#: builtin/init-db.c:532
5525
#: builtin/init-db.c:533
2080
5526
#, c-format
2081
5527
msgid "cannot chdir to %s"
2082
5528
msgstr ""
2083
5529
2084
#: builtin/init-db.c:554
5530
#: builtin/init-db.c:555
2085
5531
#, c-format
2086
5532
msgid ""
2087
5533
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
2088
5534
"dir=<directory>)"
2089
5535
msgstr ""
2090
5536
2091
#: builtin/init-db.c:578
5537
#: builtin/init-db.c:579
2092
5538
msgid "Cannot access current working directory"
2093
5539
msgstr ""
2094
5540
2095
#: builtin/init-db.c:585
5541
#: builtin/init-db.c:586
2096
5542
#, c-format
2097
5543
msgid "Cannot access work tree '%s'"
2098
5544
msgstr ""
2099
5545
2100
#: builtin/log.c:187
5546
#: builtin/log.c:40
5547
msgid "git log [<options>] [<revision range>] [[--] <path>...]\n"
5548
msgstr ""
5549
5550
#: builtin/log.c:41
5551
msgid " or: git show [options] <object>..."
5552
msgstr ""
5553
5554
#: builtin/log.c:103
5555
msgid "suppress diff output"
5556
msgstr ""
5557
5558
#: builtin/log.c:104
5559
msgid "show source"
5560
msgstr ""
5561
5562
#: builtin/log.c:105
5563
msgid "Use mail map file"
5564
msgstr ""
5565
5566
#: builtin/log.c:106
5567
msgid "decorate options"
5568
msgstr ""
5569
5570
#: builtin/log.c:199
2101
5571
#, c-format
2102
5572
msgid "Final output: %d %s\n"
2103
5573
msgstr ""
2104
5574
2105
#: builtin/log.c:395 builtin/log.c:483
5575
#: builtin/log.c:422 builtin/log.c:514
2106
5576
#, c-format
2107
5577
msgid "Could not read object %s"
2108
5578
msgstr ""
2109
5579
2110
#: builtin/log.c:507
5580
#: builtin/log.c:538
2111
5581
#, c-format
2112
5582
msgid "Unknown type: %d"
2113
5583
msgstr ""
2114
5584
2115
#: builtin/log.c:596
5585
#: builtin/log.c:638
2116
5586
msgid "format.headers without value"
2117
5587
msgstr ""
2118
5588
2119
#: builtin/log.c:669
5589
#: builtin/log.c:720
2120
5590
msgid "name of output directory is too long"
2121
5591
msgstr ""
2122
5592
2123
#: builtin/log.c:680
5593
#: builtin/log.c:736
2124
5594
#, c-format
2125
5595
msgid "Cannot open patch file %s"
2126
5596
msgstr ""
2127
5597
2128
#: builtin/log.c:694
5598
#: builtin/log.c:750
2129
5599
msgid "Need exactly one range."
2130
5600
msgstr ""
2131
5601
2132
#: builtin/log.c:702
5602
#: builtin/log.c:758
2133
5603
msgid "Not a range."
2134
5604
msgstr ""
2135
5605
2136
#: builtin/log.c:739
2137
msgid "Could not extract email from committer identity."
2138
msgstr ""
2139
2140
#: builtin/log.c:785
5606
#: builtin/log.c:860
2141
5607
msgid "Cover letter needs email format"
2142
5608
msgstr ""
2143
5609
2144
#: builtin/log.c:879
5610
#: builtin/log.c:936
2145
5611
#, c-format
2146
5612
msgid "insane in-reply-to: %s"
2147
5613
msgstr ""
2148
5614
2149
#: builtin/log.c:952
5615
#: builtin/log.c:964
5616
msgid "git format-patch [options] [<since> | <revision range>]"
5617
msgstr ""
5618
5619
#: builtin/log.c:1009
2150
5620
msgid "Two output directories?"
2151
5621
msgstr ""
2152
5622
2153
#: builtin/log.c:1173
2154
#, c-format
2155
msgid "bogus committer info %s"
2156
msgstr ""
2157
2158
#: builtin/log.c:1218
5623
#: builtin/log.c:1108
5624
msgid "use [PATCH n/m] even with a single patch"
5625
msgstr ""
5626
5627
#: builtin/log.c:1111
5628
msgid "use [PATCH] even with multiple patches"
5629
msgstr ""
5630
5631
#: builtin/log.c:1115
5632
msgid "print patches to standard out"
5633
msgstr ""
5634
5635
#: builtin/log.c:1117
5636
msgid "generate a cover letter"
5637
msgstr ""
5638
5639
#: builtin/log.c:1119
5640
msgid "use simple number sequence for output file names"
5641
msgstr ""
5642
5643
#: builtin/log.c:1120
5644
msgid "sfx"
5645
msgstr ""
5646
5647
#: builtin/log.c:1121
5648
msgid "use <sfx> instead of '.patch'"
5649
msgstr ""
5650
5651
#: builtin/log.c:1123
5652
msgid "start numbering patches at <n> instead of 1"
5653
msgstr ""
5654
5655
#: builtin/log.c:1125
5656
msgid "mark the series as Nth re-roll"
5657
msgstr ""
5658
5659
#: builtin/log.c:1127
5660
msgid "Use [<prefix>] instead of [PATCH]"
5661
msgstr ""
5662
5663
#: builtin/log.c:1130
5664
msgid "store resulting files in <dir>"
5665
msgstr ""
5666
5667
#: builtin/log.c:1133
5668
msgid "don't strip/add [PATCH]"
5669
msgstr ""
5670
5671
#: builtin/log.c:1136
5672
msgid "don't output binary diffs"
5673
msgstr ""
5674
5675
#: builtin/log.c:1138
5676
msgid "don't include a patch matching a commit upstream"
5677
msgstr ""
5678
5679
#: builtin/log.c:1140
5680
msgid "show patch format instead of default (patch + stat)"
5681
msgstr ""
5682
5683
#: builtin/log.c:1142
5684
msgid "Messaging"
5685
msgstr ""
5686
5687
#: builtin/log.c:1143
5688
msgid "header"
5689
msgstr ""
5690
5691
#: builtin/log.c:1144
5692
msgid "add email header"
5693
msgstr ""
5694
5695
#: builtin/log.c:1145 builtin/log.c:1147
5696
msgid "email"
5697
msgstr ""
5698
5699
#: builtin/log.c:1145
5700
msgid "add To: header"
5701
msgstr ""
5702
5703
#: builtin/log.c:1147
5704
msgid "add Cc: header"
5705
msgstr ""
5706
5707
#: builtin/log.c:1149
5708
msgid "message-id"
5709
msgstr ""
5710
5711
#: builtin/log.c:1150
5712
msgid "make first mail a reply to <message-id>"
5713
msgstr ""
5714
5715
#: builtin/log.c:1151 builtin/log.c:1154
5716
msgid "boundary"
5717
msgstr ""
5718
5719
#: builtin/log.c:1152
5720
msgid "attach the patch"
5721
msgstr ""
5722
5723
#: builtin/log.c:1155
5724
msgid "inline the patch"
5725
msgstr ""
5726
5727
#: builtin/log.c:1159
5728
msgid "enable message threading, styles: shallow, deep"
5729
msgstr ""
5730
5731
#: builtin/log.c:1161
5732
msgid "signature"
5733
msgstr ""
5734
5735
#: builtin/log.c:1162
5736
msgid "add a signature"
5737
msgstr ""
5738
5739
#: builtin/log.c:1164
5740
msgid "don't print the patch filenames"
5741
msgstr ""
5742
5743
#: builtin/log.c:1248
2159
5744
msgid "-n and -k are mutually exclusive."
2160
5745
msgstr ""
2161
5746
2162
#: builtin/log.c:1220
5747
#: builtin/log.c:1250
2163
5748
msgid "--subject-prefix and -k are mutually exclusive."
2164
5749
msgstr ""
2165
5750
2166
#: builtin/log.c:1225 builtin/shortlog.c:284
2167
#, c-format
2168
msgid "unrecognized argument: %s"
2169
msgstr ""
2170
2171
#: builtin/log.c:1228
5751
#: builtin/log.c:1258
2172
5752
msgid "--name-only does not make sense"
2173
5753
msgstr ""
2174
5754
2175
#: builtin/log.c:1230
5755
#: builtin/log.c:1260
2176
5756
msgid "--name-status does not make sense"
2177
5757
msgstr ""
2178
5758
2179
#: builtin/log.c:1232
5759
#: builtin/log.c:1262
2180
5760
msgid "--check does not make sense"
2181
5761
msgstr ""
2182
5762
2183
#: builtin/log.c:1255
5763
#: builtin/log.c:1285
2184
5764
msgid "standard output, or directory, which one?"
2185
5765
msgstr ""
2186
5766
2187
#: builtin/log.c:1257
5767
#: builtin/log.c:1287
2188
5768
#, c-format
2189
5769
msgid "Could not create directory '%s'"
2190
5770
msgstr ""
2191
5771
2192
#: builtin/log.c:1410
5772
#: builtin/log.c:1435
2193
5773
msgid "Failed to create output files"
2194
5774
msgstr ""
2195
5775
2196
#: builtin/log.c:1514
5776
#: builtin/log.c:1484
5777
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
5778
msgstr ""
5779
5780
#: builtin/log.c:1539
2197
5781
#, c-format
2198
5782
msgid ""
2199
5783
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
2200
5784
msgstr ""
2201
5785
2202
#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544
5786
#: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566
2203
5787
#, c-format
2204
5788
msgid "Unknown commit %s"
2205
5789
msgstr ""
2206
5790
5791
#: builtin/ls-files.c:402
5792
msgid "git ls-files [options] [<file>...]"
5793
msgstr ""
5794
5795
#: builtin/ls-files.c:459
5796
msgid "identify the file status with tags"
5797
msgstr ""
5798
5799
#: builtin/ls-files.c:461
5800
msgid "use lowercase letters for 'assume unchanged' files"
5801
msgstr ""
5802
5803
#: builtin/ls-files.c:463
5804
msgid "show cached files in the output (default)"
5805
msgstr ""
5806
5807
#: builtin/ls-files.c:465
5808
msgid "show deleted files in the output"
5809
msgstr ""
5810
5811
#: builtin/ls-files.c:467
5812
msgid "show modified files in the output"
5813
msgstr ""
5814
5815
#: builtin/ls-files.c:469
5816
msgid "show other files in the output"
5817
msgstr ""
5818
5819
#: builtin/ls-files.c:471
5820
msgid "show ignored files in the output"
5821
msgstr ""
5822
5823
#: builtin/ls-files.c:474
5824
msgid "show staged contents' object name in the output"
5825
msgstr ""
5826
5827
#: builtin/ls-files.c:476
5828
msgid "show files on the filesystem that need to be removed"
5829
msgstr ""
5830
5831
#: builtin/ls-files.c:478
5832
msgid "show 'other' directories' name only"
5833
msgstr ""
5834
5835
#: builtin/ls-files.c:481
5836
msgid "don't show empty directories"
5837
msgstr ""
5838
5839
#: builtin/ls-files.c:484
5840
msgid "show unmerged files in the output"
5841
msgstr ""
5842
5843
#: builtin/ls-files.c:486
5844
msgid "show resolve-undo information"
5845
msgstr ""
5846
5847
#: builtin/ls-files.c:488
5848
msgid "skip files matching pattern"
5849
msgstr ""
5850
5851
#: builtin/ls-files.c:491
5852
msgid "exclude patterns are read from <file>"
5853
msgstr ""
5854
5855
#: builtin/ls-files.c:494
5856
msgid "read additional per-directory exclude patterns in <file>"
5857
msgstr ""
5858
5859
#: builtin/ls-files.c:496
5860
msgid "add the standard git exclusions"
5861
msgstr ""
5862
5863
#: builtin/ls-files.c:499
5864
msgid "make the output relative to the project top directory"
5865
msgstr ""
5866
5867
#: builtin/ls-files.c:502
5868
msgid "if any <file> is not in the index, treat this as an error"
5869
msgstr ""
5870
5871
#: builtin/ls-files.c:503
5872
msgid "tree-ish"
5873
msgstr ""
5874
5875
#: builtin/ls-files.c:504
5876
msgid "pretend that paths removed since <tree-ish> are still present"
5877
msgstr ""
5878
5879
#: builtin/ls-files.c:506
5880
msgid "show debugging data"
5881
msgstr ""
5882
5883
#: builtin/ls-tree.c:27
5884
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
5885
msgstr ""
5886
5887
#: builtin/ls-tree.c:125
5888
msgid "only show trees"
5889
msgstr ""
5890
5891
#: builtin/ls-tree.c:127
5892
msgid "recurse into subtrees"
5893
msgstr ""
5894
5895
#: builtin/ls-tree.c:129
5896
msgid "show trees when recursing"
5897
msgstr ""
5898
5899
#: builtin/ls-tree.c:132
5900
msgid "terminate entries with NUL byte"
5901
msgstr ""
5902
5903
#: builtin/ls-tree.c:133
5904
msgid "include object size"
5905
msgstr ""
5906
5907
#: builtin/ls-tree.c:135 builtin/ls-tree.c:137
5908
msgid "list only filenames"
5909
msgstr ""
5910
5911
#: builtin/ls-tree.c:140
5912
msgid "use full path names"
5913
msgstr ""
5914
5915
#: builtin/ls-tree.c:142
5916
msgid "list entire tree; not just current directory (implies --full-name)"
5917
msgstr ""
5918
5919
#: builtin/merge.c:43
5920
msgid "git merge [options] [<commit>...]"
5921
msgstr ""
5922
5923
#: builtin/merge.c:44
5924
msgid "git merge [options] <msg> HEAD <commit>"
5925
msgstr ""
5926
5927
#: builtin/merge.c:45
5928
msgid "git merge --abort"
5929
msgstr ""
5930
2207
5931
#: builtin/merge.c:90
2208
5932
msgid "switch `m' requires a value"
2209
5933
msgstr ""
2223
5947
msgid "Available custom strategies are:"
2224
5948
msgstr ""
2225
5949
2226
#: builtin/merge.c:240
5950
#: builtin/merge.c:183
5951
msgid "do not show a diffstat at the end of the merge"
5952
msgstr ""
5953
5954
#: builtin/merge.c:186
5955
msgid "show a diffstat at the end of the merge"
5956
msgstr ""
5957
5958
#: builtin/merge.c:187
5959
msgid "(synonym to --stat)"
5960
msgstr ""
5961
5962
#: builtin/merge.c:189
5963
msgid "add (at most <n>) entries from shortlog to merge commit message"
5964
msgstr ""
5965
5966
#: builtin/merge.c:192
5967
msgid "create a single commit instead of doing a merge"
5968
msgstr ""
5969
5970
#: builtin/merge.c:194
5971
msgid "perform a commit if the merge succeeds (default)"
5972
msgstr ""
5973
5974
#: builtin/merge.c:196
5975
msgid "edit message before committing"
5976
msgstr ""
5977
5978
#: builtin/merge.c:198
5979
msgid "allow fast-forward (default)"
5980
msgstr ""
5981
5982
#: builtin/merge.c:200
5983
msgid "abort if fast-forward is not possible"
5984
msgstr ""
5985
5986
#: builtin/merge.c:203
5987
msgid "Verify that the named commit has a valid GPG signature"
5988
msgstr ""
5989
5990
#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112
5991
msgid "strategy"
5992
msgstr ""
5993
5994
#: builtin/merge.c:205
5995
msgid "merge strategy to use"
5996
msgstr ""
5997
5998
#: builtin/merge.c:206
5999
msgid "option=value"
6000
msgstr ""
6001
6002
#: builtin/merge.c:207
6003
msgid "option for selected merge strategy"
6004
msgstr ""
6005
6006
#: builtin/merge.c:209
6007
msgid "merge commit message (for a non-fast-forward merge)"
6008
msgstr ""
6009
6010
#: builtin/merge.c:213
6011
msgid "abort the current in-progress merge"
6012
msgstr ""
6013
6014
#: builtin/merge.c:242
2227
6015
msgid "could not run stash."
2228
6016
msgstr ""
2229
6017
2230
#: builtin/merge.c:245
6018
#: builtin/merge.c:247
2231
6019
msgid "stash failed"
2232
6020
msgstr ""
2233
6021
2234
#: builtin/merge.c:250
6022
#: builtin/merge.c:252
2235
6023
#, c-format
2236
6024
msgid "not a valid object: %s"
2237
6025
msgstr ""
2238
6026
2239
#: builtin/merge.c:269 builtin/merge.c:286
6027
#: builtin/merge.c:271 builtin/merge.c:288
2240
6028
msgid "read-tree failed"
2241
6029
msgstr ""
2242
6030
2243
#: builtin/merge.c:316
6031
#: builtin/merge.c:318
2244
6032
msgid " (nothing to squash)"
2245
6033
msgstr ""
2246
6034
2247
#: builtin/merge.c:329
6035
#: builtin/merge.c:331
2248
6036
#, c-format
2249
6037
msgid "Squash commit -- not updating HEAD\n"
2250
6038
msgstr ""
2251
6039
2252
#: builtin/merge.c:361
6040
#: builtin/merge.c:363
2253
6041
msgid "Writing SQUASH_MSG"
2254
6042
msgstr ""
2255
6043
2256
#: builtin/merge.c:363
6044
#: builtin/merge.c:365
2257
6045
msgid "Finishing SQUASH_MSG"
2258
6046
msgstr ""
2259
6047
2260
#: builtin/merge.c:386
6048
#: builtin/merge.c:388
2261
6049
#, c-format
2262
6050
msgid "No merge message -- not updating HEAD\n"
2263
6051
msgstr ""
2264
6052
2265
#: builtin/merge.c:437
6053
#: builtin/merge.c:438
2266
6054
#, c-format
2267
6055
msgid "'%s' does not point to a commit"
2268
6056
msgstr ""
2269
6057
2270
#: builtin/merge.c:536
6058
#: builtin/merge.c:550
2271
6059
#, c-format
2272
6060
msgid "Bad branch.%s.mergeoptions string: %s"
2273
6061
msgstr ""
2274
6062
2275
#: builtin/merge.c:629
6063
#: builtin/merge.c:643
2276
6064
msgid "git write-tree failed to write a tree"
2277
6065
msgstr ""
2278
6066
2279
#: builtin/merge.c:679
2280
msgid "failed to read the cache"
2281
msgstr ""
2282
2283
#: builtin/merge.c:697
2284
msgid "Unable to write index."
2285
msgstr ""
2286
2287
#: builtin/merge.c:710
6067
#: builtin/merge.c:671
2288
6068
msgid "Not handling anything other than two heads merge."
2289
6069
msgstr ""
2290
6070
2291
#: builtin/merge.c:724
6071
#: builtin/merge.c:685
2292
6072
#, c-format
2293
6073
msgid "Unknown option for merge-recursive: -X%s"
2294
6074
msgstr ""
2295
6075
2296
#: builtin/merge.c:738
6076
#: builtin/merge.c:699
2297
6077
#, c-format
2298
6078
msgid "unable to write %s"
2299
6079
msgstr ""
2300
6080
2301
#: builtin/merge.c:877
6081
#: builtin/merge.c:788
2302
6082
#, c-format
2303
6083
msgid "Could not read from '%s'"
2304
6084
msgstr ""
2305
6085
2306
#: builtin/merge.c:886
6086
#: builtin/merge.c:797
2307
6087
#, c-format
2308
6088
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
2309
6089
msgstr ""
2310
6090
2311
#: builtin/merge.c:892
6091
#: builtin/merge.c:803
6092
#, c-format
2312
6093
msgid ""
2313
6094
"Please enter a commit message to explain why this merge is necessary,\n"
2314
6095
"especially if it merges an updated upstream into a topic branch.\n"
2315
6096
"\n"
2316
"Lines starting with '#' will be ignored, and an empty message aborts\n"
6097
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
2317
6098
"the commit.\n"
2318
6099
msgstr ""
2319
6100
2320
#: builtin/merge.c:916
6101
#: builtin/merge.c:827
2321
6102
msgid "Empty commit message."
2322
6103
msgstr ""
2323
6104
2324
#: builtin/merge.c:928
6105
#: builtin/merge.c:839
2325
6106
#, c-format
2326
6107
msgid "Wonderful.\n"
2327
6108
msgstr ""
2328
6109
2329
#: builtin/merge.c:993
6110
#: builtin/merge.c:904
2330
6111
#, c-format
2331
6112
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
2332
6113
msgstr ""
2333
6114
2334
#: builtin/merge.c:1009
6115
#: builtin/merge.c:920
2335
6116
#, c-format
2336
6117
msgid "'%s' is not a commit"
2337
6118
msgstr ""
2338
6119
2339
#: builtin/merge.c:1050
6120
#: builtin/merge.c:961
2340
6121
msgid "No current branch."
2341
6122
msgstr ""
2342
6123
2343
#: builtin/merge.c:1052
6124
#: builtin/merge.c:963
2344
6125
msgid "No remote for the current branch."
2345
6126
msgstr ""
2346
6127
2347
#: builtin/merge.c:1054
6128
#: builtin/merge.c:965
2348
6129
msgid "No default upstream defined for the current branch."
2349
6130
msgstr ""
2350
6131
2351
#: builtin/merge.c:1059
6132
#: builtin/merge.c:970
2352
6133
#, c-format
2353
6134
msgid "No remote tracking branch for %s from %s"
2354
6135
msgstr ""
2355
6136
2356
#: builtin/merge.c:1146 builtin/merge.c:1303
6137
#: builtin/merge.c:1057 builtin/merge.c:1214
2357
6138
#, c-format
2358
6139
msgid "%s - not something we can merge"
2359
6140
msgstr ""
2360
6141
2361
#: builtin/merge.c:1214
6142
#: builtin/merge.c:1125
2362
6143
msgid "There is no merge to abort (MERGE_HEAD missing)."
2363
6144
msgstr ""
2364
6145
2365
#: builtin/merge.c:1230 git-pull.sh:31
6146
#: builtin/merge.c:1141 git-pull.sh:31
2366
6147
msgid ""
2367
6148
"You have not concluded your merge (MERGE_HEAD exists).\n"
2368
6149
"Please, commit your changes before you can merge."
2369
6150
msgstr ""
2370
6151
2371
#: builtin/merge.c:1233 git-pull.sh:34
6152
#: builtin/merge.c:1144 git-pull.sh:34
2372
6153
msgid "You have not concluded your merge (MERGE_HEAD exists)."
2373
6154
msgstr ""
2374
6155
2375
#: builtin/merge.c:1237
6156
#: builtin/merge.c:1148
2376
6157
msgid ""
2377
6158
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
2378
6159
"Please, commit your changes before you can merge."
2379
6160
msgstr ""
2380
6161
2381
#: builtin/merge.c:1240
6162
#: builtin/merge.c:1151
2382
6163
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
2383
6164
msgstr ""
2384
6165
2385
#: builtin/merge.c:1249
6166
#: builtin/merge.c:1160
2386
6167
msgid "You cannot combine --squash with --no-ff."
2387
6168
msgstr ""
2388
6169
2389
#: builtin/merge.c:1254
6170
#: builtin/merge.c:1165
2390
6171
msgid "You cannot combine --no-ff with --ff-only."
2391
6172
msgstr ""
2392
6173
2393
#: builtin/merge.c:1261
6174
#: builtin/merge.c:1172
2394
6175
msgid "No commit specified and merge.defaultToUpstream not set."
2395
6176
msgstr ""
2396
6177
2397
#: builtin/merge.c:1293
6178
#: builtin/merge.c:1204
2398
6179
msgid "Can merge only exactly one commit into empty head"
2399
6180
msgstr ""
2400
6181
2401
#: builtin/merge.c:1296
6182
#: builtin/merge.c:1207
2402
6183
msgid "Squash commit into empty head not supported yet"
2403
6184
msgstr ""
2404
6185
2405
#: builtin/merge.c:1298
6186
#: builtin/merge.c:1209
2406
6187
msgid "Non-fast-forward commit does not make sense into an empty head"
2407
6188
msgstr ""
2408
6189
2409
#: builtin/merge.c:1413
6190
#: builtin/merge.c:1265
6191
#, c-format
6192
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6193
msgstr ""
6194
6195
#: builtin/merge.c:1268
6196
#, c-format
6197
msgid "Commit %s has a bad GPG signature allegedly by %s."
6198
msgstr ""
6199
6200
#. 'N'
6201
#: builtin/merge.c:1271
6202
#, c-format
6203
msgid "Commit %s does not have a GPG signature."
6204
msgstr ""
6205
6206
#: builtin/merge.c:1274
6207
#, c-format
6208
msgid "Commit %s has a good GPG signature by %s\n"
6209
msgstr ""
6210
6211
#: builtin/merge.c:1358
2410
6212
#, c-format
2411
6213
msgid "Updating %s..%s\n"
2412
6214
msgstr ""
2413
6215
2414
#: builtin/merge.c:1451
6216
#: builtin/merge.c:1397
2415
6217
#, c-format
2416
6218
msgid "Trying really trivial in-index merge...\n"
2417
6219
msgstr ""
2418
6220
2419
#: builtin/merge.c:1458
6221
#: builtin/merge.c:1404
2420
6222
#, c-format
2421
6223
msgid "Nope.\n"
2422
6224
msgstr ""
2423
6225
2424
#: builtin/merge.c:1490
6226
#: builtin/merge.c:1436
2425
6227
msgid "Not possible to fast-forward, aborting."
2426
6228
msgstr ""
2427
6229
2428
#: builtin/merge.c:1513 builtin/merge.c:1592
6230
#: builtin/merge.c:1459 builtin/merge.c:1538
2429
6231
#, c-format
2430
6232
msgid "Rewinding the tree to pristine...\n"
2431
6233
msgstr ""
2432
6234
2433
#: builtin/merge.c:1517
6235
#: builtin/merge.c:1463
2434
6236
#, c-format
2435
6237
msgid "Trying merge strategy %s...\n"
2436
6238
msgstr ""
2437
6239
2438
#: builtin/merge.c:1583
6240
#: builtin/merge.c:1529
2439
6241
#, c-format
2440
6242
msgid "No merge strategy handled the merge.\n"
2441
6243
msgstr ""
2442
6244
2443
#: builtin/merge.c:1585
6245
#: builtin/merge.c:1531
2444
6246
#, c-format
2445
6247
msgid "Merge with strategy %s failed.\n"
2446
6248
msgstr ""
2447
6249
2448
#: builtin/merge.c:1594
6250
#: builtin/merge.c:1540
2449
6251
#, c-format
2450
6252
msgid "Using the %s to prepare resolving by hand.\n"
2451
6253
msgstr ""
2452
6254
2453
#: builtin/merge.c:1606
6255
#: builtin/merge.c:1552
2454
6256
#, c-format
2455
6257
msgid "Automatic merge went well; stopped before committing as requested\n"
2456
6258
msgstr ""
2457
6259
6260
#: builtin/merge-base.c:26
6261
msgid "git merge-base [-a|--all] <commit> <commit>..."
6262
msgstr ""
6263
6264
#: builtin/merge-base.c:27
6265
msgid "git merge-base [-a|--all] --octopus <commit>..."
6266
msgstr ""
6267
6268
#: builtin/merge-base.c:28
6269
msgid "git merge-base --independent <commit>..."
6270
msgstr ""
6271
6272
#: builtin/merge-base.c:29
6273
msgid "git merge-base --is-ancestor <commit> <commit>"
6274
msgstr ""
6275
6276
#: builtin/merge-base.c:98
6277
msgid "output all common ancestors"
6278
msgstr ""
6279
6280
#: builtin/merge-base.c:99
6281
msgid "find ancestors for a single n-way merge"
6282
msgstr ""
6283
6284
#: builtin/merge-base.c:100
6285
msgid "list revs not reachable from others"
6286
msgstr ""
6287
6288
#: builtin/merge-base.c:102
6289
msgid "is the first one ancestor of the other?"
6290
msgstr ""
6291
6292
#: builtin/merge-file.c:8
6293
msgid ""
6294
"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "
6295
"file2"
6296
msgstr ""
6297
6298
#: builtin/merge-file.c:33
6299
msgid "send results to standard output"
6300
msgstr ""
6301
6302
#: builtin/merge-file.c:34
6303
msgid "use a diff3 based merge"
6304
msgstr ""
6305
6306
#: builtin/merge-file.c:35
6307
msgid "for conflicts, use our version"
6308
msgstr ""
6309
6310
#: builtin/merge-file.c:37
6311
msgid "for conflicts, use their version"
6312
msgstr ""
6313
6314
#: builtin/merge-file.c:39
6315
msgid "for conflicts, use a union version"
6316
msgstr ""
6317
6318
#: builtin/merge-file.c:42
6319
msgid "for conflicts, use this marker size"
6320
msgstr ""
6321
6322
#: builtin/merge-file.c:43
6323
msgid "do not warn about conflicts"
6324
msgstr ""
6325
6326
#: builtin/merge-file.c:45
6327
msgid "set labels for file1/orig_file/file2"
6328
msgstr ""
6329
6330
#: builtin/mktree.c:67
6331
msgid "git mktree [-z] [--missing] [--batch]"
6332
msgstr ""
6333
6334
#: builtin/mktree.c:153
6335
msgid "input is NUL terminated"
6336
msgstr ""
6337
6338
#: builtin/mktree.c:154 builtin/write-tree.c:24
6339
msgid "allow missing objects"
6340
msgstr ""
6341
6342
#: builtin/mktree.c:155
6343
msgid "allow creation of more than one tree"
6344
msgstr ""
6345
6346
#: builtin/mv.c:14
6347
msgid "git mv [options] <source>... <destination>"
6348
msgstr ""
6349
6350
#: builtin/mv.c:64
6351
msgid "force move/rename even if target exists"
6352
msgstr ""
6353
6354
#: builtin/mv.c:65
6355
msgid "skip move/rename errors"
6356
msgstr ""
6357
2458
6358
#: builtin/mv.c:108
2459
6359
#, c-format
2460
6360
msgid "Checking rename of '%s' to '%s'\n"
2512
6412
msgid "Renaming %s to %s\n"
2513
6413
msgstr ""
2514
6414
2515
#: builtin/mv.c:215
6415
#: builtin/mv.c:215 builtin/remote.c:731
2516
6416
#, c-format
2517
6417
msgid "renaming '%s' failed"
2518
6418
msgstr ""
2519
6419
6420
#: builtin/name-rev.c:175
6421
msgid "git name-rev [options] <commit>..."
6422
msgstr ""
6423
6424
#: builtin/name-rev.c:176
6425
msgid "git name-rev [options] --all"
6426
msgstr ""
6427
6428
#: builtin/name-rev.c:177
6429
msgid "git name-rev [options] --stdin"
6430
msgstr ""
6431
6432
#: builtin/name-rev.c:229
6433
msgid "print only names (no SHA-1)"
6434
msgstr ""
6435
6436
#: builtin/name-rev.c:230
6437
msgid "only use tags to name the commits"
6438
msgstr ""
6439
6440
#: builtin/name-rev.c:232
6441
msgid "only use refs matching <pattern>"
6442
msgstr ""
6443
6444
#: builtin/name-rev.c:234
6445
msgid "list all commits reachable from all refs"
6446
msgstr ""
6447
6448
#: builtin/name-rev.c:235
6449
msgid "read from stdin"
6450
msgstr ""
6451
6452
#: builtin/name-rev.c:236
6453
msgid "allow to print `undefined` names"
6454
msgstr ""
6455
6456
#: builtin/notes.c:26
6457
msgid "git notes [--ref <notes_ref>] [list [<object>]]"
6458
msgstr ""
6459
6460
#: builtin/notes.c:27
6461
msgid ""
6462
"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
6463
"<object>] [<object>]"
6464
msgstr ""
6465
6466
#: builtin/notes.c:28
6467
msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
6468
msgstr ""
6469
6470
#: builtin/notes.c:29
6471
msgid ""
6472
"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
6473
"<object>] [<object>]"
6474
msgstr ""
6475
6476
#: builtin/notes.c:30
6477
msgid "git notes [--ref <notes_ref>] edit [<object>]"
6478
msgstr ""
6479
6480
#: builtin/notes.c:31
6481
msgid "git notes [--ref <notes_ref>] show [<object>]"
6482
msgstr ""
6483
6484
#: builtin/notes.c:32
6485
msgid ""
6486
"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"
6487
msgstr ""
6488
6489
#: builtin/notes.c:33
6490
msgid "git notes merge --commit [-v | -q]"
6491
msgstr ""
6492
6493
#: builtin/notes.c:34
6494
msgid "git notes merge --abort [-v | -q]"
6495
msgstr ""
6496
6497
#: builtin/notes.c:35
6498
msgid "git notes [--ref <notes_ref>] remove [<object>...]"
6499
msgstr ""
6500
6501
#: builtin/notes.c:36
6502
msgid "git notes [--ref <notes_ref>] prune [-n | -v]"
6503
msgstr ""
6504
6505
#: builtin/notes.c:37
6506
msgid "git notes [--ref <notes_ref>] get-ref"
6507
msgstr ""
6508
6509
#: builtin/notes.c:42
6510
msgid "git notes [list [<object>]]"
6511
msgstr ""
6512
6513
#: builtin/notes.c:47
6514
msgid "git notes add [<options>] [<object>]"
6515
msgstr ""
6516
6517
#: builtin/notes.c:52
6518
msgid "git notes copy [<options>] <from-object> <to-object>"
6519
msgstr ""
6520
6521
#: builtin/notes.c:53
6522
msgid "git notes copy --stdin [<from-object> <to-object>]..."
6523
msgstr ""
6524
6525
#: builtin/notes.c:58
6526
msgid "git notes append [<options>] [<object>]"
6527
msgstr ""
6528
6529
#: builtin/notes.c:63
6530
msgid "git notes edit [<object>]"
6531
msgstr ""
6532
6533
#: builtin/notes.c:68
6534
msgid "git notes show [<object>]"
6535
msgstr ""
6536
6537
#: builtin/notes.c:73
6538
msgid "git notes merge [<options>] <notes_ref>"
6539
msgstr ""
6540
6541
#: builtin/notes.c:74
6542
msgid "git notes merge --commit [<options>]"
6543
msgstr ""
6544
6545
#: builtin/notes.c:75
6546
msgid "git notes merge --abort [<options>]"
6547
msgstr ""
6548
6549
#: builtin/notes.c:80
6550
msgid "git notes remove [<object>]"
6551
msgstr ""
6552
6553
#: builtin/notes.c:85
6554
msgid "git notes prune [<options>]"
6555
msgstr ""
6556
6557
#: builtin/notes.c:90
6558
msgid "git notes get-ref"
6559
msgstr ""
6560
2520
6561
#: builtin/notes.c:139
2521
6562
#, c-format
2522
6563
msgid "unable to start 'show' for object '%s'"
2523
6564
msgstr ""
2524
6565
2525
#: builtin/notes.c:145
2526
msgid "can't fdopen 'show' output fd"
2527
msgstr ""
2528
2529
#: builtin/notes.c:155
2530
#, c-format
2531
msgid "failed to close pipe to 'show' for object '%s'"
2532
msgstr ""
2533
2534
#: builtin/notes.c:158
6566
#: builtin/notes.c:143
6567
msgid "could not read 'show' output"
6568
msgstr ""
6569
6570
#: builtin/notes.c:151
2535
6571
#, c-format
2536
6572
msgid "failed to finish 'show' for object '%s'"
2537
6573
msgstr ""
2538
6574
2539
#: builtin/notes.c:175 builtin/tag.c:343
6575
#: builtin/notes.c:169 builtin/tag.c:341
2540
6576
#, c-format
2541
6577
msgid "could not create file '%s'"
2542
6578
msgstr ""
2543
6579
2544
#: builtin/notes.c:189
6580
#: builtin/notes.c:188
2545
6581
msgid "Please supply the note contents using either -m or -F option"
2546
6582
msgstr ""
2547
6583
2548
#: builtin/notes.c:210 builtin/notes.c:973
6584
#: builtin/notes.c:209 builtin/notes.c:972
2549
6585
#, c-format
2550
6586
msgid "Removing note for object %s\n"
2551
6587
msgstr ""
2552
6588
2553
#: builtin/notes.c:215
6589
#: builtin/notes.c:214
2554
6590
msgid "unable to write note object"
2555
6591
msgstr ""
2556
6592
2557
#: builtin/notes.c:217
6593
#: builtin/notes.c:216
2558
6594
#, c-format
2559
6595
msgid "The note contents has been left in %s"
2560
6596
msgstr ""
2561
6597
2562
#: builtin/notes.c:251 builtin/tag.c:521
6598
#: builtin/notes.c:250 builtin/tag.c:540
2563
6599
#, c-format
2564
6600
msgid "cannot read '%s'"
2565
6601
msgstr ""
2566
6602
2567
#: builtin/notes.c:253 builtin/tag.c:524
6603
#: builtin/notes.c:252 builtin/tag.c:543
2568
6604
#, c-format
2569
6605
msgid "could not open or read '%s'"
2570
6606
msgstr ""
2571
6607
2572
#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
2573
#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
2574
#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
2575
#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537
6608
#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446
6609
#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643
6610
#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765
6611
#: builtin/notes.c:967 builtin/tag.c:556
2576
6612
#, c-format
2577
6613
msgid "Failed to resolve '%s' as a valid ref."
2578
6614
msgstr ""
2579
6615
2580
#: builtin/notes.c:275
6616
#: builtin/notes.c:274
2581
6617
#, c-format
2582
6618
msgid "Failed to read object '%s'."
2583
6619
msgstr ""
2584
6620
2585
#: builtin/notes.c:299
6621
#: builtin/notes.c:298
2586
6622
msgid "Cannot commit uninitialized/unreferenced notes tree"
2587
6623
msgstr ""
2588
6624
2589
#: builtin/notes.c:340
6625
#: builtin/notes.c:339
2590
6626
#, c-format
2591
6627
msgid "Bad notes.rewriteMode value: '%s'"
2592
6628
msgstr ""
2593
6629
2594
#: builtin/notes.c:350
6630
#: builtin/notes.c:349
2595
6631
#, c-format
2596
6632
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
2597
6633
msgstr ""
2598
6634
2599
6635
#. TRANSLATORS: The first %s is the name of the
2600
6636
#. environment variable, the second %s is its value
2601
#: builtin/notes.c:377
6637
#: builtin/notes.c:376
2602
6638
#, c-format
2603
6639
msgid "Bad %s value: '%s'"
2604
6640
msgstr ""
2605
6641
2606
#: builtin/notes.c:441
6642
#: builtin/notes.c:440
2607
6643
#, c-format
2608
6644
msgid "Malformed input line: '%s'."
2609
6645
msgstr ""
2610
6646
2611
#: builtin/notes.c:456
6647
#: builtin/notes.c:455
2612
6648
#, c-format
2613
6649
msgid "Failed to copy notes from '%s' to '%s'"
2614
6650
msgstr ""
2615
6651
2616
#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
2617
#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
2618
#: builtin/notes.c:1033
6652
#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626
6653
#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758
6654
#: builtin/notes.c:1032
2619
6655
msgid "too many parameters"
2620
6656
msgstr ""
2621
6657
2622
#: builtin/notes.c:513 builtin/notes.c:772
6658
#: builtin/notes.c:512 builtin/notes.c:771
2623
6659
#, c-format
2624
6660
msgid "No note found for object %s."
2625
6661
msgstr ""
2626
6662
2627
#: builtin/notes.c:580
6663
#: builtin/notes.c:534 builtin/notes.c:691
6664
msgid "note contents as a string"
6665
msgstr ""
6666
6667
#: builtin/notes.c:537 builtin/notes.c:694
6668
msgid "note contents in a file"
6669
msgstr ""
6670
6671
#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696
6672
#: builtin/notes.c:699 builtin/tag.c:474
6673
msgid "object"
6674
msgstr ""
6675
6676
#: builtin/notes.c:540 builtin/notes.c:697
6677
msgid "reuse and edit specified note object"
6678
msgstr ""
6679
6680
#: builtin/notes.c:543 builtin/notes.c:700
6681
msgid "reuse specified note object"
6682
msgstr ""
6683
6684
#: builtin/notes.c:545 builtin/notes.c:613
6685
msgid "replace existing notes"
6686
msgstr ""
6687
6688
#: builtin/notes.c:579
2628
6689
#, c-format
2629
6690
msgid ""
2630
6691
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
2631
6692
"existing notes"
2632
6693
msgstr ""
2633
6694
2634
#: builtin/notes.c:585 builtin/notes.c:662
6695
#: builtin/notes.c:584 builtin/notes.c:661
2635
6696
#, c-format
2636
6697
msgid "Overwriting existing notes for object %s\n"
2637
6698
msgstr ""
2638
6699
2639
#: builtin/notes.c:635
6700
#: builtin/notes.c:614
6701
msgid "read objects from stdin"
6702
msgstr ""
6703
6704
#: builtin/notes.c:616
6705
msgid "load rewriting config for <command> (implies --stdin)"
6706
msgstr ""
6707
6708
#: builtin/notes.c:634
2640
6709
msgid "too few parameters"
2641
6710
msgstr ""
2642
6711
2643
#: builtin/notes.c:656
6712
#: builtin/notes.c:655
2644
6713
#, c-format
2645
6714
msgid ""
2646
6715
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
2647
6716
"existing notes"
2648
6717
msgstr ""
2649
6718
2650
#: builtin/notes.c:668
6719
#: builtin/notes.c:667
2651
6720
#, c-format
2652
6721
msgid "Missing notes on source object %s. Cannot copy."
2653
6722
msgstr ""
2654
6723
2655
#: builtin/notes.c:717
6724
#: builtin/notes.c:716
2656
6725
#, c-format
2657
6726
msgid ""
2658
6727
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
2659
6728
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
2660
6729
msgstr ""
2661
6730
2662
#: builtin/notes.c:971
6731
#: builtin/notes.c:863
6732
msgid "General options"
6733
msgstr ""
6734
6735
#: builtin/notes.c:865
6736
msgid "Merge options"
6737
msgstr ""
6738
6739
#: builtin/notes.c:867
6740
msgid ""
6741
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
6742
"cat_sort_uniq)"
6743
msgstr ""
6744
6745
#: builtin/notes.c:869
6746
msgid "Committing unmerged notes"
6747
msgstr ""
6748
6749
#: builtin/notes.c:871
6750
msgid "finalize notes merge by committing unmerged notes"
6751
msgstr ""
6752
6753
#: builtin/notes.c:873
6754
msgid "Aborting notes merge resolution"
6755
msgstr ""
6756
6757
#: builtin/notes.c:875
6758
msgid "abort notes merge"
6759
msgstr ""
6760
6761
#: builtin/notes.c:970
2663
6762
#, c-format
2664
6763
msgid "Object %s has no note\n"
2665
6764
msgstr ""
2666
6765
2667
#: builtin/notes.c:1103
6766
#: builtin/notes.c:982
6767
msgid "attempt to remove non-existent note is not an error"
6768
msgstr ""
6769
6770
#: builtin/notes.c:985
6771
msgid "read object names from the standard input"
6772
msgstr ""
6773
6774
#: builtin/notes.c:1066
6775
msgid "notes_ref"
6776
msgstr ""
6777
6778
#: builtin/notes.c:1067
6779
msgid "use notes from <notes_ref>"
6780
msgstr ""
6781
6782
#: builtin/notes.c:1102 builtin/remote.c:1598
2668
6783
#, c-format
2669
6784
msgid "Unknown subcommand: %s"
2670
6785
msgstr ""
2671
6786
2672
#: builtin/pack-objects.c:2315
6787
#: builtin/pack-objects.c:23
6788
msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
6789
msgstr ""
6790
6791
#: builtin/pack-objects.c:24
6792
msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
6793
msgstr ""
6794
6795
#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
6796
#, c-format
6797
msgid "deflate error (%d)"
6798
msgstr ""
6799
6800
#: builtin/pack-objects.c:2397
2673
6801
#, c-format
2674
6802
msgid "unsupported index version %s"
2675
6803
msgstr ""
2676
6804
2677
#: builtin/pack-objects.c:2319
6805
#: builtin/pack-objects.c:2401
2678
6806
#, c-format
2679
6807
msgid "bad index version '%s'"
2680
6808
msgstr ""
2681
6809
2682
#: builtin/pack-objects.c:2342
6810
#: builtin/pack-objects.c:2424
2683
6811
#, c-format
2684
6812
msgid "option %s does not accept negative form"
2685
6813
msgstr ""
2686
6814
2687
#: builtin/pack-objects.c:2346
6815
#: builtin/pack-objects.c:2428
2688
6816
#, c-format
2689
6817
msgid "unable to parse value '%s' for option %s"
2690
6818
msgstr ""
2691
6819
6820
#: builtin/pack-objects.c:2447
6821
msgid "do not show progress meter"
6822
msgstr ""
6823
6824
#: builtin/pack-objects.c:2449
6825
msgid "show progress meter"
6826
msgstr ""
6827
6828
#: builtin/pack-objects.c:2451
6829
msgid "show progress meter during object writing phase"
6830
msgstr ""
6831
6832
#: builtin/pack-objects.c:2454
6833
msgid "similar to --all-progress when progress meter is shown"
6834
msgstr ""
6835
6836
#: builtin/pack-objects.c:2455
6837
msgid "version[,offset]"
6838
msgstr ""
6839
6840
#: builtin/pack-objects.c:2456
6841
msgid "write the pack index file in the specified idx format version"
6842
msgstr ""
6843
6844
#: builtin/pack-objects.c:2459
6845
msgid "maximum size of each output pack file"
6846
msgstr ""
6847
6848
#: builtin/pack-objects.c:2461
6849
msgid "ignore borrowed objects from alternate object store"
6850
msgstr ""
6851
6852
#: builtin/pack-objects.c:2463
6853
msgid "ignore packed objects"
6854
msgstr ""
6855
6856
#: builtin/pack-objects.c:2465
6857
msgid "limit pack window by objects"
6858
msgstr ""
6859
6860
#: builtin/pack-objects.c:2467
6861
msgid "limit pack window by memory in addition to object limit"
6862
msgstr ""
6863
6864
#: builtin/pack-objects.c:2469
6865
msgid "maximum length of delta chain allowed in the resulting pack"
6866
msgstr ""
6867
6868
#: builtin/pack-objects.c:2471
6869
msgid "reuse existing deltas"
6870
msgstr ""
6871
6872
#: builtin/pack-objects.c:2473
6873
msgid "reuse existing objects"
6874
msgstr ""
6875
6876
#: builtin/pack-objects.c:2475
6877
msgid "use OFS_DELTA objects"
6878
msgstr ""
6879
6880
#: builtin/pack-objects.c:2477
6881
msgid "use threads when searching for best delta matches"
6882
msgstr ""
6883
6884
#: builtin/pack-objects.c:2479
6885
msgid "do not create an empty pack output"
6886
msgstr ""
6887
6888
#: builtin/pack-objects.c:2481
6889
msgid "read revision arguments from standard input"
6890
msgstr ""
6891
6892
#: builtin/pack-objects.c:2483
6893
msgid "limit the objects to those that are not yet packed"
6894
msgstr ""
6895
6896
#: builtin/pack-objects.c:2486
6897
msgid "include objects reachable from any reference"
6898
msgstr ""
6899
6900
#: builtin/pack-objects.c:2489
6901
msgid "include objects referred by reflog entries"
6902
msgstr ""
6903
6904
#: builtin/pack-objects.c:2492
6905
msgid "output pack to stdout"
6906
msgstr ""
6907
6908
#: builtin/pack-objects.c:2494
6909
msgid "include tag objects that refer to objects to be packed"
6910
msgstr ""
6911
6912
#: builtin/pack-objects.c:2496
6913
msgid "keep unreachable objects"
6914
msgstr ""
6915
6916
#: builtin/pack-objects.c:2497 parse-options.h:141
6917
msgid "time"
6918
msgstr ""
6919
6920
#: builtin/pack-objects.c:2498
6921
msgid "unpack unreachable objects newer than <time>"
6922
msgstr ""
6923
6924
#: builtin/pack-objects.c:2501
6925
msgid "create thin packs"
6926
msgstr ""
6927
6928
#: builtin/pack-objects.c:2503
6929
msgid "ignore packs that have companion .keep file"
6930
msgstr ""
6931
6932
#: builtin/pack-objects.c:2505
6933
msgid "pack compression level"
6934
msgstr ""
6935
6936
#: builtin/pack-objects.c:2507
6937
msgid "do not hide commits by grafts"
6938
msgstr ""
6939
6940
#: builtin/pack-refs.c:6
6941
msgid "git pack-refs [options]"
6942
msgstr ""
6943
6944
#: builtin/pack-refs.c:14
6945
msgid "pack everything"
6946
msgstr ""
6947
6948
#: builtin/pack-refs.c:15
6949
msgid "prune loose refs (default)"
6950
msgstr ""
6951
6952
#: builtin/prune-packed.c:7
6953
msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"
6954
msgstr ""
6955
6956
#: builtin/prune.c:12
6957
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
6958
msgstr ""
6959
6960
#: builtin/prune.c:132
6961
msgid "do not remove, show only"
6962
msgstr ""
6963
6964
#: builtin/prune.c:133
6965
msgid "report pruned objects"
6966
msgstr ""
6967
6968
#: builtin/prune.c:136
6969
msgid "expire objects older than <time>"
6970
msgstr ""
6971
6972
#: builtin/push.c:14
6973
msgid "git push [<options>] [<repository> [<refspec>...]]"
6974
msgstr ""
6975
2692
6976
#: builtin/push.c:45
2693
6977
msgid "tag shorthand without <tag>"
2694
6978
msgstr ""
2697
6981
msgid "--delete only accepts plain target ref names"
2698
6982
msgstr ""
2699
6983
2700
#: builtin/push.c:84
6984
#: builtin/push.c:99
6985
msgid ""
6986
"\n"
6987
"To choose either option permanently, see push.default in 'git help config'."
6988
msgstr ""
6989
6990
#: builtin/push.c:102
6991
#, c-format
6992
msgid ""
6993
"The upstream branch of your current branch does not match\n"
6994
"the name of your current branch. To push to the upstream branch\n"
6995
"on the remote, use\n"
6996
"\n"
6997
" git push %s HEAD:%s\n"
6998
"\n"
6999
"To push to the branch of the same name on the remote, use\n"
7000
"\n"
7001
" git push %s %s\n"
7002
"%s"
7003
msgstr ""
7004
7005
#: builtin/push.c:121
2701
7006
#, c-format
2702
7007
msgid ""
2703
7008
"You are not currently on a branch.\n"
2707
7012
" git push %s HEAD:<name-of-remote-branch>\n"
2708
7013
msgstr ""
2709
7014
2710
#: builtin/push.c:91
7015
#: builtin/push.c:128
2711
7016
#, c-format
2712
7017
msgid ""
2713
7018
"The current branch %s has no upstream branch.\n"
2716
7021
" git push --set-upstream %s %s\n"
2717
7022
msgstr ""
2718
7023
2719
#: builtin/push.c:99
7024
#: builtin/push.c:136
2720
7025
#, c-format
2721
7026
msgid "The current branch %s has multiple upstream branches, refusing to push."
2722
7027
msgstr ""
2723
7028
2724
#: builtin/push.c:102
7029
#: builtin/push.c:139
2725
7030
#, c-format
2726
7031
msgid ""
2727
7032
"You are pushing to remote '%s', which is not the upstream of\n"
2729
7034
"to update which remote branch."
2730
7035
msgstr ""
2731
7036
2732
#: builtin/push.c:131
7037
#: builtin/push.c:151
7038
msgid ""
7039
"push.default is unset; its implicit value is changing in\n"
7040
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7041
"and maintain the current behavior after the default changes, use:\n"
7042
"\n"
7043
" git config --global push.default matching\n"
7044
"\n"
7045
"To squelch this message and adopt the new behavior now, use:\n"
7046
"\n"
7047
" git config --global push.default simple\n"
7048
"\n"
7049
"See 'git help config' and search for 'push.default' for further "
7050
"information.\n"
7051
"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
7052
"'current' instead of 'simple' if you sometimes use older versions of Git)"
7053
msgstr ""
7054
7055
#: builtin/push.c:199
2733
7056
msgid ""
2734
7057
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
2735
7058
msgstr ""
2736
7059
2737
#: builtin/push.c:138
7060
#: builtin/push.c:206
2738
7061
msgid ""
2739
7062
"Updates were rejected because the tip of your current branch is behind\n"
2740
7063
"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
2742
7065
"See the 'Note about fast-forwards' in 'git push --help' for details."
2743
7066
msgstr ""
2744
7067
2745
#: builtin/push.c:144
7068
#: builtin/push.c:212
2746
7069
msgid ""
2747
7070
"Updates were rejected because a pushed branch tip is behind its remote\n"
2748
7071
"counterpart. If you did not intend to push that branch, you may want to\n"
2749
"specify branches to push or set the 'push.default' configuration\n"
2750
"variable to 'current' or 'upstream' to push only the current branch."
7072
"specify branches to push or set the 'push.default' configuration variable\n"
7073
"to 'simple', 'current' or 'upstream' to push only the current branch."
2751
7074
msgstr ""
2752
7075
2753
#: builtin/push.c:150
7076
#: builtin/push.c:218
2754
7077
msgid ""
2755
7078
"Updates were rejected because a pushed branch tip is behind its remote\n"
2756
7079
"counterpart. Check out this branch and merge the remote changes\n"
2758
7081
"See the 'Note about fast-forwards' in 'git push --help' for details."
2759
7082
msgstr ""
2760
7083
2761
#: builtin/push.c:190
7084
#: builtin/push.c:224
7085
msgid ""
7086
"Updates were rejected because the remote contains work that you do\n"
7087
"not have locally. This is usually caused by another repository pushing\n"
7088
"to the same ref. You may want to first merge the remote changes (e.g.,\n"
7089
"'git pull') before pushing again.\n"
7090
"See the 'Note about fast-forwards' in 'git push --help' for details."
7091
msgstr ""
7092
7093
#: builtin/push.c:231
7094
msgid "Updates were rejected because the tag already exists in the remote."
7095
msgstr ""
7096
7097
#: builtin/push.c:234
7098
msgid ""
7099
"You cannot update a remote ref that points at a non-commit object,\n"
7100
"or update a remote ref to make it point at a non-commit object,\n"
7101
"without using the '--force' option.\n"
7102
msgstr ""
7103
7104
#: builtin/push.c:294
2762
7105
#, c-format
2763
7106
msgid "Pushing to %s\n"
2764
7107
msgstr ""
2765
7108
2766
#: builtin/push.c:194
7109
#: builtin/push.c:298
2767
7110
#, c-format
2768
7111
msgid "failed to push some refs to '%s'"
2769
7112
msgstr ""
2770
7113
2771
#: builtin/push.c:226
7114
#: builtin/push.c:331
2772
7115
#, c-format
2773
7116
msgid "bad repository '%s'"
2774
7117
msgstr ""
2775
7118
2776
#: builtin/push.c:227
7119
#: builtin/push.c:332
2777
7120
msgid ""
2778
7121
"No configured push destination.\n"
2779
7122
"Either specify the URL from the command-line or configure a remote "
2786
7129
" git push <name>\n"
2787
7130
msgstr ""
2788
7131
2789
#: builtin/push.c:242
7132
#: builtin/push.c:347
2790
7133
msgid "--all and --tags are incompatible"
2791
7134
msgstr ""
2792
7135
2793
#: builtin/push.c:243
7136
#: builtin/push.c:348
2794
7137
msgid "--all can't be combined with refspecs"
2795
7138
msgstr ""
2796
7139
2797
#: builtin/push.c:248
7140
#: builtin/push.c:353
2798
7141
msgid "--mirror and --tags are incompatible"
2799
7142
msgstr ""
2800
7143
2801
#: builtin/push.c:249
7144
#: builtin/push.c:354
2802
7145
msgid "--mirror can't be combined with refspecs"
2803
7146
msgstr ""
2804
7147
2805
#: builtin/push.c:254
7148
#: builtin/push.c:359
2806
7149
msgid "--all and --mirror are incompatible"
2807
7150
msgstr ""
2808
7151
2809
#: builtin/push.c:334
7152
#: builtin/push.c:419
7153
msgid "repository"
7154
msgstr ""
7155
7156
#: builtin/push.c:420
7157
msgid "push all refs"
7158
msgstr ""
7159
7160
#: builtin/push.c:421
7161
msgid "mirror all refs"
7162
msgstr ""
7163
7164
#: builtin/push.c:423
7165
msgid "delete refs"
7166
msgstr ""
7167
7168
#: builtin/push.c:424
7169
msgid "push tags (can't be used with --all or --mirror)"
7170
msgstr ""
7171
7172
#: builtin/push.c:427
7173
msgid "force updates"
7174
msgstr ""
7175
7176
#: builtin/push.c:428
7177
msgid "check"
7178
msgstr ""
7179
7180
#: builtin/push.c:429
7181
msgid "control recursive pushing of submodules"
7182
msgstr ""
7183
7184
#: builtin/push.c:431
7185
msgid "use thin pack"
7186
msgstr ""
7187
7188
#: builtin/push.c:432 builtin/push.c:433
7189
msgid "receive pack program"
7190
msgstr ""
7191
7192
#: builtin/push.c:434
7193
msgid "set upstream for git pull/status"
7194
msgstr ""
7195
7196
#: builtin/push.c:437
7197
msgid "prune locally removed refs"
7198
msgstr ""
7199
7200
#: builtin/push.c:439
7201
msgid "bypass pre-push hook"
7202
msgstr ""
7203
7204
#: builtin/push.c:440
7205
msgid "push missing but relevant tags"
7206
msgstr ""
7207
7208
#: builtin/push.c:450
2810
7209
msgid "--delete is incompatible with --all, --mirror and --tags"
2811
7210
msgstr ""
2812
7211
2813
#: builtin/push.c:336
7212
#: builtin/push.c:452
2814
7213
msgid "--delete doesn't make sense without any refs"
2815
7214
msgstr ""
2816
7215
7216
#: builtin/read-tree.c:36
7217
msgid ""
7218
"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] "
7219
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
7220
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
7221
msgstr ""
7222
7223
#: builtin/read-tree.c:108
7224
msgid "write resulting index to <file>"
7225
msgstr ""
7226
7227
#: builtin/read-tree.c:111
7228
msgid "only empty the index"
7229
msgstr ""
7230
7231
#: builtin/read-tree.c:113
7232
msgid "Merging"
7233
msgstr ""
7234
7235
#: builtin/read-tree.c:115
7236
msgid "perform a merge in addition to a read"
7237
msgstr ""
7238
7239
#: builtin/read-tree.c:117
7240
msgid "3-way merge if no file level merging required"
7241
msgstr ""
7242
7243
#: builtin/read-tree.c:119
7244
msgid "3-way merge in presence of adds and removes"
7245
msgstr ""
7246
7247
#: builtin/read-tree.c:121
7248
msgid "same as -m, but discard unmerged entries"
7249
msgstr ""
7250
7251
#: builtin/read-tree.c:122
7252
msgid "<subdirectory>/"
7253
msgstr ""
7254
7255
#: builtin/read-tree.c:123
7256
msgid "read the tree into the index under <subdirectory>/"
7257
msgstr ""
7258
7259
#: builtin/read-tree.c:126
7260
msgid "update working tree with merge result"
7261
msgstr ""
7262
7263
#: builtin/read-tree.c:128
7264
msgid "gitignore"
7265
msgstr ""
7266
7267
#: builtin/read-tree.c:129
7268
msgid "allow explicitly ignored files to be overwritten"
7269
msgstr ""
7270
7271
#: builtin/read-tree.c:132
7272
msgid "don't check the working tree after merging"
7273
msgstr ""
7274
7275
#: builtin/read-tree.c:133
7276
msgid "don't update the index or the work tree"
7277
msgstr ""
7278
7279
#: builtin/read-tree.c:135
7280
msgid "skip applying sparse checkout filter"
7281
msgstr ""
7282
7283
#: builtin/read-tree.c:137
7284
msgid "debug unpack-trees"
7285
msgstr ""
7286
7287
#: builtin/remote.c:11
7288
msgid "git remote [-v | --verbose]"
7289
msgstr ""
7290
7291
#: builtin/remote.c:12
7292
msgid ""
7293
"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--"
7294
"mirror=<fetch|push>] <name> <url>"
7295
msgstr ""
7296
7297
#: builtin/remote.c:13 builtin/remote.c:32
7298
msgid "git remote rename <old> <new>"
7299
msgstr ""
7300
7301
#: builtin/remote.c:14 builtin/remote.c:37
7302
msgid "git remote remove <name>"
7303
msgstr ""
7304
7305
#: builtin/remote.c:15 builtin/remote.c:42
7306
msgid "git remote set-head <name> (-a | -d | <branch>)"
7307
msgstr ""
7308
7309
#: builtin/remote.c:16
7310
msgid "git remote [-v | --verbose] show [-n] <name>"
7311
msgstr ""
7312
7313
#: builtin/remote.c:17
7314
msgid "git remote prune [-n | --dry-run] <name>"
7315
msgstr ""
7316
7317
#: builtin/remote.c:18
7318
msgid ""
7319
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
7320
msgstr ""
7321
7322
#: builtin/remote.c:19
7323
msgid "git remote set-branches [--add] <name> <branch>..."
7324
msgstr ""
7325
7326
#: builtin/remote.c:20 builtin/remote.c:68
7327
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
7328
msgstr ""
7329
7330
#: builtin/remote.c:21 builtin/remote.c:69
7331
msgid "git remote set-url --add <name> <newurl>"
7332
msgstr ""
7333
7334
#: builtin/remote.c:22 builtin/remote.c:70
7335
msgid "git remote set-url --delete <name> <url>"
7336
msgstr ""
7337
7338
#: builtin/remote.c:27
7339
msgid "git remote add [<options>] <name> <url>"
7340
msgstr ""
7341
7342
#: builtin/remote.c:47
7343
msgid "git remote set-branches <name> <branch>..."
7344
msgstr ""
7345
7346
#: builtin/remote.c:48
7347
msgid "git remote set-branches --add <name> <branch>..."
7348
msgstr ""
7349
7350
#: builtin/remote.c:53
7351
msgid "git remote show [<options>] <name>"
7352
msgstr ""
7353
7354
#: builtin/remote.c:58
7355
msgid "git remote prune [<options>] <name>"
7356
msgstr ""
7357
7358
#: builtin/remote.c:63
7359
msgid "git remote update [<options>] [<group> | <remote>]..."
7360
msgstr ""
7361
7362
#: builtin/remote.c:98
7363
#, c-format
7364
msgid "Updating %s"
7365
msgstr ""
7366
7367
#: builtin/remote.c:130
7368
msgid ""
7369
"--mirror is dangerous and deprecated; please\n"
7370
"\t use --mirror=fetch or --mirror=push instead"
7371
msgstr ""
7372
7373
#: builtin/remote.c:147
7374
#, c-format
7375
msgid "unknown mirror argument: %s"
7376
msgstr ""
7377
7378
#: builtin/remote.c:163
7379
msgid "fetch the remote branches"
7380
msgstr ""
7381
7382
#: builtin/remote.c:165
7383
msgid "import all tags and associated objects when fetching"
7384
msgstr ""
7385
7386
#: builtin/remote.c:168
7387
msgid "or do not fetch any tag at all (--no-tags)"
7388
msgstr ""
7389
7390
#: builtin/remote.c:170
7391
msgid "branch(es) to track"
7392
msgstr ""
7393
7394
#: builtin/remote.c:171
7395
msgid "master branch"
7396
msgstr ""
7397
7398
#: builtin/remote.c:172
7399
msgid "push|fetch"
7400
msgstr ""
7401
7402
#: builtin/remote.c:173
7403
msgid "set up remote as a mirror to push to or fetch from"
7404
msgstr ""
7405
7406
#: builtin/remote.c:185
7407
msgid "specifying a master branch makes no sense with --mirror"
7408
msgstr ""
7409
7410
#: builtin/remote.c:187
7411
msgid "specifying branches to track makes sense only with fetch mirrors"
7412
msgstr ""
7413
7414
#: builtin/remote.c:195 builtin/remote.c:646
7415
#, c-format
7416
msgid "remote %s already exists."
7417
msgstr ""
7418
7419
#: builtin/remote.c:199 builtin/remote.c:650
7420
#, c-format
7421
msgid "'%s' is not a valid remote name"
7422
msgstr ""
7423
7424
#: builtin/remote.c:243
7425
#, c-format
7426
msgid "Could not setup master '%s'"
7427
msgstr ""
7428
7429
#: builtin/remote.c:299
7430
#, c-format
7431
msgid "more than one %s"
7432
msgstr ""
7433
7434
#: builtin/remote.c:339
7435
#, c-format
7436
msgid "Could not get fetch map for refspec %s"
7437
msgstr ""
7438
7439
#: builtin/remote.c:440 builtin/remote.c:448
7440
msgid "(matching)"
7441
msgstr ""
7442
7443
#: builtin/remote.c:452
7444
msgid "(delete)"
7445
msgstr ""
7446
7447
#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
7448
#, c-format
7449
msgid "Could not append '%s' to '%s'"
7450
msgstr ""
7451
7452
#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
7453
#, c-format
7454
msgid "No such remote: %s"
7455
msgstr ""
7456
7457
#: builtin/remote.c:656
7458
#, c-format
7459
msgid "Could not rename config section '%s' to '%s'"
7460
msgstr ""
7461
7462
#: builtin/remote.c:662 builtin/remote.c:799
7463
#, c-format
7464
msgid "Could not remove config section '%s'"
7465
msgstr ""
7466
7467
#: builtin/remote.c:677
7468
#, c-format
7469
msgid ""
7470
"Not updating non-default fetch refspec\n"
7471
"\t%s\n"
7472
"\tPlease update the configuration manually if necessary."
7473
msgstr ""
7474
7475
#: builtin/remote.c:683
7476
#, c-format
7477
msgid "Could not append '%s'"
7478
msgstr ""
7479
7480
#: builtin/remote.c:694
7481
#, c-format
7482
msgid "Could not set '%s'"
7483
msgstr ""
7484
7485
#: builtin/remote.c:716
7486
#, c-format
7487
msgid "deleting '%s' failed"
7488
msgstr ""
7489
7490
#: builtin/remote.c:750
7491
#, c-format
7492
msgid "creating '%s' failed"
7493
msgstr ""
7494
7495
#: builtin/remote.c:764
7496
#, c-format
7497
msgid "Could not remove branch %s"
7498
msgstr ""
7499
7500
#: builtin/remote.c:834
7501
msgid ""
7502
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
7503
"to delete it, use:"
7504
msgid_plural ""
7505
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
7506
"to delete them, use:"
7507
msgstr[0] ""
7508
msgstr[1] ""
7509
7510
#: builtin/remote.c:943
7511
#, c-format
7512
msgid " new (next fetch will store in remotes/%s)"
7513
msgstr ""
7514
7515
#: builtin/remote.c:946
7516
msgid " tracked"
7517
msgstr ""
7518
7519
#: builtin/remote.c:948
7520
msgid " stale (use 'git remote prune' to remove)"
7521
msgstr ""
7522
7523
#: builtin/remote.c:950
7524
msgid " ???"
7525
msgstr ""
7526
7527
#: builtin/remote.c:991
7528
#, c-format
7529
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
7530
msgstr ""
7531
7532
#: builtin/remote.c:998
7533
#, c-format
7534
msgid "rebases onto remote %s"
7535
msgstr ""
7536
7537
#: builtin/remote.c:1001
7538
#, c-format
7539
msgid " merges with remote %s"
7540
msgstr ""
7541
7542
#: builtin/remote.c:1002
7543
msgid " and with remote"
7544
msgstr ""
7545
7546
#: builtin/remote.c:1004
7547
#, c-format
7548
msgid "merges with remote %s"
7549
msgstr ""
7550
7551
#: builtin/remote.c:1005
7552
msgid " and with remote"
7553
msgstr ""
7554
7555
#: builtin/remote.c:1051
7556
msgid "create"
7557
msgstr ""
7558
7559
#: builtin/remote.c:1054
7560
msgid "delete"
7561
msgstr ""
7562
7563
#: builtin/remote.c:1058
7564
msgid "up to date"
7565
msgstr ""
7566
7567
#: builtin/remote.c:1061
7568
msgid "fast-forwardable"
7569
msgstr ""
7570
7571
#: builtin/remote.c:1064
7572
msgid "local out of date"
7573
msgstr ""
7574
7575
#: builtin/remote.c:1071
7576
#, c-format
7577
msgid " %-*s forces to %-*s (%s)"
7578
msgstr ""
7579
7580
#: builtin/remote.c:1074
7581
#, c-format
7582
msgid " %-*s pushes to %-*s (%s)"
7583
msgstr ""
7584
7585
#: builtin/remote.c:1078
7586
#, c-format
7587
msgid " %-*s forces to %s"
7588
msgstr ""
7589
7590
#: builtin/remote.c:1081
7591
#, c-format
7592
msgid " %-*s pushes to %s"
7593
msgstr ""
7594
7595
#: builtin/remote.c:1091
7596
msgid "do not query remotes"
7597
msgstr ""
7598
7599
#: builtin/remote.c:1118
7600
#, c-format
7601
msgid "* remote %s"
7602
msgstr ""
7603
7604
#: builtin/remote.c:1119
7605
#, c-format
7606
msgid " Fetch URL: %s"
7607
msgstr ""
7608
7609
#: builtin/remote.c:1120 builtin/remote.c:1285
7610
msgid "(no URL)"
7611
msgstr ""
7612
7613
#: builtin/remote.c:1129 builtin/remote.c:1131
7614
#, c-format
7615
msgid " Push URL: %s"
7616
msgstr ""
7617
7618
#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
7619
#, c-format
7620
msgid " HEAD branch: %s"
7621
msgstr ""
7622
7623
#: builtin/remote.c:1139
7624
#, c-format
7625
msgid ""
7626
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
7627
msgstr ""
7628
7629
#: builtin/remote.c:1151
7630
#, c-format
7631
msgid " Remote branch:%s"
7632
msgid_plural " Remote branches:%s"
7633
msgstr[0] ""
7634
msgstr[1] ""
7635
7636
#: builtin/remote.c:1154 builtin/remote.c:1181
7637
msgid " (status not queried)"
7638
msgstr ""
7639
7640
#: builtin/remote.c:1163
7641
msgid " Local branch configured for 'git pull':"
7642
msgid_plural " Local branches configured for 'git pull':"
7643
msgstr[0] ""
7644
msgstr[1] ""
7645
7646
#: builtin/remote.c:1171
7647
msgid " Local refs will be mirrored by 'git push'"
7648
msgstr ""
7649
7650
#: builtin/remote.c:1178
7651
#, c-format
7652
msgid " Local ref configured for 'git push'%s:"
7653
msgid_plural " Local refs configured for 'git push'%s:"
7654
msgstr[0] ""
7655
msgstr[1] ""
7656
7657
#: builtin/remote.c:1199
7658
msgid "set refs/remotes/<name>/HEAD according to remote"
7659
msgstr ""
7660
7661
#: builtin/remote.c:1201
7662
msgid "delete refs/remotes/<name>/HEAD"
7663
msgstr ""
7664
7665
#: builtin/remote.c:1216
7666
msgid "Cannot determine remote HEAD"
7667
msgstr ""
7668
7669
#: builtin/remote.c:1218
7670
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
7671
msgstr ""
7672
7673
#: builtin/remote.c:1228
7674
#, c-format
7675
msgid "Could not delete %s"
7676
msgstr ""
7677
7678
#: builtin/remote.c:1236
7679
#, c-format
7680
msgid "Not a valid ref: %s"
7681
msgstr ""
7682
7683
#: builtin/remote.c:1238
7684
#, c-format
7685
msgid "Could not setup %s"
7686
msgstr ""
7687
7688
#: builtin/remote.c:1274
7689
#, c-format
7690
msgid " %s will become dangling!"
7691
msgstr ""
7692
7693
#: builtin/remote.c:1275
7694
#, c-format
7695
msgid " %s has become dangling!"
7696
msgstr ""
7697
7698
#: builtin/remote.c:1281
7699
#, c-format
7700
msgid "Pruning %s"
7701
msgstr ""
7702
7703
#: builtin/remote.c:1282
7704
#, c-format
7705
msgid "URL: %s"
7706
msgstr ""
7707
7708
#: builtin/remote.c:1295
7709
#, c-format
7710
msgid " * [would prune] %s"
7711
msgstr ""
7712
7713
#: builtin/remote.c:1298
7714
#, c-format
7715
msgid " * [pruned] %s"
7716
msgstr ""
7717
7718
#: builtin/remote.c:1321
7719
msgid "prune remotes after fetching"
7720
msgstr ""
7721
7722
#: builtin/remote.c:1387 builtin/remote.c:1461
7723
#, c-format
7724
msgid "No such remote '%s'"
7725
msgstr ""
7726
7727
#: builtin/remote.c:1407
7728
msgid "add branch"
7729
msgstr ""
7730
7731
#: builtin/remote.c:1414
7732
msgid "no remote specified"
7733
msgstr ""
7734
7735
#: builtin/remote.c:1436
7736
msgid "manipulate push URLs"
7737
msgstr ""
7738
7739
#: builtin/remote.c:1438
7740
msgid "add URL"
7741
msgstr ""
7742
7743
#: builtin/remote.c:1440
7744
msgid "delete URLs"
7745
msgstr ""
7746
7747
#: builtin/remote.c:1447
7748
msgid "--add --delete doesn't make sense"
7749
msgstr ""
7750
7751
#: builtin/remote.c:1487
7752
#, c-format
7753
msgid "Invalid old URL pattern: %s"
7754
msgstr ""
7755
7756
#: builtin/remote.c:1495
7757
#, c-format
7758
msgid "No such URL found: %s"
7759
msgstr ""
7760
7761
#: builtin/remote.c:1497
7762
msgid "Will not delete all non-push URLs"
7763
msgstr ""
7764
7765
#: builtin/remote.c:1569
7766
msgid "be verbose; must be placed before a subcommand"
7767
msgstr ""
7768
7769
#: builtin/replace.c:17
7770
msgid "git replace [-f] <object> <replacement>"
7771
msgstr ""
7772
7773
#: builtin/replace.c:18
7774
msgid "git replace -d <object>..."
7775
msgstr ""
7776
7777
#: builtin/replace.c:19
7778
msgid "git replace -l [<pattern>]"
7779
msgstr ""
7780
7781
#: builtin/replace.c:121
7782
msgid "list replace refs"
7783
msgstr ""
7784
7785
#: builtin/replace.c:122
7786
msgid "delete replace refs"
7787
msgstr ""
7788
7789
#: builtin/replace.c:123
7790
msgid "replace the ref if it exists"
7791
msgstr ""
7792
7793
#: builtin/rerere.c:11
7794
msgid "git rerere [clear | forget path... | status | remaining | diff | gc]"
7795
msgstr ""
7796
7797
#: builtin/rerere.c:56
7798
msgid "register clean resolutions in index"
7799
msgstr ""
7800
7801
#: builtin/reset.c:25
7802
msgid ""
7803
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
7804
msgstr ""
7805
7806
#: builtin/reset.c:26
7807
msgid "git reset [-q] <tree-ish> [--] <paths>..."
7808
msgstr ""
7809
7810
#: builtin/reset.c:27
7811
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
7812
msgstr ""
7813
2817
7814
#: builtin/reset.c:33
2818
7815
msgid "mixed"
2819
7816
msgstr ""
2827
7824
msgstr ""
2828
7825
2829
7826
#: builtin/reset.c:33
7827
msgid "merge"
7828
msgstr ""
7829
7830
#: builtin/reset.c:33
2830
7831
msgid "keep"
2831
7832
msgstr ""
2832
7833
2833
#: builtin/reset.c:77
7834
#: builtin/reset.c:73
2834
7835
msgid "You do not have a valid HEAD."
2835
7836
msgstr ""
2836
7837
2837
#: builtin/reset.c:79
7838
#: builtin/reset.c:75
2838
7839
msgid "Failed to find tree of HEAD."
2839
7840
msgstr ""
2840
7841
2841
#: builtin/reset.c:85
7842
#: builtin/reset.c:81
2842
7843
#, c-format
2843
7844
msgid "Failed to find tree of %s."
2844
7845
msgstr ""
2845
7846
2846
#: builtin/reset.c:96
2847
msgid "Could not write new index file."
2848
msgstr ""
2849
2850
#: builtin/reset.c:106
7847
#: builtin/reset.c:98
2851
7848
#, c-format
2852
7849
msgid "HEAD is now at %s"
2853
7850
msgstr ""
2854
7851
2855
#: builtin/reset.c:130
2856
msgid "Could not read index"
2857
msgstr ""
2858
2859
#: builtin/reset.c:133
2860
msgid "Unstaged changes after reset:"
2861
msgstr ""
2862
2863
#: builtin/reset.c:223
7852
#: builtin/reset.c:169
2864
7853
#, c-format
2865
7854
msgid "Cannot do a %s reset in the middle of a merge."
2866
7855
msgstr ""
2867
7856
2868
#: builtin/reset.c:297
7857
#: builtin/reset.c:248
7858
msgid "be quiet, only report errors"
7859
msgstr ""
7860
7861
#: builtin/reset.c:250
7862
msgid "reset HEAD and index"
7863
msgstr ""
7864
7865
#: builtin/reset.c:251
7866
msgid "reset only HEAD"
7867
msgstr ""
7868
7869
#: builtin/reset.c:253 builtin/reset.c:255
7870
msgid "reset HEAD, index and working tree"
7871
msgstr ""
7872
7873
#: builtin/reset.c:257
7874
msgid "reset HEAD but keep local changes"
7875
msgstr ""
7876
7877
#: builtin/reset.c:275
7878
#, c-format
7879
msgid "Failed to resolve '%s' as a valid revision."
7880
msgstr ""
7881
7882
#: builtin/reset.c:278 builtin/reset.c:286
2869
7883
#, c-format
2870
7884
msgid "Could not parse object '%s'."
2871
7885
msgstr ""
2872
7886
2873
#: builtin/reset.c:302
7887
#: builtin/reset.c:283
7888
#, c-format
7889
msgid "Failed to resolve '%s' as a valid tree."
7890
msgstr ""
7891
7892
#: builtin/reset.c:292
2874
7893
msgid "--patch is incompatible with --{hard,mixed,soft}"
2875
7894
msgstr ""
2876
7895
2877
#: builtin/reset.c:311
7896
#: builtin/reset.c:301
2878
7897
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
2879
7898
msgstr ""
2880
7899
7900
#: builtin/reset.c:303
7901
#, c-format
7902
msgid "Cannot do %s reset with paths."
7903
msgstr ""
7904
2881
7905
#: builtin/reset.c:313
2882
7906
#, c-format
2883
msgid "Cannot do %s reset with paths."
2884
msgstr ""
2885
2886
#: builtin/reset.c:325
2887
#, c-format
2888
7907
msgid "%s reset is not allowed in a bare repository"
2889
7908
msgstr ""
2890
7909
2891
#: builtin/reset.c:341
7910
#: builtin/reset.c:333
2892
7911
#, c-format
2893
7912
msgid "Could not reset index file to revision '%s'."
2894
7913
msgstr ""
2895
7914
7915
#: builtin/reset.c:339
7916
msgid "Unstaged changes after reset:"
7917
msgstr ""
7918
7919
#: builtin/reset.c:344
7920
msgid "Could not write new index file."
7921
msgstr ""
7922
7923
#: builtin/rev-parse.c:339
7924
msgid "git rev-parse --parseopt [options] -- [<args>...]"
7925
msgstr ""
7926
7927
#: builtin/rev-parse.c:344
7928
msgid "keep the `--` passed as an arg"
7929
msgstr ""
7930
7931
#: builtin/rev-parse.c:346
7932
msgid "stop parsing after the first non-option argument"
7933
msgstr ""
7934
7935
#: builtin/rev-parse.c:464
7936
msgid ""
7937
"git rev-parse --parseopt [options] -- [<args>...]\n"
7938
" or: git rev-parse --sq-quote [<arg>...]\n"
7939
" or: git rev-parse [options] [<arg>...]\n"
7940
"\n"
7941
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
7942
msgstr ""
7943
7944
#: builtin/revert.c:22
7945
msgid "git revert [options] <commit-ish>..."
7946
msgstr ""
7947
7948
#: builtin/revert.c:23
7949
msgid "git revert <subcommand>"
7950
msgstr ""
7951
7952
#: builtin/revert.c:28
7953
msgid "git cherry-pick [options] <commit-ish>..."
7954
msgstr ""
7955
7956
#: builtin/revert.c:29
7957
msgid "git cherry-pick <subcommand>"
7958
msgstr ""
7959
2896
7960
#: builtin/revert.c:70 builtin/revert.c:92
2897
7961
#, c-format
2898
7962
msgid "%s: %s cannot be used with %s"
2899
7963
msgstr ""
2900
7964
7965
#: builtin/revert.c:103
7966
msgid "end revert or cherry-pick sequence"
7967
msgstr ""
7968
7969
#: builtin/revert.c:104
7970
msgid "resume revert or cherry-pick sequence"
7971
msgstr ""
7972
7973
#: builtin/revert.c:105
7974
msgid "cancel revert or cherry-pick sequence"
7975
msgstr ""
7976
7977
#: builtin/revert.c:106
7978
msgid "don't automatically commit"
7979
msgstr ""
7980
7981
#: builtin/revert.c:107
7982
msgid "edit the commit message"
7983
msgstr ""
7984
7985
#: builtin/revert.c:110
7986
msgid "parent number"
7987
msgstr ""
7988
7989
#: builtin/revert.c:112
7990
msgid "merge strategy"
7991
msgstr ""
7992
7993
#: builtin/revert.c:113
7994
msgid "option"
7995
msgstr ""
7996
7997
#: builtin/revert.c:114
7998
msgid "option for merge strategy"
7999
msgstr ""
8000
8001
#: builtin/revert.c:125
8002
msgid "append commit name"
8003
msgstr ""
8004
8005
#: builtin/revert.c:126
8006
msgid "allow fast-forward"
8007
msgstr ""
8008
2901
8009
#: builtin/revert.c:127
8010
msgid "preserve initially empty commits"
8011
msgstr ""
8012
8013
#: builtin/revert.c:128
8014
msgid "allow commits with empty messages"
8015
msgstr ""
8016
8017
#: builtin/revert.c:129
8018
msgid "keep redundant, empty commits"
8019
msgstr ""
8020
8021
#: builtin/revert.c:133
2902
8022
msgid "program error"
2903
8023
msgstr ""
2904
8024
2905
#: builtin/revert.c:213
8025
#: builtin/revert.c:223
2906
8026
msgid "revert failed"
2907
8027
msgstr ""
2908
8028
2909
#: builtin/revert.c:228
8029
#: builtin/revert.c:238
2910
8030
msgid "cherry-pick failed"
2911
8031
msgstr ""
2912
8032
2913
#: builtin/rm.c:109
8033
#: builtin/rm.c:15
8034
msgid "git rm [options] [--] <file>..."
8035
msgstr ""
8036
8037
#: builtin/rm.c:64 builtin/rm.c:186
8038
#, c-format
8039
msgid ""
8040
"submodule '%s' (or one of its nested submodules) uses a .git directory\n"
8041
"(use 'rm -rf' if you really want to remove it including all of its history)"
8042
msgstr ""
8043
8044
#: builtin/rm.c:174
2914
8045
#, c-format
2915
8046
msgid ""
2916
8047
"'%s' has staged content different from both the file and the HEAD\n"
2917
8048
"(use -f to force removal)"
2918
8049
msgstr ""
2919
8050
2920
#: builtin/rm.c:115
8051
#: builtin/rm.c:180
2921
8052
#, c-format
2922
8053
msgid ""
2923
8054
"'%s' has changes staged in the index\n"
2924
8055
"(use --cached to keep the file, or -f to force removal)"
2925
8056
msgstr ""
2926
8057
2927
#: builtin/rm.c:119
8058
#: builtin/rm.c:191
2928
8059
#, c-format
2929
8060
msgid ""
2930
8061
"'%s' has local modifications\n"
2931
8062
"(use --cached to keep the file, or -f to force removal)"
2932
8063
msgstr ""
2933
8064
2934
#: builtin/rm.c:194
8065
#: builtin/rm.c:207
8066
msgid "do not list removed files"
8067
msgstr ""
8068
8069
#: builtin/rm.c:208
8070
msgid "only remove from the index"
8071
msgstr ""
8072
8073
#: builtin/rm.c:209
8074
msgid "override the up-to-date check"
8075
msgstr ""
8076
8077
#: builtin/rm.c:210
8078
msgid "allow recursive removal"
8079
msgstr ""
8080
8081
#: builtin/rm.c:212
8082
msgid "exit with a zero status even if nothing matched"
8083
msgstr ""
8084
8085
#: builtin/rm.c:283
2935
8086
#, c-format
2936
8087
msgid "not removing '%s' recursively without -r"
2937
8088
msgstr ""
2938
8089
2939
#: builtin/rm.c:230
8090
#: builtin/rm.c:322
2940
8091
#, c-format
2941
8092
msgid "git rm: unable to remove %s"
2942
8093
msgstr ""
2943
8094
2944
#: builtin/shortlog.c:157
8095
#: builtin/shortlog.c:13
8096
msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]"
8097
msgstr ""
8098
8099
#: builtin/shortlog.c:131
2945
8100
#, c-format
2946
8101
msgid "Missing author: %s"
2947
8102
msgstr ""
2948
8103
2949
#: builtin/tag.c:58
8104
#: builtin/shortlog.c:227
8105
msgid "sort output according to the number of commits per author"
8106
msgstr ""
8107
8108
#: builtin/shortlog.c:229
8109
msgid "Suppress commit descriptions, only provides commit count"
8110
msgstr ""
8111
8112
#: builtin/shortlog.c:231
8113
msgid "Show the email address of each author"
8114
msgstr ""
8115
8116
#: builtin/shortlog.c:232
8117
msgid "w[,i1[,i2]]"
8118
msgstr ""
8119
8120
#: builtin/shortlog.c:233
8121
msgid "Linewrap output"
8122
msgstr ""
8123
8124
#: builtin/show-branch.c:9
8125
msgid ""
8126
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--"
8127
"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --"
8128
"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | "
8129
"<glob>)...]"
8130
msgstr ""
8131
8132
#: builtin/show-branch.c:10
8133
msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
8134
msgstr ""
8135
8136
#: builtin/show-branch.c:650
8137
msgid "show remote-tracking and local branches"
8138
msgstr ""
8139
8140
#: builtin/show-branch.c:652
8141
msgid "show remote-tracking branches"
8142
msgstr ""
8143
8144
#: builtin/show-branch.c:654
8145
msgid "color '*!+-' corresponding to the branch"
8146
msgstr ""
8147
8148
#: builtin/show-branch.c:656
8149
msgid "show <n> more commits after the common ancestor"
8150
msgstr ""
8151
8152
#: builtin/show-branch.c:658
8153
msgid "synonym to more=-1"
8154
msgstr ""
8155
8156
#: builtin/show-branch.c:659
8157
msgid "suppress naming strings"
8158
msgstr ""
8159
8160
#: builtin/show-branch.c:661
8161
msgid "include the current branch"
8162
msgstr ""
8163
8164
#: builtin/show-branch.c:663
8165
msgid "name commits with their object names"
8166
msgstr ""
8167
8168
#: builtin/show-branch.c:665
8169
msgid "show possible merge bases"
8170
msgstr ""
8171
8172
#: builtin/show-branch.c:667
8173
msgid "show refs unreachable from any other ref"
8174
msgstr ""
8175
8176
#: builtin/show-branch.c:669
8177
msgid "show commits in topological order"
8178
msgstr ""
8179
8180
#: builtin/show-branch.c:671
8181
msgid "show only commits not on the first branch"
8182
msgstr ""
8183
8184
#: builtin/show-branch.c:673
8185
msgid "show merges reachable from only one tip"
8186
msgstr ""
8187
8188
#: builtin/show-branch.c:675
8189
msgid "show commits where no parent comes before its children"
8190
msgstr ""
8191
8192
#: builtin/show-branch.c:677
8193
msgid "<n>[,<base>]"
8194
msgstr ""
8195
8196
#: builtin/show-branch.c:678
8197
msgid "show <n> most recent ref-log entries starting at base"
8198
msgstr ""
8199
8200
#: builtin/show-ref.c:10
8201
msgid ""
8202
"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
8203
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
8204
msgstr ""
8205
8206
#: builtin/show-ref.c:11
8207
msgid "git show-ref --exclude-existing[=pattern] < ref-list"
8208
msgstr ""
8209
8210
#: builtin/show-ref.c:165
8211
msgid "only show tags (can be combined with heads)"
8212
msgstr ""
8213
8214
#: builtin/show-ref.c:166
8215
msgid "only show heads (can be combined with tags)"
8216
msgstr ""
8217
8218
#: builtin/show-ref.c:167
8219
msgid "stricter reference checking, requires exact ref path"
8220
msgstr ""
8221
8222
#: builtin/show-ref.c:170 builtin/show-ref.c:172
8223
msgid "show the HEAD reference"
8224
msgstr ""
8225
8226
#: builtin/show-ref.c:174
8227
msgid "dereference tags into object IDs"
8228
msgstr ""
8229
8230
#: builtin/show-ref.c:176
8231
msgid "only show SHA1 hash using <n> digits"
8232
msgstr ""
8233
8234
#: builtin/show-ref.c:180
8235
msgid "do not print results to stdout (useful with --verify)"
8236
msgstr ""
8237
8238
#: builtin/show-ref.c:182
8239
msgid "show refs from stdin that aren't in local repository"
8240
msgstr ""
8241
8242
#: builtin/symbolic-ref.c:7
8243
msgid "git symbolic-ref [options] name [ref]"
8244
msgstr ""
8245
8246
#: builtin/symbolic-ref.c:8
8247
msgid "git symbolic-ref -d [-q] name"
8248
msgstr ""
8249
8250
#: builtin/symbolic-ref.c:40
8251
msgid "suppress error message for non-symbolic (detached) refs"
8252
msgstr ""
8253
8254
#: builtin/symbolic-ref.c:41
8255
msgid "delete symbolic ref"
8256
msgstr ""
8257
8258
#: builtin/symbolic-ref.c:42
8259
msgid "shorten ref output"
8260
msgstr ""
8261
8262
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8263
msgid "reason"
8264
msgstr ""
8265
8266
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18
8267
msgid "reason of the update"
8268
msgstr ""
8269
8270
#: builtin/tag.c:22
8271
msgid ""
8272
"git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]"
8273
msgstr ""
8274
8275
#: builtin/tag.c:23
8276
msgid "git tag -d <tagname>..."
8277
msgstr ""
8278
8279
#: builtin/tag.c:24
8280
msgid ""
8281
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n"
8282
"\t\t[<pattern>...]"
8283
msgstr ""
8284
8285
#: builtin/tag.c:26
8286
msgid "git tag -v <tagname>..."
8287
msgstr ""
8288
8289
#: builtin/tag.c:60
2950
8290
#, c-format
2951
8291
msgid "malformed object at '%s'"
2952
8292
msgstr ""
2953
8293
2954
#: builtin/tag.c:205
8294
#: builtin/tag.c:207
2955
8295
#, c-format
2956
8296
msgid "tag name too long: %.*s..."
2957
8297
msgstr ""
2958
8298
2959
#: builtin/tag.c:210
8299
#: builtin/tag.c:212
2960
8300
#, c-format
2961
8301
msgid "tag '%s' not found."
2962
8302
msgstr ""
2963
8303
2964
#: builtin/tag.c:225
8304
#: builtin/tag.c:227
2965
8305
#, c-format
2966
8306
msgid "Deleted tag '%s' (was %s)\n"
2967
8307
msgstr ""
2968
8308
2969
#: builtin/tag.c:237
8309
#: builtin/tag.c:239
2970
8310
#, c-format
2971
8311
msgid "could not verify the tag '%s'"
2972
8312
msgstr ""
2973
8313
2974
#: builtin/tag.c:247
8314
#: builtin/tag.c:249
8315
#, c-format
2975
8316
msgid ""
2976
8317
"\n"
2977
"#\n"
2978
"# Write a tag message\n"
2979
"# Lines starting with '#' will be ignored.\n"
2980
"#\n"
8318
"Write a tag message\n"
8319
"Lines starting with '%c' will be ignored.\n"
2981
8320
msgstr ""
2982
8321
2983
#: builtin/tag.c:254
8322
#: builtin/tag.c:253
8323
#, c-format
2984
8324
msgid ""
2985
8325
"\n"
2986
"#\n"
2987
"# Write a tag message\n"
2988
"# Lines starting with '#' will be kept; you may remove them yourself if you "
8326
"Write a tag message\n"
8327
"Lines starting with '%c' will be kept; you may remove them yourself if you "
2989
8328
"want to.\n"
2990
"#\n"
8329
msgstr ""
8330
8331
#: builtin/tag.c:292
8332
msgid "unable to sign the tag"
2991
8333
msgstr ""
2992
8334
2993
8335
#: builtin/tag.c:294
2994
msgid "unable to sign the tag"
2995
msgstr ""
2996
2997
#: builtin/tag.c:296
2998
8336
msgid "unable to write tag file"
2999
8337
msgstr ""
3000
8338
3001
#: builtin/tag.c:321
8339
#: builtin/tag.c:319
3002
8340
msgid "bad object type."
3003
8341
msgstr ""
3004
8342
3005
#: builtin/tag.c:334
8343
#: builtin/tag.c:332
3006
8344
msgid "tag header too big."
3007
8345
msgstr ""
3008
8346
3009
#: builtin/tag.c:366
8347
#: builtin/tag.c:368
3010
8348
msgid "no tag message?"
3011
8349
msgstr ""
3012
8350
3013
#: builtin/tag.c:372
8351
#: builtin/tag.c:374
3014
8352
#, c-format
3015
8353
msgid "The tag message has been left in %s\n"
3016
8354
msgstr ""
3017
8355
3018
#: builtin/tag.c:421
8356
#: builtin/tag.c:423
3019
8357
msgid "switch 'points-at' requires an object"
3020
8358
msgstr ""
3021
8359
3022
#: builtin/tag.c:423
8360
#: builtin/tag.c:425
3023
8361
#, c-format
3024
8362
msgid "malformed object name '%s'"
3025
8363
msgstr ""
3026
8364
3027
#: builtin/tag.c:502
8365
#: builtin/tag.c:445
8366
msgid "list tag names"
8367
msgstr ""
8368
8369
#: builtin/tag.c:447
8370
msgid "print <n> lines of each tag message"
8371
msgstr ""
8372
8373
#: builtin/tag.c:449
8374
msgid "delete tags"
8375
msgstr ""
8376
8377
#: builtin/tag.c:450
8378
msgid "verify tags"
8379
msgstr ""
8380
8381
#: builtin/tag.c:452
8382
msgid "Tag creation options"
8383
msgstr ""
8384
8385
#: builtin/tag.c:454
8386
msgid "annotated tag, needs a message"
8387
msgstr ""
8388
8389
#: builtin/tag.c:456
8390
msgid "tag message"
8391
msgstr ""
8392
8393
#: builtin/tag.c:458
8394
msgid "annotated and GPG-signed tag"
8395
msgstr ""
8396
8397
#: builtin/tag.c:462
8398
msgid "use another key to sign the tag"
8399
msgstr ""
8400
8401
#: builtin/tag.c:463
8402
msgid "replace the tag if exists"
8403
msgstr ""
8404
8405
#: builtin/tag.c:464
8406
msgid "show tag list in columns"
8407
msgstr ""
8408
8409
#: builtin/tag.c:466
8410
msgid "Tag listing options"
8411
msgstr ""
8412
8413
#: builtin/tag.c:469
8414
msgid "print only tags that contain the commit"
8415
msgstr ""
8416
8417
#: builtin/tag.c:475
8418
msgid "print only tags of the object"
8419
msgstr ""
8420
8421
#: builtin/tag.c:504
8422
msgid "--column and -n are incompatible"
8423
msgstr ""
8424
8425
#: builtin/tag.c:521
3028
8426
msgid "-n option is only allowed with -l."
3029
8427
msgstr ""
3030
8428
3031
#: builtin/tag.c:504
8429
#: builtin/tag.c:523
3032
8430
msgid "--contains option is only allowed with -l."
3033
8431
msgstr ""
3034
8432
3035
#: builtin/tag.c:506
8433
#: builtin/tag.c:525
3036
8434
msgid "--points-at option is only allowed with -l."
3037
8435
msgstr ""
3038
8436
3039
#: builtin/tag.c:514
8437
#: builtin/tag.c:533
3040
8438
msgid "only one -F or -m option is allowed."
3041
8439
msgstr ""
3042
8440
3043
#: builtin/tag.c:534
8441
#: builtin/tag.c:553
3044
8442
msgid "too many params"
3045
8443
msgstr ""
3046
8444
3047
#: builtin/tag.c:540
8445
#: builtin/tag.c:559
3048
8446
#, c-format
3049
8447
msgid "'%s' is not a valid tag name."
3050
8448
msgstr ""
3051
8449
3052
#: builtin/tag.c:545
8450
#: builtin/tag.c:564
3053
8451
#, c-format
3054
8452
msgid "tag '%s' already exists"
3055
8453
msgstr ""
3056
8454
3057
#: builtin/tag.c:563
8455
#: builtin/tag.c:582
3058
8456
#, c-format
3059
8457
msgid "%s: cannot lock the ref"
3060
8458
msgstr ""
3061
8459
3062
#: builtin/tag.c:565
8460
#: builtin/tag.c:584
3063
8461
#, c-format
3064
8462
msgid "%s: cannot update the ref"
3065
8463
msgstr ""
3066
8464
3067
#: builtin/tag.c:567
8465
#: builtin/tag.c:586
3068
8466
#, c-format
3069
8467
msgid "Updated tag '%s' (was %s)\n"
3070
8468
msgstr ""
3071
8469
3072
#: git-am.sh:49
8470
#: builtin/update-index.c:401
8471
msgid "git update-index [options] [--] [<file>...]"
8472
msgstr ""
8473
8474
#: builtin/update-index.c:718
8475
msgid "continue refresh even when index needs update"
8476
msgstr ""
8477
8478
#: builtin/update-index.c:721
8479
msgid "refresh: ignore submodules"
8480
msgstr ""
8481
8482
#: builtin/update-index.c:724
8483
msgid "do not ignore new files"
8484
msgstr ""
8485
8486
#: builtin/update-index.c:726
8487
msgid "let files replace directories and vice-versa"
8488
msgstr ""
8489
8490
#: builtin/update-index.c:728
8491
msgid "notice files missing from worktree"
8492
msgstr ""
8493
8494
#: builtin/update-index.c:730
8495
msgid "refresh even if index contains unmerged entries"
8496
msgstr ""
8497
8498
#: builtin/update-index.c:733
8499
msgid "refresh stat information"
8500
msgstr ""
8501
8502
#: builtin/update-index.c:737
8503
msgid "like --refresh, but ignore assume-unchanged setting"
8504
msgstr ""
8505
8506
#: builtin/update-index.c:741
8507
msgid "<mode> <object> <path>"
8508
msgstr ""
8509
8510
#: builtin/update-index.c:742
8511
msgid "add the specified entry to the index"
8512
msgstr ""
8513
8514
#: builtin/update-index.c:746
8515
msgid "(+/-)x"
8516
msgstr ""
8517
8518
#: builtin/update-index.c:747
8519
msgid "override the executable bit of the listed files"
8520
msgstr ""
8521
8522
#: builtin/update-index.c:751
8523
msgid "mark files as \"not changing\""
8524
msgstr ""
8525
8526
#: builtin/update-index.c:754
8527
msgid "clear assumed-unchanged bit"
8528
msgstr ""
8529
8530
#: builtin/update-index.c:757
8531
msgid "mark files as \"index-only\""
8532
msgstr ""
8533
8534
#: builtin/update-index.c:760
8535
msgid "clear skip-worktree bit"
8536
msgstr ""
8537
8538
#: builtin/update-index.c:763
8539
msgid "add to index only; do not add content to object database"
8540
msgstr ""
8541
8542
#: builtin/update-index.c:765
8543
msgid "remove named paths even if present in worktree"
8544
msgstr ""
8545
8546
#: builtin/update-index.c:767
8547
msgid "with --stdin: input lines are terminated by null bytes"
8548
msgstr ""
8549
8550
#: builtin/update-index.c:769
8551
msgid "read list of paths to be updated from standard input"
8552
msgstr ""
8553
8554
#: builtin/update-index.c:773
8555
msgid "add entries from standard input to the index"
8556
msgstr ""
8557
8558
#: builtin/update-index.c:777
8559
msgid "repopulate stages #2 and #3 for the listed paths"
8560
msgstr ""
8561
8562
#: builtin/update-index.c:781
8563
msgid "only update entries that differ from HEAD"
8564
msgstr ""
8565
8566
#: builtin/update-index.c:785
8567
msgid "ignore files missing from worktree"
8568
msgstr ""
8569
8570
#: builtin/update-index.c:788
8571
msgid "report actions to standard output"
8572
msgstr ""
8573
8574
#: builtin/update-index.c:790
8575
msgid "(for porcelains) forget saved unresolved conflicts"
8576
msgstr ""
8577
8578
#: builtin/update-index.c:794
8579
msgid "write index in this format"
8580
msgstr ""
8581
8582
#: builtin/update-ref.c:7
8583
msgid "git update-ref [options] -d <refname> [<oldval>]"
8584
msgstr ""
8585
8586
#: builtin/update-ref.c:8
8587
msgid "git update-ref [options] <refname> <newval> [<oldval>]"
8588
msgstr ""
8589
8590
#: builtin/update-ref.c:19
8591
msgid "delete the reference"
8592
msgstr ""
8593
8594
#: builtin/update-ref.c:21
8595
msgid "update <refname> not the one it points to"
8596
msgstr ""
8597
8598
#: builtin/update-server-info.c:6
8599
msgid "git update-server-info [--force]"
8600
msgstr ""
8601
8602
#: builtin/update-server-info.c:14
8603
msgid "update the info files from scratch"
8604
msgstr ""
8605
8606
#: builtin/verify-pack.c:56
8607
msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
8608
msgstr ""
8609
8610
#: builtin/verify-pack.c:66
8611
msgid "verbose"
8612
msgstr ""
8613
8614
#: builtin/verify-pack.c:68
8615
msgid "show statistics only"
8616
msgstr ""
8617
8618
#: builtin/verify-tag.c:17
8619
msgid "git verify-tag [-v|--verbose] <tag>..."
8620
msgstr ""
8621
8622
#: builtin/verify-tag.c:73
8623
msgid "print tag contents"
8624
msgstr ""
8625
8626
#: builtin/write-tree.c:13
8627
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
8628
msgstr ""
8629
8630
#: builtin/write-tree.c:26
8631
msgid "<prefix>/"
8632
msgstr ""
8633
8634
#: builtin/write-tree.c:27
8635
msgid "write tree object for a subdirectory <prefix>"
8636
msgstr ""
8637
8638
#: builtin/write-tree.c:30
8639
msgid "only useful for debugging"
8640
msgstr ""
8641
8642
#: git.c:16
8643
msgid ""
8644
"'git help -a' and 'git help -g' lists available subcommands and some\n"
8645
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
8646
"to read about a specific subcommand or concept."
8647
msgstr ""
8648
8649
#: parse-options.h:156
8650
msgid "no-op (backward compatibility)"
8651
msgstr ""
8652
8653
#: parse-options.h:232
8654
msgid "be more verbose"
8655
msgstr ""
8656
8657
#: parse-options.h:234
8658
msgid "be more quiet"
8659
msgstr ""
8660
8661
#: parse-options.h:240
8662
msgid "use <n> digits to display SHA-1s"
8663
msgstr ""
8664
8665
#: common-cmds.h:8
8666
msgid "Add file contents to the index"
8667
msgstr ""
8668
8669
#: common-cmds.h:9
8670
msgid "Find by binary search the change that introduced a bug"
8671
msgstr ""
8672
8673
#: common-cmds.h:10
8674
msgid "List, create, or delete branches"
8675
msgstr ""
8676
8677
#: common-cmds.h:11
8678
msgid "Checkout a branch or paths to the working tree"
8679
msgstr ""
8680
8681
#: common-cmds.h:12
8682
msgid "Clone a repository into a new directory"
8683
msgstr ""
8684
8685
#: common-cmds.h:13
8686
msgid "Record changes to the repository"
8687
msgstr ""
8688
8689
#: common-cmds.h:14
8690
msgid "Show changes between commits, commit and working tree, etc"
8691
msgstr ""
8692
8693
#: common-cmds.h:15
8694
msgid "Download objects and refs from another repository"
8695
msgstr ""
8696
8697
#: common-cmds.h:16
8698
msgid "Print lines matching a pattern"
8699
msgstr ""
8700
8701
#: common-cmds.h:17
8702
msgid "Create an empty Git repository or reinitialize an existing one"
8703
msgstr ""
8704
8705
#: common-cmds.h:18
8706
msgid "Show commit logs"
8707
msgstr ""
8708
8709
#: common-cmds.h:19
8710
msgid "Join two or more development histories together"
8711
msgstr ""
8712
8713
#: common-cmds.h:20
8714
msgid "Move or rename a file, a directory, or a symlink"
8715
msgstr ""
8716
8717
#: common-cmds.h:21
8718
msgid "Fetch from and merge with another repository or a local branch"
8719
msgstr ""
8720
8721
#: common-cmds.h:22
8722
msgid "Update remote refs along with associated objects"
8723
msgstr ""
8724
8725
#: common-cmds.h:23
8726
msgid "Forward-port local commits to the updated upstream head"
8727
msgstr ""
8728
8729
#: common-cmds.h:24
8730
msgid "Reset current HEAD to the specified state"
8731
msgstr ""
8732
8733
#: common-cmds.h:25
8734
msgid "Remove files from the working tree and from the index"
8735
msgstr ""
8736
8737
#: common-cmds.h:26
8738
msgid "Show various types of objects"
8739
msgstr ""
8740
8741
#: common-cmds.h:27
8742
msgid "Show the working tree status"
8743
msgstr ""
8744
8745
#: common-cmds.h:28
8746
msgid "Create, list, delete or verify a tag object signed with GPG"
8747
msgstr ""
8748
8749
#: git-am.sh:50
3073
8750
msgid "You need to set your committer info first"
3074
8751
msgstr ""
3075
8752
3076
#: git-am.sh:136
8753
#: git-am.sh:95
8754
msgid ""
8755
"You seem to have moved HEAD since the last 'am' failure.\n"
8756
"Not rewinding to ORIG_HEAD"
8757
msgstr ""
8758
8759
#: git-am.sh:105
8760
#, sh-format
8761
msgid ""
8762
"When you have resolved this problem, run \"$cmdline --resolved\".\n"
8763
"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
8764
"To restore the original branch and stop patching, run \"$cmdline --abort\"."
8765
msgstr ""
8766
8767
#: git-am.sh:121
8768
msgid "Cannot fall back to three-way merge."
8769
msgstr ""
8770
8771
#: git-am.sh:137
3077
8772
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
3078
8773
msgstr ""
3079
8774
3080
#: git-am.sh:147
8775
#: git-am.sh:139
8776
msgid "Using index info to reconstruct a base tree..."
8777
msgstr ""
8778
8779
#: git-am.sh:154
3081
8780
msgid ""
3082
8781
"Did you hand edit your patch?\n"
3083
8782
"It does not apply to blobs recorded in its index."
3084
8783
msgstr ""
3085
8784
3086
#: git-am.sh:156
8785
#: git-am.sh:163
3087
8786
msgid "Falling back to patching base and 3-way merge..."
3088
8787
msgstr ""
3089
8788
3090
#: git-am.sh:268
8789
#: git-am.sh:179
8790
msgid "Failed to merge in the changes."
8791
msgstr ""
8792
8793
#: git-am.sh:274
3091
8794
msgid "Only one StGIT patch series can be applied at once"
3092
8795
msgstr ""
3093
8796
3094
#: git-am.sh:355
8797
#: git-am.sh:361
3095
8798
#, sh-format
3096
8799
msgid "Patch format $patch_format is not supported."
3097
8800
msgstr ""
3098
8801
3099
#: git-am.sh:357
8802
#: git-am.sh:363
3100
8803
msgid "Patch format detection failed."
3101
8804
msgstr ""
3102
8805
3103
#: git-am.sh:411
3104
msgid "-d option is no longer supported. Do not use."
8806
#: git-am.sh:389
8807
msgid ""
8808
"The -b/--binary option has been a no-op for long time, and\n"
8809
"it will be removed. Please do not use it anymore."
3105
8810
msgstr ""
3106
8811
3107
#: git-am.sh:474
8812
#: git-am.sh:477
3108
8813
#, sh-format
3109
8814
msgid "previous rebase directory $dotest still exists but mbox given."
3110
8815
msgstr ""
3111
8816
3112
#: git-am.sh:479
8817
#: git-am.sh:482
3113
8818
msgid "Please make up your mind. --skip or --abort?"
3114
8819
msgstr ""
3115
8820
3116
#: git-am.sh:506
8821
#: git-am.sh:509
3117
8822
msgid "Resolve operation not in progress, we are not resuming."
3118
8823
msgstr ""
3119
8824
3120
#: git-am.sh:572
8825
#: git-am.sh:575
3121
8826
#, sh-format
3122
8827
msgid "Dirty index: cannot apply patches (dirty: $files)"
3123
8828
msgstr ""
3124
8829
3125
#: git-am.sh:748
8830
#: git-am.sh:679
8831
#, sh-format
8832
msgid ""
8833
"Patch is empty. Was it split wrong?\n"
8834
"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
8835
"To restore the original branch and stop patching run \"$cmdline --abort\"."
8836
msgstr ""
8837
8838
#: git-am.sh:706
8839
msgid "Patch does not have a valid e-mail address."
8840
msgstr ""
8841
8842
#: git-am.sh:753
3126
8843
msgid "cannot be interactive without stdin connected to a terminal."
3127
8844
msgstr ""
3128
8845
8846
#: git-am.sh:757
8847
msgid "Commit Body is:"
8848
msgstr ""
8849
3129
8850
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3130
8851
#. in your translation. The program will only accept English
3131
8852
#. input at this point.
3132
#: git-am.sh:759
8853
#: git-am.sh:764
3133
8854
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3134
8855
msgstr ""
3135
8856
3136
#: git-am.sh:795
8857
#: git-am.sh:800
3137
8858
#, sh-format
3138
8859
msgid "Applying: $FIRSTLINE"
3139
8860
msgstr ""
3140
8861
3141
#: git-am.sh:840
8862
#: git-am.sh:821
8863
msgid ""
8864
"No changes - did you forget to use 'git add'?\n"
8865
"If there is nothing left to stage, chances are that something else\n"
8866
"already introduced the same changes; you might want to skip this patch."
8867
msgstr ""
8868
8869
#: git-am.sh:829
8870
msgid ""
8871
"You still have unmerged paths in your index\n"
8872
"did you forget to use 'git add'?"
8873
msgstr ""
8874
8875
#: git-am.sh:845
3142
8876
msgid "No changes -- Patch already applied."
3143
8877
msgstr ""
3144
8878
3145
#: git-am.sh:866
8879
#: git-am.sh:855
8880
#, sh-format
8881
msgid "Patch failed at $msgnum $FIRSTLINE"
8882
msgstr ""
8883
8884
#: git-am.sh:858
8885
#, sh-format
8886
msgid ""
8887
"The copy of the patch that failed is found in:\n"
8888
" $dotest/patch"
8889
msgstr ""
8890
8891
#: git-am.sh:876
3146
8892
msgid "applying to an empty history"
3147
8893
msgstr ""
3148
8894
8895
#: git-bisect.sh:48
8896
msgid "You need to start by \"git bisect start\""
8897
msgstr ""
8898
3149
8899
#. TRANSLATORS: Make sure to include [Y] and [n] in your
3150
8900
#. translation. The program will only accept English input
3151
8901
#. at this point.
3204
8954
msgid "'git bisect bad' can take only one argument."
3205
8955
msgstr ""
3206
8956
8957
#. have bad but not good. we could bisect although
8958
#. this is less optimum.
8959
#: git-bisect.sh:273
8960
msgid "Warning: bisecting only with a bad commit."
8961
msgstr ""
8962
3207
8963
#. TRANSLATORS: Make sure to include [Y] and [n] in your
3208
8964
#. translation. The program will only accept English input
3209
8965
#. at this point.
3211
8967
msgid "Are you sure [Y/n]? "
3212
8968
msgstr ""
3213
8969
3214
#: git-bisect.sh:354
8970
#: git-bisect.sh:289
8971
msgid ""
8972
"You need to give me at least one good and one bad revisions.\n"
8973
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8974
msgstr ""
8975
8976
#: git-bisect.sh:292
8977
msgid ""
8978
"You need to start by \"git bisect start\".\n"
8979
"You then need to give me at least one good and one bad revisions.\n"
8980
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
8981
msgstr ""
8982
8983
#: git-bisect.sh:363 git-bisect.sh:490
8984
msgid "We are not bisecting."
8985
msgstr ""
8986
8987
#: git-bisect.sh:370
3215
8988
#, sh-format
3216
8989
msgid "'$invalid' is not a valid commit"
3217
8990
msgstr ""
3218
8991
3219
#: git-bisect.sh:363
8992
#: git-bisect.sh:379
3220
8993
#, sh-format
3221
8994
msgid ""
3222
8995
"Could not check out original HEAD '$branch'.\n"
3223
8996
"Try 'git bisect reset <commit>'."
3224
8997
msgstr ""
3225
8998
3226
#: git-bisect.sh:390
8999
#: git-bisect.sh:406
3227
9000
msgid "No logfile given"
3228
9001
msgstr ""
3229
9002
3230
#: git-bisect.sh:391
9003
#: git-bisect.sh:407
3231
9004
#, sh-format
3232
9005
msgid "cannot read $file for replaying"
3233
9006
msgstr ""
3234
9007
3235
#: git-bisect.sh:408
9008
#: git-bisect.sh:424
3236
9009
msgid "?? what are you talking about?"
3237
9010
msgstr ""
3238
9011
3239
#: git-bisect.sh:474
3240
msgid "We are not bisecting."
9012
#: git-bisect.sh:436
9013
#, sh-format
9014
msgid "running $command"
9015
msgstr ""
9016
9017
#: git-bisect.sh:443
9018
#, sh-format
9019
msgid ""
9020
"bisect run failed:\n"
9021
"exit code $res from '$command' is < 0 or >= 128"
9022
msgstr ""
9023
9024
#: git-bisect.sh:469
9025
msgid "bisect run cannot continue any more"
9026
msgstr ""
9027
9028
#: git-bisect.sh:475
9029
#, sh-format
9030
msgid ""
9031
"bisect run failed:\n"
9032
"'bisect_state $state' exited with error code $res"
9033
msgstr ""
9034
9035
#: git-bisect.sh:482
9036
msgid "bisect run success"
3241
9037
msgstr ""
3242
9038
3243
9039
#: git-pull.sh:21
3251
9047
msgid "Pull is not possible because you have unmerged files."
3252
9048
msgstr ""
3253
9049
3254
#: git-pull.sh:197
9050
#: git-pull.sh:203
3255
9051
msgid "updating an unborn branch with changes added to the index"
3256
9052
msgstr ""
3257
9053
3258
#: git-pull.sh:253
9054
#. The fetch involved updating the current branch.
9055
#. The working tree and the index file is still based on the
9056
#. $orig_head commit, but we are merging into $curr_head.
9057
#. First update the working tree to match $curr_head.
9058
#: git-pull.sh:235
9059
#, sh-format
9060
msgid ""
9061
"Warning: fetch updated the current branch head.\n"
9062
"Warning: fast-forwarding your working tree from\n"
9063
"Warning: commit $orig_head."
9064
msgstr ""
9065
9066
#: git-pull.sh:260
3259
9067
msgid "Cannot merge multiple branches into empty head"
3260
9068
msgstr ""
3261
9069
3262
#: git-pull.sh:257
9070
#: git-pull.sh:264
3263
9071
msgid "Cannot rebase onto multiple branches"
3264
9072
msgstr ""
3265
9073
9074
#: git-rebase.sh:53
9075
msgid ""
9076
"When you have resolved this problem, run \"git rebase --continue\".\n"
9077
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9078
"To check out the original branch and stop rebasing, run \"git rebase --abort"
9079
"\"."
9080
msgstr ""
9081
9082
#: git-rebase.sh:160
9083
msgid "The pre-rebase hook refused to rebase."
9084
msgstr ""
9085
9086
#: git-rebase.sh:165
9087
msgid "It looks like git-am is in progress. Cannot rebase."
9088
msgstr ""
9089
9090
#: git-rebase.sh:296
9091
msgid "The --exec option must be used with the --interactive option"
9092
msgstr ""
9093
9094
#: git-rebase.sh:301
9095
msgid "No rebase in progress?"
9096
msgstr ""
9097
9098
#: git-rebase.sh:312
9099
msgid "The --edit-todo action can only be used during interactive rebase."
9100
msgstr ""
9101
9102
#: git-rebase.sh:319
9103
msgid "Cannot read HEAD"
9104
msgstr ""
9105
9106
#: git-rebase.sh:322
9107
msgid ""
9108
"You must edit all merge conflicts and then\n"
9109
"mark them as resolved using git add"
9110
msgstr ""
9111
9112
#: git-rebase.sh:340
9113
#, sh-format
9114
msgid "Could not move back to $head_name"
9115
msgstr ""
9116
9117
#: git-rebase.sh:359
9118
#, sh-format
9119
msgid ""
9120
"It seems that there is already a $state_dir_base directory, and\n"
9121
"I wonder if you are in the middle of another rebase. If that is the\n"
9122
"case, please try\n"
9123
"\t$cmd_live_rebase\n"
9124
"If that is not the case, please\n"
9125
"\t$cmd_clear_stale_rebase\n"
9126
"and run me again. I am stopping in case you still have something\n"
9127
"valuable there."
9128
msgstr ""
9129
9130
#: git-rebase.sh:404
9131
#, sh-format
9132
msgid "invalid upstream $upstream_name"
9133
msgstr ""
9134
9135
#: git-rebase.sh:428
9136
#, sh-format
9137
msgid "$onto_name: there are more than one merge bases"
9138
msgstr ""
9139
9140
#: git-rebase.sh:431 git-rebase.sh:435
9141
#, sh-format
9142
msgid "$onto_name: there is no merge base"
9143
msgstr ""
9144
9145
#: git-rebase.sh:440
9146
#, sh-format
9147
msgid "Does not point to a valid commit: $onto_name"
9148
msgstr ""
9149
9150
#: git-rebase.sh:463
9151
#, sh-format
9152
msgid "fatal: no such branch: $branch_name"
9153
msgstr ""
9154
9155
#: git-rebase.sh:483
9156
msgid "Please commit or stash them."
9157
msgstr ""
9158
9159
#: git-rebase.sh:501
9160
#, sh-format
9161
msgid "Current branch $branch_name is up to date."
9162
msgstr ""
9163
9164
#: git-rebase.sh:504
9165
#, sh-format
9166
msgid "Current branch $branch_name is up to date, rebase forced."
9167
msgstr ""
9168
9169
#: git-rebase.sh:515
9170
#, sh-format
9171
msgid "Changes from $mb to $onto:"
9172
msgstr ""
9173
9174
#. Detach HEAD and reset the tree
9175
#: git-rebase.sh:524
9176
msgid "First, rewinding head to replay your work on top of it..."
9177
msgstr ""
9178
9179
#: git-rebase.sh:532
9180
#, sh-format
9181
msgid "Fast-forwarded $branch_name to $onto_name."
9182
msgstr ""
9183
3266
9184
#: git-stash.sh:51
3267
9185
msgid "git stash clear with parameters is unimplemented"
3268
9186
msgstr ""
3291
9209
msgid "Cannot record working tree state"
3292
9210
msgstr ""
3293
9211
9212
#. TRANSLATORS: $option is an invalid option, like
9213
#. `--blah-blah'. The 7 spaces at the beginning of the
9214
#. second line correspond to "error: ". So you should line
9215
#. up the second line with however many characters the
9216
#. translation of "error: " takes in your language. E.g. in
9217
#. English this is:
9218
#.
9219
#. $ git stash save --blah-blah 2>&1 | head -n 2
9220
#. error: unknown option for 'stash save': --blah-blah
9221
#. To provide a message, use git stash save -- '--blah-blah'
9222
#: git-stash.sh:202
9223
#, sh-format
9224
msgid ""
9225
"error: unknown option for 'stash save': $option\n"
9226
" To provide a message, use git stash save -- '$option'"
9227
msgstr ""
9228
3294
9229
#: git-stash.sh:223
3295
9230
msgid "No local changes to save"
3296
9231
msgstr ""
3351
9286
msgid "Cannot unstage modified files"
3352
9287
msgstr ""
3353
9288
3354
#: git-stash.sh:491
9289
#: git-stash.sh:475
9290
msgid "Index was not unstashed."
9291
msgstr ""
9292
9293
#: git-stash.sh:492
3355
9294
#, sh-format
3356
9295
msgid "Dropped ${REV} ($s)"
3357
9296
msgstr ""
3358
9297
3359
#: git-stash.sh:492
9298
#: git-stash.sh:493
3360
9299
#, sh-format
3361
9300
msgid "${REV}: Could not drop stash entry"
3362
9301
msgstr ""
3363
9302
3364
#: git-stash.sh:499
9303
#: git-stash.sh:500
3365
9304
msgid "No branch name specified"
3366
9305
msgstr ""
3367
9306
3368
#: git-stash.sh:570
9307
#: git-stash.sh:571
3369
9308
msgid "(To restore them type \"git stash apply\")"
3370
9309
msgstr ""
3371
9310
3372
#: git-submodule.sh:56
9311
#: git-submodule.sh:91
3373
9312
#, sh-format
3374
9313
msgid "cannot strip one component off url '$remoteurl'"
3375
9314
msgstr ""
3376
9315
3377
#: git-submodule.sh:108
3378
#, sh-format
3379
msgid "No submodule mapping found in .gitmodules for path '$path'"
3380
msgstr ""
3381
3382
#: git-submodule.sh:149
3383
#, sh-format
3384
msgid "Clone of '$url' into submodule path '$path' failed"
3385
msgstr ""
3386
3387
#: git-submodule.sh:159
9316
#: git-submodule.sh:196
9317
#, sh-format
9318
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
9319
msgstr ""
9320
9321
#: git-submodule.sh:239
9322
#, sh-format
9323
msgid "Clone of '$url' into submodule path '$sm_path' failed"
9324
msgstr ""
9325
9326
#: git-submodule.sh:251
3388
9327
#, sh-format
3389
9328
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
3390
9329
msgstr ""
3391
9330
3392
#: git-submodule.sh:248
9331
#: git-submodule.sh:349
3393
9332
#, sh-format
3394
9333
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
3395
9334
msgstr ""
3396
9335
3397
#: git-submodule.sh:265
3398
#, sh-format
3399
msgid "'$path' already exists in the index"
3400
msgstr ""
3401
3402
#: git-submodule.sh:282
3403
#, sh-format
3404
msgid "'$path' already exists and is not a valid git repo"
3405
msgstr ""
3406
3407
#: git-submodule.sh:296
3408
#, sh-format
3409
msgid "Unable to checkout submodule '$path'"
3410
msgstr ""
3411
3412
#: git-submodule.sh:301
3413
#, sh-format
3414
msgid "Failed to add submodule '$path'"
3415
msgstr ""
3416
3417
#: git-submodule.sh:306
3418
#, sh-format
3419
msgid "Failed to register submodule '$path'"
3420
msgstr ""
3421
3422
#: git-submodule.sh:348
3423
#, sh-format
3424
msgid "Entering '$prefix$path'"
3425
msgstr ""
3426
3427
#: git-submodule.sh:360
3428
#, sh-format
3429
msgid "Stopping at '$path'; script returned non-zero status."
9336
#: git-submodule.sh:366
9337
#, sh-format
9338
msgid "'$sm_path' already exists in the index"
9339
msgstr ""
9340
9341
#: git-submodule.sh:370
9342
#, sh-format
9343
msgid ""
9344
"The following path is ignored by one of your .gitignore files:\n"
9345
"$sm_path\n"
9346
"Use -f if you really want to add it."
9347
msgstr ""
9348
9349
#: git-submodule.sh:388
9350
#, sh-format
9351
msgid "Adding existing repo at '$sm_path' to the index"
9352
msgstr ""
9353
9354
#: git-submodule.sh:390
9355
#, sh-format
9356
msgid "'$sm_path' already exists and is not a valid git repo"
9357
msgstr ""
9358
9359
#: git-submodule.sh:398
9360
#, sh-format
9361
msgid "A git directory for '$sm_name' is found locally with remote(s):"
9362
msgstr ""
9363
9364
#: git-submodule.sh:400
9365
#, sh-format
9366
msgid ""
9367
"If you want to reuse this local git directory instead of cloning again from"
3430
9368
msgstr ""
3431
9369
3432
9370
#: git-submodule.sh:402
3433
9371
#, sh-format
3434
msgid "No url found for submodule path '$path' in .gitmodules"
3435
msgstr ""
3436
3437
#: git-submodule.sh:411
3438
#, sh-format
3439
msgid "Failed to register url for submodule path '$path'"
3440
msgstr ""
3441
3442
#: git-submodule.sh:419
3443
#, sh-format
3444
msgid "Failed to register update mode for submodule path '$path'"
3445
msgstr ""
3446
3447
#: git-submodule.sh:421
3448
#, sh-format
3449
msgid "Submodule '$name' ($url) registered for path '$path'"
3450
msgstr ""
3451
3452
#: git-submodule.sh:520
3453
#, sh-format
3454
msgid ""
3455
"Submodule path '$path' not initialized\n"
9372
msgid ""
9373
"use the '--force' option. If the local git directory is not the correct repo"
9374
msgstr ""
9375
9376
#: git-submodule.sh:403
9377
#, sh-format
9378
msgid ""
9379
"or you are unsure what this means choose another name with the '--name' "
9380
"option."
9381
msgstr ""
9382
9383
#: git-submodule.sh:405
9384
#, sh-format
9385
msgid "Reactivating local git directory for submodule '$sm_name'."
9386
msgstr ""
9387
9388
#: git-submodule.sh:417
9389
#, sh-format
9390
msgid "Unable to checkout submodule '$sm_path'"
9391
msgstr ""
9392
9393
#: git-submodule.sh:422
9394
#, sh-format
9395
msgid "Failed to add submodule '$sm_path'"
9396
msgstr ""
9397
9398
#: git-submodule.sh:431
9399
#, sh-format
9400
msgid "Failed to register submodule '$sm_path'"
9401
msgstr ""
9402
9403
#: git-submodule.sh:474
9404
#, sh-format
9405
msgid "Entering '$prefix$sm_path'"
9406
msgstr ""
9407
9408
#: git-submodule.sh:488
9409
#, sh-format
9410
msgid "Stopping at '$sm_path'; script returned non-zero status."
9411
msgstr ""
9412
9413
#: git-submodule.sh:532
9414
#, sh-format
9415
msgid "No url found for submodule path '$sm_path' in .gitmodules"
9416
msgstr ""
9417
9418
#: git-submodule.sh:541
9419
#, sh-format
9420
msgid "Failed to register url for submodule path '$sm_path'"
9421
msgstr ""
9422
9423
#: git-submodule.sh:543
9424
#, sh-format
9425
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
9426
msgstr ""
9427
9428
#: git-submodule.sh:551
9429
#, sh-format
9430
msgid "Failed to register update mode for submodule path '$sm_path'"
9431
msgstr ""
9432
9433
#: git-submodule.sh:588
9434
#, sh-format
9435
msgid "Use '.' if you really want to deinitialize all submodules"
9436
msgstr ""
9437
9438
#: git-submodule.sh:603
9439
#, sh-format
9440
msgid "Submodule work tree '$sm_path' contains a .git directory"
9441
msgstr ""
9442
9443
#: git-submodule.sh:604
9444
#, sh-format
9445
msgid ""
9446
"(use 'rm -rf' if you really want to remove it including all of its history)"
9447
msgstr ""
9448
9449
#: git-submodule.sh:610
9450
#, sh-format
9451
msgid ""
9452
"Submodule work tree '$sm_path' contains local modifications; use '-f' to "
9453
"discard them"
9454
msgstr ""
9455
9456
#: git-submodule.sh:613
9457
#, sh-format
9458
msgid "Cleared directory '$sm_path'"
9459
msgstr ""
9460
9461
#: git-submodule.sh:614
9462
#, sh-format
9463
msgid "Could not remove submodule work tree '$sm_path'"
9464
msgstr ""
9465
9466
#: git-submodule.sh:617
9467
#, sh-format
9468
msgid "Could not create empty submodule directory '$sm_path'"
9469
msgstr ""
9470
9471
#: git-submodule.sh:626
9472
#, sh-format
9473
msgid "Submodule '$name' ($url) unregistered for path '$sm_path'"
9474
msgstr ""
9475
9476
#: git-submodule.sh:731
9477
#, sh-format
9478
msgid ""
9479
"Submodule path '$prefix$sm_path' not initialized\n"
3456
9480
"Maybe you want to use 'update --init'?"
3457
9481
msgstr ""
3458
9482
3459
#: git-submodule.sh:533
3460
#, sh-format
3461
msgid "Unable to find current revision in submodule path '$path'"
3462
msgstr ""
3463
3464
#: git-submodule.sh:552
3465
#, sh-format
3466
msgid "Unable to fetch in submodule path '$path'"
3467
msgstr ""
3468
3469
#: git-submodule.sh:566
3470
#, sh-format
3471
msgid "Unable to rebase '$sha1' in submodule path '$path'"
3472
msgstr ""
3473
3474
#: git-submodule.sh:567
3475
#, sh-format
3476
msgid "Submodule path '$path': rebased into '$sha1'"
3477
msgstr ""
3478
3479
#: git-submodule.sh:572
3480
#, sh-format
3481
msgid "Unable to merge '$sha1' in submodule path '$path'"
3482
msgstr ""
3483
3484
#: git-submodule.sh:573
3485
#, sh-format
3486
msgid "Submodule path '$path': merged in '$sha1'"
3487
msgstr ""
3488
3489
#: git-submodule.sh:578
3490
#, sh-format
3491
msgid "Unable to checkout '$sha1' in submodule path '$path'"
3492
msgstr ""
3493
3494
#: git-submodule.sh:579
3495
#, sh-format
3496
msgid "Submodule path '$path': checked out '$sha1'"
3497
msgstr ""
3498
3499
#: git-submodule.sh:601 git-submodule.sh:924
3500
#, sh-format
3501
msgid "Failed to recurse into submodule path '$path'"
3502
msgstr ""
3503
3504
#: git-submodule.sh:709
3505
msgid "--"
3506
msgstr ""
3507
3508
#: git-submodule.sh:767
9483
#: git-submodule.sh:744
9484
#, sh-format
9485
msgid "Unable to find current revision in submodule path '$prefix$sm_path'"
9486
msgstr ""
9487
9488
#: git-submodule.sh:753
9489
#, sh-format
9490
msgid "Unable to fetch in submodule path '$sm_path'"
9491
msgstr ""
9492
9493
#: git-submodule.sh:777
9494
#, sh-format
9495
msgid "Unable to fetch in submodule path '$prefix$sm_path'"
9496
msgstr ""
9497
9498
#: git-submodule.sh:791
9499
#, sh-format
9500
msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'"
9501
msgstr ""
9502
9503
#: git-submodule.sh:792
9504
#, sh-format
9505
msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'"
9506
msgstr ""
9507
9508
#: git-submodule.sh:797
9509
#, sh-format
9510
msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'"
9511
msgstr ""
9512
9513
#: git-submodule.sh:798
9514
#, sh-format
9515
msgid "Submodule path '$prefix$sm_path': merged in '$sha1'"
9516
msgstr ""
9517
9518
#: git-submodule.sh:803
9519
#, sh-format
9520
msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'"
9521
msgstr ""
9522
9523
#: git-submodule.sh:804
9524
#, sh-format
9525
msgid "Submodule path '$prefix$sm_path': checked out '$sha1'"
9526
msgstr ""
9527
9528
#: git-submodule.sh:831
9529
#, sh-format
9530
msgid "Failed to recurse into submodule path '$prefix$sm_path'"
9531
msgstr ""
9532
9533
#: git-submodule.sh:939
9534
msgid "The --cached option cannot be used with the --files option"
9535
msgstr ""
9536
9537
#. unexpected type
9538
#: git-submodule.sh:979
9539
#, sh-format
9540
msgid "unexpected mode $mod_dst"
9541
msgstr ""
9542
9543
#: git-submodule.sh:997
3509
9544
#, sh-format
3510
9545
msgid " Warn: $name doesn't contain commit $sha1_src"
3511
9546
msgstr ""
3512
9547
3513
#: git-submodule.sh:770
9548
#: git-submodule.sh:1000
3514
9549
#, sh-format
3515
9550
msgid " Warn: $name doesn't contain commit $sha1_dst"
3516
9551
msgstr ""
3517
9552
3518
#: git-submodule.sh:773
9553
#: git-submodule.sh:1003
3519
9554
#, sh-format
3520
9555
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
3521
9556
msgstr ""
3522
9557
3523
#: git-submodule.sh:798
9558
#: git-submodule.sh:1028
3524
9559
msgid "blob"
3525
9560
msgstr ""
3526
9561
3527
#: git-submodule.sh:799
3528
msgid "submodule"
3529
msgstr ""
3530
3531
#: git-submodule.sh:970
3532
#, sh-format
3533
msgid "Synchronizing submodule url for '$name'"
9562
#: git-submodule.sh:1066
9563
msgid "Submodules changed but not updated:"
9564
msgstr ""
9565
9566
#: git-submodule.sh:1068
9567
msgid "Submodule changes to be committed:"
9568
msgstr ""
9569
9570
#: git-submodule.sh:1153
9571
#, sh-format
9572
msgid "Failed to recurse into submodule path '$sm_path'"
9573
msgstr ""
9574
9575
#: git-submodule.sh:1216
9576
#, sh-format
9577
msgid "Synchronizing submodule url for '$prefix$sm_path'"
3534
9578
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1