@matheusbsbs / matheus-bagliano / commits / 388698ce61

l10n: pt_PT.po translate new messages

Translate new and old messages came from git.pot. Signed-off-by: Marco Sousa <marcomsousa@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Marco Sousa committed May 14, 2012 at 21:18 UTC 388698ce61246771096cc06f5c9d1e88053b3449
1 file changed +2005 -620
po/pt_PT.po
+2005 -620
@@ -8,17 +8,17 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: Git\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 -"POT-Creation-Date: 2012-03-16 20:18+0800\n"
12 -"PO-Revision-Date: 2012-04-05 20:48+0100\n"
11 +"POT-Creation-Date: 2012-05-08 16:06+0800\n"
12 +"PO-Revision-Date: 2012-05-14 21:17+0100\n"
13 "Last-Translator: Marco Sousa <marcomsousa AT gmail.com>\n"
14 "Language-Team: Portuguese\n"
15 -"Language: pt\n"
15 "MIME-Version: 1.0\n"
16 "Content-Type: text/plain; charset=UTF-8\n"
17 "Content-Transfer-Encoding: 8bit\n"
18 +"Language: pt\n"
19 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
20
21 -#: advice.c:34
21 +#: advice.c:40
22 #, c-format
23 msgid "hint: %.*s\n"
24 msgstr "dica: %.*s\n"
@@ -27,7 +27,7 @@ msgstr "dica: %.*s\n"
27 #. * Message used both when 'git commit' fails and when
28 #. * other commands doing a merge do.
29 #.
30 -#: advice.c:64
30 +#: advice.c:70
31 msgid ""
32 "Fix them up in the work tree,\n"
33 "and then use 'git add/rm <file>' as\n"
@@ -35,12 +35,95 @@ msgid ""
35 "or use 'git commit -a'."
36 msgstr ""
37
38 -#: commit.c:47
38 +#: bundle.c:36
39 +#, c-format
40 +msgid "'%s' does not look like a v2 bundle file"
41 +msgstr ""
42 +
43 +#: bundle.c:63
44 +#, c-format
45 +msgid "unrecognized header: %s%s (%d)"
46 +msgstr "cabeçalho não reconhecido: %s%s (%d)"
47 +
48 +#: bundle.c:89
49 +#: builtin/commit.c:753
50 +#, c-format
51 +msgid "could not open '%s'"
52 +msgstr "não é possivel abrir '%s'"
53 +
54 +#: bundle.c:140
55 +msgid "Repository lacks these prerequisite commits:"
56 +msgstr ""
57 +
58 +#: bundle.c:164
59 +#: sequencer.c:533
60 +#: sequencer.c:965
61 +#: builtin/log.c:289
62 +#: builtin/log.c:719
63 +#: builtin/log.c:1335
64 +#: builtin/log.c:1554
65 +#: builtin/merge.c:347
66 +#: builtin/shortlog.c:181
67 +msgid "revision walk setup failed"
68 +msgstr ""
69 +
70 +#: bundle.c:186
71 +#, c-format
72 +msgid "The bundle contains %d ref"
73 +msgid_plural "The bundle contains %d refs"
74 +msgstr[0] ""
75 +msgstr[1] ""
76 +
77 +#: bundle.c:192
78 +#, c-format
79 +msgid "The bundle requires this ref"
80 +msgid_plural "The bundle requires these %d refs"
81 +msgstr[0] ""
82 +msgstr[1] ""
83 +
84 +#: bundle.c:290
85 +msgid "rev-list died"
86 +msgstr "rev-list morreu"
87 +
88 +#: bundle.c:296
89 +#: builtin/log.c:1231
90 +#: builtin/shortlog.c:284
91 +#, c-format
92 +msgid "unrecognized argument: %s"
93 +msgstr "argumento não reconhecido: %s"
94 +
95 +#: bundle.c:331
96 +#, c-format
97 +msgid "ref '%s' is excluded by the rev-list options"
98 +msgstr ""
99 +
100 +#: bundle.c:376
101 +msgid "Refusing to create empty bundle."
102 +msgstr ""
103 +
104 +#: bundle.c:394
105 +msgid "Could not spawn pack-objects"
106 +msgstr "Não foi possível pawn pack-objects"
107 +
108 +#: bundle.c:412
109 +msgid "pack-objects died"
110 +msgstr ""
111 +
112 +#: bundle.c:415
113 +#, c-format
114 +msgid "cannot create '%s'"
115 +msgstr "não consegue crear '%s'"
116 +
117 +#: bundle.c:437
118 +msgid "index-pack died"
119 +msgstr ""
120 +
121 +#: commit.c:48
122 #, c-format
123 msgid "could not parse %s"
124 msgstr "não consigo parsear %s"
125
43 -#: commit.c:49
126 +#: commit.c:50
127 #, c-format
128 msgid "%s %s is not a commit!"
129 msgstr "%s %s não é um commit!"
@@ -64,6 +147,74 @@ msgstr ""
147 msgid "failed to close rev-list's stdin: %s"
148 msgstr ""
149
150 +#: date.c:95
151 +msgid "in the future"
152 +msgstr ""
153 +
154 +#: date.c:101
155 +#, c-format
156 +msgid "%lu second ago"
157 +msgid_plural "%lu seconds ago"
158 +msgstr[0] ""
159 +msgstr[1] ""
160 +
161 +#: date.c:108
162 +#, c-format
163 +msgid "%lu minute ago"
164 +msgid_plural "%lu minutes ago"
165 +msgstr[0] ""
166 +msgstr[1] ""
167 +
168 +#: date.c:115
169 +#, c-format
170 +msgid "%lu hour ago"
171 +msgid_plural "%lu hours ago"
172 +msgstr[0] ""
173 +msgstr[1] ""
174 +
175 +#: date.c:122
176 +#, c-format
177 +msgid "%lu day ago"
178 +msgid_plural "%lu days ago"
179 +msgstr[0] ""
180 +msgstr[1] ""
181 +
182 +#: date.c:128
183 +#, c-format
184 +msgid "%lu week ago"
185 +msgid_plural "%lu weeks ago"
186 +msgstr[0] ""
187 +msgstr[1] ""
188 +
189 +#: date.c:135
190 +#, c-format
191 +msgid "%lu month ago"
192 +msgid_plural "%lu months ago"
193 +msgstr[0] ""
194 +msgstr[1] ""
195 +
196 +#: date.c:146
197 +#, c-format
198 +msgid "%lu year"
199 +msgid_plural "%lu years"
200 +msgstr[0] ""
201 +msgstr[1] ""
202 +
203 +#: date.c:149
204 +#, c-format
205 +msgid "%s, %lu month ago"
206 +msgid_plural "%s, %lu months ago"
207 +msgstr[0] ""
208 +msgstr[1] ""
209 +
210 +#: date.c:154
211 +#: date.c:159
212 +#, c-format
213 +msgid "%lu year ago"
214 +msgid_plural "%lu years ago"
215 +msgstr[0] ""
216 +msgstr[1] ""
217 +
218 #: diff.c:105
219 #, c-format
220 msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
@@ -81,32 +232,32 @@ msgid ""
232 "%s"
233 msgstr ""
234
84 -#: diff.c:1336
235 +#: diff.c:1400
236 msgid " 0 files changed\n"
237 msgstr " 0 ficheros modificados\n"
238
88 -#: diff.c:1340
239 +#: diff.c:1404
240 #, c-format
241 msgid " %d file changed"
242 msgid_plural " %d files changed"
243 msgstr[0] " %d ficheiro modificado"
244 msgstr[1] " %d ficheiros modificados"
245
95 -#: diff.c:1357
246 +#: diff.c:1421
247 #, c-format
248 msgid ", %d insertion(+)"
249 msgid_plural ", %d insertions(+)"
250 msgstr[0] ", %d adição(+)"
251 msgstr[1] ", %d adições(+)"
252
102 -#: diff.c:1368
253 +#: diff.c:1432
254 #, c-format
255 msgid ", %d deletion(-)"
256 msgid_plural ", %d deletions(-)"
257 msgstr[0] ", %d eliminado(-)"
258 msgstr[1] ", %d eliminados(-)"
259
109 -#: diff.c:3424
260 +#: diff.c:3478
261 #, c-format
262 msgid ""
263 "Failed to parse --dirstat/-X option parameter:\n"
@@ -140,13 +291,53 @@ msgstr "'%s': %s"
291 msgid "'%s': short read %s"
292 msgstr ""
293
143 -#: help.c:287
294 +#: help.c:207
295 +#, c-format
296 +msgid "available git commands in '%s'"
297 +msgstr ""
298 +
299 +#: help.c:214
300 +msgid "git commands available from elsewhere on your $PATH"
301 +msgstr ""
302 +
303 +#: help.c:270
304 #, c-format
305 msgid ""
306 "'%s' appears to be a git command, but we were not\n"
307 "able to execute it. Maybe git-%s is broken?"
308 msgstr ""
309
310 +#: help.c:327
311 +msgid "Uh oh. Your system reports no Git commands at all."
312 +msgstr ""
313 +
314 +#: help.c:349
315 +#, c-format
316 +msgid ""
317 +"WARNING: You called a Git command named '%s', which does not exist.\n"
318 +"Continuing under the assumption that you meant '%s'"
319 +msgstr ""
320 +
321 +#: help.c:354
322 +#, c-format
323 +msgid "in %0.1f seconds automatically..."
324 +msgstr ""
325 +
326 +#: help.c:361
327 +#, c-format
328 +msgid "git: '%s' is not a git command. See 'git --help'."
329 +msgstr ""
330 +
331 +#: help.c:365
332 +msgid ""
333 +"\n"
334 +"Did you mean this?"
335 +msgid_plural ""
336 +"\n"
337 +"Did you mean one of these?"
338 +msgstr[0] ""
339 +msgstr[1] ""
340 +
341 #: remote.c:1607
342 #, c-format
343 msgid "Your branch is ahead of '%s' by %d commit.\n"
@@ -172,475 +363,502 @@ msgid_plural ""
363 msgstr[0] ""
364 msgstr[1] ""
365
175 -#: sequencer.c:120
176 -#: builtin/merge.c:864
177 -#: builtin/merge.c:985
178 -#: builtin/merge.c:1095
179 -#: builtin/merge.c:1105
366 +#: sequencer.c:121
367 +#: builtin/merge.c:865
368 +#: builtin/merge.c:978
369 +#: builtin/merge.c:1088
370 +#: builtin/merge.c:1098
371 #, c-format
372 msgid "Could not open '%s' for writing"
373 msgstr ""
374
184 -#: sequencer.c:122
185 -#: builtin/merge.c:334
186 -#: builtin/merge.c:867
187 -#: builtin/merge.c:1097
188 -#: builtin/merge.c:1110
375 +#: sequencer.c:123
376 +#: builtin/merge.c:333
377 +#: builtin/merge.c:868
378 +#: builtin/merge.c:1090
379 +#: builtin/merge.c:1103
380 #, c-format
381 msgid "Could not write to '%s'"
382 msgstr "Não foi possível escrever para '%s'"
383
193 -#: sequencer.c:143
384 +#: sequencer.c:144
385 msgid ""
386 "after resolving the conflicts, mark the corrected paths\n"
387 "with 'git add <paths>' or 'git rm <paths>'"
388 msgstr ""
389
199 -#: sequencer.c:146
390 +#: sequencer.c:147
391 msgid ""
392 "after resolving the conflicts, mark the corrected paths\n"
393 "with 'git add <paths>' or 'git rm <paths>'\n"
394 "and commit the result with 'git commit'"
395 msgstr ""
396
206 -#: sequencer.c:159
207 -#: sequencer.c:685
208 -#: sequencer.c:768
397 +#: sequencer.c:160
398 +#: sequencer.c:741
399 +#: sequencer.c:824
400 #, c-format
401 msgid "Could not write to %s"
402 msgstr "Não foi possível gravar para %s"
403
213 -#: sequencer.c:162
404 +#: sequencer.c:163
405 #, c-format
406 msgid "Error wrapping up %s"
407 msgstr ""
408
218 -#: sequencer.c:177
409 +#: sequencer.c:178
410 msgid "Your local changes would be overwritten by cherry-pick."
411 msgstr ""
412
222 -#: sequencer.c:179
413 +#: sequencer.c:180
414 msgid "Your local changes would be overwritten by revert."
415 msgstr ""
416
226 -#: sequencer.c:182
417 +#: sequencer.c:183
418 msgid "Commit your changes or stash them to proceed."
419 msgstr ""
420
421 #. TRANSLATORS: %s will be "revert" or "cherry-pick"
231 -#: sequencer.c:232
422 +#: sequencer.c:233
423 #, c-format
424 msgid "%s: Unable to write new index file"
425 msgstr ""
426
236 -#: sequencer.c:298
427 +#: sequencer.c:261
428 +msgid "Could not resolve HEAD commit\n"
429 +msgstr ""
430 +
431 +#: sequencer.c:282
432 +msgid "Unable to update cache tree\n"
433 +msgstr ""
434 +
435 +#: sequencer.c:323
436 +#, c-format
437 +msgid "Could not parse commit %s\n"
438 +msgstr "Não foi possível analisar commit %s\n"
439 +
440 +#: sequencer.c:328
441 +#, c-format
442 +msgid "Could not parse parent commit %s\n"
443 +msgstr "Não foi possível analisar commit parent %s\n"
444 +
445 +#: sequencer.c:358
446 msgid "Your index file is unmerged."
447 msgstr "O seu ficheiro de índice é não fundido."
448
240 -#: sequencer.c:301
449 +#: sequencer.c:361
450 msgid "You do not have a valid HEAD"
451 msgstr "Você não tem uma HEAD válida"
452
244 -#: sequencer.c:316
453 +#: sequencer.c:376
454 #, c-format
455 msgid "Commit %s is a merge but no -m option was given."
456 msgstr ""
457
249 -#: sequencer.c:324
458 +#: sequencer.c:384
459 #, c-format
460 msgid "Commit %s does not have parent %d"
461 msgstr ""
462
254 -#: sequencer.c:328
463 +#: sequencer.c:388
464 #, c-format
465 msgid "Mainline was specified but commit %s is not a merge."
466 msgstr ""
467
468 #. TRANSLATORS: The first %s will be "revert" or
469 #. "cherry-pick", the second %s a SHA1
261 -#: sequencer.c:339
470 +#: sequencer.c:399
471 #, c-format
472 msgid "%s: cannot parse parent commit %s"
473 msgstr ""
474
266 -#: sequencer.c:343
475 +#: sequencer.c:403
476 #, c-format
477 msgid "Cannot get commit message for %s"
478 msgstr "Não é possível obter mensagem commit para %s"
479
271 -#: sequencer.c:427
480 +#: sequencer.c:491
481 #, c-format
482 msgid "could not revert %s... %s"
483 msgstr ""
484
276 -#: sequencer.c:428
485 +#: sequencer.c:492
486 #, c-format
487 msgid "could not apply %s... %s"
488 msgstr ""
489
281 -#: sequencer.c:450
282 -#: sequencer.c:909
283 -#: builtin/log.c:288
284 -#: builtin/log.c:713
285 -#: builtin/log.c:1329
286 -#: builtin/log.c:1548
287 -#: builtin/merge.c:348
288 -#: builtin/shortlog.c:181
289 -msgid "revision walk setup failed"
290 -msgstr ""
291 -
292 -#: sequencer.c:453
490 +#: sequencer.c:536
491 msgid "empty commit set passed"
492 msgstr "passado commit com o set vazio"
493
296 -#: sequencer.c:461
494 +#: sequencer.c:544
495 #, c-format
496 msgid "git %s: failed to read the index"
497 msgstr ""
498
301 -#: sequencer.c:466
499 +#: sequencer.c:549
500 #, c-format
501 msgid "git %s: failed to refresh the index"
502 msgstr ""
503
306 -#: sequencer.c:551
504 +#: sequencer.c:607
505 #, c-format
506 msgid "Cannot %s during a %s"
507 msgstr "Não foi possível abrir %s durante um %s"
508
311 -#: sequencer.c:573
509 +#: sequencer.c:629
510 #, c-format
511 msgid "Could not parse line %d."
512 msgstr "Não foi possível parsear linha %d."
513
316 -#: sequencer.c:578
514 +#: sequencer.c:634
515 msgid "No commits parsed."
516 msgstr "Nenhum commit parseado."
517
320 -#: sequencer.c:591
518 +#: sequencer.c:647
519 #, c-format
520 msgid "Could not open %s"
521 msgstr "Não foi possível abrir %s"
522
325 -#: sequencer.c:595
523 +#: sequencer.c:651
524 #, c-format
525 msgid "Could not read %s."
526 msgstr "Não foi possível ler %s."
527
330 -#: sequencer.c:602
528 +#: sequencer.c:658
529 #, c-format
530 msgid "Unusable instruction sheet: %s"
531 msgstr ""
532
335 -#: sequencer.c:630
533 +#: sequencer.c:686
534 #, c-format
535 msgid "Invalid key: %s"
536 msgstr ""
537
340 -#: sequencer.c:633
538 +#: sequencer.c:689
539 #, c-format
540 msgid "Invalid value for %s: %s"
541 msgstr "Valor inválido para %s: %s"
542
345 -#: sequencer.c:645
543 +#: sequencer.c:701
544 #, c-format
545 msgid "Malformed options sheet: %s"
546 msgstr ""
547
350 -#: sequencer.c:666
548 +#: sequencer.c:722
549 msgid "a cherry-pick or revert is already in progress"
550 msgstr ""
551
354 -#: sequencer.c:667
552 +#: sequencer.c:723
553 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
554 msgstr ""
555
358 -#: sequencer.c:671
556 +#: sequencer.c:727
557 #, c-format
558 msgid "Could not create sequencer directory %s"
559 msgstr ""
560
363 -#: sequencer.c:687
364 -#: sequencer.c:772
561 +#: sequencer.c:743
562 +#: sequencer.c:828
563 #, c-format
564 msgid "Error wrapping up %s."
565 msgstr ""
566
369 -#: sequencer.c:706
370 -#: sequencer.c:840
567 +#: sequencer.c:762
568 +#: sequencer.c:896
569 msgid "no cherry-pick or revert in progress"
570 msgstr ""
571
374 -#: sequencer.c:708
572 +#: sequencer.c:764
573 msgid "cannot resolve HEAD"
574 msgstr ""
575
378 -#: sequencer.c:710
576 +#: sequencer.c:766
577 msgid "cannot abort from a branch yet to be born"
578 msgstr ""
579
382 -#: sequencer.c:732
580 +#: sequencer.c:788
581 +#: builtin/apply.c:3682
582 #, c-format
583 msgid "cannot open %s: %s"
584 msgstr "não foi possível abrir %s: %s"
585
387 -#: sequencer.c:735
586 +#: sequencer.c:791
587 #, c-format
588 msgid "cannot read %s: %s"
589 msgstr "não foi possível ler %s: %s"
590
392 -#: sequencer.c:736
591 +#: sequencer.c:792
592 msgid "unexpected end of file"
593 msgstr ""
594
396 -#: sequencer.c:742
595 +#: sequencer.c:798
596 #, c-format
597 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
598 msgstr ""
599
401 -#: sequencer.c:765
600 +#: sequencer.c:821
601 #, c-format
602 msgid "Could not format %s."
603 msgstr "Não foi possível formatear %s."
604
406 -#: sequencer.c:927
605 +#: sequencer.c:983
606 msgid "Can't revert as initial commit"
607 msgstr ""
608
410 -#: sequencer.c:928
609 +#: sequencer.c:984
610 msgid "Can't cherry-pick into empty head"
611 msgstr ""
612
414 -#: wt-status.c:134
613 +#: sha1_name.c:864
614 +msgid "HEAD does not point to a branch"
615 +msgstr ""
616 +
617 +#: sha1_name.c:867
618 +#, c-format
619 +msgid "No such branch: '%s'"
620 +msgstr "Não existe rama '%s'"
621 +
622 +#: sha1_name.c:869
623 +#, c-format
624 +msgid "No upstream configured for branch '%s'"
625 +msgstr ""
626 +
627 +#: sha1_name.c:872
628 +#, c-format
629 +msgid "Upstream branch '%s' not stored as a remote-tracking branch"
630 +msgstr ""
631 +
632 +#: wt-status.c:135
633 msgid "Unmerged paths:"
634 msgstr "caminhos não fundidos:"
635
418 -#: wt-status.c:140
419 -#: wt-status.c:157
636 +#: wt-status.c:141
637 +#: wt-status.c:158
638 #, c-format
639 msgid " (use \"git reset %s <file>...\" to unstage)"
640 msgstr ""
641
424 -#: wt-status.c:142
425 -#: wt-status.c:159
642 +#: wt-status.c:143
643 +#: wt-status.c:160
644 msgid " (use \"git rm --cached <file>...\" to unstage)"
645 msgstr ""
646
429 -#: wt-status.c:143
647 +#: wt-status.c:144
648 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
649 msgstr " (usa \"git add/rm <ficheiro>...\" para marcar como resolvido)"
650
433 -#: wt-status.c:151
651 +#: wt-status.c:152
652 msgid "Changes to be committed:"
653 msgstr "Mudanças a serem commitadas"
654
437 -#: wt-status.c:169
655 +#: wt-status.c:170
656 msgid "Changes not staged for commit:"
657 msgstr ""
658
441 -#: wt-status.c:173
659 +#: wt-status.c:174
660 msgid " (use \"git add <file>...\" to update what will be committed)"
661 msgstr " (usa \"git add <ficheiro>...\" para actualizar o que vai ser commitado)"
662
445 -#: wt-status.c:175
663 +#: wt-status.c:176
664 msgid " (use \"git add/rm <file>...\" to update what will be committed)"
665 msgstr " (usa \"git add/rm <ficheiro>...\" para actualizar o que vai ser commitado)"
666
449 -#: wt-status.c:176
667 +#: wt-status.c:177
668 msgid " (use \"git checkout -- <file>...\" to discard changes in working directory)"
669 msgstr ""
670
453 -#: wt-status.c:178
671 +#: wt-status.c:179
672 msgid " (commit or discard the untracked or modified content in submodules)"
673 msgstr ""
674
457 -#: wt-status.c:187
675 +#: wt-status.c:188
676 #, c-format
677 msgid "%s files:"
678 msgstr "%s ficheros:"
679
462 -#: wt-status.c:190
680 +#: wt-status.c:191
681 #, c-format
682 msgid " (use \"git %s <file>...\" to include in what will be committed)"
683 msgstr ""
684
467 -#: wt-status.c:207
685 +#: wt-status.c:208
686 msgid "bug"
687 msgstr "erro"
688
471 -#: wt-status.c:212
689 +#: wt-status.c:213
690 msgid "both deleted:"
691 msgstr "eliminados em ambos:"
692
475 -#: wt-status.c:213
693 +#: wt-status.c:214
694 msgid "added by us:"
695 msgstr "adicionado por nós:"
696
479 -#: wt-status.c:214
697 +#: wt-status.c:215
698 msgid "deleted by them:"
699 msgstr "eliminados por eles:"
700
483 -#: wt-status.c:215
701 +#: wt-status.c:216
702 msgid "added by them:"
703 msgstr "adicionados por eles:"
704
487 -#: wt-status.c:216
705 +#: wt-status.c:217
706 msgid "deleted by us:"
707 msgstr "eliminados por nós:"
708
491 -#: wt-status.c:217
709 +#: wt-status.c:218
710 msgid "both added:"
711 msgstr "adicionados em ambos:"
712
495 -#: wt-status.c:218
713 +#: wt-status.c:219
714 msgid "both modified:"
715 msgstr "modificados em ambos:"
716
499 -#: wt-status.c:248
717 +#: wt-status.c:249
718 msgid "new commits, "
719 msgstr "novos commits, "
720
503 -#: wt-status.c:250
721 +#: wt-status.c:251
722 msgid "modified content, "
723 msgstr "conteúdo modificado, "
724
507 -#: wt-status.c:252
725 +#: wt-status.c:253
726 msgid "untracked content, "
727 msgstr "conteúdo não seguido"
728
511 -#: wt-status.c:266
729 +#: wt-status.c:267
730 #, c-format
731 msgid "new file: %s"
732 msgstr "novo ficheiro: %s"
733
516 -#: wt-status.c:269
734 +#: wt-status.c:270
735 #, c-format
736 msgid "copied: %s -> %s"
737 msgstr "copiado: %s -> %s"
738
521 -#: wt-status.c:272
739 +#: wt-status.c:273
740 #, c-format
741 msgid "deleted: %s"
742 msgstr "eliminado: %s"
743
526 -#: wt-status.c:275
744 +#: wt-status.c:276
745 #, c-format
746 msgid "modified: %s"
747 msgstr "modificado: %s"
748
531 -#: wt-status.c:278
749 +#: wt-status.c:279
750 #, c-format
751 msgid "renamed: %s -> %s"
752 msgstr "mudado de nome: %s -> %s"
753
536 -#: wt-status.c:281
754 +#: wt-status.c:282
755 #, c-format
756 msgid "typechange: %s"
757 msgstr ""
758
541 -#: wt-status.c:284
759 +#: wt-status.c:285
760 #, c-format
761 msgid "unknown: %s"
762 msgstr "desconhecido: %s"
763
546 -#: wt-status.c:287
764 +#: wt-status.c:288
765 #, c-format
766 msgid "unmerged: %s"
767 msgstr "não fundidos: %s"
768
551 -#: wt-status.c:290
769 +#: wt-status.c:291
770 #, c-format
771 msgid "bug: unhandled diff status %c"
772 msgstr ""
773
556 -#: wt-status.c:713
774 +#: wt-status.c:737
775 msgid "On branch "
776 msgstr "Na rama"
777
560 -#: wt-status.c:720
778 +#: wt-status.c:744
779 msgid "Not currently on any branch."
780 msgstr "Não está em nenhuma rama."
781
564 -#: wt-status.c:731
782 +#: wt-status.c:755
783 msgid "Initial commit"
784 msgstr "Commit inicial"
785
568 -#: wt-status.c:745
786 +#: wt-status.c:769
787 msgid "Untracked"
788 msgstr "Não seguido"
789
572 -#: wt-status.c:747
790 +#: wt-status.c:771
791 msgid "Ignored"
792 msgstr "Ignorado"
793
576 -#: wt-status.c:749
794 +#: wt-status.c:773
795 #, c-format
796 msgid "Untracked files not listed%s"
797 msgstr ""
798
581 -#: wt-status.c:751
799 +#: wt-status.c:775
800 msgid " (use -u option to show untracked files)"
801 msgstr ""
802
585 -#: wt-status.c:757
803 +#: wt-status.c:781
804 msgid "No changes"
805 msgstr "Sem mudanças"
806
589 -#: wt-status.c:761
807 +#: wt-status.c:785
808 #, c-format
809 msgid "no changes added to commit%s\n"
810 msgstr "nenhuma alteração adicionado ao commit%s\n"
811
594 -#: wt-status.c:763
812 +#: wt-status.c:787
813 msgid " (use \"git add\" and/or \"git commit -a\")"
814 msgstr " (usa \"git add\" e/ou \"git commit -a\")"
815
598 -#: wt-status.c:765
816 +#: wt-status.c:789
817 #, c-format
818 msgid "nothing added to commit but untracked files present%s\n"
819 msgstr ""
820
603 -#: wt-status.c:767
821 +#: wt-status.c:791
822 msgid " (use \"git add\" to track)"
823 msgstr " (usa \"git add\" para seguir)"
824
607 -#: wt-status.c:769
608 -#: wt-status.c:772
609 -#: wt-status.c:775
825 +#: wt-status.c:793
826 +#: wt-status.c:796
827 +#: wt-status.c:799
828 #, c-format
829 msgid "nothing to commit%s\n"
830 msgstr "nada para fazer commit%s\n"
831
614 -#: wt-status.c:770
832 +#: wt-status.c:794
833 msgid " (create/copy files and use \"git add\" to track)"
834 msgstr ""
835
618 -#: wt-status.c:773
836 +#: wt-status.c:797
837 msgid " (use -u to show untracked files)"
838 msgstr ""
839
622 -#: wt-status.c:776
840 +#: wt-status.c:800
841 msgid " (working directory clean)"
842 msgstr " (directório de trabalho vacio)"
843
626 -#: wt-status.c:884
844 +#: wt-status.c:908
845 msgid "HEAD (no branch)"
846 msgstr "HEAD (Não é rama)"
847
630 -#: wt-status.c:890
848 +#: wt-status.c:914
849 msgid "Initial commit on "
850 msgstr "Commit inicial em "
851
634 -#: wt-status.c:905
852 +#: wt-status.c:929
853 msgid "behind "
854 msgstr "atrás "
855
638 -#: wt-status.c:908
639 -#: wt-status.c:911
856 +#: wt-status.c:932
857 +#: wt-status.c:935
858 msgid "ahead "
859 msgstr "a frente "
860
643 -#: wt-status.c:913
861 +#: wt-status.c:937
862 msgid ", behind "
863 msgstr ", atrás "
864
@@ -650,7 +868,7 @@ msgid "unexpected diff status %c"
868 msgstr ""
869
870 #: builtin/add.c:67
653 -#: builtin/commit.c:298
871 +#: builtin/commit.c:282
872 msgid "updating files failed"
873 msgstr "Falou a atualização dos ficheiros"
874
@@ -711,50 +929,391 @@ msgstr "Não foi possível aplicar o '%s'"
929 msgid "The following paths are ignored by one of your .gitignore files:\n"
930 msgstr ""
931
714 -#: builtin/add.c:352
932 +#: builtin/add.c:352
933 +#, c-format
934 +msgid "Use -f if you really want to add them.\n"
935 +msgstr ""
936 +
937 +#: builtin/add.c:353
938 +msgid "no files added"
939 +msgstr "nenhum ficheiros adicionado"
940 +
941 +#: builtin/add.c:359
942 +msgid "adding files failed"
943 +msgstr "falhou a adicionar ficheiros"
944 +
945 +#: builtin/add.c:391
946 +msgid "-A and -u are mutually incompatible"
947 +msgstr ""
948 +
949 +#: builtin/add.c:393
950 +msgid "Option --ignore-missing can only be used together with --dry-run"
951 +msgstr ""
952 +
953 +#: builtin/add.c:413
954 +#, c-format
955 +msgid "Nothing specified, nothing added.\n"
956 +msgstr ""
957 +
958 +#: builtin/add.c:414
959 +#, c-format
960 +msgid "Maybe you wanted to say 'git add .'?\n"
961 +msgstr ""
962 +
963 +#: builtin/add.c:420
964 +#: builtin/clean.c:95
965 +#: builtin/commit.c:342
966 +#: builtin/mv.c:82
967 +#: builtin/rm.c:162
968 +msgid "index file corrupt"
969 +msgstr "ficheiro index corrupto"
970 +
971 +#: builtin/add.c:476
972 +#: builtin/apply.c:4093
973 +#: builtin/mv.c:229
974 +#: builtin/rm.c:260
975 +msgid "Unable to write new index file"
976 +msgstr ""
977 +
978 +#: builtin/apply.c:106
979 +#, c-format
980 +msgid "unrecognized whitespace option '%s'"
981 +msgstr "espaço em braco não reconhecido: '%s'"
982 +
983 +#: builtin/apply.c:121
984 +#, c-format
985 +msgid "unrecognized whitespace ignore option '%s'"
986 +msgstr ""
987 +
988 +#: builtin/apply.c:815
989 +#, c-format
990 +msgid "Cannot prepare timestamp regexp %s"
991 +msgstr ""
992 +
993 +#: builtin/apply.c:824
994 +#, c-format
995 +msgid "regexec returned %d for input: %s"
996 +msgstr ""
997 +
998 +#: builtin/apply.c:905
999 +#, c-format
1000 +msgid "unable to find filename in patch at line %d"
1001 +msgstr ""
1002 +
1003 +#: builtin/apply.c:934
1004 +#, c-format
1005 +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1006 +msgstr ""
1007 +
1008 +#: builtin/apply.c:937
1009 +#, c-format
1010 +msgid "git apply: bad git-diff - inconsistent %s filename on line %d"
1011 +msgstr ""
1012 +
1013 +#: builtin/apply.c:944
1014 +#, c-format
1015 +msgid "git apply: bad git-diff - expected /dev/null on line %d"
1016 +msgstr ""
1017 +
1018 +#: builtin/apply.c:1387
1019 +#, c-format
1020 +msgid "recount: unexpected line: %.*s"
1021 +msgstr ""
1022 +
1023 +#: builtin/apply.c:1444
1024 +#, c-format
1025 +msgid "patch fragment without header at line %d: %.*s"
1026 +msgstr ""
1027 +
1028 +#: builtin/apply.c:1461
1029 +#, c-format
1030 +msgid "git diff header lacks filename information when removing %d leading pathname component (line %d)"
1031 +msgid_plural "git diff header lacks filename information when removing %d leading pathname components (line %d)"
1032 +msgstr[0] ""
1033 +msgstr[1] ""
1034 +
1035 +#: builtin/apply.c:1621
1036 +msgid "new file depends on old contents"
1037 +msgstr ""
1038 +
1039 +#: builtin/apply.c:1623
1040 +msgid "deleted file still has contents"
1041 +msgstr ""
1042 +
1043 +#: builtin/apply.c:1649
1044 +#, c-format
1045 +msgid "corrupt patch at line %d"
1046 +msgstr ""
1047 +
1048 +#: builtin/apply.c:1685
1049 +#, c-format
1050 +msgid "new file %s depends on old contents"
1051 +msgstr ""
1052 +
1053 +#: builtin/apply.c:1687
1054 +#, c-format
1055 +msgid "deleted file %s still has contents"
1056 +msgstr ""
1057 +
1058 +#: builtin/apply.c:1690
1059 +#, c-format
1060 +msgid "** warning: file %s becomes empty but is not deleted"
1061 +msgstr ""
1062 +
1063 +#: builtin/apply.c:1836
1064 +#, c-format
1065 +msgid "corrupt binary patch at line %d: %.*s"
1066 +msgstr ""
1067 +
1068 +#. there has to be one hunk (forward hunk)
1069 +#: builtin/apply.c:1865
1070 +#, c-format
1071 +msgid "unrecognized binary patch at line %d"
1072 +msgstr ""
1073 +
1074 +#: builtin/apply.c:1951
1075 +#, c-format
1076 +msgid "patch with only garbage at line %d"
1077 +msgstr ""
1078 +
1079 +#: builtin/apply.c:2041
1080 +#, c-format
1081 +msgid "unable to read symlink %s"
1082 +msgstr ""
1083 +
1084 +#: builtin/apply.c:2045
1085 +#, c-format
1086 +msgid "unable to open or read %s"
1087 +msgstr "Não foi possível abrir o ler %s"
1088 +
1089 +#: builtin/apply.c:2116
1090 +msgid "oops"
1091 +msgstr ""
1092 +
1093 +#: builtin/apply.c:2638
1094 +#, c-format
1095 +msgid "invalid start of line: '%c'"
1096 +msgstr "começo de linha inválido: '%c'"
1097 +
1098 +#: builtin/apply.c:2756
1099 +#, c-format
1100 +msgid "Hunk #%d succeeded at %d (offset %d line)."
1101 +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1102 +msgstr[0] ""
1103 +msgstr[1] ""
1104 +
1105 +#: builtin/apply.c:2768
1106 +#, c-format
1107 +msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1108 +msgstr ""
1109 +
1110 +#: builtin/apply.c:2774
1111 +#, c-format
1112 +msgid ""
1113 +"while searching for:\n"
1114 +"%.*s"
1115 +msgstr ""
1116 +
1117 +#: builtin/apply.c:2793
1118 +#, c-format
1119 +msgid "missing binary patch data for '%s'"
1120 +msgstr ""
1121 +
1122 +#: builtin/apply.c:2896
1123 +#, c-format
1124 +msgid "binary patch does not apply to '%s'"
1125 +msgstr ""
1126 +
1127 +#: builtin/apply.c:2902
1128 +#, c-format
1129 +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1130 +msgstr ""
1131 +
1132 +#: builtin/apply.c:2923
1133 +#, c-format
1134 +msgid "patch failed: %s:%ld"
1135 +msgstr ""
1136 +
1137 +#: builtin/apply.c:3038
1138 +#, c-format
1139 +msgid "patch %s has been renamed/deleted"
1140 +msgstr ""
1141 +
1142 +#: builtin/apply.c:3045
1143 +#: builtin/apply.c:3062
1144 +#, c-format
1145 +msgid "read of %s failed"
1146 +msgstr "ler %s falhou"
1147 +
1148 +#: builtin/apply.c:3077
1149 +msgid "removal patch leaves file contents"
1150 +msgstr ""
1151 +
1152 +#: builtin/apply.c:3098
1153 +#, c-format
1154 +msgid "%s: already exists in working directory"
1155 +msgstr "%s: já existe no espaço de trabalho"
1156 +
1157 +#: builtin/apply.c:3136
1158 +#, c-format
1159 +msgid "%s: has been deleted/renamed"
1160 +msgstr ""
1161 +
1162 +#: builtin/apply.c:3141
1163 +#: builtin/apply.c:3172
1164 +#, c-format
1165 +msgid "%s: %s"
1166 +msgstr "%s: %s"
1167 +
1168 +#: builtin/apply.c:3152
1169 +#, c-format
1170 +msgid "%s: does not exist in index"
1171 +msgstr ""
1172 +
1173 +#: builtin/apply.c:3166
1174 +#, c-format
1175 +msgid "%s: does not match index"
1176 +msgstr "%s: não tem correspondencia ao index"
1177 +
1178 +#: builtin/apply.c:3183
1179 +#, c-format
1180 +msgid "%s: wrong type"
1181 +msgstr ""
1182 +
1183 +#: builtin/apply.c:3185
1184 +#, c-format
1185 +msgid "%s has type %o, expected %o"
1186 +msgstr ""
1187 +
1188 +#: builtin/apply.c:3240
1189 +#, c-format
1190 +msgid "%s: already exists in index"
1191 +msgstr "%s: já existe no indíce"
1192 +
1193 +#: builtin/apply.c:3259
1194 +#, c-format
1195 +msgid "new mode (%o) of %s does not match old mode (%o)%s%s"
1196 +msgstr ""
1197 +
1198 +#: builtin/apply.c:3265
1199 +#, c-format
1200 +msgid "%s: patch does not apply"
1201 +msgstr ""
1202 +
1203 +#: builtin/apply.c:3278
1204 +#, c-format
1205 +msgid "Checking patch %s..."
1206 +msgstr ""
1207 +
1208 +#: builtin/apply.c:3333
1209 +#: builtin/checkout.c:212
1210 +#: builtin/reset.c:158
1211 +#, c-format
1212 +msgid "make_cache_entry failed for path '%s'"
1213 +msgstr ""
1214 +
1215 +#: builtin/apply.c:3476
1216 +#, c-format
1217 +msgid "unable to remove %s from index"
1218 +msgstr ""
1219 +
1220 +#: builtin/apply.c:3503
1221 +#, c-format
1222 +msgid "corrupt patch for subproject %s"
1223 +msgstr ""
1224 +
1225 +#: builtin/apply.c:3507
1226 +#, c-format
1227 +msgid "unable to stat newly created file '%s'"
1228 +msgstr "não é possivel 'stat' o novo ficheiro creado '%s'"
1229 +
1230 +#: builtin/apply.c:3512
1231 +#, c-format
1232 +msgid "unable to create backing store for newly created file %s"
1233 +msgstr ""
1234 +
1235 +#: builtin/apply.c:3515
1236 +#, c-format
1237 +msgid "unable to add cache entry for %s"
1238 +msgstr ""
1239 +
1240 +#: builtin/apply.c:3548
1241 +#, c-format
1242 +msgid "closing file '%s'"
1243 +msgstr "fechar fichero '%s'"
1244 +
1245 +#: builtin/apply.c:3597
1246 +#, c-format
1247 +msgid "unable to write file '%s' mode %o"
1248 +msgstr ""
1249 +
1250 +#: builtin/apply.c:3653
1251 +#, c-format
1252 +msgid "Applied patch %s cleanly."
1253 +msgstr ""
1254 +
1255 +#: builtin/apply.c:3661
1256 +msgid "internal error"
1257 +msgstr ""
1258 +
1259 +#. Say this even without --verbose
1260 +#: builtin/apply.c:3664
1261 +#, c-format
1262 +msgid "Applying patch %%s with %d reject..."
1263 +msgid_plural "Applying patch %%s with %d rejects..."
1264 +msgstr[0] ""
1265 +msgstr[1] ""
1266 +
1267 +#: builtin/apply.c:3674
1268 +#, c-format
1269 +msgid "truncating .rej filename to %.*s.rej"
1270 +msgstr ""
1271 +
1272 +#: builtin/apply.c:3695
1273 +#, c-format
1274 +msgid "Hunk #%d applied cleanly."
1275 +msgstr ""
1276 +
1277 +#: builtin/apply.c:3698
1278 #, c-format
716 -msgid "Use -f if you really want to add them.\n"
1279 +msgid "Rejected hunk #%d."
1280 msgstr ""
1281
719 -#: builtin/add.c:353
720 -msgid "no files added"
721 -msgstr "nenhum ficheiros adicionado"
1282 +#: builtin/apply.c:3829
1283 +msgid "unrecognized input"
1284 +msgstr "entrada não reconhecida"
1285
723 -#: builtin/add.c:359
724 -msgid "adding files failed"
725 -msgstr "falhou a adicionar ficheiros"
1286 +#: builtin/apply.c:3840
1287 +msgid "unable to read index file"
1288 +msgstr "Não foi possível ler o fichero indíce"
1289
727 -#: builtin/add.c:391
728 -msgid "-A and -u are mutually incompatible"
729 -msgstr ""
1290 +#: builtin/apply.c:4035
1291 +msgid "--index outside a repository"
1292 +msgstr "--index fora de um repositorio"
1293
731 -#: builtin/add.c:393
732 -msgid "Option --ignore-missing can only be used together with --dry-run"
733 -msgstr ""
1294 +#: builtin/apply.c:4038
1295 +msgid "--cached outside a repository"
1296 +msgstr "--cached fora de um repositorio"
1297
735 -#: builtin/add.c:413
1298 +#: builtin/apply.c:4054
1299 #, c-format
737 -msgid "Nothing specified, nothing added.\n"
738 -msgstr ""
1300 +msgid "can't open patch '%s'"
1301 +msgstr "não é possivel abrir patch '%s'"
1302
740 -#: builtin/add.c:414
1303 +#: builtin/apply.c:4068
1304 #, c-format
742 -msgid "Maybe you wanted to say 'git add .'?\n"
743 -msgstr ""
744 -
745 -#: builtin/add.c:420
746 -#: builtin/clean.c:95
747 -#: builtin/commit.c:358
748 -#: builtin/mv.c:82
749 -#: builtin/rm.c:162
750 -msgid "index file corrupt"
751 -msgstr "ficheiro index corrupto"
1305 +msgid "squelched %d whitespace error"
1306 +msgid_plural "squelched %d whitespace errors"
1307 +msgstr[0] ""
1308 +msgstr[1] ""
1309
753 -#: builtin/add.c:476
754 -#: builtin/mv.c:229
755 -#: builtin/rm.c:260
756 -msgid "Unable to write new index file"
757 -msgstr ""
1310 +#: builtin/apply.c:4074
1311 +#: builtin/apply.c:4084
1312 +#, c-format
1313 +msgid "%d line adds whitespace errors."
1314 +msgid_plural "%d lines add whitespace errors."
1315 +msgstr[0] ""
1316 +msgstr[1] ""
1317
1318 #: builtin/archive.c:17
1319 #, c-format
@@ -791,144 +1350,158 @@ msgstr ""
1350 msgid "git archive: expected a flush"
1351 msgstr ""
1352
794 -#: builtin/branch.c:137
1353 +#: builtin/branch.c:144
1354 #, c-format
1355 msgid ""
1356 "deleting branch '%s' that has been merged to\n"
1357 " '%s', but not yet merged to HEAD."
1358 msgstr ""
1359
801 -#: builtin/branch.c:141
1360 +#: builtin/branch.c:148
1361 #, c-format
1362 msgid ""
1363 "not deleting branch '%s' that is not yet merged to\n"
1364 " '%s', even though it is merged to HEAD."
1365 msgstr ""
1366
808 -#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
809 -#: builtin/branch.c:163
810 -msgid "remote "
811 -msgstr "remota"
812 -
813 -#: builtin/branch.c:171
1367 +#: builtin/branch.c:180
1368 msgid "cannot use -a with -d"
1369 msgstr "Não é possível usar -a com um -d"
1370
817 -#: builtin/branch.c:177
1371 +#: builtin/branch.c:186
1372 msgid "Couldn't look up commit object for HEAD"
1373 msgstr ""
1374
821 -#: builtin/branch.c:182
1375 +#: builtin/branch.c:191
1376 #, c-format
1377 msgid "Cannot delete the branch '%s' which you are currently on."
1378 msgstr ""
1379
826 -#: builtin/branch.c:192
1380 +#: builtin/branch.c:202
1381 +#, c-format
1382 +msgid "remote branch '%s' not found."
1383 +msgstr "rama remota '%s não encontrada."
1384 +
1385 +#: builtin/branch.c:203
1386 #, c-format
828 -msgid "%sbranch '%s' not found."
829 -msgstr "%sbranch '%s' não encontrado."
1387 +msgid "branch '%s' not found."
1388 +msgstr "rama '%s' não encontrado."
1389
831 -#: builtin/branch.c:200
1390 +#: builtin/branch.c:210
1391 #, c-format
1392 msgid "Couldn't look up commit object for '%s'"
1393 msgstr ""
1394
836 -#: builtin/branch.c:206
1395 +#: builtin/branch.c:216
1396 #, c-format
1397 msgid ""
1398 "The branch '%s' is not fully merged.\n"
1399 "If you are sure you want to delete it, run 'git branch -D %s'."
1400 msgstr ""
1401
843 -#: builtin/branch.c:214
1402 +#: builtin/branch.c:225
1403 #, c-format
845 -msgid "Error deleting %sbranch '%s'"
1404 +msgid "Error deleting remote branch '%s'"
1405 msgstr ""
1406
848 -#: builtin/branch.c:219
1407 +#: builtin/branch.c:226
1408 +#, c-format
1409 +msgid "Error deleting branch '%s'"
1410 +msgstr "Erro a eliminar rama '%s'"
1411 +
1412 +#: builtin/branch.c:233
1413 #, c-format
850 -msgid "Deleted %sbranch %s (was %s).\n"
1414 +msgid "Deleted remote branch %s (was %s).\n"
1415 msgstr ""
1416
853 -#: builtin/branch.c:224
1417 +#: builtin/branch.c:234
1418 +#, c-format
1419 +msgid "Deleted branch %s (was %s).\n"
1420 +msgstr "Eliminar rama %s (era %s).\n"
1421 +
1422 +#: builtin/branch.c:239
1423 msgid "Update of config-file failed"
1424 msgstr ""
1425
857 -#: builtin/branch.c:322
1426 +#: builtin/branch.c:337
1427 #, c-format
1428 msgid "branch '%s' does not point at a commit"
1429 msgstr ""
1430
862 -#: builtin/branch.c:394
1431 +#: builtin/branch.c:409
1432 #, c-format
1433 msgid "behind %d] "
1434 msgstr "atrás %d] "
1435
867 -#: builtin/branch.c:396
1436 +#: builtin/branch.c:411
1437 #, c-format
1438 msgid "ahead %d] "
1439 msgstr "a frente %d] "
1440
872 -#: builtin/branch.c:398
1441 +#: builtin/branch.c:413
1442 #, c-format
1443 msgid "ahead %d, behind %d] "
1444 msgstr "a frente %d, atrás %d] "
1445
877 -#: builtin/branch.c:501
1446 +#: builtin/branch.c:521
1447 msgid "(no branch)"
1448 msgstr "(não é rama)"
1449
881 -#: builtin/branch.c:566
1450 +#: builtin/branch.c:586
1451 msgid "some refs could not be read"
1452 msgstr ""
1453
885 -#: builtin/branch.c:579
1454 +#: builtin/branch.c:599
1455 msgid "cannot rename the current branch while not on any."
1456 msgstr ""
1457
889 -#: builtin/branch.c:589
1458 +#: builtin/branch.c:609
1459 #, c-format
1460 msgid "Invalid branch name: '%s'"
1461 msgstr "Nome da rama inválida: '%s'"
1462
894 -#: builtin/branch.c:604
1463 +#: builtin/branch.c:624
1464 msgid "Branch rename failed"
1465 msgstr "Falhou renomeação da rama"
1466
898 -#: builtin/branch.c:608
1467 +#: builtin/branch.c:628
1468 #, c-format
1469 msgid "Renamed a misnamed branch '%s' away"
1470 msgstr "Renomeado uma rama erronea '%s'"
1471
903 -#: builtin/branch.c:612
1472 +#: builtin/branch.c:632
1473 #, c-format
1474 msgid "Branch renamed to %s, but HEAD is not updated!"
1475 msgstr ""
1476
908 -#: builtin/branch.c:619
1477 +#: builtin/branch.c:639
1478 msgid "Branch is renamed, but update of config-file failed"
1479 msgstr ""
1480
912 -#: builtin/branch.c:634
1481 +#: builtin/branch.c:654
1482 #, c-format
1483 msgid "malformed object name %s"
1484 msgstr ""
1485
917 -#: builtin/branch.c:658
1486 +#: builtin/branch.c:678
1487 #, c-format
919 -msgid "could not write branch description template: %s\n"
1488 +msgid "could not write branch description template: %s"
1489 msgstr ""
1490
922 -#: builtin/branch.c:746
1491 +#: builtin/branch.c:769
1492 msgid "Failed to resolve HEAD as a valid ref."
1493 msgstr ""
1494
926 -#: builtin/branch.c:751
1495 +#: builtin/branch.c:774
1496 #: builtin/clone.c:558
1497 msgid "HEAD not found below refs/heads!"
1498 msgstr ""
1499
931 -#: builtin/branch.c:809
1500 +#: builtin/branch.c:794
1501 +msgid "--column and --verbose are incompatible"
1502 +msgstr "--column e --verbose são incompatíveis"
1503 +
1504 +#: builtin/branch.c:843
1505 msgid "-a and -r options to 'git branch' do not make sense with a branch name"
1506 msgstr ""
1507
@@ -977,12 +1550,6 @@ msgstr ""
1550 msgid "Unable to add merge result for '%s'"
1551 msgstr ""
1552
980 -#: builtin/checkout.c:212
981 -#: builtin/reset.c:158
982 -#, c-format
983 -msgid "make_cache_entry failed for path '%s'"
984 -msgstr ""
985 -
1553 #: builtin/checkout.c:234
1554 #: builtin/checkout.c:392
1555 msgid "corrupt index file"
@@ -997,7 +1564,7 @@ msgstr ""
1564 #: builtin/checkout.c:302
1565 #: builtin/checkout.c:498
1566 #: builtin/clone.c:583
1000 -#: builtin/merge.c:811
1567 +#: builtin/merge.c:812
1568 msgid "unable to write new index file"
1569 msgstr ""
1570
@@ -1016,42 +1583,42 @@ msgstr ""
1583 msgid "Can not do reflog for '%s'\n"
1584 msgstr ""
1585
1019 -#: builtin/checkout.c:565
1586 +#: builtin/checkout.c:566
1587 msgid "HEAD is now at"
1588 msgstr "HEAD é agora em "
1589
1023 -#: builtin/checkout.c:572
1590 +#: builtin/checkout.c:573
1591 #, c-format
1592 msgid "Reset branch '%s'\n"
1593 msgstr "Reset rama '%s'\n"
1594
1028 -#: builtin/checkout.c:575
1595 +#: builtin/checkout.c:576
1596 #, c-format
1597 msgid "Already on '%s'\n"
1598 msgstr "Já em '%s'\n"
1599
1033 -#: builtin/checkout.c:579
1600 +#: builtin/checkout.c:580
1601 #, c-format
1602 msgid "Switched to and reset branch '%s'\n"
1603 msgstr ""
1604
1038 -#: builtin/checkout.c:581
1605 +#: builtin/checkout.c:582
1606 #, c-format
1607 msgid "Switched to a new branch '%s'\n"
1608 msgstr "Mudado para a nova rama '%s'\n"
1609
1043 -#: builtin/checkout.c:583
1610 +#: builtin/checkout.c:584
1611 #, c-format
1612 msgid "Switched to branch '%s'\n"
1613 msgstr "Mudado para a rama '%s'\n"
1614
1048 -#: builtin/checkout.c:639
1615 +#: builtin/checkout.c:640
1616 #, c-format
1617 msgid " ... and %d more.\n"
1618 msgstr " ... e %d mais.\n"
1619
1620 #. The singular version
1054 -#: builtin/checkout.c:645
1621 +#: builtin/checkout.c:646
1622 #, c-format
1623 msgid ""
1624 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -1066,7 +1633,7 @@ msgid_plural ""
1633 msgstr[0] ""
1634 msgstr[1] ""
1635
1069 -#: builtin/checkout.c:663
1636 +#: builtin/checkout.c:664
1637 #, c-format
1638 msgid ""
1639 "If you want to keep them by creating a new branch, this may be a good time\n"
@@ -1076,96 +1643,96 @@ msgid ""
1643 "\n"
1644 msgstr ""
1645
1079 -#: builtin/checkout.c:692
1646 +#: builtin/checkout.c:693
1647 msgid "internal error in revision walk"
1648 msgstr ""
1649
1083 -#: builtin/checkout.c:696
1650 +#: builtin/checkout.c:697
1651 msgid "Previous HEAD position was"
1652 msgstr ""
1653
1087 -#: builtin/checkout.c:722
1654 +#: builtin/checkout.c:723
1655 msgid "You are on a branch yet to be born"
1656 msgstr ""
1657
1658 #. case (1)
1092 -#: builtin/checkout.c:853
1659 +#: builtin/checkout.c:854
1660 #, c-format
1661 msgid "invalid reference: %s"
1662 msgstr ""
1663
1664 #. case (1): want a tree
1098 -#: builtin/checkout.c:892
1665 +#: builtin/checkout.c:893
1666 #, c-format
1667 msgid "reference is not a tree: %s"
1668 msgstr ""
1669
1103 -#: builtin/checkout.c:972
1670 +#: builtin/checkout.c:973
1671 msgid "-B cannot be used with -b"
1672 msgstr ""
1673
1107 -#: builtin/checkout.c:981
1674 +#: builtin/checkout.c:982
1675 msgid "--patch is incompatible with all other options"
1676 msgstr ""
1677
1111 -#: builtin/checkout.c:984
1678 +#: builtin/checkout.c:985
1679 msgid "--detach cannot be used with -b/-B/--orphan"
1680 msgstr ""
1681
1115 -#: builtin/checkout.c:986
1682 +#: builtin/checkout.c:987
1683 msgid "--detach cannot be used with -t"
1684 msgstr ""
1685
1119 -#: builtin/checkout.c:992
1686 +#: builtin/checkout.c:993
1687 msgid "--track needs a branch name"
1688 msgstr ""
1689
1123 -#: builtin/checkout.c:999
1690 +#: builtin/checkout.c:1000
1691 msgid "Missing branch name; try -b"
1692 msgstr ""
1693
1127 -#: builtin/checkout.c:1005
1694 +#: builtin/checkout.c:1006
1695 msgid "--orphan and -b|-B are mutually exclusive"
1696 msgstr ""
1697
1131 -#: builtin/checkout.c:1007
1698 +#: builtin/checkout.c:1008
1699 msgid "--orphan cannot be used with -t"
1700 msgstr ""
1701
1135 -#: builtin/checkout.c:1017
1702 +#: builtin/checkout.c:1018
1703 msgid "git checkout: -f and -m are incompatible"
1704 msgstr ""
1705
1139 -#: builtin/checkout.c:1051
1706 +#: builtin/checkout.c:1052
1707 msgid "invalid path specification"
1708 msgstr ""
1709
1143 -#: builtin/checkout.c:1059
1710 +#: builtin/checkout.c:1060
1711 #, c-format
1712 msgid ""
1713 "git checkout: updating paths is incompatible with switching branches.\n"
1714 "Did you intend to checkout '%s' which can not be resolved as commit?"
1715 msgstr ""
1716
1150 -#: builtin/checkout.c:1061
1717 +#: builtin/checkout.c:1062
1718 msgid "git checkout: updating paths is incompatible with switching branches."
1719 msgstr ""
1720
1154 -#: builtin/checkout.c:1066
1721 +#: builtin/checkout.c:1067
1722 msgid "git checkout: --detach does not take a path argument"
1723 msgstr ""
1724
1158 -#: builtin/checkout.c:1069
1725 +#: builtin/checkout.c:1070
1726 msgid ""
1727 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
1728 "checking out of the index."
1729 msgstr ""
1730
1164 -#: builtin/checkout.c:1088
1731 +#: builtin/checkout.c:1089
1732 msgid "Cannot switch branch to a non-commit."
1733 msgstr ""
1734
1168 -#: builtin/checkout.c:1091
1735 +#: builtin/checkout.c:1092
1736 msgid "--ours/--theirs is incompatible with switching branches."
1737 msgstr ""
1738
@@ -1217,12 +1784,12 @@ msgstr ""
1784 #: builtin/clone.c:302
1785 #, c-format
1786 msgid "failed to open '%s'"
1220 -msgstr ""
1787 +msgstr "falhou a abrir '%s'"
1788
1789 #: builtin/clone.c:306
1790 #, c-format
1791 msgid "failed to create directory '%s'"
1225 -msgstr ""
1792 +msgstr "falhou a criar o directório '%s'"
1793
1794 #: builtin/clone.c:308
1795 #: builtin/diff.c:75
@@ -1253,7 +1820,7 @@ msgstr ""
1820 #: builtin/clone.c:350
1821 #, c-format
1822 msgid "failed to copy file to '%s'"
1256 -msgstr ""
1823 +msgstr "falhou a copiar o ficheiro para '%s'"
1824
1825 #: builtin/clone.c:373
1826 #, c-format
@@ -1336,7 +1903,11 @@ msgstr ""
1903 msgid "You appear to have cloned an empty repository."
1904 msgstr ""
1905
1339 -#: builtin/commit.c:42
1906 +#: builtin/column.c:51
1907 +msgid "--command must be the first argument"
1908 +msgstr ""
1909 +
1910 +#: builtin/commit.c:43
1911 msgid ""
1912 "Your name and email address were configured automatically based\n"
1913 "on your username and hostname. Please check that they are accurate.\n"
@@ -1360,14 +1931,14 @@ msgstr ""
1931 "\n"
1932 " git commit --amend --reset-author\n"
1933
1363 -#: builtin/commit.c:54
1934 +#: builtin/commit.c:55
1935 msgid ""
1936 "You asked to amend the most recent commit, but doing so would make\n"
1937 "it empty. You can repeat your command with --allow-empty, or you can\n"
1938 "remove the commit entirely with \"git reset HEAD^\".\n"
1939 msgstr ""
1940
1370 -#: builtin/commit.c:59
1941 +#: builtin/commit.c:60
1942 msgid ""
1943 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
1944 "If you wish to commit it anyway, use:\n"
@@ -1377,286 +1948,289 @@ msgid ""
1948 "Otherwise, please use 'git reset'\n"
1949 msgstr ""
1950
1380 -#: builtin/commit.c:205
1381 -#: builtin/reset.c:33
1382 -msgid "merge"
1383 -msgstr "juntar"
1384 -
1385 -#: builtin/commit.c:208
1386 -msgid "cherry-pick"
1387 -msgstr "cherry-pick"
1388 -
1389 -#: builtin/commit.c:325
1951 +#: builtin/commit.c:309
1952 msgid "failed to unpack HEAD tree object"
1953 msgstr ""
1954
1393 -#: builtin/commit.c:367
1955 +#: builtin/commit.c:351
1956 msgid "unable to create temporary index"
1957 msgstr ""
1958
1397 -#: builtin/commit.c:373
1959 +#: builtin/commit.c:357
1960 msgid "interactive add failed"
1961 msgstr "falhou adicionar interativo"
1962
1401 -#: builtin/commit.c:406
1402 -#: builtin/commit.c:427
1403 -#: builtin/commit.c:473
1963 +#: builtin/commit.c:390
1964 +#: builtin/commit.c:411
1965 +#: builtin/commit.c:461
1966 msgid "unable to write new_index file"
1967 msgstr ""
1968
1407 -#: builtin/commit.c:457
1408 -#, c-format
1409 -msgid "cannot do a partial commit during a %s."
1969 +#: builtin/commit.c:442
1970 +msgid "cannot do a partial commit during a merge."
1971 +msgstr ""
1972 +
1973 +#: builtin/commit.c:444
1974 +msgid "cannot do a partial commit during a cherry-pick."
1975 msgstr ""
1976
1412 -#: builtin/commit.c:466
1977 +#: builtin/commit.c:454
1978 msgid "cannot read the index"
1979 msgstr "não foi possível ler o indíce"
1980
1416 -#: builtin/commit.c:486
1981 +#: builtin/commit.c:474
1982 msgid "unable to write temporary index file"
1983 msgstr ""
1984
1420 -#: builtin/commit.c:550
1421 -#: builtin/commit.c:556
1985 +#: builtin/commit.c:549
1986 +#: builtin/commit.c:555
1987 #, c-format
1988 msgid "invalid commit: %s"
1989 msgstr "commit inválido: %s"
1990
1426 -#: builtin/commit.c:579
1991 +#: builtin/commit.c:578
1992 msgid "malformed --author parameter"
1993 msgstr ""
1994
1430 -#: builtin/commit.c:635
1995 +#: builtin/commit.c:639
1996 #, c-format
1997 msgid "Malformed ident string: '%s'"
1998 msgstr ""
1999
1435 -#: builtin/commit.c:670
1436 -#: builtin/commit.c:703
1437 -#: builtin/commit.c:1000
2000 +#: builtin/commit.c:677
2001 +#: builtin/commit.c:710
2002 +#: builtin/commit.c:1024
2003 #, c-format
2004 msgid "could not lookup commit %s"
2005 msgstr ""
2006
1442 -#: builtin/commit.c:682
2007 +#: builtin/commit.c:689
2008 #: builtin/shortlog.c:296
2009 #, c-format
2010 msgid "(reading log message from standard input)\n"
2011 msgstr ""
2012
1448 -#: builtin/commit.c:684
2013 +#: builtin/commit.c:691
2014 msgid "could not read log from standard input"
2015 msgstr ""
2016
1452 -#: builtin/commit.c:688
2017 +#: builtin/commit.c:695
2018 #, c-format
2019 msgid "could not read log file '%s'"
2020 msgstr "não é possivel ler o ficheiro de log '%s'"
2021
1457 -#: builtin/commit.c:694
2022 +#: builtin/commit.c:701
2023 msgid "commit has empty message"
2024 msgstr "a mensagem do commit está vazia"
2025
1461 -#: builtin/commit.c:710
2026 +#: builtin/commit.c:717
2027 msgid "could not read MERGE_MSG"
2028 msgstr "não é possivel ler MERGE_MSG"
2029
1465 -#: builtin/commit.c:714
2030 +#: builtin/commit.c:721
2031 msgid "could not read SQUASH_MSG"
2032 msgstr "não é possivel ler SQUASH_MSG"
2033
1469 -#: builtin/commit.c:718
2034 +#: builtin/commit.c:725
2035 #, c-format
2036 msgid "could not read '%s'"
2037 msgstr "não é possivel ler '%s'"
2038
1474 -#: builtin/commit.c:746
1475 -#, c-format
1476 -msgid "could not open '%s'"
1477 -msgstr "não é possivel abrir '%s'"
1478 -
1479 -#: builtin/commit.c:770
2039 +#: builtin/commit.c:777
2040 msgid "could not write commit template"
2041 msgstr ""
2042
1483 -#: builtin/commit.c:783
2043 +#: builtin/commit.c:788
2044 #, c-format
2045 msgid ""
2046 "\n"
1487 -"It looks like you may be committing a %s.\n"
2047 +"It looks like you may be committing a merge.\n"
2048 "If this is not correct, please remove the file\n"
2049 "\t%s\n"
2050 "and try again.\n"
2051 msgstr ""
2052
1493 -#: builtin/commit.c:796
1494 -msgid "Please enter the commit message for your changes."
1495 -msgstr "Por favor insira a mensagem de commit das suas alterações."
2053 +#: builtin/commit.c:793
2054 +#, c-format
2055 +msgid ""
2056 +"\n"
2057 +"It looks like you may be committing a cherry-pick.\n"
2058 +"If this is not correct, please remove the file\n"
2059 +"\t%s\n"
2060 +"and try again.\n"
2061 +msgstr ""
2062
1497 -#: builtin/commit.c:799
2063 +#: builtin/commit.c:805
2064 msgid ""
1499 -" Lines starting\n"
2065 +"Please enter the commit message for your changes. Lines starting\n"
2066 "with '#' will be ignored, and an empty message aborts the commit.\n"
2067 msgstr ""
2068
1503 -#: builtin/commit.c:804
2069 +#: builtin/commit.c:810
2070 msgid ""
1505 -" Lines starting\n"
2071 +"Please enter the commit message for your changes. Lines starting\n"
2072 "with '#' will be kept; you may remove them yourself if you want to.\n"
2073 "An empty message aborts the commit.\n"
2074 msgstr ""
2075
1510 -#: builtin/commit.c:816
2076 +#: builtin/commit.c:823
2077 #, c-format
2078 msgid "%sAuthor: %s"
2079 msgstr "%sAutor: %s"
2080
1515 -#: builtin/commit.c:823
2081 +#: builtin/commit.c:830
2082 #, c-format
2083 msgid "%sCommitter: %s"
2084 msgstr "%sCommitador: %s"
2085
1520 -#: builtin/commit.c:843
2086 +#: builtin/commit.c:850
2087 msgid "Cannot read index"
2088 msgstr ""
2089
1524 -#: builtin/commit.c:880
2090 +#: builtin/commit.c:887
2091 msgid "Error building trees"
2092 msgstr ""
2093
1528 -#: builtin/commit.c:895
1529 -#: builtin/tag.c:357
2094 +#: builtin/commit.c:902
2095 +#: builtin/tag.c:361
2096 #, c-format
2097 msgid "Please supply the message using either -m or -F option.\n"
2098 msgstr ""
2099
1534 -#: builtin/commit.c:975
2100 +#: builtin/commit.c:999
2101 #, c-format
2102 msgid "No existing author found with '%s'"
2103 msgstr ""
2104
1539 -#: builtin/commit.c:990
1540 -#: builtin/commit.c:1182
2105 +#: builtin/commit.c:1014
2106 +#: builtin/commit.c:1214
2107 #, c-format
2108 msgid "Invalid untracked files mode '%s'"
2109 msgstr ""
2110
1545 -#: builtin/commit.c:1030
2111 +#: builtin/commit.c:1054
2112 msgid "Using both --reset-author and --author does not make sense"
2113 msgstr ""
2114
1549 -#: builtin/commit.c:1041
2115 +#: builtin/commit.c:1065
2116 msgid "You have nothing to amend."
2117 msgstr "Você não tem nada a corregir."
2118
1553 -#: builtin/commit.c:1043
1554 -#, c-format
1555 -msgid "You are in the middle of a %s -- cannot amend."
2119 +#: builtin/commit.c:1068
2120 +msgid "You are in the middle of a merge -- cannot amend."
2121 +msgstr ""
2122 +
2123 +#: builtin/commit.c:1070
2124 +msgid "You are in the middle of a cherry-pick -- cannot amend."
2125 msgstr ""
2126
1558 -#: builtin/commit.c:1045
2127 +#: builtin/commit.c:1073
2128 msgid "Options --squash and --fixup cannot be used together"
2129 msgstr ""
2130
1562 -#: builtin/commit.c:1055
2131 +#: builtin/commit.c:1083
2132 msgid "Only one of -c/-C/-F/--fixup can be used."
2133 msgstr ""
2134
1566 -#: builtin/commit.c:1057
2135 +#: builtin/commit.c:1085
2136 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
2137 msgstr ""
2138
1570 -#: builtin/commit.c:1063
2139 +#: builtin/commit.c:1093
2140 msgid "--reset-author can be used only with -C, -c or --amend."
2141 msgstr ""
2142
1574 -#: builtin/commit.c:1080
2143 +#: builtin/commit.c:1110
2144 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
2145 msgstr ""
2146
1578 -#: builtin/commit.c:1082
2147 +#: builtin/commit.c:1112
2148 msgid "No paths with --include/--only does not make sense."
2149 msgstr ""
2150
1582 -#: builtin/commit.c:1084
2151 +#: builtin/commit.c:1114
2152 msgid "Clever... amending the last one with dirty index."
2153 msgstr ""
2154
1586 -#: builtin/commit.c:1086
2155 +#: builtin/commit.c:1116
2156 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
2157 msgstr ""
2158
1590 -#: builtin/commit.c:1096
1591 -#: builtin/tag.c:556
2159 +#: builtin/commit.c:1126
2160 +#: builtin/tag.c:577
2161 #, c-format
2162 msgid "Invalid cleanup mode %s"
2163 msgstr ""
2164
1596 -#: builtin/commit.c:1101
2165 +#: builtin/commit.c:1131
2166 msgid "Paths with -a does not make sense."
2167 msgstr ""
2168
1600 -#: builtin/commit.c:1280
2169 +#: builtin/commit.c:1315
2170 msgid "couldn't look up newly created commit"
2171 msgstr ""
2172
1604 -#: builtin/commit.c:1282
2173 +#: builtin/commit.c:1317
2174 msgid "could not parse newly created commit"
2175 msgstr ""
2176
1608 -#: builtin/commit.c:1323
2177 +#: builtin/commit.c:1358
2178 msgid "detached HEAD"
2179 msgstr ""
2180
1612 -#: builtin/commit.c:1325
2181 +#: builtin/commit.c:1360
2182 msgid " (root-commit)"
2183 msgstr " (root-commit)"
2184
1616 -#: builtin/commit.c:1415
2185 +#: builtin/commit.c:1450
2186 msgid "could not parse HEAD commit"
2187 msgstr ""
2188
1620 -#: builtin/commit.c:1452
2189 +#: builtin/commit.c:1487
2190 #: builtin/merge.c:509
2191 #, c-format
2192 msgid "could not open '%s' for reading"
2193 msgstr ""
2194
1626 -#: builtin/commit.c:1459
2195 +#: builtin/commit.c:1494
2196 #, c-format
2197 msgid "Corrupt MERGE_HEAD file (%s)"
2198 msgstr ""
2199
1631 -#: builtin/commit.c:1466
2200 +#: builtin/commit.c:1501
2201 msgid "could not read MERGE_MODE"
2202 msgstr ""
2203
1635 -#: builtin/commit.c:1485
2204 +#: builtin/commit.c:1520
2205 #, c-format
2206 msgid "could not read commit message: %s"
2207 msgstr ""
2208
1640 -#: builtin/commit.c:1499
2209 +#: builtin/commit.c:1534
2210 +#, c-format
2211 +msgid "Aborting commit; you did not edit the message.\n"
2212 +msgstr ""
2213 +
2214 +#: builtin/commit.c:1539
2215 #, c-format
2216 msgid "Aborting commit due to empty commit message.\n"
2217 msgstr ""
2218
1645 -#: builtin/commit.c:1514
1646 -#: builtin/merge.c:935
1647 -#: builtin/merge.c:968
2219 +#: builtin/commit.c:1554
2220 +#: builtin/merge.c:936
2221 +#: builtin/merge.c:961
2222 msgid "failed to write commit object"
2223 msgstr ""
2224
1651 -#: builtin/commit.c:1535
2225 +#: builtin/commit.c:1575
2226 msgid "cannot lock HEAD ref"
2227 msgstr ""
2228
1655 -#: builtin/commit.c:1539
2229 +#: builtin/commit.c:1579
2230 msgid "cannot update HEAD ref"
2231 msgstr ""
2232
1659 -#: builtin/commit.c:1550
2233 +#: builtin/commit.c:1590
2234 msgid ""
2235 "Repository has been updated, but unable to write\n"
2236 "new_index file. Check that disk is not full or quota is\n"
@@ -1779,127 +2353,133 @@ msgstr ""
2353 msgid "Couldn't find remote ref HEAD"
2354 msgstr ""
2355
1782 -#: builtin/fetch.c:252
2356 +#: builtin/fetch.c:253
2357 #, c-format
2358 msgid "object %s not found"
1785 -msgstr ""
2359 +msgstr "objecto %s não encontrado"
2360
1787 -#: builtin/fetch.c:258
2361 +#: builtin/fetch.c:259
2362 msgid "[up to date]"
2363 msgstr "[Actualizada]"
2364
1791 -#: builtin/fetch.c:272
2365 +#: builtin/fetch.c:273
2366 #, c-format
2367 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
2368 msgstr ""
2369
1796 -#: builtin/fetch.c:273
1797 -#: builtin/fetch.c:351
2370 +#: builtin/fetch.c:274
2371 +#: builtin/fetch.c:360
2372 msgid "[rejected]"
2373 msgstr "[rejeitado]"
2374
1801 -#: builtin/fetch.c:284
2375 +#: builtin/fetch.c:285
2376 msgid "[tag update]"
2377 msgstr "[etiqueta actualizada]"
2378
1805 -#: builtin/fetch.c:286
1806 -#: builtin/fetch.c:313
1807 -#: builtin/fetch.c:331
2379 +#: builtin/fetch.c:287
2380 +#: builtin/fetch.c:322
2381 +#: builtin/fetch.c:340
2382 msgid " (unable to update local ref)"
2383 msgstr ""
2384
1811 -#: builtin/fetch.c:298
2385 +#: builtin/fetch.c:305
2386 msgid "[new tag]"
2387 msgstr "[nova etiqueta]"
2388
1815 -#: builtin/fetch.c:302
2389 +#: builtin/fetch.c:308
2390 msgid "[new branch]"
2391 msgstr "[nova rama]"
2392
1819 -#: builtin/fetch.c:347
2393 +#: builtin/fetch.c:311
2394 +msgid "[new ref]"
2395 +msgstr "[nova ref]"
2396 +
2397 +#: builtin/fetch.c:356
2398 msgid "unable to update local ref"
2399 msgstr ""
2400
1823 -#: builtin/fetch.c:347
2401 +#: builtin/fetch.c:356
2402 msgid "forced update"
2403 msgstr "actualização forçada"
2404
1827 -#: builtin/fetch.c:353
2405 +#: builtin/fetch.c:362
2406 msgid "(non-fast-forward)"
1829 -msgstr ""
2407 +msgstr "(non-fast-forward)"
2408
1831 -#: builtin/fetch.c:384
1832 -#: builtin/fetch.c:676
2409 +#: builtin/fetch.c:393
2410 +#: builtin/fetch.c:685
2411 #, c-format
2412 msgid "cannot open %s: %s\n"
1835 -msgstr ""
2413 +msgstr "não é possivel abrir %s: %s\n"
2414
1837 -#: builtin/fetch.c:393
2415 +#: builtin/fetch.c:402
2416 #, c-format
2417 msgid "%s did not send all necessary objects\n"
2418 msgstr ""
2419
1842 -#: builtin/fetch.c:479
2420 +#: builtin/fetch.c:488
2421 #, c-format
2422 msgid "From %.*s\n"
2423 msgstr "Para %.*s\n"
2424
1847 -#: builtin/fetch.c:490
2425 +#: builtin/fetch.c:499
2426 #, c-format
2427 msgid ""
2428 "some local refs could not be updated; try running\n"
2429 " 'git remote prune %s' to remove any old, conflicting branches"
2430 msgstr ""
2431
1854 -#: builtin/fetch.c:540
2432 +#: builtin/fetch.c:549
2433 #, c-format
1856 -msgid " (%s will become dangling)\n"
2434 +msgid " (%s will become dangling)"
2435 msgstr ""
2436
1859 -#: builtin/fetch.c:541
2437 +#: builtin/fetch.c:550
2438 #, c-format
1861 -msgid " (%s has become dangling)\n"
2439 +msgid " (%s has become dangling)"
2440 msgstr ""
2441
1864 -#: builtin/fetch.c:548
2442 +#: builtin/fetch.c:557
2443 msgid "[deleted]"
2444 msgstr "[eliminado]"
2445
1868 -#: builtin/fetch.c:549
2446 +#: builtin/fetch.c:558
2447 +#: builtin/remote.c:1055
2448 msgid "(none)"
2449 msgstr "(nenhum)"
2450
1872 -#: builtin/fetch.c:666
2451 +#: builtin/fetch.c:675
2452 #, c-format
2453 msgid "Refusing to fetch into current branch %s of non-bare repository"
2454 msgstr ""
2455
1877 -#: builtin/fetch.c:700
2456 +#: builtin/fetch.c:709
2457 #, c-format
2458 msgid "Don't know how to fetch from %s"
2459 msgstr ""
2460
1882 -#: builtin/fetch.c:777
2461 +#: builtin/fetch.c:786
2462 #, c-format
2463 msgid "Option \"%s\" value \"%s\" is not valid for %s"
2464 msgstr ""
2465
1887 -#: builtin/fetch.c:780
2466 +#: builtin/fetch.c:789
2467 #, c-format
2468 msgid "Option \"%s\" is ignored for %s\n"
2469 msgstr ""
2470
1892 -#: builtin/fetch.c:879
2471 +#: builtin/fetch.c:888
2472 #, c-format
2473 msgid "Fetching %s\n"
2474 msgstr "Baixando %s\n"
2475
1897 -#: builtin/fetch.c:881
2476 +#: builtin/fetch.c:890
2477 +#: builtin/remote.c:100
2478 #, c-format
2479 msgid "Could not fetch %s"
2480 msgstr ""
2481
1902 -#: builtin/fetch.c:898
2482 +#: builtin/fetch.c:907
2483 msgid ""
2484 "No remote repository specified. Please, specify either a URL or a\n"
2485 "remote name from which new revisions should be fetched."
@@ -1907,24 +2487,24 @@ msgstr ""
2487 "Nenhum repositório remoto especificado. Por favor, especifique um URL ou o\n"
2488 "nome remoto a partir do qual novas revisões devem ser obtida."
2489
1910 -#: builtin/fetch.c:918
2490 +#: builtin/fetch.c:927
2491 msgid "You need to specify a tag name."
2492 msgstr "Você precisa especificar um nome da etiqueta."
2493
1914 -#: builtin/fetch.c:970
2494 +#: builtin/fetch.c:979
2495 msgid "fetch --all does not take a repository argument"
2496 msgstr ""
2497
1918 -#: builtin/fetch.c:972
2498 +#: builtin/fetch.c:981
2499 msgid "fetch --all does not make sense with refspecs"
2500 msgstr ""
2501
1922 -#: builtin/fetch.c:983
2502 +#: builtin/fetch.c:992
2503 #, c-format
2504 msgid "No such remote or remote group: %s"
2505 msgstr ""
2506
1927 -#: builtin/fetch.c:991
2507 +#: builtin/fetch.c:1000
2508 msgid "Fetching a group and specifying refspecs does not make sense"
2509 msgstr ""
2510
@@ -1933,28 +2513,24 @@ msgstr ""
2513 msgid "Invalid %s: '%s'"
2514 msgstr "Inválido %s: '%s'"
2515
1936 -#: builtin/gc.c:78
1937 -msgid "Too many options specified"
1938 -msgstr "Demasiadas opções especificadas"
1939 -
1940 -#: builtin/gc.c:103
2516 +#: builtin/gc.c:90
2517 #, c-format
2518 msgid "insanely long object directory %.*s"
2519 msgstr ""
2520
1945 -#: builtin/gc.c:223
2521 +#: builtin/gc.c:221
2522 #, c-format
2523 msgid "Auto packing the repository for optimum performance.\n"
2524 msgstr ""
2525
1950 -#: builtin/gc.c:226
2526 +#: builtin/gc.c:224
2527 #, c-format
2528 msgid ""
2529 "Auto packing the repository for optimum performance. You may also\n"
2530 "run \"git gc\" manually. See \"git help gc\" for more information.\n"
2531 msgstr ""
2532
1957 -#: builtin/gc.c:256
2533 +#: builtin/gc.c:251
2534 msgid "There are too many unreachable loose objects; run 'git prune' to remove them."
2535 msgstr ""
2536
@@ -2018,6 +2594,314 @@ msgstr ""
2594 msgid "both --cached and trees are given."
2595 msgstr ""
2596
2597 +#: builtin/help.c:59
2598 +#, c-format
2599 +msgid "unrecognized help format '%s'"
2600 +msgstr "formato ajuda não reconhecido '%s'"
2601 +
2602 +#: builtin/help.c:87
2603 +msgid "Failed to start emacsclient."
2604 +msgstr ""
2605 +
2606 +#: builtin/help.c:100
2607 +msgid "Failed to parse emacsclient version."
2608 +msgstr ""
2609 +
2610 +#: builtin/help.c:108
2611 +#, c-format
2612 +msgid "emacsclient version '%d' too old (< 22)."
2613 +msgstr ""
2614 +
2615 +#: builtin/help.c:126
2616 +#: builtin/help.c:154
2617 +#: builtin/help.c:163
2618 +#: builtin/help.c:171
2619 +#, c-format
2620 +msgid "failed to exec '%s': %s"
2621 +msgstr ""
2622 +
2623 +#: builtin/help.c:211
2624 +#, c-format
2625 +msgid ""
2626 +"'%s': path for unsupported man viewer.\n"
2627 +"Please consider using 'man.<tool>.cmd' instead."
2628 +msgstr ""
2629 +
2630 +#: builtin/help.c:223
2631 +#, c-format
2632 +msgid ""
2633 +"'%s': cmd for supported man viewer.\n"
2634 +"Please consider using 'man.<tool>.path' instead."
2635 +msgstr ""
2636 +
2637 +#: builtin/help.c:287
2638 +msgid "The most commonly used git commands are:"
2639 +msgstr ""
2640 +
2641 +#: builtin/help.c:355
2642 +#, c-format
2643 +msgid "'%s': unknown man viewer."
2644 +msgstr ""
2645 +
2646 +#: builtin/help.c:372
2647 +msgid "no man viewer handled the request"
2648 +msgstr ""
2649 +
2650 +#: builtin/help.c:380
2651 +msgid "no info viewer handled the request"
2652 +msgstr ""
2653 +
2654 +#: builtin/help.c:391
2655 +#, c-format
2656 +msgid "'%s': not a documentation directory."
2657 +msgstr ""
2658 +
2659 +#: builtin/help.c:432
2660 +#: builtin/help.c:439
2661 +#, c-format
2662 +msgid "usage: %s%s"
2663 +msgstr ""
2664 +
2665 +#: builtin/help.c:453
2666 +#, c-format
2667 +msgid "`git %s' is aliased to `%s'"
2668 +msgstr ""
2669 +
2670 +#: builtin/index-pack.c:84
2671 +#, c-format
2672 +msgid "object type mismatch at %s"
2673 +msgstr ""
2674 +
2675 +#: builtin/index-pack.c:104
2676 +msgid "object of unexpected type"
2677 +msgstr ""
2678 +
2679 +#: builtin/index-pack.c:141
2680 +#, c-format
2681 +msgid "cannot fill %d byte"
2682 +msgid_plural "cannot fill %d bytes"
2683 +msgstr[0] ""
2684 +msgstr[1] ""
2685 +
2686 +#: builtin/index-pack.c:151
2687 +msgid "early EOF"
2688 +msgstr ""
2689 +
2690 +#: builtin/index-pack.c:152
2691 +msgid "read error on input"
2692 +msgstr ""
2693 +
2694 +#: builtin/index-pack.c:164
2695 +msgid "used more bytes than were available"
2696 +msgstr ""
2697 +
2698 +#: builtin/index-pack.c:171
2699 +msgid "pack too large for current definition of off_t"
2700 +msgstr ""
2701 +
2702 +#: builtin/index-pack.c:187
2703 +#, c-format
2704 +msgid "unable to create '%s'"
2705 +msgstr "não é possivel crear '%s'"
2706 +
2707 +#: builtin/index-pack.c:192
2708 +#, c-format
2709 +msgid "cannot open packfile '%s'"
2710 +msgstr "Não é possivel abrir o ficheiro packfile '%s'"
2711 +
2712 +#: builtin/index-pack.c:206
2713 +msgid "pack signature mismatch"
2714 +msgstr ""
2715 +
2716 +#: builtin/index-pack.c:226
2717 +#, c-format
2718 +msgid "pack has bad object at offset %lu: %s"
2719 +msgstr ""
2720 +
2721 +#: builtin/index-pack.c:300
2722 +#, c-format
2723 +msgid "inflate returned %d"
2724 +msgstr ""
2725 +
2726 +#: builtin/index-pack.c:345
2727 +msgid "offset value overflow for delta base object"
2728 +msgstr ""
2729 +
2730 +#: builtin/index-pack.c:353
2731 +msgid "delta base offset is out of bound"
2732 +msgstr ""
2733 +
2734 +#: builtin/index-pack.c:361
2735 +#, c-format
2736 +msgid "unknown object type %d"
2737 +msgstr "ojecto com tipo desconhecido %d"
2738 +
2739 +#: builtin/index-pack.c:390
2740 +msgid "cannot pread pack file"
2741 +msgstr "Não é possivel pread pack file"
2742 +
2743 +#: builtin/index-pack.c:392
2744 +#, c-format
2745 +msgid "premature end of pack file, %lu byte missing"
2746 +msgid_plural "premature end of pack file, %lu bytes missing"
2747 +msgstr[0] ""
2748 +msgstr[1] ""
2749 +
2750 +#: builtin/index-pack.c:405
2751 +msgid "serious inflate inconsistency"
2752 +msgstr ""
2753 +
2754 +#: builtin/index-pack.c:476
2755 +#, c-format
2756 +msgid "cannot read existing object %s"
2757 +msgstr "não foi possível ler objecto existente %s"
2758 +
2759 +#: builtin/index-pack.c:479
2760 +#, c-format
2761 +msgid "SHA1 COLLISION FOUND WITH %s !"
2762 +msgstr ""
2763 +
2764 +#: builtin/index-pack.c:488
2765 +#, c-format
2766 +msgid "invalid blob object %s"
2767 +msgstr "inválido objecto blob %s"
2768 +
2769 +#: builtin/index-pack.c:500
2770 +#, c-format
2771 +msgid "invalid %s"
2772 +msgstr "inválido: %s"
2773 +
2774 +#: builtin/index-pack.c:502
2775 +msgid "Error in object"
2776 +msgstr ""
2777 +
2778 +#: builtin/index-pack.c:504
2779 +#, c-format
2780 +msgid "Not all child objects of %s are reachable"
2781 +msgstr ""
2782 +
2783 +#: builtin/index-pack.c:576
2784 +#: builtin/index-pack.c:602
2785 +msgid "failed to apply delta"
2786 +msgstr ""
2787 +
2788 +#: builtin/index-pack.c:706
2789 +msgid "Receiving objects"
2790 +msgstr ""
2791 +
2792 +#: builtin/index-pack.c:706
2793 +msgid "Indexing objects"
2794 +msgstr ""
2795 +
2796 +#: builtin/index-pack.c:728
2797 +msgid "pack is corrupted (SHA1 mismatch)"
2798 +msgstr ""
2799 +
2800 +#: builtin/index-pack.c:733
2801 +msgid "cannot fstat packfile"
2802 +msgstr "Não é possivel fstat packfile"
2803 +
2804 +#: builtin/index-pack.c:736
2805 +msgid "pack has junk at the end"
2806 +msgstr ""
2807 +
2808 +#: builtin/index-pack.c:754
2809 +msgid "Resolving deltas"
2810 +msgstr "Resolvendo deltas"
2811 +
2812 +#: builtin/index-pack.c:787
2813 +#, c-format
2814 +msgid "unable to deflate appended object (%d)"
2815 +msgstr ""
2816 +
2817 +#: builtin/index-pack.c:866
2818 +#, c-format
2819 +msgid "local object %s is corrupt"
2820 +msgstr ""
2821 +
2822 +#: builtin/index-pack.c:890
2823 +msgid "error while closing pack file"
2824 +msgstr ""
2825 +
2826 +#: builtin/index-pack.c:903
2827 +#, c-format
2828 +msgid "cannot write keep file '%s'"
2829 +msgstr "não é possivel escrever o fichero kepp '%s'"
2830 +
2831 +#: builtin/index-pack.c:911
2832 +#, c-format
2833 +msgid "cannot close written keep file '%s'"
2834 +msgstr "Não é possivel fechar o fichero escrito '%s'"
2835 +
2836 +#: builtin/index-pack.c:924
2837 +msgid "cannot store pack file"
2838 +msgstr "Não é possivel guardar o fichero pack"
2839 +
2840 +#: builtin/index-pack.c:935
2841 +msgid "cannot store index file"
2842 +msgstr "Não é possivel guardar fichero index"
2843 +
2844 +#: builtin/index-pack.c:1024
2845 +#, c-format
2846 +msgid "Cannot open existing pack file '%s'"
2847 +msgstr "Não é possivel abrir o existente ficheiro pack %s"
2848 +
2849 +#: builtin/index-pack.c:1026
2850 +#, c-format
2851 +msgid "Cannot open existing pack idx file for '%s'"
2852 +msgstr "Não é possivel abrir o ficheiro 'pack idx' para '%s'"
2853 +
2854 +#: builtin/index-pack.c:1073
2855 +#, c-format
2856 +msgid "non delta: %d object"
2857 +msgid_plural "non delta: %d objects"
2858 +msgstr[0] ""
2859 +msgstr[1] ""
2860 +
2861 +#: builtin/index-pack.c:1080
2862 +#, c-format
2863 +msgid "chain length = %d: %lu object"
2864 +msgid_plural "chain length = %d: %lu objects"
2865 +msgstr[0] ""
2866 +msgstr[1] ""
2867 +
2868 +#: builtin/index-pack.c:1107
2869 +msgid "Cannot come back to cwd"
2870 +msgstr ""
2871 +
2872 +#: builtin/index-pack.c:1140
2873 +#: builtin/index-pack.c:1143
2874 +#: builtin/index-pack.c:1155
2875 +#: builtin/index-pack.c:1159
2876 +#, c-format
2877 +msgid "bad %s"
2878 +msgstr "inválido %s"
2879 +
2880 +#: builtin/index-pack.c:1173
2881 +msgid "--fix-thin cannot be used without --stdin"
2882 +msgstr ""
2883 +
2884 +#: builtin/index-pack.c:1177
2885 +#: builtin/index-pack.c:1187
2886 +#, c-format
2887 +msgid "packfile name '%s' does not end with '.pack'"
2888 +msgstr ""
2889 +
2890 +#: builtin/index-pack.c:1196
2891 +msgid "--verify with no packfile name given"
2892 +msgstr ""
2893 +
2894 +#: builtin/index-pack.c:1220
2895 +msgid "confusion beyond insanity"
2896 +msgstr ""
2897 +
2898 +#: builtin/index-pack.c:1239
2899 +#, c-format
2900 +msgid "pack has %d unresolved delta"
2901 +msgid_plural "pack has %d unresolved deltas"
2902 +msgstr[0] ""
2903 +msgstr[1] ""
2904 +
2905 #: builtin/init-db.c:35
2906 #, c-format
2907 msgid "Could not make %s writable by group"
@@ -2160,167 +3044,161 @@ msgstr ""
3044 msgid "Cannot access work tree '%s'"
3045 msgstr ""
3046
2163 -#: builtin/log.c:187
3047 +#: builtin/log.c:188
3048 #, c-format
3049 msgid "Final output: %d %s\n"
3050 msgstr ""
3051
2168 -#: builtin/log.c:395
2169 -#: builtin/log.c:483
3052 +#: builtin/log.c:401
3053 +#: builtin/log.c:489
3054 #, c-format
3055 msgid "Could not read object %s"
3056 msgstr ""
3057
2174 -#: builtin/log.c:507
3058 +#: builtin/log.c:513
3059 #, c-format
3060 msgid "Unknown type: %d"
3061 msgstr "Tipo desconhecido: %d"
3062
2179 -#: builtin/log.c:596
3063 +#: builtin/log.c:602
3064 msgid "format.headers without value"
3065 msgstr ""
3066
2183 -#: builtin/log.c:669
3067 +#: builtin/log.c:675
3068 msgid "name of output directory is too long"
3069 msgstr "nome do diretório de saída é demasiado longo"
3070
2187 -#: builtin/log.c:680
3071 +#: builtin/log.c:686
3072 #, c-format
3073 msgid "Cannot open patch file %s"
3074 msgstr "Não é possivel abrir o ficheiro patch %s"
3075
2192 -#: builtin/log.c:694
3076 +#: builtin/log.c:700
3077 msgid "Need exactly one range."
3078 msgstr "Necessita de exatamente um intervalo."
3079
2196 -#: builtin/log.c:702
3080 +#: builtin/log.c:708
3081 msgid "Not a range."
3082 msgstr "Não é um intervalo."
3083
2200 -#: builtin/log.c:739
3084 +#: builtin/log.c:745
3085 msgid "Could not extract email from committer identity."
3086 msgstr "Não foi possível extrair a identidade do committer do e-mail."
3087
2204 -#: builtin/log.c:785
3088 +#: builtin/log.c:791
3089 msgid "Cover letter needs email format"
3090 msgstr "Carta de apresentação necessita um modelo de e-mail"
3091
2208 -#: builtin/log.c:879
3092 +#: builtin/log.c:885
3093 #, c-format
3094 msgid "insane in-reply-to: %s"
3095 msgstr ""
3096
2213 -#: builtin/log.c:952
3097 +#: builtin/log.c:958
3098 msgid "Two output directories?"
3099 msgstr "Dois diretórios de saída?"
3100
2217 -#: builtin/log.c:1173
3101 +#: builtin/log.c:1179
3102 #, c-format
3103 msgid "bogus committer info %s"
3104 msgstr ""
3105
2222 -#: builtin/log.c:1218
3106 +#: builtin/log.c:1224
3107 msgid "-n and -k are mutually exclusive."
3108 msgstr ""
3109
2226 -#: builtin/log.c:1220
2227 -msgid "--subject-prefix and -k are mutually exclusive."
2228 -msgstr ""
2229 -
2230 -#: builtin/log.c:1225
2231 -#: builtin/shortlog.c:284
2232 -#, c-format
2233 -msgid "unrecognized argument: %s"
2234 -msgstr "argumento não reconhecido: %s"
2235 -
2236 -#: builtin/log.c:1228
3110 +#: builtin/log.c:1226
3111 +msgid "--subject-prefix and -k are mutually exclusive."
3112 +msgstr ""
3113 +
3114 +#: builtin/log.c:1234
3115 msgid "--name-only does not make sense"
3116 msgstr ""
3117
2240 -#: builtin/log.c:1230
3118 +#: builtin/log.c:1236
3119 msgid "--name-status does not make sense"
3120 msgstr ""
3121
2244 -#: builtin/log.c:1232
3122 +#: builtin/log.c:1238
3123 msgid "--check does not make sense"
3124 msgstr ""
3125
2248 -#: builtin/log.c:1255
3126 +#: builtin/log.c:1261
3127 msgid "standard output, or directory, which one?"
3128 msgstr "saída padrão, ou diretório, qual deles?"
3129
2252 -#: builtin/log.c:1257
3130 +#: builtin/log.c:1263
3131 #, c-format
3132 msgid "Could not create directory '%s'"
3133 msgstr ""
3134
2257 -#: builtin/log.c:1410
3135 +#: builtin/log.c:1416
3136 msgid "Failed to create output files"
3137 msgstr "Falhou ao criar ficheiros de saída"
3138
2261 -#: builtin/log.c:1514
3139 +#: builtin/log.c:1520
3140 #, c-format
3141 msgid "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3142 msgstr ""
3143
2266 -#: builtin/log.c:1530
2267 -#: builtin/log.c:1532
2268 -#: builtin/log.c:1544
3144 +#: builtin/log.c:1536
3145 +#: builtin/log.c:1538
3146 +#: builtin/log.c:1550
3147 #, c-format
3148 msgid "Unknown commit %s"
3149 msgstr "Commit desconhecido %s"
3150
2273 -#: builtin/merge.c:91
3151 +#: builtin/merge.c:90
3152 msgid "switch `m' requires a value"
3153 msgstr ""
3154
2277 -#: builtin/merge.c:128
3155 +#: builtin/merge.c:127
3156 #, c-format
3157 msgid "Could not find merge strategy '%s'.\n"
3158 msgstr ""
3159
2282 -#: builtin/merge.c:129
3160 +#: builtin/merge.c:128
3161 #, c-format
3162 msgid "Available strategies are:"
3163 msgstr "As estratégias disponíveis são:"
3164
2287 -#: builtin/merge.c:134
3165 +#: builtin/merge.c:133
3166 #, c-format
3167 msgid "Available custom strategies are:"
3168 msgstr "Estratégias personalizadas disponíveis são:"
3169
2292 -#: builtin/merge.c:241
3170 +#: builtin/merge.c:240
3171 msgid "could not run stash."
3172 msgstr ""
3173
2296 -#: builtin/merge.c:246
3174 +#: builtin/merge.c:245
3175 msgid "stash failed"
3176 msgstr "falhou o stash"
3177
2300 -#: builtin/merge.c:251
3178 +#: builtin/merge.c:250
3179 #, c-format
3180 msgid "not a valid object: %s"
3181 msgstr ""
3182
2305 -#: builtin/merge.c:270
2306 -#: builtin/merge.c:287
3183 +#: builtin/merge.c:269
3184 +#: builtin/merge.c:286
3185 msgid "read-tree failed"
3186 msgstr ""
3187
2310 -#: builtin/merge.c:317
3188 +#: builtin/merge.c:316
3189 msgid " (nothing to squash)"
3190 msgstr " (nada para squash)"
3191
2314 -#: builtin/merge.c:330
3192 +#: builtin/merge.c:329
3193 #, c-format
3194 msgid "Squash commit -- not updating HEAD\n"
3195 msgstr ""
3196
2319 -#: builtin/merge.c:362
3197 +#: builtin/merge.c:361
3198 msgid "Writing SQUASH_MSG"
3199 msgstr "Escrevendo SQUASH_MSG"
3200
2323 -#: builtin/merge.c:364
3201 +#: builtin/merge.c:363
3202 msgid "Finishing SQUASH_MSG"
3203 msgstr "Terminando SQUASH_MSG"
3204
@@ -2347,35 +3225,35 @@ msgstr ""
3225 msgid "failed to read the cache"
3226 msgstr ""
3227
2350 -#: builtin/merge.c:696
3228 +#: builtin/merge.c:697
3229 msgid "Unable to write index."
3230 msgstr ""
3231
2354 -#: builtin/merge.c:709
3232 +#: builtin/merge.c:710
3233 msgid "Not handling anything other than two heads merge."
3234 msgstr ""
3235
2358 -#: builtin/merge.c:723
3236 +#: builtin/merge.c:724
3237 #, c-format
3238 msgid "Unknown option for merge-recursive: -X%s"
3239 msgstr ""
3240
2363 -#: builtin/merge.c:737
3241 +#: builtin/merge.c:738
3242 #, c-format
3243 msgid "unable to write %s"
3244 msgstr ""
3245
2368 -#: builtin/merge.c:876
3246 +#: builtin/merge.c:877
3247 #, c-format
3248 msgid "Could not read from '%s'"
3249 msgstr ""
3250
2373 -#: builtin/merge.c:885
3251 +#: builtin/merge.c:886
3252 #, c-format
3253 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3254 msgstr "Não commitando um merge; usa 'git commit' para completar o merge.\n"
3255
2378 -#: builtin/merge.c:891
3256 +#: builtin/merge.c:892
3257 msgid ""
3258 "Please enter a commit message to explain why this merge is necessary,\n"
3259 "especially if it merges an updated upstream into a topic branch.\n"
@@ -2384,144 +3262,144 @@ msgid ""
3262 "the commit.\n"
3263 msgstr ""
3264
2387 -#: builtin/merge.c:915
3265 +#: builtin/merge.c:916
3266 msgid "Empty commit message."
3267 msgstr "Mensagem de commit vazia."
3268
2391 -#: builtin/merge.c:927
3269 +#: builtin/merge.c:928
3270 #, c-format
3271 msgid "Wonderful.\n"
3272 msgstr "Fastastico.\n"
3273
2396 -#: builtin/merge.c:1000
3274 +#: builtin/merge.c:993
3275 #, c-format
3276 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3277 msgstr ""
3278
2401 -#: builtin/merge.c:1016
3279 +#: builtin/merge.c:1009
3280 #, c-format
3281 msgid "'%s' is not a commit"
3282 msgstr "'%s' não é um commit"
3283
2406 -#: builtin/merge.c:1057
3284 +#: builtin/merge.c:1050
3285 msgid "No current branch."
3286 msgstr "Nenhuma rama actual"
3287
2410 -#: builtin/merge.c:1059
3288 +#: builtin/merge.c:1052
3289 msgid "No remote for the current branch."
3290 msgstr ""
3291
2414 -#: builtin/merge.c:1061
3292 +#: builtin/merge.c:1054
3293 msgid "No default upstream defined for the current branch."
3294 msgstr ""
3295
2418 -#: builtin/merge.c:1066
3296 +#: builtin/merge.c:1059
3297 #, c-format
3298 msgid "No remote tracking branch for %s from %s"
3299 msgstr ""
3300
2423 -#: builtin/merge.c:1188
3301 +#: builtin/merge.c:1146
3302 +#: builtin/merge.c:1303
3303 +#, c-format
3304 +msgid "%s - not something we can merge"
3305 +msgstr ""
3306 +
3307 +#: builtin/merge.c:1214
3308 msgid "There is no merge to abort (MERGE_HEAD missing)."
3309 msgstr ""
3310
2427 -#: builtin/merge.c:1204
3311 +#: builtin/merge.c:1230
3312 #: git-pull.sh:31
3313 msgid ""
3314 "You have not concluded your merge (MERGE_HEAD exists).\n"
3315 "Please, commit your changes before you can merge."
3316 msgstr ""
3317
2434 -#: builtin/merge.c:1207
3318 +#: builtin/merge.c:1233
3319 #: git-pull.sh:34
3320 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3321 msgstr ""
3322
2439 -#: builtin/merge.c:1211
3323 +#: builtin/merge.c:1237
3324 msgid ""
3325 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3326 "Please, commit your changes before you can merge."
3327 msgstr ""
3328
2445 -#: builtin/merge.c:1214
3329 +#: builtin/merge.c:1240
3330 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3331 msgstr ""
3332
2449 -#: builtin/merge.c:1223
3333 +#: builtin/merge.c:1249
3334 msgid "You cannot combine --squash with --no-ff."
3335 msgstr ""
3336
2453 -#: builtin/merge.c:1228
3337 +#: builtin/merge.c:1254
3338 msgid "You cannot combine --no-ff with --ff-only."
3339 msgstr ""
3340
2457 -#: builtin/merge.c:1235
3341 +#: builtin/merge.c:1261
3342 msgid "No commit specified and merge.defaultToUpstream not set."
3343 msgstr ""
3344
2461 -#: builtin/merge.c:1266
3345 +#: builtin/merge.c:1293
3346 msgid "Can merge only exactly one commit into empty head"
3347 msgstr ""
3348
2465 -#: builtin/merge.c:1269
3349 +#: builtin/merge.c:1296
3350 msgid "Squash commit into empty head not supported yet"
3351 msgstr ""
3352
2469 -#: builtin/merge.c:1271
3353 +#: builtin/merge.c:1298
3354 msgid "Non-fast-forward commit does not make sense into an empty head"
3355 msgstr ""
3356
2473 -#: builtin/merge.c:1275
2474 -#: builtin/merge.c:1319
2475 -#, c-format
2476 -msgid "%s - not something we can merge"
2477 -msgstr ""
2478 -
2479 -#: builtin/merge.c:1385
3357 +#: builtin/merge.c:1413
3358 #, c-format
3359 msgid "Updating %s..%s\n"
3360 msgstr "Actualizando %s..%s\n"
3361
2484 -#: builtin/merge.c:1423
3362 +#: builtin/merge.c:1451
3363 #, c-format
3364 msgid "Trying really trivial in-index merge...\n"
3365 msgstr ""
3366
2489 -#: builtin/merge.c:1430
3367 +#: builtin/merge.c:1458
3368 #, c-format
3369 msgid "Nope.\n"
3370 msgstr "Não.\n"
3371
2494 -#: builtin/merge.c:1462
3372 +#: builtin/merge.c:1490
3373 msgid "Not possible to fast-forward, aborting."
3374 msgstr ""
3375
2498 -#: builtin/merge.c:1485
2499 -#: builtin/merge.c:1562
3376 +#: builtin/merge.c:1513
3377 +#: builtin/merge.c:1592
3378 #, c-format
3379 msgid "Rewinding the tree to pristine...\n"
3380 msgstr ""
3381
2504 -#: builtin/merge.c:1489
3382 +#: builtin/merge.c:1517
3383 #, c-format
3384 msgid "Trying merge strategy %s...\n"
3385 msgstr ""
3386
2509 -#: builtin/merge.c:1553
3387 +#: builtin/merge.c:1583
3388 #, c-format
3389 msgid "No merge strategy handled the merge.\n"
3390 msgstr ""
3391
2514 -#: builtin/merge.c:1555
3392 +#: builtin/merge.c:1585
3393 #, c-format
3394 msgid "Merge with strategy %s failed.\n"
3395 msgstr "Fundir com a estratégia %s falhou.\n"
3396
2519 -#: builtin/merge.c:1564
3397 +#: builtin/merge.c:1594
3398 #, c-format
3399 msgid "Using the %s to prepare resolving by hand.\n"
3400 msgstr ""
3401
2524 -#: builtin/merge.c:1575
3402 +#: builtin/merge.c:1606
3403 #, c-format
3404 msgid "Automatic merge went well; stopped before committing as requested\n"
3405 msgstr ""
@@ -2584,6 +3462,7 @@ msgid "Renaming %s to %s\n"
3462 msgstr "Mudar de nome %s para %s\n"
3463
3464 #: builtin/mv.c:215
3465 +#: builtin/remote.c:731
3466 #, c-format
3467 msgid "renaming '%s' failed"
3468 msgstr "mudar de nome '%s' falhou"
@@ -2608,7 +3487,7 @@ msgid "failed to finish 'show' for object '%s'"
3487 msgstr ""
3488
3489 #: builtin/notes.c:175
2611 -#: builtin/tag.c:343
3490 +#: builtin/tag.c:347
3491 #, c-format
3492 msgid "could not create file '%s'"
3493 msgstr ""
@@ -2633,13 +3512,13 @@ msgid "The note contents has been left in %s"
3512 msgstr ""
3513
3514 #: builtin/notes.c:251
2636 -#: builtin/tag.c:521
3515 +#: builtin/tag.c:542
3516 #, c-format
3517 msgid "cannot read '%s'"
3518 msgstr "não consegue ler '%s'"
3519
3520 #: builtin/notes.c:253
2642 -#: builtin/tag.c:524
3521 +#: builtin/tag.c:545
3522 #, c-format
3523 msgid "could not open or read '%s'"
3524 msgstr ""
@@ -2655,7 +3534,7 @@ msgstr ""
3534 #: builtin/notes.c:766
3535 #: builtin/notes.c:968
3536 #: builtin/reset.c:293
2658 -#: builtin/tag.c:537
3537 +#: builtin/tag.c:558
3538 #, c-format
3539 msgid "Failed to resolve '%s' as a valid ref."
3540 msgstr ""
@@ -2750,39 +3629,61 @@ msgid "Object %s has no note\n"
3629 msgstr ""
3630
3631 #: builtin/notes.c:1103
3632 +#: builtin/remote.c:1598
3633 #, c-format
3634 msgid "Unknown subcommand: %s"
3635 msgstr ""
3636
2757 -#: builtin/pack-objects.c:2310
3637 +#: builtin/pack-objects.c:2315
3638 #, c-format
3639 msgid "unsupported index version %s"
3640 msgstr ""
3641
2762 -#: builtin/pack-objects.c:2314
3642 +#: builtin/pack-objects.c:2319
3643 #, c-format
3644 msgid "bad index version '%s'"
3645 msgstr ""
3646
2767 -#: builtin/pack-objects.c:2322
3647 +#: builtin/pack-objects.c:2342
3648 #, c-format
3649 msgid "option %s does not accept negative form"
3650 msgstr "opção %s não aceita formato negativo"
3651
2772 -#: builtin/pack-objects.c:2326
3652 +#: builtin/pack-objects.c:2346
3653 #, c-format
3654 msgid "unable to parse value '%s' for option %s"
3655 msgstr ""
3656
2777 -#: builtin/push.c:44
3657 +#: builtin/push.c:45
3658 msgid "tag shorthand without <tag>"
3659 msgstr ""
3660
2781 -#: builtin/push.c:63
3661 +#: builtin/push.c:64
3662 msgid "--delete only accepts plain target ref names"
3663 msgstr "--delete só aceita nomes simples para o ref de destino"
3664
2785 -#: builtin/push.c:73
3665 +#: builtin/push.c:99
3666 +msgid ""
3667 +"\n"
3668 +"To choose either option permanently, see push.default in 'git help config'."
3669 +msgstr ""
3670 +
3671 +#: builtin/push.c:102
3672 +#, c-format
3673 +msgid ""
3674 +"The upstream branch of your current branch does not match\n"
3675 +"the name of your current branch. To push to the upstream branch\n"
3676 +"on the remote, use\n"
3677 +"\n"
3678 +" git push %s HEAD:%s\n"
3679 +"\n"
3680 +"To push to the branch of the same name on the remote, use\n"
3681 +"\n"
3682 +" git push %s %s\n"
3683 +"%s"
3684 +msgstr ""
3685 +
3686 +#: builtin/push.c:121
3687 #, c-format
3688 msgid ""
3689 "You are not currently on a branch.\n"
@@ -2792,7 +3693,7 @@ msgid ""
3693 " git push %s HEAD:<name-of-remote-branch>\n"
3694 msgstr ""
3695
2795 -#: builtin/push.c:80
3696 +#: builtin/push.c:128
3697 #, c-format
3698 msgid ""
3699 "The current branch %s has no upstream branch.\n"
@@ -2801,39 +3702,63 @@ msgid ""
3702 " git push --set-upstream %s %s\n"
3703 msgstr ""
3704
2804 -#: builtin/push.c:88
3705 +#: builtin/push.c:136
3706 #, c-format
3707 msgid "The current branch %s has multiple upstream branches, refusing to push."
3708 msgstr ""
3709
2809 -#: builtin/push.c:111
3710 +#: builtin/push.c:139
3711 +#, c-format
3712 +msgid ""
3713 +"You are pushing to remote '%s', which is not the upstream of\n"
3714 +"your current branch '%s', without telling me what to push\n"
3715 +"to update which remote branch."
3716 +msgstr ""
3717 +
3718 +#: builtin/push.c:174
3719 msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
3720 msgstr ""
3721
2813 -#: builtin/push.c:131
3722 +#: builtin/push.c:181
3723 +msgid ""
3724 +"Updates were rejected because the tip of your current branch is behind\n"
3725 +"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
3726 +"before pushing again.\n"
3727 +"See the 'Note about fast-forwards' in 'git push --help' for details."
3728 +msgstr ""
3729 +
3730 +#: builtin/push.c:187
3731 +msgid ""
3732 +"Updates were rejected because a pushed branch tip is behind its remote\n"
3733 +"counterpart. If you did not intend to push that branch, you may want to\n"
3734 +"specify branches to push or set the 'push.default' configuration\n"
3735 +"variable to 'current' or 'upstream' to push only the current branch."
3736 +msgstr ""
3737 +
3738 +#: builtin/push.c:193
3739 +msgid ""
3740 +"Updates were rejected because a pushed branch tip is behind its remote\n"
3741 +"counterpart. Check out this branch and merge the remote changes\n"
3742 +"(e.g. 'git pull') before pushing again.\n"
3743 +"See the 'Note about fast-forwards' in 'git push --help' for details."
3744 +msgstr ""
3745 +
3746 +#: builtin/push.c:233
3747 #, c-format
3748 msgid "Pushing to %s\n"
3749 msgstr "Pushing para %s\n"
3750
2818 -#: builtin/push.c:135
3751 +#: builtin/push.c:237
3752 #, c-format
3753 msgid "failed to push some refs to '%s'"
3754 msgstr ""
3755
2823 -#: builtin/push.c:143
2824 -#, c-format
2825 -msgid ""
2826 -"To prevent you from losing history, non-fast-forward updates were rejected\n"
2827 -"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
2828 -"'Note about fast-forwards' section of 'git push --help' for details.\n"
2829 -msgstr ""
2830 -
2831 -#: builtin/push.c:160
3756 +#: builtin/push.c:269
3757 #, c-format
3758 msgid "bad repository '%s'"
3759 msgstr "repositorio inválido '%s'"
3760
2836 -#: builtin/push.c:161
3761 +#: builtin/push.c:270
3762 msgid ""
3763 "No configured push destination.\n"
3764 "Either specify the URL from the command-line or configure a remote repository using\n"
@@ -2845,34 +3770,390 @@ msgid ""
3770 " git push <name>\n"
3771 msgstr ""
3772
2848 -#: builtin/push.c:176
3773 +#: builtin/push.c:285
3774 msgid "--all and --tags are incompatible"
3775 msgstr "--all e --tags are são incompatíveis"
3776
2852 -#: builtin/push.c:177
3777 +#: builtin/push.c:286
3778 msgid "--all can't be combined with refspecs"
3779 msgstr ""
3780
2856 -#: builtin/push.c:182
3781 +#: builtin/push.c:291
3782 msgid "--mirror and --tags are incompatible"
3783 msgstr ""
3784
2860 -#: builtin/push.c:183
3785 +#: builtin/push.c:292
3786 msgid "--mirror can't be combined with refspecs"
3787 msgstr ""
3788
2864 -#: builtin/push.c:188
3789 +#: builtin/push.c:297
3790 msgid "--all and --mirror are incompatible"
3791 msgstr ""
3792
2868 -#: builtin/push.c:274
3793 +#: builtin/push.c:385
3794 msgid "--delete is incompatible with --all, --mirror and --tags"
3795 msgstr ""
3796
2872 -#: builtin/push.c:276
3797 +#: builtin/push.c:387
3798 msgid "--delete doesn't make sense without any refs"
3799 msgstr ""
3800
3801 +#: builtin/remote.c:98
3802 +#, c-format
3803 +msgid "Updating %s"
3804 +msgstr "Actualizando %s"
3805 +
3806 +#: builtin/remote.c:130
3807 +msgid ""
3808 +"--mirror is dangerous and deprecated; please\n"
3809 +"\t use --mirror=fetch or --mirror=push instead"
3810 +msgstr ""
3811 +
3812 +#: builtin/remote.c:147
3813 +#, c-format
3814 +msgid "unknown mirror argument: %s"
3815 +msgstr "argumento mirror não conhecido: %s"
3816 +
3817 +#: builtin/remote.c:185
3818 +msgid "specifying a master branch makes no sense with --mirror"
3819 +msgstr ""
3820 +
3821 +#: builtin/remote.c:187
3822 +msgid "specifying branches to track makes sense only with fetch mirrors"
3823 +msgstr ""
3824 +
3825 +#: builtin/remote.c:195
3826 +#: builtin/remote.c:646
3827 +#, c-format
3828 +msgid "remote %s already exists."
3829 +msgstr "o remoto %s já existe"
3830 +
3831 +#: builtin/remote.c:199
3832 +#: builtin/remote.c:650
3833 +#, c-format
3834 +msgid "'%s' is not a valid remote name"
3835 +msgstr "'%s' não é um nombe remoto valido"
3836 +
3837 +#: builtin/remote.c:243
3838 +#, c-format
3839 +msgid "Could not setup master '%s'"
3840 +msgstr "Não foi possível configurar a rama master '%s'"
3841 +
3842 +#: builtin/remote.c:299
3843 +#, c-format
3844 +msgid "more than one %s"
3845 +msgstr ""
3846 +
3847 +#: builtin/remote.c:339
3848 +#, c-format
3849 +msgid "Could not get fetch map for refspec %s"
3850 +msgstr ""
3851 +
3852 +#: builtin/remote.c:440
3853 +#: builtin/remote.c:448
3854 +msgid "(matching)"
3855 +msgstr ""
3856 +
3857 +#: builtin/remote.c:452
3858 +msgid "(delete)"
3859 +msgstr "(eliminado)"
3860 +
3861 +#: builtin/remote.c:595
3862 +#: builtin/remote.c:601
3863 +#: builtin/remote.c:607
3864 +#, c-format
3865 +msgid "Could not append '%s' to '%s'"
3866 +msgstr "Não foi possível adicionar o '%s' para o '%s'"
3867 +
3868 +#: builtin/remote.c:639
3869 +#: builtin/remote.c:792
3870 +#: builtin/remote.c:890
3871 +#, c-format
3872 +msgid "No such remote: %s"
3873 +msgstr ""
3874 +
3875 +#: builtin/remote.c:656
3876 +#, c-format
3877 +msgid "Could not rename config section '%s' to '%s'"
3878 +msgstr "Não foi possível renombrar a secção da configuração de '%s' para '%s'"
3879 +
3880 +#: builtin/remote.c:662
3881 +#: builtin/remote.c:799
3882 +#, c-format
3883 +msgid "Could not remove config section '%s'"
3884 +msgstr "Não foi possível remover a secção da configuração '%s'"
3885 +
3886 +#: builtin/remote.c:677
3887 +#, c-format
3888 +msgid ""
3889 +"Not updating non-default fetch respec\n"
3890 +"\t%s\n"
3891 +"\tPlease update the configuration manually if necessary."
3892 +msgstr ""
3893 +
3894 +#: builtin/remote.c:683
3895 +#, c-format
3896 +msgid "Could not append '%s'"
3897 +msgstr "Não foi possível adicionar '%s'"
3898 +
3899 +#: builtin/remote.c:694
3900 +#, c-format
3901 +msgid "Could not set '%s'"
3902 +msgstr "Não foi possível atribuir '%s'"
3903 +
3904 +#: builtin/remote.c:716
3905 +#, c-format
3906 +msgid "deleting '%s' failed"
3907 +msgstr "falhou eliminar '%s'"
3908 +
3909 +#: builtin/remote.c:750
3910 +#, c-format
3911 +msgid "creating '%s' failed"
3912 +msgstr "falhou a criar '%s'"
3913 +
3914 +#: builtin/remote.c:764
3915 +#, c-format
3916 +msgid "Could not remove branch %s"
3917 +msgstr "Não foi possível remover rama %s"
3918 +
3919 +#: builtin/remote.c:834
3920 +msgid ""
3921 +"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
3922 +"to delete it, use:"
3923 +msgid_plural ""
3924 +"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
3925 +"to delete them, use:"
3926 +msgstr[0] ""
3927 +msgstr[1] ""
3928 +
3929 +#: builtin/remote.c:943
3930 +#, c-format
3931 +msgid " new (next fetch will store in remotes/%s)"
3932 +msgstr ""
3933 +
3934 +#: builtin/remote.c:946
3935 +msgid " tracked"
3936 +msgstr "seguido"
3937 +
3938 +#: builtin/remote.c:948
3939 +msgid " stale (use 'git remote prune' to remove)"
3940 +msgstr ""
3941 +
3942 +#: builtin/remote.c:950
3943 +msgid " ???"
3944 +msgstr " ???"
3945 +
3946 +#: builtin/remote.c:991
3947 +#, c-format
3948 +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
3949 +msgstr ""
3950 +
3951 +#: builtin/remote.c:998
3952 +#, c-format
3953 +msgid "rebases onto remote %s"
3954 +msgstr ""
3955 +
3956 +#: builtin/remote.c:1001
3957 +#, c-format
3958 +msgid " merges with remote %s"
3959 +msgstr "Fundir com servidor remoto %s"
3960 +
3961 +#: builtin/remote.c:1002
3962 +msgid " and with remote"
3963 +msgstr " e com remoto"
3964 +
3965 +#: builtin/remote.c:1004
3966 +#, c-format
3967 +msgid "merges with remote %s"
3968 +msgstr "Fundir com servidor remoto %s"
3969 +
3970 +#: builtin/remote.c:1005
3971 +msgid " and with remote"
3972 +msgstr " e com remoto"
3973 +
3974 +#: builtin/remote.c:1051
3975 +msgid "create"
3976 +msgstr "creado"
3977 +
3978 +#: builtin/remote.c:1054
3979 +msgid "delete"
3980 +msgstr "eliminado"
3981 +
3982 +#: builtin/remote.c:1058
3983 +msgid "up to date"
3984 +msgstr "actualizado"
3985 +
3986 +#: builtin/remote.c:1061
3987 +msgid "fast-forwardable"
3988 +msgstr "fast-forwardable"
3989 +
3990 +#: builtin/remote.c:1064
3991 +msgid "local out of date"
3992 +msgstr "local desatualizada"
3993 +
3994 +#: builtin/remote.c:1071
3995 +#, c-format
3996 +msgid " %-*s forces to %-*s (%s)"
3997 +msgstr ""
3998 +
3999 +#: builtin/remote.c:1074
4000 +#, c-format
4001 +msgid " %-*s pushes to %-*s (%s)"
4002 +msgstr ""
4003 +
4004 +#: builtin/remote.c:1078
4005 +#, c-format
4006 +msgid " %-*s forces to %s"
4007 +msgstr ""
4008 +
4009 +#: builtin/remote.c:1081
4010 +#, c-format
4011 +msgid " %-*s pushes to %s"
4012 +msgstr ""
4013 +
4014 +#: builtin/remote.c:1118
4015 +#, c-format
4016 +msgid "* remote %s"
4017 +msgstr "* remota %s"
4018 +
4019 +#: builtin/remote.c:1119
4020 +#, c-format
4021 +msgid " Fetch URL: %s"
4022 +msgstr ""
4023 +
4024 +#: builtin/remote.c:1120
4025 +#: builtin/remote.c:1285
4026 +msgid "(no URL)"
4027 +msgstr "(nenhum URL)"
4028 +
4029 +#: builtin/remote.c:1129
4030 +#: builtin/remote.c:1131
4031 +#, c-format
4032 +msgid " Push URL: %s"
4033 +msgstr ""
4034 +
4035 +#: builtin/remote.c:1133
4036 +#: builtin/remote.c:1135
4037 +#: builtin/remote.c:1137
4038 +#, c-format
4039 +msgid " HEAD branch: %s"
4040 +msgstr "Rama HEAD: %s"
4041 +
4042 +#: builtin/remote.c:1139
4043 +#, c-format
4044 +msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
4045 +msgstr ""
4046 +
4047 +#: builtin/remote.c:1151
4048 +#, c-format
4049 +msgid " Remote branch:%s"
4050 +msgid_plural " Remote branches:%s"
4051 +msgstr[0] "Rama remota:%s"
4052 +msgstr[1] "Ramas remotas:%s'"
4053 +
4054 +#: builtin/remote.c:1154
4055 +#: builtin/remote.c:1181
4056 +msgid " (status not queried)"
4057 +msgstr ""
4058 +
4059 +#: builtin/remote.c:1163
4060 +msgid " Local branch configured for 'git pull':"
4061 +msgid_plural " Local branches configured for 'git pull':"
4062 +msgstr[0] ""
4063 +msgstr[1] ""
4064 +
4065 +#: builtin/remote.c:1171
4066 +msgid " Local refs will be mirrored by 'git push'"
4067 +msgstr ""
4068 +
4069 +#: builtin/remote.c:1178
4070 +#, c-format
4071 +msgid " Local ref configured for 'git push'%s:"
4072 +msgid_plural " Local refs configured for 'git push'%s:"
4073 +msgstr[0] ""
4074 +msgstr[1] ""
4075 +
4076 +#: builtin/remote.c:1216
4077 +msgid "Cannot determine remote HEAD"
4078 +msgstr ""
4079 +
4080 +#: builtin/remote.c:1218
4081 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
4082 +msgstr ""
4083 +
4084 +#: builtin/remote.c:1228
4085 +#, c-format
4086 +msgid "Could not delete %s"
4087 +msgstr "Não foi possível abrir %s"
4088 +
4089 +#: builtin/remote.c:1236
4090 +#, c-format
4091 +msgid "Not a valid ref: %s"
4092 +msgstr ""
4093 +
4094 +#: builtin/remote.c:1238
4095 +#, c-format
4096 +msgid "Could not setup %s"
4097 +msgstr "Não foi possível configurar %s"
4098 +
4099 +#: builtin/remote.c:1274
4100 +#, c-format
4101 +msgid " %s will become dangling!"
4102 +msgstr ""
4103 +
4104 +#: builtin/remote.c:1275
4105 +#, c-format
4106 +msgid " %s has become dangling!"
4107 +msgstr ""
4108 +
4109 +#: builtin/remote.c:1281
4110 +#, c-format
4111 +msgid "Pruning %s"
4112 +msgstr "Apagando %s"
4113 +
4114 +#: builtin/remote.c:1282
4115 +#, c-format
4116 +msgid "URL: %s"
4117 +msgstr "URL: %s"
4118 +
4119 +#: builtin/remote.c:1295
4120 +#, c-format
4121 +msgid " * [would prune] %s"
4122 +msgstr ""
4123 +
4124 +#: builtin/remote.c:1298
4125 +#, c-format
4126 +msgid " * [pruned] %s"
4127 +msgstr ""
4128 +
4129 +#: builtin/remote.c:1387
4130 +#: builtin/remote.c:1461
4131 +#, c-format
4132 +msgid "No such remote '%s'"
4133 +msgstr "Não existe este remoto '%s'"
4134 +
4135 +#: builtin/remote.c:1414
4136 +msgid "no remote specified"
4137 +msgstr "Nenhum remoto especificado"
4138 +
4139 +#: builtin/remote.c:1447
4140 +msgid "--add --delete doesn't make sense"
4141 +msgstr ""
4142 +
4143 +#: builtin/remote.c:1487
4144 +#, c-format
4145 +msgid "Invalid old URL pattern: %s"
4146 +msgstr ""
4147 +
4148 +#: builtin/remote.c:1495
4149 +#, c-format
4150 +msgid "No such URL found: %s"
4151 +msgstr "Nenhum URL encontrado: %s"
4152 +
4153 +#: builtin/remote.c:1497
4154 +msgid "Will not delete all non-push URLs"
4155 +msgstr ""
4156 +
4157 #: builtin/reset.c:33
4158 msgid "mixed"
4159 msgstr "mistura"
@@ -2885,6 +4166,10 @@ msgstr "leve"
4166 msgid "hard"
4167 msgstr "forte"
4168
4169 +#: builtin/reset.c:33
4170 +msgid "merge"
4171 +msgstr "juntar"
4172 +
4173 #: builtin/reset.c:33
4174 msgid "keep"
4175 msgstr "manter"
@@ -2953,20 +4238,20 @@ msgid "Could not reset index file to revision '%s'."
4238 msgstr ""
4239
4240 #: builtin/revert.c:70
2956 -#: builtin/revert.c:91
4241 +#: builtin/revert.c:92
4242 #, c-format
4243 msgid "%s: %s cannot be used with %s"
4244 msgstr ""
4245
2961 -#: builtin/revert.c:126
4246 +#: builtin/revert.c:131
4247 msgid "program error"
4248 msgstr "erro do programa"
4249
2965 -#: builtin/revert.c:209
4250 +#: builtin/revert.c:221
4251 msgid "revert failed"
4252 msgstr "falhou o revert"
4253
2969 -#: builtin/revert.c:224
4254 +#: builtin/revert.c:236
4255 msgid "cherry-pick failed"
4256 msgstr "cherry-pick falhou"
4257
@@ -3006,32 +4291,32 @@ msgstr ""
4291 msgid "Missing author: %s"
4292 msgstr "Autor em falta: %s"
4293
3009 -#: builtin/tag.c:58
4294 +#: builtin/tag.c:60
4295 #, c-format
4296 msgid "malformed object at '%s'"
4297 msgstr ""
4298
3014 -#: builtin/tag.c:205
4299 +#: builtin/tag.c:207
4300 #, c-format
4301 msgid "tag name too long: %.*s..."
4302 msgstr ""
4303
3019 -#: builtin/tag.c:210
4304 +#: builtin/tag.c:212
4305 #, c-format
4306 msgid "tag '%s' not found."
4307 msgstr "etiqueta '%s' não foi encontrada."
4308
3024 -#: builtin/tag.c:225
4309 +#: builtin/tag.c:227
4310 #, c-format
4311 msgid "Deleted tag '%s' (was %s)\n"
4312 msgstr ""
4313
3029 -#: builtin/tag.c:237
4314 +#: builtin/tag.c:239
4315 #, c-format
4316 msgid "could not verify the tag '%s'"
4317 msgstr ""
4318
3034 -#: builtin/tag.c:247
4319 +#: builtin/tag.c:249
4320 msgid ""
4321 "\n"
4322 "#\n"
@@ -3040,7 +4325,7 @@ msgid ""
4325 "#\n"
4326 msgstr ""
4327
3043 -#: builtin/tag.c:254
4328 +#: builtin/tag.c:256
4329 msgid ""
4330 "\n"
4331 "#\n"
@@ -3049,159 +4334,251 @@ msgid ""
4334 "#\n"
4335 msgstr ""
4336
3052 -#: builtin/tag.c:294
4337 +#: builtin/tag.c:298
4338 msgid "unable to sign the tag"
4339 msgstr ""
4340
3056 -#: builtin/tag.c:296
4341 +#: builtin/tag.c:300
4342 msgid "unable to write tag file"
4343 msgstr ""
4344
3060 -#: builtin/tag.c:321
4345 +#: builtin/tag.c:325
4346 msgid "bad object type."
4347 msgstr ""
4348
3064 -#: builtin/tag.c:334
4349 +#: builtin/tag.c:338
4350 msgid "tag header too big."
4351 msgstr ""
4352
3068 -#: builtin/tag.c:366
4353 +#: builtin/tag.c:370
4354 msgid "no tag message?"
4355 msgstr "nenhuma mensaje para a etiqueta?"
4356
3072 -#: builtin/tag.c:372
4357 +#: builtin/tag.c:376
4358 #, c-format
4359 msgid "The tag message has been left in %s\n"
4360 msgstr ""
4361
3077 -#: builtin/tag.c:421
4362 +#: builtin/tag.c:425
4363 msgid "switch 'points-at' requires an object"
4364 msgstr ""
4365
3081 -#: builtin/tag.c:423
4366 +#: builtin/tag.c:427
4367 #, c-format
4368 msgid "malformed object name '%s'"
4369 msgstr ""
4370
3086 -#: builtin/tag.c:502
4371 +#: builtin/tag.c:506
4372 +msgid "--column and -n are incompatible"
4373 +msgstr "--column e -n are são incompatíveis"
4374 +
4375 +#: builtin/tag.c:523
4376 msgid "-n option is only allowed with -l."
4377 msgstr ""
4378
3090 -#: builtin/tag.c:504
4379 +#: builtin/tag.c:525
4380 msgid "--contains option is only allowed with -l."
4381 msgstr ""
4382
3094 -#: builtin/tag.c:506
4383 +#: builtin/tag.c:527
4384 msgid "--points-at option is only allowed with -l."
4385 msgstr ""
4386
3098 -#: builtin/tag.c:514
4387 +#: builtin/tag.c:535
4388 msgid "only one -F or -m option is allowed."
4389 msgstr ""
4390
3102 -#: builtin/tag.c:534
4391 +#: builtin/tag.c:555
4392 msgid "too many params"
4393 msgstr "demasiado parametros"
4394
3106 -#: builtin/tag.c:540
4395 +#: builtin/tag.c:561
4396 #, c-format
4397 msgid "'%s' is not a valid tag name."
4398 msgstr ""
4399
3111 -#: builtin/tag.c:545
4400 +#: builtin/tag.c:566
4401 #, c-format
4402 msgid "tag '%s' already exists"
4403 msgstr "etiqueta '%s' já existe"
4404
3116 -#: builtin/tag.c:563
4405 +#: builtin/tag.c:584
4406 #, c-format
4407 msgid "%s: cannot lock the ref"
4408 msgstr ""
4409
3121 -#: builtin/tag.c:565
4410 +#: builtin/tag.c:586
4411 #, c-format
4412 msgid "%s: cannot update the ref"
4413 msgstr ""
4414
3126 -#: builtin/tag.c:567
4415 +#: builtin/tag.c:588
4416 #, c-format
4417 msgid "Updated tag '%s' (was %s)\n"
4418 msgstr ""
4419
3131 -#: git-am.sh:49
4420 +#: git.c:16
4421 +msgid "See 'git help <command>' for more information on a specific command."
4422 +msgstr ""
4423 +
4424 +#: common-cmds.h:8
4425 +msgid "Add file contents to the index"
4426 +msgstr ""
4427 +
4428 +#: common-cmds.h:9
4429 +msgid "Find by binary search the change that introduced a bug"
4430 +msgstr ""
4431 +
4432 +#: common-cmds.h:10
4433 +msgid "List, create, or delete branches"
4434 +msgstr "Listar, criar ou apagar ramas"
4435 +
4436 +#: common-cmds.h:11
4437 +msgid "Checkout a branch or paths to the working tree"
4438 +msgstr ""
4439 +
4440 +#: common-cmds.h:12
4441 +msgid "Clone a repository into a new directory"
4442 +msgstr ""
4443 +
4444 +#: common-cmds.h:13
4445 +msgid "Record changes to the repository"
4446 +msgstr "Gravar alterações para o repositório"
4447 +
4448 +#: common-cmds.h:14
4449 +msgid "Show changes between commits, commit and working tree, etc"
4450 +msgstr ""
4451 +
4452 +#: common-cmds.h:15
4453 +msgid "Download objects and refs from another repository"
4454 +msgstr ""
4455 +
4456 +#: common-cmds.h:16
4457 +msgid "Print lines matching a pattern"
4458 +msgstr ""
4459 +
4460 +#: common-cmds.h:17
4461 +msgid "Create an empty git repository or reinitialize an existing one"
4462 +msgstr ""
4463 +
4464 +#: common-cmds.h:18
4465 +msgid "Show commit logs"
4466 +msgstr "Mostrado logs de commits"
4467 +
4468 +#: common-cmds.h:19
4469 +msgid "Join two or more development histories together"
4470 +msgstr ""
4471 +
4472 +#: common-cmds.h:20
4473 +msgid "Move or rename a file, a directory, or a symlink"
4474 +msgstr ""
4475 +
4476 +#: common-cmds.h:21
4477 +msgid "Fetch from and merge with another repository or a local branch"
4478 +msgstr ""
4479 +
4480 +#: common-cmds.h:22
4481 +msgid "Update remote refs along with associated objects"
4482 +msgstr ""
4483 +
4484 +#: common-cmds.h:23
4485 +msgid "Forward-port local commits to the updated upstream head"
4486 +msgstr ""
4487 +
4488 +#: common-cmds.h:24
4489 +msgid "Reset current HEAD to the specified state"
4490 +msgstr ""
4491 +
4492 +#: common-cmds.h:25
4493 +msgid "Remove files from the working tree and from the index"
4494 +msgstr ""
4495 +
4496 +#: common-cmds.h:26
4497 +msgid "Show various types of objects"
4498 +msgstr ""
4499 +
4500 +#: common-cmds.h:27
4501 +msgid "Show the working tree status"
4502 +msgstr "Mostrar o estado los ramos das árvores de trabalho"
4503 +
4504 +#: common-cmds.h:28
4505 +msgid "Create, list, delete or verify a tag object signed with GPG"
4506 +msgstr ""
4507 +
4508 +#: git-am.sh:50
4509 msgid "You need to set your committer info first"
4510 msgstr "Necessitas primeiro de especificiar os teus dados de committer"
4511
3135 -#: git-am.sh:136
4512 +#: git-am.sh:137
4513 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
4514 msgstr ""
4515
3139 -#: git-am.sh:147
4516 +#: git-am.sh:154
4517 msgid ""
4518 "Did you hand edit your patch?\n"
4519 "It does not apply to blobs recorded in its index."
4520 msgstr ""
4521
3145 -#: git-am.sh:156
4522 +#: git-am.sh:163
4523 msgid "Falling back to patching base and 3-way merge..."
4524 msgstr ""
4525
3149 -#: git-am.sh:268
4526 +#: git-am.sh:275
4527 msgid "Only one StGIT patch series can be applied at once"
4528 msgstr ""
4529
3153 -#: git-am.sh:355
4530 +#: git-am.sh:362
4531 #, sh-format
4532 msgid "Patch format $patch_format is not supported."
4533 msgstr ""
4534
3158 -#: git-am.sh:357
4535 +#: git-am.sh:364
4536 msgid "Patch format detection failed."
4537 msgstr "Falhou a detecção do formato do patch."
4538
3162 -#: git-am.sh:411
4539 +#: git-am.sh:418
4540 msgid "-d option is no longer supported. Do not use."
4541 msgstr ""
4542
3166 -#: git-am.sh:474
4543 +#: git-am.sh:481
4544 #, sh-format
4545 msgid "previous rebase directory $dotest still exists but mbox given."
4546 msgstr ""
4547
3171 -#: git-am.sh:479
4548 +#: git-am.sh:486
4549 msgid "Please make up your mind. --skip or --abort?"
4550 msgstr ""
4551
3175 -#: git-am.sh:506
4552 +#: git-am.sh:513
4553 msgid "Resolve operation not in progress, we are not resuming."
4554 msgstr ""
4555
3179 -#: git-am.sh:572
4556 +#: git-am.sh:579
4557 #, sh-format
4558 msgid "Dirty index: cannot apply patches (dirty: $files)"
4559 msgstr ""
4560
3184 -#: git-am.sh:748
4561 +#: git-am.sh:755
4562 msgid "cannot be interactive without stdin connected to a terminal."
4563 msgstr ""
4564
4565 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
4566 #. in your translation. The program will only accept English
4567 #. input at this point.
3191 -#: git-am.sh:759
4568 +#: git-am.sh:766
4569 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
4570 msgstr "Aplicar? Sim[y]/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos "
4571
3195 -#: git-am.sh:795
4572 +#: git-am.sh:802
4573 #, sh-format
4574 msgid "Applying: $FIRSTLINE"
4575 msgstr "Aplicando: $FIRSTLINE"
4576
3200 -#: git-am.sh:840
4577 +#: git-am.sh:847
4578 msgid "No changes -- Patch already applied."
4579 msgstr "Nenhuma mudança -- Já foi aplicado o patch."
4580
3204 -#: git-am.sh:866
4581 +#: git-am.sh:873
4582 msgid "applying to an empty history"
4583 msgstr ""
4584
@@ -3296,7 +4673,7 @@ msgstr ""
4673
4674 #: git-bisect.sh:474
4675 msgid "We are not bisecting."
3299 -msgstr ""
4676 +msgstr "Não estamos a bisseccionar."
4677
4678 #: git-pull.sh:21
4679 msgid ""
@@ -3433,163 +4810,171 @@ msgstr ""
4810 msgid "cannot strip one component off url '$remoteurl'"
4811 msgstr ""
4812
3436 -#: git-submodule.sh:108
4813 +#: git-submodule.sh:109
4814 #, sh-format
3438 -msgid "No submodule mapping found in .gitmodules for path '$path'"
4815 +msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
4816 msgstr ""
4817
3441 -#: git-submodule.sh:149
4818 +#: git-submodule.sh:150
4819 #, sh-format
3443 -msgid "Clone of '$url' into submodule path '$path' failed"
4820 +msgid "Clone of '$url' into submodule path '$sm_path' failed"
4821 msgstr ""
4822
3446 -#: git-submodule.sh:159
4823 +#: git-submodule.sh:160
4824 #, sh-format
4825 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
4826 msgstr ""
4827
3451 -#: git-submodule.sh:247
4828 +#: git-submodule.sh:249
4829 #, sh-format
4830 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
4831 msgstr ""
4832
3456 -#: git-submodule.sh:264
4833 +#: git-submodule.sh:266
4834 #, sh-format
3458 -msgid "'$path' already exists in the index"
4835 +msgid "'$sm_path' already exists in the index"
4836 msgstr ""
4837
3461 -#: git-submodule.sh:281
4838 +#: git-submodule.sh:283
4839 #, sh-format
3463 -msgid "'$path' already exists and is not a valid git repo"
4840 +msgid "'$sm_path' already exists and is not a valid git repo"
4841 msgstr ""
4842
3466 -#: git-submodule.sh:295
4843 +#: git-submodule.sh:297
4844 #, sh-format
3468 -msgid "Unable to checkout submodule '$path'"
4845 +msgid "Unable to checkout submodule '$sm_path'"
4846 msgstr ""
4847
3471 -#: git-submodule.sh:300
4848 +#: git-submodule.sh:302
4849 #, sh-format
3473 -msgid "Failed to add submodule '$path'"
4850 +msgid "Failed to add submodule '$sm_path'"
4851 msgstr ""
4852
3476 -#: git-submodule.sh:305
4853 +#: git-submodule.sh:307
4854 #, sh-format
3478 -msgid "Failed to register submodule '$path'"
4855 +msgid "Failed to register submodule '$sm_path'"
4856 msgstr ""
4857
3481 -#: git-submodule.sh:347
4858 +#: git-submodule.sh:349
4859 #, sh-format
3483 -msgid "Entering '$prefix$path'"
3484 -msgstr "Entrando '$prefix$path'"
4860 +msgid "Entering '$prefix$sm_path'"
4861 +msgstr "Entrando '$prefix$sm_path'"
4862
3486 -#: git-submodule.sh:359
4863 +#: git-submodule.sh:363
4864 #, sh-format
3488 -msgid "Stopping at '$path'; script returned non-zero status."
4865 +msgid "Stopping at '$sm_path'; script returned non-zero status."
4866 msgstr ""
4867
3491 -#: git-submodule.sh:401
4868 +#: git-submodule.sh:405
4869 #, sh-format
3493 -msgid "No url found for submodule path '$path' in .gitmodules"
4870 +msgid "No url found for submodule path '$sm_path' in .gitmodules"
4871 msgstr ""
4872
3496 -#: git-submodule.sh:410
4873 +#: git-submodule.sh:414
4874 #, sh-format
3498 -msgid "Failed to register url for submodule path '$path'"
4875 +msgid "Failed to register url for submodule path '$sm_path'"
4876 msgstr ""
4877
3501 -#: git-submodule.sh:418
4878 +#: git-submodule.sh:422
4879 #, sh-format
3503 -msgid "Failed to register update mode for submodule path '$path'"
4880 +msgid "Failed to register update mode for submodule path '$sm_path'"
4881 msgstr ""
4882
3506 -#: git-submodule.sh:420
4883 +#: git-submodule.sh:424
4884 #, sh-format
3508 -msgid "Submodule '$name' ($url) registered for path '$path'"
4885 +msgid "Submodule '$name' ($url) registered for path '$sm_path'"
4886 msgstr ""
4887
3511 -#: git-submodule.sh:519
4888 +#: git-submodule.sh:523
4889 #, sh-format
4890 msgid ""
3514 -"Submodule path '$path' not initialized\n"
4891 +"Submodule path '$sm_path' not initialized\n"
4892 "Maybe you want to use 'update --init'?"
4893 msgstr ""
4894
3518 -#: git-submodule.sh:532
4895 +#: git-submodule.sh:536
4896 #, sh-format
3520 -msgid "Unable to find current revision in submodule path '$path'"
4897 +msgid "Unable to find current revision in submodule path '$sm_path'"
4898 msgstr ""
4899
3523 -#: git-submodule.sh:551
4900 +#: git-submodule.sh:555
4901 #, sh-format
3525 -msgid "Unable to fetch in submodule path '$path'"
4902 +msgid "Unable to fetch in submodule path '$sm_path'"
4903 msgstr ""
4904
3528 -#: git-submodule.sh:565
4905 +#: git-submodule.sh:569
4906 #, sh-format
3530 -msgid "Unable to rebase '$sha1' in submodule path '$path'"
4907 +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
4908 msgstr ""
4909
3533 -#: git-submodule.sh:566
4910 +#: git-submodule.sh:570
4911 #, sh-format
3535 -msgid "Submodule path '$path': rebased into '$sha1'"
4912 +msgid "Submodule path '$sm_path': rebased into '$sha1'"
4913 msgstr ""
4914
3538 -#: git-submodule.sh:571
4915 +#: git-submodule.sh:575
4916 #, sh-format
3540 -msgid "Unable to merge '$sha1' in submodule path '$path'"
4917 +msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
4918 msgstr ""
4919
3543 -#: git-submodule.sh:572
4920 +#: git-submodule.sh:576
4921 #, sh-format
3545 -msgid "Submodule path '$path': merged in '$sha1'"
4922 +msgid "Submodule path '$sm_path': merged in '$sha1'"
4923 msgstr ""
4924
3548 -#: git-submodule.sh:577
4925 +#: git-submodule.sh:581
4926 #, sh-format
3550 -msgid "Unable to checkout '$sha1' in submodule path '$path'"
4927 +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
4928 msgstr ""
4929
3553 -#: git-submodule.sh:578
4930 +#: git-submodule.sh:582
4931 #, sh-format
3555 -msgid "Submodule path '$path': checked out '$sha1'"
4932 +msgid "Submodule path '$sm_path': checked out '$sha1'"
4933 msgstr ""
4934
3558 -#: git-submodule.sh:600
3559 -#: git-submodule.sh:923
4935 +#: git-submodule.sh:604
4936 +#: git-submodule.sh:927
4937 #, sh-format
3561 -msgid "Failed to recurse into submodule path '$path'"
4938 +msgid "Failed to recurse into submodule path '$sm_path'"
4939 msgstr ""
4940
3564 -#: git-submodule.sh:708
4941 +#: git-submodule.sh:712
4942 msgid "--"
4943 msgstr "--"
4944
3568 -#: git-submodule.sh:766
4945 +#: git-submodule.sh:770
4946 #, sh-format
4947 msgid " Warn: $name doesn't contain commit $sha1_src"
4948 msgstr ""
4949
3573 -#: git-submodule.sh:769
4950 +#: git-submodule.sh:773
4951 #, sh-format
4952 msgid " Warn: $name doesn't contain commit $sha1_dst"
4953 msgstr ""
4954
3578 -#: git-submodule.sh:772
4955 +#: git-submodule.sh:776
4956 #, sh-format
4957 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
4958 msgstr ""
4959
3583 -#: git-submodule.sh:797
4960 +#: git-submodule.sh:801
4961 msgid "blob"
4962 msgstr "blob"
4963
3587 -#: git-submodule.sh:798
4964 +#: git-submodule.sh:802
4965 msgid "submodule"
4966 msgstr "submódulos"
4967
3591 -#: git-submodule.sh:969
4968 +#: git-submodule.sh:973
4969 #, sh-format
4970 msgid "Synchronizing submodule url for '$name'"
4971 msgstr ""
4972
4973 +#~ msgid "cherry-pick"
4974 +#~ msgstr "cherry-pick"
4975 +
4976 +#~ msgid "Please enter the commit message for your changes."
4977 +#~ msgstr "Por favor insira a mensagem de commit das suas alterações."
4978 +
4979 +#~ msgid "Too many options specified"
4980 +#~ msgstr "Demasiadas opções especificadas"