« back to all changes in this revision
Viewing changes to data/ja/LC_MESSAGES/git.po
- browse files at revision 250
- compare with another revision
- download diff
- download tarball
- view history from revision 250
- Committer: Package Import Robot
- Author(s): Ubuntu automatic language-pack builder
- Date: 2015-02-19 14:08:48 UTC
- Revision ID: package-import@ubuntu.com-20150219140848-rn4rdzbg8obehns3
Tags: 1:15.04+20150216
Automatic update to latest translation data.
- files added:
- data/ja/LC_MESSAGES/alsa-utils.po
- files modified:
- data/ja/LC_MESSAGES/FontForge.po
added
removed
data/ja/LC_MESSAGES/git.po
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=1; plural=0;\n"
18
"X-Launchpad-Export-Date: 2015-02-02 11:38+0000\n"
19
"X-Generator: Launchpad (build 17306)\n"
18
"X-Launchpad-Export-Date: 2015-02-16 11:27+0000\n"
19
"X-Generator: Launchpad (build 17341)\n"
20
20
21
#: advice.c:57
21
#: advice.c:55
22
22
#, c-format
23
23
msgid "hint: %.*s\n"
24
24
msgstr "ヒント: %.*s\n"
47
47
msgid "git archive --remote <repo> [--exec <cmd>] --list"
48
48
msgstr "git archive --remote <リポジトリ> [--exec <コマンド>] --list"
49
49
50
#: archive.c:242 builtin/add.c:240 builtin/add.c:559 builtin/rm.c:328
50
#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328
51
51
#, c-format
52
52
msgid "pathspec '%s' did not match any files"
53
53
msgstr ""
54
54
55
#: archive.c:327
55
#: archive.c:328
56
56
msgid "fmt"
57
57
msgstr "fmt"
58
58
59
#: archive.c:327
59
#: archive.c:328
60
60
msgid "archive format"
61
61
msgstr "アーカイブフォーマット"
62
62
63
#: archive.c:328 builtin/log.c:1193
63
#: archive.c:329 builtin/log.c:1201
64
64
msgid "prefix"
65
65
msgstr ""
66
66
67
#: archive.c:329
67
#: archive.c:330
68
68
msgid "prepend prefix to each pathname in the archive"
69
69
msgstr ""
70
70
71
#: archive.c:330 builtin/archive.c:88 builtin/blame.c:2265
72
#: builtin/blame.c:2266 builtin/config.c:58 builtin/fast-export.c:680
73
#: builtin/fast-export.c:682 builtin/grep.c:716 builtin/hash-object.c:77
74
#: builtin/ls-files.c:486 builtin/ls-files.c:489 builtin/notes.c:408
75
#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:154
71
#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517
72
#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709
73
#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77
74
#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412
75
#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151
76
76
msgid "file"
77
77
msgstr ""
78
78
79
#: archive.c:331 builtin/archive.c:89
79
#: archive.c:332 builtin/archive.c:89
80
80
msgid "write the archive to this file"
81
81
msgstr "このファイルにアーカイブを書き込む"
82
82
83
#: archive.c:333
83
#: archive.c:334
84
84
msgid "read .gitattributes in working directory"
85
85
msgstr "ワーキングディレクトリの.gitattributesを読み込む"
86
86
87
#: archive.c:334
87
#: archive.c:335
88
88
msgid "report archived files on stderr"
89
89
msgstr "stderrに圧縮ファイルを報告"
90
90
91
#: archive.c:335
91
#: archive.c:336
92
92
msgid "store only"
93
93
msgstr "保存のみ"
94
94
95
#: archive.c:336
95
#: archive.c:337
96
96
msgid "compress faster"
97
97
msgstr "高速で圧縮"
98
98
99
#: archive.c:344
99
#: archive.c:345
100
100
msgid "compress better"
101
101
msgstr ""
102
102
103
#: archive.c:347
103
#: archive.c:348
104
104
msgid "list supported archive formats"
105
105
msgstr ""
106
106
107
#: archive.c:349 builtin/archive.c:90 builtin/clone.c:84
107
#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84
108
108
msgid "repo"
109
109
msgstr "リポジトリ"
110
110
111
#: archive.c:350 builtin/archive.c:91
111
#: archive.c:351 builtin/archive.c:91
112
112
msgid "retrieve the archive from remote repository <repo>"
113
113
msgstr ""
114
114
115
#: archive.c:351 builtin/archive.c:92 builtin/notes.c:487
115
#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491
116
116
msgid "command"
117
117
msgstr ""
118
118
119
#: archive.c:352 builtin/archive.c:93
119
#: archive.c:353 builtin/archive.c:93
120
120
msgid "path to the remote git-upload-archive command"
121
121
msgstr ""
122
122
131
131
msgid "Not setting branch %s as its own upstream."
132
132
msgstr ""
133
133
134
#: branch.c:82
134
#: branch.c:83
135
135
#, c-format
136
136
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
137
137
msgstr ""
138
138
139
#: branch.c:83
139
#: branch.c:84
140
140
#, c-format
141
141
msgid "Branch %s set up to track remote branch %s from %s."
142
142
msgstr ""
143
143
144
#: branch.c:87
144
#: branch.c:88
145
145
#, c-format
146
146
msgid "Branch %s set up to track local branch %s by rebasing."
147
147
msgstr ""
148
148
149
#: branch.c:88
149
#: branch.c:89
150
150
#, c-format
151
151
msgid "Branch %s set up to track local branch %s."
152
152
msgstr ""
153
153
154
#: branch.c:92
154
#: branch.c:94
155
155
#, c-format
156
156
msgid "Branch %s set up to track remote ref %s by rebasing."
157
157
msgstr ""
158
158
159
#: branch.c:93
159
#: branch.c:95
160
160
#, c-format
161
161
msgid "Branch %s set up to track remote ref %s."
162
162
msgstr ""
163
163
164
#: branch.c:97
164
#: branch.c:99
165
165
#, c-format
166
166
msgid "Branch %s set up to track local ref %s by rebasing."
167
167
msgstr ""
168
168
169
#: branch.c:98
169
#: branch.c:100
170
170
#, c-format
171
171
msgid "Branch %s set up to track local ref %s."
172
172
msgstr ""
173
173
174
#: branch.c:137
174
#: branch.c:133
175
175
#, c-format
176
176
msgid "Not tracking: ambiguous information for ref %s"
177
177
msgstr ""
178
178
179
#: branch.c:182
179
#: branch.c:178
180
180
#, c-format
181
181
msgid "'%s' is not a valid branch name."
182
182
msgstr ""
183
183
184
#: branch.c:187
184
#: branch.c:183
185
185
#, c-format
186
186
msgid "A branch named '%s' already exists."
187
187
msgstr ""
188
188
189
#: branch.c:195
189
#: branch.c:191
190
190
msgid "Cannot force update the current branch."
191
191
msgstr ""
192
192
193
#: branch.c:215
193
#: branch.c:211
194
194
#, c-format
195
195
msgid ""
196
196
"Cannot setup tracking information; starting point '%s' is not a branch."
197
197
msgstr ""
198
198
199
#: branch.c:217
199
#: branch.c:213
200
200
#, c-format
201
201
msgid "the requested upstream branch '%s' does not exist"
202
202
msgstr ""
203
203
204
#: branch.c:219
204
#: branch.c:215
205
205
msgid ""
206
206
"\n"
207
207
"If you are planning on basing your work on an upstream\n"
213
213
"\"git push -u\" to set the upstream config as you push."
214
214
msgstr ""
215
215
216
#: branch.c:264
216
#: branch.c:260
217
217
#, c-format
218
218
msgid "Not a valid object name: '%s'."
219
219
msgstr ""
220
220
221
#: branch.c:284
221
#: branch.c:280
222
222
#, c-format
223
223
msgid "Ambiguous object name: '%s'."
224
224
msgstr ""
225
225
226
#: branch.c:289
226
#: branch.c:285
227
227
#, c-format
228
228
msgid "Not a valid branch point: '%s'."
229
229
msgstr ""
230
230
231
#: branch.c:295
231
#: branch.c:291
232
232
msgid "Failed to lock ref for update"
233
233
msgstr ""
234
234
235
#: branch.c:313
235
#: branch.c:309
236
236
msgid "Failed to write ref"
237
237
msgstr ""
238
238
239
#: bundle.c:37
239
#: bundle.c:33
240
240
#, c-format
241
241
msgid "'%s' does not look like a v2 bundle file"
242
242
msgstr ""
243
243
244
#: bundle.c:64
244
#: bundle.c:60
245
245
#, c-format
246
246
msgid "unrecognized header: %s%s (%d)"
247
247
msgstr ""
248
248
249
#: bundle.c:90 builtin/commit.c:706
249
#: bundle.c:86 builtin/commit.c:755
250
250
#, c-format
251
251
msgid "could not open '%s'"
252
252
msgstr "'%s'を開けません"
253
253
254
#: bundle.c:141
254
#: bundle.c:138
255
255
msgid "Repository lacks these prerequisite commits:"
256
256
msgstr ""
257
257
258
#: bundle.c:165 sequencer.c:662 sequencer.c:1112 builtin/log.c:332
259
#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357
258
#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330
259
#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357
260
260
#: builtin/shortlog.c:158
261
261
msgid "revision walk setup failed"
262
262
msgstr ""
263
263
264
#: bundle.c:187
264
#: bundle.c:184
265
265
#, c-format
266
266
msgid "The bundle contains this ref:"
267
267
msgid_plural "The bundle contains these %d refs:"
268
268
msgstr[0] ""
269
269
msgstr[1] ""
270
270
271
#: bundle.c:194
271
#: bundle.c:191
272
272
msgid "The bundle records a complete history."
273
273
msgstr ""
274
274
275
#: bundle.c:196
275
#: bundle.c:193
276
276
#, c-format
277
277
msgid "The bundle requires this ref:"
278
278
msgid_plural "The bundle requires these %d refs:"
279
279
msgstr[0] ""
280
280
msgstr[1] ""
281
281
282
#: bundle.c:296
282
#: bundle.c:289
283
283
msgid "rev-list died"
284
284
msgstr ""
285
285
286
#: bundle.c:302 builtin/log.c:1329 builtin/shortlog.c:261
286
#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261
287
287
#, c-format
288
288
msgid "unrecognized argument: %s"
289
289
msgstr ""
290
290
291
#: bundle.c:337
291
#: bundle.c:330
292
292
#, c-format
293
293
msgid "ref '%s' is excluded by the rev-list options"
294
294
msgstr "参照 '%s'はrev-listのオプションから除外されています。"
295
295
296
#: bundle.c:382
296
#: bundle.c:375
297
297
msgid "Refusing to create empty bundle."
298
298
msgstr ""
299
299
300
#: bundle.c:398
300
#: bundle.c:390
301
301
msgid "Could not spawn pack-objects"
302
302
msgstr ""
303
303
304
#: bundle.c:416
304
#: bundle.c:408
305
305
msgid "pack-objects died"
306
306
msgstr ""
307
307
308
#: bundle.c:419
308
#: bundle.c:411
309
309
#, c-format
310
310
msgid "cannot create '%s'"
311
311
msgstr ""
312
312
313
#: bundle.c:441
313
#: bundle.c:433
314
314
msgid "index-pack died"
315
315
msgstr ""
316
316
317
#: commit.c:53
317
#: commit.c:40
318
318
#, c-format
319
319
msgid "could not parse %s"
320
320
msgstr "%s をパースできませんでした"
321
321
322
#: commit.c:55
322
#: commit.c:42
323
323
#, c-format
324
324
msgid "%s %s is not a commit!"
325
325
msgstr "%s %s はコミットではありません!"
388
388
msgid_plural "%lu years"
389
389
msgstr[0] "%lu年前"
390
390
391
#. TRANSLATORS: "%s" is "<n> years"
391
392
#: date.c:149
392
393
#, c-format
393
394
msgid "%s, %lu month ago"
405
406
msgid "failed to read orderfile '%s'"
406
407
msgstr ""
407
408
408
#: diffcore-rename.c:517
409
#: diffcore-rename.c:514
409
410
msgid "Performing inexact rename detection"
410
411
msgstr ""
411
412
412
#: diff.c:113
413
#: diff.c:114
413
414
#, c-format
414
415
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
415
416
msgstr ""
416
417
417
#: diff.c:118
418
#: diff.c:119
418
419
#, c-format
419
420
msgid " Unknown dirstat parameter '%s'\n"
420
421
msgstr ""
421
422
422
#: diff.c:213
423
#: diff.c:214
423
424
#, c-format
424
425
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
425
426
msgstr ""
426
427
427
#: diff.c:263
428
#: diff.c:267
428
429
#, c-format
429
430
msgid ""
430
431
"Found errors in 'diff.dirstat' config variable:\n"
442
443
msgid "--follow requires exactly one pathspec"
443
444
msgstr ""
444
445
445
#: diff.c:3509
446
#: diff.c:3492
446
447
#, c-format
447
448
msgid ""
448
449
"Failed to parse --dirstat/-X option parameter:\n"
451
452
"--dirstat/-X オプションパラメーターのパースに失敗しました:\n"
452
453
"%s"
453
454
454
#: diff.c:3523
455
#: diff.c:3506
455
456
#, c-format
456
457
msgid "Failed to parse --submodule option parameter: '%s'"
457
458
msgstr ""
458
459
459
#: gpg-interface.c:59 gpg-interface.c:131
460
#: gpg-interface.c:73 gpg-interface.c:145
460
461
msgid "could not run gpg."
461
462
msgstr "gpgを実行できませんでした。"
462
463
463
#: gpg-interface.c:71
464
#: gpg-interface.c:85
464
465
msgid "gpg did not accept the data"
465
466
msgstr "gpg はデータを受け入れませんでした"
466
467
467
#: gpg-interface.c:82
468
#: gpg-interface.c:96
468
469
msgid "gpg failed to sign the data"
469
470
msgstr ""
470
471
471
#: gpg-interface.c:115
472
#: gpg-interface.c:129
472
473
#, c-format
473
474
msgid "could not create temporary file '%s': %s"
474
475
msgstr ""
475
476
476
#: gpg-interface.c:118
477
#: gpg-interface.c:132
477
478
#, c-format
478
479
msgid "failed writing detached signature to '%s': %s"
479
480
msgstr ""
480
481
481
#: grep.c:1695
482
#: grep.c:1703
482
483
#, c-format
483
484
msgid "'%s': unable to read %s"
484
485
msgstr "'%s': %s を読み取れません"
485
486
486
#: grep.c:1712
487
#: grep.c:1720
487
488
#, c-format
488
489
msgid "'%s': %s"
489
490
msgstr "'%s': %s"
490
491
491
#: grep.c:1723
492
#: grep.c:1731
492
493
#, c-format
493
494
msgid "'%s': short read %s"
494
495
msgstr ""
495
496
496
#: help.c:210
497
#: help.c:207
497
498
#, c-format
498
499
msgid "available git commands in '%s'"
499
500
msgstr ""
500
501
501
#: help.c:217
502
#: help.c:214
502
503
msgid "git commands available from elsewhere on your $PATH"
503
504
msgstr ""
504
505
505
#: help.c:233
506
#: help.c:230
506
507
msgid "The most commonly used git commands are:"
507
508
msgstr ""
508
509
509
#: help.c:290
510
#: help.c:289
510
511
#, c-format
511
512
msgid ""
512
513
"'%s' appears to be a git command, but we were not\n"
513
514
"able to execute it. Maybe git-%s is broken?"
514
515
msgstr ""
515
516
516
#: help.c:347
517
#: help.c:346
517
518
msgid "Uh oh. Your system reports no Git commands at all."
518
519
msgstr ""
519
520
520
#: help.c:369
521
#: help.c:368
521
522
#, c-format
522
523
msgid ""
523
524
"WARNING: You called a Git command named '%s', which does not exist.\n"
524
525
"Continuing under the assumption that you meant '%s'"
525
526
msgstr ""
526
527
527
#: help.c:374
528
#: help.c:373
528
529
#, c-format
529
530
msgid "in %0.1f seconds automatically..."
530
531
msgstr ""
531
532
532
#: help.c:381
533
#: help.c:380
533
534
#, c-format
534
535
msgid "git: '%s' is not a git command. See 'git --help'."
535
536
msgstr "git: '%s' はgitコマンドではありません。 'git --help'を参照してください。"
536
537
537
#: help.c:385 help.c:444
538
#: help.c:384 help.c:444
538
539
msgid ""
539
540
"\n"
540
541
"Did you mean this?"
549
550
msgid "%s: %s - %s"
550
551
msgstr ""
551
552
552
#: merge.c:56
553
#: merge.c:40
553
554
msgid "failed to read the cache"
554
555
msgstr ""
555
556
556
#: merge.c:110 builtin/checkout.c:358 builtin/checkout.c:559
557
#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556
557
558
#: builtin/clone.c:661
558
559
msgid "unable to write new index file"
559
560
msgstr ""
563
564
msgid "(bad commit)\n"
564
565
msgstr ""
565
566
566
#: merge-recursive.c:206
567
#: merge-recursive.c:210
567
568
#, c-format
568
569
msgid "addinfo_cache failed for path '%s'"
569
570
msgstr ""
570
571
571
#: merge-recursive.c:269
572
#: merge-recursive.c:271
572
573
msgid "error building trees"
573
574
msgstr ""
574
575
575
#: merge-recursive.c:673
576
#: merge-recursive.c:692
576
577
#, c-format
577
578
msgid "failed to create path '%s'%s"
578
579
msgstr ""
579
580
580
#: merge-recursive.c:684
581
#: merge-recursive.c:703
581
582
#, c-format
582
583
msgid "Removing %s to make room for subdirectory\n"
583
584
msgstr ""
584
585
585
#. something else exists
586
#. .. but not some other error (who really cares what?)
587
#: merge-recursive.c:698 merge-recursive.c:719
586
#: merge-recursive.c:717 merge-recursive.c:738
588
587
msgid ": perhaps a D/F conflict?"
589
588
msgstr ""
590
589
591
#: merge-recursive.c:709
590
#: merge-recursive.c:728
592
591
#, c-format
593
592
msgid "refusing to lose untracked file at '%s'"
594
593
msgstr ""
595
594
596
#: merge-recursive.c:749
595
#: merge-recursive.c:768
597
596
#, c-format
598
597
msgid "cannot read object %s '%s'"
599
598
msgstr ""
600
599
601
#: merge-recursive.c:751
600
#: merge-recursive.c:770
602
601
#, c-format
603
602
msgid "blob expected for %s '%s'"
604
603
msgstr ""
605
604
606
#: merge-recursive.c:774 builtin/clone.c:317
605
#: merge-recursive.c:793 builtin/clone.c:317
607
606
#, c-format
608
607
msgid "failed to open '%s'"
609
608
msgstr ""
610
609
611
#: merge-recursive.c:782
610
#: merge-recursive.c:801
612
611
#, c-format
613
612
msgid "failed to symlink '%s'"
614
613
msgstr ""
615
614
616
#: merge-recursive.c:785
615
#: merge-recursive.c:804
617
616
#, c-format
618
617
msgid "do not know what to do with %06o %s '%s'"
619
618
msgstr ""
620
619
621
#: merge-recursive.c:923
620
#: merge-recursive.c:942
622
621
msgid "Failed to execute internal merge"
623
622
msgstr ""
624
623
625
#: merge-recursive.c:927
624
#: merge-recursive.c:946
626
625
#, c-format
627
626
msgid "Unable to add %s to database"
628
627
msgstr "データベースに%sを追加できません"
629
628
630
#: merge-recursive.c:943
629
#: merge-recursive.c:962
631
630
msgid "unsupported object type in the tree"
632
631
msgstr ""
633
632
634
#: merge-recursive.c:1022 merge-recursive.c:1036
633
#: merge-recursive.c:1037 merge-recursive.c:1051
635
634
#, c-format
636
635
msgid ""
637
636
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
638
637
"in tree."
639
638
msgstr ""
640
639
641
#: merge-recursive.c:1028 merge-recursive.c:1041
640
#: merge-recursive.c:1043 merge-recursive.c:1056
642
641
#, c-format
643
642
msgid ""
644
643
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
645
644
"in tree at %s."
646
645
msgstr ""
647
646
648
#: merge-recursive.c:1082
647
#: merge-recursive.c:1097
649
648
msgid "rename"
650
649
msgstr ""
651
650
652
#: merge-recursive.c:1082 wt-status.c:283
651
#: merge-recursive.c:1097
653
652
msgid "renamed"
654
653
msgstr ""
655
654
656
#: merge-recursive.c:1138
655
#: merge-recursive.c:1153
657
656
#, c-format
658
657
msgid "%s is a directory in %s adding as %s instead"
659
658
msgstr ""
660
659
661
#: merge-recursive.c:1160
660
#: merge-recursive.c:1175
662
661
#, c-format
663
662
msgid ""
664
663
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
665
664
"\"%s\"->\"%s\" in \"%s\"%s"
666
665
msgstr ""
667
666
668
#: merge-recursive.c:1165
667
#: merge-recursive.c:1180
669
668
msgid " (left unresolved)"
670
669
msgstr ""
671
670
672
#: merge-recursive.c:1219
671
#: merge-recursive.c:1234
673
672
#, c-format
674
673
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
675
674
msgstr ""
676
675
677
#: merge-recursive.c:1249
676
#: merge-recursive.c:1264
678
677
#, c-format
679
678
msgid "Renaming %s to %s and %s to %s instead"
680
679
msgstr ""
681
680
682
#: merge-recursive.c:1448
681
#: merge-recursive.c:1463
683
682
#, c-format
684
683
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
685
684
msgstr ""
686
685
687
#: merge-recursive.c:1458
686
#: merge-recursive.c:1473
688
687
#, c-format
689
688
msgid "Adding merged %s"
690
689
msgstr ""
691
690
692
#: merge-recursive.c:1463 merge-recursive.c:1661
691
#: merge-recursive.c:1478 merge-recursive.c:1676
693
692
#, c-format
694
693
msgid "Adding as %s instead"
695
694
msgstr ""
696
695
697
#: merge-recursive.c:1514
696
#: merge-recursive.c:1529
698
697
#, c-format
699
698
msgid "cannot read object %s"
700
699
msgstr ""
701
700
702
#: merge-recursive.c:1517
701
#: merge-recursive.c:1532
703
702
#, c-format
704
703
msgid "object %s is not a blob"
705
704
msgstr ""
706
705
707
#: merge-recursive.c:1565
706
#: merge-recursive.c:1580
708
707
msgid "modify"
709
708
msgstr ""
710
709
711
#: merge-recursive.c:1565 wt-status.c:281
710
#: merge-recursive.c:1580
712
711
msgid "modified"
713
712
msgstr ""
714
713
715
#: merge-recursive.c:1575
714
#: merge-recursive.c:1590
716
715
msgid "content"
717
716
msgstr ""
718
717
719
#: merge-recursive.c:1582
718
#: merge-recursive.c:1597
720
719
msgid "add/add"
721
720
msgstr ""
722
721
723
#: merge-recursive.c:1616
722
#: merge-recursive.c:1631
724
723
#, c-format
725
724
msgid "Skipped %s (merged same as existing)"
726
725
msgstr ""
727
726
728
#: merge-recursive.c:1630
727
#: merge-recursive.c:1645
729
728
#, c-format
730
729
msgid "Auto-merging %s"
731
730
msgstr ""
732
731
733
#: merge-recursive.c:1634 git-submodule.sh:1148
732
#: merge-recursive.c:1649 git-submodule.sh:1150
734
733
msgid "submodule"
735
734
msgstr ""
736
735
737
#: merge-recursive.c:1635
736
#: merge-recursive.c:1650
738
737
#, c-format
739
738
msgid "CONFLICT (%s): Merge conflict in %s"
740
739
msgstr ""
741
740
742
#: merge-recursive.c:1725
741
#: merge-recursive.c:1740
743
742
#, c-format
744
743
msgid "Removing %s"
745
744
msgstr ""
746
745
747
#: merge-recursive.c:1750
746
#: merge-recursive.c:1765
748
747
msgid "file/directory"
749
748
msgstr ""
750
749
751
#: merge-recursive.c:1756
750
#: merge-recursive.c:1771
752
751
msgid "directory/file"
753
752
msgstr ""
754
753
755
#: merge-recursive.c:1761
754
#: merge-recursive.c:1776
756
755
#, c-format
757
756
msgid ""
758
757
"CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
759
758
msgstr ""
760
759
761
#: merge-recursive.c:1771
760
#: merge-recursive.c:1786
762
761
#, c-format
763
762
msgid "Adding %s"
764
763
msgstr ""
765
764
766
#: merge-recursive.c:1788
765
#: merge-recursive.c:1803
767
766
msgid "Fatal merge failure, shouldn't happen."
768
767
msgstr ""
769
768
770
#: merge-recursive.c:1807
769
#: merge-recursive.c:1822
771
770
msgid "Already up-to-date!"
772
771
msgstr "すでに最新です！"
773
772
774
#: merge-recursive.c:1816
773
#: merge-recursive.c:1831
775
774
#, c-format
776
775
msgid "merging of trees %s and %s failed"
777
776
msgstr ""
778
777
779
#: merge-recursive.c:1846
778
#: merge-recursive.c:1861
780
779
#, c-format
781
780
msgid "Unprocessed path??? %s"
782
781
msgstr ""
783
782
784
#: merge-recursive.c:1891
783
#: merge-recursive.c:1906
785
784
msgid "Merging:"
786
785
msgstr ""
787
786
788
#: merge-recursive.c:1904
787
#: merge-recursive.c:1919
789
788
#, c-format
790
789
msgid "found %u common ancestor:"
791
790
msgid_plural "found %u common ancestors:"
792
791
msgstr[0] ""
793
792
msgstr[1] ""
794
793
795
#: merge-recursive.c:1941
794
#: merge-recursive.c:1956
796
795
msgid "merge returned no commit"
797
796
msgstr ""
798
797
799
#: merge-recursive.c:1998
798
#: merge-recursive.c:2013
800
799
#, c-format
801
800
msgid "Could not parse object '%s'"
802
801
msgstr ""
803
802
804
#: merge-recursive.c:2010 builtin/merge.c:665
803
#: merge-recursive.c:2024 builtin/merge.c:666
805
804
msgid "Unable to write index."
806
805
msgstr ""
807
806
808
#: notes-utils.c:40
807
#: notes-utils.c:41
809
808
msgid "Cannot commit uninitialized/unreferenced notes tree"
810
809
msgstr ""
811
810
812
#: notes-utils.c:81
811
#: notes-utils.c:83
813
812
#, c-format
814
813
msgid "Bad notes.rewriteMode value: '%s'"
815
814
msgstr ""
816
815
817
#: notes-utils.c:91
816
#: notes-utils.c:93
818
817
#, c-format
819
818
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
820
819
msgstr ""
821
820
822
821
#. TRANSLATORS: The first %s is the name of the
823
822
#. environment variable, the second %s is its value
824
#: notes-utils.c:118
823
#: notes-utils.c:120
825
824
#, c-format
826
825
msgid "Bad %s value: '%s'"
827
826
msgstr ""
828
827
829
#: object.c:202
828
#: object.c:234
830
829
#, c-format
831
830
msgid "unable to parse object: %s"
832
831
msgstr ""
833
832
834
#: parse-options.c:537
833
#: parse-options.c:534
835
834
msgid "..."
836
835
msgstr ""
837
836
838
#: parse-options.c:555
837
#: parse-options.c:552
839
838
#, c-format
840
839
msgid "usage: %s"
841
840
msgstr ""
842
841
843
842
#. TRANSLATORS: the colon here should align with the
844
843
#. one in "usage: %s" translation
844
#: parse-options.c:556
845
#, c-format
846
msgid " or: %s"
847
msgstr ""
848
845
849
#: parse-options.c:559
846
850
#, c-format
847
msgid " or: %s"
848
msgstr ""
849
850
#: parse-options.c:562
851
#, c-format
852
851
msgid " %s"
853
852
msgstr " %s"
854
853
855
#: parse-options.c:596
854
#: parse-options.c:593
856
855
msgid "-NUM"
857
856
msgstr ""
858
857
900
899
msgid "Pathspec '%s' is in submodule '%.*s'"
901
900
msgstr ""
902
901
903
#.
904
#. * We may want to substitute "this command" with a command
905
#. * name. E.g. when add--interactive dies when running
906
#. * "checkout -p"
907
#.
908
902
#: pathspec.c:353
909
903
#, c-format
910
904
msgid "%s: pathspec magic not supported by this command: %s"
911
905
msgstr ""
912
906
913
#: pathspec.c:433
907
#: pathspec.c:432
914
908
#, c-format
915
909
msgid "pathspec '%s' is beyond a symbolic link"
916
910
msgstr ""
917
911
918
#: pathspec.c:442
912
#: pathspec.c:441
919
913
msgid ""
920
914
"There is nothing to exclude from by :(exclude) patterns.\n"
921
915
"Perhaps you forgot to add either ':/' or '.' ?"
922
916
msgstr ""
923
917
924
#: progress.c:224
918
#: progress.c:225
925
919
msgid "done"
926
920
msgstr ""
927
921
928
#: read-cache.c:1238
922
#: read-cache.c:1260
929
923
#, c-format
930
924
msgid ""
931
925
"index.version set, but the value is invalid.\n"
932
926
"Using version %i"
933
927
msgstr ""
934
928
935
#: read-cache.c:1248
929
#: read-cache.c:1270
936
930
#, c-format
937
931
msgid ""
938
932
"GIT_INDEX_VERSION set, but the value is invalid.\n"
954
948
msgid "%s tracks both %s and %s"
955
949
msgstr ""
956
950
957
#.
958
#. * This last possibility doesn't occur because
959
#. * FETCH_HEAD_IGNORE entries always appear at
960
#. * the end of the list.
961
#.
962
951
#: remote.c:769
963
952
msgid "Internal error"
964
953
msgstr ""
965
954
966
#: remote.c:1871
955
#: remote.c:1943
967
956
#, c-format
968
957
msgid "Your branch is based on '%s', but the upstream is gone.\n"
969
958
msgstr ""
970
959
971
#: remote.c:1875
960
#: remote.c:1947
972
961
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
973
962
msgstr ""
974
963
975
#: remote.c:1878
964
#: remote.c:1950
976
965
#, c-format
977
966
msgid "Your branch is up-to-date with '%s'.\n"
978
967
msgstr ""
979
968
980
#: remote.c:1882
969
#: remote.c:1954
981
970
#, c-format
982
971
msgid "Your branch is ahead of '%s' by %d commit.\n"
983
972
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
984
973
msgstr[0] "このブランチは '%s' よりも%dコミット進んでいます。\n"
985
974
986
#: remote.c:1888
975
#: remote.c:1960
987
976
msgid " (use \"git push\" to publish your local commits)\n"
988
977
msgstr ""
989
978
990
#: remote.c:1891
979
#: remote.c:1963
991
980
#, c-format
992
981
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
993
982
msgid_plural ""
994
983
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
995
984
msgstr[0] "このブランチは '%s' に比べて%dコミット遅れています。fast-forwardすることができます。\n"
996
985
997
#: remote.c:1899
986
#: remote.c:1971
998
987
msgid " (use \"git pull\" to update your local branch)\n"
999
988
msgstr ""
1000
989
1001
#: remote.c:1902
990
#: remote.c:1974
1002
991
#, c-format
1003
992
msgid ""
1004
993
"Your branch and '%s' have diverged,\n"
1009
998
msgstr[0] ""
1010
999
msgstr[1] ""
1011
1000
1012
#: remote.c:1912
1001
#: remote.c:1984
1013
1002
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
1014
1003
msgstr ""
1015
1004
1022
1011
msgid "dup2(%d,%d) failed"
1023
1012
msgstr ""
1024
1013
1025
#: sequencer.c:206 builtin/merge.c:783 builtin/merge.c:896
1026
#: builtin/merge.c:1006 builtin/merge.c:1016
1014
#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893
1015
#: builtin/merge.c:1003 builtin/merge.c:1013
1027
1016
#, c-format
1028
1017
msgid "Could not open '%s' for writing"
1029
1018
msgstr "書き込み用として '%s' を開けませんでした"
1030
1019
1031
#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:786
1032
#: builtin/merge.c:1008 builtin/merge.c:1021
1020
#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785
1021
#: builtin/merge.c:1005 builtin/merge.c:1018
1033
1022
#, c-format
1034
1023
msgid "Could not write to '%s'"
1035
1024
msgstr "'%s'に書き込めません"
1036
1025
1037
#: sequencer.c:229
1026
#: sequencer.c:194
1038
1027
msgid ""
1039
1028
"after resolving the conflicts, mark the corrected paths\n"
1040
1029
"with 'git add <paths>' or 'git rm <paths>'"
1041
1030
msgstr ""
1042
1031
1043
#: sequencer.c:232
1032
#: sequencer.c:197
1044
1033
msgid ""
1045
1034
"after resolving the conflicts, mark the corrected paths\n"
1046
1035
"with 'git add <paths>' or 'git rm <paths>'\n"
1047
1036
"and commit the result with 'git commit'"
1048
1037
msgstr ""
1049
1038
1050
#: sequencer.c:245 sequencer.c:870 sequencer.c:953
1039
#: sequencer.c:210 sequencer.c:841 sequencer.c:924
1051
1040
#, c-format
1052
1041
msgid "Could not write to %s"
1053
1042
msgstr "%s に書き込めませんでした"
1054
1043
1055
#: sequencer.c:248
1044
#: sequencer.c:213
1056
1045
#, c-format
1057
1046
msgid "Error wrapping up %s"
1058
1047
msgstr ""
1059
1048
1060
#: sequencer.c:263
1049
#: sequencer.c:228
1061
1050
msgid "Your local changes would be overwritten by cherry-pick."
1062
1051
msgstr ""
1063
1052
1064
#: sequencer.c:265
1053
#: sequencer.c:230
1065
1054
msgid "Your local changes would be overwritten by revert."
1066
1055
msgstr ""
1067
1056
1068
#: sequencer.c:268
1057
#: sequencer.c:233
1069
1058
msgid "Commit your changes or stash them to proceed."
1070
1059
msgstr ""
1071
1060
1074
1063
msgstr ""
1075
1064
1076
1065
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
1077
#: sequencer.c:325
1066
#: sequencer.c:293
1078
1067
#, c-format
1079
1068
msgid "%s: Unable to write new index file"
1080
1069
msgstr ""
1081
1070
1082
#: sequencer.c:356
1071
#: sequencer.c:324
1083
1072
msgid "Could not resolve HEAD commit\n"
1084
1073
msgstr ""
1085
1074
1086
#: sequencer.c:378
1075
#: sequencer.c:344
1087
1076
msgid "Unable to update cache tree\n"
1088
1077
msgstr ""
1089
1078
1090
#: sequencer.c:423
1079
#: sequencer.c:391
1091
1080
#, c-format
1092
1081
msgid "Could not parse commit %s\n"
1093
1082
msgstr ""
1094
1083
1095
#: sequencer.c:428
1084
#: sequencer.c:396
1096
1085
#, c-format
1097
1086
msgid "Could not parse parent commit %s\n"
1098
1087
msgstr ""
1099
1088
1100
#: sequencer.c:494
1089
#: sequencer.c:462
1101
1090
msgid "Your index file is unmerged."
1102
1091
msgstr ""
1103
1092
1104
#: sequencer.c:513
1093
#: sequencer.c:481
1105
1094
#, c-format
1106
1095
msgid "Commit %s is a merge but no -m option was given."
1107
1096
msgstr ""
1108
1097
1109
#: sequencer.c:521
1098
#: sequencer.c:489
1110
1099
#, c-format
1111
1100
msgid "Commit %s does not have parent %d"
1112
1101
msgstr ""
1113
1102
1114
#: sequencer.c:525
1103
#: sequencer.c:493
1115
1104
#, c-format
1116
1105
msgid "Mainline was specified but commit %s is not a merge."
1117
1106
msgstr ""
1118
1107
1119
1108
#. TRANSLATORS: The first %s will be "revert" or
1120
1109
#. "cherry-pick", the second %s a SHA1
1121
#: sequencer.c:538
1110
#: sequencer.c:506
1122
1111
#, c-format
1123
1112
msgid "%s: cannot parse parent commit %s"
1124
1113
msgstr ""
1125
1114
1126
#: sequencer.c:542
1115
#: sequencer.c:510
1127
1116
#, c-format
1128
1117
msgid "Cannot get commit message for %s"
1129
1118
msgstr ""
1130
1119
1131
#: sequencer.c:628
1120
#: sequencer.c:596
1132
1121
#, c-format
1133
1122
msgid "could not revert %s... %s"
1134
1123
msgstr ""
1135
1124
1136
#: sequencer.c:629
1125
#: sequencer.c:597
1137
1126
#, c-format
1138
1127
msgid "could not apply %s... %s"
1139
1128
msgstr ""
1140
1129
1141
#: sequencer.c:665
1130
#: sequencer.c:633
1142
1131
msgid "empty commit set passed"
1143
1132
msgstr ""
1144
1133
1145
#: sequencer.c:673
1134
#: sequencer.c:641
1146
1135
#, c-format
1147
1136
msgid "git %s: failed to read the index"
1148
1137
msgstr ""
1149
1138
1150
#: sequencer.c:678
1139
#: sequencer.c:645
1151
1140
#, c-format
1152
1141
msgid "git %s: failed to refresh the index"
1153
1142
msgstr ""
1154
1143
1155
#: sequencer.c:736
1144
#: sequencer.c:705
1156
1145
#, c-format
1157
1146
msgid "Cannot %s during a %s"
1158
1147
msgstr ""
1159
1148
1160
#: sequencer.c:758
1149
#: sequencer.c:727
1161
1150
#, c-format
1162
1151
msgid "Could not parse line %d."
1163
1152
msgstr ""
1164
1153
1165
#: sequencer.c:763
1154
#: sequencer.c:732
1166
1155
msgid "No commits parsed."
1167
1156
msgstr ""
1168
1157
1169
#: sequencer.c:776
1158
#: sequencer.c:745
1170
1159
#, c-format
1171
1160
msgid "Could not open %s"
1172
1161
msgstr "%s を開けません"
1173
1162
1174
#: sequencer.c:780
1163
#: sequencer.c:749
1175
1164
#, c-format
1176
1165
msgid "Could not read %s."
1177
1166
msgstr "%s を読み込めません"
1178
1167
1179
#: sequencer.c:787
1168
#: sequencer.c:756
1180
1169
#, c-format
1181
1170
msgid "Unusable instruction sheet: %s"
1182
1171
msgstr ""
1183
1172
1184
#: sequencer.c:815
1173
#: sequencer.c:786
1185
1174
#, c-format
1186
1175
msgid "Invalid key: %s"
1187
1176
msgstr "無効なキー: %s"
1188
1177
1189
#: sequencer.c:818
1178
#: sequencer.c:789
1190
1179
#, c-format
1191
1180
msgid "Invalid value for %s: %s"
1192
1181
msgstr ""
1193
1182
1194
#: sequencer.c:830
1183
#: sequencer.c:801
1195
1184
#, c-format
1196
1185
msgid "Malformed options sheet: %s"
1197
1186
msgstr ""
1198
1187
1199
#: sequencer.c:851
1188
#: sequencer.c:822
1200
1189
msgid "a cherry-pick or revert is already in progress"
1201
1190
msgstr ""
1202
1191
1203
#: sequencer.c:852
1192
#: sequencer.c:823
1204
1193
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
1205
1194
msgstr ""
1206
1195
1207
#: sequencer.c:856
1196
#: sequencer.c:827
1208
1197
#, c-format
1209
1198
msgid "Could not create sequencer directory %s"
1210
1199
msgstr ""
1211
1200
1212
#: sequencer.c:872 sequencer.c:957
1201
#: sequencer.c:843 sequencer.c:928
1213
1202
#, c-format
1214
1203
msgid "Error wrapping up %s."
1215
1204
msgstr ""
1216
1205
1217
#: sequencer.c:891 sequencer.c:1025
1206
#: sequencer.c:862 sequencer.c:998
1218
1207
msgid "no cherry-pick or revert in progress"
1219
1208
msgstr ""
1220
1209
1221
#: sequencer.c:893
1210
#: sequencer.c:864
1222
1211
msgid "cannot resolve HEAD"
1223
1212
msgstr ""
1224
1213
1225
#: sequencer.c:895
1214
#: sequencer.c:866
1226
1215
msgid "cannot abort from a branch yet to be born"
1227
1216
msgstr ""
1228
1217
1229
#: sequencer.c:917 builtin/apply.c:4061
1218
#: sequencer.c:888 builtin/apply.c:4062
1230
1219
#, c-format
1231
1220
msgid "cannot open %s: %s"
1232
1221
msgstr "%s を開けません: %s"
1233
1222
1234
#: sequencer.c:920
1223
#: sequencer.c:891
1235
1224
#, c-format
1236
1225
msgid "cannot read %s: %s"
1237
1226
msgstr "%s を読み込めません: %s"
1238
1227
1239
#: sequencer.c:921
1228
#: sequencer.c:892
1240
1229
msgid "unexpected end of file"
1241
1230
msgstr "予期せぬファイル終端(OEF)です"
1242
1231
1243
#: sequencer.c:927
1232
#: sequencer.c:898
1244
1233
#, c-format
1245
1234
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
1246
1235
msgstr ""
1247
1236
1248
#: sequencer.c:950
1237
#: sequencer.c:921
1249
1238
#, c-format
1250
1239
msgid "Could not format %s."
1251
1240
msgstr ""
1252
1241
1253
#: sequencer.c:1093
1242
#: sequencer.c:1066
1254
1243
#, c-format
1255
1244
msgid "%s: can't cherry-pick a %s"
1256
1245
msgstr ""
1257
1246
1258
#: sequencer.c:1096
1247
#: sequencer.c:1069
1259
1248
#, c-format
1260
1249
msgid "%s: bad revision"
1261
1250
msgstr ""
1262
1251
1263
#: sequencer.c:1130
1252
#: sequencer.c:1103
1264
1253
msgid "Can't revert as initial commit"
1265
1254
msgstr ""
1266
1255
1267
#: sequencer.c:1131
1256
#: sequencer.c:1104
1268
1257
msgid "Can't cherry-pick into empty head"
1269
1258
msgstr ""
1270
1259
1281
1270
"running \"git config advice.objectNameWarning false\""
1282
1271
msgstr ""
1283
1272
1284
#: sha1_name.c:1070
1273
#: sha1_name.c:1060
1285
1274
msgid "HEAD does not point to a branch"
1286
1275
msgstr ""
1287
1276
1288
#: sha1_name.c:1073
1277
#: sha1_name.c:1063
1289
1278
#, c-format
1290
1279
msgid "No such branch: '%s'"
1291
1280
msgstr ""
1292
1281
1293
#: sha1_name.c:1075
1282
#: sha1_name.c:1065
1294
1283
#, c-format
1295
1284
msgid "No upstream configured for branch '%s'"
1296
1285
msgstr ""
1297
1286
1298
#: sha1_name.c:1079
1287
#: sha1_name.c:1069
1299
1288
#, c-format
1300
1289
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
1301
1290
msgstr ""
1309
1298
msgid "Could not find section in .gitmodules where path=%s"
1310
1299
msgstr ""
1311
1300
1312
#. Maybe the user already did that, don't error out here
1313
1301
#: submodule.c:76
1314
1302
#, c-format
1315
1303
msgid "Could not update .gitmodules entry %s"
1316
1304
msgstr ""
1317
1305
1318
#. Maybe the user already did that, don't error out here
1319
1306
#: submodule.c:109
1320
1307
#, c-format
1321
1308
msgid "Could not remove .gitmodules entry for %s"
1322
1309
msgstr ""
1323
1310
1324
#: submodule.c:143
1311
#: submodule.c:120
1325
1312
msgid "staging updated .gitmodules failed"
1326
1313
msgstr ""
1327
1314
1328
#: submodule.c:1144 builtin/init-db.c:363
1315
#: submodule.c:1118 builtin/init-db.c:363
1329
1316
#, c-format
1330
1317
msgid "Could not create git link %s"
1331
1318
msgstr ""
1332
1319
1333
#: submodule.c:1155
1320
#: submodule.c:1129
1334
1321
#, c-format
1335
1322
msgid "Could not set core.worktree in %s"
1336
1323
msgstr ""
1337
1324
1338
#: unpack-trees.c:206
1325
#: unpack-trees.c:202
1339
1326
msgid "Checking out files"
1340
1327
msgstr ""
1341
1328
1368
1355
msgid "invalid '..' path segment"
1369
1356
msgstr ""
1370
1357
1371
#: wrapper.c:422
1358
#: wrapper.c:460
1372
1359
#, c-format
1373
1360
msgid "unable to access '%s': %s"
1374
1361
msgstr ""
1375
1362
1376
#: wrapper.c:443
1363
#: wrapper.c:481
1377
1364
#, c-format
1378
1365
msgid "unable to access '%s'"
1379
1366
msgstr ""
1380
1367
1381
#: wrapper.c:454
1368
#: wrapper.c:492
1382
1369
#, c-format
1383
1370
msgid "unable to look up current user in the passwd file: %s"
1384
1371
msgstr ""
1385
1372
1386
#: wrapper.c:455
1373
#: wrapper.c:493
1387
1374
msgid "no such user"
1388
1375
msgstr ""
1389
1376
1442
1429
msgid " (use \"git %s <file>...\" to include in what will be committed)"
1443
1430
msgstr ""
1444
1431
1445
#: wt-status.c:259
1432
#: wt-status.c:252
1446
1433
msgid "both deleted:"
1447
1434
msgstr ""
1448
1435
1449
#: wt-status.c:260
1436
#: wt-status.c:254
1450
1437
msgid "added by us:"
1451
1438
msgstr ""
1452
1439
1453
#: wt-status.c:261
1440
#: wt-status.c:256
1454
1441
msgid "deleted by them:"
1455
1442
msgstr ""
1456
1443
1457
#: wt-status.c:262
1444
#: wt-status.c:258
1458
1445
msgid "added by them:"
1459
1446
msgstr ""
1460
1447
1461
#: wt-status.c:263
1448
#: wt-status.c:260
1462
1449
msgid "deleted by us:"
1463
1450
msgstr ""
1464
1451
1452
#: wt-status.c:262
1453
msgid "both added:"
1454
msgstr ""
1455
1465
1456
#: wt-status.c:264
1466
msgid "both added:"
1467
msgstr ""
1468
1469
#: wt-status.c:265
1470
1457
msgid "both modified:"
1471
1458
msgstr ""
1472
1459
1507
1494
msgid "unmerged:"
1508
1495
msgstr ""
1509
1496
1510
#: wt-status.c:336
1497
#: wt-status.c:370
1511
1498
msgid "new commits, "
1512
1499
msgstr "新規コミット, "
1513
1500
1514
#: wt-status.c:338
1501
#: wt-status.c:372
1515
1502
msgid "modified content, "
1516
1503
msgstr ""
1517
1504
1518
#: wt-status.c:340
1505
#: wt-status.c:374
1519
1506
msgid "untracked content, "
1520
1507
msgstr ""
1521
1508
1522
#: wt-status.c:357
1509
#: wt-status.c:391
1523
1510
#, c-format
1524
1511
msgid "bug: unhandled diff status %c"
1525
1512
msgstr ""
1526
1513
1527
#: wt-status.c:732
1514
#: wt-status.c:764
1528
1515
msgid "Submodules changed but not updated:"
1529
1516
msgstr ""
1530
1517
1531
#: wt-status.c:734
1518
#: wt-status.c:766
1532
1519
msgid "Submodule changes to be committed:"
1533
1520
msgstr ""
1534
1521
1535
#: wt-status.c:836
1522
#: wt-status.c:845
1536
1523
msgid ""
1537
1524
"Do not touch the line above.\n"
1538
1525
"Everything below will be removed."
1539
1526
msgstr ""
1540
1527
1541
#: wt-status.c:899
1528
#: wt-status.c:936
1542
1529
msgid "You have unmerged paths."
1543
1530
msgstr ""
1544
1531
1545
#: wt-status.c:902
1532
#: wt-status.c:939
1546
1533
msgid " (fix conflicts and run \"git commit\")"
1547
1534
msgstr ""
1548
1535
1549
#: wt-status.c:905
1536
#: wt-status.c:942
1550
1537
msgid "All conflicts fixed but you are still merging."
1551
1538
msgstr ""
1552
1539
1553
#: wt-status.c:908
1540
#: wt-status.c:945
1554
1541
msgid " (use \"git commit\" to conclude merge)"
1555
1542
msgstr ""
1556
1543
1557
#: wt-status.c:918
1544
#: wt-status.c:955
1558
1545
msgid "You are in the middle of an am session."
1559
1546
msgstr ""
1560
1547
1561
#: wt-status.c:921
1548
#: wt-status.c:958
1562
1549
msgid "The current patch is empty."
1563
1550
msgstr ""
1564
1551
1565
#: wt-status.c:925
1552
#: wt-status.c:962
1566
1553
msgid " (fix conflicts and then run \"git am --continue\")"
1567
1554
msgstr ""
1568
1555
1569
#: wt-status.c:927
1556
#: wt-status.c:964
1570
1557
msgid " (use \"git am --skip\" to skip this patch)"
1571
1558
msgstr ""
1572
1559
1573
#: wt-status.c:929
1560
#: wt-status.c:966
1574
1561
msgid " (use \"git am --abort\" to restore the original branch)"
1575
1562
msgstr ""
1576
1563
1577
#: wt-status.c:989 wt-status.c:1006
1564
#: wt-status.c:1026 wt-status.c:1043
1578
1565
#, c-format
1579
1566
msgid "You are currently rebasing branch '%s' on '%s'."
1580
1567
msgstr ""
1581
1568
1582
#: wt-status.c:994 wt-status.c:1011
1569
#: wt-status.c:1031 wt-status.c:1048
1583
1570
msgid "You are currently rebasing."
1584
1571
msgstr ""
1585
1572
1586
#: wt-status.c:997
1573
#: wt-status.c:1034
1587
1574
msgid " (fix conflicts and then run \"git rebase --continue\")"
1588
1575
msgstr ""
1589
1576
1590
#: wt-status.c:999
1577
#: wt-status.c:1036
1591
1578
msgid " (use \"git rebase --skip\" to skip this patch)"
1592
1579
msgstr ""
1593
1580
1594
#: wt-status.c:1001
1581
#: wt-status.c:1038
1595
1582
msgid " (use \"git rebase --abort\" to check out the original branch)"
1596
1583
msgstr ""
1597
1584
1598
#: wt-status.c:1014
1585
#: wt-status.c:1051
1599
1586
msgid " (all conflicts fixed: run \"git rebase --continue\")"
1600
1587
msgstr ""
1601
1588
1602
#: wt-status.c:1018
1589
#: wt-status.c:1055
1603
1590
#, c-format
1604
1591
msgid ""
1605
1592
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
1606
1593
msgstr ""
1607
1594
1608
#: wt-status.c:1023
1595
#: wt-status.c:1060
1609
1596
msgid "You are currently splitting a commit during a rebase."
1610
1597
msgstr ""
1611
1598
1612
#: wt-status.c:1026
1599
#: wt-status.c:1063
1613
1600
msgid ""
1614
1601
" (Once your working directory is clean, run \"git rebase --continue\")"
1615
1602
msgstr ""
1616
1603
1617
#: wt-status.c:1030
1604
#: wt-status.c:1067
1618
1605
#, c-format
1619
1606
msgid ""
1620
1607
"You are currently editing a commit while rebasing branch '%s' on '%s'."
1621
1608
msgstr ""
1622
1609
1623
#: wt-status.c:1035
1610
#: wt-status.c:1072
1624
1611
msgid "You are currently editing a commit during a rebase."
1625
1612
msgstr ""
1626
1613
1627
#: wt-status.c:1038
1614
#: wt-status.c:1075
1628
1615
msgid " (use \"git commit --amend\" to amend the current commit)"
1629
1616
msgstr ""
1630
1617
1631
#: wt-status.c:1040
1618
#: wt-status.c:1077
1632
1619
msgid ""
1633
1620
" (use \"git rebase --continue\" once you are satisfied with your changes)"
1634
1621
msgstr ""
1635
1622
1636
#: wt-status.c:1050
1623
#: wt-status.c:1087
1637
1624
#, c-format
1638
1625
msgid "You are currently cherry-picking commit %s."
1639
1626
msgstr ""
1640
1627
1641
#: wt-status.c:1055
1628
#: wt-status.c:1092
1642
1629
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
1643
1630
msgstr ""
1644
1631
1645
#: wt-status.c:1058
1632
#: wt-status.c:1095
1646
1633
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
1647
1634
msgstr ""
1648
1635
1649
#: wt-status.c:1060
1636
#: wt-status.c:1097
1650
1637
msgid ""
1651
1638
" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
1652
1639
msgstr ""
1653
1640
1654
#: wt-status.c:1069
1641
#: wt-status.c:1106
1655
1642
#, c-format
1656
1643
msgid "You are currently reverting commit %s."
1657
1644
msgstr ""
1658
1645
1659
#: wt-status.c:1074
1646
#: wt-status.c:1111
1660
1647
msgid " (fix conflicts and run \"git revert --continue\")"
1661
1648
msgstr ""
1662
1649
1663
#: wt-status.c:1077
1650
#: wt-status.c:1114
1664
1651
msgid " (all conflicts fixed: run \"git revert --continue\")"
1665
1652
msgstr ""
1666
1653
1667
#: wt-status.c:1079
1654
#: wt-status.c:1116
1668
1655
msgid " (use \"git revert --abort\" to cancel the revert operation)"
1669
1656
msgstr ""
1670
1657
1671
#: wt-status.c:1090
1658
#: wt-status.c:1127
1672
1659
#, c-format
1673
1660
msgid "You are currently bisecting, started from branch '%s'."
1674
1661
msgstr ""
1675
1662
1676
#: wt-status.c:1094
1663
#: wt-status.c:1131
1677
1664
msgid "You are currently bisecting."
1678
1665
msgstr ""
1679
1666
1680
#: wt-status.c:1097
1667
#: wt-status.c:1134
1681
1668
msgid " (use \"git bisect reset\" to get back to the original branch)"
1682
1669
msgstr ""
1683
1670
1684
#: wt-status.c:1272
1671
#: wt-status.c:1309
1685
1672
msgid "On branch "
1686
1673
msgstr ""
1687
1674
1688
#: wt-status.c:1279
1675
#: wt-status.c:1316
1689
1676
msgid "rebase in progress; onto "
1690
1677
msgstr ""
1691
1678
1692
#: wt-status.c:1286
1679
#: wt-status.c:1323
1693
1680
msgid "HEAD detached at "
1694
1681
msgstr ""
1695
1682
1696
#: wt-status.c:1288
1683
#: wt-status.c:1325
1697
1684
msgid "HEAD detached from "
1698
1685
msgstr ""
1699
1686
1700
#: wt-status.c:1291
1687
#: wt-status.c:1328
1701
1688
msgid "Not currently on any branch."
1702
1689
msgstr ""
1703
1690
1704
#: wt-status.c:1308
1691
#: wt-status.c:1345
1705
1692
msgid "Initial commit"
1706
1693
msgstr "最初のコミット"
1707
1694
1708
#: wt-status.c:1322
1695
#: wt-status.c:1359
1709
1696
msgid "Untracked files"
1710
1697
msgstr ""
1711
1698
1712
#: wt-status.c:1324
1699
#: wt-status.c:1361
1713
1700
msgid "Ignored files"
1714
1701
msgstr ""
1715
1702
1716
#: wt-status.c:1328
1703
#: wt-status.c:1365
1717
1704
#, c-format
1718
1705
msgid ""
1719
1706
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
1721
1708
"new files yourself (see 'git help status')."
1722
1709
msgstr ""
1723
1710
1724
#: wt-status.c:1334
1711
#: wt-status.c:1371
1725
1712
#, c-format
1726
1713
msgid "Untracked files not listed%s"
1727
1714
msgstr ""
1728
1715
1729
#: wt-status.c:1336
1716
#: wt-status.c:1373
1730
1717
msgid " (use -u option to show untracked files)"
1731
1718
msgstr ""
1732
1719
1733
#: wt-status.c:1342
1720
#: wt-status.c:1379
1734
1721
msgid "No changes"
1735
1722
msgstr "変更なし"
1736
1723
1737
#: wt-status.c:1347
1724
#: wt-status.c:1384
1738
1725
#, c-format
1739
1726
msgid ""
1740
1727
"no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
1741
1728
msgstr ""
1742
1729
1743
#: wt-status.c:1350
1730
#: wt-status.c:1387
1744
1731
#, c-format
1745
1732
msgid "no changes added to commit\n"
1746
1733
msgstr ""
1747
1734
1748
#: wt-status.c:1353
1735
#: wt-status.c:1390
1749
1736
#, c-format
1750
1737
msgid ""
1751
1738
"nothing added to commit but untracked files present (use \"git add\" to "
1752
1739
"track)\n"
1753
1740
msgstr ""
1754
1741
1755
#: wt-status.c:1356
1742
#: wt-status.c:1393
1756
1743
#, c-format
1757
1744
msgid "nothing added to commit but untracked files present\n"
1758
1745
msgstr ""
1759
1746
1760
#: wt-status.c:1359
1747
#: wt-status.c:1396
1761
1748
#, c-format
1762
1749
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
1763
1750
msgstr ""
1764
1751
1765
#: wt-status.c:1362 wt-status.c:1367
1752
#: wt-status.c:1399 wt-status.c:1404
1766
1753
#, c-format
1767
1754
msgid "nothing to commit\n"
1768
1755
msgstr ""
1769
1756
1770
#: wt-status.c:1365
1757
#: wt-status.c:1402
1771
1758
#, c-format
1772
1759
msgid "nothing to commit (use -u to show untracked files)\n"
1773
1760
msgstr ""
1774
1761
1775
#: wt-status.c:1369
1762
#: wt-status.c:1406
1776
1763
#, c-format
1777
1764
msgid "nothing to commit, working directory clean\n"
1778
1765
msgstr ""
1779
1766
1780
#: wt-status.c:1478
1767
#: wt-status.c:1515
1781
1768
msgid "HEAD (no branch)"
1782
1769
msgstr ""
1783
1770
1784
#: wt-status.c:1484
1771
#: wt-status.c:1521
1785
1772
msgid "Initial commit on "
1786
1773
msgstr ""
1787
1774
1788
#: wt-status.c:1514
1775
#: wt-status.c:1553
1789
1776
msgid "gone"
1790
1777
msgstr ""
1791
1778
1792
#: wt-status.c:1516
1779
#: wt-status.c:1555 wt-status.c:1563
1793
1780
msgid "behind "
1794
1781
msgstr ""
1795
1782
1798
1785
msgid "failed to unlink '%s'"
1799
1786
msgstr ""
1800
1787
1801
#: builtin/add.c:20
1788
#: builtin/add.c:21
1802
1789
msgid "git add [options] [--] <pathspec>..."
1803
1790
msgstr ""
1804
1791
1805
#: builtin/add.c:144
1792
#: builtin/add.c:64
1806
1793
#, c-format
1807
1794
msgid "unexpected diff status %c"
1808
1795
msgstr ""
1809
1796
1810
#: builtin/add.c:149 builtin/commit.c:260
1797
#: builtin/add.c:69 builtin/commit.c:261
1811
1798
msgid "updating files failed"
1812
1799
msgstr ""
1813
1800
1814
#: builtin/add.c:163
1801
#: builtin/add.c:79
1815
1802
#, c-format
1816
1803
msgid "remove '%s'\n"
1817
1804
msgstr ""
1818
1805
1819
#: builtin/add.c:237
1806
#: builtin/add.c:133
1820
1807
msgid "Unstaged changes after refreshing the index:"
1821
1808
msgstr ""
1822
1809
1823
#: builtin/add.c:299
1810
#: builtin/add.c:193 builtin/rev-parse.c:781
1824
1811
msgid "Could not read the index"
1825
1812
msgstr ""
1826
1813
1827
#: builtin/add.c:310
1814
#: builtin/add.c:204
1828
1815
#, c-format
1829
1816
msgid "Could not open '%s' for writing."
1830
1817
msgstr ""
1831
1818
1832
#: builtin/add.c:314
1819
#: builtin/add.c:208
1833
1820
msgid "Could not write patch"
1834
1821
msgstr ""
1835
1822
1836
#: builtin/add.c:319
1823
#: builtin/add.c:213
1837
1824
#, c-format
1838
1825
msgid "Could not stat '%s'"
1839
1826
msgstr ""
1840
1827
1841
#: builtin/add.c:321
1828
#: builtin/add.c:215
1842
1829
msgid "Empty patch. Aborted."
1843
1830
msgstr ""
1844
1831
1845
#: builtin/add.c:327
1832
#: builtin/add.c:221
1846
1833
#, c-format
1847
1834
msgid "Could not apply '%s'"
1848
1835
msgstr "'%s'を適用できません"
1849
1836
1850
#: builtin/add.c:337
1837
#: builtin/add.c:231
1851
1838
msgid "The following paths are ignored by one of your .gitignore files:\n"
1852
1839
msgstr ""
1853
1840
1854
#: builtin/add.c:354 builtin/clean.c:875 builtin/fetch.c:93 builtin/mv.c:70
1855
#: builtin/prune-packed.c:77 builtin/push.c:506 builtin/remote.c:1344
1841
#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70
1842
#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367
1856
1843
#: builtin/rm.c:269
1857
1844
msgid "dry run"
1858
1845
msgstr ""
1859
1846
1860
#: builtin/add.c:355 builtin/apply.c:4410 builtin/check-ignore.c:19
1861
#: builtin/commit.c:1249 builtin/count-objects.c:95 builtin/fsck.c:612
1862
#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113
1847
#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19
1848
#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606
1849
#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113
1863
1850
msgid "be verbose"
1864
1851
msgstr ""
1865
1852
1866
#: builtin/add.c:357
1853
#: builtin/add.c:251
1867
1854
msgid "interactive picking"
1868
1855
msgstr ""
1869
1856
1870
#: builtin/add.c:358 builtin/checkout.c:1109 builtin/reset.c:272
1857
#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285
1871
1858
msgid "select hunks interactively"
1872
1859
msgstr ""
1873
1860
1874
#: builtin/add.c:359
1861
#: builtin/add.c:253
1875
1862
msgid "edit current diff and apply"
1876
1863
msgstr ""
1877
1864
1878
#: builtin/add.c:360
1865
#: builtin/add.c:254
1879
1866
msgid "allow adding otherwise ignored files"
1880
1867
msgstr ""
1881
1868
1882
#: builtin/add.c:361
1869
#: builtin/add.c:255
1883
1870
msgid "update tracked files"
1884
1871
msgstr ""
1885
1872
1886
#: builtin/add.c:362
1873
#: builtin/add.c:256
1887
1874
msgid "record only the fact that the path will be added later"
1888
1875
msgstr ""
1889
1876
1890
#: builtin/add.c:363
1877
#: builtin/add.c:257
1891
1878
msgid "add changes from all tracked and untracked files"
1892
1879
msgstr ""
1893
1880
1894
#. takes no arguments
1895
#: builtin/add.c:366
1881
#: builtin/add.c:260
1896
1882
msgid "ignore paths removed in the working tree (same as --no-all)"
1897
1883
msgstr ""
1898
1884
1899
#: builtin/add.c:368
1885
#: builtin/add.c:262
1900
1886
msgid "don't add, only refresh the index"
1901
1887
msgstr ""
1902
1888
1903
#: builtin/add.c:369
1889
#: builtin/add.c:263
1904
1890
msgid "just skip files which cannot be added because of errors"
1905
1891
msgstr ""
1906
1892
1907
#: builtin/add.c:370
1893
#: builtin/add.c:264
1908
1894
msgid "check if - even missing - files are ignored in dry run"
1909
1895
msgstr ""
1910
1896
1911
#: builtin/add.c:392
1897
#: builtin/add.c:286
1912
1898
#, c-format
1913
1899
msgid "Use -f if you really want to add them.\n"
1914
1900
msgstr ""
1915
1901
1916
#: builtin/add.c:393
1902
#: builtin/add.c:287
1917
1903
msgid "no files added"
1918
1904
msgstr ""
1919
1905
1920
#: builtin/add.c:399
1906
#: builtin/add.c:293
1921
1907
msgid "adding files failed"
1922
1908
msgstr ""
1923
1909
1924
#: builtin/add.c:438
1910
#: builtin/add.c:329
1925
1911
msgid "-A and -u are mutually incompatible"
1926
1912
msgstr ""
1927
1913
1928
#: builtin/add.c:456
1914
#: builtin/add.c:336
1929
1915
msgid "Option --ignore-missing can only be used together with --dry-run"
1930
1916
msgstr ""
1931
1917
1932
#: builtin/add.c:486
1918
#: builtin/add.c:357
1933
1919
#, c-format
1934
1920
msgid "Nothing specified, nothing added.\n"
1935
1921
msgstr ""
1936
1922
1937
#: builtin/add.c:487
1923
#: builtin/add.c:358
1938
1924
#, c-format
1939
1925
msgid "Maybe you wanted to say 'git add .'?\n"
1940
1926
msgstr ""
1941
1927
1942
#: builtin/add.c:492 builtin/check-ignore.c:172 builtin/clean.c:919
1943
#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:224 builtin/rm.c:299
1928
#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919
1929
#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299
1944
1930
msgid "index file corrupt"
1945
1931
msgstr ""
1946
1932
1947
#: builtin/add.c:592 builtin/apply.c:4506 builtin/mv.c:270 builtin/rm.c:432
1933
#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431
1948
1934
msgid "Unable to write new index file"
1949
1935
msgstr ""
1950
1936
1962
1948
msgid "unrecognized whitespace ignore option '%s'"
1963
1949
msgstr ""
1964
1950
1965
#: builtin/apply.c:823
1951
#: builtin/apply.c:825
1966
1952
#, c-format
1967
1953
msgid "Cannot prepare timestamp regexp %s"
1968
1954
msgstr ""
1969
1955
1970
#: builtin/apply.c:832
1956
#: builtin/apply.c:834
1971
1957
#, c-format
1972
1958
msgid "regexec returned %d for input: %s"
1973
1959
msgstr ""
1974
1960
1975
#: builtin/apply.c:913
1961
#: builtin/apply.c:915
1976
1962
#, c-format
1977
1963
msgid "unable to find filename in patch at line %d"
1978
1964
msgstr ""
1979
1965
1980
#: builtin/apply.c:945
1966
#: builtin/apply.c:947
1981
1967
#, c-format
1982
1968
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1983
1969
msgstr ""
1984
1970
1985
#: builtin/apply.c:949
1971
#: builtin/apply.c:951
1986
1972
#, c-format
1987
1973
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1988
1974
msgstr ""
1989
1975
1990
#: builtin/apply.c:950
1976
#: builtin/apply.c:952
1991
1977
#, c-format
1992
1978
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1993
1979
msgstr ""
1994
1980
1995
#: builtin/apply.c:957
1981
#: builtin/apply.c:959
1996
1982
#, c-format
1997
1983
msgid "git apply: bad git-diff - expected /dev/null on line %d"
1998
1984
msgstr ""
2051
2037
msgid "corrupt binary patch at line %d: %.*s"
2052
2038
msgstr ""
2053
2039
2054
#. there has to be one hunk (forward hunk)
2055
2040
#: builtin/apply.c:1900
2056
2041
#, c-format
2057
2042
msgid "unrecognized binary patch at line %d"
2101
2086
msgid "missing binary patch data for '%s'"
2102
2087
msgstr ""
2103
2088
2104
#: builtin/apply.c:2946
2089
#: builtin/apply.c:2944
2105
2090
#, c-format
2106
2091
msgid "binary patch does not apply to '%s'"
2107
2092
msgstr ""
2108
2093
2109
#: builtin/apply.c:2952
2094
#: builtin/apply.c:2950
2110
2095
#, c-format
2111
2096
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2112
2097
msgstr ""
2113
2098
2114
#: builtin/apply.c:2973
2099
#: builtin/apply.c:2971
2115
2100
#, c-format
2116
2101
msgid "patch failed: %s:%ld"
2117
2102
msgstr ""
2190
2175
msgid "Checking patch %s..."
2191
2176
msgstr ""
2192
2177
2193
#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:127
2178
#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134
2194
2179
#, c-format
2195
2180
msgid "make_cache_entry failed for path '%s'"
2196
2181
msgstr ""
2200
2185
msgid "unable to remove %s from index"
2201
2186
msgstr ""
2202
2187
2203
#: builtin/apply.c:3851
2188
#: builtin/apply.c:3852
2204
2189
#, c-format
2205
2190
msgid "corrupt patch for submodule %s"
2206
2191
msgstr ""
2207
2192
2208
#: builtin/apply.c:3855
2193
#: builtin/apply.c:3856
2209
2194
#, c-format
2210
2195
msgid "unable to stat newly created file '%s'"
2211
2196
msgstr ""
2212
2197
2213
#: builtin/apply.c:3860
2198
#: builtin/apply.c:3861
2214
2199
#, c-format
2215
2200
msgid "unable to create backing store for newly created file %s"
2216
2201
msgstr ""
2217
2202
2218
#: builtin/apply.c:3863 builtin/apply.c:3971
2203
#: builtin/apply.c:3864 builtin/apply.c:3972
2219
2204
#, c-format
2220
2205
msgid "unable to add cache entry for %s"
2221
2206
msgstr ""
2222
2207
2223
#: builtin/apply.c:3896
2208
#: builtin/apply.c:3897
2224
2209
#, c-format
2225
2210
msgid "closing file '%s'"
2226
2211
msgstr ""
2227
2212
2228
#: builtin/apply.c:3945
2213
#: builtin/apply.c:3946
2229
2214
#, c-format
2230
2215
msgid "unable to write file '%s' mode %o"
2231
2216
msgstr ""
2232
2217
2233
#: builtin/apply.c:4032
2218
#: builtin/apply.c:4033
2234
2219
#, c-format
2235
2220
msgid "Applied patch %s cleanly."
2236
2221
msgstr ""
2237
2222
2238
#: builtin/apply.c:4040
2223
#: builtin/apply.c:4041
2239
2224
msgid "internal error"
2240
2225
msgstr ""
2241
2226
2242
#. Say this even without --verbose
2243
#: builtin/apply.c:4043
2227
#: builtin/apply.c:4044
2244
2228
#, c-format
2245
2229
msgid "Applying patch %%s with %d reject..."
2246
2230
msgid_plural "Applying patch %%s with %d rejects..."
2247
2231
msgstr[0] ""
2248
2232
msgstr[1] ""
2249
2233
2250
#: builtin/apply.c:4053
2234
#: builtin/apply.c:4054
2251
2235
#, c-format
2252
2236
msgid "truncating .rej filename to %.*s.rej"
2253
2237
msgstr ""
2254
2238
2255
#: builtin/apply.c:4074
2239
#: builtin/apply.c:4075
2256
2240
#, c-format
2257
2241
msgid "Hunk #%d applied cleanly."
2258
2242
msgstr ""
2259
2243
2260
#: builtin/apply.c:4077
2244
#: builtin/apply.c:4078
2261
2245
#, c-format
2262
2246
msgid "Rejected hunk #%d."
2263
2247
msgstr ""
2264
2248
2265
#: builtin/apply.c:4227
2249
#: builtin/apply.c:4228
2266
2250
msgid "unrecognized input"
2267
2251
msgstr ""
2268
2252
2269
#: builtin/apply.c:4238
2253
#: builtin/apply.c:4239
2270
2254
msgid "unable to read index file"
2271
2255
msgstr ""
2272
2256
2273
#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90
2274
#: builtin/fetch.c:78
2257
#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90
2258
#: builtin/fetch.c:93
2275
2259
msgid "path"
2276
2260
msgstr ""
2277
2261
2278
#: builtin/apply.c:4358
2262
#: builtin/apply.c:4359
2279
2263
msgid "don't apply changes matching the given path"
2280
2264
msgstr ""
2281
2265
2282
#: builtin/apply.c:4361
2266
#: builtin/apply.c:4362
2283
2267
msgid "apply changes matching the given path"
2284
2268
msgstr ""
2285
2269
2286
#: builtin/apply.c:4363
2270
#: builtin/apply.c:4364
2287
2271
msgid "num"
2288
2272
msgstr ""
2289
2273
2290
#: builtin/apply.c:4364
2274
#: builtin/apply.c:4365
2291
2275
msgid "remove <num> leading slashes from traditional diff paths"
2292
2276
msgstr ""
2293
2277
2294
#: builtin/apply.c:4367
2278
#: builtin/apply.c:4368
2295
2279
msgid "ignore additions made by the patch"
2296
2280
msgstr ""
2297
2281
2298
#: builtin/apply.c:4369
2282
#: builtin/apply.c:4370
2299
2283
msgid "instead of applying the patch, output diffstat for the input"
2300
2284
msgstr ""
2301
2285
2302
#: builtin/apply.c:4373
2286
#: builtin/apply.c:4374
2303
2287
msgid "show number of added and deleted lines in decimal notation"
2304
2288
msgstr ""
2305
2289
2306
#: builtin/apply.c:4375
2290
#: builtin/apply.c:4376
2307
2291
msgid "instead of applying the patch, output a summary for the input"
2308
2292
msgstr ""
2309
2293
2310
#: builtin/apply.c:4377
2294
#: builtin/apply.c:4378
2311
2295
msgid "instead of applying the patch, see if the patch is applicable"
2312
2296
msgstr ""
2313
2297
2314
#: builtin/apply.c:4379
2298
#: builtin/apply.c:4380
2315
2299
msgid "make sure the patch is applicable to the current index"
2316
2300
msgstr ""
2317
2301
2318
#: builtin/apply.c:4381
2302
#: builtin/apply.c:4382
2319
2303
msgid "apply a patch without touching the working tree"
2320
2304
msgstr ""
2321
2305
2322
#: builtin/apply.c:4383
2306
#: builtin/apply.c:4384
2323
2307
msgid "also apply the patch (use with --stat/--summary/--check)"
2324
2308
msgstr ""
2325
2309
2326
#: builtin/apply.c:4385
2310
#: builtin/apply.c:4386
2327
2311
msgid "attempt three-way merge if a patch does not apply"
2328
2312
msgstr ""
2329
2313
2330
#: builtin/apply.c:4387
2314
#: builtin/apply.c:4388
2331
2315
msgid "build a temporary index based on embedded index information"
2332
2316
msgstr ""
2333
2317
2334
#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:452
2318
#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455
2335
2319
msgid "paths are separated with NUL character"
2336
2320
msgstr ""
2337
2321
2338
#: builtin/apply.c:4392
2322
#: builtin/apply.c:4393
2339
2323
msgid "ensure at least <n> lines of context match"
2340
2324
msgstr ""
2341
2325
2342
#: builtin/apply.c:4393
2326
#: builtin/apply.c:4394
2343
2327
msgid "action"
2344
2328
msgstr ""
2345
2329
2346
#: builtin/apply.c:4394
2330
#: builtin/apply.c:4395
2347
2331
msgid "detect new or modified lines that have whitespace errors"
2348
2332
msgstr ""
2349
2333
2350
#: builtin/apply.c:4397 builtin/apply.c:4400
2334
#: builtin/apply.c:4398 builtin/apply.c:4401
2351
2335
msgid "ignore changes in whitespace when finding context"
2352
2336
msgstr ""
2353
2337
2354
#: builtin/apply.c:4403
2338
#: builtin/apply.c:4404
2355
2339
msgid "apply the patch in reverse"
2356
2340
msgstr ""
2357
2341
2358
#: builtin/apply.c:4405
2342
#: builtin/apply.c:4406
2359
2343
msgid "don't expect at least one line of context"
2360
2344
msgstr ""
2361
2345
2362
#: builtin/apply.c:4407
2346
#: builtin/apply.c:4408
2363
2347
msgid "leave the rejected hunks in corresponding *.rej files"
2364
2348
msgstr ""
2365
2349
2366
#: builtin/apply.c:4409
2350
#: builtin/apply.c:4410
2367
2351
msgid "allow overlapping hunks"
2368
2352
msgstr ""
2369
2353
2370
#: builtin/apply.c:4412
2354
#: builtin/apply.c:4413
2371
2355
msgid "tolerate incorrectly detected missing new-line at the end of file"
2372
2356
msgstr ""
2373
2357
2374
#: builtin/apply.c:4415
2358
#: builtin/apply.c:4416
2375
2359
msgid "do not trust the line counts in the hunk headers"
2376
2360
msgstr ""
2377
2361
2378
#: builtin/apply.c:4417
2362
#: builtin/apply.c:4418
2379
2363
msgid "root"
2380
2364
msgstr ""
2381
2365
2382
#: builtin/apply.c:4418
2366
#: builtin/apply.c:4419
2383
2367
msgid "prepend <root> to all filenames"
2384
2368
msgstr ""
2385
2369
2386
#: builtin/apply.c:4440
2370
#: builtin/apply.c:4441
2387
2371
msgid "--3way outside a repository"
2388
2372
msgstr ""
2389
2373
2390
#: builtin/apply.c:4448
2374
#: builtin/apply.c:4449
2391
2375
msgid "--index outside a repository"
2392
2376
msgstr ""
2393
2377
2394
#: builtin/apply.c:4451
2378
#: builtin/apply.c:4452
2395
2379
msgid "--cached outside a repository"
2396
2380
msgstr ""
2397
2381
2398
#: builtin/apply.c:4467
2382
#: builtin/apply.c:4468
2399
2383
#, c-format
2400
2384
msgid "can't open patch '%s'"
2401
2385
msgstr ""
2402
2386
2403
#: builtin/apply.c:4481
2387
#: builtin/apply.c:4482
2404
2388
#, c-format
2405
2389
msgid "squelched %d whitespace error"
2406
2390
msgid_plural "squelched %d whitespace errors"
2407
2391
msgstr[0] ""
2408
2392
msgstr[1] ""
2409
2393
2410
#: builtin/apply.c:4487 builtin/apply.c:4497
2394
#: builtin/apply.c:4488 builtin/apply.c:4498
2411
2395
#, c-format
2412
2396
msgid "%d line adds whitespace errors."
2413
2397
msgid_plural "%d lines add whitespace errors."
2461
2445
msgid "update BISECT_HEAD instead of checking out the current commit"
2462
2446
msgstr ""
2463
2447
2464
#: builtin/blame.c:27
2448
#: builtin/blame.c:30
2465
2449
msgid "git blame [options] [rev-opts] [rev] [--] file"
2466
2450
msgstr ""
2467
2451
2468
#: builtin/blame.c:32
2452
#: builtin/blame.c:35
2469
2453
msgid "[rev-opts] are documented in git-rev-list(1)"
2470
2454
msgstr ""
2471
2455
2472
#: builtin/blame.c:2249
2456
#: builtin/blame.c:2501
2473
2457
msgid "Show blame entries as we find them, incrementally"
2474
2458
msgstr ""
2475
2459
2476
#: builtin/blame.c:2250
2460
#: builtin/blame.c:2502
2477
2461
msgid "Show blank SHA-1 for boundary commits (Default: off)"
2478
2462
msgstr ""
2479
2463
2480
#: builtin/blame.c:2251
2464
#: builtin/blame.c:2503
2481
2465
msgid "Do not treat root commits as boundaries (Default: off)"
2482
2466
msgstr ""
2483
2467
2484
#: builtin/blame.c:2252
2468
#: builtin/blame.c:2504
2485
2469
msgid "Show work cost statistics"
2486
2470
msgstr ""
2487
2471
2488
#: builtin/blame.c:2253
2472
#: builtin/blame.c:2505
2489
2473
msgid "Show output score for blame entries"
2490
2474
msgstr ""
2491
2475
2492
#: builtin/blame.c:2254
2476
#: builtin/blame.c:2506
2493
2477
msgid "Show original filename (Default: auto)"
2494
2478
msgstr ""
2495
2479
2496
#: builtin/blame.c:2255
2480
#: builtin/blame.c:2507
2497
2481
msgid "Show original linenumber (Default: off)"
2498
2482
msgstr ""
2499
2483
2500
#: builtin/blame.c:2256
2484
#: builtin/blame.c:2508
2501
2485
msgid "Show in a format designed for machine consumption"
2502
2486
msgstr ""
2503
2487
2504
#: builtin/blame.c:2257
2488
#: builtin/blame.c:2509
2505
2489
msgid "Show porcelain format with per-line commit information"
2506
2490
msgstr ""
2507
2491
2508
#: builtin/blame.c:2258
2492
#: builtin/blame.c:2510
2509
2493
msgid "Use the same output mode as git-annotate (Default: off)"
2510
2494
msgstr ""
2511
2495
2512
#: builtin/blame.c:2259
2496
#: builtin/blame.c:2511
2513
2497
msgid "Show raw timestamp (Default: off)"
2514
2498
msgstr ""
2515
2499
2516
#: builtin/blame.c:2260
2500
#: builtin/blame.c:2512
2517
2501
msgid "Show long commit SHA1 (Default: off)"
2518
2502
msgstr ""
2519
2503
2520
#: builtin/blame.c:2261
2504
#: builtin/blame.c:2513
2521
2505
msgid "Suppress author name and timestamp (Default: off)"
2522
2506
msgstr ""
2523
2507
2524
#: builtin/blame.c:2262
2508
#: builtin/blame.c:2514
2525
2509
msgid "Show author email instead of name (Default: off)"
2526
2510
msgstr ""
2527
2511
2528
#: builtin/blame.c:2263
2512
#: builtin/blame.c:2515
2529
2513
msgid "Ignore whitespace differences"
2530
2514
msgstr ""
2531
2515
2532
#: builtin/blame.c:2264
2516
#: builtin/blame.c:2516
2533
2517
msgid "Spend extra cycles to find better match"
2534
2518
msgstr ""
2535
2519
2536
#: builtin/blame.c:2265
2520
#: builtin/blame.c:2517
2537
2521
msgid "Use revisions from <file> instead of calling git-rev-list"
2538
2522
msgstr ""
2539
2523
2540
#: builtin/blame.c:2266
2524
#: builtin/blame.c:2518
2541
2525
msgid "Use <file>'s contents as the final image"
2542
2526
msgstr ""
2543
2527
2544
#: builtin/blame.c:2267 builtin/blame.c:2268
2528
#: builtin/blame.c:2519 builtin/blame.c:2520
2545
2529
msgid "score"
2546
2530
msgstr ""
2547
2531
2548
#: builtin/blame.c:2267
2532
#: builtin/blame.c:2519
2549
2533
msgid "Find line copies within and across files"
2550
2534
msgstr ""
2551
2535
2552
#: builtin/blame.c:2268
2536
#: builtin/blame.c:2520
2553
2537
msgid "Find line movements within and across files"
2554
2538
msgstr ""
2555
2539
2556
#: builtin/blame.c:2269
2540
#: builtin/blame.c:2521
2557
2541
msgid "n,m"
2558
2542
msgstr ""
2559
2543
2560
#: builtin/blame.c:2269
2544
#: builtin/blame.c:2521
2561
2545
msgid "Process only line range n,m, counting from 1"
2562
2546
msgstr ""
2563
2547
2803
2787
msgstr ""
2804
2788
2805
2789
#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844
2806
#: builtin/branch.c:850 builtin/commit.c:1460 builtin/commit.c:1461
2807
#: builtin/commit.c:1462 builtin/commit.c:1463 builtin/tag.c:468
2790
#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574
2791
#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615
2792
#: builtin/tag.c:621
2808
2793
msgid "commit"
2809
2794
msgstr ""
2810
2795
2868
2853
msgid "Failed to resolve HEAD as a valid ref."
2869
2854
msgstr ""
2870
2855
2871
#: builtin/branch.c:872 builtin/clone.c:635
2856
#: builtin/branch.c:872 builtin/clone.c:636
2872
2857
msgid "HEAD not found below refs/heads!"
2873
2858
msgstr ""
2874
2859
2983
2968
msgid "Need a repository to unbundle."
2984
2969
msgstr ""
2985
2970
2986
#: builtin/cat-file.c:328
2971
#: builtin/cat-file.c:331
2987
2972
msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"
2988
2973
msgstr ""
2989
2974
2990
#: builtin/cat-file.c:329
2975
#: builtin/cat-file.c:332
2991
2976
msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"
2992
2977
msgstr ""
2993
2978
2994
#: builtin/cat-file.c:366
2979
#: builtin/cat-file.c:369
2995
2980
msgid "<type> can be one of: blob, tree, commit, tag"
2996
2981
msgstr ""
2997
2982
2998
#: builtin/cat-file.c:367
2983
#: builtin/cat-file.c:370
2999
2984
msgid "show object type"
3000
2985
msgstr ""
3001
2986
3002
#: builtin/cat-file.c:368
2987
#: builtin/cat-file.c:371
3003
2988
msgid "show object size"
3004
2989
msgstr ""
3005
2990
3006
#: builtin/cat-file.c:370
2991
#: builtin/cat-file.c:373
3007
2992
msgid "exit with zero when there's no error"
3008
2993
msgstr ""
3009
2994
3010
#: builtin/cat-file.c:371
2995
#: builtin/cat-file.c:374
3011
2996
msgid "pretty-print object's content"
3012
2997
msgstr ""
3013
2998
3014
#: builtin/cat-file.c:373
2999
#: builtin/cat-file.c:376
3015
3000
msgid "for blob objects, run textconv on object's content"
3016
3001
msgstr ""
3017
3002
3018
#: builtin/cat-file.c:375
3003
#: builtin/cat-file.c:378
3019
3004
msgid "show info and content of objects fed from the standard input"
3020
3005
msgstr ""
3021
3006
3022
#: builtin/cat-file.c:378
3007
#: builtin/cat-file.c:381
3023
3008
msgid "show info about objects fed from the standard input"
3024
3009
msgstr ""
3025
3010
3047
3032
msgid "terminate input and output records by a NUL character"
3048
3033
msgstr ""
3049
3034
3050
#: builtin/check-ignore.c:18 builtin/checkout.c:1090 builtin/gc.c:260
3035
#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285
3051
3036
msgid "suppress progress reporting"
3052
3037
msgstr ""
3053
3038
3104
3089
msgid "git checkout-index [options] [--] [<file>...]"
3105
3090
msgstr ""
3106
3091
3107
#: builtin/checkout-index.c:187
3092
#: builtin/checkout-index.c:188
3108
3093
msgid "check out all files in the index"
3109
3094
msgstr ""
3110
3095
3111
#: builtin/checkout-index.c:188
3096
#: builtin/checkout-index.c:189
3112
3097
msgid "force overwrite of existing files"
3113
3098
msgstr ""
3114
3099
3115
#: builtin/checkout-index.c:190
3100
#: builtin/checkout-index.c:191
3116
3101
msgid "no warning for existing files and files not in index"
3117
3102
msgstr ""
3118
3103
3119
#: builtin/checkout-index.c:192
3104
#: builtin/checkout-index.c:193
3120
3105
msgid "don't checkout new files"
3121
3106
msgstr ""
3122
3107
3123
#: builtin/checkout-index.c:194
3108
#: builtin/checkout-index.c:195
3124
3109
msgid "update stat information in the index file"
3125
3110
msgstr ""
3126
3111
3127
#: builtin/checkout-index.c:200
3112
#: builtin/checkout-index.c:201
3128
3113
msgid "read list of paths from the standard input"
3129
3114
msgstr ""
3130
3115
3131
#: builtin/checkout-index.c:202
3116
#: builtin/checkout-index.c:203
3132
3117
msgid "write the content to temporary files"
3133
3118
msgstr ""
3134
3119
3135
#: builtin/checkout-index.c:203 builtin/column.c:30
3120
#: builtin/checkout-index.c:204 builtin/column.c:30
3136
3121
msgid "string"
3137
3122
msgstr ""
3138
3123
3139
#: builtin/checkout-index.c:204
3124
#: builtin/checkout-index.c:205
3140
3125
msgid "when creating files, prepend <string>"
3141
3126
msgstr ""
3142
3127
3143
#: builtin/checkout-index.c:207
3128
#: builtin/checkout-index.c:208
3144
3129
msgid "copy out the files from named stage"
3145
3130
msgstr ""
3146
3131
3182
3167
msgid "Unable to add merge result for '%s'"
3183
3168
msgstr ""
3184
3169
3185
#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238
3186
#: builtin/checkout.c:241
3170
#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237
3171
#: builtin/checkout.c:240
3187
3172
#, c-format
3188
3173
msgid "'%s' cannot be used with updating paths"
3189
3174
msgstr ""
3190
3175
3191
#: builtin/checkout.c:244 builtin/checkout.c:247
3176
#: builtin/checkout.c:243 builtin/checkout.c:246
3192
3177
#, c-format
3193
3178
msgid "'%s' cannot be used with %s"
3194
3179
msgstr ""
3195
3180
3196
#: builtin/checkout.c:250
3181
#: builtin/checkout.c:249
3197
3182
#, c-format
3198
3183
msgid "Cannot update paths and switch to branch '%s' at the same time."
3199
3184
msgstr ""
3200
3185
3201
#: builtin/checkout.c:261 builtin/checkout.c:451
3186
#: builtin/checkout.c:260 builtin/checkout.c:449
3202
3187
msgid "corrupt index file"
3203
3188
msgstr ""
3204
3189
3205
#: builtin/checkout.c:322 builtin/checkout.c:329
3190
#: builtin/checkout.c:320 builtin/checkout.c:327
3206
3191
#, c-format
3207
3192
msgid "path '%s' is unmerged"
3208
3193
msgstr ""
3209
3194
3210
#: builtin/checkout.c:473
3195
#: builtin/checkout.c:471
3211
3196
msgid "you need to resolve your current index first"
3212
3197
msgstr ""
3213
3198
3214
#: builtin/checkout.c:594
3199
#: builtin/checkout.c:591
3215
3200
#, c-format
3216
3201
msgid "Can not do reflog for '%s'\n"
3217
3202
msgstr ""
3218
3203
3219
#: builtin/checkout.c:632
3204
#: builtin/checkout.c:629
3220
3205
msgid "HEAD is now at"
3221
3206
msgstr ""
3222
3207
3208
#: builtin/checkout.c:636
3209
#, c-format
3210
msgid "Reset branch '%s'\n"
3211
msgstr ""
3212
3223
3213
#: builtin/checkout.c:639
3224
3214
#, c-format
3225
msgid "Reset branch '%s'\n"
3226
msgstr ""
3227
3228
#: builtin/checkout.c:642
3229
#, c-format
3230
3215
msgid "Already on '%s'\n"
3231
3216
msgstr ""
3232
3217
3233
#: builtin/checkout.c:646
3218
#: builtin/checkout.c:643
3234
3219
#, c-format
3235
3220
msgid "Switched to and reset branch '%s'\n"
3236
3221
msgstr ""
3237
3222
3238
#: builtin/checkout.c:648 builtin/checkout.c:1033
3223
#: builtin/checkout.c:645 builtin/checkout.c:1026
3239
3224
#, c-format
3240
3225
msgid "Switched to a new branch '%s'\n"
3241
3226
msgstr ""
3242
3227
3243
#: builtin/checkout.c:650
3228
#: builtin/checkout.c:647
3244
3229
#, c-format
3245
3230
msgid "Switched to branch '%s'\n"
3246
3231
msgstr ""
3247
3232
3248
#: builtin/checkout.c:706
3233
#: builtin/checkout.c:699
3249
3234
#, c-format
3250
3235
msgid " ... and %d more.\n"
3251
3236
msgstr ""
3252
3237
3253
#. The singular version
3254
#: builtin/checkout.c:712
3238
#: builtin/checkout.c:705
3255
3239
#, c-format
3256
3240
msgid ""
3257
3241
"Warning: you are leaving %d commit behind, not connected to\n"
3266
3250
msgstr[0] ""
3267
3251
msgstr[1] ""
3268
3252
3269
#: builtin/checkout.c:730
3253
#: builtin/checkout.c:723
3270
3254
#, c-format
3271
3255
msgid ""
3272
3256
"If you want to keep them by creating a new branch, this may be a good time\n"
3276
3260
"\n"
3277
3261
msgstr ""
3278
3262
3279
#: builtin/checkout.c:760
3263
#: builtin/checkout.c:753
3280
3264
msgid "internal error in revision walk"
3281
3265
msgstr ""
3282
3266
3283
#: builtin/checkout.c:764
3267
#: builtin/checkout.c:757
3284
3268
msgid "Previous HEAD position was"
3285
3269
msgstr ""
3286
3270
3287
#: builtin/checkout.c:791 builtin/checkout.c:1028
3271
#: builtin/checkout.c:784 builtin/checkout.c:1021
3288
3272
msgid "You are on a branch yet to be born"
3289
3273
msgstr ""
3290
3274
3291
#: builtin/checkout.c:935
3275
#: builtin/checkout.c:928
3292
3276
#, c-format
3293
3277
msgid "only one reference expected, %d given."
3294
3278
msgstr ""
3295
3279
3296
#: builtin/checkout.c:974
3280
#: builtin/checkout.c:967
3297
3281
#, c-format
3298
3282
msgid "invalid reference: %s"
3299
3283
msgstr ""
3300
3284
3301
#. case (1): want a tree
3302
#: builtin/checkout.c:1003
3285
#: builtin/checkout.c:996
3303
3286
#, c-format
3304
3287
msgid "reference is not a tree: %s"
3305
3288
msgstr ""
3306
3289
3307
#: builtin/checkout.c:1042
3290
#: builtin/checkout.c:1035
3308
3291
msgid "paths cannot be used with switching branches"
3309
3292
msgstr ""
3310
3293
3311
#: builtin/checkout.c:1045 builtin/checkout.c:1049
3294
#: builtin/checkout.c:1038 builtin/checkout.c:1042
3312
3295
#, c-format
3313
3296
msgid "'%s' cannot be used with switching branches"
3314
3297
msgstr ""
3315
3298
3316
#: builtin/checkout.c:1053 builtin/checkout.c:1056 builtin/checkout.c:1061
3317
#: builtin/checkout.c:1064
3299
#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054
3300
#: builtin/checkout.c:1057
3318
3301
#, c-format
3319
3302
msgid "'%s' cannot be used with '%s'"
3320
3303
msgstr ""
3321
3304
3322
#: builtin/checkout.c:1069
3305
#: builtin/checkout.c:1062
3323
3306
#, c-format
3324
3307
msgid "Cannot switch branch to a non-commit '%s'"
3325
3308
msgstr ""
3326
3309
3327
#: builtin/checkout.c:1091 builtin/checkout.c:1093 builtin/clone.c:88
3310
#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88
3328
3311
#: builtin/remote.c:159 builtin/remote.c:161
3329
3312
msgid "branch"
3330
3313
msgstr ""
3331
3314
3332
#: builtin/checkout.c:1092
3315
#: builtin/checkout.c:1085
3333
3316
msgid "create and checkout a new branch"
3334
3317
msgstr ""
3335
3318
3336
#: builtin/checkout.c:1094
3319
#: builtin/checkout.c:1087
3337
3320
msgid "create/reset and checkout a branch"
3338
3321
msgstr ""
3339
3322
3340
#: builtin/checkout.c:1095
3323
#: builtin/checkout.c:1088
3341
3324
msgid "create reflog for new branch"
3342
3325
msgstr ""
3343
3326
3344
#: builtin/checkout.c:1096
3327
#: builtin/checkout.c:1089
3345
3328
msgid "detach the HEAD at named commit"
3346
3329
msgstr ""
3347
3330
3348
#: builtin/checkout.c:1097
3331
#: builtin/checkout.c:1090
3349
3332
msgid "set upstream info for new branch"
3350
3333
msgstr ""
3351
3334
3352
#: builtin/checkout.c:1098
3335
#: builtin/checkout.c:1092
3353
3336
msgid "new-branch"
3354
3337
msgstr ""
3355
3338
3356
#: builtin/checkout.c:1099
3339
#: builtin/checkout.c:1092
3357
3340
msgid "new unparented branch"
3358
3341
msgstr ""
3359
3342
3360
#: builtin/checkout.c:1100
3343
#: builtin/checkout.c:1093
3361
3344
msgid "checkout our version for unmerged files"
3362
3345
msgstr ""
3363
3346
3364
#: builtin/checkout.c:1102
3347
#: builtin/checkout.c:1095
3365
3348
msgid "checkout their version for unmerged files"
3366
3349
msgstr ""
3367
3350
3368
#: builtin/checkout.c:1104
3351
#: builtin/checkout.c:1097
3369
3352
msgid "force checkout (throw away local modifications)"
3370
3353
msgstr ""
3371
3354
3372
#: builtin/checkout.c:1105
3355
#: builtin/checkout.c:1098
3373
3356
msgid "perform a 3-way merge with the new branch"
3374
3357
msgstr ""
3375
3358
3376
#: builtin/checkout.c:1106 builtin/merge.c:225
3359
#: builtin/checkout.c:1099 builtin/merge.c:225
3377
3360
msgid "update ignored files (default)"
3378
3361
msgstr ""
3379
3362
3380
#: builtin/checkout.c:1107 builtin/log.c:1228 parse-options.h:248
3363
#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245
3381
3364
msgid "style"
3382
3365
msgstr ""
3383
3366
3384
#: builtin/checkout.c:1108
3367
#: builtin/checkout.c:1101
3385
3368
msgid "conflict style (merge or diff3)"
3386
3369
msgstr ""
3387
3370
3388
#: builtin/checkout.c:1111
3371
#: builtin/checkout.c:1104
3389
3372
msgid "do not limit pathspecs to sparse entries only"
3390
3373
msgstr ""
3391
3374
3392
#: builtin/checkout.c:1113
3375
#: builtin/checkout.c:1106
3393
3376
msgid "second guess 'git checkout no-such-branch'"
3394
3377
msgstr ""
3395
3378
3396
#: builtin/checkout.c:1136
3379
#: builtin/checkout.c:1129
3397
3380
msgid "-b, -B and --orphan are mutually exclusive"
3398
3381
msgstr ""
3399
3382
3383
#: builtin/checkout.c:1146
3384
msgid "--track needs a branch name"
3385
msgstr ""
3386
3400
3387
#: builtin/checkout.c:1153
3401
msgid "--track needs a branch name"
3402
msgstr ""
3403
3404
#: builtin/checkout.c:1160
3405
3388
msgid "Missing branch name; try -b"
3406
3389
msgstr ""
3407
3390
3391
#: builtin/checkout.c:1190
3392
msgid "invalid path specification"
3393
msgstr ""
3394
3408
3395
#: builtin/checkout.c:1197
3409
msgid "invalid path specification"
3410
msgstr ""
3411
3412
#: builtin/checkout.c:1204
3413
3396
#, c-format
3414
3397
msgid ""
3415
3398
"Cannot update paths and switch to branch '%s' at the same time.\n"
3416
3399
"Did you intend to checkout '%s' which can not be resolved as commit?"
3417
3400
msgstr ""
3418
3401
3419
#: builtin/checkout.c:1209
3402
#: builtin/checkout.c:1202
3420
3403
#, c-format
3421
3404
msgid "git checkout: --detach does not take a path argument '%s'"
3422
3405
msgstr ""
3423
3406
3424
#: builtin/checkout.c:1213
3407
#: builtin/checkout.c:1206
3425
3408
msgid ""
3426
3409
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
3427
3410
"checking out of the index."
3457
3440
msgid "failed to remove %s"
3458
3441
msgstr ""
3459
3442
3460
#: builtin/clean.c:294
3443
#: builtin/clean.c:295
3461
3444
msgid ""
3462
3445
"Prompt help:\n"
3463
3446
"1 - select a numbered item\n"
3465
3448
" - (empty) select nothing"
3466
3449
msgstr ""
3467
3450
3468
#: builtin/clean.c:298
3451
#: builtin/clean.c:299
3469
3452
msgid ""
3470
3453
"Prompt help:\n"
3471
3454
"1 - select a single item\n"
3477
3460
" - (empty) finish selecting"
3478
3461
msgstr ""
3479
3462
3480
#: builtin/clean.c:516
3463
#: builtin/clean.c:517
3481
3464
#, c-format
3482
3465
msgid "Huh (%s)?"
3483
3466
msgstr ""
3550
3533
msgid "remove whole directories"
3551
3534
msgstr ""
3552
3535
3553
#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:718
3554
#: builtin/ls-files.c:483 builtin/name-rev.c:314 builtin/show-ref.c:185
3536
#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714
3537
#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185
3555
3538
msgid "pattern"
3556
3539
msgstr ""
3557
3540
3571
3554
msgid "-x and -X cannot be used together"
3572
3555
msgstr ""
3573
3556
3574
#: builtin/clean.c:907
3557
#: builtin/clean.c:906
3575
3558
msgid ""
3576
3559
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
3577
3560
"clean"
3578
3561
msgstr ""
3579
3562
3580
#: builtin/clean.c:910
3563
#: builtin/clean.c:909
3581
3564
msgid ""
3582
3565
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
3583
3566
"refusing to clean"
3587
3570
msgid "git clone [options] [--] <repo> [<dir>]"
3588
3571
msgstr ""
3589
3572
3590
#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222
3591
#: builtin/push.c:521
3573
#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222
3574
#: builtin/push.c:503
3592
3575
msgid "force progress reporting"
3593
3576
msgstr ""
3594
3577
3596
3579
msgid "don't create a checkout"
3597
3580
msgstr ""
3598
3581
3599
#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488
3582
#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486
3600
3583
msgid "create a bare repository"
3601
3584
msgstr ""
3602
3585
3620
3603
msgid "initialize submodules in the clone"
3621
3604
msgstr ""
3622
3605
3623
#: builtin/clone.c:82 builtin/init-db.c:485
3606
#: builtin/clone.c:82 builtin/init-db.c:483
3624
3607
msgid "template-directory"
3625
3608
msgstr ""
3626
3609
3627
#: builtin/clone.c:83 builtin/init-db.c:486
3610
#: builtin/clone.c:83 builtin/init-db.c:484
3628
3611
msgid "directory from which templates will be used"
3629
3612
msgstr ""
3630
3613
3648
3631
msgid "path to git-upload-pack on the remote"
3649
3632
msgstr ""
3650
3633
3651
#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:663
3634
#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659
3652
3635
msgid "depth"
3653
3636
msgstr ""
3654
3637
3660
3643
msgid "clone only one branch, HEAD or --branch"
3661
3644
msgstr ""
3662
3645
3663
#: builtin/clone.c:96 builtin/init-db.c:494
3646
#: builtin/clone.c:96 builtin/init-db.c:492
3664
3647
msgid "gitdir"
3665
3648
msgstr ""
3666
3649
3667
#: builtin/clone.c:97 builtin/init-db.c:495
3650
#: builtin/clone.c:97 builtin/init-db.c:493
3668
3651
msgid "separate git dir from working tree"
3669
3652
msgstr ""
3670
3653
3747
3730
msgid "remote did not send all necessary objects"
3748
3731
msgstr ""
3749
3732
3750
#: builtin/clone.c:626
3733
#: builtin/clone.c:627
3751
3734
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
3752
3735
msgstr ""
3753
3736
3754
#: builtin/clone.c:657
3737
#: builtin/clone.c:658
3755
3738
msgid "unable to checkout working tree"
3756
3739
msgstr ""
3757
3740
3758
#: builtin/clone.c:765
3741
#: builtin/clone.c:768
3759
3742
msgid "Too many arguments."
3760
3743
msgstr ""
3761
3744
3762
#: builtin/clone.c:769
3745
#: builtin/clone.c:772
3763
3746
msgid "You must specify a repository to clone."
3764
3747
msgstr ""
3765
3748
3766
#: builtin/clone.c:780
3749
#: builtin/clone.c:783
3767
3750
#, c-format
3768
3751
msgid "--bare and --origin %s options are incompatible."
3769
3752
msgstr ""
3770
3753
3771
#: builtin/clone.c:783
3754
#: builtin/clone.c:786
3772
3755
msgid "--bare and --separate-git-dir are incompatible."
3773
3756
msgstr ""
3774
3757
3775
#: builtin/clone.c:796
3758
#: builtin/clone.c:799
3776
3759
#, c-format
3777
3760
msgid "repository '%s' does not exist"
3778
3761
msgstr "リポジトリ '%s' は存在しません"
3779
3762
3780
#: builtin/clone.c:814 builtin/fetch.c:1119
3763
#: builtin/clone.c:805 builtin/fetch.c:1143
3781
3764
#, c-format
3782
3765
msgid "depth %s is not a positive number"
3783
3766
msgstr ""
3784
3767
3785
#: builtin/clone.c:824
3768
#: builtin/clone.c:815
3786
3769
#, c-format
3787
3770
msgid "destination path '%s' already exists and is not an empty directory."
3788
3771
msgstr ""
3789
3772
3790
#: builtin/clone.c:834
3773
#: builtin/clone.c:825
3791
3774
#, c-format
3792
3775
msgid "working tree '%s' already exists."
3793
3776
msgstr ""
3794
3777
3795
#: builtin/clone.c:847 builtin/clone.c:859
3778
#: builtin/clone.c:838 builtin/clone.c:850
3796
3779
#, c-format
3797
3780
msgid "could not create leading directories of '%s'"
3798
3781
msgstr ""
3799
3782
3800
#: builtin/clone.c:850
3783
#: builtin/clone.c:841
3801
3784
#, c-format
3802
3785
msgid "could not create work tree dir '%s'."
3803
3786
msgstr ""
3804
3787
3805
#: builtin/clone.c:869
3788
#: builtin/clone.c:860
3806
3789
#, c-format
3807
3790
msgid "Cloning into bare repository '%s'...\n"
3808
3791
msgstr ""
3809
3792
3810
#: builtin/clone.c:871
3793
#: builtin/clone.c:862
3811
3794
#, c-format
3812
3795
msgid "Cloning into '%s'...\n"
3813
3796
msgstr ""
3814
3797
3815
#: builtin/clone.c:802
3798
#: builtin/clone.c:898
3816
3799
msgid "--depth is ignored in local clones; use file:// instead."
3817
3800
msgstr ""
3818
3801
3819
#: builtin/clone.c:805
3802
#: builtin/clone.c:901
3820
3803
msgid "source repository is shallow, ignoring --local"
3821
3804
msgstr ""
3822
3805
3823
#: builtin/clone.c:810
3806
#: builtin/clone.c:906
3824
3807
msgid "--local is ignored"
3825
3808
msgstr ""
3826
3809
3827
#: builtin/clone.c:906
3810
#: builtin/clone.c:910
3828
3811
#, c-format
3829
3812
msgid "Don't know how to clone %s"
3830
3813
msgstr ""
3831
3814
3832
#: builtin/clone.c:957 builtin/clone.c:965
3815
#: builtin/clone.c:961 builtin/clone.c:969
3833
3816
#, c-format
3834
3817
msgid "Remote branch %s not found in upstream %s"
3835
3818
msgstr ""
3836
3819
3837
#: builtin/clone.c:968
3820
#: builtin/clone.c:972
3838
3821
msgid "You appear to have cloned an empty repository."
3839
3822
msgstr ""
3840
3823
3922
3905
"the remaining commits.\n"
3923
3906
msgstr ""
3924
3907
3925
#: builtin/commit.c:287
3908
#: builtin/commit.c:288
3926
3909
msgid "failed to unpack HEAD tree object"
3927
3910
msgstr ""
3928
3911
3929
#: builtin/commit.c:329
3912
#: builtin/commit.c:328
3930
3913
msgid "unable to create temporary index"
3931
3914
msgstr ""
3932
3915
3933
#: builtin/commit.c:335
3916
#: builtin/commit.c:334
3934
3917
msgid "interactive add failed"
3935
3918
msgstr ""
3936
3919
3937
#: builtin/commit.c:368 builtin/commit.c:389 builtin/commit.c:439
3920
#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435
3938
3921
msgid "unable to write new_index file"
3939
3922
msgstr ""
3940
3923
3924
#: builtin/commit.c:418
3925
msgid "cannot do a partial commit during a merge."
3926
msgstr ""
3927
3941
3928
#: builtin/commit.c:420
3942
msgid "cannot do a partial commit during a merge."
3943
msgstr ""
3944
3945
#: builtin/commit.c:422
3946
3929
msgid "cannot do a partial commit during a cherry-pick."
3947
3930
msgstr ""
3948
3931
3949
#: builtin/commit.c:432
3932
#: builtin/commit.c:429
3950
3933
msgid "cannot read the index"
3951
3934
msgstr ""
3952
3935
3953
#: builtin/commit.c:452
3936
#: builtin/commit.c:447
3954
3937
msgid "unable to write temporary index file"
3955
3938
msgstr ""
3956
3939
3957
#: builtin/commit.c:543 builtin/commit.c:549
3940
#: builtin/commit.c:557 builtin/commit.c:563
3958
3941
#, c-format
3959
3942
msgid "invalid commit: %s"
3960
3943
msgstr "無効なコミット: %s"
3961
3944
3962
#: builtin/commit.c:571
3945
#: builtin/commit.c:585
3963
3946
msgid "malformed --author parameter"
3964
3947
msgstr ""
3965
3948
3968
3951
msgid "invalid date format: %s"
3969
3952
msgstr ""
3970
3953
3971
#: builtin/commit.c:591
3954
#: builtin/commit.c:609
3972
3955
#, c-format
3973
3956
msgid "Malformed ident string: '%s'"
3974
3957
msgstr ""
3979
3962
"in the current commit message"
3980
3963
msgstr ""
3981
3964
3982
#: builtin/commit.c:630 builtin/commit.c:663 builtin/commit.c:1007
3965
#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086
3983
3966
#, c-format
3984
3967
msgid "could not lookup commit %s"
3985
3968
msgstr ""
3986
3969
3987
#: builtin/commit.c:642 builtin/shortlog.c:273
3970
#: builtin/commit.c:691 builtin/shortlog.c:273
3988
3971
#, c-format
3989
3972
msgid "(reading log message from standard input)\n"
3990
3973
msgstr ""
3991
3974
3992
#: builtin/commit.c:644
3975
#: builtin/commit.c:693
3993
3976
msgid "could not read log from standard input"
3994
3977
msgstr ""
3995
3978
3996
#: builtin/commit.c:648
3979
#: builtin/commit.c:697
3997
3980
#, c-format
3998
3981
msgid "could not read log file '%s'"
3999
3982
msgstr ""
4000
3983
4001
#: builtin/commit.c:670
3984
#: builtin/commit.c:719
4002
3985
msgid "could not read MERGE_MSG"
4003
3986
msgstr ""
4004
3987
4005
#: builtin/commit.c:674
3988
#: builtin/commit.c:723
4006
3989
msgid "could not read SQUASH_MSG"
4007
3990
msgstr ""
4008
3991
4009
#: builtin/commit.c:678
3992
#: builtin/commit.c:727
4010
3993
#, c-format
4011
3994
msgid "could not read '%s'"
4012
3995
msgstr "'%s'を読み込めません"
4013
3996
4014
#: builtin/commit.c:749
3997
#: builtin/commit.c:798
4015
3998
msgid "could not write commit template"
4016
3999
msgstr ""
4017
4000
4018
#: builtin/commit.c:760
4001
#: builtin/commit.c:816
4019
4002
#, c-format
4020
4003
msgid ""
4021
4004
"\n"
4025
4008
"and try again.\n"
4026
4009
msgstr ""
4027
4010
4028
#: builtin/commit.c:765
4011
#: builtin/commit.c:821
4029
4012
#, c-format
4030
4013
msgid ""
4031
4014
"\n"
4035
4018
"and try again.\n"
4036
4019
msgstr ""
4037
4020
4038
#: builtin/commit.c:777
4021
#: builtin/commit.c:834
4039
4022
#, c-format
4040
4023
msgid ""
4041
4024
"Please enter the commit message for your changes. Lines starting\n"
4042
4025
"with '%c' will be ignored, and an empty message aborts the commit.\n"
4043
4026
msgstr ""
4044
4027
4045
#: builtin/commit.c:782
4028
#: builtin/commit.c:841
4046
4029
#, c-format
4047
4030
msgid ""
4048
4031
"Please enter the commit message for your changes. Lines starting\n"
4065
4048
msgid "%sCommitter: %.*s <%.*s>"
4066
4049
msgstr ""
4067
4050
4068
#: builtin/commit.c:822
4051
#: builtin/commit.c:888
4069
4052
msgid "Cannot read index"
4070
4053
msgstr ""
4071
4054
4072
#: builtin/commit.c:865
4055
#: builtin/commit.c:945
4073
4056
msgid "Error building trees"
4074
4057
msgstr ""
4075
4058
4076
#: builtin/commit.c:880 builtin/tag.c:359
4059
#: builtin/commit.c:960 builtin/tag.c:495
4077
4060
#, c-format
4078
4061
msgid "Please supply the message using either -m or -F option.\n"
4079
4062
msgstr ""
4080
4063
4081
#: builtin/commit.c:982
4064
#: builtin/commit.c:1061
4082
4065
#, c-format
4083
4066
msgid "No existing author found with '%s'"
4084
4067
msgstr ""
4085
4068
4086
#: builtin/commit.c:997 builtin/commit.c:1237
4069
#: builtin/commit.c:1076 builtin/commit.c:1316
4087
4070
#, c-format
4088
4071
msgid "Invalid untracked files mode '%s'"
4089
4072
msgstr ""
4090
4073
4091
#: builtin/commit.c:1034
4074
#: builtin/commit.c:1113
4092
4075
msgid "--long and -z are incompatible"
4093
4076
msgstr ""
4094
4077
4095
#: builtin/commit.c:1064
4078
#: builtin/commit.c:1143
4096
4079
msgid "Using both --reset-author and --author does not make sense"
4097
4080
msgstr ""
4098
4081
4099
#: builtin/commit.c:1075
4082
#: builtin/commit.c:1152
4100
4083
msgid "You have nothing to amend."
4101
4084
msgstr ""
4102
4085
4103
#: builtin/commit.c:1078
4086
#: builtin/commit.c:1155
4104
4087
msgid "You are in the middle of a merge -- cannot amend."
4105
4088
msgstr ""
4106
4089
4107
#: builtin/commit.c:1080
4090
#: builtin/commit.c:1157
4108
4091
msgid "You are in the middle of a cherry-pick -- cannot amend."
4109
4092
msgstr ""
4110
4093
4111
#: builtin/commit.c:1083
4094
#: builtin/commit.c:1160
4112
4095
msgid "Options --squash and --fixup cannot be used together"
4113
4096
msgstr ""
4114
4097
4115
#: builtin/commit.c:1093
4098
#: builtin/commit.c:1170
4116
4099
msgid "Only one of -c/-C/-F/--fixup can be used."
4117
4100
msgstr ""
4118
4101
4119
#: builtin/commit.c:1095
4102
#: builtin/commit.c:1172
4120
4103
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4121
4104
msgstr ""
4122
4105
4123
#: builtin/commit.c:1103
4106
#: builtin/commit.c:1180
4124
4107
msgid "--reset-author can be used only with -C, -c or --amend."
4125
4108
msgstr ""
4126
4109
4127
#: builtin/commit.c:1120
4110
#: builtin/commit.c:1197
4128
4111
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4129
4112
msgstr ""
4130
4113
4131
#: builtin/commit.c:1122
4114
#: builtin/commit.c:1199
4132
4115
msgid "No paths with --include/--only does not make sense."
4133
4116
msgstr ""
4134
4117
4135
#: builtin/commit.c:1124
4118
#: builtin/commit.c:1201
4136
4119
msgid "Clever... amending the last one with dirty index."
4137
4120
msgstr ""
4138
4121
4139
#: builtin/commit.c:1131
4122
#: builtin/commit.c:1203
4140
4123
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4141
4124
msgstr ""
4142
4125
4143
#: builtin/commit.c:1136 builtin/tag.c:572
4126
#: builtin/commit.c:1215 builtin/tag.c:727
4144
4127
#, c-format
4145
4128
msgid "Invalid cleanup mode %s"
4146
4129
msgstr ""
4147
4130
4148
#: builtin/commit.c:1141
4131
#: builtin/commit.c:1220
4149
4132
msgid "Paths with -a does not make sense."
4150
4133
msgstr ""
4151
4134
4152
#: builtin/commit.c:1251 builtin/commit.c:1482
4135
#: builtin/commit.c:1330 builtin/commit.c:1595
4153
4136
msgid "show status concisely"
4154
4137
msgstr ""
4155
4138
4156
#: builtin/commit.c:1253 builtin/commit.c:1484
4139
#: builtin/commit.c:1332 builtin/commit.c:1597
4157
4140
msgid "show branch information"
4158
4141
msgstr ""
4159
4142
4160
#: builtin/commit.c:1255 builtin/commit.c:1486 builtin/push.c:507
4143
#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489
4161
4144
msgid "machine-readable output"
4162
4145
msgstr ""
4163
4146
4164
#: builtin/commit.c:1258 builtin/commit.c:1488
4147
#: builtin/commit.c:1337 builtin/commit.c:1601
4165
4148
msgid "show status in long format (default)"
4166
4149
msgstr ""
4167
4150
4168
#: builtin/commit.c:1261 builtin/commit.c:1491
4151
#: builtin/commit.c:1340 builtin/commit.c:1604
4169
4152
msgid "terminate entries with NUL"
4170
4153
msgstr ""
4171
4154
4172
#: builtin/commit.c:1263 builtin/commit.c:1494 builtin/fast-export.c:674
4173
#: builtin/fast-export.c:677 builtin/tag.c:459
4155
#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703
4156
#: builtin/fast-export.c:706 builtin/tag.c:602
4174
4157
msgid "mode"
4175
4158
msgstr ""
4176
4159
4177
#: builtin/commit.c:1264 builtin/commit.c:1494
4160
#: builtin/commit.c:1343 builtin/commit.c:1607
4178
4161
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4179
4162
msgstr ""
4180
4163
4181
#: builtin/commit.c:1267
4164
#: builtin/commit.c:1346
4182
4165
msgid "show ignored files"
4183
4166
msgstr ""
4184
4167
4185
#: builtin/commit.c:1268 parse-options.h:156
4168
#: builtin/commit.c:1347 parse-options.h:153
4186
4169
msgid "when"
4187
4170
msgstr ""
4188
4171
4189
#: builtin/commit.c:1269
4172
#: builtin/commit.c:1348
4190
4173
msgid ""
4191
4174
"ignore changes to submodules, optional when: all, dirty, untracked. "
4192
4175
"(Default: all)"
4193
4176
msgstr ""
4194
4177
4195
#: builtin/commit.c:1271
4178
#: builtin/commit.c:1350
4196
4179
msgid "list untracked files in columns"
4197
4180
msgstr ""
4198
4181
4199
#: builtin/commit.c:1340
4182
#: builtin/commit.c:1419
4200
4183
msgid "couldn't look up newly created commit"
4201
4184
msgstr ""
4202
4185
4203
#: builtin/commit.c:1342
4186
#: builtin/commit.c:1421
4204
4187
msgid "could not parse newly created commit"
4205
4188
msgstr ""
4206
4189
4207
#: builtin/commit.c:1383
4190
#: builtin/commit.c:1469
4208
4191
msgid "detached HEAD"
4209
4192
msgstr ""
4210
4193
4211
#: builtin/commit.c:1385
4194
#: builtin/commit.c:1471
4212
4195
msgid " (root-commit)"
4213
4196
msgstr ""
4214
4197
4215
#: builtin/commit.c:1452
4198
#: builtin/commit.c:1565
4216
4199
msgid "suppress summary after successful commit"
4217
4200
msgstr ""
4218
4201
4219
#: builtin/commit.c:1453
4202
#: builtin/commit.c:1566
4220
4203
msgid "show diff in commit message template"
4221
4204
msgstr ""
4222
4205
4223
#: builtin/commit.c:1455
4206
#: builtin/commit.c:1568
4224
4207
msgid "Commit message options"
4225
4208
msgstr ""
4226
4209
4227
#: builtin/commit.c:1456 builtin/tag.c:457
4210
#: builtin/commit.c:1569 builtin/tag.c:600
4228
4211
msgid "read message from file"
4229
4212
msgstr ""
4230
4213
4231
#: builtin/commit.c:1457
4214
#: builtin/commit.c:1570
4232
4215
msgid "author"
4233
4216
msgstr ""
4234
4217
4235
#: builtin/commit.c:1457
4218
#: builtin/commit.c:1570
4236
4219
msgid "override author for commit"
4237
4220
msgstr ""
4238
4221
4239
#: builtin/commit.c:1458 builtin/gc.c:261
4222
#: builtin/commit.c:1571 builtin/gc.c:286
4240
4223
msgid "date"
4241
4224
msgstr ""
4242
4225
4243
#: builtin/commit.c:1458
4226
#: builtin/commit.c:1571
4244
4227
msgid "override date for commit"
4245
4228
msgstr ""
4246
4229
4247
#: builtin/commit.c:1459 builtin/merge.c:216 builtin/notes.c:405
4248
#: builtin/notes.c:562 builtin/tag.c:455
4230
#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409
4231
#: builtin/notes.c:566 builtin/tag.c:598
4249
4232
msgid "message"
4250
4233
msgstr ""
4251
4234
4252
#: builtin/commit.c:1459
4235
#: builtin/commit.c:1572
4253
4236
msgid "commit message"
4254
4237
msgstr ""
4255
4238
4256
#: builtin/commit.c:1460
4239
#: builtin/commit.c:1573
4257
4240
msgid "reuse and edit message from specified commit"
4258
4241
msgstr ""
4259
4242
4260
#: builtin/commit.c:1461
4243
#: builtin/commit.c:1574
4261
4244
msgid "reuse message from specified commit"
4262
4245
msgstr ""
4263
4246
4264
#: builtin/commit.c:1462
4247
#: builtin/commit.c:1575
4265
4248
msgid "use autosquash formatted message to fixup specified commit"
4266
4249
msgstr ""
4267
4250
4268
#: builtin/commit.c:1463
4251
#: builtin/commit.c:1576
4269
4252
msgid "use autosquash formatted message to squash specified commit"
4270
4253
msgstr ""
4271
4254
4272
#: builtin/commit.c:1464
4255
#: builtin/commit.c:1577
4273
4256
msgid "the commit is authored by me now (used with -C/-c/--amend)"
4274
4257
msgstr ""
4275
4258
4276
#: builtin/commit.c:1465 builtin/log.c:1180 builtin/revert.c:86
4259
#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86
4277
4260
msgid "add Signed-off-by:"
4278
4261
msgstr ""
4279
4262
4280
#: builtin/commit.c:1466
4263
#: builtin/commit.c:1579
4281
4264
msgid "use specified template file"
4282
4265
msgstr ""
4283
4266
4284
#: builtin/commit.c:1467
4267
#: builtin/commit.c:1580
4285
4268
msgid "force edit of commit"
4286
4269
msgstr ""
4287
4270
4288
#: builtin/commit.c:1468
4271
#: builtin/commit.c:1581
4289
4272
msgid "default"
4290
4273
msgstr ""
4291
4274
4292
#: builtin/commit.c:1468 builtin/tag.c:460
4275
#: builtin/commit.c:1581 builtin/tag.c:603
4293
4276
msgid "how to strip spaces and #comments from message"
4294
4277
msgstr ""
4295
4278
4296
#: builtin/commit.c:1469
4279
#: builtin/commit.c:1582
4297
4280
msgid "include status in commit message template"
4298
4281
msgstr ""
4299
4282
4300
#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92
4301
#: builtin/tag.c:516
4283
#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92
4284
#: builtin/tag.c:604
4302
4285
msgid "key-id"
4303
4286
msgstr ""
4304
4287
4305
#: builtin/commit.c:1471 builtin/merge.c:224
4288
#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93
4306
4289
msgid "GPG sign commit"
4307
4290
msgstr ""
4308
4291
4309
#. end commit message options
4310
#: builtin/commit.c:1474
4292
#: builtin/commit.c:1587
4311
4293
msgid "Commit contents options"
4312
4294
msgstr ""
4313
4295
4314
#: builtin/commit.c:1475
4296
#: builtin/commit.c:1588
4315
4297
msgid "commit all changed files"
4316
4298
msgstr ""
4317
4299
4318
#: builtin/commit.c:1476
4300
#: builtin/commit.c:1589
4319
4301
msgid "add specified files to index for commit"
4320
4302
msgstr ""
4321
4303
4322
#: builtin/commit.c:1477
4304
#: builtin/commit.c:1590
4323
4305
msgid "interactively add files"
4324
4306
msgstr ""
4325
4307
4326
#: builtin/commit.c:1478
4308
#: builtin/commit.c:1591
4327
4309
msgid "interactively add changes"
4328
4310
msgstr ""
4329
4311
4330
#: builtin/commit.c:1479
4312
#: builtin/commit.c:1592
4331
4313
msgid "commit only specified files"
4332
4314
msgstr ""
4333
4315
4334
#: builtin/commit.c:1480
4316
#: builtin/commit.c:1593
4335
4317
msgid "bypass pre-commit hook"
4336
4318
msgstr ""
4337
4319
4338
#: builtin/commit.c:1481
4320
#: builtin/commit.c:1594
4339
4321
msgid "show what would be committed"
4340
4322
msgstr ""
4341
4323
4342
#: builtin/commit.c:1492
4324
#: builtin/commit.c:1605
4343
4325
msgid "amend previous commit"
4344
4326
msgstr ""
4345
4327
4346
#: builtin/commit.c:1493
4328
#: builtin/commit.c:1606
4347
4329
msgid "bypass post-rewrite hook"
4348
4330
msgstr ""
4349
4331
4350
#: builtin/commit.c:1498
4332
#: builtin/commit.c:1611
4351
4333
msgid "ok to record an empty change"
4352
4334
msgstr ""
4353
4335
4354
#: builtin/commit.c:1500
4336
#: builtin/commit.c:1613
4355
4337
msgid "ok to record a change with an empty message"
4356
4338
msgstr ""
4357
4339
4358
#: builtin/commit.c:1529
4340
#: builtin/commit.c:1641
4359
4341
msgid "could not parse HEAD commit"
4360
4342
msgstr ""
4361
4343
4362
#: builtin/commit.c:1567 builtin/merge.c:518
4344
#: builtin/commit.c:1680 builtin/merge.c:518
4363
4345
#, c-format
4364
4346
msgid "could not open '%s' for reading"
4365
4347
msgstr ""
4366
4348
4367
#: builtin/commit.c:1574
4349
#: builtin/commit.c:1687
4368
4350
#, c-format
4369
4351
msgid "Corrupt MERGE_HEAD file (%s)"
4370
4352
msgstr ""
4371
4353
4372
#: builtin/commit.c:1581
4354
#: builtin/commit.c:1694
4373
4355
msgid "could not read MERGE_MODE"
4374
4356
msgstr ""
4375
4357
4376
#: builtin/commit.c:1600
4358
#: builtin/commit.c:1713
4377
4359
#, c-format
4378
4360
msgid "could not read commit message: %s"
4379
4361
msgstr ""
4380
4362
4381
#: builtin/commit.c:1611
4363
#: builtin/commit.c:1724
4382
4364
#, c-format
4383
4365
msgid "Aborting commit; you did not edit the message.\n"
4384
4366
msgstr ""
4385
4367
4386
#: builtin/commit.c:1616
4368
#: builtin/commit.c:1729
4387
4369
#, c-format
4388
4370
msgid "Aborting commit due to empty commit message.\n"
4389
4371
msgstr ""
4390
4372
4391
#: builtin/commit.c:1631 builtin/merge.c:854 builtin/merge.c:879
4373
#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876
4392
4374
msgid "failed to write commit object"
4393
4375
msgstr ""
4394
4376
4395
#: builtin/commit.c:1652
4377
#: builtin/commit.c:1756
4396
4378
msgid "cannot lock HEAD ref"
4397
4379
msgstr ""
4398
4380
4399
#: builtin/commit.c:1656
4381
#: builtin/commit.c:1769
4400
4382
msgid "cannot update HEAD ref"
4401
4383
msgstr ""
4402
4384
4403
#: builtin/commit.c:1667
4385
#: builtin/commit.c:1780
4404
4386
msgid ""
4405
4387
"Repository has been updated, but unable to write\n"
4406
4388
"new_index file. Check that disk is not full or quota is\n"
4411
4393
msgid "git config [options]"
4412
4394
msgstr ""
4413
4395
4396
#: builtin/config.c:53
4397
msgid "Config file location"
4398
msgstr ""
4399
4414
4400
#: builtin/config.c:54
4415
msgid "Config file location"
4401
msgid "use global config file"
4416
4402
msgstr ""
4417
4403
4418
4404
#: builtin/config.c:55
4419
msgid "use global config file"
4405
msgid "use system config file"
4420
4406
msgstr ""
4421
4407
4422
4408
#: builtin/config.c:56
4423
msgid "use system config file"
4409
msgid "use repository config file"
4424
4410
msgstr ""
4425
4411
4426
4412
#: builtin/config.c:57
4427
msgid "use repository config file"
4428
msgstr ""
4429
4430
#: builtin/config.c:58
4431
4413
msgid "use given config file"
4432
4414
msgstr ""
4433
4415
4434
#: builtin/config.c:59
4416
#: builtin/config.c:58
4435
4417
msgid "blob-id"
4436
4418
msgstr ""
4437
4419
4438
#: builtin/config.c:59
4420
#: builtin/config.c:58
4439
4421
msgid "read config from given blob object"
4440
4422
msgstr ""
4441
4423
4424
#: builtin/config.c:59
4425
msgid "Action"
4426
msgstr ""
4427
4442
4428
#: builtin/config.c:60
4443
msgid "Action"
4429
msgid "get value: name [value-regex]"
4444
4430
msgstr ""
4445
4431
4446
4432
#: builtin/config.c:61
4447
msgid "get value: name [value-regex]"
4433
msgid "get all values: key [value-regex]"
4448
4434
msgstr ""
4449
4435
4450
4436
#: builtin/config.c:62
4451
msgid "get all values: key [value-regex]"
4437
msgid "get values for regexp: name-regex [value-regex]"
4452
4438
msgstr ""
4453
4439
4454
4440
#: builtin/config.c:63
4455
msgid "get values for regexp: name-regex [value-regex]"
4441
msgid "get value specific for the URL: section[.var] URL"
4456
4442
msgstr ""
4457
4443
4458
4444
#: builtin/config.c:64
4459
msgid "get value specific for the URL: section[.var] URL"
4445
msgid "replace all matching variables: name value [value_regex]"
4460
4446
msgstr ""
4461
4447
4462
4448
#: builtin/config.c:65
4463
msgid "replace all matching variables: name value [value_regex]"
4449
msgid "add a new variable: name value"
4464
4450
msgstr ""
4465
4451
4466
4452
#: builtin/config.c:66
4467
msgid "add a new variable: name value"
4453
msgid "remove a variable: name [value-regex]"
4468
4454
msgstr ""
4469
4455
4470
4456
#: builtin/config.c:67
4471
msgid "remove a variable: name [value-regex]"
4457
msgid "remove all matches: name [value-regex]"
4472
4458
msgstr ""
4473
4459
4474
4460
#: builtin/config.c:68
4475
msgid "remove all matches: name [value-regex]"
4461
msgid "rename section: old-name new-name"
4476
4462
msgstr ""
4477
4463
4478
4464
#: builtin/config.c:69
4479
msgid "rename section: old-name new-name"
4465
msgid "remove a section: name"
4480
4466
msgstr ""
4481
4467
4482
4468
#: builtin/config.c:70
4483
msgid "remove a section: name"
4469
msgid "list all"
4484
4470
msgstr ""
4485
4471
4486
4472
#: builtin/config.c:71
4487
msgid "list all"
4488
msgstr ""
4489
4490
#: builtin/config.c:72
4491
4473
msgid "open an editor"
4492
4474
msgstr ""
4493
4475
4494
#: builtin/config.c:73 builtin/config.c:74
4476
#: builtin/config.c:72 builtin/config.c:73
4495
4477
msgid "slot"
4496
4478
msgstr ""
4497
4479
4480
#: builtin/config.c:72
4481
msgid "find the color configured: [default]"
4482
msgstr ""
4483
4498
4484
#: builtin/config.c:73
4499
msgid "find the color configured: [default]"
4485
msgid "find the color setting: [stdout-is-tty]"
4500
4486
msgstr ""
4501
4487
4502
4488
#: builtin/config.c:74
4503
msgid "find the color setting: [stdout-is-tty]"
4489
msgid "Type"
4504
4490
msgstr ""
4505
4491
4506
4492
#: builtin/config.c:75
4507
msgid "Type"
4493
msgid "value is \"true\" or \"false\""
4508
4494
msgstr ""
4509
4495
4510
4496
#: builtin/config.c:76
4511
msgid "value is \"true\" or \"false\""
4497
msgid "value is decimal number"
4512
4498
msgstr ""
4513
4499
4514
4500
#: builtin/config.c:77
4515
msgid "value is decimal number"
4501
msgid "value is --bool or --int"
4516
4502
msgstr ""
4517
4503
4518
4504
#: builtin/config.c:78
4519
msgid "value is --bool or --int"
4505
msgid "value is a path (file or directory name)"
4520
4506
msgstr ""
4521
4507
4522
4508
#: builtin/config.c:79
4523
msgid "value is a path (file or directory name)"
4509
msgid "Other"
4524
4510
msgstr ""
4525
4511
4526
4512
#: builtin/config.c:80
4527
msgid "Other"
4513
msgid "terminate values with NUL byte"
4528
4514
msgstr ""
4529
4515
4530
4516
#: builtin/config.c:81
4531
msgid "terminate values with NUL byte"
4532
msgstr ""
4533
4534
#: builtin/config.c:82
4535
4517
msgid "respect include directives on lookup"
4536
4518
msgstr ""
4537
4519
4551
4533
msgid "git describe [options] --dirty"
4552
4534
msgstr ""
4553
4535
4554
#: builtin/describe.c:237
4536
#: builtin/describe.c:216
4555
4537
#, c-format
4556
4538
msgid "annotated tag %s not available"
4557
4539
msgstr ""
4558
4540
4559
#: builtin/describe.c:241
4541
#: builtin/describe.c:220
4560
4542
#, c-format
4561
4543
msgid "annotated tag %s has no embedded name"
4562
4544
msgstr ""
4563
4545
4564
#: builtin/describe.c:243
4546
#: builtin/describe.c:222
4565
4547
#, c-format
4566
4548
msgid "tag '%s' is really '%s' here"
4567
4549
msgstr ""
4568
4550
4569
#: builtin/describe.c:270
4551
#: builtin/describe.c:249
4570
4552
#, c-format
4571
4553
msgid "Not a valid object name %s"
4572
4554
msgstr ""
4573
4555
4574
#: builtin/describe.c:273
4556
#: builtin/describe.c:252
4575
4557
#, c-format
4576
4558
msgid "%s is not a valid '%s' object"
4577
4559
msgstr ""
4578
4560
4579
#: builtin/describe.c:290
4561
#: builtin/describe.c:269
4580
4562
#, c-format
4581
4563
msgid "no tag exactly matches '%s'"
4582
4564
msgstr ""
4583
4565
4584
#: builtin/describe.c:292
4566
#: builtin/describe.c:271
4585
4567
#, c-format
4586
4568
msgid "searching to describe %s\n"
4587
4569
msgstr ""
4588
4570
4589
#: builtin/describe.c:332
4571
#: builtin/describe.c:318
4590
4572
#, c-format
4591
4573
msgid "finished search at %s\n"
4592
4574
msgstr ""
4593
4575
4594
#: builtin/describe.c:359
4576
#: builtin/describe.c:345
4595
4577
#, c-format
4596
4578
msgid ""
4597
4579
"No annotated tags can describe '%s'.\n"
4598
4580
"However, there were unannotated tags: try --tags."
4599
4581
msgstr ""
4600
4582
4601
#: builtin/describe.c:363
4583
#: builtin/describe.c:349
4602
4584
#, c-format
4603
4585
msgid ""
4604
4586
"No tags can describe '%s'.\n"
4605
4587
"Try --always, or create some tags."
4606
4588
msgstr ""
4607
4589
4608
#: builtin/describe.c:384
4590
#: builtin/describe.c:370
4609
4591
#, c-format
4610
4592
msgid "traversed %lu commits\n"
4611
4593
msgstr ""
4612
4594
4613
#: builtin/describe.c:387
4595
#: builtin/describe.c:373
4614
4596
#, c-format
4615
4597
msgid ""
4616
4598
"more than %i tags found; listed %i most recent\n"
4617
4599
"gave up search at %s\n"
4618
4600
msgstr ""
4619
4601
4620
#: builtin/describe.c:409
4602
#: builtin/describe.c:395
4621
4603
msgid "find the tag that comes after the commit"
4622
4604
msgstr ""
4623
4605
4624
#: builtin/describe.c:410
4606
#: builtin/describe.c:396
4625
4607
msgid "debug search strategy on stderr"
4626
4608
msgstr ""
4627
4609
4628
#: builtin/describe.c:411
4610
#: builtin/describe.c:397
4629
4611
msgid "use any ref"
4630
4612
msgstr ""
4631
4613
4632
#: builtin/describe.c:412
4614
#: builtin/describe.c:398
4633
4615
msgid "use any tag, even unannotated"
4634
4616
msgstr ""
4635
4617
4636
#: builtin/describe.c:413
4618
#: builtin/describe.c:399
4637
4619
msgid "always use long format"
4638
4620
msgstr ""
4639
4621
4640
#: builtin/describe.c:414
4622
#: builtin/describe.c:400
4641
4623
msgid "only follow first parent"
4642
4624
msgstr ""
4643
4625
4644
#: builtin/describe.c:417
4626
#: builtin/describe.c:403
4645
4627
msgid "only output exact matches"
4646
4628
msgstr ""
4647
4629
4648
#: builtin/describe.c:419
4630
#: builtin/describe.c:405
4649
4631
msgid "consider <n> most recent tags (default: 10)"
4650
4632
msgstr ""
4651
4633
4652
#: builtin/describe.c:421
4634
#: builtin/describe.c:407
4653
4635
msgid "only consider tags matching <pattern>"
4654
4636
msgstr ""
4655
4637
4656
#: builtin/describe.c:423 builtin/name-rev.c:321
4638
#: builtin/describe.c:409 builtin/name-rev.c:318
4657
4639
msgid "show abbreviated commit object as fallback"
4658
4640
msgstr ""
4659
4641
4660
#: builtin/describe.c:424
4642
#: builtin/describe.c:410
4661
4643
msgid "mark"
4662
4644
msgstr ""
4663
4645
4664
#: builtin/describe.c:425
4646
#: builtin/describe.c:411
4665
4647
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
4666
4648
msgstr ""
4667
4649
4668
#: builtin/describe.c:443
4650
#: builtin/describe.c:429
4669
4651
msgid "--long is incompatible with --abbrev=0"
4670
4652
msgstr ""
4671
4653
4672
#: builtin/describe.c:469
4654
#: builtin/describe.c:455
4673
4655
msgid "No names found, cannot describe anything."
4674
4656
msgstr ""
4675
4657
4676
#: builtin/describe.c:489
4658
#: builtin/describe.c:475
4677
4659
msgid "--dirty is incompatible with commit-ishes"
4678
4660
msgstr ""
4679
4661
4706
4688
msgid "unhandled object '%s' given."
4707
4689
msgstr ""
4708
4690
4709
#: builtin/fast-export.c:22
4691
#: builtin/fast-export.c:23
4710
4692
msgid "git fast-export [rev-list-opts]"
4711
4693
msgstr ""
4712
4694
4713
#: builtin/fast-export.c:673
4695
#: builtin/fast-export.c:702
4714
4696
msgid "show progress after <n> objects"
4715
4697
msgstr ""
4716
4698
4717
#: builtin/fast-export.c:675
4699
#: builtin/fast-export.c:704
4718
4700
msgid "select handling of signed tags"
4719
4701
msgstr ""
4720
4702
4721
#: builtin/fast-export.c:678
4703
#: builtin/fast-export.c:707
4722
4704
msgid "select handling of tags that tag filtered objects"
4723
4705
msgstr ""
4724
4706
4725
#: builtin/fast-export.c:681
4707
#: builtin/fast-export.c:710
4726
4708
msgid "Dump marks to this file"
4727
4709
msgstr ""
4728
4710
4729
#: builtin/fast-export.c:683
4711
#: builtin/fast-export.c:712
4730
4712
msgid "Import marks from this file"
4731
4713
msgstr ""
4732
4714
4733
#: builtin/fast-export.c:685
4715
#: builtin/fast-export.c:714
4734
4716
msgid "Fake a tagger when tags lack one"
4735
4717
msgstr ""
4736
4718
4737
#: builtin/fast-export.c:687
4719
#: builtin/fast-export.c:716
4738
4720
msgid "Output full tree for each commit"
4739
4721
msgstr ""
4740
4722
4741
#: builtin/fast-export.c:689
4723
#: builtin/fast-export.c:718
4742
4724
msgid "Use the done feature to terminate the stream"
4743
4725
msgstr ""
4744
4726
4745
#: builtin/fast-export.c:690
4727
#: builtin/fast-export.c:719
4746
4728
msgid "Skip output of blob data"
4747
4729
msgstr ""
4748
4730
4770
4752
msgid "git fetch --all [<options>]"
4771
4753
msgstr ""
4772
4754
4773
#: builtin/fetch.c:75
4755
#: builtin/fetch.c:90
4774
4756
msgid "fetch from all remotes"
4775
4757
msgstr ""
4776
4758
4777
#: builtin/fetch.c:77
4759
#: builtin/fetch.c:92
4778
4760
msgid "append to .git/FETCH_HEAD instead of overwriting"
4779
4761
msgstr ""
4780
4762
4781
#: builtin/fetch.c:79
4763
#: builtin/fetch.c:94
4782
4764
msgid "path to upload pack on remote end"
4783
4765
msgstr ""
4784
4766
4785
#: builtin/fetch.c:80
4767
#: builtin/fetch.c:95
4786
4768
msgid "force overwrite of local branch"
4787
4769
msgstr ""
4788
4770
4789
#: builtin/fetch.c:82
4771
#: builtin/fetch.c:97
4790
4772
msgid "fetch from multiple remotes"
4791
4773
msgstr ""
4792
4774
4793
#: builtin/fetch.c:84
4775
#: builtin/fetch.c:99
4794
4776
msgid "fetch all tags and associated objects"
4795
4777
msgstr ""
4796
4778
4797
#: builtin/fetch.c:86
4779
#: builtin/fetch.c:101
4798
4780
msgid "do not fetch all tags (--no-tags)"
4799
4781
msgstr ""
4800
4782
4801
#: builtin/fetch.c:88
4783
#: builtin/fetch.c:103
4802
4784
msgid "prune remote-tracking branches no longer on remote"
4803
4785
msgstr ""
4804
4786
4805
#: builtin/fetch.c:89
4787
#: builtin/fetch.c:104
4806
4788
msgid "on-demand"
4807
4789
msgstr ""
4808
4790
4809
#: builtin/fetch.c:90
4791
#: builtin/fetch.c:105
4810
4792
msgid "control recursive fetching of submodules"
4811
4793
msgstr ""
4812
4794
4813
#: builtin/fetch.c:94
4795
#: builtin/fetch.c:109
4814
4796
msgid "keep downloaded pack"
4815
4797
msgstr ""
4816
4798
4817
#: builtin/fetch.c:96
4799
#: builtin/fetch.c:111
4818
4800
msgid "allow updating of HEAD ref"
4819
4801
msgstr ""
4820
4802
4821
#: builtin/fetch.c:99
4803
#: builtin/fetch.c:114
4822
4804
msgid "deepen history of shallow clone"
4823
4805
msgstr ""
4824
4806
4825
#: builtin/fetch.c:101
4807
#: builtin/fetch.c:116
4826
4808
msgid "convert to a complete repository"
4827
4809
msgstr ""
4828
4810
4829
#: builtin/fetch.c:103 builtin/log.c:1197
4811
#: builtin/fetch.c:118 builtin/log.c:1205
4830
4812
msgid "dir"
4831
4813
msgstr ""
4832
4814
4833
#: builtin/fetch.c:104
4815
#: builtin/fetch.c:119
4834
4816
msgid "prepend this to submodule path output"
4835
4817
msgstr ""
4836
4818
4837
#: builtin/fetch.c:107
4819
#: builtin/fetch.c:122
4838
4820
msgid "default mode for recursion"
4839
4821
msgstr ""
4840
4822
4841
#: builtin/fetch.c:109
4823
#: builtin/fetch.c:124
4842
4824
msgid "accept refs that update .git/shallow"
4843
4825
msgstr ""
4844
4826
4850
4832
msgid "specify fetch refmap"
4851
4833
msgstr ""
4852
4834
4853
#: builtin/fetch.c:347
4835
#: builtin/fetch.c:376
4854
4836
msgid "Couldn't find remote ref HEAD"
4855
4837
msgstr ""
4856
4838
4857
#: builtin/fetch.c:411
4839
#: builtin/fetch.c:440
4858
4840
#, c-format
4859
4841
msgid "object %s not found"
4860
4842
msgstr ""
4861
4843
4862
#: builtin/fetch.c:416
4844
#: builtin/fetch.c:445
4863
4845
msgid "[up to date]"
4864
4846
msgstr ""
4865
4847
4866
#: builtin/fetch.c:430
4848
#: builtin/fetch.c:459
4867
4849
#, c-format
4868
4850
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
4869
4851
msgstr ""
4870
4852
4871
#: builtin/fetch.c:431 builtin/fetch.c:517
4853
#: builtin/fetch.c:460 builtin/fetch.c:546
4872
4854
msgid "[rejected]"
4873
4855
msgstr ""
4874
4856
4875
#: builtin/fetch.c:442
4857
#: builtin/fetch.c:471
4876
4858
msgid "[tag update]"
4877
4859
msgstr ""
4878
4860
4879
#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497
4861
#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526
4880
4862
msgid " (unable to update local ref)"
4881
4863
msgstr ""
4882
4864
4883
#: builtin/fetch.c:462
4865
#: builtin/fetch.c:491
4884
4866
msgid "[new tag]"
4885
4867
msgstr ""
4886
4868
4887
#: builtin/fetch.c:465
4869
#: builtin/fetch.c:494
4888
4870
msgid "[new branch]"
4889
4871
msgstr ""
4890
4872
4891
#: builtin/fetch.c:468
4873
#: builtin/fetch.c:497
4892
4874
msgid "[new ref]"
4893
4875
msgstr ""
4894
4876
4895
#: builtin/fetch.c:513
4877
#: builtin/fetch.c:542
4896
4878
msgid "unable to update local ref"
4897
4879
msgstr ""
4898
4880
4899
#: builtin/fetch.c:513
4881
#: builtin/fetch.c:542
4900
4882
msgid "forced update"
4901
4883
msgstr ""
4902
4884
4903
#: builtin/fetch.c:519
4885
#: builtin/fetch.c:548
4904
4886
msgid "(non-fast-forward)"
4905
4887
msgstr ""
4906
4888
4907
#: builtin/fetch.c:552 builtin/fetch.c:785
4889
#: builtin/fetch.c:581 builtin/fetch.c:814
4908
4890
#, c-format
4909
4891
msgid "cannot open %s: %s\n"
4910
4892
msgstr ""
4911
4893
4912
#: builtin/fetch.c:561
4894
#: builtin/fetch.c:590
4913
4895
#, c-format
4914
4896
msgid "%s did not send all necessary objects\n"
4915
4897
msgstr ""
4916
4898
4917
#: builtin/fetch.c:579
4899
#: builtin/fetch.c:608
4918
4900
#, c-format
4919
4901
msgid "reject %s because shallow roots are not allowed to be updated"
4920
4902
msgstr ""
4921
4903
4922
#: builtin/fetch.c:667 builtin/fetch.c:750
4904
#: builtin/fetch.c:696 builtin/fetch.c:779
4923
4905
#, c-format
4924
4906
msgid "From %.*s\n"
4925
4907
msgstr ""
4926
4908
4927
#: builtin/fetch.c:678
4909
#: builtin/fetch.c:707
4928
4910
#, c-format
4929
4911
msgid ""
4930
4912
"some local refs could not be updated; try running\n"
4931
4913
" 'git remote prune %s' to remove any old, conflicting branches"
4932
4914
msgstr ""
4933
4915
4934
#: builtin/fetch.c:730
4916
#: builtin/fetch.c:759
4935
4917
#, c-format
4936
4918
msgid " (%s will become dangling)"
4937
4919
msgstr ""
4938
4920
4939
#: builtin/fetch.c:731
4921
#: builtin/fetch.c:760
4940
4922
#, c-format
4941
4923
msgid " (%s has become dangling)"
4942
4924
msgstr ""
4943
4925
4944
#: builtin/fetch.c:755
4926
#: builtin/fetch.c:784
4945
4927
msgid "[deleted]"
4946
4928
msgstr ""
4947
4929
4948
#: builtin/fetch.c:756 builtin/remote.c:1050
4930
#: builtin/fetch.c:785 builtin/remote.c:1059
4949
4931
msgid "(none)"
4950
4932
msgstr ""
4951
4933
4952
#: builtin/fetch.c:775
4934
#: builtin/fetch.c:804
4953
4935
#, c-format
4954
4936
msgid "Refusing to fetch into current branch %s of non-bare repository"
4955
4937
msgstr ""
4956
4938
4957
#: builtin/fetch.c:794
4939
#: builtin/fetch.c:823
4958
4940
#, c-format
4959
4941
msgid "Option \"%s\" value \"%s\" is not valid for %s"
4960
4942
msgstr ""
4961
4943
4962
#: builtin/fetch.c:797
4944
#: builtin/fetch.c:826
4963
4945
#, c-format
4964
4946
msgid "Option \"%s\" is ignored for %s\n"
4965
4947
msgstr ""
4966
4948
4967
#: builtin/fetch.c:853
4949
#: builtin/fetch.c:882
4968
4950
#, c-format
4969
4951
msgid "Don't know how to fetch from %s"
4970
4952
msgstr ""
4971
4953
4972
#: builtin/fetch.c:1015
4954
#: builtin/fetch.c:1044
4973
4955
#, c-format
4974
4956
msgid "Fetching %s\n"
4975
4957
msgstr ""
4976
4958
4977
#: builtin/fetch.c:1017 builtin/remote.c:90
4959
#: builtin/fetch.c:1046 builtin/remote.c:90
4978
4960
#, c-format
4979
4961
msgid "Could not fetch %s"
4980
4962
msgstr ""
4981
4963
4982
#: builtin/fetch.c:1036
4964
#: builtin/fetch.c:1064
4983
4965
msgid ""
4984
4966
"No remote repository specified. Please, specify either a URL or a\n"
4985
4967
"remote name from which new revisions should be fetched."
4986
4968
msgstr ""
4987
4969
4988
#: builtin/fetch.c:1059
4970
#: builtin/fetch.c:1087
4989
4971
msgid "You need to specify a tag name."
4990
4972
msgstr ""
4991
4973
4992
#: builtin/fetch.c:1107
4974
#: builtin/fetch.c:1131
4993
4975
msgid "--depth and --unshallow cannot be used together"
4994
4976
msgstr ""
4995
4977
4996
#: builtin/fetch.c:1109
4978
#: builtin/fetch.c:1133
4997
4979
msgid "--unshallow on a complete repository does not make sense"
4998
4980
msgstr ""
4999
4981
5000
#: builtin/fetch.c:1132
4982
#: builtin/fetch.c:1156
5001
4983
msgid "fetch --all does not take a repository argument"
5002
4984
msgstr ""
5003
4985
5004
#: builtin/fetch.c:1134
4986
#: builtin/fetch.c:1158
5005
4987
msgid "fetch --all does not make sense with refspecs"
5006
4988
msgstr ""
5007
4989
5008
#: builtin/fetch.c:1145
4990
#: builtin/fetch.c:1169
5009
4991
#, c-format
5010
4992
msgid "No such remote or remote group: %s"
5011
4993
msgstr ""
5012
4994
5013
#: builtin/fetch.c:1153
4995
#: builtin/fetch.c:1177
5014
4996
msgid "Fetching a group and specifying refspecs does not make sense"
5015
4997
msgstr ""
5016
4998
5019
5001
"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5020
5002
msgstr ""
5021
5003
5022
#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:702
5023
#: builtin/merge.c:196 builtin/repack.c:160 builtin/repack.c:164
5024
#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:446
5025
#: parse-options.h:135 parse-options.h:242
5004
#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698
5005
#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183
5006
#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589
5007
#: parse-options.h:132 parse-options.h:239
5026
5008
msgid "n"
5027
5009
msgstr ""
5028
5010
5046
5028
msgid "file to read from"
5047
5029
msgstr ""
5048
5030
5049
#: builtin/for-each-ref.c:1063
5031
#: builtin/for-each-ref.c:1051
5050
5032
msgid "git for-each-ref [options] [<pattern>]"
5051
5033
msgstr ""
5052
5034
5053
#: builtin/for-each-ref.c:1078
5035
#: builtin/for-each-ref.c:1066
5054
5036
msgid "quote placeholders suitably for shells"
5055
5037
msgstr ""
5056
5038
5057
#: builtin/for-each-ref.c:1080
5039
#: builtin/for-each-ref.c:1068
5058
5040
msgid "quote placeholders suitably for perl"
5059
5041
msgstr ""
5060
5042
5061
#: builtin/for-each-ref.c:1082
5043
#: builtin/for-each-ref.c:1070
5062
5044
msgid "quote placeholders suitably for python"
5063
5045
msgstr ""
5064
5046
5065
#: builtin/for-each-ref.c:1084
5047
#: builtin/for-each-ref.c:1072
5066
5048
msgid "quote placeholders suitably for tcl"
5067
5049
msgstr ""
5068
5050
5069
#: builtin/for-each-ref.c:1087
5051
#: builtin/for-each-ref.c:1075
5070
5052
msgid "show only <n> matched refs"
5071
5053
msgstr ""
5072
5054
5073
#: builtin/for-each-ref.c:1088 builtin/replace.c:177
5055
#: builtin/for-each-ref.c:1076 builtin/replace.c:435
5074
5056
msgid "format"
5075
5057
msgstr ""
5076
5058
5077
#: builtin/for-each-ref.c:1088
5059
#: builtin/for-each-ref.c:1076
5078
5060
msgid "format to use for the output"
5079
5061
msgstr ""
5080
5062
5081
#: builtin/for-each-ref.c:1089
5063
#: builtin/for-each-ref.c:1077
5082
5064
msgid "key"
5083
5065
msgstr ""
5084
5066
5085
#: builtin/for-each-ref.c:1090
5067
#: builtin/for-each-ref.c:1078
5086
5068
msgid "field name to sort on"
5087
5069
msgstr ""
5088
5070
5090
5072
msgid "Checking connectivity"
5091
5073
msgstr ""
5092
5074
5093
#: builtin/fsck.c:544
5075
#: builtin/fsck.c:538
5094
5076
msgid "Checking object directories"
5095
5077
msgstr ""
5096
5078
5079
#: builtin/fsck.c:601
5080
msgid "git fsck [options] [<object>...]"
5081
msgstr ""
5082
5097
5083
#: builtin/fsck.c:607
5098
msgid "git fsck [options] [<object>...]"
5099
msgstr ""
5100
5101
#: builtin/fsck.c:613
5102
5084
msgid "show unreachable objects"
5103
5085
msgstr ""
5104
5086
5105
#: builtin/fsck.c:614
5087
#: builtin/fsck.c:608
5106
5088
msgid "show dangling objects"
5107
5089
msgstr ""
5108
5090
5109
#: builtin/fsck.c:615
5091
#: builtin/fsck.c:609
5110
5092
msgid "report tags"
5111
5093
msgstr ""
5112
5094
5113
#: builtin/fsck.c:616
5095
#: builtin/fsck.c:610
5114
5096
msgid "report root nodes"
5115
5097
msgstr ""
5116
5098
5117
#: builtin/fsck.c:617
5099
#: builtin/fsck.c:611
5118
5100
msgid "make index objects head nodes"
5119
5101
msgstr ""
5120
5102
5121
#: builtin/fsck.c:618
5103
#: builtin/fsck.c:612
5122
5104
msgid "make reflogs head nodes (default)"
5123
5105
msgstr ""
5124
5106
5125
#: builtin/fsck.c:619
5107
#: builtin/fsck.c:613
5126
5108
msgid "also consider packs and alternate objects"
5127
5109
msgstr ""
5128
5110
5129
#: builtin/fsck.c:620
5111
#: builtin/fsck.c:614
5130
5112
msgid "enable more strict checking"
5131
5113
msgstr ""
5132
5114
5133
#: builtin/fsck.c:622
5115
#: builtin/fsck.c:616
5134
5116
msgid "write dangling objects in .git/lost-found"
5135
5117
msgstr ""
5136
5118
5137
#: builtin/fsck.c:623 builtin/prune.c:144
5119
#: builtin/fsck.c:617 builtin/prune.c:144
5138
5120
msgid "show progress"
5139
5121
msgstr ""
5140
5122
5141
#: builtin/fsck.c:673
5123
#: builtin/fsck.c:667
5142
5124
msgid "Checking objects"
5143
5125
msgstr ""
5144
5126
5146
5128
msgid "git gc [options]"
5147
5129
msgstr ""
5148
5130
5149
#: builtin/gc.c:80
5131
#: builtin/gc.c:91
5150
5132
#, c-format
5151
5133
msgid "Invalid %s: '%s'"
5152
5134
msgstr ""
5153
5135
5154
#: builtin/gc.c:107
5136
#: builtin/gc.c:118
5155
5137
#, c-format
5156
5138
msgid "insanely long object directory %.*s"
5157
5139
msgstr ""
5158
5140
5159
#: builtin/gc.c:262
5141
#: builtin/gc.c:287
5160
5142
msgid "prune unreferenced objects"
5161
5143
msgstr ""
5162
5144
5163
#: builtin/gc.c:264
5145
#: builtin/gc.c:289
5164
5146
msgid "be more thorough (increased runtime)"
5165
5147
msgstr ""
5166
5148
5167
#: builtin/gc.c:265
5149
#: builtin/gc.c:290
5168
5150
msgid "enable auto-gc mode"
5169
5151
msgstr ""
5170
5152
5171
#: builtin/gc.c:266
5153
#: builtin/gc.c:291
5172
5154
msgid "force running gc even if there may be another gc running"
5173
5155
msgstr ""
5174
5156
5175
#: builtin/gc.c:318
5157
#: builtin/gc.c:332
5176
5158
#, c-format
5177
5159
msgid "Auto packing the repository in background for optimum performance.\n"
5178
5160
msgstr ""
5179
5161
5180
#: builtin/gc.c:320
5162
#: builtin/gc.c:334
5181
5163
#, c-format
5182
5164
msgid "Auto packing the repository for optimum performance.\n"
5183
5165
msgstr ""
5184
5166
5185
#: builtin/gc.c:321
5167
#: builtin/gc.c:335
5186
5168
#, c-format
5187
5169
msgid "See \"git help gc\" for manual housekeeping.\n"
5188
5170
msgstr ""
5189
5171
5190
#. be quiet on --auto
5191
#: builtin/gc.c:316
5172
#: builtin/gc.c:353
5192
5173
#, c-format
5193
5174
msgid ""
5194
5175
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
5195
5176
msgstr ""
5196
5177
5197
#: builtin/gc.c:341
5178
#: builtin/gc.c:375
5198
5179
msgid ""
5199
5180
"There are too many unreachable loose objects; run 'git prune' to remove them."
5200
5181
msgstr ""
5208
5189
msgid "grep: failed to create thread: %s"
5209
5190
msgstr ""
5210
5191
5211
#: builtin/grep.c:443 builtin/grep.c:478
5192
#: builtin/grep.c:441 builtin/grep.c:476
5212
5193
#, c-format
5213
5194
msgid "unable to read tree (%s)"
5214
5195
msgstr ""
5215
5196
5216
#: builtin/grep.c:493
5197
#: builtin/grep.c:491
5217
5198
#, c-format
5218
5199
msgid "unable to grep from object of type %s"
5219
5200
msgstr ""
5220
5201
5221
#: builtin/grep.c:551
5202
#: builtin/grep.c:547
5222
5203
#, c-format
5223
5204
msgid "switch `%c' expects a numerical value"
5224
5205
msgstr ""
5225
5206
5226
#: builtin/grep.c:568
5207
#: builtin/grep.c:564
5227
5208
#, c-format
5228
5209
msgid "cannot open '%s'"
5229
5210
msgstr ""
5230
5211
5231
#: builtin/grep.c:642
5212
#: builtin/grep.c:638
5232
5213
msgid "search in index instead of in the work tree"
5233
5214
msgstr ""
5234
5215
5235
#: builtin/grep.c:644
5216
#: builtin/grep.c:640
5236
5217
msgid "find in contents not managed by git"
5237
5218
msgstr ""
5238
5219
5239
#: builtin/grep.c:646
5220
#: builtin/grep.c:642
5240
5221
msgid "search in both tracked and untracked files"
5241
5222
msgstr ""
5242
5223
5243
#: builtin/grep.c:648
5224
#: builtin/grep.c:644
5244
5225
msgid "search also in ignored files"
5245
5226
msgstr ""
5246
5227
5247
#: builtin/grep.c:651
5228
#: builtin/grep.c:647
5248
5229
msgid "show non-matching lines"
5249
5230
msgstr ""
5250
5231
5251
#: builtin/grep.c:653
5232
#: builtin/grep.c:649
5252
5233
msgid "case insensitive matching"
5253
5234
msgstr ""
5254
5235
5255
#: builtin/grep.c:655
5236
#: builtin/grep.c:651
5256
5237
msgid "match patterns only at word boundaries"
5257
5238
msgstr ""
5258
5239
5259
#: builtin/grep.c:657
5240
#: builtin/grep.c:653
5260
5241
msgid "process binary files as text"
5261
5242
msgstr ""
5262
5243
5263
#: builtin/grep.c:659
5244
#: builtin/grep.c:655
5264
5245
msgid "don't match patterns in binary files"
5265
5246
msgstr ""
5266
5247
5267
#: builtin/grep.c:662
5248
#: builtin/grep.c:658
5268
5249
msgid "process binary files with textconv filters"
5269
5250
msgstr ""
5270
5251
5252
#: builtin/grep.c:660
5253
msgid "descend at most <depth> levels"
5254
msgstr ""
5255
5271
5256
#: builtin/grep.c:664
5272
msgid "descend at most <depth> levels"
5273
msgstr ""
5274
5275
#: builtin/grep.c:668
5276
5257
msgid "use extended POSIX regular expressions"
5277
5258
msgstr ""
5278
5259
5279
#: builtin/grep.c:671
5260
#: builtin/grep.c:667
5280
5261
msgid "use basic POSIX regular expressions (default)"
5281
5262
msgstr ""
5282
5263
5283
#: builtin/grep.c:674
5264
#: builtin/grep.c:670
5284
5265
msgid "interpret patterns as fixed strings"
5285
5266
msgstr ""
5286
5267
5287
#: builtin/grep.c:677
5268
#: builtin/grep.c:673
5288
5269
msgid "use Perl-compatible regular expressions"
5289
5270
msgstr ""
5290
5271
5291
#: builtin/grep.c:680
5272
#: builtin/grep.c:676
5292
5273
msgid "show line numbers"
5293
5274
msgstr ""
5294
5275
5295
#: builtin/grep.c:681
5276
#: builtin/grep.c:677
5296
5277
msgid "don't show filenames"
5297
5278
msgstr ""
5298
5279
5299
#: builtin/grep.c:682
5280
#: builtin/grep.c:678
5300
5281
msgid "show filenames"
5301
5282
msgstr ""
5302
5283
5303
#: builtin/grep.c:684
5284
#: builtin/grep.c:680
5304
5285
msgid "show filenames relative to top directory"
5305
5286
msgstr ""
5306
5287
5307
#: builtin/grep.c:686
5288
#: builtin/grep.c:682
5308
5289
msgid "show only filenames instead of matching lines"
5309
5290
msgstr ""
5310
5291
5311
#: builtin/grep.c:688
5292
#: builtin/grep.c:684
5312
5293
msgid "synonym for --files-with-matches"
5313
5294
msgstr ""
5314
5295
5315
#: builtin/grep.c:691
5296
#: builtin/grep.c:687
5316
5297
msgid "show only the names of files without match"
5317
5298
msgstr ""
5318
5299
5319
#: builtin/grep.c:693
5300
#: builtin/grep.c:689
5320
5301
msgid "print NUL after filenames"
5321
5302
msgstr ""
5322
5303
5323
#: builtin/grep.c:695
5304
#: builtin/grep.c:691
5324
5305
msgid "show the number of matches instead of matching lines"
5325
5306
msgstr ""
5326
5307
5327
#: builtin/grep.c:696
5308
#: builtin/grep.c:692
5328
5309
msgid "highlight matches"
5329
5310
msgstr ""
5330
5311
5331
#: builtin/grep.c:698
5312
#: builtin/grep.c:694
5332
5313
msgid "print empty line between matches from different files"
5333
5314
msgstr ""
5334
5315
5335
#: builtin/grep.c:700
5316
#: builtin/grep.c:696
5336
5317
msgid "show filename only once above matches from same file"
5337
5318
msgstr ""
5338
5319
5339
#: builtin/grep.c:703
5320
#: builtin/grep.c:699
5340
5321
msgid "show <n> context lines before and after matches"
5341
5322
msgstr ""
5342
5323
5343
#: builtin/grep.c:706
5324
#: builtin/grep.c:702
5344
5325
msgid "show <n> context lines before matches"
5345
5326
msgstr ""
5346
5327
5347
#: builtin/grep.c:708
5328
#: builtin/grep.c:704
5348
5329
msgid "show <n> context lines after matches"
5349
5330
msgstr ""
5350
5331
5351
#: builtin/grep.c:709
5332
#: builtin/grep.c:705
5352
5333
msgid "shortcut for -C NUM"
5353
5334
msgstr ""
5354
5335
5355
#: builtin/grep.c:712
5336
#: builtin/grep.c:708
5356
5337
msgid "show a line with the function name before matches"
5357
5338
msgstr ""
5358
5339
5359
#: builtin/grep.c:714
5340
#: builtin/grep.c:710
5360
5341
msgid "show the surrounding function"
5361
5342
msgstr ""
5362
5343
5363
#: builtin/grep.c:717
5344
#: builtin/grep.c:713
5364
5345
msgid "read patterns from file"
5365
5346
msgstr ""
5366
5347
5367
#: builtin/grep.c:719
5348
#: builtin/grep.c:715
5368
5349
msgid "match <pattern>"
5369
5350
msgstr ""
5370
5351
5371
#: builtin/grep.c:721
5352
#: builtin/grep.c:717
5372
5353
msgid "combine patterns specified with -e"
5373
5354
msgstr ""
5374
5355
5375
#: builtin/grep.c:733
5356
#: builtin/grep.c:729
5376
5357
msgid "indicate hit with exit status without output"
5377
5358
msgstr ""
5378
5359
5379
#: builtin/grep.c:735
5360
#: builtin/grep.c:731
5380
5361
msgid "show only matches from files that match all patterns"
5381
5362
msgstr ""
5382
5363
5383
#: builtin/grep.c:737
5364
#: builtin/grep.c:733
5384
5365
msgid "show parse tree for grep expression"
5385
5366
msgstr ""
5386
5367
5387
#: builtin/grep.c:741
5368
#: builtin/grep.c:737
5388
5369
msgid "pager"
5389
5370
msgstr ""
5390
5371
5391
#: builtin/grep.c:741
5372
#: builtin/grep.c:737
5392
5373
msgid "show matching files in the pager"
5393
5374
msgstr ""
5394
5375
5395
#: builtin/grep.c:744
5376
#: builtin/grep.c:740
5396
5377
msgid "allow calling of grep(1) (ignored by this build)"
5397
5378
msgstr ""
5398
5379
5399
#: builtin/grep.c:745 builtin/show-ref.c:187
5380
#: builtin/grep.c:741 builtin/show-ref.c:187
5400
5381
msgid "show usage"
5401
5382
msgstr ""
5402
5383
5403
#: builtin/grep.c:812
5384
#: builtin/grep.c:808
5404
5385
msgid "no pattern given."
5405
5386
msgstr ""
5406
5387
5407
#: builtin/grep.c:870
5388
#: builtin/grep.c:866
5408
5389
msgid "--open-files-in-pager only works on the worktree"
5409
5390
msgstr ""
5410
5391
5411
#: builtin/grep.c:893
5392
#: builtin/grep.c:892
5412
5393
msgid "--cached or --untracked cannot be used with --no-index."
5413
5394
msgstr ""
5414
5395
5415
#: builtin/grep.c:898
5396
#: builtin/grep.c:897
5416
5397
msgid "--no-index or --untracked cannot be used with revs."
5417
5398
msgstr ""
5418
5399
5419
#: builtin/grep.c:901
5400
#: builtin/grep.c:900
5420
5401
msgid "--[no-]exclude-standard cannot be used for tracked contents."
5421
5402
msgstr ""
5422
5403
5423
#: builtin/grep.c:909
5404
#: builtin/grep.c:908
5424
5405
msgid "both --cached and trees are given."
5425
5406
msgstr ""
5426
5407
5434
5415
msgid "git hash-object --stdin-paths < <list-of-paths>"
5435
5416
msgstr ""
5436
5417
5437
#: builtin/hash-object.c:72
5418
#: builtin/hash-object.c:72 builtin/tag.c:609
5438
5419
msgid "type"
5439
5420
msgstr ""
5440
5421
5579
5560
msgid "unable to open %s"
5580
5561
msgstr ""
5581
5562
5582
#: builtin/index-pack.c:184
5563
#: builtin/index-pack.c:191
5583
5564
#, c-format
5584
5565
msgid "object type mismatch at %s"
5585
5566
msgstr ""
5594
5575
msgid "object %s: expected type %s, found %s"
5595
5576
msgstr ""
5596
5577
5597
#: builtin/index-pack.c:244
5578
#: builtin/index-pack.c:256
5598
5579
#, c-format
5599
5580
msgid "cannot fill %d byte"
5600
5581
msgid_plural "cannot fill %d bytes"
5601
5582
msgstr[0] ""
5602
5583
msgstr[1] ""
5603
5584
5604
#: builtin/index-pack.c:254
5585
#: builtin/index-pack.c:266
5605
5586
msgid "early EOF"
5606
5587
msgstr ""
5607
5588
5608
#: builtin/index-pack.c:255
5589
#: builtin/index-pack.c:267
5609
5590
msgid "read error on input"
5610
5591
msgstr ""
5611
5592
5612
#: builtin/index-pack.c:267
5593
#: builtin/index-pack.c:279
5613
5594
msgid "used more bytes than were available"
5614
5595
msgstr ""
5615
5596
5616
#: builtin/index-pack.c:274
5597
#: builtin/index-pack.c:286
5617
5598
msgid "pack too large for current definition of off_t"
5618
5599
msgstr ""
5619
5600
5620
#: builtin/index-pack.c:290
5601
#: builtin/index-pack.c:302
5621
5602
#, c-format
5622
5603
msgid "unable to create '%s'"
5623
5604
msgstr ""
5624
5605
5625
#: builtin/index-pack.c:295
5606
#: builtin/index-pack.c:307
5626
5607
#, c-format
5627
5608
msgid "cannot open packfile '%s'"
5628
5609
msgstr ""
5629
5610
5630
#: builtin/index-pack.c:309
5611
#: builtin/index-pack.c:321
5631
5612
msgid "pack signature mismatch"
5632
5613
msgstr ""
5633
5614
5634
#: builtin/index-pack.c:311
5615
#: builtin/index-pack.c:323
5635
5616
#, c-format
5636
5617
msgid "pack version %<PRIu32> unsupported"
5637
5618
msgstr ""
5638
5619
5639
#: builtin/index-pack.c:329
5620
#: builtin/index-pack.c:341
5640
5621
#, c-format
5641
5622
msgid "pack has bad object at offset %lu: %s"
5642
5623
msgstr ""
5643
5624
5644
#: builtin/index-pack.c:451
5625
#: builtin/index-pack.c:462
5645
5626
#, c-format
5646
5627
msgid "inflate returned %d"
5647
5628
msgstr ""
5648
5629
5649
#: builtin/index-pack.c:500
5630
#: builtin/index-pack.c:511
5650
5631
msgid "offset value overflow for delta base object"
5651
5632
msgstr ""
5652
5633
5653
#: builtin/index-pack.c:508
5634
#: builtin/index-pack.c:519
5654
5635
msgid "delta base offset is out of bound"
5655
5636
msgstr ""
5656
5637
5657
#: builtin/index-pack.c:516
5638
#: builtin/index-pack.c:527
5658
5639
#, c-format
5659
5640
msgid "unknown object type %d"
5660
5641
msgstr ""
5661
5642
5662
#: builtin/index-pack.c:547
5643
#: builtin/index-pack.c:558
5663
5644
msgid "cannot pread pack file"
5664
5645
msgstr ""
5665
5646
5666
#: builtin/index-pack.c:549
5647
#: builtin/index-pack.c:560
5667
5648
#, c-format
5668
5649
msgid "premature end of pack file, %lu byte missing"
5669
5650
msgid_plural "premature end of pack file, %lu bytes missing"
5670
5651
msgstr[0] ""
5671
5652
msgstr[1] ""
5672
5653
5673
#: builtin/index-pack.c:575
5654
#: builtin/index-pack.c:586
5674
5655
msgid "serious inflate inconsistency"
5675
5656
msgstr ""
5676
5657
5677
#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695
5678
#: builtin/index-pack.c:729 builtin/index-pack.c:738
5658
#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706
5659
#: builtin/index-pack.c:740 builtin/index-pack.c:749
5679
5660
#, c-format
5680
5661
msgid "SHA1 COLLISION FOUND WITH %s !"
5681
5662
msgstr ""
5682
5663
5683
#: builtin/index-pack.c:669 builtin/pack-objects.c:171
5684
#: builtin/pack-objects.c:263
5664
#: builtin/index-pack.c:680 builtin/pack-objects.c:162
5665
#: builtin/pack-objects.c:254
5685
5666
#, c-format
5686
5667
msgid "unable to read %s"
5687
5668
msgstr ""
5688
5669
5689
#: builtin/index-pack.c:735
5670
#: builtin/index-pack.c:746
5690
5671
#, c-format
5691
5672
msgid "cannot read existing object %s"
5692
5673
msgstr ""
5693
5674
5694
#: builtin/index-pack.c:749
5675
#: builtin/index-pack.c:760
5695
5676
#, c-format
5696
5677
msgid "invalid blob object %s"
5697
5678
msgstr ""
5698
5679
5699
#: builtin/index-pack.c:763
5680
#: builtin/index-pack.c:774
5700
5681
#, c-format
5701
5682
msgid "invalid %s"
5702
5683
msgstr ""
5703
5684
5704
#: builtin/index-pack.c:766
5685
#: builtin/index-pack.c:777
5705
5686
msgid "Error in object"
5706
5687
msgstr ""
5707
5688
5708
#: builtin/index-pack.c:768
5689
#: builtin/index-pack.c:779
5709
5690
#, c-format
5710
5691
msgid "Not all child objects of %s are reachable"
5711
5692
msgstr ""
5712
5693
5713
#: builtin/index-pack.c:839 builtin/index-pack.c:869
5694
#: builtin/index-pack.c:851 builtin/index-pack.c:881
5714
5695
msgid "failed to apply delta"
5715
5696
msgstr ""
5716
5697
5717
#: builtin/index-pack.c:1010
5698
#: builtin/index-pack.c:1022
5718
5699
msgid "Receiving objects"
5719
5700
msgstr ""
5720
5701
5721
#: builtin/index-pack.c:1010
5702
#: builtin/index-pack.c:1022
5722
5703
msgid "Indexing objects"
5723
5704
msgstr ""
5724
5705
5725
#: builtin/index-pack.c:1036
5706
#: builtin/index-pack.c:1048
5726
5707
msgid "pack is corrupted (SHA1 mismatch)"
5727
5708
msgstr ""
5728
5709
5729
#: builtin/index-pack.c:1041
5710
#: builtin/index-pack.c:1053
5730
5711
msgid "cannot fstat packfile"
5731
5712
msgstr ""
5732
5713
5733
#: builtin/index-pack.c:1044
5714
#: builtin/index-pack.c:1056
5734
5715
msgid "pack has junk at the end"
5735
5716
msgstr ""
5736
5717
5737
#: builtin/index-pack.c:1055
5718
#: builtin/index-pack.c:1067
5738
5719
msgid "confusion beyond insanity in parse_pack_objects()"
5739
5720
msgstr ""
5740
5721
5741
#: builtin/index-pack.c:1078
5722
#: builtin/index-pack.c:1090
5742
5723
msgid "Resolving deltas"
5743
5724
msgstr ""
5744
5725
5745
#: builtin/index-pack.c:1088
5726
#: builtin/index-pack.c:1100
5746
5727
#, c-format
5747
5728
msgid "unable to create thread: %s"
5748
5729
msgstr ""
5749
5730
5750
#: builtin/index-pack.c:1130
5731
#: builtin/index-pack.c:1142
5751
5732
msgid "confusion beyond insanity"
5752
5733
msgstr ""
5753
5734
5754
#: builtin/index-pack.c:1138
5735
#: builtin/index-pack.c:1150
5755
5736
#, c-format
5756
5737
msgid "completed with %d local objects"
5757
5738
msgstr ""
5758
5739
5759
#: builtin/index-pack.c:1148
5740
#: builtin/index-pack.c:1160
5760
5741
#, c-format
5761
5742
msgid "Unexpected tail checksum for %s (disk corruption?)"
5762
5743
msgstr ""
5763
5744
5764
#: builtin/index-pack.c:1152
5745
#: builtin/index-pack.c:1164
5765
5746
#, c-format
5766
5747
msgid "pack has %d unresolved delta"
5767
5748
msgid_plural "pack has %d unresolved deltas"
5768
5749
msgstr[0] ""
5769
5750
msgstr[1] ""
5770
5751
5771
#: builtin/index-pack.c:1177
5752
#: builtin/index-pack.c:1189
5772
5753
#, c-format
5773
5754
msgid "unable to deflate appended object (%d)"
5774
5755
msgstr ""
5775
5756
5776
#: builtin/index-pack.c:1256
5757
#: builtin/index-pack.c:1268
5777
5758
#, c-format
5778
5759
msgid "local object %s is corrupt"
5779
5760
msgstr ""
5780
5761
5781
#: builtin/index-pack.c:1280
5762
#: builtin/index-pack.c:1292
5782
5763
msgid "error while closing pack file"
5783
5764
msgstr ""
5784
5765
5785
#: builtin/index-pack.c:1293
5766
#: builtin/index-pack.c:1305
5786
5767
#, c-format
5787
5768
msgid "cannot write keep file '%s'"
5788
5769
msgstr ""
5789
5770
5790
#: builtin/index-pack.c:1301
5771
#: builtin/index-pack.c:1313
5791
5772
#, c-format
5792
5773
msgid "cannot close written keep file '%s'"
5793
5774
msgstr ""
5794
5775
5795
#: builtin/index-pack.c:1314
5776
#: builtin/index-pack.c:1326
5796
5777
msgid "cannot store pack file"
5797
5778
msgstr ""
5798
5779
5799
#: builtin/index-pack.c:1325
5780
#: builtin/index-pack.c:1337
5800
5781
msgid "cannot store index file"
5801
5782
msgstr ""
5802
5783
5803
#: builtin/index-pack.c:1358
5784
#: builtin/index-pack.c:1370
5804
5785
#, c-format
5805
5786
msgid "bad pack.indexversion=%<PRIu32>"
5806
5787
msgstr ""
5807
5788
5808
#: builtin/index-pack.c:1364
5789
#: builtin/index-pack.c:1376
5809
5790
#, c-format
5810
5791
msgid "invalid number of threads specified (%d)"
5811
5792
msgstr ""
5812
5793
5813
#: builtin/index-pack.c:1368 builtin/index-pack.c:1546
5794
#: builtin/index-pack.c:1380 builtin/index-pack.c:1559
5814
5795
#, c-format
5815
5796
msgid "no threads support, ignoring %s"
5816
5797
msgstr ""
5817
5798
5818
#: builtin/index-pack.c:1426
5799
#: builtin/index-pack.c:1438
5819
5800
#, c-format
5820
5801
msgid "Cannot open existing pack file '%s'"
5821
5802
msgstr ""
5822
5803
5823
#: builtin/index-pack.c:1428
5804
#: builtin/index-pack.c:1440
5824
5805
#, c-format
5825
5806
msgid "Cannot open existing pack idx file for '%s'"
5826
5807
msgstr ""
5827
5808
5828
#: builtin/index-pack.c:1475
5809
#: builtin/index-pack.c:1487
5829
5810
#, c-format
5830
5811
msgid "non delta: %d object"
5831
5812
msgid_plural "non delta: %d objects"
5832
5813
msgstr[0] ""
5833
5814
msgstr[1] ""
5834
5815
5835
#: builtin/index-pack.c:1482
5816
#: builtin/index-pack.c:1494
5836
5817
#, c-format
5837
5818
msgid "chain length = %d: %lu object"
5838
5819
msgid_plural "chain length = %d: %lu objects"
5839
5820
msgstr[0] ""
5840
5821
msgstr[1] ""
5841
5822
5842
#: builtin/index-pack.c:1510
5823
#: builtin/index-pack.c:1523
5843
5824
msgid "Cannot come back to cwd"
5844
5825
msgstr ""
5845
5826
5846
#: builtin/index-pack.c:1558 builtin/index-pack.c:1561
5847
#: builtin/index-pack.c:1573 builtin/index-pack.c:1577
5827
#: builtin/index-pack.c:1571 builtin/index-pack.c:1574
5828
#: builtin/index-pack.c:1586 builtin/index-pack.c:1590
5848
5829
#, c-format
5849
5830
msgid "bad %s"
5850
5831
msgstr ""
5851
5832
5852
#: builtin/index-pack.c:1591
5833
#: builtin/index-pack.c:1604
5853
5834
msgid "--fix-thin cannot be used without --stdin"
5854
5835
msgstr ""
5855
5836
5856
#: builtin/index-pack.c:1595 builtin/index-pack.c:1605
5837
#: builtin/index-pack.c:1608 builtin/index-pack.c:1617
5857
5838
#, c-format
5858
5839
msgid "packfile name '%s' does not end with '.pack'"
5859
5840
msgstr ""
5860
5841
5861
#: builtin/index-pack.c:1614
5842
#: builtin/index-pack.c:1625
5862
5843
msgid "--verify with no packfile name given"
5863
5844
msgstr ""
5864
5845
5947
5928
msgid "unable to move %s to %s"
5948
5929
msgstr ""
5949
5930
5950
#.
5951
#. * TRANSLATORS: The first '%s' is either "Reinitialized
5952
#. * existing" or "Initialized empty", the second " shared" or
5953
#. * "", and the last '%s%s' is the verbatim directory name.
5954
#.
5955
#: builtin/init-db.c:420
5931
#. TRANSLATORS: The first '%s' is either "Reinitialized
5932
#. existing" or "Initialized empty", the second " shared" or
5933
#. "", and the last '%s%s' is the verbatim directory name.
5934
#: builtin/init-db.c:418
5956
5935
#, c-format
5957
5936
msgid "%s%s Git repository in %s%s\n"
5958
5937
msgstr ""
5959
5938
5960
#: builtin/init-db.c:421
5939
#: builtin/init-db.c:419
5961
5940
msgid "Reinitialized existing"
5962
5941
msgstr ""
5963
5942
5964
#: builtin/init-db.c:421
5943
#: builtin/init-db.c:419
5965
5944
msgid "Initialized empty"
5966
5945
msgstr ""
5967
5946
5968
#: builtin/init-db.c:422
5947
#: builtin/init-db.c:420
5969
5948
msgid " shared"
5970
5949
msgstr ""
5971
5950
5972
#: builtin/init-db.c:441
5951
#: builtin/init-db.c:439
5973
5952
msgid "cannot tell cwd"
5974
5953
msgstr ""
5975
5954
5976
#: builtin/init-db.c:467
5955
#: builtin/init-db.c:465
5977
5956
msgid ""
5978
5957
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
5979
5958
"shared[=<permissions>]] [directory]"
5980
5959
msgstr ""
5981
5960
5982
#: builtin/init-db.c:490
5961
#: builtin/init-db.c:488
5983
5962
msgid "permissions"
5984
5963
msgstr ""
5985
5964
5986
#: builtin/init-db.c:491
5965
#: builtin/init-db.c:489
5987
5966
msgid "specify that the git repository is to be shared amongst several users"
5988
5967
msgstr ""
5989
5968
5990
#: builtin/init-db.c:493 builtin/prune-packed.c:79 builtin/repack.c:155
5969
#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172
5991
5970
msgid "be quiet"
5992
5971
msgstr ""
5993
5972
5994
#: builtin/init-db.c:525 builtin/init-db.c:530
5973
#: builtin/init-db.c:523 builtin/init-db.c:528
5995
5974
#, c-format
5996
5975
msgid "cannot mkdir %s"
5997
5976
msgstr ""
5998
5977
5999
#: builtin/init-db.c:534
5978
#: builtin/init-db.c:532
6000
5979
#, c-format
6001
5980
msgid "cannot chdir to %s"
6002
5981
msgstr ""
6003
5982
6004
#: builtin/init-db.c:556
5983
#: builtin/init-db.c:554
6005
5984
#, c-format
6006
5985
msgid ""
6007
5986
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
6008
5987
"dir=<directory>)"
6009
5988
msgstr ""
6010
5989
6011
#: builtin/init-db.c:580
5990
#: builtin/init-db.c:578
6012
5991
msgid "Cannot access current working directory"
6013
5992
msgstr ""
6014
5993
6015
#: builtin/init-db.c:587
5994
#: builtin/init-db.c:585
6016
5995
#, c-format
6017
5996
msgid "Cannot access work tree '%s'"
6018
5997
msgstr ""
6025
6004
msgid " or: git show [options] <object>..."
6026
6005
msgstr ""
6027
6006
6028
#: builtin/log.c:125
6007
#: builtin/log.c:127
6029
6008
msgid "suppress diff output"
6030
6009
msgstr ""
6031
6010
6032
#: builtin/log.c:126
6011
#: builtin/log.c:128
6033
6012
msgid "show source"
6034
6013
msgstr ""
6035
6014
6036
#: builtin/log.c:127
6015
#: builtin/log.c:129
6037
6016
msgid "Use mail map file"
6038
6017
msgstr ""
6039
6018
6040
#: builtin/log.c:128
6019
#: builtin/log.c:130
6041
6020
msgid "decorate options"
6042
6021
msgstr ""
6043
6022
6044
#: builtin/log.c:231
6023
#: builtin/log.c:229
6045
6024
#, c-format
6046
6025
msgid "Final output: %d %s\n"
6047
6026
msgstr ""
6048
6027
6049
#: builtin/log.c:473 builtin/log.c:565
6028
#: builtin/log.c:470 builtin/log.c:562
6050
6029
#, c-format
6051
6030
msgid "Could not read object %s"
6052
6031
msgstr ""
6053
6032
6054
#: builtin/log.c:589
6033
#: builtin/log.c:586
6055
6034
#, c-format
6056
6035
msgid "Unknown type: %d"
6057
6036
msgstr ""
6058
6037
6059
#: builtin/log.c:689
6038
#: builtin/log.c:687
6060
6039
msgid "format.headers without value"
6061
6040
msgstr ""
6062
6041
6077
6056
msgid "Not a range."
6078
6057
msgstr ""
6079
6058
6080
#: builtin/log.c:911
6059
#: builtin/log.c:916
6081
6060
msgid "Cover letter needs email format"
6082
6061
msgstr ""
6083
6062
6084
#: builtin/log.c:987
6063
#: builtin/log.c:995
6085
6064
#, c-format
6086
6065
msgid "insane in-reply-to: %s"
6087
6066
msgstr ""
6088
6067
6089
#: builtin/log.c:1015
6068
#: builtin/log.c:1023
6090
6069
msgid "git format-patch [options] [<since> | <revision range>]"
6091
6070
msgstr ""
6092
6071
6093
#: builtin/log.c:1060
6072
#: builtin/log.c:1068
6094
6073
msgid "Two output directories?"
6095
6074
msgstr ""
6096
6075
6097
#: builtin/log.c:1175
6076
#: builtin/log.c:1183
6098
6077
msgid "use [PATCH n/m] even with a single patch"
6099
6078
msgstr ""
6100
6079
6101
#: builtin/log.c:1178
6080
#: builtin/log.c:1186
6102
6081
msgid "use [PATCH] even with multiple patches"
6103
6082
msgstr ""
6104
6083
6105
#: builtin/log.c:1182
6084
#: builtin/log.c:1190
6106
6085
msgid "print patches to standard out"
6107
6086
msgstr ""
6108
6087
6109
#: builtin/log.c:1184
6088
#: builtin/log.c:1192
6110
6089
msgid "generate a cover letter"
6111
6090
msgstr ""
6112
6091
6113
#: builtin/log.c:1186
6092
#: builtin/log.c:1194
6114
6093
msgid "use simple number sequence for output file names"
6115
6094
msgstr ""
6116
6095
6117
#: builtin/log.c:1187
6096
#: builtin/log.c:1195
6118
6097
msgid "sfx"
6119
6098
msgstr ""
6120
6099
6121
#: builtin/log.c:1188
6100
#: builtin/log.c:1196
6122
6101
msgid "use <sfx> instead of '.patch'"
6123
6102
msgstr ""
6124
6103
6125
#: builtin/log.c:1190
6104
#: builtin/log.c:1198
6126
6105
msgid "start numbering patches at <n> instead of 1"
6127
6106
msgstr ""
6128
6107
6129
#: builtin/log.c:1192
6108
#: builtin/log.c:1200
6130
6109
msgid "mark the series as Nth re-roll"
6131
6110
msgstr ""
6132
6111
6133
#: builtin/log.c:1194
6112
#: builtin/log.c:1202
6134
6113
msgid "Use [<prefix>] instead of [PATCH]"
6135
6114
msgstr ""
6136
6115
6137
#: builtin/log.c:1197
6116
#: builtin/log.c:1205
6138
6117
msgid "store resulting files in <dir>"
6139
6118
msgstr ""
6140
6119
6141
#: builtin/log.c:1200
6120
#: builtin/log.c:1208
6142
6121
msgid "don't strip/add [PATCH]"
6143
6122
msgstr ""
6144
6123
6145
#: builtin/log.c:1203
6124
#: builtin/log.c:1211
6146
6125
msgid "don't output binary diffs"
6147
6126
msgstr ""
6148
6127
6149
#: builtin/log.c:1205
6128
#: builtin/log.c:1213
6150
6129
msgid "don't include a patch matching a commit upstream"
6151
6130
msgstr ""
6152
6131
6153
#: builtin/log.c:1207
6132
#: builtin/log.c:1215
6154
6133
msgid "show patch format instead of default (patch + stat)"
6155
6134
msgstr ""
6156
6135
6157
#: builtin/log.c:1209
6136
#: builtin/log.c:1217
6158
6137
msgid "Messaging"
6159
6138
msgstr ""
6160
6139
6161
#: builtin/log.c:1210
6140
#: builtin/log.c:1218
6162
6141
msgid "header"
6163
6142
msgstr ""
6164
6143
6165
#: builtin/log.c:1211
6144
#: builtin/log.c:1219
6166
6145
msgid "add email header"
6167
6146
msgstr ""
6168
6147
6169
#: builtin/log.c:1212 builtin/log.c:1214
6148
#: builtin/log.c:1220 builtin/log.c:1222
6170
6149
msgid "email"
6171
6150
msgstr ""
6172
6151
6173
#: builtin/log.c:1212
6152
#: builtin/log.c:1220
6174
6153
msgid "add To: header"
6175
6154
msgstr ""
6176
6155
6177
#: builtin/log.c:1214
6156
#: builtin/log.c:1222
6178
6157
msgid "add Cc: header"
6179
6158
msgstr ""
6180
6159
6181
#: builtin/log.c:1216
6160
#: builtin/log.c:1224
6182
6161
msgid "ident"
6183
6162
msgstr ""
6184
6163
6185
#: builtin/log.c:1217
6164
#: builtin/log.c:1225
6186
6165
msgid "set From address to <ident> (or committer ident if absent)"
6187
6166
msgstr ""
6188
6167
6189
#: builtin/log.c:1219
6168
#: builtin/log.c:1227
6190
6169
msgid "message-id"
6191
6170
msgstr ""
6192
6171
6193
#: builtin/log.c:1220
6172
#: builtin/log.c:1228
6194
6173
msgid "make first mail a reply to <message-id>"
6195
6174
msgstr ""
6196
6175
6197
#: builtin/log.c:1221 builtin/log.c:1224
6176
#: builtin/log.c:1229 builtin/log.c:1232
6198
6177
msgid "boundary"
6199
6178
msgstr ""
6200
6179
6201
#: builtin/log.c:1222
6180
#: builtin/log.c:1230
6202
6181
msgid "attach the patch"
6203
6182
msgstr ""
6204
6183
6205
#: builtin/log.c:1225
6184
#: builtin/log.c:1233
6206
6185
msgid "inline the patch"
6207
6186
msgstr ""
6208
6187
6209
#: builtin/log.c:1229
6188
#: builtin/log.c:1237
6210
6189
msgid "enable message threading, styles: shallow, deep"
6211
6190
msgstr ""
6212
6191
6213
#: builtin/log.c:1231
6192
#: builtin/log.c:1239
6214
6193
msgid "signature"
6215
6194
msgstr ""
6216
6195
6217
#: builtin/log.c:1232
6196
#: builtin/log.c:1240
6218
6197
msgid "add a signature"
6219
6198
msgstr ""
6220
6199
6222
6201
msgid "add a signature from a file"
6223
6202
msgstr ""
6224
6203
6225
#: builtin/log.c:1233
6204
#: builtin/log.c:1243
6226
6205
msgid "don't print the patch filenames"
6227
6206
msgstr ""
6228
6207
6229
#: builtin/log.c:1307
6208
#: builtin/log.c:1317
6230
6209
#, c-format
6231
6210
msgid "invalid ident line: %s"
6232
6211
msgstr ""
6233
6212
6234
#: builtin/log.c:1322
6213
#: builtin/log.c:1332
6235
6214
msgid "-n and -k are mutually exclusive."
6236
6215
msgstr ""
6237
6216
6238
#: builtin/log.c:1324
6217
#: builtin/log.c:1334
6239
6218
msgid "--subject-prefix and -k are mutually exclusive."
6240
6219
msgstr ""
6241
6220
6242
#: builtin/log.c:1332
6221
#: builtin/log.c:1342
6243
6222
msgid "--name-only does not make sense"
6244
6223
msgstr ""
6245
6224
6246
#: builtin/log.c:1334
6225
#: builtin/log.c:1344
6247
6226
msgid "--name-status does not make sense"
6248
6227
msgstr ""
6249
6228
6250
#: builtin/log.c:1336
6229
#: builtin/log.c:1346
6251
6230
msgid "--check does not make sense"
6252
6231
msgstr ""
6253
6232
6254
#: builtin/log.c:1359
6233
#: builtin/log.c:1369
6255
6234
msgid "standard output, or directory, which one?"
6256
6235
msgstr ""
6257
6236
6258
#: builtin/log.c:1361
6237
#: builtin/log.c:1371
6259
6238
#, c-format
6260
6239
msgid "Could not create directory '%s'"
6261
6240
msgstr ""
6265
6244
msgid "unable to read signature file '%s'"
6266
6245
msgstr ""
6267
6246
6268
#: builtin/log.c:1509
6247
#: builtin/log.c:1531
6269
6248
msgid "Failed to create output files"
6270
6249
msgstr ""
6271
6250
6272
#: builtin/log.c:1558
6251
#: builtin/log.c:1579
6273
6252
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
6274
6253
msgstr ""
6275
6254
6276
#: builtin/log.c:1613
6255
#: builtin/log.c:1634
6277
6256
#, c-format
6278
6257
msgid ""
6279
6258
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
6280
6259
msgstr ""
6281
6260
6282
#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640
6261
#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661
6283
6262
#, c-format
6284
6263
msgid "Unknown commit %s"
6285
6264
msgstr "不明なコミット %s"
6286
6265
6287
#: builtin/ls-files.c:398
6266
#: builtin/ls-files.c:401
6288
6267
msgid "git ls-files [options] [<file>...]"
6289
6268
msgstr ""
6290
6269
6291
#: builtin/ls-files.c:455
6270
#: builtin/ls-files.c:458
6292
6271
msgid "identify the file status with tags"
6293
6272
msgstr ""
6294
6273
6295
#: builtin/ls-files.c:457
6274
#: builtin/ls-files.c:460
6296
6275
msgid "use lowercase letters for 'assume unchanged' files"
6297
6276
msgstr ""
6298
6277
6299
#: builtin/ls-files.c:459
6278
#: builtin/ls-files.c:462
6300
6279
msgid "show cached files in the output (default)"
6301
6280
msgstr ""
6302
6281
6303
#: builtin/ls-files.c:461
6282
#: builtin/ls-files.c:464
6304
6283
msgid "show deleted files in the output"
6305
6284
msgstr ""
6306
6285
6307
#: builtin/ls-files.c:463
6286
#: builtin/ls-files.c:466
6308
6287
msgid "show modified files in the output"
6309
6288
msgstr ""
6310
6289
6311
#: builtin/ls-files.c:465
6290
#: builtin/ls-files.c:468
6312
6291
msgid "show other files in the output"
6313
6292
msgstr ""
6314
6293
6315
#: builtin/ls-files.c:467
6294
#: builtin/ls-files.c:470
6316
6295
msgid "show ignored files in the output"
6317
6296
msgstr ""
6318
6297
6319
#: builtin/ls-files.c:470
6298
#: builtin/ls-files.c:473
6320
6299
msgid "show staged contents' object name in the output"
6321
6300
msgstr ""
6322
6301
6323
#: builtin/ls-files.c:472
6302
#: builtin/ls-files.c:475
6324
6303
msgid "show files on the filesystem that need to be removed"
6325
6304
msgstr ""
6326
6305
6327
#: builtin/ls-files.c:474
6306
#: builtin/ls-files.c:477
6328
6307
msgid "show 'other' directories' name only"
6329
6308
msgstr ""
6330
6309
6331
#: builtin/ls-files.c:477
6310
#: builtin/ls-files.c:480
6332
6311
msgid "don't show empty directories"
6333
6312
msgstr ""
6334
6313
6335
#: builtin/ls-files.c:480
6314
#: builtin/ls-files.c:483
6336
6315
msgid "show unmerged files in the output"
6337
6316
msgstr ""
6338
6317
6339
#: builtin/ls-files.c:482
6318
#: builtin/ls-files.c:485
6340
6319
msgid "show resolve-undo information"
6341
6320
msgstr ""
6342
6321
6343
#: builtin/ls-files.c:484
6322
#: builtin/ls-files.c:487
6344
6323
msgid "skip files matching pattern"
6345
6324
msgstr ""
6346
6325
6347
#: builtin/ls-files.c:487
6326
#: builtin/ls-files.c:490
6348
6327
msgid "exclude patterns are read from <file>"
6349
6328
msgstr ""
6350
6329
6351
#: builtin/ls-files.c:490
6330
#: builtin/ls-files.c:493
6352
6331
msgid "read additional per-directory exclude patterns in <file>"
6353
6332
msgstr ""
6354
6333
6355
#: builtin/ls-files.c:492
6334
#: builtin/ls-files.c:495
6356
6335
msgid "add the standard git exclusions"
6357
6336
msgstr ""
6358
6337
6359
#: builtin/ls-files.c:495
6338
#: builtin/ls-files.c:498
6360
6339
msgid "make the output relative to the project top directory"
6361
6340
msgstr ""
6362
6341
6363
#: builtin/ls-files.c:498
6342
#: builtin/ls-files.c:501
6364
6343
msgid "if any <file> is not in the index, treat this as an error"
6365
6344
msgstr ""
6366
6345
6367
#: builtin/ls-files.c:499
6346
#: builtin/ls-files.c:502
6368
6347
msgid "tree-ish"
6369
6348
msgstr ""
6370
6349
6371
#: builtin/ls-files.c:500
6350
#: builtin/ls-files.c:503
6372
6351
msgid "pretend that paths removed since <tree-ish> are still present"
6373
6352
msgstr ""
6374
6353
6375
#: builtin/ls-files.c:502
6354
#: builtin/ls-files.c:505
6376
6355
msgid "show debugging data"
6377
6356
msgstr ""
6378
6357
6483
6462
msgid "Verify that the named commit has a valid GPG signature"
6484
6463
msgstr ""
6485
6464
6486
#: builtin/merge.c:212 builtin/notes.c:738 builtin/revert.c:89
6465
#: builtin/merge.c:212 builtin/notes.c:742 builtin/revert.c:89
6487
6466
msgid "strategy"
6488
6467
msgstr ""
6489
6468
6556
6535
msgid "Bad branch.%s.mergeoptions string: %s"
6557
6536
msgstr ""
6558
6537
6559
#: builtin/merge.c:650
6538
#: builtin/merge.c:653
6560
6539
msgid "git write-tree failed to write a tree"
6561
6540
msgstr ""
6562
6541
6569
6548
msgid "Unknown option for merge-recursive: -X%s"
6570
6549
msgstr ""
6571
6550
6572
#: builtin/merge.c:706
6551
#: builtin/merge.c:705
6573
6552
#, c-format
6574
6553
msgid "unable to write %s"
6575
6554
msgstr ""
6576
6555
6577
#: builtin/merge.c:795
6556
#: builtin/merge.c:794
6578
6557
#, c-format
6579
6558
msgid "Could not read from '%s'"
6580
6559
msgstr ""
6581
6560
6582
#: builtin/merge.c:804
6561
#: builtin/merge.c:803
6583
6562
#, c-format
6584
6563
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
6585
6564
msgstr ""
6586
6565
6587
#: builtin/merge.c:810
6566
#: builtin/merge.c:809
6588
6567
#, c-format
6589
6568
msgid ""
6590
6569
"Please enter a commit message to explain why this merge is necessary,\n"
6594
6573
"the commit.\n"
6595
6574
msgstr ""
6596
6575
6597
#: builtin/merge.c:834
6576
#: builtin/merge.c:833
6598
6577
msgid "Empty commit message."
6599
6578
msgstr "コミットメッセージが空です。"
6600
6579
6601
#: builtin/merge.c:846
6580
#: builtin/merge.c:845
6602
6581
#, c-format
6603
6582
msgid "Wonderful.\n"
6604
6583
msgstr ""
6605
6584
6606
#: builtin/merge.c:911
6585
#: builtin/merge.c:908
6607
6586
#, c-format
6608
6587
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
6609
6588
msgstr ""
6610
6589
6611
#: builtin/merge.c:927
6590
#: builtin/merge.c:924
6612
6591
#, c-format
6613
6592
msgid "'%s' is not a commit"
6614
6593
msgstr "'%s' はコミットではありません"
6615
6594
6616
#: builtin/merge.c:968
6595
#: builtin/merge.c:965
6617
6596
msgid "No current branch."
6618
6597
msgstr ""
6619
6598
6620
#: builtin/merge.c:970
6599
#: builtin/merge.c:967
6621
6600
msgid "No remote for the current branch."
6622
6601
msgstr ""
6623
6602
6624
#: builtin/merge.c:972
6603
#: builtin/merge.c:969
6625
6604
msgid "No default upstream defined for the current branch."
6626
6605
msgstr ""
6627
6606
6628
#: builtin/merge.c:977
6607
#: builtin/merge.c:974
6629
6608
#, c-format
6630
6609
msgid "No remote-tracking branch for %s from %s"
6631
6610
msgstr ""
6632
6611
6633
#: builtin/merge.c:1133
6612
#: builtin/merge.c:1130
6634
6613
msgid "There is no merge to abort (MERGE_HEAD missing)."
6635
6614
msgstr ""
6636
6615
6637
#: builtin/merge.c:1149 git-pull.sh:31
6616
#: builtin/merge.c:1146 git-pull.sh:31
6638
6617
msgid ""
6639
6618
"You have not concluded your merge (MERGE_HEAD exists).\n"
6640
6619
"Please, commit your changes before you can merge."
6641
6620
msgstr ""
6642
6621
6643
#: builtin/merge.c:1152 git-pull.sh:34
6622
#: builtin/merge.c:1149 git-pull.sh:34
6644
6623
msgid "You have not concluded your merge (MERGE_HEAD exists)."
6645
6624
msgstr ""
6646
6625
6626
#: builtin/merge.c:1153
6627
msgid ""
6628
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6629
"Please, commit your changes before you can merge."
6630
msgstr ""
6631
6647
6632
#: builtin/merge.c:1156
6648
msgid ""
6649
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
6650
"Please, commit your changes before you can merge."
6651
msgstr ""
6652
6653
#: builtin/merge.c:1159
6654
6633
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
6655
6634
msgstr ""
6656
6635
6657
#: builtin/merge.c:1168
6636
#: builtin/merge.c:1165
6658
6637
msgid "You cannot combine --squash with --no-ff."
6659
6638
msgstr ""
6660
6639
6661
#: builtin/merge.c:1177
6640
#: builtin/merge.c:1174
6662
6641
msgid "No commit specified and merge.defaultToUpstream not set."
6663
6642
msgstr ""
6664
6643
6644
#: builtin/merge.c:1206
6645
msgid "Can merge only exactly one commit into empty head"
6646
msgstr ""
6647
6665
6648
#: builtin/merge.c:1209
6666
msgid "Can merge only exactly one commit into empty head"
6667
msgstr ""
6668
6669
#: builtin/merge.c:1212
6670
6649
msgid "Squash commit into empty head not supported yet"
6671
6650
msgstr ""
6672
6651
6673
#: builtin/merge.c:1214
6652
#: builtin/merge.c:1211
6674
6653
msgid "Non-fast-forward commit does not make sense into an empty head"
6675
6654
msgstr ""
6676
6655
6677
#: builtin/merge.c:1219
6656
#: builtin/merge.c:1216
6678
6657
#, c-format
6679
6658
msgid "%s - not something we can merge"
6680
6659
msgstr ""
6681
6660
6661
#: builtin/merge.c:1267
6662
#, c-format
6663
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6664
msgstr ""
6665
6682
6666
#: builtin/merge.c:1270
6683
6667
#, c-format
6684
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
6668
msgid "Commit %s has a bad GPG signature allegedly by %s."
6685
6669
msgstr ""
6686
6670
6687
6671
#: builtin/merge.c:1273
6688
6672
#, c-format
6689
msgid "Commit %s has a bad GPG signature allegedly by %s."
6673
msgid "Commit %s does not have a GPG signature."
6690
6674
msgstr ""
6691
6675
6692
#. 'N'
6693
6676
#: builtin/merge.c:1276
6694
6677
#, c-format
6695
msgid "Commit %s does not have a GPG signature."
6696
msgstr ""
6697
6698
#: builtin/merge.c:1279
6699
#, c-format
6700
6678
msgid "Commit %s has a good GPG signature by %s\n"
6701
6679
msgstr ""
6702
6680
6703
#: builtin/merge.c:1363
6681
#: builtin/merge.c:1357
6704
6682
#, c-format
6705
6683
msgid "Updating %s..%s\n"
6706
6684
msgstr ""
6707
6685
6708
#: builtin/merge.c:1402
6686
#: builtin/merge.c:1396
6709
6687
#, c-format
6710
6688
msgid "Trying really trivial in-index merge...\n"
6711
6689
msgstr ""
6712
6690
6713
#: builtin/merge.c:1409
6691
#: builtin/merge.c:1403
6714
6692
#, c-format
6715
6693
msgid "Nope.\n"
6716
6694
msgstr ""
6717
6695
6718
#: builtin/merge.c:1441
6696
#: builtin/merge.c:1435
6719
6697
msgid "Not possible to fast-forward, aborting."
6720
6698
msgstr ""
6721
6699
6722
#: builtin/merge.c:1464 builtin/merge.c:1543
6700
#: builtin/merge.c:1458 builtin/merge.c:1537
6723
6701
#, c-format
6724
6702
msgid "Rewinding the tree to pristine...\n"
6725
6703
msgstr ""
6726
6704
6727
#: builtin/merge.c:1468
6705
#: builtin/merge.c:1462
6728
6706
#, c-format
6729
6707
msgid "Trying merge strategy %s...\n"
6730
6708
msgstr ""
6731
6709
6732
#: builtin/merge.c:1534
6710
#: builtin/merge.c:1528
6733
6711
#, c-format
6734
6712
msgid "No merge strategy handled the merge.\n"
6735
6713
msgstr ""
6736
6714
6737
#: builtin/merge.c:1536
6715
#: builtin/merge.c:1530
6738
6716
#, c-format
6739
6717
msgid "Merge with strategy %s failed.\n"
6740
6718
msgstr ""
6741
6719
6742
#: builtin/merge.c:1545
6720
#: builtin/merge.c:1539
6743
6721
#, c-format
6744
6722
msgid "Using the %s to prepare resolving by hand.\n"
6745
6723
msgstr ""
6746
6724
6747
#: builtin/merge.c:1557
6725
#: builtin/merge.c:1551
6748
6726
#, c-format
6749
6727
msgid "Automatic merge went well; stopped before committing as requested\n"
6750
6728
msgstr ""
6827
6805
msgid "set labels for file1/orig_file/file2"
6828
6806
msgstr ""
6829
6807
6830
#: builtin/mktree.c:67
6808
#: builtin/mktree.c:64
6831
6809
msgid "git mktree [-z] [--missing] [--batch]"
6832
6810
msgstr ""
6833
6811
6834
#: builtin/mktree.c:153
6812
#: builtin/mktree.c:150
6835
6813
msgid "input is NUL terminated"
6836
6814
msgstr ""
6837
6815
6838
#: builtin/mktree.c:154 builtin/write-tree.c:24
6816
#: builtin/mktree.c:151 builtin/write-tree.c:24
6839
6817
msgid "allow missing objects"
6840
6818
msgstr ""
6841
6819
6842
#: builtin/mktree.c:155
6820
#: builtin/mktree.c:152
6843
6821
msgid "allow creation of more than one tree"
6844
6822
msgstr ""
6845
6823
6886
6864
msgid "Huh? %.*s is in index?"
6887
6865
msgstr ""
6888
6866
6889
#: builtin/mv.c:168
6867
#: builtin/mv.c:169
6890
6868
msgid "source directory is empty"
6891
6869
msgstr ""
6892
6870
6893
#: builtin/mv.c:200
6871
#: builtin/mv.c:205
6894
6872
msgid "not under version control"
6895
6873
msgstr ""
6896
6874
6897
#: builtin/mv.c:202
6875
#: builtin/mv.c:208
6898
6876
msgid "destination exists"
6899
6877
msgstr ""
6900
6878
6901
#: builtin/mv.c:210
6879
#: builtin/mv.c:216
6902
6880
#, c-format
6903
6881
msgid "overwriting '%s'"
6904
6882
msgstr ""
6905
6883
6906
#: builtin/mv.c:213
6884
#: builtin/mv.c:219
6907
6885
msgid "Cannot overwrite"
6908
6886
msgstr ""
6909
6887
6910
#: builtin/mv.c:216
6888
#: builtin/mv.c:222
6911
6889
msgid "multiple sources for the same target"
6912
6890
msgstr ""
6913
6891
6914
#: builtin/mv.c:218
6892
#: builtin/mv.c:224
6915
6893
msgid "destination directory does not exist"
6916
6894
msgstr ""
6917
6895
6918
#: builtin/mv.c:233
6896
#: builtin/mv.c:244
6919
6897
#, c-format
6920
6898
msgid "%s, source=%s, destination=%s"
6921
6899
msgstr ""
6922
6900
6923
#: builtin/mv.c:243
6901
#: builtin/mv.c:254
6924
6902
#, c-format
6925
6903
msgid "Renaming %s to %s\n"
6926
6904
msgstr ""
6927
6905
6928
#: builtin/mv.c:246 builtin/remote.c:726 builtin/repack.c:328
6906
#: builtin/mv.c:257 builtin/remote.c:725 builtin/repack.c:358
6929
6907
#, c-format
6930
6908
msgid "renaming '%s' failed"
6931
6909
msgstr ""
6932
6910
6933
#: builtin/name-rev.c:258
6911
#: builtin/name-rev.c:255
6934
6912
msgid "git name-rev [options] <commit>..."
6935
6913
msgstr ""
6936
6914
6937
#: builtin/name-rev.c:259
6915
#: builtin/name-rev.c:256
6938
6916
msgid "git name-rev [options] --all"
6939
6917
msgstr ""
6940
6918
6941
#: builtin/name-rev.c:260
6919
#: builtin/name-rev.c:257
6942
6920
msgid "git name-rev [options] --stdin"
6943
6921
msgstr ""
6944
6922
6945
#: builtin/name-rev.c:312
6923
#: builtin/name-rev.c:309
6946
6924
msgid "print only names (no SHA-1)"
6947
6925
msgstr ""
6948
6926
6949
#: builtin/name-rev.c:313
6927
#: builtin/name-rev.c:310
6950
6928
msgid "only use tags to name the commits"
6951
6929
msgstr ""
6952
6930
6953
#: builtin/name-rev.c:315
6931
#: builtin/name-rev.c:312
6954
6932
msgid "only use refs matching <pattern>"
6955
6933
msgstr ""
6956
6934
6957
#: builtin/name-rev.c:317
6935
#: builtin/name-rev.c:314
6958
6936
msgid "list all commits reachable from all refs"
6959
6937
msgstr ""
6960
6938
6961
#: builtin/name-rev.c:318
6939
#: builtin/name-rev.c:315
6962
6940
msgid "read from stdin"
6963
6941
msgstr ""
6964
6942
6965
#: builtin/name-rev.c:319
6943
#: builtin/name-rev.c:316
6966
6944
msgid "allow to print `undefined` names (default)"
6967
6945
msgstr ""
6968
6946
6969
#: builtin/name-rev.c:325
6947
#: builtin/name-rev.c:322
6970
6948
msgid "dereference tags in the input (internal use)"
6971
6949
msgstr ""
6972
6950
7089
7067
msgid "failed to finish 'show' for object '%s'"
7090
7068
msgstr ""
7091
7069
7092
#: builtin/notes.c:167 builtin/tag.c:341
7070
#: builtin/notes.c:167 builtin/tag.c:477
7093
7071
#, c-format
7094
7072
msgid "could not create file '%s'"
7095
7073
msgstr ""
7098
7076
msgid "Please supply the note contents using either -m or -F option"
7099
7077
msgstr ""
7100
7078
7101
#: builtin/notes.c:207 builtin/notes.c:844
7079
#: builtin/notes.c:207 builtin/notes.c:848
7102
7080
#, c-format
7103
7081
msgid "Removing note for object %s\n"
7104
7082
msgstr ""
7112
7090
msgid "The note contents has been left in %s"
7113
7091
msgstr ""
7114
7092
7115
#: builtin/notes.c:248 builtin/tag.c:537
7093
#: builtin/notes.c:248 builtin/tag.c:692
7116
7094
#, c-format
7117
7095
msgid "cannot read '%s'"
7118
7096
msgstr ""
7119
7097
7120
#: builtin/notes.c:250 builtin/tag.c:540
7098
#: builtin/notes.c:250 builtin/tag.c:695
7121
7099
#, c-format
7122
7100
msgid "could not open or read '%s'"
7123
7101
msgstr ""
7124
7102
7125
#: builtin/notes.c:269 builtin/notes.c:316 builtin/notes.c:318
7126
#: builtin/notes.c:378 builtin/notes.c:432 builtin/notes.c:515
7127
#: builtin/notes.c:520 builtin/notes.c:595 builtin/notes.c:637
7128
#: builtin/notes.c:839 builtin/tag.c:553
7103
#: builtin/notes.c:269 builtin/notes.c:320 builtin/notes.c:322
7104
#: builtin/notes.c:382 builtin/notes.c:436 builtin/notes.c:519
7105
#: builtin/notes.c:524 builtin/notes.c:599 builtin/notes.c:641
7106
#: builtin/notes.c:843 builtin/tag.c:708
7129
7107
#, c-format
7130
7108
msgid "Failed to resolve '%s' as a valid ref."
7131
7109
msgstr ""
7140
7118
msgid "Cannot read note data from non-blob object '%s'."
7141
7119
msgstr ""
7142
7120
7143
#: builtin/notes.c:312
7121
#: builtin/notes.c:316
7144
7122
#, c-format
7145
7123
msgid "Malformed input line: '%s'."
7146
7124
msgstr ""
7147
7125
7148
#: builtin/notes.c:327
7126
#: builtin/notes.c:331
7149
7127
#, c-format
7150
7128
msgid "Failed to copy notes from '%s' to '%s'"
7151
7129
msgstr ""
7152
7130
7153
#: builtin/notes.c:371 builtin/notes.c:425 builtin/notes.c:498
7154
#: builtin/notes.c:510 builtin/notes.c:583 builtin/notes.c:630
7155
#: builtin/notes.c:904
7131
#: builtin/notes.c:375 builtin/notes.c:429 builtin/notes.c:502
7132
#: builtin/notes.c:514 builtin/notes.c:587 builtin/notes.c:634
7133
#: builtin/notes.c:908
7156
7134
msgid "too many parameters"
7157
7135
msgstr ""
7158
7136
7159
#: builtin/notes.c:384 builtin/notes.c:643
7137
#: builtin/notes.c:388 builtin/notes.c:647
7160
7138
#, c-format
7161
7139
msgid "No note found for object %s."
7162
7140
msgstr ""
7163
7141
7164
#: builtin/notes.c:406 builtin/notes.c:563
7142
#: builtin/notes.c:410 builtin/notes.c:567
7165
7143
msgid "note contents as a string"
7166
7144
msgstr ""
7167
7145
7168
#: builtin/notes.c:409 builtin/notes.c:566
7146
#: builtin/notes.c:413 builtin/notes.c:570
7169
7147
msgid "note contents in a file"
7170
7148
msgstr ""
7171
7149
7172
#: builtin/notes.c:411 builtin/notes.c:414 builtin/notes.c:568
7173
#: builtin/notes.c:571 builtin/tag.c:474
7150
#: builtin/notes.c:415 builtin/notes.c:418 builtin/notes.c:572
7151
#: builtin/notes.c:575 builtin/tag.c:627
7174
7152
msgid "object"
7175
7153
msgstr ""
7176
7154
7177
#: builtin/notes.c:412 builtin/notes.c:569
7155
#: builtin/notes.c:416 builtin/notes.c:573
7178
7156
msgid "reuse and edit specified note object"
7179
7157
msgstr ""
7180
7158
7181
#: builtin/notes.c:415 builtin/notes.c:572
7159
#: builtin/notes.c:419 builtin/notes.c:576
7182
7160
msgid "reuse specified note object"
7183
7161
msgstr ""
7184
7162
7185
#: builtin/notes.c:417 builtin/notes.c:485
7163
#: builtin/notes.c:421 builtin/notes.c:489
7186
7164
msgid "replace existing notes"
7187
7165
msgstr ""
7188
7166
7189
#: builtin/notes.c:451
7167
#: builtin/notes.c:455
7190
7168
#, c-format
7191
7169
msgid ""
7192
7170
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
7193
7171
"existing notes"
7194
7172
msgstr ""
7195
7173
7196
#: builtin/notes.c:456 builtin/notes.c:533
7174
#: builtin/notes.c:460 builtin/notes.c:537
7197
7175
#, c-format
7198
7176
msgid "Overwriting existing notes for object %s\n"
7199
7177
msgstr ""
7200
7178
7201
#: builtin/notes.c:486
7179
#: builtin/notes.c:490
7202
7180
msgid "read objects from stdin"
7203
7181
msgstr ""
7204
7182
7205
#: builtin/notes.c:488
7183
#: builtin/notes.c:492
7206
7184
msgid "load rewriting config for <command> (implies --stdin)"
7207
7185
msgstr ""
7208
7186
7209
#: builtin/notes.c:506
7187
#: builtin/notes.c:510
7210
7188
msgid "too few parameters"
7211
7189
msgstr ""
7212
7190
7213
#: builtin/notes.c:527
7191
#: builtin/notes.c:531
7214
7192
#, c-format
7215
7193
msgid ""
7216
7194
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
7217
7195
"existing notes"
7218
7196
msgstr ""
7219
7197
7220
#: builtin/notes.c:539
7198
#: builtin/notes.c:543
7221
7199
#, c-format
7222
7200
msgid "Missing notes on source object %s. Cannot copy."
7223
7201
msgstr ""
7224
7202
7225
#: builtin/notes.c:588
7203
#: builtin/notes.c:592
7226
7204
#, c-format
7227
7205
msgid ""
7228
7206
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
7229
7207
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
7230
7208
msgstr ""
7231
7209
7232
#: builtin/notes.c:735
7210
#: builtin/notes.c:739
7233
7211
msgid "General options"
7234
7212
msgstr ""
7235
7213
7236
#: builtin/notes.c:737
7214
#: builtin/notes.c:741
7237
7215
msgid "Merge options"
7238
7216
msgstr ""
7239
7217
7240
#: builtin/notes.c:739
7218
#: builtin/notes.c:743
7241
7219
msgid ""
7242
7220
"resolve notes conflicts using the given strategy "
7243
7221
"(manual/ours/theirs/union/cat_sort_uniq)"
7244
7222
msgstr ""
7245
7223
7246
#: builtin/notes.c:741
7224
#: builtin/notes.c:745
7247
7225
msgid "Committing unmerged notes"
7248
7226
msgstr ""
7249
7227
7250
#: builtin/notes.c:743
7228
#: builtin/notes.c:747
7251
7229
msgid "finalize notes merge by committing unmerged notes"
7252
7230
msgstr ""
7253
7231
7254
#: builtin/notes.c:745
7232
#: builtin/notes.c:749
7255
7233
msgid "Aborting notes merge resolution"
7256
7234
msgstr ""
7257
7235
7258
#: builtin/notes.c:747
7236
#: builtin/notes.c:751
7259
7237
msgid "abort notes merge"
7260
7238
msgstr ""
7261
7239
7262
#: builtin/notes.c:842
7240
#: builtin/notes.c:846
7263
7241
#, c-format
7264
7242
msgid "Object %s has no note\n"
7265
7243
msgstr ""
7266
7244
7267
#: builtin/notes.c:854
7245
#: builtin/notes.c:858
7268
7246
msgid "attempt to remove non-existent note is not an error"
7269
7247
msgstr ""
7270
7248
7271
#: builtin/notes.c:857
7249
#: builtin/notes.c:861
7272
7250
msgid "read object names from the standard input"
7273
7251
msgstr ""
7274
7252
7276
7254
msgid "notes-ref"
7277
7255
msgstr ""
7278
7256
7279
#: builtin/notes.c:939
7257
#: builtin/notes.c:943
7280
7258
msgid "use notes from <notes_ref>"
7281
7259
msgstr ""
7282
7260
7283
#: builtin/notes.c:974 builtin/remote.c:1593
7261
#: builtin/notes.c:978 builtin/remote.c:1616
7284
7262
#, c-format
7285
7263
msgid "Unknown subcommand: %s"
7286
7264
msgstr ""
7287
7265
7288
#: builtin/pack-objects.c:23
7266
#: builtin/pack-objects.c:25
7289
7267
msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"
7290
7268
msgstr ""
7291
7269
7292
#: builtin/pack-objects.c:24
7270
#: builtin/pack-objects.c:26
7293
7271
msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"
7294
7272
msgstr ""
7295
7273
7296
#: builtin/pack-objects.c:184 builtin/pack-objects.c:187
7274
#: builtin/pack-objects.c:175 builtin/pack-objects.c:178
7297
7275
#, c-format
7298
7276
msgid "deflate error (%d)"
7299
7277
msgstr ""
7310
7288
msgid "Compressing objects"
7311
7289
msgstr ""
7312
7290
7313
#: builtin/pack-objects.c:2396
7291
#: builtin/pack-objects.c:2526
7314
7292
#, c-format
7315
7293
msgid "unsupported index version %s"
7316
7294
msgstr ""
7317
7295
7318
#: builtin/pack-objects.c:2400
7296
#: builtin/pack-objects.c:2530
7319
7297
#, c-format
7320
7298
msgid "bad index version '%s'"
7321
7299
msgstr ""
7322
7300
7323
#: builtin/pack-objects.c:2423
7301
#: builtin/pack-objects.c:2553
7324
7302
#, c-format
7325
7303
msgid "option %s does not accept negative form"
7326
7304
msgstr ""
7327
7305
7328
#: builtin/pack-objects.c:2427
7306
#: builtin/pack-objects.c:2557
7329
7307
#, c-format
7330
7308
msgid "unable to parse value '%s' for option %s"
7331
7309
msgstr ""
7332
7310
7333
#: builtin/pack-objects.c:2446
7311
#: builtin/pack-objects.c:2576
7334
7312
msgid "do not show progress meter"
7335
7313
msgstr ""
7336
7314
7337
#: builtin/pack-objects.c:2448
7315
#: builtin/pack-objects.c:2578
7338
7316
msgid "show progress meter"
7339
7317
msgstr ""
7340
7318
7341
#: builtin/pack-objects.c:2450
7319
#: builtin/pack-objects.c:2580
7342
7320
msgid "show progress meter during object writing phase"
7343
7321
msgstr ""
7344
7322
7345
#: builtin/pack-objects.c:2453
7323
#: builtin/pack-objects.c:2583
7346
7324
msgid "similar to --all-progress when progress meter is shown"
7347
7325
msgstr ""
7348
7326
7349
#: builtin/pack-objects.c:2454
7327
#: builtin/pack-objects.c:2584
7350
7328
msgid "version[,offset]"
7351
7329
msgstr ""
7352
7330
7353
#: builtin/pack-objects.c:2455
7331
#: builtin/pack-objects.c:2585
7354
7332
msgid "write the pack index file in the specified idx format version"
7355
7333
msgstr ""
7356
7334
7357
#: builtin/pack-objects.c:2458
7335
#: builtin/pack-objects.c:2588
7358
7336
msgid "maximum size of each output pack file"
7359
7337
msgstr ""
7360
7338
7361
#: builtin/pack-objects.c:2460
7339
#: builtin/pack-objects.c:2590
7362
7340
msgid "ignore borrowed objects from alternate object store"
7363
7341
msgstr ""
7364
7342
7365
#: builtin/pack-objects.c:2462
7343
#: builtin/pack-objects.c:2592
7366
7344
msgid "ignore packed objects"
7367
7345
msgstr ""
7368
7346
7369
#: builtin/pack-objects.c:2464
7347
#: builtin/pack-objects.c:2594
7370
7348
msgid "limit pack window by objects"
7371
7349
msgstr ""
7372
7350
7373
#: builtin/pack-objects.c:2466
7351
#: builtin/pack-objects.c:2596
7374
7352
msgid "limit pack window by memory in addition to object limit"
7375
7353
msgstr ""
7376
7354
7377
#: builtin/pack-objects.c:2468
7355
#: builtin/pack-objects.c:2598
7378
7356
msgid "maximum length of delta chain allowed in the resulting pack"
7379
7357
msgstr ""
7380
7358
7381
#: builtin/pack-objects.c:2470
7359
#: builtin/pack-objects.c:2600
7382
7360
msgid "reuse existing deltas"
7383
7361
msgstr ""
7384
7362
7385
#: builtin/pack-objects.c:2472
7363
#: builtin/pack-objects.c:2602
7386
7364
msgid "reuse existing objects"
7387
7365
msgstr ""
7388
7366
7389
#: builtin/pack-objects.c:2474
7367
#: builtin/pack-objects.c:2604
7390
7368
msgid "use OFS_DELTA objects"
7391
7369
msgstr ""
7392
7370
7393
#: builtin/pack-objects.c:2476
7371
#: builtin/pack-objects.c:2606
7394
7372
msgid "use threads when searching for best delta matches"
7395
7373
msgstr ""
7396
7374
7397
#: builtin/pack-objects.c:2478
7375
#: builtin/pack-objects.c:2608
7398
7376
msgid "do not create an empty pack output"
7399
7377
msgstr ""
7400
7378
7401
#: builtin/pack-objects.c:2480
7379
#: builtin/pack-objects.c:2610
7402
7380
msgid "read revision arguments from standard input"
7403
7381
msgstr ""
7404
7382
7405
#: builtin/pack-objects.c:2482
7383
#: builtin/pack-objects.c:2612
7406
7384
msgid "limit the objects to those that are not yet packed"
7407
7385
msgstr ""
7408
7386
7409
#: builtin/pack-objects.c:2485
7387
#: builtin/pack-objects.c:2615
7410
7388
msgid "include objects reachable from any reference"
7411
7389
msgstr ""
7412
7390
7413
#: builtin/pack-objects.c:2488
7391
#: builtin/pack-objects.c:2618
7414
7392
msgid "include objects referred by reflog entries"
7415
7393
msgstr ""
7416
7394
7417
#: builtin/pack-objects.c:2491
7395
#: builtin/pack-objects.c:2621
7418
7396
msgid "output pack to stdout"
7419
7397
msgstr ""
7420
7398
7421
#: builtin/pack-objects.c:2493
7399
#: builtin/pack-objects.c:2623
7422
7400
msgid "include tag objects that refer to objects to be packed"
7423
7401
msgstr ""
7424
7402
7425
#: builtin/pack-objects.c:2495
7403
#: builtin/pack-objects.c:2625
7426
7404
msgid "keep unreachable objects"
7427
7405
msgstr ""
7428
7406
7429
#: builtin/pack-objects.c:2496 parse-options.h:143
7407
#: builtin/pack-objects.c:2626 parse-options.h:140
7430
7408
msgid "time"
7431
7409
msgstr ""
7432
7410
7433
#: builtin/pack-objects.c:2497
7411
#: builtin/pack-objects.c:2627
7434
7412
msgid "unpack unreachable objects newer than <time>"
7435
7413
msgstr ""
7436
7414
7437
#: builtin/pack-objects.c:2500
7415
#: builtin/pack-objects.c:2630
7438
7416
msgid "create thin packs"
7439
7417
msgstr ""
7440
7418
7441
#: builtin/pack-objects.c:2502
7419
#: builtin/pack-objects.c:2632
7442
7420
msgid "ignore packs that have companion .keep file"
7443
7421
msgstr ""
7444
7422
7445
#: builtin/pack-objects.c:2504
7423
#: builtin/pack-objects.c:2634
7446
7424
msgid "pack compression level"
7447
7425
msgstr ""
7448
7426
7449
#: builtin/pack-objects.c:2506
7427
#: builtin/pack-objects.c:2636
7450
7428
msgid "do not hide commits by grafts"
7451
7429
msgstr ""
7452
7430
7453
#: builtin/pack-objects.c:2642
7431
#: builtin/pack-objects.c:2638
7454
7432
msgid "use a bitmap index if available to speed up counting objects"
7455
7433
msgstr ""
7456
7434
7457
#: builtin/pack-objects.c:2644
7435
#: builtin/pack-objects.c:2640
7458
7436
msgid "write a bitmap index together with the pack index"
7459
7437
msgstr ""
7460
7438
7461
#: builtin/pack-objects.c:2723
7439
#: builtin/pack-objects.c:2719
7462
7440
msgid "Counting objects"
7463
7441
msgstr ""
7464
7442
7502
7480
msgid "git push [<options>] [<repository> [<refspec>...]]"
7503
7481
msgstr ""
7504
7482
7505
#: builtin/push.c:86
7483
#: builtin/push.c:85
7506
7484
msgid "tag shorthand without <tag>"
7507
7485
msgstr ""
7508
7486
7509
#: builtin/push.c:96
7487
#: builtin/push.c:95
7510
7488
msgid "--delete only accepts plain target ref names"
7511
7489
msgstr ""
7512
7490
7513
#: builtin/push.c:141
7491
#: builtin/push.c:139
7514
7492
msgid ""
7515
7493
"\n"
7516
7494
"To choose either option permanently, see push.default in 'git help config'."
7517
7495
msgstr ""
7518
7496
7519
#: builtin/push.c:144
7497
#: builtin/push.c:142
7520
7498
#, c-format
7521
7499
msgid ""
7522
7500
"The upstream branch of your current branch does not match\n"
7531
7509
"%s"
7532
7510
msgstr ""
7533
7511
7534
#: builtin/push.c:159
7512
#: builtin/push.c:157
7535
7513
#, c-format
7536
7514
msgid ""
7537
7515
"You are not currently on a branch.\n"
7541
7519
" git push %s HEAD:<name-of-remote-branch>\n"
7542
7520
msgstr ""
7543
7521
7544
#: builtin/push.c:173
7522
#: builtin/push.c:171
7545
7523
#, c-format
7546
7524
msgid ""
7547
7525
"The current branch %s has no upstream branch.\n"
7550
7528
" git push --set-upstream %s %s\n"
7551
7529
msgstr ""
7552
7530
7553
#: builtin/push.c:181
7531
#: builtin/push.c:179
7554
7532
#, c-format
7555
7533
msgid ""
7556
7534
"The current branch %s has multiple upstream branches, refusing to push."
7557
7535
msgstr ""
7558
7536
7559
#: builtin/push.c:184
7537
#: builtin/push.c:182
7560
7538
#, c-format
7561
7539
msgid ""
7562
7540
"You are pushing to remote '%s', which is not the upstream of\n"
7564
7542
"to update which remote branch."
7565
7543
msgstr ""
7566
7544
7567
#: builtin/push.c:206
7545
#: builtin/push.c:205
7568
7546
msgid ""
7569
7547
"push.default is unset; its implicit value has changed in\n"
7570
7548
"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
7589
7567
"'current' instead of 'simple' if you sometimes use older versions of Git)"
7590
7568
msgstr ""
7591
7569
7592
#: builtin/push.c:274
7570
#: builtin/push.c:272
7593
7571
msgid ""
7594
7572
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
7595
7573
msgstr ""
7596
7574
7597
#: builtin/push.c:281
7575
#: builtin/push.c:279
7598
7576
msgid ""
7599
7577
"Updates were rejected because the tip of your current branch is behind\n"
7600
7578
"its remote counterpart. Integrate the remote changes (e.g.\n"
7602
7580
"See the 'Note about fast-forwards' in 'git push --help' for details."
7603
7581
msgstr ""
7604
7582
7605
#: builtin/push.c:293
7583
#: builtin/push.c:285
7606
7584
msgid ""
7607
7585
"Updates were rejected because a pushed branch tip is behind its remote\n"
7608
7586
"counterpart. Check out this branch and integrate the remote changes\n"
7610
7588
"See the 'Note about fast-forwards' in 'git push --help' for details."
7611
7589
msgstr ""
7612
7590
7613
#: builtin/push.c:299
7591
#: builtin/push.c:291
7614
7592
msgid ""
7615
7593
"Updates were rejected because the remote contains work that you do\n"
7616
7594
"not have locally. This is usually caused by another repository pushing\n"
7619
7597
"See the 'Note about fast-forwards' in 'git push --help' for details."
7620
7598
msgstr ""
7621
7599
7622
#: builtin/push.c:306
7600
#: builtin/push.c:298
7623
7601
msgid "Updates were rejected because the tag already exists in the remote."
7624
7602
msgstr ""
7625
7603
7626
#: builtin/push.c:309
7604
#: builtin/push.c:301
7627
7605
msgid ""
7628
7606
"You cannot update a remote ref that points at a non-commit object,\n"
7629
7607
"or update a remote ref to make it point at a non-commit object,\n"
7630
7608
"without using the '--force' option.\n"
7631
7609
msgstr ""
7632
7610
7633
#: builtin/push.c:375
7611
#: builtin/push.c:360
7634
7612
#, c-format
7635
7613
msgid "Pushing to %s\n"
7636
7614
msgstr ""
7637
7615
7638
#: builtin/push.c:379
7616
#: builtin/push.c:364
7639
7617
#, c-format
7640
7618
msgid "failed to push some refs to '%s'"
7641
7619
msgstr ""
7642
7620
7643
#: builtin/push.c:412
7621
#: builtin/push.c:394
7644
7622
#, c-format
7645
7623
msgid "bad repository '%s'"
7646
7624
msgstr ""
7647
7625
7648
#: builtin/push.c:413
7626
#: builtin/push.c:395
7649
7627
msgid ""
7650
7628
"No configured push destination.\n"
7651
7629
"Either specify the URL from the command-line or configure a remote "
7658
7636
" git push <name>\n"
7659
7637
msgstr ""
7660
7638
7661
#: builtin/push.c:428
7639
#: builtin/push.c:410
7662
7640
msgid "--all and --tags are incompatible"
7663
7641
msgstr ""
7664
7642
7665
#: builtin/push.c:429
7643
#: builtin/push.c:411
7666
7644
msgid "--all can't be combined with refspecs"
7667
7645
msgstr ""
7668
7646
7669
#: builtin/push.c:434
7647
#: builtin/push.c:416
7670
7648
msgid "--mirror and --tags are incompatible"
7671
7649
msgstr ""
7672
7650
7673
#: builtin/push.c:435
7651
#: builtin/push.c:417
7674
7652
msgid "--mirror can't be combined with refspecs"
7675
7653
msgstr ""
7676
7654
7677
#: builtin/push.c:440
7655
#: builtin/push.c:422
7678
7656
msgid "--all and --mirror are incompatible"
7679
7657
msgstr ""
7680
7658
7681
#: builtin/push.c:500
7659
#: builtin/push.c:482
7682
7660
msgid "repository"
7683
7661
msgstr ""
7684
7662
7685
#: builtin/push.c:501
7663
#: builtin/push.c:483
7686
7664
msgid "push all refs"
7687
7665
msgstr ""
7688
7666
7689
#: builtin/push.c:502
7667
#: builtin/push.c:484
7690
7668
msgid "mirror all refs"
7691
7669
msgstr ""
7692
7670
7693
#: builtin/push.c:504
7671
#: builtin/push.c:486
7694
7672
msgid "delete refs"
7695
7673
msgstr ""
7696
7674
7697
#: builtin/push.c:505
7675
#: builtin/push.c:487
7698
7676
msgid "push tags (can't be used with --all or --mirror)"
7699
7677
msgstr ""
7700
7678
7701
#: builtin/push.c:508
7679
#: builtin/push.c:490
7702
7680
msgid "force updates"
7703
7681
msgstr ""
7704
7682
7705
#: builtin/push.c:510
7683
#: builtin/push.c:492
7706
7684
msgid "refname>:<expect"
7707
7685
msgstr ""
7708
7686
7709
#: builtin/push.c:511
7687
#: builtin/push.c:493
7710
7688
msgid "require old value of ref to be at this value"
7711
7689
msgstr ""
7712
7690
7713
#: builtin/push.c:513
7691
#: builtin/push.c:495
7714
7692
msgid "check"
7715
7693
msgstr ""
7716
7694
7717
#: builtin/push.c:514
7695
#: builtin/push.c:496
7718
7696
msgid "control recursive pushing of submodules"
7719
7697
msgstr ""
7720
7698
7721
#: builtin/push.c:516
7699
#: builtin/push.c:498
7722
7700
msgid "use thin pack"
7723
7701
msgstr ""
7724
7702
7725
#: builtin/push.c:517 builtin/push.c:518
7703
#: builtin/push.c:499 builtin/push.c:500
7726
7704
msgid "receive pack program"
7727
7705
msgstr ""
7728
7706
7729
#: builtin/push.c:519
7707
#: builtin/push.c:501
7730
7708
msgid "set upstream for git pull/status"
7731
7709
msgstr ""
7732
7710
7733
#: builtin/push.c:522
7711
#: builtin/push.c:504
7734
7712
msgid "prune locally removed refs"
7735
7713
msgstr ""
7736
7714
7737
#: builtin/push.c:524
7715
#: builtin/push.c:506
7738
7716
msgid "bypass pre-push hook"
7739
7717
msgstr ""
7740
7718
7741
#: builtin/push.c:525
7719
#: builtin/push.c:507
7742
7720
msgid "push missing but relevant tags"
7743
7721
msgstr ""
7744
7722
7745
#: builtin/push.c:535
7723
#: builtin/push.c:517
7746
7724
msgid "--delete is incompatible with --all, --mirror and --tags"
7747
7725
msgstr ""
7748
7726
7749
#: builtin/push.c:537
7727
#: builtin/push.c:519
7750
7728
msgid "--delete doesn't make sense without any refs"
7751
7729
msgstr ""
7752
7730
7962
7940
msgid "specifying branches to track makes sense only with fetch mirrors"
7963
7941
msgstr ""
7964
7942
7965
#: builtin/remote.c:185 builtin/remote.c:641
7943
#: builtin/remote.c:185 builtin/remote.c:640
7966
7944
#, c-format
7967
7945
msgid "remote %s already exists."
7968
7946
msgstr ""
7969
7947
7970
#: builtin/remote.c:189 builtin/remote.c:645
7948
#: builtin/remote.c:189 builtin/remote.c:644
7971
7949
#, c-format
7972
7950
msgid "'%s' is not a valid remote name"
7973
7951
msgstr ""
7977
7955
msgid "Could not setup master '%s'"
7978
7956
msgstr ""
7979
7957
7980
#: builtin/remote.c:289
7958
#: builtin/remote.c:288
7981
7959
#, c-format
7982
7960
msgid "more than one %s"
7983
7961
msgstr ""
7984
7962
7985
#: builtin/remote.c:334
7963
#: builtin/remote.c:333
7986
7964
#, c-format
7987
7965
msgid "Could not get fetch map for refspec %s"
7988
7966
msgstr ""
7989
7967
7990
#: builtin/remote.c:435 builtin/remote.c:443
7968
#: builtin/remote.c:434 builtin/remote.c:442
7991
7969
msgid "(matching)"
7992
7970
msgstr ""
7993
7971
7994
#: builtin/remote.c:447
7972
#: builtin/remote.c:446
7995
7973
msgid "(delete)"
7996
7974
msgstr ""
7997
7975
7998
#: builtin/remote.c:590 builtin/remote.c:596 builtin/remote.c:602
7976
#: builtin/remote.c:589 builtin/remote.c:595 builtin/remote.c:601
7999
7977
#, c-format
8000
7978
msgid "Could not append '%s' to '%s'"
8001
7979
msgstr ""
8002
7980
8003
#: builtin/remote.c:634 builtin/remote.c:787 builtin/remote.c:885
7981
#: builtin/remote.c:633 builtin/remote.c:794 builtin/remote.c:894
8004
7982
#, c-format
8005
7983
msgid "No such remote: %s"
8006
7984
msgstr ""
8007
7985
8008
#: builtin/remote.c:651
7986
#: builtin/remote.c:650
8009
7987
#, c-format
8010
7988
msgid "Could not rename config section '%s' to '%s'"
8011
7989
msgstr ""
8012
7990
8013
#: builtin/remote.c:657 builtin/remote.c:794
7991
#: builtin/remote.c:656 builtin/remote.c:846
8014
7992
#, c-format
8015
7993
msgid "Could not remove config section '%s'"
8016
7994
msgstr ""
8017
7995
8018
#: builtin/remote.c:672
7996
#: builtin/remote.c:671
8019
7997
#, c-format
8020
7998
msgid ""
8021
7999
"Not updating non-default fetch refspec\n"
8023
8001
"\tPlease update the configuration manually if necessary."
8024
8002
msgstr ""
8025
8003
8026
#: builtin/remote.c:678
8004
#: builtin/remote.c:677
8027
8005
#, c-format
8028
8006
msgid "Could not append '%s'"
8029
8007
msgstr ""
8030
8008
8031
#: builtin/remote.c:689
8009
#: builtin/remote.c:688
8032
8010
#, c-format
8033
8011
msgid "Could not set '%s'"
8034
8012
msgstr ""
8035
8013
8036
#: builtin/remote.c:711
8014
#: builtin/remote.c:710
8037
8015
#, c-format
8038
8016
msgid "deleting '%s' failed"
8039
8017
msgstr ""
8040
8018
8041
#: builtin/remote.c:745
8019
#: builtin/remote.c:744
8042
8020
#, c-format
8043
8021
msgid "creating '%s' failed"
8044
8022
msgstr ""
8045
8023
8046
#: builtin/remote.c:759
8024
#: builtin/remote.c:765
8047
8025
#, c-format
8048
8026
msgid "Could not remove branch %s"
8049
8027
msgstr ""
8050
8028
8051
#: builtin/remote.c:829
8029
#: builtin/remote.c:832
8052
8030
msgid ""
8053
8031
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
8054
8032
"to delete it, use:"
8058
8036
msgstr[0] ""
8059
8037
msgstr[1] ""
8060
8038
8061
#: builtin/remote.c:938
8039
#: builtin/remote.c:947
8062
8040
#, c-format
8063
8041
msgid " new (next fetch will store in remotes/%s)"
8064
8042
msgstr ""
8065
8043
8066
#: builtin/remote.c:941
8044
#: builtin/remote.c:950
8067
8045
msgid " tracked"
8068
8046
msgstr ""
8069
8047
8070
#: builtin/remote.c:943
8048
#: builtin/remote.c:952
8071
8049
msgid " stale (use 'git remote prune' to remove)"
8072
8050
msgstr ""
8073
8051
8074
#: builtin/remote.c:945
8052
#: builtin/remote.c:954
8075
8053
msgid " ???"
8076
8054
msgstr ""
8077
8055
8078
#: builtin/remote.c:986
8056
#: builtin/remote.c:995
8079
8057
#, c-format
8080
8058
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
8081
8059
msgstr ""
8082
8060
8083
#: builtin/remote.c:993
8061
#: builtin/remote.c:1002
8084
8062
#, c-format
8085
8063
msgid "rebases onto remote %s"
8086
8064
msgstr ""
8087
8065
8088
#: builtin/remote.c:996
8066
#: builtin/remote.c:1005
8089
8067
#, c-format
8090
8068
msgid " merges with remote %s"
8091
8069
msgstr ""
8092
8070
8093
#: builtin/remote.c:997
8071
#: builtin/remote.c:1006
8094
8072
msgid " and with remote"
8095
8073
msgstr ""
8096
8074
8097
#: builtin/remote.c:999
8075
#: builtin/remote.c:1008
8098
8076
#, c-format
8099
8077
msgid "merges with remote %s"
8100
8078
msgstr ""
8101
8079
8102
#: builtin/remote.c:1000
8080
#: builtin/remote.c:1009
8103
8081
msgid " and with remote"
8104
8082
msgstr ""
8105
8083
8106
#: builtin/remote.c:1046
8084
#: builtin/remote.c:1055
8107
8085
msgid "create"
8108
8086
msgstr ""
8109
8087
8110
#: builtin/remote.c:1049
8088
#: builtin/remote.c:1058
8111
8089
msgid "delete"
8112
8090
msgstr ""
8113
8091
8114
#: builtin/remote.c:1053
8092
#: builtin/remote.c:1062
8115
8093
msgid "up to date"
8116
8094
msgstr ""
8117
8095
8118
#: builtin/remote.c:1056
8096
#: builtin/remote.c:1065
8119
8097
msgid "fast-forwardable"
8120
8098
msgstr ""
8121
8099
8122
#: builtin/remote.c:1059
8100
#: builtin/remote.c:1068
8123
8101
msgid "local out of date"
8124
8102
msgstr ""
8125
8103
8126
#: builtin/remote.c:1066
8104
#: builtin/remote.c:1075
8127
8105
#, c-format
8128
8106
msgid " %-*s forces to %-*s (%s)"
8129
8107
msgstr ""
8130
8108
8131
#: builtin/remote.c:1069
8109
#: builtin/remote.c:1078
8132
8110
#, c-format
8133
8111
msgid " %-*s pushes to %-*s (%s)"
8134
8112
msgstr ""
8135
8113
8136
#: builtin/remote.c:1073
8114
#: builtin/remote.c:1082
8137
8115
#, c-format
8138
8116
msgid " %-*s forces to %s"
8139
8117
msgstr ""
8140
8118
8141
#: builtin/remote.c:1076
8119
#: builtin/remote.c:1085
8142
8120
#, c-format
8143
8121
msgid " %-*s pushes to %s"
8144
8122
msgstr ""
8145
8123
8146
#: builtin/remote.c:1144
8124
#: builtin/remote.c:1153
8147
8125
msgid "do not query remotes"
8148
8126
msgstr ""
8149
8127
8150
#: builtin/remote.c:1171
8128
#: builtin/remote.c:1180
8151
8129
#, c-format
8152
8130
msgid "* remote %s"
8153
8131
msgstr ""
8154
8132
8155
#: builtin/remote.c:1172
8133
#: builtin/remote.c:1181
8156
8134
#, c-format
8157
8135
msgid " Fetch URL: %s"
8158
8136
msgstr ""
8159
8137
8160
#: builtin/remote.c:1173 builtin/remote.c:1318
8138
#: builtin/remote.c:1182 builtin/remote.c:1329
8161
8139
msgid "(no URL)"
8162
8140
msgstr ""
8163
8141
8164
#: builtin/remote.c:1182 builtin/remote.c:1184
8142
#: builtin/remote.c:1191 builtin/remote.c:1193
8165
8143
#, c-format
8166
8144
msgid " Push URL: %s"
8167
8145
msgstr ""
8168
8146
8169
#: builtin/remote.c:1186 builtin/remote.c:1188 builtin/remote.c:1190
8147
#: builtin/remote.c:1195 builtin/remote.c:1197 builtin/remote.c:1199
8170
8148
#, c-format
8171
8149
msgid " HEAD branch: %s"
8172
8150
msgstr ""
8173
8151
8174
#: builtin/remote.c:1192
8152
#: builtin/remote.c:1201
8175
8153
#, c-format
8176
8154
msgid ""
8177
8155
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
8178
8156
msgstr ""
8179
8157
8180
#: builtin/remote.c:1204
8158
#: builtin/remote.c:1213
8181
8159
#, c-format
8182
8160
msgid " Remote branch:%s"
8183
8161
msgid_plural " Remote branches:%s"
8184
8162
msgstr[0] ""
8185
8163
msgstr[1] ""
8186
8164
8187
#: builtin/remote.c:1207 builtin/remote.c:1234
8165
#: builtin/remote.c:1216 builtin/remote.c:1243
8188
8166
msgid " (status not queried)"
8189
8167
msgstr ""
8190
8168
8191
#: builtin/remote.c:1216
8169
#: builtin/remote.c:1225
8192
8170
msgid " Local branch configured for 'git pull':"
8193
8171
msgid_plural " Local branches configured for 'git pull':"
8194
8172
msgstr[0] ""
8195
8173
msgstr[1] ""
8196
8174
8197
#: builtin/remote.c:1224
8175
#: builtin/remote.c:1233
8198
8176
msgid " Local refs will be mirrored by 'git push'"
8199
8177
msgstr ""
8200
8178
8201
#: builtin/remote.c:1231
8179
#: builtin/remote.c:1240
8202
8180
#, c-format
8203
8181
msgid " Local ref configured for 'git push'%s:"
8204
8182
msgid_plural " Local refs configured for 'git push'%s:"
8205
8183
msgstr[0] ""
8206
8184
msgstr[1] ""
8207
8185
8208
#: builtin/remote.c:1252
8186
#: builtin/remote.c:1261
8209
8187
msgid "set refs/remotes/<name>/HEAD according to remote"
8210
8188
msgstr ""
8211
8189
8212
#: builtin/remote.c:1254
8190
#: builtin/remote.c:1263
8213
8191
msgid "delete refs/remotes/<name>/HEAD"
8214
8192
msgstr ""
8215
8193
8216
#: builtin/remote.c:1269
8194
#: builtin/remote.c:1278
8217
8195
msgid "Cannot determine remote HEAD"
8218
8196
msgstr ""
8219
8197
8220
#: builtin/remote.c:1271
8198
#: builtin/remote.c:1280
8221
8199
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
8222
8200
msgstr ""
8223
8201
8224
#: builtin/remote.c:1281
8202
#: builtin/remote.c:1290
8225
8203
#, c-format
8226
8204
msgid "Could not delete %s"
8227
8205
msgstr ""
8228
8206
8229
#: builtin/remote.c:1289
8207
#: builtin/remote.c:1298
8230
8208
#, c-format
8231
8209
msgid "Not a valid ref: %s"
8232
8210
msgstr ""
8233
8211
8234
#: builtin/remote.c:1291
8212
#: builtin/remote.c:1300
8235
8213
#, c-format
8236
8214
msgid "Could not setup %s"
8237
8215
msgstr ""
8238
8216
8239
#: builtin/remote.c:1307
8217
#: builtin/remote.c:1318
8240
8218
#, c-format
8241
8219
msgid " %s will become dangling!"
8242
8220
msgstr ""
8243
8221
8244
#: builtin/remote.c:1308
8222
#: builtin/remote.c:1319
8245
8223
#, c-format
8246
8224
msgid " %s has become dangling!"
8247
8225
msgstr ""
8248
8226
8249
#: builtin/remote.c:1314
8227
#: builtin/remote.c:1325
8250
8228
#, c-format
8251
8229
msgid "Pruning %s"
8252
8230
msgstr ""
8253
8231
8254
#: builtin/remote.c:1315
8232
#: builtin/remote.c:1326
8255
8233
#, c-format
8256
8234
msgid "URL: %s"
8257
8235
msgstr ""
8258
8236
8259
#: builtin/remote.c:1328
8237
#: builtin/remote.c:1349
8260
8238
#, c-format
8261
8239
msgid " * [would prune] %s"
8262
8240
msgstr ""
8263
8241
8264
#: builtin/remote.c:1331
8242
#: builtin/remote.c:1352
8265
8243
#, c-format
8266
8244
msgid " * [pruned] %s"
8267
8245
msgstr ""
8268
8246
8269
#: builtin/remote.c:1374
8247
#: builtin/remote.c:1397
8270
8248
msgid "prune remotes after fetching"
8271
8249
msgstr ""
8272
8250
8273
#: builtin/remote.c:1440 builtin/remote.c:1514
8251
#: builtin/remote.c:1463 builtin/remote.c:1537
8274
8252
#, c-format
8275
8253
msgid "No such remote '%s'"
8276
8254
msgstr ""
8277
8255
8278
#: builtin/remote.c:1460
8256
#: builtin/remote.c:1483
8279
8257
msgid "add branch"
8280
8258
msgstr ""
8281
8259
8282
#: builtin/remote.c:1467
8260
#: builtin/remote.c:1490
8283
8261
msgid "no remote specified"
8284
8262
msgstr ""
8285
8263
8286
#: builtin/remote.c:1489
8264
#: builtin/remote.c:1512
8287
8265
msgid "manipulate push URLs"
8288
8266
msgstr ""
8289
8267
8290
#: builtin/remote.c:1491
8268
#: builtin/remote.c:1514
8291
8269
msgid "add URL"
8292
8270
msgstr ""
8293
8271
8294
#: builtin/remote.c:1493
8272
#: builtin/remote.c:1516
8295
8273
msgid "delete URLs"
8296
8274
msgstr ""
8297
8275
8298
#: builtin/remote.c:1500
8276
#: builtin/remote.c:1523
8299
8277
msgid "--add --delete doesn't make sense"
8300
8278
msgstr ""
8301
8279
8302
#: builtin/remote.c:1540
8280
#: builtin/remote.c:1563
8303
8281
#, c-format
8304
8282
msgid "Invalid old URL pattern: %s"
8305
8283
msgstr ""
8306
8284
8307
#: builtin/remote.c:1548
8285
#: builtin/remote.c:1571
8308
8286
#, c-format
8309
8287
msgid "No such URL found: %s"
8310
8288
msgstr ""
8311
8289
8312
#: builtin/remote.c:1550
8290
#: builtin/remote.c:1573
8313
8291
msgid "Will not delete all non-push URLs"
8314
8292
msgstr ""
8315
8293
8316
#: builtin/remote.c:1564
8294
#: builtin/remote.c:1587
8317
8295
msgid "be verbose; must be placed before a subcommand"
8318
8296
msgstr ""
8319
8297
8320
#: builtin/repack.c:15
8298
#: builtin/repack.c:17
8321
8299
msgid "git repack [options]"
8322
8300
msgstr ""
8323
8301
8324
#: builtin/repack.c:143
8302
#: builtin/repack.c:160
8325
8303
msgid "pack everything in a single pack"
8326
8304
msgstr ""
8327
8305
8328
#: builtin/repack.c:145
8306
#: builtin/repack.c:162
8329
8307
msgid "same as -a, and turn unreachable objects loose"
8330
8308
msgstr ""
8331
8309
8332
#: builtin/repack.c:148
8310
#: builtin/repack.c:165
8333
8311
msgid "remove redundant packs, and run git-prune-packed"
8334
8312
msgstr ""
8335
8313
8336
#: builtin/repack.c:150
8314
#: builtin/repack.c:167
8337
8315
msgid "pass --no-reuse-delta to git-pack-objects"
8338
8316
msgstr ""
8339
8317
8340
#: builtin/repack.c:152
8318
#: builtin/repack.c:169
8341
8319
msgid "pass --no-reuse-object to git-pack-objects"
8342
8320
msgstr ""
8343
8321
8344
#: builtin/repack.c:154
8322
#: builtin/repack.c:171
8345
8323
msgid "do not run git-update-server-info"
8346
8324
msgstr ""
8347
8325
8348
#: builtin/repack.c:157
8326
#: builtin/repack.c:174
8349
8327
msgid "pass --local to git-pack-objects"
8350
8328
msgstr ""
8351
8329
8352
#: builtin/repack.c:172
8330
#: builtin/repack.c:176
8353
8331
msgid "write bitmap index"
8354
8332
msgstr ""
8355
8333
8356
#: builtin/repack.c:158
8334
#: builtin/repack.c:177
8357
8335
msgid "approxidate"
8358
8336
msgstr ""
8359
8337
8360
#: builtin/repack.c:159
8338
#: builtin/repack.c:178
8361
8339
msgid "with -A, do not loosen objects older than this"
8362
8340
msgstr ""
8363
8341
8364
#: builtin/repack.c:161
8342
#: builtin/repack.c:180
8365
8343
msgid "size of the window used for delta compression"
8366
8344
msgstr ""
8367
8345
8368
#: builtin/repack.c:162 builtin/repack.c:166
8346
#: builtin/repack.c:181 builtin/repack.c:185
8369
8347
msgid "bytes"
8370
8348
msgstr ""
8371
8349
8372
#: builtin/repack.c:163
8350
#: builtin/repack.c:182
8373
8351
msgid "same as the above, but limit memory size instead of entries count"
8374
8352
msgstr ""
8375
8353
8376
#: builtin/repack.c:165
8354
#: builtin/repack.c:184
8377
8355
msgid "limits the maximum delta depth"
8378
8356
msgstr ""
8379
8357
8380
#: builtin/repack.c:167
8358
#: builtin/repack.c:186
8381
8359
msgid "maximum size of each packfile"
8382
8360
msgstr ""
8383
8361
8384
#: builtin/repack.c:184
8362
#: builtin/repack.c:188
8385
8363
msgid "repack objects in packs marked with .keep"
8386
8364
msgstr ""
8387
8365
8388
#: builtin/repack.c:343
8366
#: builtin/repack.c:374
8389
8367
#, c-format
8390
8368
msgid "removing '%s' failed"
8391
8369
msgstr ""
8392
8370
8393
#: builtin/replace.c:17
8371
#: builtin/replace.c:19
8394
8372
msgid "git replace [-f] <object> <replacement>"
8395
8373
msgstr ""
8396
8374
8402
8380
msgid "git replace [-f] --graft <commit> [<parent>...]"
8403
8381
msgstr ""
8404
8382
8405
#: builtin/replace.c:18
8383
#: builtin/replace.c:22
8406
8384
msgid "git replace -d <object>..."
8407
8385
msgstr ""
8408
8386
8409
#: builtin/replace.c:19
8387
#: builtin/replace.c:23
8410
8388
msgid "git replace [--format=<format>] [-l [<pattern>]]"
8411
8389
msgstr ""
8412
8390
8446
8424
msgid "could not write replacement commit for: '%s'"
8447
8425
msgstr ""
8448
8426
8449
#: builtin/replace.c:174
8427
#: builtin/replace.c:429
8450
8428
msgid "list replace refs"
8451
8429
msgstr ""
8452
8430
8453
#: builtin/replace.c:175
8431
#: builtin/replace.c:430
8454
8432
msgid "delete replace refs"
8455
8433
msgstr ""
8456
8434
8462
8440
msgid "change a commit's parents"
8463
8441
msgstr ""
8464
8442
8465
#: builtin/replace.c:176
8443
#: builtin/replace.c:433
8466
8444
msgid "replace the ref if it exists"
8467
8445
msgstr ""
8468
8446
8470
8448
msgid "do not pretty-print contents for --edit"
8471
8449
msgstr ""
8472
8450
8473
#: builtin/replace.c:177
8451
#: builtin/replace.c:435
8474
8452
msgid "use this format"
8475
8453
msgstr ""
8476
8454
8533
8511
msgid "HEAD is now at %s"
8534
8512
msgstr ""
8535
8513
8536
#: builtin/reset.c:172
8514
#: builtin/reset.c:182
8537
8515
#, c-format
8538
8516
msgid "Cannot do a %s reset in the middle of a merge."
8539
8517
msgstr ""
8540
8518
8541
#: builtin/reset.c:262
8519
#: builtin/reset.c:275
8542
8520
msgid "be quiet, only report errors"
8543
8521
msgstr ""
8544
8522
8545
#: builtin/reset.c:264
8523
#: builtin/reset.c:277
8546
8524
msgid "reset HEAD and index"
8547
8525
msgstr ""
8548
8526
8549
#: builtin/reset.c:265
8527
#: builtin/reset.c:278
8550
8528
msgid "reset only HEAD"
8551
8529
msgstr ""
8552
8530
8553
#: builtin/reset.c:267 builtin/reset.c:269
8531
#: builtin/reset.c:280 builtin/reset.c:282
8554
8532
msgid "reset HEAD, index and working tree"
8555
8533
msgstr ""
8556
8534
8557
#: builtin/reset.c:271
8535
#: builtin/reset.c:284
8558
8536
msgid "reset HEAD but keep local changes"
8559
8537
msgstr ""
8560
8538
8561
#: builtin/reset.c:285
8539
#: builtin/reset.c:287
8562
8540
msgid "record only the fact that removed paths will be added later"
8563
8541
msgstr ""
8564
8542
8565
#: builtin/reset.c:289
8543
#: builtin/reset.c:304
8566
8544
#, c-format
8567
8545
msgid "Failed to resolve '%s' as a valid revision."
8568
8546
msgstr ""
8569
8547
8570
#: builtin/reset.c:292 builtin/reset.c:300
8548
#: builtin/reset.c:307 builtin/reset.c:315
8571
8549
#, c-format
8572
8550
msgid "Could not parse object '%s'."
8573
8551
msgstr ""
8574
8552
8575
#: builtin/reset.c:297
8553
#: builtin/reset.c:312
8576
8554
#, c-format
8577
8555
msgid "Failed to resolve '%s' as a valid tree."
8578
8556
msgstr ""
8579
8557
8580
#: builtin/reset.c:306
8558
#: builtin/reset.c:321
8581
8559
msgid "--patch is incompatible with --{hard,mixed,soft}"
8582
8560
msgstr ""
8583
8561
8584
#: builtin/reset.c:315
8562
#: builtin/reset.c:330
8585
8563
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
8586
8564
msgstr ""
8587
8565
8588
#: builtin/reset.c:317
8566
#: builtin/reset.c:332
8589
8567
#, c-format
8590
8568
msgid "Cannot do %s reset with paths."
8591
8569
msgstr ""
8592
8570
8593
#: builtin/reset.c:327
8571
#: builtin/reset.c:342
8594
8572
#, c-format
8595
8573
msgid "%s reset is not allowed in a bare repository"
8596
8574
msgstr ""
8597
8575
8598
#: builtin/reset.c:344
8576
#: builtin/reset.c:346
8599
8577
msgid "-N can only be used with --mixed"
8600
8578
msgstr ""
8601
8579
8602
#: builtin/reset.c:344
8580
#: builtin/reset.c:363
8603
8581
msgid "Unstaged changes after reset:"
8604
8582
msgstr ""
8605
8583
8606
#: builtin/reset.c:350
8584
#: builtin/reset.c:369
8607
8585
#, c-format
8608
8586
msgid "Could not reset index file to revision '%s'."
8609
8587
msgstr ""
8610
8588
8611
#: builtin/reset.c:355
8589
#: builtin/reset.c:373
8612
8590
msgid "Could not write new index file."
8613
8591
msgstr ""
8614
8592
8615
#: builtin/rev-parse.c:359
8593
#: builtin/rev-parse.c:360
8616
8594
msgid "git rev-parse --parseopt [options] -- [<args>...]"
8617
8595
msgstr ""
8618
8596
8619
#: builtin/rev-parse.c:364
8597
#: builtin/rev-parse.c:365
8620
8598
msgid "keep the `--` passed as an arg"
8621
8599
msgstr ""
8622
8600
8623
#: builtin/rev-parse.c:366
8601
#: builtin/rev-parse.c:367
8624
8602
msgid "stop parsing after the first non-option argument"
8625
8603
msgstr ""
8626
8604
8627
#: builtin/rev-parse.c:369
8605
#: builtin/rev-parse.c:370
8628
8606
msgid "output in stuck long form"
8629
8607
msgstr ""
8630
8608
8631
#: builtin/rev-parse.c:486
8609
#: builtin/rev-parse.c:498
8632
8610
msgid ""
8633
8611
"git rev-parse --parseopt [options] -- [<args>...]\n"
8634
8612
" or: git rev-parse --sq-quote [<arg>...]\n"
8694
8672
msgid "option for merge strategy"
8695
8673
msgstr ""
8696
8674
8697
#: builtin/revert.c:102
8675
#: builtin/revert.c:104
8698
8676
msgid "append commit name"
8699
8677
msgstr ""
8700
8678
8701
#: builtin/revert.c:103
8679
#: builtin/revert.c:105
8702
8680
msgid "allow fast-forward"
8703
8681
msgstr ""
8704
8682
8705
#: builtin/revert.c:104
8683
#: builtin/revert.c:106
8706
8684
msgid "preserve initially empty commits"
8707
8685
msgstr ""
8708
8686
8709
#: builtin/revert.c:105
8687
#: builtin/revert.c:107
8710
8688
msgid "allow commits with empty messages"
8711
8689
msgstr ""
8712
8690
8713
#: builtin/revert.c:106
8691
#: builtin/revert.c:108
8714
8692
msgid "keep redundant, empty commits"
8715
8693
msgstr ""
8716
8694
8717
#: builtin/revert.c:110
8695
#: builtin/revert.c:112
8718
8696
msgid "program error"
8719
8697
msgstr ""
8720
8698
8721
#: builtin/revert.c:195
8699
#: builtin/revert.c:197
8722
8700
msgid "revert failed"
8723
8701
msgstr ""
8724
8702
8725
#: builtin/revert.c:210
8703
#: builtin/revert.c:212
8726
8704
msgid "cherry-pick failed"
8727
8705
msgstr ""
8728
8706
8977
8955
msgid "shorten ref output"
8978
8956
msgstr ""
8979
8957
8980
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
8958
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
8981
8959
msgid "reason"
8982
8960
msgstr ""
8983
8961
8984
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:254
8962
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:349
8985
8963
msgid "reason of the update"
8986
8964
msgstr ""
8987
8965
9004
8982
msgid "git tag -v <tagname>..."
9005
8983
msgstr ""
9006
8984
9007
#: builtin/tag.c:60
8985
#: builtin/tag.c:69
9008
8986
#, c-format
9009
8987
msgid "malformed object at '%s'"
9010
8988
msgstr ""
9011
8989
9012
#: builtin/tag.c:207
8990
#: builtin/tag.c:301
9013
8991
#, c-format
9014
8992
msgid "tag name too long: %.*s..."
9015
8993
msgstr ""
9016
8994
9017
#: builtin/tag.c:212
8995
#: builtin/tag.c:306
9018
8996
#, c-format
9019
8997
msgid "tag '%s' not found."
9020
8998
msgstr ""
9021
8999
9022
#: builtin/tag.c:227
9000
#: builtin/tag.c:321
9023
9001
#, c-format
9024
9002
msgid "Deleted tag '%s' (was %s)\n"
9025
9003
msgstr ""
9026
9004
9027
#: builtin/tag.c:239
9005
#: builtin/tag.c:333
9028
9006
#, c-format
9029
9007
msgid "could not verify the tag '%s'"
9030
9008
msgstr ""
9058
9036
msgid "unsupported sort specification '%s' in variable '%s'"
9059
9037
msgstr ""
9060
9038
9061
#: builtin/tag.c:292
9039
#: builtin/tag.c:428
9062
9040
msgid "unable to sign the tag"
9063
9041
msgstr ""
9064
9042
9065
#: builtin/tag.c:294
9043
#: builtin/tag.c:430
9066
9044
msgid "unable to write tag file"
9067
9045
msgstr ""
9068
9046
9069
#: builtin/tag.c:319
9047
#: builtin/tag.c:455
9070
9048
msgid "bad object type."
9071
9049
msgstr ""
9072
9050
9073
#: builtin/tag.c:332
9051
#: builtin/tag.c:468
9074
9052
msgid "tag header too big."
9075
9053
msgstr ""
9076
9054
9077
#: builtin/tag.c:368
9055
#: builtin/tag.c:504
9078
9056
msgid "no tag message?"
9079
9057
msgstr ""
9080
9058
9081
#: builtin/tag.c:374
9059
#: builtin/tag.c:510
9082
9060
#, c-format
9083
9061
msgid "The tag message has been left in %s\n"
9084
9062
msgstr ""
9085
9063
9086
#: builtin/tag.c:423
9064
#: builtin/tag.c:559
9087
9065
msgid "switch 'points-at' requires an object"
9088
9066
msgstr ""
9089
9067
9090
#: builtin/tag.c:425
9068
#: builtin/tag.c:561
9091
9069
#, c-format
9092
9070
msgid "malformed object name '%s'"
9093
9071
msgstr ""
9094
9072
9095
#: builtin/tag.c:445
9073
#: builtin/tag.c:588
9096
9074
msgid "list tag names"
9097
9075
msgstr ""
9098
9076
9099
#: builtin/tag.c:447
9077
#: builtin/tag.c:590
9100
9078
msgid "print <n> lines of each tag message"
9101
9079
msgstr ""
9102
9080
9103
#: builtin/tag.c:449
9081
#: builtin/tag.c:592
9104
9082
msgid "delete tags"
9105
9083
msgstr ""
9106
9084
9107
#: builtin/tag.c:450
9085
#: builtin/tag.c:593
9108
9086
msgid "verify tags"
9109
9087
msgstr ""
9110
9088
9111
#: builtin/tag.c:452
9089
#: builtin/tag.c:595
9112
9090
msgid "Tag creation options"
9113
9091
msgstr ""
9114
9092
9115
#: builtin/tag.c:454
9093
#: builtin/tag.c:597
9116
9094
msgid "annotated tag, needs a message"
9117
9095
msgstr ""
9118
9096
9119
#: builtin/tag.c:456
9097
#: builtin/tag.c:599
9120
9098
msgid "tag message"
9121
9099
msgstr ""
9122
9100
9123
#: builtin/tag.c:458
9101
#: builtin/tag.c:601
9124
9102
msgid "annotated and GPG-signed tag"
9125
9103
msgstr ""
9126
9104
9127
#: builtin/tag.c:462
9105
#: builtin/tag.c:605
9128
9106
msgid "use another key to sign the tag"
9129
9107
msgstr ""
9130
9108
9131
#: builtin/tag.c:463
9109
#: builtin/tag.c:606
9132
9110
msgid "replace the tag if exists"
9133
9111
msgstr ""
9134
9112
9135
#: builtin/tag.c:464
9113
#: builtin/tag.c:607
9136
9114
msgid "show tag list in columns"
9137
9115
msgstr ""
9138
9116
9139
#: builtin/tag.c:521
9117
#: builtin/tag.c:609
9140
9118
msgid "sort tags"
9141
9119
msgstr ""
9142
9120
9143
#: builtin/tag.c:466
9121
#: builtin/tag.c:613
9144
9122
msgid "Tag listing options"
9145
9123
msgstr ""
9146
9124
9147
#: builtin/tag.c:469
9125
#: builtin/tag.c:616 builtin/tag.c:622
9148
9126
msgid "print only tags that contain the commit"
9149
9127
msgstr ""
9150
9128
9151
#: builtin/tag.c:475
9129
#: builtin/tag.c:628
9152
9130
msgid "print only tags of the object"
9153
9131
msgstr ""
9154
9132
9155
#: builtin/tag.c:501
9133
#: builtin/tag.c:654
9156
9134
msgid "--column and -n are incompatible"
9157
9135
msgstr ""
9158
9136
9159
#: builtin/tag.c:578
9137
#: builtin/tag.c:666
9160
9138
msgid "--sort and -n are incompatible"
9161
9139
msgstr ""
9162
9140
9163
#: builtin/tag.c:518
9141
#: builtin/tag.c:673
9164
9142
msgid "-n option is only allowed with -l."
9165
9143
msgstr ""
9166
9144
9167
#: builtin/tag.c:520
9145
#: builtin/tag.c:675
9168
9146
msgid "--contains option is only allowed with -l."
9169
9147
msgstr ""
9170
9148
9171
#: builtin/tag.c:522
9149
#: builtin/tag.c:677
9172
9150
msgid "--points-at option is only allowed with -l."
9173
9151
msgstr ""
9174
9152
9175
#: builtin/tag.c:530
9153
#: builtin/tag.c:685
9176
9154
msgid "only one -F or -m option is allowed."
9177
9155
msgstr ""
9178
9156
9179
#: builtin/tag.c:550
9157
#: builtin/tag.c:705
9180
9158
msgid "too many params"
9181
9159
msgstr ""
9182
9160
9183
#: builtin/tag.c:556
9161
#: builtin/tag.c:711
9184
9162
#, c-format
9185
9163
msgid "'%s' is not a valid tag name."
9186
9164
msgstr ""
9187
9165
9188
#: builtin/tag.c:561
9166
#: builtin/tag.c:716
9189
9167
#, c-format
9190
9168
msgid "tag '%s' already exists"
9191
9169
msgstr ""
9192
9170
9193
#: builtin/tag.c:579
9171
#: builtin/tag.c:734
9194
9172
#, c-format
9195
9173
msgid "%s: cannot lock the ref"
9196
9174
msgstr ""
9197
9175
9198
#: builtin/tag.c:581
9176
#: builtin/tag.c:736
9199
9177
#, c-format
9200
9178
msgid "%s: cannot update the ref"
9201
9179
msgstr ""
9202
9180
9203
#: builtin/tag.c:583
9181
#: builtin/tag.c:738
9204
9182
#, c-format
9205
9183
msgid "Updated tag '%s' (was %s)\n"
9206
9184
msgstr ""
9213
9191
msgid "git update-index [options] [--] [<file>...]"
9214
9192
msgstr ""
9215
9193
9216
#: builtin/update-index.c:720
9194
#: builtin/update-index.c:755
9217
9195
msgid "continue refresh even when index needs update"
9218
9196
msgstr ""
9219
9197
9220
#: builtin/update-index.c:723
9198
#: builtin/update-index.c:758
9221
9199
msgid "refresh: ignore submodules"
9222
9200
msgstr ""
9223
9201
9224
#: builtin/update-index.c:726
9202
#: builtin/update-index.c:761
9225
9203
msgid "do not ignore new files"
9226
9204
msgstr ""
9227
9205
9228
#: builtin/update-index.c:728
9206
#: builtin/update-index.c:763
9229
9207
msgid "let files replace directories and vice-versa"
9230
9208
msgstr ""
9231
9209
9232
#: builtin/update-index.c:730
9210
#: builtin/update-index.c:765
9233
9211
msgid "notice files missing from worktree"
9234
9212
msgstr ""
9235
9213
9236
#: builtin/update-index.c:732
9214
#: builtin/update-index.c:767
9237
9215
msgid "refresh even if index contains unmerged entries"
9238
9216
msgstr ""
9239
9217
9240
#: builtin/update-index.c:735
9218
#: builtin/update-index.c:770
9241
9219
msgid "refresh stat information"
9242
9220
msgstr ""
9243
9221
9244
#: builtin/update-index.c:739
9222
#: builtin/update-index.c:774
9245
9223
msgid "like --refresh, but ignore assume-unchanged setting"
9246
9224
msgstr ""
9247
9225
9248
#: builtin/update-index.c:771
9226
#: builtin/update-index.c:778
9249
9227
msgid "<mode>,<object>,<path>"
9250
9228
msgstr ""
9251
9229
9252
#: builtin/update-index.c:744
9230
#: builtin/update-index.c:779
9253
9231
msgid "add the specified entry to the index"
9254
9232
msgstr ""
9255
9233
9256
#: builtin/update-index.c:748
9234
#: builtin/update-index.c:783
9257
9235
msgid "(+/-)x"
9258
9236
msgstr ""
9259
9237
9260
#: builtin/update-index.c:749
9238
#: builtin/update-index.c:784
9261
9239
msgid "override the executable bit of the listed files"
9262
9240
msgstr ""
9263
9241
9264
#: builtin/update-index.c:753
9242
#: builtin/update-index.c:788
9265
9243
msgid "mark files as \"not changing\""
9266
9244
msgstr ""
9267
9245
9268
#: builtin/update-index.c:756
9246
#: builtin/update-index.c:791
9269
9247
msgid "clear assumed-unchanged bit"
9270
9248
msgstr ""
9271
9249
9272
#: builtin/update-index.c:759
9250
#: builtin/update-index.c:794
9273
9251
msgid "mark files as \"index-only\""
9274
9252
msgstr ""
9275
9253
9276
#: builtin/update-index.c:762
9254
#: builtin/update-index.c:797
9277
9255
msgid "clear skip-worktree bit"
9278
9256
msgstr ""
9279
9257
9280
#: builtin/update-index.c:765
9258
#: builtin/update-index.c:800
9281
9259
msgid "add to index only; do not add content to object database"
9282
9260
msgstr ""
9283
9261
9284
#: builtin/update-index.c:767
9262
#: builtin/update-index.c:802
9285
9263
msgid "remove named paths even if present in worktree"
9286
9264
msgstr ""
9287
9265
9288
#: builtin/update-index.c:769
9266
#: builtin/update-index.c:804
9289
9267
msgid "with --stdin: input lines are terminated by null bytes"
9290
9268
msgstr ""
9291
9269
9292
#: builtin/update-index.c:771
9270
#: builtin/update-index.c:806
9293
9271
msgid "read list of paths to be updated from standard input"
9294
9272
msgstr ""
9295
9273
9296
#: builtin/update-index.c:775
9274
#: builtin/update-index.c:810
9297
9275
msgid "add entries from standard input to the index"
9298
9276
msgstr ""
9299
9277
9300
#: builtin/update-index.c:779
9278
#: builtin/update-index.c:814
9301
9279
msgid "repopulate stages #2 and #3 for the listed paths"
9302
9280
msgstr ""
9303
9281
9304
#: builtin/update-index.c:783
9282
#: builtin/update-index.c:818
9305
9283
msgid "only update entries that differ from HEAD"
9306
9284
msgstr ""
9307
9285
9308
#: builtin/update-index.c:787
9286
#: builtin/update-index.c:822
9309
9287
msgid "ignore files missing from worktree"
9310
9288
msgstr ""
9311
9289
9312
#: builtin/update-index.c:790
9290
#: builtin/update-index.c:825
9313
9291
msgid "report actions to standard output"
9314
9292
msgstr ""
9315
9293
9316
#: builtin/update-index.c:792
9294
#: builtin/update-index.c:827
9317
9295
msgid "(for porcelains) forget saved unresolved conflicts"
9318
9296
msgstr ""
9319
9297
9320
#: builtin/update-index.c:796
9298
#: builtin/update-index.c:831
9321
9299
msgid "write index in this format"
9322
9300
msgstr ""
9323
9301
9337
9315
msgid "git update-ref [options] --stdin [-z]"
9338
9316
msgstr ""
9339
9317
9340
#: builtin/update-ref.c:255
9318
#: builtin/update-ref.c:350
9341
9319
msgid "delete the reference"
9342
9320
msgstr ""
9343
9321
9344
#: builtin/update-ref.c:257
9322
#: builtin/update-ref.c:352
9345
9323
msgid "update <refname> not the one it points to"
9346
9324
msgstr ""
9347
9325
9348
#: builtin/update-ref.c:258
9326
#: builtin/update-ref.c:353
9349
9327
msgid "stdin has NUL-terminated arguments"
9350
9328
msgstr ""
9351
9329
9352
#: builtin/update-ref.c:259
9330
#: builtin/update-ref.c:354
9353
9331
msgid "read updates from stdin"
9354
9332
msgstr ""
9355
9333
9369
9347
msgid "print commit contents"
9370
9348
msgstr ""
9371
9349
9372
#: builtin/verify-pack.c:56
9350
#: builtin/verify-pack.c:55
9373
9351
msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..."
9374
9352
msgstr ""
9375
9353
9376
#: builtin/verify-pack.c:66
9354
#: builtin/verify-pack.c:65
9377
9355
msgid "verbose"
9378
9356
msgstr ""
9379
9357
9380
#: builtin/verify-pack.c:68
9358
#: builtin/verify-pack.c:67
9381
9359
msgid "show statistics only"
9382
9360
msgstr ""
9383
9361
9416
9394
msgid "expiry-date"
9417
9395
msgstr ""
9418
9396
9419
#: parse-options.h:161
9397
#: parse-options.h:158
9420
9398
msgid "no-op (backward compatibility)"
9421
9399
msgstr ""
9422
9400
9423
#: parse-options.h:235
9401
#: parse-options.h:232
9424
9402
msgid "be more verbose"
9425
9403
msgstr ""
9426
9404
9427
#: parse-options.h:237
9405
#: parse-options.h:234
9428
9406
msgid "be more quiet"
9429
9407
msgstr ""
9430
9408
9431
#: parse-options.h:243
9409
#: parse-options.h:240
9432
9410
msgid "use <n> digits to display SHA-1s"
9433
9411
msgstr ""
9434
9412
9516
9494
msgid "Create, list, delete or verify a tag object signed with GPG"
9517
9495
msgstr ""
9518
9496
9519
#: git-am.sh:50
9497
#: git-am.sh:52
9520
9498
msgid "You need to set your committer info first"
9521
9499
msgstr ""
9522
9500
9523
#: git-am.sh:95
9501
#: git-am.sh:97
9524
9502
msgid ""
9525
9503
"You seem to have moved HEAD since the last 'am' failure.\n"
9526
9504
"Not rewinding to ORIG_HEAD"
9527
9505
msgstr ""
9528
9506
9529
#: git-am.sh:105
9507
#: git-am.sh:107
9530
9508
#, sh-format
9531
9509
msgid ""
9532
9510
"When you have resolved this problem, run \"$cmdline --continue\".\n"
9534
9512
"To restore the original branch and stop patching, run \"$cmdline --abort\"."
9535
9513
msgstr ""
9536
9514
9537
#: git-am.sh:121
9515
#: git-am.sh:123
9538
9516
msgid "Cannot fall back to three-way merge."
9539
9517
msgstr ""
9540
9518
9541
#: git-am.sh:137
9519
#: git-am.sh:139
9542
9520
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
9543
9521
msgstr ""
9544
9522
9545
#: git-am.sh:139
9523
#: git-am.sh:141
9546
9524
msgid "Using index info to reconstruct a base tree..."
9547
9525
msgstr ""
9548
9526
9549
#: git-am.sh:154
9527
#: git-am.sh:156
9550
9528
msgid ""
9551
9529
"Did you hand edit your patch?\n"
9552
9530
"It does not apply to blobs recorded in its index."
9553
9531
msgstr ""
9554
9532
9555
#: git-am.sh:163
9533
#: git-am.sh:165
9556
9534
msgid "Falling back to patching base and 3-way merge..."
9557
9535
msgstr ""
9558
9536
9559
#: git-am.sh:179
9537
#: git-am.sh:181
9560
9538
msgid "Failed to merge in the changes."
9561
9539
msgstr ""
9562
9540
9563
#: git-am.sh:274
9541
#: git-am.sh:276
9564
9542
msgid "Only one StGIT patch series can be applied at once"
9565
9543
msgstr ""
9566
9544
9567
#: git-am.sh:361
9545
#: git-am.sh:363
9568
9546
#, sh-format
9569
9547
msgid "Patch format $patch_format is not supported."
9570
9548
msgstr ""
9571
9549
9572
#: git-am.sh:363
9550
#: git-am.sh:365
9573
9551
msgid "Patch format detection failed."
9574
9552
msgstr ""
9575
9553
9576
#: git-am.sh:389
9554
#: git-am.sh:392
9577
9555
msgid ""
9578
9556
"The -b/--binary option has been a no-op for long time, and\n"
9579
9557
"it will be removed. Please do not use it anymore."
9580
9558
msgstr ""
9581
9559
9582
#: git-am.sh:479
9560
#: git-am.sh:486
9583
9561
#, sh-format
9584
9562
msgid "previous rebase directory $dotest still exists but mbox given."
9585
9563
msgstr ""
9586
9564
9587
#: git-am.sh:484
9565
#: git-am.sh:491
9588
9566
msgid "Please make up your mind. --skip or --abort?"
9589
9567
msgstr ""
9590
9568
9591
#: git-am.sh:520
9569
#: git-am.sh:527
9592
9570
#, sh-format
9593
9571
msgid ""
9594
9572
"Stray $dotest directory found.\n"
9595
9573
"Use \"git am --abort\" to remove it."
9596
9574
msgstr ""
9597
9575
9598
#: git-am.sh:528
9576
#: git-am.sh:535
9599
9577
msgid "Resolve operation not in progress, we are not resuming."
9600
9578
msgstr ""
9601
9579
9602
#: git-am.sh:594
9580
#: git-am.sh:601
9603
9581
#, sh-format
9604
9582
msgid "Dirty index: cannot apply patches (dirty: $files)"
9605
9583
msgstr ""
9606
9584
9607
#: git-am.sh:698
9585
#: git-am.sh:705
9608
9586
#, sh-format
9609
9587
msgid ""
9610
9588
"Patch is empty. Was it split wrong?\n"
9612
9590
"To restore the original branch and stop patching run \"$cmdline --abort\"."
9613
9591
msgstr ""
9614
9592
9615
#: git-am.sh:725
9593
#: git-am.sh:732
9616
9594
msgid "Patch does not have a valid e-mail address."
9617
9595
msgstr ""
9618
9596
9619
#: git-am.sh:772
9597
#: git-am.sh:779
9620
9598
msgid "cannot be interactive without stdin connected to a terminal."
9621
9599
msgstr ""
9622
9600
9623
#: git-am.sh:776
9601
#: git-am.sh:783
9624
9602
msgid "Commit Body is:"
9625
9603
msgstr ""
9626
9604
9627
9605
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
9628
9606
#. in your translation. The program will only accept English
9629
9607
#. input at this point.
9630
#: git-am.sh:783
9608
#: git-am.sh:790
9631
9609
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
9632
9610
msgstr ""
9633
9611
9634
#: git-am.sh:819
9612
#: git-am.sh:826
9635
9613
#, sh-format
9636
9614
msgid "Applying: $FIRSTLINE"
9637
9615
msgstr ""
9638
9616
9639
#: git-am.sh:840
9617
#: git-am.sh:847
9640
9618
msgid ""
9641
9619
"No changes - did you forget to use 'git add'?\n"
9642
9620
"If there is nothing left to stage, chances are that something else\n"
9643
9621
"already introduced the same changes; you might want to skip this patch."
9644
9622
msgstr ""
9645
9623
9646
#: git-am.sh:848
9624
#: git-am.sh:855
9647
9625
msgid ""
9648
9626
"You still have unmerged paths in your index\n"
9649
9627
"did you forget to use 'git add'?"
9650
9628
msgstr ""
9651
9629
9652
#: git-am.sh:864
9630
#: git-am.sh:871
9653
9631
msgid "No changes -- Patch already applied."
9654
9632
msgstr ""
9655
9633
9656
#: git-am.sh:874
9634
#: git-am.sh:881
9657
9635
#, sh-format
9658
9636
msgid "Patch failed at $msgnum $FIRSTLINE"
9659
9637
msgstr ""
9660
9638
9661
#: git-am.sh:877
9639
#: git-am.sh:884
9662
9640
#, sh-format
9663
9641
msgid ""
9664
9642
"The copy of the patch that failed is found in:\n"
9665
9643
" $dotest/patch"
9666
9644
msgstr ""
9667
9645
9668
#: git-am.sh:895
9646
#: git-am.sh:902
9669
9647
msgid "applying to an empty history"
9670
9648
msgstr ""
9671
9649
9731
9709
msgid "'git bisect bad' can take only one argument."
9732
9710
msgstr ""
9733
9711
9734
#. have bad but not good. we could bisect although
9735
#. this is less optimum.
9736
9712
#: git-bisect.sh:273
9737
9713
msgid "Warning: bisecting only with a bad commit."
9738
9714
msgstr ""
9824
9800
msgid "Pull is not possible because you have unmerged files."
9825
9801
msgstr ""
9826
9802
9827
#: git-pull.sh:223
9803
#: git-pull.sh:245
9828
9804
msgid "updating an unborn branch with changes added to the index"
9829
9805
msgstr ""
9830
9806
9831
#. The fetch involved updating the current branch.
9832
#. The working tree and the index file is still based on the
9833
#. $orig_head commit, but we are merging into $curr_head.
9834
#. First update the working tree to match $curr_head.
9835
#: git-pull.sh:247
9807
#: git-pull.sh:269
9836
9808
#, sh-format
9837
9809
msgid ""
9838
9810
"Warning: fetch updated the current branch head.\n"
9840
9812
"Warning: commit $orig_head."
9841
9813
msgstr ""
9842
9814
9843
#: git-pull.sh:272
9815
#: git-pull.sh:294
9844
9816
msgid "Cannot merge multiple branches into empty head"
9845
9817
msgstr ""
9846
9818
9847
#: git-pull.sh:276
9819
#: git-pull.sh:298
9848
9820
msgid "Cannot rebase onto multiple branches"
9849
9821
msgstr ""
9850
9822
9851
#: git-rebase.sh:55
9823
#: git-rebase.sh:57
9852
9824
msgid ""
9853
9825
"When you have resolved this problem, run \"git rebase --continue\".\n"
9854
9826
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
9856
9828
"abort\"."
9857
9829
msgstr ""
9858
9830
9859
#: git-rebase.sh:158
9831
#: git-rebase.sh:165
9860
9832
msgid "Applied autostash."
9861
9833
msgstr ""
9862
9834
9863
#: git-rebase.sh:161
9835
#: git-rebase.sh:168
9864
9836
#, sh-format
9865
9837
msgid "Cannot store $stash_sha1"
9866
9838
msgstr ""
9867
9839
9868
#: git-rebase.sh:162
9840
#: git-rebase.sh:169
9869
9841
msgid ""
9870
9842
"Applying autostash resulted in conflicts.\n"
9871
9843
"Your changes are safe in the stash.\n"
9872
9844
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
9873
9845
msgstr ""
9874
9846
9875
#: git-rebase.sh:201
9847
#: git-rebase.sh:208
9876
9848
msgid "The pre-rebase hook refused to rebase."
9877
9849
msgstr ""
9878
9850
9879
#: git-rebase.sh:206
9851
#: git-rebase.sh:213
9880
9852
msgid "It looks like git-am is in progress. Cannot rebase."
9881
9853
msgstr ""
9882
9854
9883
#: git-rebase.sh:346
9855
#: git-rebase.sh:351
9884
9856
msgid "The --exec option must be used with the --interactive option"
9885
9857
msgstr ""
9886
9858
9887
#: git-rebase.sh:351
9859
#: git-rebase.sh:356
9888
9860
msgid "No rebase in progress?"
9889
9861
msgstr ""
9890
9862
9891
#: git-rebase.sh:362
9863
#: git-rebase.sh:367
9892
9864
msgid "The --edit-todo action can only be used during interactive rebase."
9893
9865
msgstr ""
9894
9866
9895
#: git-rebase.sh:369
9867
#: git-rebase.sh:374
9896
9868
msgid "Cannot read HEAD"
9897
9869
msgstr ""
9898
9870
9899
#: git-rebase.sh:372
9871
#: git-rebase.sh:377
9900
9872
msgid ""
9901
9873
"You must edit all merge conflicts and then\n"
9902
9874
"mark them as resolved using git add"
9903
9875
msgstr ""
9904
9876
9905
#: git-rebase.sh:390
9877
#: git-rebase.sh:395
9906
9878
#, sh-format
9907
9879
msgid "Could not move back to $head_name"
9908
9880
msgstr ""
9909
9881
9910
#: git-rebase.sh:409
9882
#: git-rebase.sh:414
9911
9883
#, sh-format
9912
9884
msgid ""
9913
9885
"It seems that there is already a $state_dir_base directory, and\n"
9920
9892
"valuable there."
9921
9893
msgstr ""
9922
9894
9923
#: git-rebase.sh:456
9895
#: git-rebase.sh:465
9924
9896
#, sh-format
9925
9897
msgid "invalid upstream $upstream_name"
9926
9898
msgstr ""
9927
9899
9928
#: git-rebase.sh:480
9900
#: git-rebase.sh:489
9929
9901
#, sh-format
9930
9902
msgid "$onto_name: there are more than one merge bases"
9931
9903
msgstr ""
9932
9904
9933
#: git-rebase.sh:483 git-rebase.sh:487
9905
#: git-rebase.sh:492 git-rebase.sh:496
9934
9906
#, sh-format
9935
9907
msgid "$onto_name: there is no merge base"
9936
9908
msgstr ""
9937
9909
9938
#: git-rebase.sh:492
9910
#: git-rebase.sh:501
9939
9911
#, sh-format
9940
9912
msgid "Does not point to a valid commit: $onto_name"
9941
9913
msgstr ""
9942
9914
9943
#: git-rebase.sh:515
9915
#: git-rebase.sh:524
9944
9916
#, sh-format
9945
9917
msgid "fatal: no such branch: $branch_name"
9946
9918
msgstr ""
9947
9919
9948
#: git-rebase.sh:548
9920
#: git-rebase.sh:557
9949
9921
msgid "Cannot autostash"
9950
9922
msgstr ""
9951
9923
9952
#: git-rebase.sh:553
9924
#: git-rebase.sh:562
9953
9925
#, sh-format
9954
9926
msgid "Created autostash: $stash_abbrev"
9955
9927
msgstr ""
9956
9928
9957
#: git-rebase.sh:557
9929
#: git-rebase.sh:566
9958
9930
msgid "Please commit or stash them."
9959
9931
msgstr ""
9960
9932
9961
#: git-rebase.sh:577
9933
#: git-rebase.sh:586
9962
9934
#, sh-format
9963
9935
msgid "Current branch $branch_name is up to date."
9964
9936
msgstr ""
9965
9937
9966
#: git-rebase.sh:581
9938
#: git-rebase.sh:590
9967
9939
#, sh-format
9968
9940
msgid "Current branch $branch_name is up to date, rebase forced."
9969
9941
msgstr ""
9970
9942
9971
#: git-rebase.sh:592
9943
#: git-rebase.sh:601
9972
9944
#, sh-format
9973
9945
msgid "Changes from $mb to $onto:"
9974
9946
msgstr ""
9975
9947
9976
#. Detach HEAD and reset the tree
9977
#: git-rebase.sh:601
9948
#: git-rebase.sh:610
9978
9949
msgid "First, rewinding head to replay your work on top of it..."
9979
9950
msgstr ""
9980
9951
9981
#: git-rebase.sh:611
9952
#: git-rebase.sh:620
9982
9953
#, sh-format
9983
9954
msgid "Fast-forwarded $branch_name to $onto_name."
9984
9955
msgstr ""
9995
9966
msgid "Cannot save the current index state"
9996
9967
msgstr ""
9997
9968
9998
#: git-stash.sh:123 git-stash.sh:136
9969
#: git-stash.sh:124 git-stash.sh:137
9999
9970
msgid "Cannot save the current worktree state"
10000
9971
msgstr ""
10001
9972
10002
#: git-stash.sh:140
9973
#: git-stash.sh:141
10003
9974
msgid "No changes selected"
10004
9975
msgstr ""
10005
9976
10006
#: git-stash.sh:143
9977
#: git-stash.sh:144
10007
9978
msgid "Cannot remove temporary index (can't happen)"
10008
9979
msgstr ""
10009
9980
10010
#: git-stash.sh:156
9981
#: git-stash.sh:157
10011
9982
msgid "Cannot record working tree state"
10012
9983
msgstr ""
10013
9984
10014
#: git-stash.sh:190
9985
#: git-stash.sh:191
10015
9986
#, sh-format
10016
9987
msgid "Cannot update $ref_stash with $w_commit"
10017
9988
msgstr ""
10026
9997
#. $ git stash save --blah-blah 2>&1 | head -n 2
10027
9998
#. error: unknown option for 'stash save': --blah-blah
10028
9999
#. To provide a message, use git stash save -- '--blah-blah'
10029
#: git-stash.sh:237
10000
#: git-stash.sh:238
10030
10001
#, sh-format
10031
10002
msgid ""
10032
10003
"error: unknown option for 'stash save': $option\n"
10033
10004
" To provide a message, use git stash save -- '$option'"
10034
10005
msgstr ""
10035
10006
10036
#: git-stash.sh:258
10007
#: git-stash.sh:259
10037
10008
msgid "No local changes to save"
10038
10009
msgstr ""
10039
10010
10040
#: git-stash.sh:262
10011
#: git-stash.sh:263
10041
10012
msgid "Cannot initialize stash"
10042
10013
msgstr ""
10043
10014
10044
#: git-stash.sh:266
10015
#: git-stash.sh:267
10045
10016
msgid "Cannot save the current status"
10046
10017
msgstr ""
10047
10018
10048
#: git-stash.sh:284
10019
#: git-stash.sh:285
10049
10020
msgid "Cannot remove worktree changes"
10050
10021
msgstr ""
10051
10022
10052
#: git-stash.sh:383
10023
#: git-stash.sh:384
10053
10024
msgid "No stash found."
10054
10025
msgstr ""
10055
10026
10056
#: git-stash.sh:390
10027
#: git-stash.sh:391
10057
10028
#, sh-format
10058
10029
msgid "Too many revisions specified: $REV"
10059
10030
msgstr ""
10060
10031
10061
#: git-stash.sh:396
10032
#: git-stash.sh:397
10062
10033
#, sh-format
10063
10034
msgid "$reference is not valid reference"
10064
10035
msgstr ""
10065
10036
10066
#: git-stash.sh:424
10037
#: git-stash.sh:425
10067
10038
#, sh-format
10068
10039
msgid "'$args' is not a stash-like commit"
10069
10040
msgstr ""
10070
10041
10071
#: git-stash.sh:435
10042
#: git-stash.sh:436
10072
10043
#, sh-format
10073
10044
msgid "'$args' is not a stash reference"
10074
10045
msgstr ""
10075
10046
10076
#: git-stash.sh:443
10047
#: git-stash.sh:444
10077
10048
msgid "unable to refresh index"
10078
10049
msgstr ""
10079
10050
10080
#: git-stash.sh:447
10051
#: git-stash.sh:448
10081
10052
msgid "Cannot apply a stash in the middle of a merge"
10082
10053
msgstr ""
10083
10054
10084
#: git-stash.sh:455
10055
#: git-stash.sh:456
10085
10056
msgid "Conflicts in index. Try without --index."
10086
10057
msgstr ""
10087
10058
10088
#: git-stash.sh:457
10059
#: git-stash.sh:458
10089
10060
msgid "Could not save index tree"
10090
10061
msgstr ""
10091
10062
10092
#: git-stash.sh:491
10063
#: git-stash.sh:492
10093
10064
msgid "Cannot unstage modified files"
10094
10065
msgstr ""
10095
10066
10096
#: git-stash.sh:506
10067
#: git-stash.sh:507
10097
10068
msgid "Index was not unstashed."
10098
10069
msgstr ""
10099
10070
10100
#: git-stash.sh:523
10071
#: git-stash.sh:530
10101
10072
#, sh-format
10102
10073
msgid "Dropped ${REV} ($s)"
10103
10074
msgstr ""
10104
10075
10105
#: git-stash.sh:524
10076
#: git-stash.sh:531
10106
10077
#, sh-format
10107
10078
msgid "${REV}: Could not drop stash entry"
10108
10079
msgstr ""
10109
10080
10110
#: git-stash.sh:531
10081
#: git-stash.sh:538
10111
10082
msgid "No branch name specified"
10112
10083
msgstr ""
10113
10084
10114
#: git-stash.sh:603
10085
#: git-stash.sh:610
10115
10086
msgid "(To restore them type \"git stash apply\")"
10116
10087
msgstr ""
10117
10088
10125
10096
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
10126
10097
msgstr ""
10127
10098
10128
#: git-submodule.sh:281
10099
#: git-submodule.sh:287
10129
10100
#, sh-format
10130
10101
msgid "Clone of '$url' into submodule path '$sm_path' failed"
10131
10102
msgstr ""
10132
10103
10133
#: git-submodule.sh:293
10104
#: git-submodule.sh:296
10134
10105
#, sh-format
10135
10106
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
10136
10107
msgstr ""
10137
10108
10138
#: git-submodule.sh:403
10109
#: git-submodule.sh:406
10139
10110
msgid "Relative path can only be used from the toplevel of the working tree"
10140
10111
msgstr ""
10141
10112
10142
#: git-submodule.sh:413
10113
#: git-submodule.sh:416
10143
10114
#, sh-format
10144
10115
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
10145
10116
msgstr ""
10146
10117
10147
#: git-submodule.sh:430
10118
#: git-submodule.sh:433
10148
10119
#, sh-format
10149
10120
msgid "'$sm_path' already exists in the index"
10150
10121
msgstr ""
10151
10122
10152
#: git-submodule.sh:434
10123
#: git-submodule.sh:437
10153
10124
#, sh-format
10154
10125
msgid ""
10155
10126
"The following path is ignored by one of your .gitignore files:\n"
10157
10128
"Use -f if you really want to add it."
10158
10129
msgstr ""
10159
10130
10160
#: git-submodule.sh:452
10131
#: git-submodule.sh:455
10161
10132
#, sh-format
10162
10133
msgid "Adding existing repo at '$sm_path' to the index"
10163
10134
msgstr ""
10164
10135
10165
#: git-submodule.sh:454
10136
#: git-submodule.sh:457
10166
10137
#, sh-format
10167
10138
msgid "'$sm_path' already exists and is not a valid git repo"
10168
10139
msgstr ""
10169
10140
10170
#: git-submodule.sh:462
10141
#: git-submodule.sh:465
10171
10142
#, sh-format
10172
10143
msgid "A git directory for '$sm_name' is found locally with remote(s):"
10173
10144
msgstr ""
10174
10145
10175
#: git-submodule.sh:464
10146
#: git-submodule.sh:467
10176
10147
#, sh-format
10177
10148
msgid ""
10178
10149
"If you want to reuse this local git directory instead of cloning again from"
10179
10150
msgstr ""
10180
10151
10181
#: git-submodule.sh:466
10152
#: git-submodule.sh:469
10182
10153
#, sh-format
10183
10154
msgid ""
10184
10155
"use the '--force' option. If the local git directory is not the correct repo"
10185
10156
msgstr ""
10186
10157
10187
#: git-submodule.sh:467
10158
#: git-submodule.sh:470
10188
10159
#, sh-format
10189
10160
msgid ""
10190
10161
"or you are unsure what this means choose another name with the '--name' "
10191
10162
"option."
10192
10163
msgstr ""
10193
10164
10194
#: git-submodule.sh:469
10165
#: git-submodule.sh:472
10195
10166
#, sh-format
10196
10167
msgid "Reactivating local git directory for submodule '$sm_name'."
10197
10168
msgstr ""
10198
10169
10199
#: git-submodule.sh:481
10170
#: git-submodule.sh:484
10200
10171
#, sh-format
10201
10172
msgid "Unable to checkout submodule '$sm_path'"
10202
10173
msgstr ""
10203
10174
10204
#: git-submodule.sh:486
10175
#: git-submodule.sh:489
10205
10176
#, sh-format
10206
10177
msgid "Failed to add submodule '$sm_path'"
10207
10178
msgstr ""
10208
10179
10209
#: git-submodule.sh:495
10180
#: git-submodule.sh:498
10210
10181
#, sh-format
10211
10182
msgid "Failed to register submodule '$sm_path'"
10212
10183
msgstr ""
10213
10184
10214
#: git-submodule.sh:539
10185
#: git-submodule.sh:542
10215
10186
#, sh-format
10216
10187
msgid "Entering '$prefix$displaypath'"
10217
10188
msgstr ""
10218
10189
10219
#: git-submodule.sh:559
10190
#: git-submodule.sh:562
10220
10191
#, sh-format
10221
10192
msgid "Stopping at '$prefix$displaypath'; script returned non-zero status."
10222
10193
msgstr ""
10223
10194
10224
#: git-submodule.sh:605
10195
#: git-submodule.sh:608
10225
10196
#, sh-format
10226
10197
msgid "No url found for submodule path '$displaypath' in .gitmodules"
10227
10198
msgstr ""
10228
10199
10229
#: git-submodule.sh:614
10200
#: git-submodule.sh:617
10230
10201
#, sh-format
10231
10202
msgid "Failed to register url for submodule path '$displaypath'"
10232
10203
msgstr ""
10233
10204
10234
#: git-submodule.sh:616
10205
#: git-submodule.sh:619
10235
10206
#, sh-format
10236
10207
msgid "Submodule '$name' ($url) registered for path '$displaypath'"
10237
10208
msgstr ""
10238
10209
10239
#: git-submodule.sh:633
10210
#: git-submodule.sh:636
10240
10211
#, sh-format
10241
10212
msgid "Failed to register update mode for submodule path '$displaypath'"
10242
10213
msgstr ""
10243
10214
10244
#: git-submodule.sh:671
10215
#: git-submodule.sh:674
10245
10216
#, sh-format
10246
10217
msgid "Use '.' if you really want to deinitialize all submodules"
10247
10218
msgstr ""
10248
10219
10249
#: git-submodule.sh:688
10220
#: git-submodule.sh:691
10250
10221
#, sh-format
10251
10222
msgid "Submodule work tree '$displaypath' contains a .git directory"
10252
10223
msgstr ""
10253
10224
10254
#: git-submodule.sh:689
10225
#: git-submodule.sh:692
10255
10226
#, sh-format
10256
10227
msgid ""
10257
10228
"(use 'rm -rf' if you really want to remove it including all of its history)"
10258
10229
msgstr ""
10259
10230
10260
#: git-submodule.sh:695
10231
#: git-submodule.sh:698
10261
10232
#, sh-format
10262
10233
msgid ""
10263
10234
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
10264
10235
"discard them"
10265
10236
msgstr ""
10266
10237
10267
#: git-submodule.sh:698
10238
#: git-submodule.sh:701
10268
10239
#, sh-format
10269
10240
msgid "Cleared directory '$displaypath'"
10270
10241
msgstr ""
10271
10242
10272
#: git-submodule.sh:699
10243
#: git-submodule.sh:702
10273
10244
#, sh-format
10274
10245
msgid "Could not remove submodule work tree '$displaypath'"
10275
10246
msgstr ""
10276
10247
10277
#: git-submodule.sh:702
10248
#: git-submodule.sh:705
10278
10249
#, sh-format
10279
10250
msgid "Could not create empty submodule directory '$displaypath'"
10280
10251
msgstr ""
10281
10252
10282
#: git-submodule.sh:711
10253
#: git-submodule.sh:714
10283
10254
#, sh-format
10284
10255
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
10285
10256
msgstr ""
10286
10257
10287
#: git-submodule.sh:834
10258
#: git-submodule.sh:830
10288
10259
#, sh-format
10289
10260
msgid ""
10290
10261
"Submodule path '$displaypath' not initialized\n"
10291
10262
"Maybe you want to use 'update --init'?"
10292
10263
msgstr ""
10293
10264
10294
#: git-submodule.sh:847
10265
#: git-submodule.sh:843
10295
10266
#, sh-format
10296
10267
msgid "Unable to find current revision in submodule path '$displaypath'"
10297
10268
msgstr ""
10298
10269
10299
#: git-submodule.sh:856
10270
#: git-submodule.sh:852
10300
10271
#, sh-format
10301
10272
msgid "Unable to fetch in submodule path '$sm_path'"
10302
10273
msgstr ""
10303
10274
10304
#: git-submodule.sh:880
10275
#: git-submodule.sh:876
10305
10276
#, sh-format
10306
10277
msgid "Unable to fetch in submodule path '$displaypath'"
10307
10278
msgstr ""
10308
10279
10309
#: git-submodule.sh:912
10280
#: git-submodule.sh:890
10310
10281
#, sh-format
10311
10282
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
10312
10283
msgstr ""
10313
10284
10314
#: git-submodule.sh:913
10285
#: git-submodule.sh:891
10315
10286
#, sh-format
10316
10287
msgid "Submodule path '$displaypath': checked out '$sha1'"
10317
10288
msgstr ""
10318
10289
10319
#: git-submodule.sh:894
10290
#: git-submodule.sh:895
10320
10291
#, sh-format
10321
10292
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
10322
10293
msgstr ""
10323
10294
10324
#: git-submodule.sh:895
10295
#: git-submodule.sh:896
10325
10296
#, sh-format
10326
10297
msgid "Submodule path '$displaypath': rebased into '$sha1'"
10327
10298
msgstr ""
10328
10299
10329
#: git-submodule.sh:900
10300
#: git-submodule.sh:901
10330
10301
#, sh-format
10331
10302
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
10332
10303
msgstr ""
10333
10304
10334
#: git-submodule.sh:901
10305
#: git-submodule.sh:902
10335
10306
#, sh-format
10336
10307
msgid "Submodule path '$displaypath': merged in '$sha1'"
10337
10308
msgstr ""
10338
10309
10339
#: git-submodule.sh:906
10310
#: git-submodule.sh:907
10340
10311
#, sh-format
10341
10312
msgid ""
10342
10313
"Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'"
10343
10314
msgstr ""
10344
10315
10345
#: git-submodule.sh:907
10316
#: git-submodule.sh:908
10346
10317
#, sh-format
10347
10318
msgid "Submodule path '$prefix$sm_path': '$command $sha1'"
10348
10319
msgstr ""
10349
10320
10350
#: git-submodule.sh:940
10321
#: git-submodule.sh:938
10351
10322
#, sh-format
10352
10323
msgid "Failed to recurse into submodule path '$displaypath'"
10353
10324
msgstr ""
10354
10325
10355
#: git-submodule.sh:1048
10326
#: git-submodule.sh:1046
10356
10327
msgid "The --cached option cannot be used with the --files option"
10357
10328
msgstr ""
10358
10329
10359
#. unexpected type
10360
#: git-submodule.sh:1096
10330
#: git-submodule.sh:1098
10361
10331
#, sh-format
10362
10332
msgid "unexpected mode $mod_dst"
10363
10333
msgstr ""
10364
10334
10365
#: git-submodule.sh:1116
10335
#: git-submodule.sh:1118
10366
10336
#, sh-format
10367
10337
msgid " Warn: $display_name doesn't contain commit $sha1_src"
10368
10338
msgstr ""
10369
10339
10370
#: git-submodule.sh:1119
10340
#: git-submodule.sh:1121
10371
10341
#, sh-format
10372
10342
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
10373
10343
msgstr ""
10374
10344
10375
#: git-submodule.sh:1122
10345
#: git-submodule.sh:1124
10376
10346
#, sh-format
10377
10347
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
10378
10348
msgstr ""
10379
10349
10380
#: git-submodule.sh:1147
10350
#: git-submodule.sh:1149
10381
10351
msgid "blob"
10382
10352
msgstr ""
10383
10353
10384
#: git-submodule.sh:1261
10354
#: git-submodule.sh:1267
10385
10355
#, sh-format
10386
10356
msgid "Failed to recurse into submodule path '$sm_path'"
10387
10357
msgstr ""
10388
10358
10389
#: git-submodule.sh:1325
10359
#: git-submodule.sh:1331
10390
10360
#, sh-format
10391
10361
msgid "Synchronizing submodule url for '$displaypath'"
10392
10362
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1