01758866ba · matheusbsbs/matheus-bagliano

@@ -161,7 +161,7 @@ msgid ""

161 msgstr ""

162 "Project-Id-Version: Git\n"

163 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

164 -"POT-Creation-Date: 2021-05-17 16:02+0800\n"

164 +"POT-Creation-Date: 2021-08-03 17:06+0800\n"

165 "PO-Revision-Date: 2020-10-14 11:43+0100\n"

166 "Last-Translator: Daniel Santos <hello@brighterdan.com>\n"

167 "Language-Team: Git L10N Português <https://github.com/git-l10n-pt-PT/>\n"

@@ -177,7 +177,7 @@ msgid "Huh (%s)?"

177 msgstr "O quê (%s)?"

178

179 #: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493

180 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528

180 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528

181 #: builtin/rebase.c:1953

182 msgid "could not read index"

183 msgstr "incapaz de ler index"

@@ -206,7 +206,7 @@ msgstr "Atualizar"

206 msgid "could not stage '%s'"

207 msgstr "incapaz de stage '%s'"

208

209 -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687

209 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707

210 #, fuzzy

211 msgid "could not write index"

212 msgstr "incapaz de escrever index"

@@ -266,12 +266,12 @@ msgstr[1] "adicionei %d paths\n"

266 msgid "ignoring unmerged: %s"

267 msgstr "ignorando unmerged: %s"

268

269 -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369

269 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369

270 #, c-format

271 msgid "Only binary files changed.\n"

272 msgstr "Apenas ficheiros binários mudaram.\n"

273

274 -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371

274 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371

275 #, c-format

276 msgid "No changes.\n"

277 msgstr "Sem modificação.\n"

@@ -357,11 +357,11 @@ msgstr "seleciona item numerado"

357 msgid "(empty) select nothing"

358 msgstr "(vazio) seleciona nada"

359

360 -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896

360 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896

361 msgid "*** Commands ***"

362 msgstr "*** Comandos ***"

363

364 -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893

364 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893

365 msgid "What now"

366 msgstr "E agora"

367

@@ -373,12 +373,12 @@ msgstr "staged"

373 msgid "unstaged"

374 msgstr "unstaged"

375

376 -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308

377 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128

376 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309

377 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128

378 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190

379 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819

380 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327

381 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573

379 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818

380 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

381 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

382 #: git-add--interactive.perl:213

383 msgid "path"

384 msgstr "path"

@@ -388,7 +388,7 @@ msgstr "path"

388 msgid "could not refresh index"

389 msgstr "incapaz de reactualizar o index"

390

391 -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803

391 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803

392 #, c-format

393 msgid "Bye.\n"

394 msgstr "Adeus.\n"

@@ -703,36 +703,36 @@ msgstr ""

703 "a - submeter este pedaço e qualquer próximo deste ficheiro\n"

704 "d - declinar este pedaço e qualquer próximo deste ficheiro\n"

705

706 -#: add-patch.c:342

706 +#: add-patch.c:343

707 #, fuzzy, c-format

708 msgid "could not parse hunk header '%.*s'"

709 msgstr "incapaz de analisar início de pedaço '%s'"

710

711 -#: add-patch.c:361 add-patch.c:365

711 +#: add-patch.c:362 add-patch.c:366

712 #, fuzzy, c-format

713 msgid "could not parse colored hunk header '%.*s'"

714 msgstr "incapaz de analisar início de pedaço colorido '%.*s'"

715

716 -#: add-patch.c:419

716 +#: add-patch.c:420

717 #, fuzzy

718 msgid "could not parse diff"

719 msgstr "incapaz de analisar diff"

720

721 -#: add-patch.c:438

721 +#: add-patch.c:439

722 #, fuzzy

723 msgid "could not parse colored diff"

724 msgstr "incapaz de analisar diff colorido"

725

726 -#: add-patch.c:452

726 +#: add-patch.c:453

727 #, fuzzy, c-format

728 msgid "failed to run '%s'"

729 msgstr "falha ao executar '%s'"

730

731 -#: add-patch.c:611

731 +#: add-patch.c:612

732 msgid "mismatched output from interactive.diffFilter"

733 msgstr "sem match de output de interactive.diffFilter"

734

735 -#: add-patch.c:612

735 +#: add-patch.c:613

736 msgid ""

737 "Your filter must maintain a one-to-one correspondence\n"

738 "between its input and output lines."

@@ -740,7 +740,7 @@ msgstr ""

740 "O teu filtro tem de manter uma correspondência exata\n"

741 "entre seu input e linhas output."

742

743 -#: add-patch.c:790

743 +#: add-patch.c:791

744 #, fuzzy, c-format

745 msgid ""

746 "expected context line #%d in\n"

@@ -749,7 +749,7 @@ msgstr ""

749 "linha de contexto esperada #%d em\n"

750 "%.*s"

751

752 -#: add-patch.c:805

752 +#: add-patch.c:806

753 #, c-format

754 msgid ""

755 "hunks do not overlap:\n"

@@ -762,11 +762,11 @@ msgstr ""

762 "\ttermina sem:\n"

763 "%.*s"

764

765 -#: add-patch.c:1081 git-add--interactive.perl:1115

765 +#: add-patch.c:1082 git-add--interactive.perl:1115

766 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

767 msgstr "Modo de edição manual de pedaço -- ver final para guia rápido.\n"

768

769 -#: add-patch.c:1085

769 +#: add-patch.c:1086

770 #, fuzzy, c-format

771 msgid ""

772 "---\n"

@@ -780,7 +780,7 @@ msgstr ""

780 "Linhas começadas com %c serão removidas.\n"

781

782 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

783 -#: add-patch.c:1099 git-add--interactive.perl:1129

783 +#: add-patch.c:1100 git-add--interactive.perl:1129

784 msgid ""

785 "If it does not apply cleanly, you will be given an opportunity to\n"

786 "edit again. If all lines of the hunk are removed, then the edit is\n"

@@ -790,12 +790,12 @@ msgstr ""

790 "editar. Se todas as linhas deste pedaço forem removidas, então a edição\n"

791 "é abortada e este pedaço é deixado inalterado.\n"

792

793 -#: add-patch.c:1132

793 +#: add-patch.c:1133

794 #, fuzzy

795 msgid "could not parse hunk header"

796 msgstr "incapaz interpretar início de pedaço"

797

798 -#: add-patch.c:1177

798 +#: add-patch.c:1178

799 msgid "'git apply --cached' failed"

800 msgstr "'git apply --cached' falhou"

801

@@ -811,27 +811,27 @@ msgstr "'git apply --cached' falhou"

811 #. Consider translating (saying "no" discards!) as

812 #. (saying "n" for "no" discards!) if the translation

813 #. of the word "no" does not start with n.

814 -#: add-patch.c:1246 git-add--interactive.perl:1242

814 +#: add-patch.c:1247 git-add--interactive.perl:1242

815 msgid ""

816 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

817 msgstr ""

818 "Problema na submissão de pedaço editado. Editar de novo (responder \"n\" "

819 "para \"não\" descarta!) [y/n]? "

820

821 -#: add-patch.c:1289

821 +#: add-patch.c:1290

822 #, fuzzy

823 msgid "The selected hunks do not apply to the index!"

824 msgstr "Submissão incorreta de pedaços selecionados para index!"

825

826 -#: add-patch.c:1290 git-add--interactive.perl:1346

826 +#: add-patch.c:1291 git-add--interactive.perl:1346

827 msgid "Apply them to the worktree anyway? "

828 msgstr "Submetê-los para worktree mesmo assim? "

829

830 -#: add-patch.c:1297 git-add--interactive.perl:1349

830 +#: add-patch.c:1298 git-add--interactive.perl:1349

831 msgid "Nothing was applied.\n"

832 msgstr "Nada foi submetido.\n"

833

834 -#: add-patch.c:1354

834 +#: add-patch.c:1355

835 #, fuzzy

836 msgid ""

837 "j - leave this hunk undecided, see next undecided hunk\n"

@@ -854,72 +854,72 @@ msgstr ""

854 "e - editar manualmente o pedaço atual\n"

855 "? - mostrar ajuda\n"

856

857 -#: add-patch.c:1516 add-patch.c:1526

857 +#: add-patch.c:1517 add-patch.c:1527

858 #, fuzzy

859 msgid "No previous hunk"

860 msgstr "Sem pedaço anterior"

861

862 -#: add-patch.c:1521 add-patch.c:1531

862 +#: add-patch.c:1522 add-patch.c:1532

863 #, fuzzy

864 msgid "No next hunk"

865 msgstr "Sem próximo pedaço"

866

867 -#: add-patch.c:1537

867 +#: add-patch.c:1538

868 msgid "No other hunks to goto"

869 msgstr "Sem qualquer outro pedaço"

870

871 -#: add-patch.c:1548 git-add--interactive.perl:1606

871 +#: add-patch.c:1549 git-add--interactive.perl:1606

872 msgid "go to which hunk (<ret> to see more)? "

873 msgstr "ir para qual pedaço (<ret> para ver mais)? "

874

875 -#: add-patch.c:1549 git-add--interactive.perl:1608

875 +#: add-patch.c:1550 git-add--interactive.perl:1608

876 msgid "go to which hunk? "

877 msgstr "ir para qual pedaço? "

878

879 -#: add-patch.c:1560

879 +#: add-patch.c:1561

880 #, fuzzy, c-format

881 msgid "Invalid number: '%s'"

882 msgstr "Número inválido: '%s'"

883

884 -#: add-patch.c:1565

884 +#: add-patch.c:1566

885 #, fuzzy, c-format

886 msgid "Sorry, only %d hunk available."

887 msgid_plural "Sorry, only %d hunks available."

888 msgstr[0] "Lamento, apenas %d pedaço disponível."

889 msgstr[1] "Lamento, apenas %d pedaços disponíveis."

890

891 -#: add-patch.c:1574

891 +#: add-patch.c:1575

892 msgid "No other hunks to search"

893 msgstr "Sem outro pedaço a procurar"

894

895 -#: add-patch.c:1580 git-add--interactive.perl:1661

895 +#: add-patch.c:1581 git-add--interactive.perl:1661

896 msgid "search for regex? "

897 msgstr "procurar por regex? "

898

899 -#: add-patch.c:1595

899 +#: add-patch.c:1596

900 #, fuzzy, c-format

901 msgid "Malformed search regexp %s: %s"

902 msgstr "Pesquisa regexp deformada %s: %s"

903

904 -#: add-patch.c:1612

904 +#: add-patch.c:1613

905 #, fuzzy

906 msgid "No hunk matches the given pattern"

907 msgstr "Sem pedaço correspondente ao padrão fornecido"

908

909 -#: add-patch.c:1619

909 +#: add-patch.c:1620

910 msgid "Sorry, cannot split this hunk"

911 msgstr "Lamento, incapaz de dividir este pedaço"

912

913 -#: add-patch.c:1623

913 +#: add-patch.c:1624

914 #, fuzzy, c-format

915 msgid "Split into %d hunks."

916 msgstr "Dividir em %d pedaços."

917

918 -#: add-patch.c:1627

918 +#: add-patch.c:1628

919 msgid "Sorry, cannot edit this hunk"

920 msgstr "Lamento, incapaz de editar este pedaço"

921

922 -#: add-patch.c:1679

922 +#: add-patch.c:1680

923 #, fuzzy

924 msgid "'git apply' failed"

925 msgstr "'git apply' falhou"

@@ -1363,8 +1363,8 @@ msgstr "%s: tipo errado"

1363 msgid "%s has type %o, expected %o"

1364 msgstr "%s é do tipo %o, esperado %o"

1365

1366 -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890

1367 -#: read-cache.c:1351

1366 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892

1367 +#: read-cache.c:1353

1368 #, c-format

1369 msgid "invalid path '%s'"

1370 msgstr "caminho inválido '%s'"

@@ -1454,7 +1454,7 @@ msgstr "incapaz criar armazenamento de backup para ficheiro recém-criado %s"

1454 msgid "unable to add cache entry for %s"

1455 msgstr "incapaz adicionar entrada de cache para %s"

1456

1457 -#: apply.c:4376 builtin/bisect--helper.c:523

1457 +#: apply.c:4376 builtin/bisect--helper.c:525

1458 #, c-format

1459 msgid "failed to write to '%s'"

1460 msgstr "falha a escrever para '%s'"

@@ -1544,7 +1544,7 @@ msgid_plural "%d lines applied after fixing whitespace errors."

1544 msgstr[0] "%d linha aplicada depois de corrigir erros de espaço em branco."

1545 msgstr[1] "%d linhas aplicadas depois de corrigir erros de espaço em branco."

1546

1547 -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423

1547 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423

1548 msgid "Unable to write new index file"

1549 msgstr "Incapaz de escrever novo ficheiro index"

1550

@@ -1557,7 +1557,7 @@ msgstr ""

1557 msgid "apply changes matching the given path"

1558 msgstr "submeter alterações correspondentes a path fornecido"

1559

1560 -#: apply.c:5000 builtin/am.c:2317

1560 +#: apply.c:5000 builtin/am.c:2318

1561 msgid "num"

1562 msgstr "num"

1563

@@ -1623,9 +1623,9 @@ msgstr "os caminhos estão separados por caracteres NUL"

1623 msgid "ensure at least <n> lines of context match"

1624 msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"

1625

1626 -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296

1626 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297

1627 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1628 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831

1628 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991

1629 #: builtin/rebase.c:1347

1630 msgid "action"

1631 msgstr "ação"

@@ -1655,8 +1655,8 @@ msgid "allow overlapping hunks"

1655 msgstr "permitir a sobreposição de pedaços"

1656

1657 #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22

1658 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755

1659 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128

1658 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756

1659 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128

1660 msgid "be verbose"

1661 msgstr "ser verboso"

1662

@@ -1669,7 +1669,7 @@ msgstr ""

1669 msgid "do not trust the line counts in the hunk headers"

1670 msgstr "desconfia da contagem de linhas nos headers de pedaços"

1671

1672 -#: apply.c:5059 builtin/am.c:2305

1672 +#: apply.c:5059 builtin/am.c:2306

1673 msgid "root"

1674 msgstr "raiz"

1675

@@ -1712,7 +1712,7 @@ msgstr ""

1712 msgid "path too long (%d chars, SHA1: %s): %s"

1713 msgstr ""

1714

1715 -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247

1715 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368

1716 #, c-format

1717 msgid "deflate error (%d)"

1718 msgstr "erro ao compactar (%d)"

@@ -1747,13 +1747,13 @@ msgid "cannot read %s"

1747 msgstr "incapaz ler '%s'"

1748

1749 #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095

1750 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833

1750 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833

1751 #: builtin/merge.c:1143

1752 #, c-format

1753 msgid "could not read '%s'"

1754 msgstr "incapaz ler '%s'"

1755

1756 -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328

1756 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328

1757 #, c-format

1758 msgid "pathspec '%s' did not match any files"

1759 msgstr "especificador de path '%s' correspondeu a ficheiro nenhum"

@@ -1796,7 +1796,7 @@ msgstr "fmt"

1796 msgid "archive format"

1797 msgstr "formato do arquivo"

1798

1799 -#: archive.c:553 builtin/log.c:1772

1799 +#: archive.c:553 builtin/log.c:1775

1800 msgid "prefix"

1801 msgstr "prefixo"

1802

@@ -1807,7 +1807,7 @@ msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo"

1807 #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888

1808 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135

1809 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209

1810 -#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105

1810 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105

1811 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412

1812 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191

1813 msgid "file"

@@ -1840,7 +1840,7 @@ msgid "list supported archive formats"

1840 msgstr "listar formatos de arquivo suportados"

1841

1842 #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121

1843 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336

1843 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1844 msgid "repo"

1845 msgstr "repo"

1846

@@ -1848,7 +1848,7 @@ msgstr "repo"

1848 msgid "retrieve the archive from remote repository <repo>"

1849 msgstr "obter o arquivo a partir do repositório remoto <repo>"

1850

1851 -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718

1851 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717

1852 #: builtin/notes.c:498

1853 msgid "command"

1854 msgstr "comando"

@@ -2034,11 +2034,11 @@ msgid "--reverse and --first-parent together require specified latest commit"

2034 msgstr ""

2035 "--reverse e --first-parent juntos requer que se especifique o último commit"

2036

2037 -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333

2038 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411

2039 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344

2040 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646

2041 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255

2037 +#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333

2038 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414

2039 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346

2040 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806

2041 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255

2042 msgid "revision walk setup failed"

2043 msgstr "falha ao configurar percurso de revisões"

2044

@@ -2196,120 +2196,120 @@ msgstr "'%s' foi já extraído em '%s'"

2196 msgid "HEAD of working tree %s is not updated"

2197 msgstr "HEAD da working tree %s está desatualizada"

2198

2199 -#: bundle.c:41

2199 +#: bundle.c:44

2200 #, fuzzy, c-format

2201 msgid "unrecognized bundle hash algorithm: %s"

2202 msgstr "algoritmo hash de bundle irreconhecível: %s"

2203

2204 -#: bundle.c:45

2204 +#: bundle.c:48

2205 #, fuzzy, c-format

2206 msgid "unknown capability '%s'"

2207 msgstr "capacidade desconhecida '%s'"

2208

2209 -#: bundle.c:71

2209 +#: bundle.c:74

2210 #, fuzzy, c-format

2211 msgid "'%s' does not look like a v2 or v3 bundle file"

2212 msgstr "'%s' parece-se com ficheiro bundle v2 ou v3 nenhum"

2213

2214 -#: bundle.c:110

2214 +#: bundle.c:113

2215 #, c-format

2216 msgid "unrecognized header: %s%s (%d)"

2217 msgstr "cabeçalho irreconhecível: %s%s (%d)"

2218

2219 -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

2219 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

2220 #: builtin/commit.c:861

2221 #, c-format

2222 msgid "could not open '%s'"

2223 msgstr "incapaz abrir '%s'"

2224

2225 -#: bundle.c:189

2225 +#: bundle.c:198

2226 msgid "Repository lacks these prerequisite commits:"

2227 msgstr "Falta ao repositório estes pré-requisitos de commits:"

2228

2229 -#: bundle.c:192

2229 +#: bundle.c:201

2230 #, fuzzy

2231 msgid "need a repository to verify a bundle"

2232 msgstr "é preciso repositório para verificar um bundle."

2233

2234 -#: bundle.c:243

2234 +#: bundle.c:257

2235 #, c-format

2236 msgid "The bundle contains this ref:"

2237 msgid_plural "The bundle contains these %d refs:"

2238 msgstr[0] "O bundle contém esta referência:"

2239 msgstr[1] "O bundle contém estas %d referências:"

2240

2241 -#: bundle.c:250

2241 +#: bundle.c:264

2242 msgid "The bundle records a complete history."

2243 msgstr "O pacote regista um histórico completo."

2244

2245 -#: bundle.c:252

2245 +#: bundle.c:266

2246 #, c-format

2247 msgid "The bundle requires this ref:"

2248 msgid_plural "The bundle requires these %d refs:"

2249 msgstr[0] "O bundle requer esta referência:"

2250 msgstr[1] "O bundle requer estas %d referências:"

2251

2252 -#: bundle.c:319

2252 +#: bundle.c:333

2253 #, fuzzy

2254 msgid "unable to dup bundle descriptor"

2255 msgstr "incapaz de dup descritor de bundle"

2256

2257 -#: bundle.c:326

2257 +#: bundle.c:340

2258 msgid "Could not spawn pack-objects"

2259 msgstr "Impossível gerar pack-objects"

2260

2261 -#: bundle.c:337

2261 +#: bundle.c:351

2262 msgid "pack-objects died"

2263 msgstr "pack-objects terminaram inesperadamente"

2264

2265 -#: bundle.c:386

2265 +#: bundle.c:400

2266 #, c-format

2267 msgid "ref '%s' is excluded by the rev-list options"

2268 msgstr "a referência '%s' é excluída pelas opções de rev-list"

2269

2270 -#: bundle.c:490

2270 +#: bundle.c:504

2271 #, fuzzy, c-format

2272 msgid "unsupported bundle version %d"

2273 msgstr "fora de suporte versão bundle %d"

2274

2275 -#: bundle.c:492

2275 +#: bundle.c:506

2276 #, c-format

2277 msgid "cannot write bundle version %d with algorithm %s"

2278 msgstr ""

2279

2280 -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396

2280 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396

2281 #, c-format

2282 msgid "unrecognized argument: %s"

2283 msgstr "argumento irreconhecível: %s"

2284

2285 -#: bundle.c:539

2285 +#: bundle.c:553

2286 msgid "Refusing to create empty bundle."

2287 msgstr "Criação de bundle vazio recusada."

2288

2289 -#: bundle.c:549

2289 +#: bundle.c:563

2290 #, c-format

2291 msgid "cannot create '%s'"

2292 msgstr "incapaz criar '%s'"

2293

2294 -#: bundle.c:574

2294 +#: bundle.c:588

2295 msgid "index-pack died"

2296 msgstr "index-pack terminou inesperadamente"

2297

2298 -#: chunk-format.c:113

2298 +#: chunk-format.c:117

2299 msgid "terminating chunk id appears earlier than expected"

2300 msgstr ""

2301

2302 -#: chunk-format.c:122

2302 +#: chunk-format.c:126

2303 #, c-format

2304 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"

2305 msgstr ""

2306

2307 -#: chunk-format.c:129

2307 +#: chunk-format.c:133

2308 #, c-format

2309 msgid "duplicate chunk ID %<PRIx32> found"

2310 msgstr ""

2311

2312 -#: chunk-format.c:143

2312 +#: chunk-format.c:147

2313 #, c-format

2314 msgid "final chunk has non-zero id %<PRIx32>"

2315 msgstr ""

@@ -2379,12 +2379,12 @@ msgstr "incapaz encontrar commit %s"

2379 msgid "commit-graph requires overflow generation data but has none"

2380 msgstr ""

2381

2382 -#: commit-graph.c:1075 builtin/am.c:1340

2382 +#: commit-graph.c:1075 builtin/am.c:1341

2383 #, c-format

2384 msgid "unable to parse commit %s"

2385 msgstr "incapaz analisar commit %s"

2386

2387 -#: commit-graph.c:1337 builtin/pack-objects.c:2897

2387 +#: commit-graph.c:1337 builtin/pack-objects.c:3057

2388 #, fuzzy, c-format

2389 msgid "unable to get type of object %s"

2390 msgstr "incapaz obter tipo de objeto %s"

@@ -2448,7 +2448,7 @@ msgstr ""

2448 msgid "failed to write correct number of base graph ids"

2449 msgstr ""

2450

2451 -#: commit-graph.c:1812 midx.c:906

2451 +#: commit-graph.c:1812 midx.c:911

2452 #, fuzzy, c-format

2453 msgid "unable to create leading directories of %s"

2454 msgstr "incapaz criar as pastas superiores a %s"

@@ -2503,78 +2503,78 @@ msgstr ""

2503 msgid "too many commits to write graph"

2504 msgstr "demasiados commits para escrever grafo"

2505

2506 -#: commit-graph.c:2450

2506 +#: commit-graph.c:2449

2507 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

2508 msgstr ""

2509

2510 -#: commit-graph.c:2460

2510 +#: commit-graph.c:2459

2511 #, c-format

2512 msgid "commit-graph has incorrect OID order: %s then %s"

2513 msgstr ""

2514

2515 -#: commit-graph.c:2470 commit-graph.c:2485

2515 +#: commit-graph.c:2469 commit-graph.c:2484

2516 #, c-format

2517 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2518 msgstr ""

2519

2520 -#: commit-graph.c:2477

2520 +#: commit-graph.c:2476

2521 #, fuzzy, c-format

2522 msgid "failed to parse commit %s from commit-graph"

2523 msgstr "incapaz analisar commit %s de commit-graph"

2524

2525 -#: commit-graph.c:2495

2525 +#: commit-graph.c:2494

2526 msgid "Verifying commits in commit graph"

2527 msgstr ""

2528

2529 -#: commit-graph.c:2510

2529 +#: commit-graph.c:2509

2530 #, c-format

2531 msgid "failed to parse commit %s from object database for commit-graph"

2532 msgstr ""

2533

2534 -#: commit-graph.c:2517

2534 +#: commit-graph.c:2516

2535 #, c-format

2536 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2537 msgstr ""

2538

2539 -#: commit-graph.c:2527

2539 +#: commit-graph.c:2526

2540 #, c-format

2541 msgid "commit-graph parent list for commit %s is too long"

2542 msgstr ""

2543

2544 -#: commit-graph.c:2536

2544 +#: commit-graph.c:2535

2545 #, c-format

2546 msgid "commit-graph parent for %s is %s != %s"

2547 msgstr ""

2548

2549 -#: commit-graph.c:2550

2549 +#: commit-graph.c:2549

2550 #, c-format

2551 msgid "commit-graph parent list for commit %s terminates early"

2552 msgstr ""

2553

2554 -#: commit-graph.c:2555

2554 +#: commit-graph.c:2554

2555 #, c-format

2556 msgid ""

2557 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

2558 msgstr ""

2559

2560 -#: commit-graph.c:2559

2560 +#: commit-graph.c:2558

2561 #, c-format

2562 msgid ""

2563 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

2564 msgstr ""

2565

2566 -#: commit-graph.c:2576

2566 +#: commit-graph.c:2575

2567 #, c-format

2568 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2569 msgstr ""

2570

2571 -#: commit-graph.c:2582

2571 +#: commit-graph.c:2581

2572 #, c-format

2573 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2574 msgstr ""

2575

2576 -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416

2577 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457

2576 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417

2577 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457

2578 #, c-format

2579 msgid "could not parse %s"

2580 msgstr "incapaz analisar %s"

@@ -2852,7 +2852,7 @@ msgstr "valor inválido de %s: %s"

2852 msgid "must be one of nothing, matching, simple, upstream or current"

2853 msgstr ""

2854

2855 -#: config.c:1687 builtin/pack-objects.c:3924

2855 +#: config.c:1687 builtin/pack-objects.c:4084

2856 #, c-format

2857 msgid "bad pack compression level %d"

2858 msgstr "nível de compactação do pacote %d incorreto"

@@ -2872,111 +2872,111 @@ msgstr "referência '%s' aponta para blob nenhum"

2872 msgid "unable to resolve config blob '%s'"

2873 msgstr "incapaz resolver blog config '%s'"

2874

2875 -#: config.c:1873

2875 +#: config.c:1874

2876 #, fuzzy, c-format

2877 msgid "failed to parse %s"

2878 msgstr "falha a analisar %s"

2879

2880 -#: config.c:1929

2880 +#: config.c:1930

2881 msgid "unable to parse command-line config"

2882 msgstr "incapaz analisar config de linha de comandos"

2883

2884 -#: config.c:2293

2884 +#: config.c:2294

2885 msgid "unknown error occurred while reading the configuration files"

2886 msgstr ""

2887 "ocorreu um erro desconhecido durante a leitura dos ficheiros de configuração"

2888

2889 -#: config.c:2467

2889 +#: config.c:2468

2890 #, c-format

2891 msgid "Invalid %s: '%s'"

2892 msgstr "Inválido %s: '%s'"

2893

2894 -#: config.c:2512

2894 +#: config.c:2513

2895 #, c-format

2896 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2897 msgstr "o valor '%d' de splitIndex.maxPercentChange deve estar entre 0 e 100"

2898

2899 -#: config.c:2558

2899 +#: config.c:2559

2900 #, c-format

2901 msgid "unable to parse '%s' from command-line config"

2902 msgstr "incapaz analisar '%s' da configuração de linha de comandos"

2903

2904 -#: config.c:2560

2904 +#: config.c:2561

2905 #, c-format

2906 msgid "bad config variable '%s' in file '%s' at line %d"

2907 msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d"

2908

2909 -#: config.c:2644

2909 +#: config.c:2645

2910 #, fuzzy, c-format

2911 msgid "invalid section name '%s'"

2912 msgstr "conteúdo inválido: '%s'"

2913

2914 -#: config.c:2676

2914 +#: config.c:2677

2915 #, c-format

2916 msgid "%s has multiple values"

2917 msgstr "%s tem múltiplos valores"

2918

2919 -#: config.c:2705

2919 +#: config.c:2706

2920 #, fuzzy, c-format

2921 msgid "failed to write new configuration file %s"

2922 msgstr "falha a escrever novo ficheiro configuração %s"

2923

2924 -#: config.c:2957 config.c:3283

2924 +#: config.c:2958 config.c:3285

2925 #, fuzzy, c-format

2926 msgid "could not lock config file %s"

2927 msgstr "incapaz trancar ficheiro config %s"

2928

2929 -#: config.c:2968

2929 +#: config.c:2969

2930 #, fuzzy, c-format

2931 msgid "opening %s"

2932 msgstr "abrindo %s"

2933

2934 -#: config.c:3005 builtin/config.c:361

2934 +#: config.c:3006 builtin/config.c:361

2935 #, fuzzy, c-format

2936 msgid "invalid pattern: %s"

2937 msgstr "padrão inválido: %s"

2938

2939 -#: config.c:3030

2939 +#: config.c:3031

2940 #, fuzzy, c-format

2941 msgid "invalid config file %s"

2942 msgstr "ficheiro config inválido %s"

2943

2944 -#: config.c:3043 config.c:3296

2944 +#: config.c:3044 config.c:3298

2945 #, c-format

2946 msgid "fstat on %s failed"

2947 msgstr "falha de fstat de %s"

2948

2949 -#: config.c:3054

2949 +#: config.c:3055

2950 #, fuzzy, c-format

2951 -msgid "unable to mmap '%s'"

2951 +msgid "unable to mmap '%s'%s"

2952 msgstr "incapaz mmap '%s'"

2953

2954 -#: config.c:3063 config.c:3301

2954 +#: config.c:3065 config.c:3303

2955 #, fuzzy, c-format

2956 msgid "chmod on %s failed"

2957 msgstr "falha de fstat de %s"

2958

2959 -#: config.c:3148 config.c:3398

2959 +#: config.c:3150 config.c:3400

2960 #, fuzzy, c-format

2961 msgid "could not write config file %s"

2962 msgstr "incapaz escrever ficheiro config %s"

2963

2964 -#: config.c:3182

2964 +#: config.c:3184

2965 #, c-format

2966 msgid "could not set '%s' to '%s'"

2967 msgstr "incapaz definir '%s' como '%s'"

2968

2969 -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2969 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2970 #, c-format

2971 msgid "could not unset '%s'"

2972 msgstr "incapaz desdefinir '%s'"

2973

2974 -#: config.c:3274

2974 +#: config.c:3276

2975 #, fuzzy, c-format

2976 msgid "invalid section name: %s"

2977 msgstr "opção inválida: %s"

2978

2979 -#: config.c:3441

2979 +#: config.c:3443

2980 #, fuzzy, c-format

2981 msgid "missing value for '%s'"

2982 msgstr "valor inválido de %s"

@@ -3156,7 +3156,7 @@ msgstr ""

3156 msgid "unable to fork"

3157 msgstr "incapaz de aforquilhar"

3158

3159 -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45

3159 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45

3160 msgid "Checking connectivity"

3161 msgstr "A verificar conectividade"

3162

@@ -3414,38 +3414,38 @@ msgstr ""

3414 msgid "Marked %d islands, done.\n"

3415 msgstr ""

3416

3417 -#: diff-merges.c:80

3417 +#: diff-merges.c:70

3418 #, fuzzy, c-format

3419 msgid "unknown value for --diff-merges: %s"

3420 msgstr "valor desconhecido '%s' da chave '%s'"

3421

3422 -#: diff-lib.c:538

3422 +#: diff-lib.c:557

3423 msgid "--merge-base does not work with ranges"

3424 msgstr ""

3425

3426 -#: diff-lib.c:540

3426 +#: diff-lib.c:559

3427 msgid "--merge-base only works with commits"

3428 msgstr ""

3429

3430 -#: diff-lib.c:557

3430 +#: diff-lib.c:576

3431 #, fuzzy

3432 msgid "unable to get HEAD"

3433 msgstr "incapaz obter HEAD"

3434

3435 -#: diff-lib.c:564

3435 +#: diff-lib.c:583

3436 msgid "no merge base found"

3437 msgstr ""

3438

3439 -#: diff-lib.c:566

3439 +#: diff-lib.c:585

3440 msgid "multiple merge bases found"

3441 msgstr ""

3442

3443 -#: diff-no-index.c:238

3443 +#: diff-no-index.c:237

3444 #, fuzzy

3445 msgid "git diff --no-index [<options>] <path> <path>"

3446 msgstr "git worktree add [<opções>] <caminho> [<ramo>]"

3447

3448 -#: diff-no-index.c:263

3448 +#: diff-no-index.c:262

3449 msgid ""

3450 "Not a git repository. Use --no-index to compare two paths outside a working "

3451 "tree"

@@ -3494,36 +3494,48 @@ msgstr ""

3494 "Erros encontrados na variável de configuração 'diff.dirstat':\n"

3495 "%s"

3496

3497 -#: diff.c:4278

3497 +#: diff.c:4282

3498 #, c-format

3499 msgid "external diff died, stopping at %s"

3500 msgstr "o diff externo terminou inesperadamente, interrompido em %s"

3501

3502 -#: diff.c:4630

3502 +#: diff.c:4634

3503 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

3504 msgstr "--name-only, --name-status, --check e -s são mutuamente exclusivos"

3505

3506 -#: diff.c:4633

3506 +#: diff.c:4637

3507 #, fuzzy

3508 msgid "-G, -S and --find-object are mutually exclusive"

3509 msgstr "-b, -B e --detach são mutuamente exclusivos"

3510

3511 -#: diff.c:4712

3511 +#: diff.c:4640

3512 +msgid ""

3513 +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"

3514 +msgstr ""

3515 +

3516 +#: diff.c:4643

3517 +#, fuzzy

3518 +msgid ""

3519 +"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "

3520 +"with -G and -S"

3521 +msgstr "-b, -B e --detach são mutuamente exclusivos"

3522 +

3523 +#: diff.c:4722

3524 msgid "--follow requires exactly one pathspec"

3525 msgstr "--follow requer exatamente um único especificador de caminho"

3526

3515 -#: diff.c:4760

3527 +#: diff.c:4770

3528 #, fuzzy, c-format

3529 msgid "invalid --stat value: %s"

3530 msgstr "valor de cor inválido: %.*s"

3531

3520 -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308

3532 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318

3533 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3534 #, fuzzy, c-format

3535 msgid "%s expects a numerical value"

3536 msgstr "a opção '%c' espera um valor numérico"

3537

3526 -#: diff.c:4797

3538 +#: diff.c:4807

3539 #, c-format

3540 msgid ""

3541 "Failed to parse --dirstat/-X option parameter:\n"

@@ -3532,555 +3544,556 @@ msgstr ""

3544 "Falha ao analisar parâmetro da opção --dirstat/-X:\n"

3545 "%s"

3546

3535 -#: diff.c:4882

3547 +#: diff.c:4892

3548 #, c-format

3549 msgid "unknown change class '%c' in --diff-filter=%s"

3550 msgstr ""

3551

3540 -#: diff.c:4906

3552 +#: diff.c:4916

3553 #, c-format

3554 msgid "unknown value after ws-error-highlight=%.*s"

3555 msgstr ""

3556

3545 -#: diff.c:4920

3557 +#: diff.c:4930

3558 #, fuzzy, c-format

3559 msgid "unable to resolve '%s'"

3560 msgstr "incapaz resolver '%s'"

3561

3550 -#: diff.c:4970 diff.c:4976

3562 +#: diff.c:4980 diff.c:4986

3563 #, c-format

3564 msgid "%s expects <n>/<m> form"

3565 msgstr ""

3566

3555 -#: diff.c:4988

3567 +#: diff.c:4998

3568 #, c-format

3569 msgid "%s expects a character, got '%s'"

3570 msgstr ""

3571

3560 -#: diff.c:5009

3572 +#: diff.c:5019

3573 #, fuzzy, c-format

3574 msgid "bad --color-moved argument: %s"

3575 msgstr "argumento incorreto --color-moved: %s"

3576

3565 -#: diff.c:5028

3577 +#: diff.c:5038

3578 #, fuzzy, c-format

3579 msgid "invalid mode '%s' in --color-moved-ws"

3580 msgstr "objeto inválido '%s' fornecido."

3581

3570 -#: diff.c:5068

3582 +#: diff.c:5078

3583 msgid ""

3584 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3585 "\"histogram\""

3586 msgstr ""

3587

3576 -#: diff.c:5104 diff.c:5124

3588 +#: diff.c:5114 diff.c:5134

3589 #, fuzzy, c-format

3590 msgid "invalid argument to %s"

3591 msgstr "valor inválido de %s"

3592

3581 -#: diff.c:5228

3593 +#: diff.c:5238

3594 #, fuzzy, c-format

3595 msgid "invalid regex given to -I: '%s'"

3596 msgstr "valor inválido de %s"

3597

3586 -#: diff.c:5277

3598 +#: diff.c:5287

3599 #, fuzzy, c-format

3600 msgid "failed to parse --submodule option parameter: '%s'"

3601 msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"

3602

3591 -#: diff.c:5333

3603 +#: diff.c:5343

3604 #, c-format

3605 msgid "bad --word-diff argument: %s"

3606 msgstr ""

3607

3596 -#: diff.c:5369

3608 +#: diff.c:5379

3609 msgid "Diff output format options"

3610 msgstr ""

3611

3600 -#: diff.c:5371 diff.c:5377

3612 +#: diff.c:5381 diff.c:5387

3613 #, fuzzy

3614 msgid "generate patch"

3615 msgstr "incorporar o patch"

3616

3605 -#: diff.c:5374 builtin/log.c:179

3617 +#: diff.c:5384 builtin/log.c:179

3618 msgid "suppress diff output"

3619 msgstr "suprimir saída do diff"

3620

3609 -#: diff.c:5379 diff.c:5493 diff.c:5500

3621 +#: diff.c:5389 diff.c:5503 diff.c:5510

3622 msgid "<n>"

3623 msgstr ""

3624

3613 -#: diff.c:5380 diff.c:5383

3625 +#: diff.c:5390 diff.c:5393

3626 #, fuzzy

3627 msgid "generate diffs with <n> lines context"

3628 msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"

3629

3618 -#: diff.c:5385

3630 +#: diff.c:5395

3631 msgid "generate the diff in raw format"

3632 msgstr ""

3633

3622 -#: diff.c:5388

3634 +#: diff.c:5398

3635 #, fuzzy

3636 msgid "synonym for '-p --raw'"

3637 msgstr "(sinónimo de --stat)"

3638

3627 -#: diff.c:5392

3639 +#: diff.c:5402

3640 #, fuzzy

3641 msgid "synonym for '-p --stat'"

3642 msgstr "(sinónimo de --stat)"

3643

3632 -#: diff.c:5396

3644 +#: diff.c:5406

3645 #, fuzzy

3646 msgid "machine friendly --stat"

3647 msgstr "saída inteligível por máquina"

3648

3637 -#: diff.c:5399

3649 +#: diff.c:5409

3650 msgid "output only the last line of --stat"

3651 msgstr ""

3652

3641 -#: diff.c:5401 diff.c:5409

3653 +#: diff.c:5411 diff.c:5419

3654 msgid "<param1,param2>..."

3655 msgstr ""

3656

3645 -#: diff.c:5402

3657 +#: diff.c:5412

3658 msgid ""

3659 "output the distribution of relative amount of changes for each sub-directory"

3660 msgstr ""

3661

3650 -#: diff.c:5406

3662 +#: diff.c:5416

3663 #, fuzzy

3664 msgid "synonym for --dirstat=cumulative"

3665 msgstr "sinónimo de --files-with-matches"

3666

3655 -#: diff.c:5410

3667 +#: diff.c:5420

3668 msgid "synonym for --dirstat=files,param1,param2..."

3669 msgstr ""

3670

3659 -#: diff.c:5414

3671 +#: diff.c:5424

3672 msgid "warn if changes introduce conflict markers or whitespace errors"

3673 msgstr ""

3674

3663 -#: diff.c:5417

3675 +#: diff.c:5427

3676 msgid "condensed summary such as creations, renames and mode changes"

3677 msgstr ""

3678

3667 -#: diff.c:5420

3679 +#: diff.c:5430

3680 #, fuzzy

3681 msgid "show only names of changed files"

3682 msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"

3683

3672 -#: diff.c:5423

3684 +#: diff.c:5433

3685 #, fuzzy

3686 msgid "show only names and status of changed files"

3687 msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"

3688

3677 -#: diff.c:5425

3689 +#: diff.c:5435

3690 msgid "<width>[,<name-width>[,<count>]]"

3691 msgstr ""

3692

3681 -#: diff.c:5426

3693 +#: diff.c:5436

3694 #, fuzzy

3695 msgid "generate diffstat"

3696 msgstr "diff status inesperado %c"

3697

3686 -#: diff.c:5428 diff.c:5431 diff.c:5434

3698 +#: diff.c:5438 diff.c:5441 diff.c:5444

3699 msgid "<width>"

3700 msgstr ""

3701

3690 -#: diff.c:5429

3702 +#: diff.c:5439

3703 msgid "generate diffstat with a given width"

3704 msgstr ""

3705

3694 -#: diff.c:5432

3706 +#: diff.c:5442

3707 msgid "generate diffstat with a given name width"

3708 msgstr ""

3709

3698 -#: diff.c:5435

3710 +#: diff.c:5445

3711 msgid "generate diffstat with a given graph width"

3712 msgstr ""

3713

3702 -#: diff.c:5437

3714 +#: diff.c:5447

3715 msgid "<count>"

3716 msgstr ""

3717

3706 -#: diff.c:5438

3718 +#: diff.c:5448

3719 msgid "generate diffstat with limited lines"

3720 msgstr ""

3721

3710 -#: diff.c:5441

3722 +#: diff.c:5451

3723 msgid "generate compact summary in diffstat"

3724 msgstr ""

3725

3714 -#: diff.c:5444

3726 +#: diff.c:5454

3727 msgid "output a binary diff that can be applied"

3728 msgstr ""

3729

3718 -#: diff.c:5447

3730 +#: diff.c:5457

3731 msgid "show full pre- and post-image object names on the \"index\" lines"

3732 msgstr ""

3733

3722 -#: diff.c:5449

3734 +#: diff.c:5459

3735 #, fuzzy

3736 msgid "show colored diff"

3737 msgstr "mostrar ficheiros ignorados"

3738

3727 -#: diff.c:5450

3739 +#: diff.c:5460

3740 msgid "<kind>"

3741 msgstr ""

3742

3731 -#: diff.c:5451

3743 +#: diff.c:5461

3744 msgid ""

3745 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3746 "diff"

3747 msgstr ""

3748

3737 -#: diff.c:5454

3749 +#: diff.c:5464

3750 msgid ""

3751 "do not munge pathnames and use NULs as output field terminators in --raw or "

3752 "--numstat"

3753 msgstr ""

3754

3743 -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572

3755 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582

3756 #, fuzzy

3757 msgid "<prefix>"

3758 msgstr "<prefixo>/"

3759

3748 -#: diff.c:5458

3760 +#: diff.c:5468

3761 msgid "show the given source prefix instead of \"a/\""

3762 msgstr ""

3763

3752 -#: diff.c:5461

3764 +#: diff.c:5471

3765 msgid "show the given destination prefix instead of \"b/\""

3766 msgstr ""

3767

3756 -#: diff.c:5464

3768 +#: diff.c:5474

3769 #, fuzzy

3770 msgid "prepend an additional prefix to every line of output"

3771 msgstr "preceder o nomebase do projeto pai na saída"

3772

3761 -#: diff.c:5467

3773 +#: diff.c:5477

3774 msgid "do not show any source or destination prefix"

3775 msgstr ""

3776

3765 -#: diff.c:5470

3777 +#: diff.c:5480

3778 #, fuzzy

3779 msgid "show context between diff hunks up to the specified number of lines"

3780 msgstr "criar um clone raso, truncado ao número especificado de revisões"

3781

3770 -#: diff.c:5474 diff.c:5479 diff.c:5484

3782 +#: diff.c:5484 diff.c:5489 diff.c:5494

3783 msgid "<char>"

3784 msgstr ""

3785

3774 -#: diff.c:5475

3786 +#: diff.c:5485

3787 msgid "specify the character to indicate a new line instead of '+'"

3788 msgstr ""

3789

3778 -#: diff.c:5480

3790 +#: diff.c:5490

3791 msgid "specify the character to indicate an old line instead of '-'"

3792 msgstr ""

3793

3782 -#: diff.c:5485

3794 +#: diff.c:5495

3795 msgid "specify the character to indicate a context instead of ' '"

3796 msgstr ""

3797

3786 -#: diff.c:5488

3798 +#: diff.c:5498

3799 #, fuzzy

3800 msgid "Diff rename options"

3801 msgstr "Opções genéricas"

3802

3791 -#: diff.c:5489

3803 +#: diff.c:5499

3804 #, fuzzy

3805 msgid "<n>[/<m>]"

3806 msgstr "<n>[,<base>]"

3807

3796 -#: diff.c:5490

3808 +#: diff.c:5500

3809 msgid "break complete rewrite changes into pairs of delete and create"

3810 msgstr ""

3811

3800 -#: diff.c:5494

3812 +#: diff.c:5504

3813 #, fuzzy

3814 msgid "detect renames"

3815 msgstr "nome do remoto"

3816

3805 -#: diff.c:5498

3817 +#: diff.c:5508

3818 msgid "omit the preimage for deletes"

3819 msgstr ""

3820

3809 -#: diff.c:5501

3821 +#: diff.c:5511

3822 msgid "detect copies"

3823 msgstr ""

3824

3813 -#: diff.c:5505

3825 +#: diff.c:5515

3826 msgid "use unmodified files as source to find copies"

3827 msgstr ""

3828

3817 -#: diff.c:5507

3829 +#: diff.c:5517

3830 #, fuzzy

3831 msgid "disable rename detection"

3832 msgstr "Deteção de mudança de nome inexata em curso"

3833

3822 -#: diff.c:5510

3834 +#: diff.c:5520

3835 msgid "use empty blobs as rename source"

3836 msgstr ""

3837

3826 -#: diff.c:5512

3838 +#: diff.c:5522

3839 msgid "continue listing the history of a file beyond renames"

3840 msgstr ""

3841

3830 -#: diff.c:5515

3842 +#: diff.c:5525

3843 msgid ""

3844 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3845 "given limit"

3846 msgstr ""

3847

3836 -#: diff.c:5517

3848 +#: diff.c:5527

3849 #, fuzzy

3850 msgid "Diff algorithm options"

3851 msgstr "opção inválida: %s"

3852

3841 -#: diff.c:5519

3853 +#: diff.c:5529

3854 msgid "produce the smallest possible diff"

3855 msgstr ""

3856

3845 -#: diff.c:5522

3857 +#: diff.c:5532

3858 #, fuzzy

3859 msgid "ignore whitespace when comparing lines"

3860 msgstr "ignorar alterações de espaço em branco ao procurar contexto"

3861

3850 -#: diff.c:5525

3862 +#: diff.c:5535

3863 #, fuzzy

3864 msgid "ignore changes in amount of whitespace"

3865 msgstr "ignorar alterações de espaço em branco ao procurar contexto"

3866

3855 -#: diff.c:5528

3867 +#: diff.c:5538

3868 #, fuzzy

3869 msgid "ignore changes in whitespace at EOL"

3870 msgstr "ignorar alterações de espaço em branco ao procurar contexto"

3871

3860 -#: diff.c:5531

3872 +#: diff.c:5541

3873 msgid "ignore carrier-return at the end of line"

3874 msgstr ""

3875

3864 -#: diff.c:5534

3876 +#: diff.c:5544

3877 msgid "ignore changes whose lines are all blank"

3878 msgstr ""

3879

3868 -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606

3880 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616

3881 msgid "<regex>"

3882 msgstr ""

3883

3872 -#: diff.c:5537

3884 +#: diff.c:5547

3885 #, fuzzy

3886 msgid "ignore changes whose all lines match <regex>"

3887 msgstr "ignorar alterações de espaço em branco ao procurar contexto"

3888

3877 -#: diff.c:5540

3889 +#: diff.c:5550

3890 msgid "heuristic to shift diff hunk boundaries for easy reading"

3891 msgstr ""

3892

3881 -#: diff.c:5543

3893 +#: diff.c:5553

3894 msgid "generate diff using the \"patience diff\" algorithm"

3895 msgstr ""

3896

3885 -#: diff.c:5547

3897 +#: diff.c:5557

3898 msgid "generate diff using the \"histogram diff\" algorithm"

3899 msgstr ""

3900

3889 -#: diff.c:5549

3901 +#: diff.c:5559

3902 msgid "<algorithm>"

3903 msgstr ""

3904

3893 -#: diff.c:5550

3905 +#: diff.c:5560

3906 msgid "choose a diff algorithm"

3907 msgstr ""

3908

3897 -#: diff.c:5552

3909 +#: diff.c:5562

3910 #, fuzzy

3911 msgid "<text>"

3912 msgstr "texto"

3913

3902 -#: diff.c:5553

3914 +#: diff.c:5563

3915 msgid "generate diff using the \"anchored diff\" algorithm"

3916 msgstr ""

3917

3906 -#: diff.c:5555 diff.c:5564 diff.c:5567

3918 +#: diff.c:5565 diff.c:5574 diff.c:5577

3919 #, fuzzy

3920 msgid "<mode>"

3921 msgstr "modo"

3922

3911 -#: diff.c:5556

3923 +#: diff.c:5566

3924 msgid "show word diff, using <mode> to delimit changed words"

3925 msgstr ""

3926

3915 -#: diff.c:5559

3927 +#: diff.c:5569

3928 msgid "use <regex> to decide what a word is"

3929 msgstr ""

3930

3919 -#: diff.c:5562

3931 +#: diff.c:5572

3932 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3933 msgstr ""

3934

3923 -#: diff.c:5565

3935 +#: diff.c:5575

3936 msgid "moved lines of code are colored differently"

3937 msgstr ""

3938

3927 -#: diff.c:5568

3939 +#: diff.c:5578

3940 msgid "how white spaces are ignored in --color-moved"

3941 msgstr ""

3942

3931 -#: diff.c:5571

3943 +#: diff.c:5581

3944 #, fuzzy

3945 msgid "Other diff options"

3946 msgstr "Opções genéricas"

3947

3936 -#: diff.c:5573

3948 +#: diff.c:5583

3949 msgid "when run from subdir, exclude changes outside and show relative paths"

3950 msgstr ""

3951

3940 -#: diff.c:5577

3952 +#: diff.c:5587

3953 #, fuzzy

3954 msgid "treat all files as text"

3955 msgstr "processar ficheiros binários como texto"

3956

3945 -#: diff.c:5579

3957 +#: diff.c:5589

3958 msgid "swap two inputs, reverse the diff"

3959 msgstr ""

3960

3949 -#: diff.c:5581

3961 +#: diff.c:5591

3962 msgid "exit with 1 if there were differences, 0 otherwise"

3963 msgstr ""

3964

3953 -#: diff.c:5583

3965 +#: diff.c:5593

3966 msgid "disable all output of the program"

3967 msgstr ""

3968

3957 -#: diff.c:5585

3969 +#: diff.c:5595

3970 msgid "allow an external diff helper to be executed"

3971 msgstr ""

3972

3961 -#: diff.c:5587

3973 +#: diff.c:5597

3974 msgid "run external text conversion filters when comparing binary files"

3975 msgstr ""

3976

3965 -#: diff.c:5589

3977 +#: diff.c:5599

3978 #, fuzzy

3979 msgid "<when>"

3980 msgstr "quando"

3981

3970 -#: diff.c:5590

3982 +#: diff.c:5600

3983 #, fuzzy

3984 msgid "ignore changes to submodules in the diff generation"

3985 msgstr ""

3986 "ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "

3987 "(Predefinição: all)"

3988

3977 -#: diff.c:5593

3989 +#: diff.c:5603

3990 #, fuzzy

3991 msgid "<format>"

3992 msgstr "formato"

3993

3982 -#: diff.c:5594

3994 +#: diff.c:5604

3995 msgid "specify how differences in submodules are shown"

3996 msgstr ""

3997

3986 -#: diff.c:5598

3998 +#: diff.c:5608

3999 #, fuzzy

4000 msgid "hide 'git add -N' entries from the index"

4001 msgstr "usar .gitattributes apenas a partir do índice"

4002

3991 -#: diff.c:5601

4003 +#: diff.c:5611

4004 msgid "treat 'git add -N' entries as real in the index"

4005 msgstr ""

4006

3995 -#: diff.c:5603

4007 +#: diff.c:5613

4008 #, fuzzy

4009 msgid "<string>"

4010 msgstr "cadeia"

4011

4000 -#: diff.c:5604

4012 +#: diff.c:5614

4013 msgid ""

4014 "look for differences that change the number of occurrences of the specified "

4015 "string"

4016 msgstr ""

4017

4006 -#: diff.c:5607

4018 +#: diff.c:5617

4019 msgid ""

4020 "look for differences that change the number of occurrences of the specified "

4021 "regex"

4022 msgstr ""

4023

4012 -#: diff.c:5610

4024 +#: diff.c:5620

4025 #, fuzzy

4026 msgid "show all changes in the changeset with -S or -G"

4027 msgstr "mostrar ficheiros com correspondências no paginador"

4028

4017 -#: diff.c:5613

4029 +#: diff.c:5623

4030 #, fuzzy

4031 msgid "treat <string> in -S as extended POSIX regular expression"

4032 msgstr "usar expressões regulares estendidas do POSIX"

4033

4022 -#: diff.c:5616

4034 +#: diff.c:5626

4035 #, fuzzy

4036 msgid "control the order in which files appear in the output"

4037 msgstr "mostrar outros ficheiros na saída"

4038

4027 -#: diff.c:5617 diff.c:5620

4039 +#: diff.c:5627 diff.c:5630

4040 #, fuzzy

4041 msgid "<path>"

4042 msgstr "path"

4043

4032 -#: diff.c:5618

4044 +#: diff.c:5628

4045 #, fuzzy

4046 msgid "show the change in the specified path first"

4047 msgstr ""

4048 "escrever o ficheiro de índice do pacote na versão de formato especificada"

4049

4038 -#: diff.c:5621

4050 +#: diff.c:5631

4051 #, fuzzy

4052 msgid "skip the output to the specified path"

4053 msgstr "Repor a HEAD atual no estado especificado"

4054

4043 -#: diff.c:5623

4055 +#: diff.c:5633

4056 #, fuzzy

4057 msgid "<object-id>"

4058 msgstr "objeto"

4059

4048 -#: diff.c:5624

4060 +#: diff.c:5634

4061 msgid ""

4062 "look for differences that change the number of occurrences of the specified "

4063 "object"

4064 msgstr ""

4065

4054 -#: diff.c:5626

4066 +#: diff.c:5636

4067 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

4068 msgstr ""

4069

4058 -#: diff.c:5627

4070 +#: diff.c:5637

4071 msgid "select files by diff type"

4072 msgstr ""

4073

4062 -#: diff.c:5629

4074 +#: diff.c:5639

4075 #, fuzzy

4076 msgid "<file>"

4077 msgstr "ficheiro"

4078

4067 -#: diff.c:5630

4079 +#: diff.c:5640

4080 #, fuzzy

4081 msgid "Output to a specific file"

4082 msgstr "submeter somente os ficheiros especificados"

4083

4072 -#: diff.c:6287

4073 -msgid "inexact rename detection was skipped due to too many files."

4084 +#: diff.c:6298

4085 +#, fuzzy

4086 +msgid "exhaustive rename detection was skipped due to too many files."

4087 msgstr ""

4088 "a deteção mudança de nome inexata foi omitida devido a demasiados ficheiros."

4089

4077 -#: diff.c:6290

4090 +#: diff.c:6301

4091 msgid "only found copies from modified paths due to too many files."

4092 msgstr ""

4093 "só foram encontradas cópias de caminhos modificados devido a demasiados "

4094 "ficheiros."

4095

4083 -#: diff.c:6293

4096 +#: diff.c:6304

4097 #, c-format

4098 msgid ""

4099 "you may want to set your %s variable to at least %d and retry the command."

@@ -4092,7 +4105,7 @@ msgstr ""

4105 msgid "failed to read orderfile '%s'"

4106 msgstr "falha ao ler o ficheiro de comando '%s'"

4107

4095 -#: diffcore-rename.c:1418

4108 +#: diffcore-rename.c:1510

4109 msgid "Performing inexact rename detection"

4110 msgstr "Deteção de mudança de nome inexata em curso"

4111

@@ -4101,61 +4114,61 @@ msgstr "Deteção de mudança de nome inexata em curso"

4114 msgid "No such path '%s' in the diff"

4115 msgstr "path %s inexistente em %s"

4116

4104 -#: dir.c:578

4117 +#: dir.c:593

4118 #, fuzzy, c-format

4119 msgid "pathspec '%s' did not match any file(s) known to git"

4120 msgstr ""

4121 "especificador de path '%s' correspondeu a ficheiro nenhum conhecido pelo git"

4122

4110 -#: dir.c:718 dir.c:747 dir.c:760

4123 +#: dir.c:733 dir.c:762 dir.c:775

4124 #, fuzzy, c-format

4125 msgid "unrecognized pattern: '%s'"

4126 msgstr "padrão irreconhecível: '%s'"

4127

4115 -#: dir.c:777 dir.c:791

4128 +#: dir.c:792 dir.c:806

4129 #, fuzzy, c-format

4130 msgid "unrecognized negative pattern: '%s'"

4131 msgstr "por reconhecer padrão negativo: '%s'"

4132

4120 -#: dir.c:809

4133 +#: dir.c:824

4134 #, c-format

4135 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

4136 msgstr ""

4137

4125 -#: dir.c:819

4138 +#: dir.c:834

4139 msgid "disabling cone pattern matching"

4140 msgstr ""

4141

4129 -#: dir.c:1206

4142 +#: dir.c:1221

4143 #, fuzzy, c-format

4144 msgid "cannot use %s as an exclude file"

4145 msgstr "incapaz usar %s como ficheiro de exclusão"

4146

4134 -#: dir.c:2314

4147 +#: dir.c:2358

4148 #, fuzzy, c-format

4149 msgid "could not open directory '%s'"

4150 msgstr "incapaz abrir pasta '%s'"

4151

4139 -#: dir.c:2614

4152 +#: dir.c:2660

4153 msgid "failed to get kernel name and information"

4154 msgstr "falha ao obter nome e informação do kernel"

4155

4143 -#: dir.c:2738

4156 +#: dir.c:2784

4157 #, fuzzy

4158 msgid "untracked cache is disabled on this system or location"

4159 msgstr "cache untracked está desativada neste sistema ou localização."

4160

4148 -#: dir.c:3543

4161 +#: dir.c:3617

4162 #, fuzzy, c-format

4163 msgid "index file corrupt in repo %s"

4164 msgstr "ficheiro de índice corrompido"

4165

4153 -#: dir.c:3590 dir.c:3595

4166 +#: dir.c:3664 dir.c:3669

4167 #, c-format

4168 msgid "could not create directories for %s"

4169 msgstr "incapaz criar pasta para %s"

4170

4158 -#: dir.c:3624

4171 +#: dir.c:3698

4172 #, c-format

4173 msgid "could not migrate git directory from '%s' to '%s'"

4174 msgstr "incapaz migrar pasta git de '%s' para '%s'"

@@ -4165,12 +4178,12 @@ msgstr "incapaz migrar pasta git de '%s' para '%s'"

4178 msgid "hint: Waiting for your editor to close the file...%c"

4179 msgstr ""

4180

4168 -#: entry.c:179

4181 +#: entry.c:176

4182 #, fuzzy

4183 msgid "Filtering content"

4184 msgstr "imprimir conteúdo da tag"

4185

4173 -#: entry.c:500

4186 +#: entry.c:497

4187 #, c-format

4188 msgid "could not stat file '%s'"

4189 msgstr "incapaz obter estatutário de ficheiro '%s'"

@@ -4350,7 +4363,7 @@ msgstr "commits comuns nenhuns"

4363 msgid "source repository is shallow, reject to clone."

4364 msgstr "o repositório de origem é raso, --local ignorado"

4365

4353 -#: fetch-pack.c:1128 fetch-pack.c:1651

4366 +#: fetch-pack.c:1128 fetch-pack.c:1660

4367 msgid "git fetch-pack: fetch failed."

4368 msgstr "git fetch-pack: falha ao obter."

4369

@@ -4374,7 +4387,7 @@ msgstr "Servidor insustenta pedidos shallow"

4387 msgid "Server supports filter"

4388 msgstr "Servidor sustenta filtro"

4389

4377 -#: fetch-pack.c:1329 fetch-pack.c:2034

4390 +#: fetch-pack.c:1329 fetch-pack.c:2043

4391 #, fuzzy

4392 msgid "unable to write request to remote"

4393 msgstr "incapaz escrever pedidos para remoto"

@@ -4432,25 +4445,25 @@ msgstr ""

4445 msgid "git fetch-pack: expected response end packet"

4446 msgstr "git fetch-pack: esperava-se lista rasa"

4447

4435 -#: fetch-pack.c:1930

4448 +#: fetch-pack.c:1939

4449 msgid "no matching remote head"

4450 msgstr "corresponde a remote head nenhuma"

4451

4439 -#: fetch-pack.c:1953 builtin/clone.c:697

4452 +#: fetch-pack.c:1962 builtin/clone.c:697

4453 msgid "remote did not send all necessary objects"

4454 msgstr "remoto faltou enviar todos objetos necessários"

4455

4443 -#: fetch-pack.c:2056

4456 +#: fetch-pack.c:2065

4457 #, fuzzy

4458 msgid "unexpected 'ready' from remote"

4459 msgstr "fim de ficheiro inesperado"

4460

4448 -#: fetch-pack.c:2079

4461 +#: fetch-pack.c:2088

4462 #, c-format

4463 msgid "no such remote ref %s"

4464 msgstr "referência remota %s inexistente"

4465

4453 -#: fetch-pack.c:2082

4466 +#: fetch-pack.c:2091

4467 #, c-format

4468 msgid "Server does not allow request for unadvertised object %s"

4469 msgstr "Servidor proíbe pedido de objeto por anunciar %s"

@@ -4469,8 +4482,8 @@ msgid "gpg failed to sign the data"

4482 msgstr "gpg falhou assinar os dados"

4483

4484 #: graph.c:98

4472 -#, c-format

4473 -msgid "ignore invalid color '%.*s' in log.graphColors"

4485 +#, fuzzy, c-format

4486 +msgid "ignored invalid color '%.*s' in log.graphColors"

4487 msgstr "ignorar cor inválida '%.*s' em log.graphColors"

4488

4489 #: grep.c:531

@@ -4479,18 +4492,18 @@ msgid ""

4492 "with -P under PCRE v2"

4493 msgstr ""

4494

4482 -#: grep.c:1893

4495 +#: grep.c:1895

4496 #, c-format

4497 msgid "'%s': unable to read %s"

4498 msgstr "'%s': incapaz ler %s"

4499

4487 -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4500 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4501 #: builtin/rm.c:136

4502 #, c-format

4503 msgid "failed to stat '%s'"

4504 msgstr "falha ao invocar stat de '%s'"

4505

4493 -#: grep.c:1921

4506 +#: grep.c:1923

4507 #, c-format

4508 msgid "'%s': short read"

4509 msgstr "'%s': leitura truncada"

@@ -4727,7 +4740,7 @@ msgstr ""

4740

4741 #: list-objects-filter-options.c:105

4742 #, fuzzy, c-format

4730 -msgid "'%s' for 'object:type=<type>' isnot a valid object type"

4743 +msgid "'%s' for 'object:type=<type>' is not a valid object type"

4744 msgstr "'%s' em '%s' é carimbo de data/hora inválido"

4745

4746 #: list-objects-filter-options.c:124

@@ -4772,7 +4785,7 @@ msgstr ""

4785 msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4786 msgstr ""

4787

4775 -#: list-objects.c:395

4788 +#: list-objects.c:398

4789 #, fuzzy, c-format

4790 msgid "unable to load root tree for commit %s"

4791 msgstr "incapaz carregar raiz de árvore para commit %s"

@@ -4819,39 +4832,39 @@ msgstr ""

4832 msgid "bad action '%s' for '%s'"

4833 msgstr "incapaz copiar '%s' para '%s'"

4834

4822 -#: merge-ort.c:1116 merge-recursive.c:1205

4835 +#: merge-ort.c:1228 merge-recursive.c:1206

4836 #, fuzzy, c-format

4837 msgid "Failed to merge submodule %s (not checked out)"

4838 msgstr "Falha ao registar o submódulo '$sm_path'"

4839

4827 -#: merge-ort.c:1125 merge-recursive.c:1212

4840 +#: merge-ort.c:1237 merge-recursive.c:1213

4841 #, fuzzy, c-format

4842 msgid "Failed to merge submodule %s (commits not present)"

4843 msgstr "Falha ao registar o submódulo '$sm_path'"

4844

4832 -#: merge-ort.c:1134 merge-recursive.c:1219

4845 +#: merge-ort.c:1246 merge-recursive.c:1220

4846 #, c-format

4847 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4848 msgstr ""

4849

4837 -#: merge-ort.c:1144 merge-ort.c:1151

4850 +#: merge-ort.c:1256 merge-ort.c:1263

4851 #, fuzzy, c-format

4852 msgid "Note: Fast-forwarding submodule %s to %s"

4853 msgstr "Avanço-rápido para $sha1"

4854

4842 -#: merge-ort.c:1172

4855 +#: merge-ort.c:1284

4856 #, fuzzy, c-format

4857 msgid "Failed to merge submodule %s"

4858 msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"

4859

4847 -#: merge-ort.c:1179

4860 +#: merge-ort.c:1291

4861 #, fuzzy, c-format

4862 msgid ""

4863 "Failed to merge submodule %s, but a possible merge resolution exists:\n"

4864 "%s\n"

4865 msgstr "Falha ao registar o submódulo '$sm_path'"

4866

4854 -#: merge-ort.c:1183 merge-recursive.c:1273

4867 +#: merge-ort.c:1295 merge-recursive.c:1274

4868 #, c-format

4869 msgid ""

4870 "If this is correct simply add it to the index for example\n"

@@ -4862,42 +4875,42 @@ msgid ""

4875 "which will accept this suggestion.\n"

4876 msgstr ""

4877

4865 -#: merge-ort.c:1196

4878 +#: merge-ort.c:1308

4879 #, fuzzy, c-format

4880 msgid ""

4881 "Failed to merge submodule %s, but multiple possible merges exist:\n"

4882 "%s"

4883 msgstr "Falha ao registar o submódulo '$sm_path'"

4884

4872 -#: merge-ort.c:1415 merge-recursive.c:1362

4885 +#: merge-ort.c:1527 merge-recursive.c:1363

4886 msgid "Failed to execute internal merge"

4887 msgstr "Falha ao executar integração interna"

4888

4876 -#: merge-ort.c:1420 merge-recursive.c:1367

4889 +#: merge-ort.c:1532 merge-recursive.c:1368

4890 #, c-format

4891 msgid "Unable to add %s to database"

4892 msgstr "Incapaz de adicionar %s à base de dados"

4893

4881 -#: merge-ort.c:1427 merge-recursive.c:1400

4894 +#: merge-ort.c:1539 merge-recursive.c:1401

4895 #, c-format

4896 msgid "Auto-merging %s"

4897 msgstr "A integrar automaticamente %s"

4898

4886 -#: merge-ort.c:1566 merge-recursive.c:2122

4899 +#: merge-ort.c:1678 merge-recursive.c:2123

4900 #, c-format

4901 msgid ""

4902 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

4903 "implicit directory rename(s) putting the following path(s) there: %s."

4904 msgstr ""

4905

4893 -#: merge-ort.c:1576 merge-recursive.c:2132

4906 +#: merge-ort.c:1688 merge-recursive.c:2133

4907 #, c-format

4908 msgid ""

4909 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

4910 "implicit directory renames tried to put these paths there: %s"

4911 msgstr ""

4912

4900 -#: merge-ort.c:1634

4913 +#: merge-ort.c:1746

4914 #, c-format

4915 msgid ""

4916 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "

@@ -4905,49 +4918,49 @@ msgid ""

4918 "majority of the files."

4919 msgstr ""

4920

4908 -#: merge-ort.c:1788 merge-recursive.c:2468

4921 +#: merge-ort.c:1900 merge-recursive.c:2469

4922 #, c-format

4923 msgid ""

4924 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

4925 "renamed."

4926 msgstr ""

4927

4915 -#: merge-ort.c:1932 merge-recursive.c:3244

4928 +#: merge-ort.c:2044 merge-recursive.c:3252

4929 #, c-format

4930 msgid ""

4931 "Path updated: %s added in %s inside a directory that was renamed in %s; "

4932 "moving it to %s."

4933 msgstr ""

4934

4922 -#: merge-ort.c:1939 merge-recursive.c:3251

4935 +#: merge-ort.c:2051 merge-recursive.c:3259

4936 #, c-format

4937 msgid ""

4938 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

4939 "%s; moving it to %s."

4940 msgstr ""

4941

4929 -#: merge-ort.c:1952 merge-recursive.c:3247

4942 +#: merge-ort.c:2064 merge-recursive.c:3255

4943 #, c-format

4944 msgid ""

4945 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

4946 "in %s, suggesting it should perhaps be moved to %s."

4947 msgstr ""

4948

4936 -#: merge-ort.c:1960 merge-recursive.c:3254

4949 +#: merge-ort.c:2072 merge-recursive.c:3262

4950 #, c-format

4951 msgid ""

4952 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

4953 "was renamed in %s, suggesting it should perhaps be moved to %s."

4954 msgstr ""

4955

4943 -#: merge-ort.c:2103

4956 +#: merge-ort.c:2228

4957 #, fuzzy, c-format

4958 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

4959 msgstr ""

4960 "CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "

4961 "%s->%s em %s"

4962

4950 -#: merge-ort.c:2198

4963 +#: merge-ort.c:2323

4964 #, c-format

4965 msgid ""

4966 "CONFLICT (rename involved in collision): rename of %s -> %s has content "

@@ -4955,62 +4968,62 @@ msgid ""

4968 "markers."

4969 msgstr ""

4970

4958 -#: merge-ort.c:2217 merge-ort.c:2241

4971 +#: merge-ort.c:2342 merge-ort.c:2366

4972 #, fuzzy, c-format

4973 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

4974 msgstr ""

4975 "CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "

4976 "%s"

4977

4965 -#: merge-ort.c:2550 merge-recursive.c:3002

4978 +#: merge-ort.c:2819 merge-recursive.c:3013

4979 #, c-format

4980 msgid "cannot read object %s"

4981 msgstr "incapaz ler objeto %s"

4982

4970 -#: merge-ort.c:2553 merge-recursive.c:3005

4983 +#: merge-ort.c:2822 merge-recursive.c:3016

4984 #, c-format

4985 msgid "object %s is not a blob"

4986 msgstr "objeto %s é blob nenhum"

4987

4975 -#: merge-ort.c:2981

4988 +#: merge-ort.c:3250

4989 #, c-format

4990 msgid ""

4991 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

4992 "%s instead."

4993 msgstr ""

4994

4982 -#: merge-ort.c:3055

4995 +#: merge-ort.c:3326

4996 #, c-format

4997 msgid ""

4998 "CONFLICT (distinct types): %s had different types on each side; renamed both "

4999 "of them so each can be recorded somewhere."

5000 msgstr ""

5001

4989 -#: merge-ort.c:3062

5002 +#: merge-ort.c:3333

5003 #, c-format

5004 msgid ""

5005 "CONFLICT (distinct types): %s had different types on each side; renamed one "

5006 "of them so each can be recorded somewhere."

5007 msgstr ""

5008

4996 -#: merge-ort.c:3162 merge-recursive.c:3081

5009 +#: merge-ort.c:3433 merge-recursive.c:3092

5010 msgid "content"

5011 msgstr "conteúdo"

5012

5000 -#: merge-ort.c:3164 merge-recursive.c:3085

5013 +#: merge-ort.c:3435 merge-recursive.c:3096

5014 msgid "add/add"

5015 msgstr "adicionar/adicionar"

5016

5004 -#: merge-ort.c:3166 merge-recursive.c:3130

5017 +#: merge-ort.c:3437 merge-recursive.c:3141

5018 msgid "submodule"

5019 msgstr "submódulo"

5020

5008 -#: merge-ort.c:3168 merge-recursive.c:3131

5021 +#: merge-ort.c:3439 merge-recursive.c:3142

5022 #, c-format

5023 msgid "CONFLICT (%s): Merge conflict in %s"

5024 msgstr "CONFLITO (%s): conflito de integração em %s"

5025

5013 -#: merge-ort.c:3198

5026 +#: merge-ort.c:3470

5027 #, fuzzy, c-format

5028 msgid ""

5029 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

@@ -5019,7 +5032,7 @@ msgstr ""

5032 "CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "

5033 "deixada na árvore."

5034

5022 -#: merge-ort.c:3433

5035 +#: merge-ort.c:3757

5036 #, c-format

5037 msgid ""

5038 "Note: %s not up to date and in way of checking out conflicted version; old "

@@ -5029,12 +5042,12 @@ msgstr ""

5042 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

5043 #. base, and 2-3) the trees for the two trees we're merging.

5044 #.

5032 -#: merge-ort.c:3730

5045 +#: merge-ort.c:4116

5046 #, fuzzy, c-format

5047 msgid "collecting merge info failed for trees %s, %s, %s"

5048 msgstr "falha ao abrir '%s': %s"

5049

5037 -#: merge-ort-wrappers.c:13 merge-recursive.c:3699

5050 +#: merge-ort-wrappers.c:13 merge-recursive.c:3707

5051 #, fuzzy, c-format

5052 msgid ""

5053 "Your local changes to the following files would be overwritten by merge:\n"

@@ -5044,105 +5057,105 @@ msgstr ""

5057 "integrar:\n"

5058 "%%s"

5059

5047 -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402

5060 +#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402

5061 #, fuzzy

5062 msgid "Already up to date."

5063 msgstr "Já está atualizado."

5064

5052 -#: merge-recursive.c:356

5065 +#: merge-recursive.c:357

5066 msgid "(bad commit)\n"

5067 msgstr "(commit incorreto)\n"

5068

5056 -#: merge-recursive.c:379

5069 +#: merge-recursive.c:380

5070 #, fuzzy, c-format

5071 msgid "add_cacheinfo failed for path '%s'; merge aborting."

5072 msgstr "addinfo_cache falhou no caminho '%s'"

5073

5061 -#: merge-recursive.c:388

5074 +#: merge-recursive.c:389

5075 #, fuzzy, c-format

5076 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

5077 msgstr "addinfo_cache falhou no caminho '%s'"

5078

5066 -#: merge-recursive.c:876

5079 +#: merge-recursive.c:877

5080 #, c-format

5081 msgid "failed to create path '%s'%s"

5082 msgstr "falha ao criar o caminho '%s'%s"

5083

5071 -#: merge-recursive.c:887

5084 +#: merge-recursive.c:888

5085 #, c-format

5086 msgid "Removing %s to make room for subdirectory\n"

5087 msgstr "A remover %s para criar espaço para o subdiretório\n"

5088

5076 -#: merge-recursive.c:901 merge-recursive.c:920

5089 +#: merge-recursive.c:902 merge-recursive.c:921

5090 msgid ": perhaps a D/F conflict?"

5091 msgstr ": talvez um conflito D/F?"

5092

5080 -#: merge-recursive.c:910

5093 +#: merge-recursive.c:911

5094 #, c-format

5095 msgid "refusing to lose untracked file at '%s'"

5096 msgstr "recusando perder ficheiro untracked em '%s'"

5097

5085 -#: merge-recursive.c:951 builtin/cat-file.c:41

5098 +#: merge-recursive.c:952 builtin/cat-file.c:41

5099 #, c-format

5100 msgid "cannot read object %s '%s'"

5101 msgstr "incapaz ler objeto %s '%s'"

5102

5090 -#: merge-recursive.c:956

5103 +#: merge-recursive.c:957

5104 #, c-format

5105 msgid "blob expected for %s '%s'"

5106 msgstr "blob para %s '%s' esperado"

5107

5095 -#: merge-recursive.c:981

5108 +#: merge-recursive.c:982

5109 #, c-format

5110 msgid "failed to open '%s': %s"

5111 msgstr "falha ao abrir '%s': %s"

5112

5100 -#: merge-recursive.c:992

5113 +#: merge-recursive.c:993

5114 #, c-format

5115 msgid "failed to symlink '%s': %s"

5116 msgstr "falha ao criar a ligação simbólica '%s': %s"

5117

5105 -#: merge-recursive.c:997

5118 +#: merge-recursive.c:998

5119 #, c-format

5120 msgid "do not know what to do with %06o %s '%s'"

5121 msgstr "desconheço que fazer com %06o %s '%s'"

5122

5110 -#: merge-recursive.c:1227 merge-recursive.c:1239

5123 +#: merge-recursive.c:1228 merge-recursive.c:1240

5124 #, c-format

5125 msgid "Fast-forwarding submodule %s to the following commit:"

5126 msgstr ""

5127

5115 -#: merge-recursive.c:1230 merge-recursive.c:1242

5128 +#: merge-recursive.c:1231 merge-recursive.c:1243

5129 #, fuzzy, c-format

5130 msgid "Fast-forwarding submodule %s"

5131 msgstr "Avanço-rápido para $sha1"

5132

5120 -#: merge-recursive.c:1265

5133 +#: merge-recursive.c:1266

5134 #, c-format

5135 msgid "Failed to merge submodule %s (merge following commits not found)"

5136 msgstr ""

5137

5125 -#: merge-recursive.c:1269

5138 +#: merge-recursive.c:1270

5139 #, fuzzy, c-format

5140 msgid "Failed to merge submodule %s (not fast-forward)"

5141 msgstr "Falha ao registar o submódulo '$sm_path'"

5142

5130 -#: merge-recursive.c:1270

5143 +#: merge-recursive.c:1271

5144 msgid "Found a possible merge resolution for the submodule:\n"

5145 msgstr ""

5146

5134 -#: merge-recursive.c:1282

5147 +#: merge-recursive.c:1283

5148 #, c-format

5149 msgid "Failed to merge submodule %s (multiple merges found)"

5150 msgstr ""

5151

5139 -#: merge-recursive.c:1424

5152 +#: merge-recursive.c:1425

5153 #, fuzzy, c-format

5154 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

5155 msgstr ""

5156 "Erro: Recusando perder ficheiro untracked de '%s'; escrevendo invés para %s"

5157

5145 -#: merge-recursive.c:1496

5158 +#: merge-recursive.c:1497

5159 #, c-format

5160 msgid ""

5161 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -5151,7 +5164,7 @@ msgstr ""

5164 "CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "

5165 "deixada na árvore."

5166

5154 -#: merge-recursive.c:1501

5167 +#: merge-recursive.c:1502

5168 #, c-format

5169 msgid ""

5170 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -5160,7 +5173,7 @@ msgstr ""

5173 "CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s "

5174 "de %s deixada na árvore."

5175

5163 -#: merge-recursive.c:1508

5176 +#: merge-recursive.c:1509

5177 #, c-format

5178 msgid ""

5179 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -5169,7 +5182,7 @@ msgstr ""

5182 "CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "

5183 "deixada na árvore em %s."

5184

5172 -#: merge-recursive.c:1513

5185 +#: merge-recursive.c:1514

5186 #, c-format

5187 msgid ""

5188 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -5178,43 +5191,43 @@ msgstr ""

5191 "CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s "

5192 "de %s deixada na árvore em %s."

5193

5181 -#: merge-recursive.c:1548

5194 +#: merge-recursive.c:1549

5195 msgid "rename"

5196 msgstr "mudar nome"

5197

5185 -#: merge-recursive.c:1548

5198 +#: merge-recursive.c:1549

5199 msgid "renamed"

5200 msgstr "nome mudado"

5201

5189 -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158

5202 +#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169

5203 #, fuzzy, c-format

5204 msgid "Refusing to lose dirty file at %s"

5205 msgstr "Recusando perder ficheiro sujo de %s"

5206

5194 -#: merge-recursive.c:1609

5207 +#: merge-recursive.c:1610

5208 #, fuzzy, c-format

5209 msgid "Refusing to lose untracked file at %s, even though it's in the way."

5210 msgstr ""

5211 "Recusando perder ficheiro untracked de %s, apesar de este estar no caminho."

5212

5200 -#: merge-recursive.c:1667

5213 +#: merge-recursive.c:1668

5214 #, fuzzy, c-format

5215 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"

5216 msgstr ""

5217 "CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "

5218 "%s"

5219

5207 -#: merge-recursive.c:1698

5220 +#: merge-recursive.c:1699

5221 #, c-format

5222 msgid "%s is a directory in %s adding as %s instead"

5223 msgstr "%s é um diretório em %s adicionando %s no seu lugar"

5224

5212 -#: merge-recursive.c:1703

5225 +#: merge-recursive.c:1704

5226 #, fuzzy, c-format

5227 msgid "Refusing to lose untracked file at %s; adding as %s instead"

5228 msgstr "Recusando perder ficheiro untracked de %s; adicionado-o como %s invés"

5229

5217 -#: merge-recursive.c:1730

5230 +#: merge-recursive.c:1731

5231 #, c-format

5232 msgid ""

5233 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -5223,18 +5236,18 @@ msgstr ""

5236 "CONFLITO (mudar nome/mudar nome): Mudar o nome \"%s\"->\"%s\" no ramo \"%s\" "

5237 "mudar o nome \"%s\"->\"%s\" em \"%s\"%s"

5238

5226 -#: merge-recursive.c:1735

5239 +#: merge-recursive.c:1736

5240 msgid " (left unresolved)"

5241 msgstr " (por resolver)"

5242

5230 -#: merge-recursive.c:1827

5243 +#: merge-recursive.c:1828

5244 #, c-format

5245 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

5246 msgstr ""

5247 "CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "

5248 "%s->%s em %s"

5249

5237 -#: merge-recursive.c:2090

5250 +#: merge-recursive.c:2091

5251 #, c-format

5252 msgid ""

5253 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -5242,7 +5255,7 @@ msgid ""

5255 "getting a majority of the files."

5256 msgstr ""

5257

5245 -#: merge-recursive.c:2224

5258 +#: merge-recursive.c:2225

5259 #, fuzzy, c-format

5260 msgid ""

5261 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -5251,79 +5264,79 @@ msgstr ""

5264 "CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "

5265 "%s->%s em %s"

5266

5254 -#: merge-recursive.c:3069

5267 +#: merge-recursive.c:3080

5268 msgid "modify"

5269 msgstr "modificar"

5270

5258 -#: merge-recursive.c:3069

5271 +#: merge-recursive.c:3080

5272 msgid "modified"

5273 msgstr "modificado"

5274

5262 -#: merge-recursive.c:3108

5275 +#: merge-recursive.c:3119

5276 #, c-format

5277 msgid "Skipped %s (merged same as existing)"

5278 msgstr "%s ignorado (integrado é igual ao existente)"

5279

5267 -#: merge-recursive.c:3161

5280 +#: merge-recursive.c:3172

5281 #, c-format

5282 msgid "Adding as %s instead"

5283 msgstr "A adicionar como %s, em alternativa."

5284

5272 -#: merge-recursive.c:3368

5285 +#: merge-recursive.c:3376

5286 #, c-format

5287 msgid "Removing %s"

5288 msgstr "A remover %s"

5289

5277 -#: merge-recursive.c:3391

5290 +#: merge-recursive.c:3399

5291 msgid "file/directory"

5292 msgstr "ficheiro/diretório"

5293

5281 -#: merge-recursive.c:3396

5294 +#: merge-recursive.c:3404

5295 msgid "directory/file"

5296 msgstr "diretório/ficheiro"

5297

5285 -#: merge-recursive.c:3403

5298 +#: merge-recursive.c:3411

5299 #, c-format

5300 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

5301 msgstr ""

5302 "CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s"

5303

5291 -#: merge-recursive.c:3412

5304 +#: merge-recursive.c:3420

5305 #, c-format

5306 msgid "Adding %s"

5307 msgstr "A adicionar %s"

5308

5296 -#: merge-recursive.c:3421

5309 +#: merge-recursive.c:3429

5310 #, fuzzy, c-format

5311 msgid "CONFLICT (add/add): Merge conflict in %s"

5312 msgstr "CONFLITO (%s): conflito de integração em %s"

5313

5301 -#: merge-recursive.c:3474

5314 +#: merge-recursive.c:3482

5315 #, c-format

5316 msgid "merging of trees %s and %s failed"

5317 msgstr "falha ao integrar as árvores %s e %s"

5318

5306 -#: merge-recursive.c:3568

5319 +#: merge-recursive.c:3576

5320 msgid "Merging:"

5321 msgstr "A integrar:"

5322

5310 -#: merge-recursive.c:3581

5323 +#: merge-recursive.c:3589

5324 #, c-format

5325 msgid "found %u common ancestor:"

5326 msgid_plural "found %u common ancestors:"

5327 msgstr[0] "%u antecessor comum encontrado:"

5328 msgstr[1] "%u antecessores comuns encontrados:"

5329

5317 -#: merge-recursive.c:3631

5330 +#: merge-recursive.c:3639

5331 msgid "merge returned no commit"

5332 msgstr "junção retornou commit nenhum"

5333

5321 -#: merge-recursive.c:3796

5334 +#: merge-recursive.c:3804

5335 #, c-format

5336 msgid "Could not parse object '%s'"

5337 msgstr "Incapaz de analisar objeto '%s'"

5338

5326 -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900

5339 +#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900

5340 #: builtin/stash.c:473

5341 msgid "Unable to write index."

5342 msgstr "Incapaz de escrever no index."

@@ -5332,7 +5345,7 @@ msgstr "Incapaz de escrever no index."

5345 msgid "failed to read the cache"

5346 msgstr "falha ao ler a cache"

5347

5335 -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965

5348 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966

5349 #: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821

5350 #: builtin/stash.c:267

5351 msgid "unable to write new index file"

@@ -5408,112 +5421,120 @@ msgstr "falha ao abrir '%s'"

5421 msgid "failed to locate object %d in packfile"

5422 msgstr "Falha ao criar os ficheiros de saída"

5423

5411 -#: midx.c:880 builtin/index-pack.c:1535

5424 +#: midx.c:880 builtin/index-pack.c:1533

5425 #, fuzzy

5426 msgid "cannot store reverse index file"

5427 msgstr "incapaz guardar ficheiro index"

5428

5416 -#: midx.c:933

5429 +#: midx.c:920

5430 +msgid "ignoring existing multi-pack-index; checksum mismatch"

5431 +msgstr ""

5432 +

5433 +#: midx.c:943

5434 msgid "Adding packfiles to multi-pack-index"

5435 msgstr ""

5436

5420 -#: midx.c:979

5437 +#: midx.c:989

5438 #, c-format

5439 msgid "did not see pack-file %s to drop"

5440 msgstr ""

5441

5425 -#: midx.c:1024

5442 +#: midx.c:1034

5443 #, fuzzy, c-format

5444 msgid "unknown preferred pack: '%s'"

5445 msgstr "Subcomando desconhecido: %s"

5446

5430 -#: midx.c:1029

5447 +#: midx.c:1039

5448 #, fuzzy, c-format

5449 msgid "preferred pack '%s' is expired"

5450 msgstr "o repositório de referência '%s' está enxertado"

5451

5435 -#: midx.c:1045

5452 +#: midx.c:1055

5453 #, fuzzy

5454 msgid "no pack files to index."

5455 msgstr "pack files nenhuns para index."

5456

5440 -#: midx.c:1125 builtin/clean.c:37

5457 +#: midx.c:1135 builtin/clean.c:37

5458 #, c-format

5459 msgid "failed to remove %s"

5460 msgstr "falha ao remover %s"

5461

5445 -#: midx.c:1156

5462 +#: midx.c:1166

5463 #, fuzzy, c-format

5464 msgid "failed to clear multi-pack-index at %s"

5465 msgstr "falha ao limpar o índice"

5466

5450 -#: midx.c:1214

5467 +#: midx.c:1225

5468 msgid "multi-pack-index file exists, but failed to parse"

5469 msgstr ""

5470

5454 -#: midx.c:1222

5471 +#: midx.c:1233

5472 +msgid "incorrect checksum"

5473 +msgstr ""

5474 +

5475 +#: midx.c:1236

5476 msgid "Looking for referenced packfiles"

5477 msgstr ""

5478

5458 -#: midx.c:1237

5479 +#: midx.c:1251

5480 #, c-format

5481 msgid ""

5482 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5483 msgstr ""

5484

5464 -#: midx.c:1242

5485 +#: midx.c:1256

5486 msgid "the midx contains no oid"

5487 msgstr ""

5488

5468 -#: midx.c:1251

5489 +#: midx.c:1265

5490 msgid "Verifying OID order in multi-pack-index"

5491 msgstr ""

5492

5472 -#: midx.c:1260

5493 +#: midx.c:1274

5494 #, c-format

5495 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5496 msgstr ""

5497

5477 -#: midx.c:1280

5498 +#: midx.c:1294

5499 #, fuzzy

5500 msgid "Sorting objects by packfile"

5501 msgstr "A escrever objetos"

5502

5482 -#: midx.c:1287

5503 +#: midx.c:1301

5504 #, fuzzy

5505 msgid "Verifying object offsets"

5506 msgstr "A escrever objetos"

5507

5487 -#: midx.c:1303

5508 +#: midx.c:1317

5509 #, fuzzy, c-format

5510 msgid "failed to load pack entry for oid[%d] = %s"

5511 msgstr "falhou carregar entrada pack para oid[%d] = %s"

5512

5492 -#: midx.c:1309

5513 +#: midx.c:1323

5514 #, fuzzy, c-format

5515 msgid "failed to load pack-index for packfile %s"

5516 msgstr "falha ao ler o ficheiro de comando '%s'"

5517

5497 -#: midx.c:1318

5518 +#: midx.c:1332

5519 #, c-format

5520 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5521 msgstr ""

5522

5502 -#: midx.c:1343

5523 +#: midx.c:1357

5524 #, fuzzy

5525 msgid "Counting referenced objects"

5526 msgstr "Contando objetos referenciados"

5527

5507 -#: midx.c:1353

5528 +#: midx.c:1367

5529 msgid "Finding and deleting unreferenced packfiles"

5530 msgstr ""

5531

5511 -#: midx.c:1544

5532 +#: midx.c:1558

5533 #, fuzzy

5534 msgid "could not start pack-objects"

5535 msgstr "incapaz de começar pack-objects"

5536

5516 -#: midx.c:1564

5537 +#: midx.c:1578

5538 #, fuzzy

5539 msgid "could not finish pack-objects"

5540 msgstr "incapaz de terminar pack-objects"

@@ -5579,277 +5600,277 @@ msgstr "Valor incorreto de %s: '%s'"

5600 msgid "object directory %s does not exist; check .git/objects/info/alternates"

5601 msgstr ""

5602

5582 -#: object-file.c:577

5603 +#: object-file.c:584

5604 #, fuzzy, c-format

5605 msgid "unable to normalize alternate object path: %s"

5606 msgstr "incapaz normalizar path de objeto alternativo: %s"

5607

5587 -#: object-file.c:649

5608 +#: object-file.c:658

5609 #, c-format

5610 msgid "%s: ignoring alternate object stores, nesting too deep"

5611 msgstr ""

5612

5592 -#: object-file.c:656

5613 +#: object-file.c:665

5614 #, fuzzy, c-format

5615 msgid "unable to normalize object directory: %s"

5616 msgstr "incapaz normalizar pasta de objeto: %s"

5617

5597 -#: object-file.c:699

5618 +#: object-file.c:708

5619 #, fuzzy

5620 msgid "unable to fdopen alternates lockfile"

5621 msgstr "incapaz de fdopen lockfile alternativo"

5622

5602 -#: object-file.c:717

5623 +#: object-file.c:726

5624 #, fuzzy

5625 msgid "unable to read alternates file"

5626 msgstr "incapaz ler ficheiro alternativo"

5627

5607 -#: object-file.c:724

5628 +#: object-file.c:733

5629 #, fuzzy

5630 msgid "unable to move new alternates file into place"

5631 msgstr "incapaz mover novo ficheiro alternativo para o sítio"

5632

5612 -#: object-file.c:759

5633 +#: object-file.c:768

5634 #, c-format

5635 msgid "path '%s' does not exist"

5636 msgstr "caminho '%s' é inexistente"

5637

5617 -#: object-file.c:780

5638 +#: object-file.c:789

5639 #, c-format

5640 msgid "reference repository '%s' as a linked checkout is not supported yet."

5641 msgstr ""

5642 "repositório referência '%s' como uma checkout ligada ainda é insustentado."

5643

5623 -#: object-file.c:786

5644 +#: object-file.c:795

5645 #, c-format

5646 msgid "reference repository '%s' is not a local repository."

5647 msgstr "repositório referência '%s' é repositório local nenhum."

5648

5628 -#: object-file.c:792

5649 +#: object-file.c:801

5650 #, c-format

5651 msgid "reference repository '%s' is shallow"

5652 msgstr "o repositório de referência '%s' é raso"

5653

5633 -#: object-file.c:800

5654 +#: object-file.c:809

5655 #, c-format

5656 msgid "reference repository '%s' is grafted"

5657 msgstr "o repositório de referência '%s' está enxertado"

5658

5638 -#: object-file.c:860

5659 +#: object-file.c:869

5660 #, c-format

5661 msgid "invalid line while parsing alternate refs: %s"

5662 msgstr ""

5663

5643 -#: object-file.c:1010

5664 +#: object-file.c:1019

5665 #, c-format

5666 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5667 msgstr ""

5668

5648 -#: object-file.c:1031

5649 -#, fuzzy

5650 -msgid "mmap failed"

5669 +#: object-file.c:1054

5670 +#, fuzzy, c-format

5671 +msgid "mmap failed%s"

5672 msgstr "%s falhou"

5673

5653 -#: object-file.c:1195

5674 +#: object-file.c:1218

5675 #, fuzzy, c-format

5676 msgid "object file %s is empty"

5677 msgstr "objeto local %s corrompido"

5678

5658 -#: object-file.c:1330 object-file.c:2524

5679 +#: object-file.c:1353 object-file.c:2548

5680 #, fuzzy, c-format

5681 msgid "corrupt loose object '%s'"

5682 msgstr "objeto solto '%s' corrupto"

5683

5663 -#: object-file.c:1332 object-file.c:2528

5684 +#: object-file.c:1355 object-file.c:2552

5685 #, fuzzy, c-format

5686 msgid "garbage at end of loose object '%s'"

5687 msgstr "lixo no fim de objeto solto '%s'"

5688

5668 -#: object-file.c:1374

5689 +#: object-file.c:1397

5690 #, fuzzy

5691 msgid "invalid object type"

5692 msgstr "tipo de objeto incorreto."

5693

5673 -#: object-file.c:1458

5694 +#: object-file.c:1481

5695 #, c-format

5696 msgid "unable to unpack %s header with --allow-unknown-type"

5697 msgstr ""

5698

5678 -#: object-file.c:1461

5699 +#: object-file.c:1484

5700 #, fuzzy, c-format

5701 msgid "unable to unpack %s header"

5702 msgstr "incapaz desempacotar cabeçalho %s"

5703

5683 -#: object-file.c:1467

5704 +#: object-file.c:1490

5705 #, c-format

5706 msgid "unable to parse %s header with --allow-unknown-type"

5707 msgstr ""

5708

5688 -#: object-file.c:1470

5709 +#: object-file.c:1493

5710 #, fuzzy, c-format

5711 msgid "unable to parse %s header"

5712 msgstr "incapaz processar cabeçalho %s"

5713

5693 -#: object-file.c:1697

5714 +#: object-file.c:1717

5715 #, fuzzy, c-format

5716 msgid "failed to read object %s"

5717 msgstr "falha ao ler o objeto '%s'."

5718

5698 -#: object-file.c:1701

5719 +#: object-file.c:1721

5720 #, fuzzy, c-format

5721 msgid "replacement %s not found for %s"

5722 msgstr "%s substituto, por encontrar para %s"

5723

5703 -#: object-file.c:1705

5724 +#: object-file.c:1725

5725 #, fuzzy, c-format

5726 msgid "loose object %s (stored in %s) is corrupt"

5727 msgstr "objeto local %s corrompido"

5728

5708 -#: object-file.c:1709

5729 +#: object-file.c:1729

5730 #, fuzzy, c-format

5731 msgid "packed object %s (stored in %s) is corrupt"

5732 msgstr "objeto local %s corrompido"

5733

5713 -#: object-file.c:1814

5734 +#: object-file.c:1834

5735 #, fuzzy, c-format

5736 msgid "unable to write file %s"

5737 msgstr "incapaz escrever ficheiro %s"

5738

5718 -#: object-file.c:1821

5739 +#: object-file.c:1841

5740 #, fuzzy, c-format

5741 msgid "unable to set permission to '%s'"

5742 msgstr "incapaz definir permissão para '%s'"

5743

5723 -#: object-file.c:1828

5744 +#: object-file.c:1848

5745 #, fuzzy

5746 msgid "file write error"

5747 msgstr "falha ao escrever para rev-list"

5748

5728 -#: object-file.c:1848

5749 +#: object-file.c:1868

5750 #, fuzzy

5751 msgid "error when closing loose object file"

5752 msgstr "erro ao fechar ficheiro de pacote"

5753

5733 -#: object-file.c:1913

5754 +#: object-file.c:1933

5755 #, c-format

5756 msgid "insufficient permission for adding an object to repository database %s"

5757 msgstr ""

5758

5738 -#: object-file.c:1915

5759 +#: object-file.c:1935

5760 #, fuzzy

5761 msgid "unable to create temporary file"

5762 msgstr "incapaz criar ficheiro temporário"

5763

5743 -#: object-file.c:1939

5764 +#: object-file.c:1959

5765 #, fuzzy

5766 msgid "unable to write loose object file"

5767 msgstr "incapaz escrever ficheiro objeto solto"

5768

5748 -#: object-file.c:1945

5769 +#: object-file.c:1965

5770 #, fuzzy, c-format

5771 msgid "unable to deflate new object %s (%d)"

5772 msgstr "incapaz esvaziar objeto novo %s (%d)"

5773

5753 -#: object-file.c:1949

5774 +#: object-file.c:1969

5775 #, fuzzy, c-format

5776 msgid "deflateEnd on object %s failed (%d)"

5777 msgstr "falha de fstat de %s"

5778

5758 -#: object-file.c:1953

5779 +#: object-file.c:1973

5780 #, c-format

5781 msgid "confused by unstable object source data for %s"

5782 msgstr ""

5783

5763 -#: object-file.c:1963 builtin/pack-objects.c:1097

5784 +#: object-file.c:1983 builtin/pack-objects.c:1237

5785 #, fuzzy, c-format

5786 msgid "failed utime() on %s"

5787 msgstr "falha ao abrir '%s'"

5788

5768 -#: object-file.c:2040

5789 +#: object-file.c:2060

5790 #, fuzzy, c-format

5791 msgid "cannot read object for %s"

5792 msgstr "incapaz ler objeto para %s"

5793

5773 -#: object-file.c:2091

5794 +#: object-file.c:2111

5795 #, fuzzy

5796 msgid "corrupt commit"

5797 msgstr "substituir autor do commit"

5798

5778 -#: object-file.c:2099

5799 +#: object-file.c:2119

5800 #, fuzzy

5801 msgid "corrupt tag"

5802 msgstr "mostrar tags"

5803

5783 -#: object-file.c:2199

5804 +#: object-file.c:2219

5805 #, c-format

5806 msgid "read error while indexing %s"

5807 msgstr ""

5808

5788 -#: object-file.c:2202

5809 +#: object-file.c:2222

5810 #, fuzzy, c-format

5811 msgid "short read while indexing %s"

5812 msgstr "leitura curta enquanto indexando %s"

5813

5793 -#: object-file.c:2275 object-file.c:2285

5814 +#: object-file.c:2295 object-file.c:2305

5815 #, fuzzy, c-format

5816 msgid "%s: failed to insert into database"

5817 msgstr "%s: falhou inserir na base de dados"

5818

5798 -#: object-file.c:2291

5819 +#: object-file.c:2311

5820 #, fuzzy, c-format

5821 msgid "%s: unsupported file type"

5822 msgstr "%s: tipo ficheiro insustentado"

5823

5803 -#: object-file.c:2315

5824 +#: object-file.c:2335

5825 #, fuzzy, c-format

5826 msgid "%s is not a valid object"

5827 msgstr "%s é objeto inválido"

5828

5808 -#: object-file.c:2317

5829 +#: object-file.c:2337

5830 #, c-format

5831 msgid "%s is not a valid '%s' object"

5832 msgstr "%s é um objeto inválido '%s'"

5833

5813 -#: object-file.c:2344 builtin/index-pack.c:192

5834 +#: object-file.c:2364 builtin/index-pack.c:192

5835 #, c-format

5836 msgid "unable to open %s"

5837 msgstr "incapaz abrir %s"

5838

5818 -#: object-file.c:2535 object-file.c:2588

5839 +#: object-file.c:2559 object-file.c:2612

5840 #, c-format

5841 msgid "hash mismatch for %s (expected %s)"

5842 msgstr ""

5843

5823 -#: object-file.c:2559

5844 +#: object-file.c:2583

5845 #, fuzzy, c-format

5846 msgid "unable to mmap %s"

5847 msgstr "incapaz mmap %s"

5848

5828 -#: object-file.c:2564

5849 +#: object-file.c:2588

5850 #, fuzzy, c-format

5851 msgid "unable to unpack header of %s"

5852 msgstr "incapaz desempacotar cabeçalho de %s"

5853

5833 -#: object-file.c:2570

5854 +#: object-file.c:2594

5855 #, fuzzy, c-format

5856 msgid "unable to parse header of %s"

5857 msgstr "incapaz processar cabeçalho de %s"

5858

5838 -#: object-file.c:2581

5859 +#: object-file.c:2605

5860 #, fuzzy, c-format

5861 msgid "unable to unpack contents of %s"

5862 msgstr "incapaz desempacotar conteúdo de %s"

5863

5843 -#: object-name.c:486

5864 +#: object-name.c:480

5865 #, fuzzy, c-format

5866 msgid "short object ID %s is ambiguous"

5867 msgstr "SHA1 curto %s é ambíguo"

5868

5848 -#: object-name.c:497

5869 +#: object-name.c:491

5870 msgid "The candidates are:"

5871 msgstr "Os candidatos são:"

5872

5852 -#: object-name.c:796

5873 +#: object-name.c:790

5874 #, fuzzy

5875 msgid ""

5876 "Git normally never creates a ref that ends with 40 hex characters\n"

@@ -5872,65 +5893,65 @@ msgstr ""

5893 "examine estas refs e talvez apague-as. Desative esta mensagem\n"

5894 "executando \"git config advice.objectNameWarning false\""

5895

5875 -#: object-name.c:916

5896 +#: object-name.c:910

5897 #, c-format

5898 msgid "log for '%.*s' only goes back to %s"

5899 msgstr ""

5900

5880 -#: object-name.c:924

5901 +#: object-name.c:918

5902 #, c-format

5903 msgid "log for '%.*s' only has %d entries"

5904 msgstr ""

5905

5885 -#: object-name.c:1702

5906 +#: object-name.c:1696

5907 #, fuzzy, c-format

5908 msgid "path '%s' exists on disk, but not in '%.*s'"

5909 msgstr "O caminho '%s' está dentro do submódulo '%.*s'"

5910

5890 -#: object-name.c:1708

5911 +#: object-name.c:1702

5912 #, c-format

5913 msgid ""

5914 "path '%s' exists, but not '%s'\n"

5915 "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"

5916 msgstr ""

5917

5897 -#: object-name.c:1717

5918 +#: object-name.c:1711

5919 #, fuzzy, c-format

5920 msgid "path '%s' does not exist in '%.*s'"

5921 msgstr "caminho '%s' é inexistente em '%.*s'"

5922

5902 -#: object-name.c:1745

5923 +#: object-name.c:1739

5924 #, c-format

5925 msgid ""

5926 "path '%s' is in the index, but not at stage %d\n"

5927 "hint: Did you mean ':%d:%s'?"

5928 msgstr ""

5929

5909 -#: object-name.c:1761

5930 +#: object-name.c:1755

5931 #, c-format

5932 msgid ""

5933 "path '%s' is in the index, but not '%s'\n"

5934 "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"

5935 msgstr ""

5936

5916 -#: object-name.c:1769

5937 +#: object-name.c:1763

5938 #, c-format

5939 msgid "path '%s' exists on disk, but not in the index"

5940 msgstr ""

5941

5921 -#: object-name.c:1771

5942 +#: object-name.c:1765

5943 #, fuzzy, c-format

5944 msgid "path '%s' does not exist (neither on disk nor in the index)"

5945 msgstr "caminho '%s' é inexistente (quer no disco quer no index)"

5946

5926 -#: object-name.c:1784

5947 +#: object-name.c:1778

5948 #, fuzzy

5949 msgid "relative path syntax can't be used outside working tree"

5950 msgstr ""

5951 "Os caminhos relativos só podem ser usados a partir do topo da árvore de "

5952 "trabalho"

5953

5933 -#: object-name.c:1922

5954 +#: object-name.c:1916

5955 #, fuzzy, c-format

5956 msgid "invalid object name '%.*s'."

5957 msgstr "Nome de objeto inválido: '%s'."

@@ -5945,27 +5966,27 @@ msgstr "objeto blob inválido %s"

5966 msgid "object %s is a %s, not a %s"

5967 msgstr "objeto %s é %s, é %s nenhum(a)"

5968

5948 -#: object.c:232

5969 +#: object.c:250

5970 #, fuzzy, c-format

5971 msgid "object %s has unknown type id %d"

5972 msgstr "objeto de tipo desconhecido"

5973

5953 -#: object.c:245

5974 +#: object.c:263

5975 #, c-format

5976 msgid "unable to parse object: %s"

5977 msgstr "incapaz analisar objeto: %s"

5978

5958 -#: object.c:265 object.c:277

5979 +#: object.c:283 object.c:295

5980 #, c-format

5981 msgid "hash mismatch %s"

5982 msgstr ""

5983

5963 -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251

5984 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411

5985 #, fuzzy, c-format

5986 msgid "unable to get size of %s"

5987 msgstr "incapaz obter tamanho de %s"

5988

5968 -#: pack-bitmap.c:1547 builtin/rev-list.c:92

5989 +#: pack-bitmap.c:1571 builtin/rev-list.c:92

5990 #, fuzzy, c-format

5991 msgid "unable to get disk usage of %s"

5992 msgstr "incapaz obter tamanho de %s"

@@ -6019,12 +6040,17 @@ msgstr "incapaz escrever '%s'"

6040 msgid "offset before end of packfile (broken .idx?)"

6041 msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"

6042

6022 -#: packfile.c:1937

6043 +#: packfile.c:655

6044 +#, fuzzy, c-format

6045 +msgid "packfile %s cannot be mapped%s"

6046 +msgstr "objeto %s incapaz ser lido"

6047 +

6048 +#: packfile.c:1934

6049 #, c-format

6050 msgid "offset before start of pack index for %s (corrupt index?)"

6051 msgstr "offset antes do início do índice do pacote %s (índice corrompido?)"

6052

6027 -#: packfile.c:1941

6053 +#: packfile.c:1938

6054 #, c-format

6055 msgid "offset beyond end of pack index for %s (truncated index?)"

6056 msgstr "offset depois do fim do índice do pacote %s (índice truncado?)"

@@ -6232,8 +6258,8 @@ msgstr "incapaz escrever pacote delim"

6258

6259 #: pkt-line.c:106

6260 #, fuzzy

6235 -msgid "unable to write stateless separator packet"

6236 -msgstr "incapaz escrever pacote de separador sem estado"

6261 +msgid "unable to write response end packet"

6262 +msgstr "incapaz escrever pacote flush"

6263

6264 #: pkt-line.c:113

6265 #, fuzzy

@@ -6297,19 +6323,19 @@ msgstr "incapaz criar thread de lstat: %s"

6323 msgid "unable to parse --pretty format"

6324 msgstr "incapaz analisar formato de --pretty"

6325

6300 -#: promisor-remote.c:30

6326 +#: promisor-remote.c:31

6327 msgid "promisor-remote: unable to fork off fetch subprocess"

6328 msgstr ""

6329

6304 -#: promisor-remote.c:35 promisor-remote.c:37

6330 +#: promisor-remote.c:38 promisor-remote.c:40

6331 msgid "promisor-remote: could not write to fetch subprocess"

6332 msgstr ""

6333

6308 -#: promisor-remote.c:41

6334 +#: promisor-remote.c:44

6335 msgid "promisor-remote: could not close stdin to fetch subprocess"

6336 msgstr ""

6337

6312 -#: promisor-remote.c:53

6338 +#: promisor-remote.c:54

6339 #, c-format

6340 msgid "promisor remote name cannot begin with '/': %s"

6341 msgstr ""

@@ -6333,7 +6359,7 @@ msgstr "incapaz começar `log`"

6359 msgid "could not read `log` output"

6360 msgstr "incapaz ler output de `log`"

6361

6336 -#: range-diff.c:101 sequencer.c:5551

6362 +#: range-diff.c:101 sequencer.c:5550

6363 #, fuzzy, c-format

6364 msgid "could not parse commit '%s'"

6365 msgstr "incapaz analisar commit '%s'"

@@ -6350,67 +6376,67 @@ msgstr ""

6376 msgid "could not parse git header '%.*s'"

6377 msgstr "incapaz analisar cabeçalho git '%.*s'"

6378

6353 -#: range-diff.c:306

6379 +#: range-diff.c:307

6380 #, fuzzy

6381 msgid "failed to generate diff"

6382 msgstr "falha ao criar o ficheiro %s"

6383

6358 -#: range-diff.c:558

6384 +#: range-diff.c:559

6385 #, fuzzy

6386 msgid "--left-only and --right-only are mutually exclusive"

6387 msgstr "-b, -B e --orphan são mutuamente exclusivos"

6388

6363 -#: range-diff.c:561 range-diff.c:563

6389 +#: range-diff.c:562 range-diff.c:564

6390 #, fuzzy, c-format

6391 msgid "could not parse log for '%s'"

6392 msgstr "incapaz analisar log para '%s'"

6393

6368 -#: read-cache.c:708

6394 +#: read-cache.c:710

6395 #, fuzzy, c-format

6396 msgid "will not add file alias '%s' ('%s' already exists in index)"

6397 msgstr "%s: já existe no índice"

6398

6373 -#: read-cache.c:724

6399 +#: read-cache.c:726

6400 #, fuzzy

6401 msgid "cannot create an empty blob in the object database"

6402 msgstr "escrever o objeto na base de dados de objetos"

6403

6378 -#: read-cache.c:746

6404 +#: read-cache.c:748

6405 #, c-format

6406 msgid "%s: can only add regular files, symbolic links or git-directories"

6407 msgstr ""

6408

6383 -#: read-cache.c:751

6409 +#: read-cache.c:753

6410 #, fuzzy, c-format

6411 msgid "'%s' does not have a commit checked out"

6412 msgstr "'%s' tem commit checked out nenhum"

6413

6388 -#: read-cache.c:803

6414 +#: read-cache.c:805

6415 #, fuzzy, c-format

6416 msgid "unable to index file '%s'"

6417 msgstr "incapaz indexar ficheiro '%s'"

6418

6393 -#: read-cache.c:822

6419 +#: read-cache.c:824

6420 #, fuzzy, c-format

6421 msgid "unable to add '%s' to index"

6422 msgstr "incapaz adicionar %s a index"

6423

6398 -#: read-cache.c:833

6424 +#: read-cache.c:835

6425 #, fuzzy, c-format

6426 msgid "unable to stat '%s'"

6427 msgstr "incapaz obter estatutário de '%s'"

6428

6403 -#: read-cache.c:1356

6429 +#: read-cache.c:1358

6430 #, fuzzy, c-format

6431 msgid "'%s' appears as both a file and as a directory"

6432 msgstr "'%s' aparece ambo como ficheiro e como pasta"

6433

6408 -#: read-cache.c:1571

6434 +#: read-cache.c:1573

6435 #, fuzzy

6436 msgid "Refresh index"

6437 msgstr "Refresca index"

6438

6413 -#: read-cache.c:1700

6439 +#: read-cache.c:1705

6440 #, c-format

6441 msgid ""

6442 "index.version set, but the value is invalid.\n"

@@ -6419,7 +6445,7 @@ msgstr ""

6445 "index.version definido, mas com valor inválido.\n"

6446 "A usar a versão %i"

6447

6422 -#: read-cache.c:1710

6448 +#: read-cache.c:1715

6449 #, c-format

6450 msgid ""

6451 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -6428,145 +6454,145 @@ msgstr ""

6454 "GIT_INDEX_VERSION definido, mas com valor inválido.\n"

6455 "A usar a versão %i"

6456

6431 -#: read-cache.c:1766

6457 +#: read-cache.c:1771

6458 #, fuzzy, c-format

6459 msgid "bad signature 0x%08x"

6460 msgstr "adicionar uma assinatura"

6461

6436 -#: read-cache.c:1769

6462 +#: read-cache.c:1774

6463 #, fuzzy, c-format

6464 msgid "bad index version %d"

6465 msgstr "versão de índice '%s' incorreta"

6466

6441 -#: read-cache.c:1778

6467 +#: read-cache.c:1783

6468 #, fuzzy

6469 msgid "bad index file sha1 signature"

6470 msgstr "adicionar uma assinatura"

6471

6446 -#: read-cache.c:1812

6472 +#: read-cache.c:1817

6473 #, c-format

6474 msgid "index uses %.4s extension, which we do not understand"

6475 msgstr ""

6476

6451 -#: read-cache.c:1814

6477 +#: read-cache.c:1819

6478 #, fuzzy, c-format

6479 msgid "ignoring %.4s extension"

6480 msgstr "modelo %s ignorado"

6481

6456 -#: read-cache.c:1851

6482 +#: read-cache.c:1856

6483 #, fuzzy, c-format

6484 msgid "unknown index entry format 0x%08x"

6485 msgstr "formato de %.*s desconhecido %s"

6486

6461 -#: read-cache.c:1867

6487 +#: read-cache.c:1872

6488 #, c-format

6489 msgid "malformed name field in the index, near path '%s'"

6490 msgstr ""

6491

6466 -#: read-cache.c:1924

6492 +#: read-cache.c:1929

6493 msgid "unordered stage entries in index"

6494 msgstr ""

6495

6470 -#: read-cache.c:1927

6496 +#: read-cache.c:1932

6497 #, fuzzy, c-format

6498 msgid "multiple stage entries for merged file '%s'"

6499 msgstr "multíplas entradas de estágio para ficheiro juntado '%s'"

6500

6475 -#: read-cache.c:1930

6501 +#: read-cache.c:1935

6502 #, fuzzy, c-format

6503 msgid "unordered stage entries for '%s'"

6504 msgstr "entradas de estágio desordenadas para '%s'"

6505

6480 -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095

6481 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183

6482 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991

6506 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095

6507 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183

6508 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987

6509 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505

6510 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291

6485 -#: builtin/submodule--helper.c:332

6511 +#: builtin/submodule--helper.c:331

6512 msgid "index file corrupt"

6513 msgstr "ficheiro de índice corrompido"

6514

6489 -#: read-cache.c:2180

6515 +#: read-cache.c:2185

6516 #, fuzzy, c-format

6517 msgid "unable to create load_cache_entries thread: %s"

6518 msgstr "incapaz criar thread load_cache_entries: %s"

6519

6494 -#: read-cache.c:2193

6520 +#: read-cache.c:2198

6521 #, fuzzy, c-format

6522 msgid "unable to join load_cache_entries thread: %s"

6523 msgstr "incapaz juntar a thread load_cache_entries: %s"

6524

6499 -#: read-cache.c:2226

6525 +#: read-cache.c:2231

6526 #, fuzzy, c-format

6527 msgid "%s: index file open failed"

6528 msgstr "falha ao adicionar ficheiros"

6529

6504 -#: read-cache.c:2230

6530 +#: read-cache.c:2235

6531 #, fuzzy, c-format

6532 msgid "%s: cannot stat the open index"

6533 msgstr "%s: incapaz obter estatutário de index aberto"

6534

6509 -#: read-cache.c:2234

6535 +#: read-cache.c:2239

6536 #, c-format

6537 msgid "%s: index file smaller than expected"

6538 msgstr ""

6539

6514 -#: read-cache.c:2238

6540 +#: read-cache.c:2243

6541 #, fuzzy, c-format

6516 -msgid "%s: unable to map index file"

6542 +msgid "%s: unable to map index file%s"

6543 msgstr "%s: incapaz mapear ficheiro index"

6544

6519 -#: read-cache.c:2280

6545 +#: read-cache.c:2286

6546 #, fuzzy, c-format

6547 msgid "unable to create load_index_extensions thread: %s"

6548 msgstr "incapaz criar thread load_index_extensions: %s"

6549

6524 -#: read-cache.c:2307

6550 +#: read-cache.c:2313

6551 #, fuzzy, c-format

6552 msgid "unable to join load_index_extensions thread: %s"

6553 msgstr "incapaz juntar a thread load_index_extensions: %s"

6554

6529 -#: read-cache.c:2345

6555 +#: read-cache.c:2351

6556 #, fuzzy, c-format

6557 msgid "could not freshen shared index '%s'"

6558 msgstr "incapaz refrescar index partilhado '%s'"

6559

6534 -#: read-cache.c:2392

6560 +#: read-cache.c:2398

6561 #, c-format

6562 msgid "broken index, expect %s in %s, got %s"

6563 msgstr ""

6564

6539 -#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145

6565 +#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145

6566 #, c-format

6567 msgid "could not close '%s'"

6568 msgstr "incapaz fechar '%s'"

6569

6544 -#: read-cache.c:3138

6570 +#: read-cache.c:3074

6571 #, fuzzy

6572 msgid "failed to convert to a sparse-index"

6573 msgstr "falha ao limpar o índice"

6574

6549 -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441

6575 +#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440

6576 #, fuzzy, c-format

6577 msgid "could not stat '%s'"

6578 msgstr "incapaz obter estatutário '%s'"

6579

6554 -#: read-cache.c:3222

6580 +#: read-cache.c:3158

6581 #, c-format

6582 msgid "unable to open git dir: %s"

6583 msgstr "incapaz abrir pasta git: %s"

6584

6559 -#: read-cache.c:3234

6585 +#: read-cache.c:3170

6586 #, c-format

6587 msgid "unable to unlink: %s"

6588 msgstr "incapaz deslinkar: %s"

6589

6564 -#: read-cache.c:3263

6590 +#: read-cache.c:3199

6591 #, fuzzy, c-format

6592 msgid "cannot fix permission bits on '%s'"

6593 msgstr "incapaz arranjar bits de permissão em '%s'"

6594

6569 -#: read-cache.c:3412

6595 +#: read-cache.c:3348

6596 #, fuzzy, c-format

6597 msgid "%s: cannot drop to stage #0"

6598 msgstr "%s: incapaz baixar para estágio #0"

@@ -6673,8 +6699,8 @@ msgstr ""

6699 "No entanto, se remover tudo, o rebase será abortado.\n"

6700 "\n"

6701

6676 -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816

6677 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271

6702 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836

6703 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271

6704 #, fuzzy, c-format

6705 msgid "could not write '%s'"

6706 msgstr "incapaz escrever '%s'"

@@ -6718,7 +6744,7 @@ msgstr ""

6744 msgid "could not read '%s'."

6745 msgstr "incapaz ler '%s'."

6746

6721 -#: ref-filter.c:42 wt-status.c:1978

6747 +#: ref-filter.c:42 wt-status.c:2036

6748 msgid "gone"

6749 msgstr "desapareceu"

6750

@@ -6737,248 +6763,248 @@ msgstr "atrás %d"

6763 msgid "ahead %d, behind %d"

6764 msgstr "à frente %d, atrás %d"

6765

6740 -#: ref-filter.c:175

6766 +#: ref-filter.c:230

6767 #, c-format

6768 msgid "expected format: %%(color:<color>)"

6769 msgstr "formato esperado: %%(color:<cor>)"

6770

6745 -#: ref-filter.c:177

6771 +#: ref-filter.c:232

6772 #, c-format

6773 msgid "unrecognized color: %%(color:%s)"

6774 msgstr "cor desconhecida: %%(color:%s)"

6775

6750 -#: ref-filter.c:199

6776 +#: ref-filter.c:254

6777 #, c-format

6778 msgid "Integer value expected refname:lstrip=%s"

6779 msgstr "valor inteiro esperado refname:lstrip=%s"

6780

6755 -#: ref-filter.c:203

6781 +#: ref-filter.c:258

6782 #, c-format

6783 msgid "Integer value expected refname:rstrip=%s"

6784 msgstr "Valor inteiro esperado refname:rstrip=%s"

6785

6760 -#: ref-filter.c:205

6786 +#: ref-filter.c:260

6787 #, c-format

6788 msgid "unrecognized %%(%s) argument: %s"

6789 msgstr "argumento %%(%s) desconhecido: %s"

6790

6765 -#: ref-filter.c:260

6791 +#: ref-filter.c:315

6792 #, fuzzy, c-format

6793 msgid "%%(objecttype) does not take arguments"

6794 msgstr "%%(objecttype) leva argumentos nenhuns"

6795

6770 -#: ref-filter.c:282

6796 +#: ref-filter.c:339

6797 #, fuzzy, c-format

6798 msgid "unrecognized %%(objectsize) argument: %s"

6799 msgstr "argumento %%(objectsize) desconhecido: %s"

6800

6775 -#: ref-filter.c:290

6801 +#: ref-filter.c:347

6802 #, fuzzy, c-format

6803 msgid "%%(deltabase) does not take arguments"

6804 msgstr "%%(deltabase) leva argumentos nenhuns"

6805

6780 -#: ref-filter.c:302

6806 +#: ref-filter.c:359

6807 #, c-format

6808 msgid "%%(body) does not take arguments"

6809 msgstr "%%(body) leva argumentos nenhuns"

6810

6785 -#: ref-filter.c:315

6811 +#: ref-filter.c:372

6812 #, fuzzy, c-format

6813 msgid "unrecognized %%(subject) argument: %s"

6814 msgstr "argumento %%(subject) desconhecido: %s"

6815

6790 -#: ref-filter.c:334

6816 +#: ref-filter.c:391

6817 #, c-format

6818 msgid "expected %%(trailers:key=<value>)"

6819 msgstr ""

6820

6795 -#: ref-filter.c:336

6821 +#: ref-filter.c:393

6822 #, fuzzy, c-format

6823 msgid "unknown %%(trailers) argument: %s"

6824 msgstr "argumento %%(trailers) desconhecido: %s"

6825

6800 -#: ref-filter.c:367

6826 +#: ref-filter.c:424

6827 #, c-format

6828 msgid "positive value expected contents:lines=%s"

6829 msgstr "valor positivo esperado contents:lines=%s"

6830

6805 -#: ref-filter.c:369

6831 +#: ref-filter.c:426

6832 #, c-format

6833 msgid "unrecognized %%(contents) argument: %s"

6834 msgstr "argumento %%(contents) desconhecido: %s"

6835

6810 -#: ref-filter.c:384

6836 +#: ref-filter.c:441

6837 #, fuzzy, c-format

6838 msgid "positive value expected '%s' in %%(%s)"

6839 msgstr "valor positivo esperado contents:lines=%s"

6840

6815 -#: ref-filter.c:388

6841 +#: ref-filter.c:445

6842 #, fuzzy, c-format

6843 msgid "unrecognized argument '%s' in %%(%s)"

6844 msgstr "argumento '%s' desconhecido em %%(%s)"

6845

6820 -#: ref-filter.c:402

6846 +#: ref-filter.c:459

6847 #, fuzzy, c-format

6848 msgid "unrecognized email option: %s"

6849 msgstr "opção de email desconhecida: %s"

6850

6825 -#: ref-filter.c:432

6851 +#: ref-filter.c:489

6852 #, c-format

6853 msgid "expected format: %%(align:<width>,<position>)"

6854 msgstr "formato esperado: %%(align:<largura>,<posição>)"

6855

6830 -#: ref-filter.c:444

6856 +#: ref-filter.c:501

6857 #, c-format

6858 msgid "unrecognized position:%s"

6859 msgstr "posição desconhecida: %s"

6860

6835 -#: ref-filter.c:451

6861 +#: ref-filter.c:508

6862 #, c-format

6863 msgid "unrecognized width:%s"

6864 msgstr "largura desconhecida: %s"

6865

6840 -#: ref-filter.c:460

6866 +#: ref-filter.c:517

6867 #, c-format

6868 msgid "unrecognized %%(align) argument: %s"

6869 msgstr "argumento %%(align) desconhecido: %s"

6870

6845 -#: ref-filter.c:468

6871 +#: ref-filter.c:525

6872 #, c-format

6873 msgid "positive width expected with the %%(align) atom"

6874 msgstr "largura positiva esperada com o átomo %%(algn)"

6875

6850 -#: ref-filter.c:486

6876 +#: ref-filter.c:543

6877 #, c-format

6878 msgid "unrecognized %%(if) argument: %s"

6879 msgstr "argumento %%(if) desconhecido: %s"

6880

6855 -#: ref-filter.c:588

6881 +#: ref-filter.c:645

6882 #, c-format

6883 msgid "malformed field name: %.*s"

6884 msgstr "nome de ficheiro malformado: %.*s"

6885

6860 -#: ref-filter.c:615

6886 +#: ref-filter.c:672

6887 #, c-format

6888 msgid "unknown field name: %.*s"

6889 msgstr "nome do campo desconhecido: %.*s"

6890

6865 -#: ref-filter.c:619

6891 +#: ref-filter.c:676

6892 #, c-format

6893 msgid ""

6894 "not a git repository, but the field '%.*s' requires access to object data"

6895 msgstr ""

6896

6871 -#: ref-filter.c:743

6897 +#: ref-filter.c:801

6898 #, c-format

6899 msgid "format: %%(if) atom used without a %%(then) atom"

6900 msgstr "formato: átomo %%(if) utilizado sem átomo %%(then) correspondente"

6901

6876 -#: ref-filter.c:807

6902 +#: ref-filter.c:865

6903 #, c-format

6904 msgid "format: %%(then) atom used without an %%(if) atom"

6905 msgstr "formato: átomo %%(then) utilizado sem átomo %%(if) correspondente"

6906

6881 -#: ref-filter.c:809

6907 +#: ref-filter.c:867

6908 #, c-format

6909 msgid "format: %%(then) atom used more than once"

6910 msgstr "formato: átomo %%(then) utilizado mais que uma vez"

6911

6886 -#: ref-filter.c:811

6912 +#: ref-filter.c:869

6913 #, c-format

6914 msgid "format: %%(then) atom used after %%(else)"

6915 msgstr "formato: átomo %%(then) utilizado depois de %%(else)"

6916

6891 -#: ref-filter.c:839

6917 +#: ref-filter.c:897

6918 #, c-format

6919 msgid "format: %%(else) atom used without an %%(if) atom"

6920 msgstr "formato: átomo %%(else) utilizado sem átomo %%(if) correspondente"

6921

6896 -#: ref-filter.c:841

6922 +#: ref-filter.c:899

6923 #, c-format

6924 msgid "format: %%(else) atom used without a %%(then) atom"

6925 msgstr "formato: átomo %%(else) utilizado sem átomo %%(then) correspondente"

6926

6901 -#: ref-filter.c:843

6927 +#: ref-filter.c:901

6928 #, c-format

6929 msgid "format: %%(else) atom used more than once"

6930 msgstr "formato: átomo %%(else) utilizado mais que uma vez"

6931

6906 -#: ref-filter.c:858

6932 +#: ref-filter.c:916

6933 #, c-format

6934 msgid "format: %%(end) atom used without corresponding atom"

6935 msgstr "formato: átomo %%(end) utilizado sem átomo correspondente"

6936

6911 -#: ref-filter.c:915

6937 +#: ref-filter.c:973

6938 #, c-format

6939 msgid "malformed format string %s"

6940 msgstr "cadeia malformada %s"

6941

6916 -#: ref-filter.c:1556

6942 +#: ref-filter.c:1621

6943 #, fuzzy, c-format

6944 msgid "(no branch, rebasing %s)"

6945 msgstr "(ramo nenhum, rebaseando %s)"

6946

6921 -#: ref-filter.c:1559

6947 +#: ref-filter.c:1624

6948 #, fuzzy, c-format

6949 msgid "(no branch, rebasing detached HEAD %s)"

6950 msgstr "(ramo nenhum, rebaseando HEAD solta %s)"

6951

6926 -#: ref-filter.c:1562

6952 +#: ref-filter.c:1627

6953 #, fuzzy, c-format

6954 msgid "(no branch, bisect started on %s)"

6955 msgstr "(ramo nenhum, bisseção iniciada em %s)"

6956

6931 -#: ref-filter.c:1566

6957 +#: ref-filter.c:1631

6958 #, c-format

6959 msgid "(HEAD detached at %s)"

6960 msgstr "(HEAD destacada em %s)"

6961

6936 -#: ref-filter.c:1569

6962 +#: ref-filter.c:1634

6963 #, c-format

6964 msgid "(HEAD detached from %s)"

6965 msgstr "(HEAD destacada de %s)"

6966

6941 -#: ref-filter.c:1572

6967 +#: ref-filter.c:1637

6968 #, fuzzy

6969 msgid "(no branch)"

6970 msgstr "(ramo nenhum)"

6971

6946 -#: ref-filter.c:1604 ref-filter.c:1813

6972 +#: ref-filter.c:1669 ref-filter.c:1880

6973 #, c-format

6974 msgid "missing object %s for %s"

6975 msgstr "falta o objeto %s de %s"

6976

6951 -#: ref-filter.c:1614

6977 +#: ref-filter.c:1679

6978 #, c-format

6979 msgid "parse_object_buffer failed on %s for %s"

6980 msgstr "falha ao invocar parse_object_buffer sobre %s de %s"

6981

6956 -#: ref-filter.c:1997

6982 +#: ref-filter.c:2064

6983 #, c-format

6984 msgid "malformed object at '%s'"

6985 msgstr "objeto malformado em '%s'"

6986

6961 -#: ref-filter.c:2086

6987 +#: ref-filter.c:2153

6988 #, c-format

6989 msgid "ignoring ref with broken name %s"

6990 msgstr "a referência %s com nome danificado foi ignorada"

6991

6966 -#: ref-filter.c:2091 refs.c:676

6992 +#: ref-filter.c:2158 refs.c:676

6993 #, c-format

6994 msgid "ignoring broken ref %s"

6995 msgstr "a referência %s danificada foi ignorada"

6996

6971 -#: ref-filter.c:2431

6997 +#: ref-filter.c:2498

6998 #, c-format

6999 msgid "format: %%(end) atom missing"

7000 msgstr "formato: falta átomo %%(end)"

7001

6976 -#: ref-filter.c:2525

7002 +#: ref-filter.c:2592

7003 #, c-format

7004 msgid "malformed object name %s"

7005 msgstr "nome de objeto malformado %s"

7006

6981 -#: ref-filter.c:2530

7007 +#: ref-filter.c:2597

7008 #, fuzzy, c-format

7009 msgid "option `%s' must point to a commit"

7010 msgstr "opção '%s' tem apontar para um commit"

@@ -7407,8 +7433,8 @@ msgstr "incapaz deslinkar o perdido '%s'"

7433 msgid "Recorded preimage for '%s'"

7434 msgstr ""

7435

7410 -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000

7411 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891

7436 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002

7437 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890

7438 #, c-format

7439 msgid "could not create directory '%s'"

7440 msgstr "incapaz criar pasta '%s'"

@@ -7448,38 +7474,38 @@ msgstr "incapaz abrir pasta rr-cache"

7474 msgid "could not determine HEAD revision"

7475 msgstr "incapaz determinar revisão de HEAD"

7476

7451 -#: reset.c:70 reset.c:76 sequencer.c:3669

7477 +#: reset.c:70 reset.c:76 sequencer.c:3689

7478 #, fuzzy, c-format

7479 msgid "failed to find tree of %s"

7480 msgstr "Falha ao procurar árvore de %s."

7481

7456 -#: revision.c:2343

7482 +#: revision.c:2344

7483 msgid "--unpacked=<packfile> no longer supported"

7484 msgstr ""

7485

7460 -#: revision.c:2683

7486 +#: revision.c:2684

7487 msgid "your current branch appears to be broken"

7488 msgstr "o ramo atual parece estar danificado"

7489

7464 -#: revision.c:2686

7490 +#: revision.c:2687

7491 #, c-format

7492 msgid "your current branch '%s' does not have any commits yet"

7493 msgstr "teu ramo atual '%s' ainda contém commits nenhuns"

7494

7469 -#: revision.c:2892

7495 +#: revision.c:2893

7496 msgid "-L does not yet support diff formats besides -p and -s"

7497 msgstr ""

7498

7473 -#: run-command.c:767

7499 +#: run-command.c:766

7500 msgid "open /dev/null failed"

7501 msgstr "falha ao abrir /dev/null"

7502

7477 -#: run-command.c:1275

7503 +#: run-command.c:1274

7504 #, fuzzy, c-format

7505 msgid "cannot create async thread: %s"

7506 msgstr "incapaz criar thread assíncrona: %s"

7507

7482 -#: run-command.c:1345

7508 +#: run-command.c:1344

7509 #, c-format

7510 msgid ""

7511 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -7514,16 +7540,16 @@ msgstr "fetch-pack: incapaz de aforquilhar %s"

7540 msgid "push negotiation failed; proceeding anyway with push"

7541 msgstr ""

7542

7517 -#: send-pack.c:520

7543 +#: send-pack.c:526

7544 #, fuzzy

7545 msgid "the receiving end does not support this repository's hash algorithm"

7546 msgstr "o recetor insustenta algoritmo hash deste repositório"

7547

7522 -#: send-pack.c:529

7548 +#: send-pack.c:535

7549 msgid "the receiving end does not support --signed push"

7550 msgstr "o recetor insustenta atiro --signed"

7551

7526 -#: send-pack.c:531

7552 +#: send-pack.c:537

7553 msgid ""

7554 "not sending a push certificate since the receiving end does not support --"

7555 "signed push"

@@ -7531,11 +7557,11 @@ msgstr ""

7557 "certificado de atiro por enviar uma vez que o recetor insustenta atirocom --"

7558 "signed"

7559

7534 -#: send-pack.c:543

7560 +#: send-pack.c:544

7561 msgid "the receiving end does not support --atomic push"

7562 msgstr "o recetor insustenta atiro com --atomic"

7563

7538 -#: send-pack.c:548

7564 +#: send-pack.c:549

7565 msgid "the receiving end does not support push options"

7566 msgstr "o recetor insustenta opções de atiro"

7567

@@ -7596,7 +7622,7 @@ msgid "could not lock '%s'"

7622 msgstr "incapaz bloquear '%s'"

7623

7624 #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289

7599 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631

7625 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631

7626 #, c-format

7627 msgid "could not write to '%s'"

7628 msgstr "incapaz escrever em '%s'"

@@ -7607,7 +7633,7 @@ msgid "could not write eol to '%s'"

7633 msgstr "incapaz escrever fim de linha em '%s'"

7634

7635 #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291

7610 -#: sequencer.c:3554

7636 +#: sequencer.c:3555

7637 #, fuzzy, c-format

7638 msgid "failed to finalize '%s'"

7639 msgstr "falha ao finalizar '%s'."

@@ -7659,8 +7685,8 @@ msgstr ""

7685 msgid "unable to dequote value of '%s'"

7686 msgstr "incapaz retirar valor, da citação '%s'"

7687

7662 -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728

7663 -#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910

7688 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729

7689 +#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910

7690 #, c-format

7691 msgid "could not open '%s' for reading"

7692 msgstr "incapaz abrir '%s' para leitura"

@@ -7808,7 +7834,7 @@ msgstr "incapaz processar HEAD"

7834 msgid "HEAD %s is not a commit!"

7835 msgstr "HEAD %s é commit nenhum!"

7836

7811 -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692

7837 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702

7838 msgid "could not parse HEAD commit"

7839 msgstr "incapaz analisar commit HEAD"

7840

@@ -7817,7 +7843,7 @@ msgstr "incapaz analisar commit HEAD"

7843 msgid "unable to parse commit author"

7844 msgstr "incapaz processar autor de commit"

7845

7820 -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706

7846 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706

7847 msgid "git write-tree failed to write a tree"

7848 msgstr "git write-tree falhou ao escrever uma árvore"

7849

@@ -7835,12 +7861,13 @@ msgstr "caminho inválido '%s'"

7861 msgid "corrupt author: missing date information"

7862 msgstr ""

7863

7838 -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909

7864 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909

7865 #: builtin/merge.c:934 t/helper/test-fast-rebase.c:78

7866 msgid "failed to write commit object"

7867 msgstr "falha ao escrever objeto de commit"

7868

7843 -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198

7869 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199

7870 +#: t/helper/test-fast-rebase.c:217

7871 #, c-format

7872 msgid "could not update %s"

7873 msgstr "incapaz atualizar %s"

@@ -7892,7 +7919,7 @@ msgstr "incapaz escrever '%s'"

7919 msgid "need a HEAD to fixup"

7920 msgstr "necessária uma HEAD para fixup"

7921

7895 -#: sequencer.c:1936 sequencer.c:3581

7922 +#: sequencer.c:1936 sequencer.c:3582

7923 msgid "could not read HEAD"

7924 msgstr "incapaz ler HEAD"

7925

@@ -8036,7 +8063,7 @@ msgstr ""

8063 msgid "malformed options sheet: '%s'"

8064 msgstr "folha de opções malformada: '%s'"

8065

8039 -#: sequencer.c:3012 sequencer.c:4869

8066 +#: sequencer.c:3012 sequencer.c:4868

8067 msgid "empty commit set passed"

8068 msgstr "o conjunto de commits especificado está vazio"

8069

@@ -8069,7 +8096,7 @@ msgstr "incapaz criar pasta do sequenciador '%s'"

8096 msgid "could not lock HEAD"

8097 msgstr "incapaz bloquear HEAD"

8098

8072 -#: sequencer.c:3125 sequencer.c:4582

8099 +#: sequencer.c:3125 sequencer.c:4581

8100 msgid "no cherry-pick or revert in progress"

8101 msgstr "sem cherry-pick ou revert em curso"

8102

@@ -8081,7 +8108,7 @@ msgstr "incapaz resolver HEAD"

8108 msgid "cannot abort from a branch yet to be born"

8109 msgstr "incapaz abortar de um ramo ainda por nascer"

8110

8084 -#: sequencer.c:3159 builtin/grep.c:759

8111 +#: sequencer.c:3159 builtin/grep.c:758

8112 #, c-format

8113 msgid "cannot open '%s'"

8114 msgstr "incapaz abrir '%s'"

@@ -8130,7 +8157,7 @@ msgid ""

8157 "try \"git %s --continue\""

8158 msgstr ""

8159

8133 -#: sequencer.c:3411 sequencer.c:4473

8160 +#: sequencer.c:3411 sequencer.c:4472

8161 msgid "cannot read HEAD"

8162 msgstr "incapaz ler HEAD"

8163

@@ -8214,94 +8241,94 @@ msgstr ""

8241 " git rebase --continue\n"

8242 "\n"

8243

8217 -#: sequencer.c:3571

8244 +#: sequencer.c:3572

8245 #, fuzzy, c-format

8246 msgid "illegal label name: '%.*s'"

8247 msgstr "nome de ficheiro malformado: %.*s"

8248

8222 -#: sequencer.c:3625

8249 +#: sequencer.c:3645

8250 #, fuzzy

8251 msgid "writing fake root commit"

8252 msgstr "escrevendo commit de raíz falso"

8253

8227 -#: sequencer.c:3630

8254 +#: sequencer.c:3650

8255 msgid "writing squash-onto"

8256 msgstr ""

8257

8231 -#: sequencer.c:3714

8258 +#: sequencer.c:3734

8259 #, fuzzy, c-format

8260 msgid "could not resolve '%s'"

8261 msgstr "incapaz resolver '%s'"

8262

8236 -#: sequencer.c:3747

8263 +#: sequencer.c:3767

8264 #, fuzzy

8265 msgid "cannot merge without a current revision"

8266 msgstr "incapaz juntar sem uma revisão currente"

8267

8241 -#: sequencer.c:3769

8268 +#: sequencer.c:3789

8269 #, fuzzy, c-format

8270 msgid "unable to parse '%.*s'"

8271 msgstr "incapaz processar '%.*s'"

8272

8246 -#: sequencer.c:3778

8273 +#: sequencer.c:3798

8274 #, fuzzy, c-format

8275 msgid "nothing to merge: '%.*s'"

8276 msgstr "nada a juntar: '%.*s'"

8277

8251 -#: sequencer.c:3790

8278 +#: sequencer.c:3810

8279 msgid "octopus merge cannot be executed on top of a [new root]"

8280 msgstr ""

8281

8255 -#: sequencer.c:3806

8282 +#: sequencer.c:3826

8283 #, fuzzy, c-format

8284 msgid "could not get commit message of '%s'"

8285 msgstr "incapaz obter mensagem de commit de '%s'"

8286

8260 -#: sequencer.c:3989

8287 +#: sequencer.c:4009

8288 #, fuzzy, c-format

8289 msgid "could not even attempt to merge '%.*s'"

8290 msgstr "incapaz de tentar juntar '%.*s'"

8291

8265 -#: sequencer.c:4005

8292 +#: sequencer.c:4025

8293 #, fuzzy

8294 msgid "merge: Unable to write new index file"

8295 msgstr "merge: Incapaz de escrever novo ficheiro index"

8296

8270 -#: sequencer.c:4079

8297 +#: sequencer.c:4099

8298 msgid "Cannot autostash"

8299 msgstr "Incapaz de arrumar automaticamente (autostash)"

8300

8274 -#: sequencer.c:4082

8301 +#: sequencer.c:4102

8302 #, fuzzy, c-format

8303 msgid "Unexpected stash response: '%s'"

8304 msgstr "Resposta de squash inexperada: '%s'"

8305

8279 -#: sequencer.c:4088

8306 +#: sequencer.c:4108

8307 #, fuzzy, c-format

8308 msgid "Could not create directory for '%s'"

8309 msgstr "Incapaz de criar a pasta para '%s'"

8310

8284 -#: sequencer.c:4091

8311 +#: sequencer.c:4111

8312 #, fuzzy, c-format

8313 msgid "Created autostash: %s\n"

8314 msgstr "Criado autostash: %s\n"

8315

8289 -#: sequencer.c:4095

8316 +#: sequencer.c:4115

8317 #, fuzzy

8318 msgid "could not reset --hard"

8319 msgstr "incapaz repor --hard"

8320

8294 -#: sequencer.c:4120

8321 +#: sequencer.c:4140

8322 #, fuzzy, c-format

8323 msgid "Applied autostash.\n"

8324 msgstr "Autostash aplicado.\n"

8325

8299 -#: sequencer.c:4132

8326 +#: sequencer.c:4152

8327 #, c-format

8328 msgid "cannot store %s"

8329 msgstr "incapaz guardar %s"

8330

8304 -#: sequencer.c:4135

8331 +#: sequencer.c:4155

8332 #, fuzzy, c-format

8333 msgid ""

8334 "%s\n"

@@ -8312,30 +8339,30 @@ msgstr ""

8339 "As suas alterações estão guardadas na pilha.\n"

8340 "Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"

8341

8315 -#: sequencer.c:4140

8342 +#: sequencer.c:4160

8343 #, fuzzy

8344 msgid "Applying autostash resulted in conflicts."

8345 msgstr "Patch aplicado a '%s' com conflitos."

8346

8320 -#: sequencer.c:4141

8347 +#: sequencer.c:4161

8348 msgid "Autostash exists; creating a new stash entry."

8349 msgstr ""

8350

8324 -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769

8351 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769

8352 msgid "could not detach HEAD"

8353 msgstr "incapaz soltar HEAD"

8354

8328 -#: sequencer.c:4249

8355 +#: sequencer.c:4248

8356 #, fuzzy, c-format

8357 msgid "Stopped at HEAD\n"

8358 msgstr "Parou no HEAD\n"

8359

8333 -#: sequencer.c:4251

8360 +#: sequencer.c:4250

8361 #, fuzzy, c-format

8362 msgid "Stopped at %s\n"

8363 msgstr "Parou a %s... %.*s\n"

8364

8338 -#: sequencer.c:4259

8365 +#: sequencer.c:4258

8366 #, c-format

8367 msgid ""

8368 "Could not execute the todo command\n"

@@ -8348,58 +8375,58 @@ msgid ""

8375 " git rebase --continue\n"

8376 msgstr ""

8377

8351 -#: sequencer.c:4305

8378 +#: sequencer.c:4304

8379 #, c-format

8380 msgid "Rebasing (%d/%d)%s"

8381 msgstr ""

8382

8356 -#: sequencer.c:4351

8383 +#: sequencer.c:4350

8384 #, c-format

8385 msgid "Stopped at %s... %.*s\n"

8386 msgstr "Parou no %s... %.*s\n"

8387

8361 -#: sequencer.c:4422

8388 +#: sequencer.c:4421

8389 #, c-format

8390 msgid "unknown command %d"

8391 msgstr "comando desconhecido %d"

8392

8366 -#: sequencer.c:4481

8393 +#: sequencer.c:4480

8394 msgid "could not read orig-head"

8395 msgstr "incapaz ler orig-head"

8396

8370 -#: sequencer.c:4486

8397 +#: sequencer.c:4485

8398 msgid "could not read 'onto'"

8399 msgstr "incapaz ler 'onto'"

8400

8374 -#: sequencer.c:4500

8401 +#: sequencer.c:4499

8402 #, c-format

8403 msgid "could not update HEAD to %s"

8404 msgstr "incapaz atualizar HEAD para %s"

8405

8379 -#: sequencer.c:4560

8406 +#: sequencer.c:4559

8407 #, fuzzy, c-format

8408 msgid "Successfully rebased and updated %s.\n"

8409 msgstr "O %s foi rebaseado e atualizado com sucesso.\n"

8410

8384 -#: sequencer.c:4612

8411 +#: sequencer.c:4611

8412 msgid "cannot rebase: You have unstaged changes."

8413 msgstr "incapaz rebasear: tem alterações despreparadas."

8414

8388 -#: sequencer.c:4621

8415 +#: sequencer.c:4620

8416 msgid "cannot amend non-existing commit"

8417 msgstr "incapaz emendar commit inexistente"

8418

8392 -#: sequencer.c:4623

8419 +#: sequencer.c:4622

8420 #, c-format

8421 msgid "invalid file: '%s'"

8422 msgstr "ficheiro inválido: '%s'"

8423

8397 -#: sequencer.c:4625

8424 +#: sequencer.c:4624

8425 #, c-format

8426 msgid "invalid contents: '%s'"

8427 msgstr "conteúdo inválido: '%s'"

8428

8402 -#: sequencer.c:4628

8429 +#: sequencer.c:4627

8430 msgid ""

8431 "\n"

8432 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -8409,52 +8436,52 @@ msgstr ""

8436 "Tem alterações por submeter na árvore de trabalho. Submeta-as primeiro\n"

8437 "e execute 'git rebase --continue' de novo."

8438

8412 -#: sequencer.c:4664 sequencer.c:4703

8439 +#: sequencer.c:4663 sequencer.c:4702

8440 #, fuzzy, c-format

8441 msgid "could not write file: '%s'"

8442 msgstr "incapaz escrever ficheiro: '%s'"

8443

8417 -#: sequencer.c:4719

8444 +#: sequencer.c:4718

8445 msgid "could not remove CHERRY_PICK_HEAD"

8446 msgstr "incapaz remover CHERRY_PICK_HEAD"

8447

8421 -#: sequencer.c:4726

8448 +#: sequencer.c:4725

8449 msgid "could not commit staged changes."

8450 msgstr "incapaz commit alterações preparadas."

8451

8425 -#: sequencer.c:4846

8452 +#: sequencer.c:4845

8453 #, c-format

8454 msgid "%s: can't cherry-pick a %s"

8455 msgstr "%s: incapaz apanhar um %s"

8456

8430 -#: sequencer.c:4850

8457 +#: sequencer.c:4849

8458 #, c-format

8459 msgid "%s: bad revision"

8460 msgstr "%s: revisão incorreta"

8461

8435 -#: sequencer.c:4885

8462 +#: sequencer.c:4884

8463 msgid "can't revert as initial commit"

8464 msgstr "incapaz reverter como commit inicial"

8465

8439 -#: sequencer.c:5362

8466 +#: sequencer.c:5361

8467 msgid "make_script: unhandled options"

8468 msgstr ""

8469

8443 -#: sequencer.c:5365

8470 +#: sequencer.c:5364

8471 msgid "make_script: error preparing revisions"

8472 msgstr ""

8473

8447 -#: sequencer.c:5615 sequencer.c:5632

8474 +#: sequencer.c:5614 sequencer.c:5631

8475 #, fuzzy

8476 msgid "nothing to do"

8477 msgstr "nada a fazer"

8478

8452 -#: sequencer.c:5651

8479 +#: sequencer.c:5650

8480 #, fuzzy

8481 msgid "could not skip unnecessary pick commands"

8482 msgstr "incapaz de saltar comandos pick desnecessários"

8483

8457 -#: sequencer.c:5751

8484 +#: sequencer.c:5750

8485 msgid "the script was already rearranged."

8486 msgstr ""

8487

@@ -8505,94 +8532,99 @@ msgstr ""

8532 msgid "unable to set up work tree using invalid config"

8533 msgstr "incapaz preparar work tree usando config inválido"

8534

8508 -#: setup.c:423

8535 +#: setup.c:423 builtin/rev-parse.c:895

8536 msgid "this operation must be run in a work tree"

8537 msgstr ""

8538

8512 -#: setup.c:661

8539 +#: setup.c:658

8540 #, c-format

8541 msgid "Expected git repo version <= %d, found %d"

8542 msgstr "Esperava-se versão do repositório git <= %d, obteve-se %d"

8543

8517 -#: setup.c:669

8518 -msgid "unknown repository extensions found:"

8519 -msgstr "extensões de repositório desconhecidas encontradas:"

8544 +#: setup.c:666

8545 +#, fuzzy

8546 +msgid "unknown repository extension found:"

8547 +msgid_plural "unknown repository extensions found:"

8548 +msgstr[0] "extensões de repositório desconhecidas encontradas:"

8549 +msgstr[1] "extensões de repositório desconhecidas encontradas:"

8550

8521 -#: setup.c:681

8551 +#: setup.c:680

8552 #, fuzzy

8523 -msgid "repo version is 0, but v1-only extensions found:"

8524 -msgstr "extensões de repositório desconhecidas encontradas:"

8553 +msgid "repo version is 0, but v1-only extension found:"

8554 +msgid_plural "repo version is 0, but v1-only extensions found:"

8555 +msgstr[0] "extensões de repositório desconhecidas encontradas:"

8556 +msgstr[1] "extensões de repositório desconhecidas encontradas:"

8557

8526 -#: setup.c:700

8558 +#: setup.c:701

8559 #, fuzzy, c-format

8560 msgid "error opening '%s'"

8561 msgstr "falha ao abrir '%s'"

8562

8531 -#: setup.c:702

8563 +#: setup.c:703

8564 #, fuzzy, c-format

8565 msgid "too large to be a .git file: '%s'"

8566 msgstr "demasiado grande para ser um ficheiro .git: '%s'"

8567

8536 -#: setup.c:704

8568 +#: setup.c:705

8569 #, fuzzy, c-format

8570 msgid "error reading %s"

8571 msgstr "Erro ao rematar %s."

8572

8541 -#: setup.c:706

8573 +#: setup.c:707

8574 #, fuzzy, c-format

8575 msgid "invalid gitfile format: %s"

8576 msgstr "formato de data inválido: %s"

8577

8546 -#: setup.c:708

8578 +#: setup.c:709

8579 #, fuzzy, c-format

8580 msgid "no path in gitfile: %s"

8581 msgstr "gitfile sem path: %s"

8582

8551 -#: setup.c:710

8583 +#: setup.c:711

8584 #, fuzzy, c-format

8585 msgid "not a git repository: %s"

8586 msgstr "é repositório git nenhum: %s"

8587

8556 -#: setup.c:812

8588 +#: setup.c:813

8589 #, c-format

8590 msgid "'$%s' too big"

8591 msgstr ""

8592

8561 -#: setup.c:826

8593 +#: setup.c:827

8594 #, fuzzy, c-format

8595 msgid "not a git repository: '%s'"

8596 msgstr "é repositório git nenhum: '%s'"

8597

8566 -#: setup.c:855 setup.c:857 setup.c:888

8598 +#: setup.c:856 setup.c:858 setup.c:889

8599 #, fuzzy, c-format

8600 msgid "cannot chdir to '%s'"

8601 msgstr "incapaz chdir para '%s'"

8602

8571 -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973

8603 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974

8604 #, fuzzy

8605 msgid "cannot come back to cwd"

8606 msgstr "incapaz de voltar para cwd"

8607

8576 -#: setup.c:987

8608 +#: setup.c:988

8609 #, fuzzy, c-format

8610 msgid "failed to stat '%*s%s%s'"

8611 msgstr "falha ao invocar stat de '%s'"

8612

8581 -#: setup.c:1225

8613 +#: setup.c:1231

8614 msgid "Unable to read current working directory"

8615 msgstr "Incapaz de ler pasta atual de trabalho"

8616

8585 -#: setup.c:1234 setup.c:1240

8617 +#: setup.c:1240 setup.c:1246

8618 #, fuzzy, c-format

8619 msgid "cannot change to '%s'"

8620 msgstr "incapaz mudar para '%s'"

8621

8590 -#: setup.c:1245

8622 +#: setup.c:1251

8623 #, fuzzy, c-format

8624 msgid "not a git repository (or any of the parent directories): %s"

8625 msgstr "é repositório git nenhum (ou em pastas parente nenhuma): %s"

8626

8595 -#: setup.c:1251

8627 +#: setup.c:1257

8628 #, fuzzy, c-format

8629 msgid ""

8630 "not a git repository (or any parent up to mount point %s)\n"

@@ -8602,7 +8634,7 @@ msgstr ""

8634 "Parando na fronteira do sistema de ficheiros "

8635 "(GIT_DISCOVERY_ACROSS_FILESYSTEM indefinido)."

8636

8605 -#: setup.c:1370

8637 +#: setup.c:1381

8638 #, fuzzy, c-format

8639 msgid ""

8640 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -8611,31 +8643,31 @@ msgstr ""

8643 "Problema com o valor core.sharedRepository modo de ficheiro (0%.3o).\n"

8644 "O dono dos ficheiros tem de ter sempre permissões de leitura e escrita."

8645

8614 -#: setup.c:1417

8646 +#: setup.c:1430

8647 #, fuzzy

8648 msgid "open /dev/null or dup failed"

8649 msgstr "falha ao abrir /dev/null"

8650

8619 -#: setup.c:1432

8651 +#: setup.c:1445

8652 #, fuzzy

8653 msgid "fork failed"

8654 msgstr "falha ao invocar fseek"

8655

8624 -#: setup.c:1437 t/helper/test-simple-ipc.c:285

8656 +#: setup.c:1450 t/helper/test-simple-ipc.c:285

8657 #, fuzzy

8658 msgid "setsid failed"

8659 msgstr "falha ao executar o comando stash"

8660

8629 -#: sparse-index.c:151

8661 +#: sparse-index.c:162

8662 msgid "attempting to use sparse-index without cone mode"

8663 msgstr ""

8664

8633 -#: sparse-index.c:156

8665 +#: sparse-index.c:174

8666 #, fuzzy

8667 msgid "unable to update cache-tree, staying full"

8668 msgstr "incapaz atualizar árvore de cache"

8669

8638 -#: sparse-index.c:239

8670 +#: sparse-index.c:261

8671 #, c-format

8672 msgid "index entry is a directory, but not sparse (%08x)"

8673 msgstr ""

@@ -8692,7 +8724,7 @@ msgid_plural "%u bytes/s"

8724 msgstr[0] "bytes"

8725 msgstr[1] "bytes"

8726

8695 -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737

8727 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738

8728 #: builtin/rebase.c:866

8729 #, c-format

8730 msgid "could not open '%s' for writing"

@@ -8763,19 +8795,19 @@ msgstr "O caminho '%s' está dentro do submódulo '%.*s'"

8795 msgid "bad --ignore-submodules argument: %s"

8796 msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"

8797

8766 -#: submodule.c:818

8798 +#: submodule.c:805

8799 #, c-format

8800 msgid ""

8801 "Submodule in commit %s at path: '%s' collides with a submodule named the "

8802 "same. Skipping it."

8803 msgstr ""

8804

8773 -#: submodule.c:921

8805 +#: submodule.c:908

8806 #, fuzzy, c-format

8807 msgid "submodule entry '%s' (%s) is a %s, not a commit"

8808 msgstr "entrada submódulo '%s' (%s) é um(a) %s, não um commit"

8809

8778 -#: submodule.c:1006

8810 +#: submodule.c:993

8811 #, fuzzy, c-format

8812 msgid ""

8813 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "

@@ -8784,36 +8816,36 @@ msgstr ""

8816 "Incapaz executar comando 'git rev-list <commits> --not --remotes -n 1' "

8817 "emsubmódulo %s"

8818

8787 -#: submodule.c:1129

8819 +#: submodule.c:1116

8820 #, fuzzy, c-format

8821 msgid "process for submodule '%s' failed"

8822 msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"

8823

8792 -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470

8824 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469

8825 msgid "Failed to resolve HEAD as a valid ref."

8826 msgstr "Falha ao resolver HEAD numa referência válida."

8827

8796 -#: submodule.c:1169

8828 +#: submodule.c:1156

8829 #, fuzzy, c-format

8830 msgid "Pushing submodule '%s'\n"

8831 msgstr "A ignorar submódulo '%s'\n"

8832

8801 -#: submodule.c:1172

8833 +#: submodule.c:1159

8834 #, fuzzy, c-format

8835 msgid "Unable to push submodule '%s'\n"

8836 msgstr "Impossível enviar submódulo '%s'\n"

8837

8806 -#: submodule.c:1464

8838 +#: submodule.c:1451

8839 #, fuzzy, c-format

8840 msgid "Fetching submodule %s%s\n"

8841 msgstr "Buscando submódulo %s%s\n"

8842

8811 -#: submodule.c:1498

8843 +#: submodule.c:1485

8844 #, fuzzy, c-format

8845 msgid "Could not access submodule '%s'\n"

8846 msgstr "Submódulo '%s' inacessível\n"

8847

8816 -#: submodule.c:1653

8848 +#: submodule.c:1640

8849 #, fuzzy, c-format

8850 msgid ""

8851 "Errors during submodule fetch:\n"

@@ -8822,79 +8854,79 @@ msgstr ""

8854 "Erros na busca do submódulo:\n"

8855 "%s"

8856

8825 -#: submodule.c:1678

8857 +#: submodule.c:1665

8858 #, c-format

8859 msgid "'%s' not recognized as a git repository"

8860 msgstr "'%s' é irreconhecível como um repositório git"

8861

8830 -#: submodule.c:1695

8862 +#: submodule.c:1682

8863 #, fuzzy, c-format

8864 msgid "Could not run 'git status --porcelain=2' in submodule %s"

8865 msgstr "Incapaz executar 'git status' no submódulo '%s'"

8866

8835 -#: submodule.c:1736

8867 +#: submodule.c:1723

8868 #, fuzzy, c-format

8869 msgid "'git status --porcelain=2' failed in submodule %s"

8870 msgstr "'git status --porcelain=2' falhou no submódulo '%s'"

8871

8840 -#: submodule.c:1811

8872 +#: submodule.c:1798

8873 #, c-format

8874 msgid "could not start 'git status' in submodule '%s'"

8875 msgstr "incapaz iniciar 'git status' no submódulo '%s'"

8876

8845 -#: submodule.c:1824

8877 +#: submodule.c:1811

8878 #, c-format

8879 msgid "could not run 'git status' in submodule '%s'"

8880 msgstr "incapaz executar 'git status' no submódulo '%s'"

8881

8850 -#: submodule.c:1839

8882 +#: submodule.c:1826

8883 #, fuzzy, c-format

8884 msgid "Could not unset core.worktree setting in submodule '%s'"

8885 msgstr "Incapaz de remover a definição core.worktree em submódulo '%s'"

8886

8855 -#: submodule.c:1866 submodule.c:2176

8887 +#: submodule.c:1853 submodule.c:2163

8888 #, c-format

8889 msgid "could not recurse into submodule '%s'"

8890 msgstr "incapaz percorrer recursivamente o submódulo '%s'"

8891

8860 -#: submodule.c:1887

8892 +#: submodule.c:1874

8893 #, fuzzy

8894 msgid "could not reset submodule index"

8895 msgstr "incapaz repor index de submódulo"

8896

8865 -#: submodule.c:1929

8897 +#: submodule.c:1916

8898 #, c-format

8899 msgid "submodule '%s' has dirty index"

8900 msgstr "o submódulo '%s' tem índice sujo"

8901

8870 -#: submodule.c:1981

8902 +#: submodule.c:1968

8903 #, fuzzy, c-format

8904 msgid "Submodule '%s' could not be updated."

8905 msgstr "Submódulo '%s' incapaz de ser atualizado."

8906

8875 -#: submodule.c:2049

8907 +#: submodule.c:2036

8908 #, c-format

8909 msgid "submodule git dir '%s' is inside git dir '%.*s'"

8910 msgstr ""

8911

8880 -#: submodule.c:2070

8912 +#: submodule.c:2057

8913 #, c-format

8914 msgid ""

8915 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

8916 msgstr ""

8917 "relocate_gitdir para submodúlo '%s' com mais que uma worktree é insustentado"

8918

8887 -#: submodule.c:2082 submodule.c:2141

8919 +#: submodule.c:2069 submodule.c:2128

8920 #, c-format

8921 msgid "could not lookup name for submodule '%s'"

8922 msgstr "incapaz procurar nome para submódulo '%s'"

8923

8892 -#: submodule.c:2086

8924 +#: submodule.c:2073

8925 #, c-format

8926 msgid "refusing to move '%s' into an existing git dir"

8927 msgstr ""

8928

8897 -#: submodule.c:2093

8929 +#: submodule.c:2080

8930 #, c-format

8931 msgid ""

8932 "Migrating git directory of '%s%s' from\n"

@@ -8905,11 +8937,11 @@ msgstr ""

8937 "'%s' para\n"

8938 "'%s'\n"

8939

8908 -#: submodule.c:2221

8940 +#: submodule.c:2208

8941 msgid "could not start ls-files in .."

8942 msgstr "incapaz iniciar ls-files em .."

8943

8912 -#: submodule.c:2261

8944 +#: submodule.c:2248

8945 #, c-format

8946 msgid "ls-tree returned unexpected return code %d"

8947 msgstr "ls-tree retornou código de retorno inesperado %d"

@@ -8946,7 +8978,7 @@ msgstr "token terminador vazio no terminador '%.*s'"

8978 msgid "could not read input file '%s'"

8979 msgstr "incapaz ler ficheiro de entrada '%s'"

8980

8949 -#: trailer.c:766 builtin/mktag.c:88

8981 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577

8982 msgid "could not read from stdin"

8983 msgstr "incapaz ler da entrada padrão"

8984

@@ -9038,7 +9070,7 @@ msgstr ""

9070 msgid "invalid remote service path"

9071 msgstr "referência inválida: %s"

9072

9041 -#: transport-helper.c:661 transport.c:1471

9073 +#: transport-helper.c:661 transport.c:1477

9074 #, fuzzy

9075 msgid "operation not supported by protocol"

9076 msgstr "opção insustentado pelo protocolo"

@@ -9048,7 +9080,7 @@ msgstr "opção insustentado pelo protocolo"

9080 msgid "can't connect to subservice %s"

9081 msgstr ""

9082

9051 -#: transport-helper.c:693 transport.c:397

9083 +#: transport-helper.c:693 transport.c:400

9084 msgid "--negotiate-only requires protocol v2"

9085 msgstr ""

9086

@@ -9181,48 +9213,48 @@ msgstr "Iria definir o ramo a montante de '%s' como '%s' de '%s'\n"

9213 msgid "could not read bundle '%s'"

9214 msgstr "incapaz ler conjunto '%s'"

9215

9184 -#: transport.c:220

9216 +#: transport.c:223

9217 #, c-format

9218 msgid "transport: invalid depth option '%s'"

9219 msgstr "transporte: opção de profundidade '%s' inválida"

9220

9189 -#: transport.c:272

9221 +#: transport.c:275

9222 msgid "see protocol.version in 'git help config' for more details"

9223 msgstr ""

9224

9193 -#: transport.c:273

9225 +#: transport.c:276

9226 msgid "server options require protocol version 2 or later"

9227 msgstr ""

9228

9197 -#: transport.c:400

9229 +#: transport.c:403

9230 #, fuzzy

9231 msgid "server does not support wait-for-done"

9232 msgstr "Servidor insustenta --deepen"

9233

9202 -#: transport.c:751

9234 +#: transport.c:755

9235 #, fuzzy

9236 msgid "could not parse transport.color.* config"

9237 msgstr "incapaz processar config transport.color.*"

9238

9207 -#: transport.c:826

9239 +#: transport.c:830

9240 msgid "support for protocol v2 not implemented yet"

9241 msgstr ""

9242

9211 -#: transport.c:960

9243 +#: transport.c:965

9244 #, fuzzy, c-format

9245 msgid "unknown value for config '%s': %s"

9246 msgstr "valor desconhecido '%s' da chave '%s'"

9247

9216 -#: transport.c:1026

9248 +#: transport.c:1031

9249 #, fuzzy, c-format

9250 msgid "transport '%s' not allowed"

9251 msgstr "transport '%s' proibido"

9252

9221 -#: transport.c:1079

9253 +#: transport.c:1084

9254 msgid "git-over-rsync is no longer supported"

9255 msgstr ""

9256

9225 -#: transport.c:1181

9257 +#: transport.c:1187

9258 #, c-format

9259 msgid ""

9260 "The following submodule paths contain changes that can\n"

@@ -9231,7 +9263,7 @@ msgstr ""

9263 "Os seguintes paths de submódulo contêm alterações que\n"

9264 "puderam ser encontradas em remoto nenhum:\n"

9265

9234 -#: transport.c:1185

9266 +#: transport.c:1191

9267 #, c-format

9268 msgid ""

9269 "\n"

@@ -9258,11 +9290,11 @@ msgstr ""

9290 "para publicá-las no remoto.\n"

9291 "\n"

9292

9261 -#: transport.c:1193

9293 +#: transport.c:1199

9294 msgid "Aborting."

9295 msgstr "Abortado."

9296

9265 -#: transport.c:1340

9297 +#: transport.c:1346

9298 #, fuzzy

9299 msgid "failed to push all needed submodules"

9300 msgstr "Falha ao adicionar o submódulo '$sm_path'"

@@ -9532,12 +9564,12 @@ msgid ""

9564 "colliding group is in the working tree:\n"

9565 msgstr ""

9566

9535 -#: unpack-trees.c:1519

9567 +#: unpack-trees.c:1618

9568 #, fuzzy

9569 msgid "Updating index flags"

9570 msgstr "A atualizar %s"

9571

9540 -#: unpack-trees.c:2608

9572 +#: unpack-trees.c:2707

9573 #, c-format

9574 msgid "worktree and untracked commit have duplicate entries: %s"

9575 msgstr ""

@@ -9580,109 +9612,109 @@ msgstr "segmento de caminho '..' inválido"

9612 msgid "Fetching objects"

9613 msgstr "A verificar objetos"

9614

9583 -#: worktree.c:238 builtin/am.c:2151

9615 +#: worktree.c:236 builtin/am.c:2152

9616 #, c-format

9617 msgid "failed to read '%s'"

9618 msgstr "falha ao ler '%s'"

9619

9588 -#: worktree.c:304

9620 +#: worktree.c:303

9621 #, c-format

9622 msgid "'%s' at main working tree is not the repository directory"

9623 msgstr ""

9624

9593 -#: worktree.c:315

9625 +#: worktree.c:314

9626 #, c-format

9627 msgid "'%s' file does not contain absolute path to the working tree location"

9628 msgstr ""

9629

9598 -#: worktree.c:327

9630 +#: worktree.c:326

9631 #, fuzzy, c-format

9632 msgid "'%s' does not exist"

9633 msgstr "'%s' é inexistente"

9634

9603 -#: worktree.c:333

9635 +#: worktree.c:332

9636 #, fuzzy, c-format

9637 msgid "'%s' is not a .git file, error code %d"

9638 msgstr "'%s' é ficheiro .git nenhum, código de erro %d"

9639

9608 -#: worktree.c:342

9640 +#: worktree.c:341

9641 #, fuzzy, c-format

9642 msgid "'%s' does not point back to '%s'"

9643 msgstr "'%s' aponta para algo diferente de '%s'"

9644

9613 -#: worktree.c:608

9645 +#: worktree.c:603

9646 #, fuzzy

9647 msgid "not a directory"

9648 msgstr "é pasta nenhuma"

9649

9618 -#: worktree.c:617

9650 +#: worktree.c:612

9651 #, fuzzy

9652 msgid ".git is not a file"

9653 msgstr "git show %s: ficheiro incorreto"

9654

9623 -#: worktree.c:619

9655 +#: worktree.c:614

9656 msgid ".git file broken"

9657 msgstr ""

9658

9627 -#: worktree.c:621

9659 +#: worktree.c:616

9660 #, fuzzy

9661 msgid ".git file incorrect"

9662 msgstr "ficheiro de índice corrompido"

9663

9632 -#: worktree.c:727

9664 +#: worktree.c:722

9665 #, fuzzy

9666 msgid "not a valid path"

9667 msgstr "nome de objeto inválido: %s"

9668

9637 -#: worktree.c:733

9669 +#: worktree.c:728

9670 #, fuzzy

9671 msgid "unable to locate repository; .git is not a file"

9672 msgstr "incapaz localizar repositório; .git é diferente de ficheiro"

9673

9642 -#: worktree.c:737

9674 +#: worktree.c:732

9675 #, fuzzy

9676 msgid "unable to locate repository; .git file does not reference a repository"

9677 msgstr "incapaz localizar repositório; .git é diferente de ficheiro"

9678

9647 -#: worktree.c:741

9679 +#: worktree.c:736

9680 #, fuzzy

9681 msgid "unable to locate repository; .git file broken"

9682 msgstr "incapaz localizar repositório; .git está quebrado"

9683

9652 -#: worktree.c:747

9684 +#: worktree.c:742

9685 msgid "gitdir unreadable"

9686 msgstr ""

9687

9656 -#: worktree.c:751

9688 +#: worktree.c:746

9689 msgid "gitdir incorrect"

9690 msgstr ""

9691

9660 -#: worktree.c:776

9692 +#: worktree.c:771

9693 #, fuzzy

9694 msgid "not a valid directory"

9695 msgstr "nome de objeto inválido: %s"

9696

9665 -#: worktree.c:782

9697 +#: worktree.c:777

9698 #, fuzzy

9699 msgid "gitdir file does not exist"

9700 msgstr "ficheiro gitdir é inexistente"

9701

9670 -#: worktree.c:787 worktree.c:796

9702 +#: worktree.c:782 worktree.c:791

9703 #, fuzzy, c-format

9704 msgid "unable to read gitdir file (%s)"

9705 msgstr "incapaz ler ficheiro gitdir (%s)"

9706

9675 -#: worktree.c:806

9707 +#: worktree.c:801

9708 #, c-format

9709 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"

9710 msgstr ""

9711

9680 -#: worktree.c:814

9712 +#: worktree.c:809

9713 #, fuzzy

9714 msgid "invalid gitdir file"

9715 msgstr "linha de Data inválida"

9716

9685 -#: worktree.c:822

9717 +#: worktree.c:817

9718 #, fuzzy

9719 msgid "gitdir file points to non-existent location"

9720 msgstr ""

@@ -9735,11 +9767,11 @@ msgstr ""

9767 msgid " (use \"git rm <file>...\" to mark resolution)"

9768 msgstr " (use \"git rm <ficheiro>...\" para marcar como resolvido)"

9769

9738 -#: wt-status.c:211 wt-status.c:1075

9770 +#: wt-status.c:211 wt-status.c:1125

9771 msgid "Changes to be committed:"

9772 msgstr "Alterações para serem submetidas:"

9773

9742 -#: wt-status.c:234 wt-status.c:1084

9774 +#: wt-status.c:234 wt-status.c:1134

9775 msgid "Changes not staged for commit:"

9776 msgstr "Alterações por preparar para commit:"

9777

@@ -9842,22 +9874,22 @@ msgstr "conteúdo modificado, "

9874 msgid "untracked content, "

9875 msgstr "conteúdo por seguir, "

9876

9845 -#: wt-status.c:908

9877 +#: wt-status.c:958

9878 #, fuzzy, c-format

9879 msgid "Your stash currently has %d entry"

9880 msgid_plural "Your stash currently has %d entries"

9881 msgstr[0] "Está a rebasear neste momento."

9882 msgstr[1] "Está a rebasear neste momento."

9883

9852 -#: wt-status.c:939

9884 +#: wt-status.c:989

9885 msgid "Submodules changed but not updated:"

9886 msgstr "Submódulos alterados mas desatualizados:"

9887

9856 -#: wt-status.c:941

9888 +#: wt-status.c:991

9889 msgid "Submodule changes to be committed:"

9890 msgstr "Alterações em submódulos para serem submetidas:"

9891

9860 -#: wt-status.c:1023

9892 +#: wt-status.c:1073

9893 #, fuzzy

9894 msgid ""

9895 "Do not modify or remove the line above.\n"

@@ -9866,7 +9898,7 @@ msgstr ""

9898 "Deixe estar a linha acima.\n"

9899 "Tudo abaixo será ignorado."

9900

9869 -#: wt-status.c:1115

9901 +#: wt-status.c:1165

9902 #, c-format

9903 msgid ""

9904 "\n"

@@ -9874,108 +9906,108 @@ msgid ""

9906 "You can use '--no-ahead-behind' to avoid this.\n"

9907 msgstr ""

9908

9877 -#: wt-status.c:1145

9909 +#: wt-status.c:1195

9910 msgid "You have unmerged paths."

9911 msgstr "Tens paths por juntar."

9912

9881 -#: wt-status.c:1148

9913 +#: wt-status.c:1198

9914 msgid " (fix conflicts and run \"git commit\")"

9915 msgstr " (corrija os conflitos e execute \"git commit\")"

9916

9885 -#: wt-status.c:1150

9917 +#: wt-status.c:1200

9918 msgid " (use \"git merge --abort\" to abort the merge)"

9919 msgstr " (use \"git am --abort\" para abortar a integração)"

9920

9889 -#: wt-status.c:1154

9921 +#: wt-status.c:1204

9922 msgid "All conflicts fixed but you are still merging."

9923 msgstr "Todos os conflitos foram corrigidos mas ainda está a integrar."

9924

9893 -#: wt-status.c:1157

9925 +#: wt-status.c:1207

9926 msgid " (use \"git commit\" to conclude merge)"

9927 msgstr " (use \"git commit\" para concluir a integração)"

9928

9897 -#: wt-status.c:1166

9929 +#: wt-status.c:1216

9930 msgid "You are in the middle of an am session."

9931 msgstr "Sessão am em curso."

9932

9901 -#: wt-status.c:1169

9933 +#: wt-status.c:1219

9934 msgid "The current patch is empty."

9935 msgstr "O patch atual está vazio."

9936

9905 -#: wt-status.c:1173

9937 +#: wt-status.c:1223

9938 msgid " (fix conflicts and then run \"git am --continue\")"

9939 msgstr " (corrija os conflitos e execute \"git am --continue\")"

9940

9909 -#: wt-status.c:1175

9941 +#: wt-status.c:1225

9942 msgid " (use \"git am --skip\" to skip this patch)"

9943 msgstr " (use \"git am --skip\" para ignorar este patch)"

9944

9913 -#: wt-status.c:1177

9945 +#: wt-status.c:1227

9946 msgid " (use \"git am --abort\" to restore the original branch)"

9947 msgstr " (use \"git am --abort\" para restaurar o ramo original)"

9948

9917 -#: wt-status.c:1310

9949 +#: wt-status.c:1360

9950 msgid "git-rebase-todo is missing."

9951 msgstr "git-rebase-todo está faltando."

9952

9921 -#: wt-status.c:1312

9953 +#: wt-status.c:1362

9954 msgid "No commands done."

9955 msgstr "Nenhum comando concluído."

9956

9925 -#: wt-status.c:1315

9957 +#: wt-status.c:1365

9958 #, c-format

9959 msgid "Last command done (%d command done):"

9960 msgid_plural "Last commands done (%d commands done):"

9961 msgstr[0] "Último comando concluído (%d comando concluído):"

9962 msgstr[1] "Últimos comandos concluídos (%d comandos concluídos):"

9963

9932 -#: wt-status.c:1326

9964 +#: wt-status.c:1376

9965 #, c-format

9966 msgid " (see more in file %s)"

9967 msgstr " (veja mais no ficheiro %s)"

9968

9937 -#: wt-status.c:1331

9969 +#: wt-status.c:1381

9970 msgid "No commands remaining."

9971 msgstr "Nenhum comando por concluir."

9972

9941 -#: wt-status.c:1334

9973 +#: wt-status.c:1384

9974 #, c-format

9975 msgid "Next command to do (%d remaining command):"

9976 msgid_plural "Next commands to do (%d remaining commands):"

9977 msgstr[0] "Próximo comando a executar (%d comando restante):"

9978 msgstr[1] "Próximos comandos a executar (%d comandos restantes):"

9979

9948 -#: wt-status.c:1342

9980 +#: wt-status.c:1392

9981 msgid " (use \"git rebase --edit-todo\" to view and edit)"

9982 msgstr " (use \"git rebase --edit-todo\" para visualizar e editar)"

9983

9952 -#: wt-status.c:1354

9984 +#: wt-status.c:1404

9985 #, c-format

9986 msgid "You are currently rebasing branch '%s' on '%s'."

9987 msgstr "Está a realizar rebase do ramo '%s' sobre '%s'."

9988

9957 -#: wt-status.c:1359

9989 +#: wt-status.c:1409

9990 msgid "You are currently rebasing."

9991 msgstr "Está a rebasear neste momento."

9992

9961 -#: wt-status.c:1372

9993 +#: wt-status.c:1422

9994 msgid " (fix conflicts and then run \"git rebase --continue\")"

9995 msgstr " (corrija os conflitos e execute \"git rebase --continue\")"

9996

9965 -#: wt-status.c:1374

9997 +#: wt-status.c:1424

9998 msgid " (use \"git rebase --skip\" to skip this patch)"

9999 msgstr " (use \"git rebase --skip\" para ignorar este patch)"

10000

9969 -#: wt-status.c:1376

10001 +#: wt-status.c:1426

10002 msgid " (use \"git rebase --abort\" to check out the original branch)"

10003 msgstr " (use \"git rebase --abort\" para restaurar o ramo original)"

10004

9973 -#: wt-status.c:1383

10005 +#: wt-status.c:1433

10006 msgid " (all conflicts fixed: run \"git rebase --continue\")"

10007 msgstr ""

10008 " (todos os conflitos foram corrigidos: execute \"git rebase --continue\")"

10009

9978 -#: wt-status.c:1387

10010 +#: wt-status.c:1437

10011 #, c-format

10012 msgid ""

10013 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -9983,166 +10015,171 @@ msgstr ""

10015 "Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' "

10016 "sobre '%s'."

10017

9986 -#: wt-status.c:1392

10018 +#: wt-status.c:1442

10019 msgid "You are currently splitting a commit during a rebase."

10020 msgstr "Está a dividir um commit durante um rebase."

10021

9990 -#: wt-status.c:1395

10022 +#: wt-status.c:1445

10023 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

10024 msgstr ""

10025 " (Assim que o diretório de trabalho estiver limpo, execute \"git rebase --"

10026 "continue\")"

10027

9996 -#: wt-status.c:1399

10028 +#: wt-status.c:1449

10029 #, c-format

10030 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

10031 msgstr ""

10032 "Está a editar um commit ao mesmo tempo que efetua rebase do ramo '%s' sobre "

10033 "'%s'."

10034

10003 -#: wt-status.c:1404

10035 +#: wt-status.c:1454

10036 msgid "You are currently editing a commit during a rebase."

10037 msgstr "Está a editar um commit durante um rebase."

10038

10007 -#: wt-status.c:1407

10039 +#: wt-status.c:1457

10040 msgid " (use \"git commit --amend\" to amend the current commit)"

10041 msgstr " (use \"git commit --amend\" para emendar o commit atual)"

10042

10011 -#: wt-status.c:1409

10043 +#: wt-status.c:1459

10044 msgid ""

10045 " (use \"git rebase --continue\" once you are satisfied with your changes)"

10046 msgstr ""

l10n: pt_PT: update git-po-helper