7d3bc0806b · matheusbsbs/matheus-bagliano

@@ -215,7 +215,7 @@ msgid ""

215 msgstr ""

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

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

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

218 +"POT-Creation-Date: 2021-08-14 07:56+0800\n"

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

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

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

@@ -230,7 +230,7 @@ msgstr ""

230 msgid "Huh (%s)?"

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

232

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

233 +#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493

234 #: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528

235 #: builtin/rebase.c:1953

236 msgid "could not read index"

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

260 msgid "could not stage '%s'"

261 msgstr "incapaz de stage '%s'"

262

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

263 +#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707

264 #, fuzzy

265 msgid "could not write index"

266 msgstr "incapaz de escrever index"

@@ -430,9 +430,10 @@ msgstr "unstaged"

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

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

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

433 -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818

434 -#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

435 -#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

433 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886

434 +#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343

435 +#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589

436 +#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893

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

438 msgid "path"

439 msgstr "path"

@@ -1029,7 +1030,7 @@ msgstr ""

1030 msgid "Exiting because of an unresolved conflict."

1031 msgstr "Saindo devido a conflito por resolver."

1032

1032 -#: advice.c:283 builtin/merge.c:1374

1033 +#: advice.c:283 builtin/merge.c:1375

1034 msgid "You have not concluded your merge (MERGE_HEAD exists)."

1035 msgstr "O teu juntar ficou por concluir (MERGE_HEAD presente)."

1036

@@ -1802,7 +1803,7 @@ msgstr "incapaz ler %s"

1803

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

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

1805 -#: builtin/merge.c:1143

1806 +#: builtin/merge.c:1144

1807 #, c-format

1808 msgid "could not read '%s'"

1809 msgstr "incapaz ler '%s'"

@@ -1894,7 +1895,8 @@ msgid "list supported archive formats"

1895 msgstr "listar formatos de arquivo suportados"

1896

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

1897 -#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1898 +#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352

1899 +#: builtin/submodule--helper.c:2902

1900 msgid "repo"

1901 msgstr "repo"

1902

@@ -2088,7 +2090,7 @@ msgid "--reverse and --first-parent together require specified latest commit"

2090 msgstr ""

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

2092

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

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

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

2095 #: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346

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

@@ -2456,7 +2458,6 @@ msgid "Clearing commit marks in commit graph"

2458 msgstr ""

2459

2460 #: commit-graph.c:1424

2459 -#, fuzzy

2461 msgid "Computing commit graph topological levels"

2462 msgstr ""

2463

@@ -2530,7 +2531,6 @@ msgid "unable to open commit-graph chain file"

2531 msgstr "incapaz abrir ficheiro commit-graph chain"

2532

2533 #: commit-graph.c:1939

2533 -#, fuzzy

2534 msgid "failed to rename base commit-graph file"

2535 msgstr ""

2536

@@ -2742,12 +2742,11 @@ msgid "invalid key: %s"

2742 msgstr "chave inválida: %s"

2743

2744 #: config.c:478

2745 -#, fuzzy, c-format

2745 +#, c-format

2746 msgid "invalid key (newline): %s"

2747 msgstr ""

2748

2749 #: config.c:511

2750 -#, fuzzy

2750 msgid "empty config key"

2751 msgstr ""

2752

@@ -2767,7 +2766,7 @@ msgid "bogus count in %s"

2766 msgstr "contagem falsa em %s"

2767

2768 #: config.c:626

2770 -#, fuzzy, c-format

2769 +#, c-format

2770 msgid "too many entries in %s"

2771 msgstr ""

2772

@@ -2777,7 +2776,7 @@ msgid "missing config key %s"

2776 msgstr "ficheiro config inválido %s"

2777

2778 #: config.c:644

2780 -#, fuzzy, c-format

2779 +#, c-format

2780 msgid "missing config value %s"

2781 msgstr ""

2782

@@ -3026,12 +3025,12 @@ msgid "could not unset '%s'"

3025 msgstr "incapaz desdefinir '%s'"

3026

3027 #: config.c:3276

3029 -#, fuzzy, c-format

3028 +#, c-format

3029 msgid "invalid section name: %s"

3030 msgstr ""

3031

3032 #: config.c:3443

3034 -#, fuzzy, c-format

3033 +#, c-format

3034 msgid "missing value for '%s'"

3035 msgstr ""

3036

@@ -3076,7 +3075,7 @@ msgid "protocol error: unexpected capabilities^{}"

3075 msgstr ""

3076

3077 #: connect.c:306

3079 -#, fuzzy, c-format

3078 +#, c-format

3079 msgid "protocol error: expected shallow sha-1, got '%s'"

3080 msgstr ""

3081

@@ -3085,12 +3084,11 @@ msgid "repository on the other end cannot be shallow"

3084 msgstr ""

3085

3086 #: connect.c:347

3088 -#, fuzzy

3087 msgid "invalid packet"

3088 msgstr ""

3089

3090 #: connect.c:367

3093 -#, fuzzy, c-format

3091 +#, c-format

3092 msgid "protocol error: unexpected '%s'"

3093 msgstr ""

3094

@@ -3100,7 +3098,7 @@ msgid "unknown object format '%s' specified by server"

3098 msgstr "objeto desconhecido '%s' pelo formato em servidor."

3099

3100 #: connect.c:526

3103 -#, fuzzy, c-format

3101 +#, c-format

3102 msgid "invalid ls-refs response: %s"

3103 msgstr ""

3104

@@ -3122,7 +3120,7 @@ msgid "unable to set SO_KEEPALIVE on socket"

3120 msgstr ""

3121

3122 #: connect.c:757 connect.c:820

3125 -#, fuzzy, c-format

3123 +#, c-format

3124 msgid "Looking up %s ... "

3125 msgstr ""

3126

@@ -3160,7 +3158,7 @@ msgid "unable to look up %s (%s)"

3158 msgstr "incapaz procurar %s (%s)"

3159

3160 #: connect.c:830

3163 -#, fuzzy, c-format

3161 +#, c-format

3162 msgid "unknown port %s"

3163 msgstr ""

3164

@@ -3319,7 +3317,6 @@ msgid "external filter '%s' failed"

3317 msgstr "filtro externo '%s' falhou"

3318

3319 #: convert.c:826

3322 -#, fuzzy

3320 msgid "unexpected filter type"

3321 msgstr ""

3322

@@ -3327,23 +3324,23 @@ msgstr ""

3324 msgid "path name too long for external filter"

3325 msgstr ""

3326

3330 -#: convert.c:934

3327 +#: convert.c:935

3328 #, c-format

3329 msgid ""

3330 "external filter '%s' is not available anymore although not all paths have "

3331 "been filtered"

3332 msgstr ""

3333

3337 -#: convert.c:1234

3334 +#: convert.c:1236

3335 msgid "true/false are no valid working-tree-encodings"

3336 msgstr ""

3337

3341 -#: convert.c:1414 convert.c:1447

3342 -#, fuzzy, c-format

3338 +#: convert.c:1416 convert.c:1449

3339 +#, c-format

3340 msgid "%s: clean filter '%s' failed"

3341 msgstr ""

3342

3346 -#: convert.c:1490

3343 +#: convert.c:1492

3344 #, fuzzy, c-format

3345 msgid "%s: smudge filter %s failed"

3346 msgstr "falha ao atualizar os ficheiros"

@@ -3454,7 +3451,7 @@ msgid "bad tree object %s"

3451 msgstr "objeto árvore"

3452

3453 #: delta-islands.c:334

3457 -#, fuzzy, c-format

3454 +#, c-format

3455 msgid "failed to load island regex for '%s': %s"

3456 msgstr ""

3457

@@ -3558,7 +3555,6 @@ msgid "--name-only, --name-status, --check and -s are mutually exclusive"

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

3556

3557 #: diff.c:4637

3561 -#, fuzzy

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

3559 msgstr ""

3560

@@ -3568,9 +3564,8 @@ msgid ""

3564 msgstr ""

3565

3566 #: diff.c:4643

3571 -#, fuzzy

3567 msgid ""

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

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

3569 "with -G and -S"

3570 msgstr ""

3571

@@ -3585,7 +3580,7 @@ msgstr "valor de cor inválido: %.*s"

3580

3581 #: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318

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

3588 -#, fuzzy, c-format

3583 +#, c-format

3584 msgid "%s expects a numerical value"

3585 msgstr ""

3586

@@ -3640,12 +3635,12 @@ msgid ""

3635 msgstr ""

3636

3637 #: diff.c:5114 diff.c:5134

3643 -#, fuzzy, c-format

3638 +#, c-format

3639 msgid "invalid argument to %s"

3640 msgstr ""

3641

3642 #: diff.c:5238

3648 -#, fuzzy, c-format

3643 +#, c-format

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

3645 msgstr ""

3646

@@ -3686,12 +3681,10 @@ msgid "generate the diff in raw format"

3681 msgstr ""

3682

3683 #: diff.c:5398

3689 -#, fuzzy

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

3685 msgstr ""

3686

3687 #: diff.c:5402

3694 -#, fuzzy

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

3689 msgstr ""

3690

@@ -3731,12 +3724,10 @@ msgid "condensed summary such as creations, renames and mode changes"

3724 msgstr ""

3725

3726 #: diff.c:5430

3734 -#, fuzzy

3727 msgid "show only names of changed files"

3728 msgstr ""

3729

3730 #: diff.c:5433

3739 -#, fuzzy

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

3732 msgstr ""

3733

@@ -3850,7 +3841,6 @@ msgid "specify the character to indicate a context instead of ' '"

3841 msgstr ""

3842

3843 #: diff.c:5498

3853 -#, fuzzy

3844 msgid "Diff rename options"

3845 msgstr ""

3846

@@ -3900,7 +3890,6 @@ msgid ""

3890 msgstr ""

3891

3892 #: diff.c:5527

3903 -#, fuzzy

3893 msgid "Diff algorithm options"

3894 msgstr ""

3895

@@ -3909,17 +3898,14 @@ msgid "produce the smallest possible diff"

3898 msgstr ""

3899

3900 #: diff.c:5532

3912 -#, fuzzy

3901 msgid "ignore whitespace when comparing lines"

3902 msgstr ""

3903

3904 #: diff.c:5535

3917 -#, fuzzy

3905 msgid "ignore changes in amount of whitespace"

3906 msgstr ""

3907

3908 #: diff.c:5538

3922 -#, fuzzy

3909 msgid "ignore changes in whitespace at EOL"

3910 msgstr ""

3911

@@ -3936,7 +3922,6 @@ msgid "<regex>"

3922 msgstr ""

3923

3924 #: diff.c:5547

3939 -#, fuzzy

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

3926 msgstr ""

3927

@@ -3995,7 +3980,6 @@ msgid "how white spaces are ignored in --color-moved"

3980 msgstr ""

3981

3982 #: diff.c:5581

3998 -#, fuzzy

3983 msgid "Other diff options"

3984 msgstr ""

3985

@@ -4050,7 +4034,6 @@ msgid "specify how differences in submodules are shown"

4034 msgstr ""

4035

4036 #: diff.c:5608

4053 -#, fuzzy

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

4038 msgstr ""

4039

@@ -4138,7 +4121,8 @@ msgstr "submeter somente os ficheiros especificados"

4121 #: diff.c:6298

4122 #, fuzzy

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

4141 -msgstr "detecção de renomeação exaustiva foi ignorada devido a demasiados ficheiros."

4124 +msgstr ""

4125 +"detecção de renomeação exaustiva foi ignorada devido a demasiados ficheiros."

4126

4127 #: diff.c:6301

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

@@ -4158,7 +4142,7 @@ msgstr ""

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

4143 msgstr "falha ao ler ficheiro de comando '%s'"

4144

4161 -#: diffcore-rename.c:1510

4145 +#: diffcore-rename.c:1514

4146 msgid "Performing inexact rename detection"

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

4148

@@ -4178,50 +4162,50 @@ msgstr ""

4162 msgid "unrecognized pattern: '%s'"

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

4164

4181 -#: dir.c:792 dir.c:806

4165 +#: dir.c:790 dir.c:804

4166 #, fuzzy, c-format

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

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

4169

4186 -#: dir.c:824

4170 +#: dir.c:820

4171 #, c-format

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

4173 msgstr ""

4174

4191 -#: dir.c:834

4175 +#: dir.c:830

4176 msgid "disabling cone pattern matching"

4177 msgstr ""

4178

4195 -#: dir.c:1221

4179 +#: dir.c:1214

4180 #, fuzzy, c-format

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

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

4183

4200 -#: dir.c:2358

4184 +#: dir.c:2351

4185 #, fuzzy, c-format

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

4187 msgstr "incapaz abrir pasta '%s'"

4188

4205 -#: dir.c:2660

4189 +#: dir.c:2653

4190 msgid "failed to get kernel name and information"

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

4192

4209 -#: dir.c:2784

4193 +#: dir.c:2777

4194 #, fuzzy

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

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

4197

4214 -#: dir.c:3617

4215 -#, fuzzy, c-format

4198 +#: dir.c:3610

4199 +#, c-format

4200 msgid "index file corrupt in repo %s"

4201 msgstr ""

4202

4219 -#: dir.c:3664 dir.c:3669

4203 +#: dir.c:3657 dir.c:3662

4204 #, c-format

4205 msgid "could not create directories for %s"

4206 msgstr "incapaz criar pasta para %s"

4207

4224 -#: dir.c:3698

4208 +#: dir.c:3691

4209 #, c-format

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

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

@@ -4246,13 +4230,13 @@ msgstr "incapaz de stat o ficheiro '%s'"

4230 msgid "bad git namespace path \"%s\""

4231 msgstr ""

4232

4249 -#: environment.c:335

4233 +#: environment.c:334

4234 #, fuzzy, c-format

4235 msgid "could not set GIT_DIR to '%s'"

4236 msgstr "incapaz definir GIT_DIR para '%s'"

4237

4238 #: exec-cmd.c:363

4255 -#, fuzzy, c-format

4239 +#, c-format

4240 msgid "too many args to run %s"

4241 msgstr ""

4242

@@ -4451,7 +4435,7 @@ msgid "error reading section header '%s'"

4435 msgstr ""

4436

4437 #: fetch-pack.c:1353

4454 -#, fuzzy, c-format

4438 +#, c-format

4439 msgid "expected '%s', received '%s'"

4440 msgstr ""

4441

@@ -4479,12 +4463,12 @@ msgid "error processing shallow info: %d"

4463 msgstr ""

4464

4465 #: fetch-pack.c:1494

4482 -#, fuzzy, c-format

4466 +#, c-format

4467 msgid "expected wanted-ref, got '%s'"

4468 msgstr ""

4469

4470 #: fetch-pack.c:1499

4487 -#, fuzzy, c-format

4471 +#, c-format

4472 msgid "unexpected wanted-ref: '%s'"

4473 msgstr ""

4474

@@ -4507,7 +4491,6 @@ msgid "remote did not send all necessary objects"

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

4492

4493 #: fetch-pack.c:2065

4510 -#, fuzzy

4494 msgid "unexpected 'ready' from remote"

4495 msgstr ""

4496

@@ -4797,7 +4780,7 @@ msgid "'%s' for 'object:type=<type>' is not a valid object type"

4780 msgstr "'%s' para 'object:type=<type>' é um tipo de objecto inválido"

4781

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

4800 -#, fuzzy, c-format

4783 +#, c-format

4784 msgid "invalid filter-spec '%s'"

4785 msgstr ""

4786

@@ -4868,7 +4851,7 @@ msgid "Unable to create '%s.lock': %s"

4851 msgstr "Incapaz de criar '%s.lock': %s"

4852

4853 #: ls-refs.c:37

4871 -#, fuzzy, c-format

4854 +#, c-format

4855 msgid "invalid value '%s' for lsrefs.unborn"

4856 msgstr ""

4857

@@ -4885,39 +4868,39 @@ msgstr ""

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

4869 msgstr "ação inválida '%s' para '%s'"

4870

4888 -#: merge-ort.c:1228 merge-recursive.c:1206

4889 -#, fuzzy, c-format

4871 +#: merge-ort.c:1569 merge-recursive.c:1201

4872 +#, c-format

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

4874 msgstr ""

4875

4893 -#: merge-ort.c:1237 merge-recursive.c:1213

4894 -#, fuzzy, c-format

4876 +#: merge-ort.c:1578 merge-recursive.c:1208

4877 +#, c-format

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

4879 msgstr ""

4880

4898 -#: merge-ort.c:1246 merge-recursive.c:1220

4881 +#: merge-ort.c:1587 merge-recursive.c:1215

4882 #, c-format

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

4884 msgstr ""

4885

4903 -#: merge-ort.c:1256 merge-ort.c:1263

4904 -#, fuzzy, c-format

4886 +#: merge-ort.c:1597 merge-ort.c:1604

4887 +#, c-format

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

4889 msgstr ""

4890

4908 -#: merge-ort.c:1284

4891 +#: merge-ort.c:1625

4892 #, fuzzy, c-format

4893 msgid "Failed to merge submodule %s"

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

4895

4913 -#: merge-ort.c:1291

4914 -#, fuzzy, c-format

4896 +#: merge-ort.c:1632

4897 +#, c-format

4898 msgid ""

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

4900 "%s\n"

4901 msgstr ""

4902

4920 -#: merge-ort.c:1295 merge-recursive.c:1274

4903 +#: merge-ort.c:1636 merge-recursive.c:1269

4904 #, c-format

4905 msgid ""

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

@@ -4928,42 +4911,42 @@ msgid ""

4911 "which will accept this suggestion.\n"

4912 msgstr ""

4913

4931 -#: merge-ort.c:1308

4932 -#, fuzzy, c-format

4914 +#: merge-ort.c:1649

4915 +#, c-format

4916 msgid ""

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

4918 "%s"

4919 msgstr ""

4920

4938 -#: merge-ort.c:1527 merge-recursive.c:1363

4921 +#: merge-ort.c:1868 merge-recursive.c:1358

4922 msgid "Failed to execute internal merge"

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

4924

4942 -#: merge-ort.c:1532 merge-recursive.c:1368

4925 +#: merge-ort.c:1873 merge-recursive.c:1363

4926 #, c-format

4927 msgid "Unable to add %s to database"

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

4929

4947 -#: merge-ort.c:1539 merge-recursive.c:1401

4930 +#: merge-ort.c:1880 merge-recursive.c:1396

4931 #, c-format

4932 msgid "Auto-merging %s"

4933 msgstr "A integrar automaticamente %s"

4934

4952 -#: merge-ort.c:1678 merge-recursive.c:2123

4935 +#: merge-ort.c:2019 merge-recursive.c:2118

4936 #, c-format

4937 msgid ""

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

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

4940 msgstr ""

4941

4959 -#: merge-ort.c:1688 merge-recursive.c:2133

4942 +#: merge-ort.c:2029 merge-recursive.c:2128

4943 #, c-format

4944 msgid ""

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

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

4947 msgstr ""

4948

4966 -#: merge-ort.c:1746

4949 +#: merge-ort.c:2087

4950 #, c-format

4951 msgid ""

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

@@ -4971,49 +4954,49 @@ msgid ""

4954 "majority of the files."

4955 msgstr ""

4956

4974 -#: merge-ort.c:1900 merge-recursive.c:2469

4957 +#: merge-ort.c:2241 merge-recursive.c:2464

4958 #, c-format

4959 msgid ""

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

4961 "renamed."

4962 msgstr ""

4963

4981 -#: merge-ort.c:2044 merge-recursive.c:3252

4964 +#: merge-ort.c:2385 merge-recursive.c:3247

4965 #, c-format

4966 msgid ""

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

4968 "moving it to %s."

4969 msgstr ""

4970

4988 -#: merge-ort.c:2051 merge-recursive.c:3259

4971 +#: merge-ort.c:2392 merge-recursive.c:3254

4972 #, c-format

4973 msgid ""

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

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

4976 msgstr ""

4977

4995 -#: merge-ort.c:2064 merge-recursive.c:3255

4978 +#: merge-ort.c:2405 merge-recursive.c:3250

4979 #, c-format

4980 msgid ""

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

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

4983 msgstr ""

4984

5002 -#: merge-ort.c:2072 merge-recursive.c:3262

4985 +#: merge-ort.c:2413 merge-recursive.c:3257

4986 #, c-format

4987 msgid ""

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

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

4990 msgstr ""

4991

5009 -#: merge-ort.c:2228

4992 +#: merge-ort.c:2569

4993 #, fuzzy, c-format

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

4995 msgstr ""

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

4997 "%s->%s em %s"

4998

5016 -#: merge-ort.c:2323

4999 +#: merge-ort.c:2664

5000 #, c-format

5001 msgid ""

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

@@ -5021,62 +5004,62 @@ msgid ""

5004 "markers."

5005 msgstr ""

5006

5024 -#: merge-ort.c:2342 merge-ort.c:2366

5007 +#: merge-ort.c:2683 merge-ort.c:2707

5008 #, fuzzy, c-format

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

5010 msgstr ""

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

5012 "%s"

5013

5031 -#: merge-ort.c:2819 merge-recursive.c:3013

5014 +#: merge-ort.c:3182 merge-recursive.c:3008

5015 #, c-format

5016 msgid "cannot read object %s"

5017 msgstr "incapaz ler objeto %s"

5018

5036 -#: merge-ort.c:2822 merge-recursive.c:3016

5019 +#: merge-ort.c:3185 merge-recursive.c:3011

5020 #, c-format

5021 msgid "object %s is not a blob"

5022 msgstr "objeto %s é blob nenhum"

5023

5041 -#: merge-ort.c:3250

5024 +#: merge-ort.c:3613

5025 #, c-format

5026 msgid ""

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

5028 "%s instead."

5029 msgstr ""

5030

5048 -#: merge-ort.c:3326

5031 +#: merge-ort.c:3689

5032 #, c-format

5033 msgid ""

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

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

5036 msgstr ""

5037

5055 -#: merge-ort.c:3333

5038 +#: merge-ort.c:3696

5039 #, c-format

5040 msgid ""

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

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

5043 msgstr ""

5044

5062 -#: merge-ort.c:3433 merge-recursive.c:3092

5045 +#: merge-ort.c:3796 merge-recursive.c:3087

5046 msgid "content"

5047 msgstr "conteúdo"

5048

5066 -#: merge-ort.c:3435 merge-recursive.c:3096

5049 +#: merge-ort.c:3798 merge-recursive.c:3091

5050 msgid "add/add"

5051 msgstr "adicionar/adicionar"

5052

5070 -#: merge-ort.c:3437 merge-recursive.c:3141

5053 +#: merge-ort.c:3800 merge-recursive.c:3136

5054 msgid "submodule"

5055 msgstr "submódulo"

5056

5074 -#: merge-ort.c:3439 merge-recursive.c:3142

5057 +#: merge-ort.c:3802 merge-recursive.c:3137

5058 #, c-format

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

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

5061

5079 -#: merge-ort.c:3470

5062 +#: merge-ort.c:3833

5063 #, fuzzy, c-format

5064 msgid ""

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

@@ -5085,7 +5068,7 @@ msgstr ""

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

5069 "deixada na árvore."

5070

5088 -#: merge-ort.c:3757

5071 +#: merge-ort.c:4120

5072 #, c-format

5073 msgid ""

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

@@ -5095,12 +5078,12 @@ msgstr ""

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

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

5080 #.

5098 -#: merge-ort.c:4116

5099 -#, fuzzy, c-format

5081 +#: merge-ort.c:4487

5082 +#, c-format

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

5084 msgstr ""

5085

5103 -#: merge-ort-wrappers.c:13 merge-recursive.c:3707

5086 +#: merge-ort-wrappers.c:13 merge-recursive.c:3702

5087 #, fuzzy, c-format

5088 msgid ""

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

@@ -5110,105 +5093,105 @@ msgstr ""

5093 "integrar:\n"

5094 "%%s"

5095

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

5096 +#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402

5097 #, fuzzy

5098 msgid "Already up to date."

5099 msgstr "Já está atualizado."

5100

5118 -#: merge-recursive.c:357

5101 +#: merge-recursive.c:352

5102 msgid "(bad commit)\n"

5103 msgstr "(commit incorreto)\n"

5104

5122 -#: merge-recursive.c:380

5105 +#: merge-recursive.c:375

5106 #, fuzzy, c-format

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

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

5109

5127 -#: merge-recursive.c:389

5110 +#: merge-recursive.c:384

5111 #, fuzzy, c-format

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

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

5114

5132 -#: merge-recursive.c:877

5115 +#: merge-recursive.c:872

5116 #, c-format

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

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

5119

5137 -#: merge-recursive.c:888

5120 +#: merge-recursive.c:883

5121 #, c-format

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

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

5124

5142 -#: merge-recursive.c:902 merge-recursive.c:921

5125 +#: merge-recursive.c:897 merge-recursive.c:916

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

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

5128

5146 -#: merge-recursive.c:911

5129 +#: merge-recursive.c:906

5130 #, c-format

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

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

5133

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

5134 +#: merge-recursive.c:947 builtin/cat-file.c:41

5135 #, c-format

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

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

5138

5156 -#: merge-recursive.c:957

5139 +#: merge-recursive.c:952

5140 #, c-format

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

5142 msgstr ""

5143

5161 -#: merge-recursive.c:982

5144 +#: merge-recursive.c:977

5145 #, c-format

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

5147 msgstr "falhou ao abrir '%s': %s"

5148

5166 -#: merge-recursive.c:993

5149 +#: merge-recursive.c:988

5150 #, c-format

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

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

5153

5171 -#: merge-recursive.c:998

5154 +#: merge-recursive.c:993

5155 #, c-format

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

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

5158

5176 -#: merge-recursive.c:1228 merge-recursive.c:1240

5159 +#: merge-recursive.c:1223 merge-recursive.c:1235

5160 #, c-format

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

5162 msgstr ""

5163

5181 -#: merge-recursive.c:1231 merge-recursive.c:1243

5164 +#: merge-recursive.c:1226 merge-recursive.c:1238

5165 #, fuzzy, c-format

5166 msgid "Fast-forwarding submodule %s"

5167 msgstr "Avançando submódulo %s"

5168

5186 -#: merge-recursive.c:1266

5169 +#: merge-recursive.c:1261

5170 #, c-format

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

5172 msgstr ""

5173

5191 -#: merge-recursive.c:1270

5192 -#, fuzzy, c-format

5174 +#: merge-recursive.c:1265

5175 +#, c-format

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

5177 msgstr ""

5178

5196 -#: merge-recursive.c:1271

5179 +#: merge-recursive.c:1266

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

5181 msgstr ""

5182

5200 -#: merge-recursive.c:1283

5183 +#: merge-recursive.c:1278

5184 #, c-format

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

5186 msgstr ""

5187

5205 -#: merge-recursive.c:1425

5188 +#: merge-recursive.c:1420

5189 #, fuzzy, c-format

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

5191 msgstr ""

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

5193

5211 -#: merge-recursive.c:1497

5194 +#: merge-recursive.c:1492

5195 #, c-format

5196 msgid ""

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

@@ -5217,7 +5200,7 @@ msgstr ""

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

5201 "deixada na árvore."

5202

5220 -#: merge-recursive.c:1502

5203 +#: merge-recursive.c:1497

5204 #, c-format

5205 msgid ""

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

@@ -5226,7 +5209,7 @@ msgstr ""

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

5210 "de %s deixada na árvore."

5211

5229 -#: merge-recursive.c:1509

5212 +#: merge-recursive.c:1504

5213 #, c-format

5214 msgid ""

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

@@ -5235,7 +5218,7 @@ msgstr ""

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

5219 "deixada na árvore em %s."

5220

5238 -#: merge-recursive.c:1514

5221 +#: merge-recursive.c:1509

5222 #, c-format

5223 msgid ""

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

@@ -5244,43 +5227,43 @@ msgstr ""

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

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

5229

5247 -#: merge-recursive.c:1549

5230 +#: merge-recursive.c:1544

5231 msgid "rename"

5232 msgstr "mudar nome"

5233

5251 -#: merge-recursive.c:1549

5234 +#: merge-recursive.c:1544

5235 msgid "renamed"

5236 msgstr "nome mudado"

5237

5255 -#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169

5238 +#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164

5239 #, fuzzy, c-format

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

5241 msgstr "Recusando perder ficheiro sujo de %s"

5242

5260 -#: merge-recursive.c:1610

5243 +#: merge-recursive.c:1605

5244 #, fuzzy, c-format

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

5246 msgstr ""

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

5248

5266 -#: merge-recursive.c:1668

5249 +#: merge-recursive.c:1663

5250 #, fuzzy, c-format

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

5252 msgstr ""

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

5254 "%s"

5255

5273 -#: merge-recursive.c:1699

5256 +#: merge-recursive.c:1694

5257 #, c-format

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

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

5260

5278 -#: merge-recursive.c:1704

5261 +#: merge-recursive.c:1699

5262 #, fuzzy, c-format

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

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

5265

5283 -#: merge-recursive.c:1731

5266 +#: merge-recursive.c:1726

5267 #, c-format

5268 msgid ""

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

@@ -5289,18 +5272,18 @@ msgstr ""

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

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

5274

5292 -#: merge-recursive.c:1736

5275 +#: merge-recursive.c:1731

5276 msgid " (left unresolved)"

5277 msgstr " (por resolver)"

5278

5296 -#: merge-recursive.c:1828

5279 +#: merge-recursive.c:1823

5280 #, c-format

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

5282 msgstr ""

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

5284 "%s->%s em %s"

5285

5303 -#: merge-recursive.c:2091

5286 +#: merge-recursive.c:2086

5287 #, c-format

5288 msgid ""

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

@@ -5308,7 +5291,7 @@ msgid ""

5291 "getting a majority of the files."

5292 msgstr ""

5293

5311 -#: merge-recursive.c:2225

5294 +#: merge-recursive.c:2220

5295 #, fuzzy, c-format

5296 msgid ""

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

@@ -5317,79 +5300,79 @@ msgstr ""

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

5301 "%s->%s em %s"

5302

5320 -#: merge-recursive.c:3080

5303 +#: merge-recursive.c:3075

5304 msgid "modify"

5305 msgstr "modificar"

5306

5324 -#: merge-recursive.c:3080

5307 +#: merge-recursive.c:3075

5308 msgid "modified"

5309 msgstr "modificado"

5310

5328 -#: merge-recursive.c:3119

5311 +#: merge-recursive.c:3114

5312 #, c-format

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

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

5315

5333 -#: merge-recursive.c:3172

5316 +#: merge-recursive.c:3167

5317 #, c-format

5318 msgid "Adding as %s instead"

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

5320

5338 -#: merge-recursive.c:3376

5321 +#: merge-recursive.c:3371

5322 #, c-format

5323 msgid "Removing %s"

5324 msgstr "A remover %s"

5325

5343 -#: merge-recursive.c:3399

5326 +#: merge-recursive.c:3394

5327 msgid "file/directory"

5328 msgstr "ficheiro/diretório"

5329

5347 -#: merge-recursive.c:3404

5330 +#: merge-recursive.c:3399

5331 msgid "directory/file"

5332 msgstr "diretório/ficheiro"

5333

5351 -#: merge-recursive.c:3411

5334 +#: merge-recursive.c:3406

5335 #, c-format

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

5337 msgstr ""

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

5339

5357 -#: merge-recursive.c:3420

5340 +#: merge-recursive.c:3415

5341 #, c-format

5342 msgid "Adding %s"

5343 msgstr "A adicionar %s"

5344

5362 -#: merge-recursive.c:3429

5345 +#: merge-recursive.c:3424

5346 #, fuzzy, c-format

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

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

5349

5367 -#: merge-recursive.c:3482

5350 +#: merge-recursive.c:3477

5351 #, c-format

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

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

5354

5372 -#: merge-recursive.c:3576

5355 +#: merge-recursive.c:3571

5356 msgid "Merging:"

5357 msgstr "A integrar:"

5358

5376 -#: merge-recursive.c:3589

5359 +#: merge-recursive.c:3584

5360 #, c-format

5361 msgid "found %u common ancestor:"

5362 msgid_plural "found %u common ancestors:"

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

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

5365

5383 -#: merge-recursive.c:3639

5366 +#: merge-recursive.c:3634

5367 msgid "merge returned no commit"

5368 msgstr "junção retornou commit nenhum"

5369

5387 -#: merge-recursive.c:3804

5370 +#: merge-recursive.c:3799

5371 #, c-format

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

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

5374

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

5375 +#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901

5376 #: builtin/stash.c:473

5377 msgid "Unable to write index."

5378 msgstr "Incapaz de escrever no index."

@@ -5399,7 +5382,7 @@ msgid "failed to read the cache"

5382 msgstr "falha ao ler a cache"

5383

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

5402 -#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821

5385 +#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821

5386 #: builtin/stash.c:267

5387 msgid "unable to write new index file"

5388 msgstr "incapaz escrever novo ficheiro index"

@@ -5460,17 +5443,17 @@ msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5443 msgstr ""

5444

5445 #: midx.c:490

5463 -#, fuzzy, c-format

5446 +#, c-format

5447 msgid "failed to add packfile '%s'"

5448 msgstr ""

5449

5450 #: midx.c:496

5468 -#, fuzzy, c-format

5451 +#, c-format

5452 msgid "failed to open pack-index '%s'"

5453 msgstr ""

5454

5455 #: midx.c:564

5473 -#, fuzzy, c-format

5456 +#, c-format

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

5458 msgstr ""

5459

@@ -5493,7 +5476,7 @@ msgid "did not see pack-file %s to drop"

5476 msgstr ""

5477

5478 #: midx.c:1034

5496 -#, fuzzy, c-format

5479 +#, c-format

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

5481 msgstr ""

5482

@@ -5513,7 +5496,7 @@ msgid "failed to remove %s"

5496 msgstr "falha ao remover %s"

5497

5498 #: midx.c:1166

5516 -#, fuzzy, c-format

5499 +#, c-format

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

5501 msgstr ""

5502

@@ -5549,12 +5532,10 @@ msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5532 msgstr ""

5533

5534 #: midx.c:1294

5552 -#, fuzzy

5535 msgid "Sorting objects by packfile"

5536 msgstr ""

5537

5538 #: midx.c:1301

5557 -#, fuzzy

5539 msgid "Verifying object offsets"

5540 msgstr ""

5541

@@ -5564,7 +5545,7 @@ msgid "failed to load pack entry for oid[%d] = %s"

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

5546

5547 #: midx.c:1323

5567 -#, fuzzy, c-format

5548 +#, c-format

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

5550 msgstr ""

5551

@@ -5725,7 +5706,7 @@ msgid "mmap failed%s"

5706 msgstr "mmap falhou%s"

5707

5708 #: object-file.c:1218

5728 -#, fuzzy, c-format

5709 +#, c-format

5710 msgid "object file %s is empty"

5711 msgstr ""

5712

@@ -5775,12 +5756,12 @@ msgid "replacement %s not found for %s"

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

5757

5758 #: object-file.c:1725

5778 -#, fuzzy, c-format

5759 +#, c-format

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

5761 msgstr ""

5762

5763 #: object-file.c:1729

5783 -#, fuzzy, c-format

5764 +#, c-format

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

5766 msgstr ""

5767

@@ -5795,12 +5776,10 @@ msgid "unable to set permission to '%s'"

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

5777

5778 #: object-file.c:1848

5798 -#, fuzzy

5779 msgid "file write error"

5780 msgstr ""

5781

5782 #: object-file.c:1868

5803 -#, fuzzy

5783 msgid "error when closing loose object file"

5784 msgstr ""

5785

@@ -5835,7 +5814,7 @@ msgid "confused by unstable object source data for %s"

5814 msgstr ""

5815

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

5838 -#, fuzzy, c-format

5817 +#, c-format

5818 msgid "failed utime() on %s"

5819 msgstr ""

5820

@@ -6020,7 +5999,7 @@ msgid "object %s is a %s, not a %s"

5999 msgstr "objeto %s é %s, é %s nenhum(a)"

6000

6001 #: object.c:250

6023 -#, fuzzy, c-format

6002 +#, c-format

6003 msgid "object %s has unknown type id %d"

6004 msgstr ""

6005

@@ -6050,12 +6029,12 @@ msgid "reverse-index file %s is too small"

6029 msgstr ""

6030

6031 #: pack-revindex.c:226

6053 -#, fuzzy, c-format

6032 +#, c-format

6033 msgid "reverse-index file %s is corrupt"

6034 msgstr ""

6035

6036 #: pack-revindex.c:234

6058 -#, fuzzy, c-format

6037 +#, c-format

6038 msgid "reverse-index file %s has unknown signature"

6039 msgstr ""

6040

@@ -6109,7 +6088,7 @@ msgid "offset beyond end of pack index for %s (truncated index?)"

6088 msgstr "offset depois do fim do índice do pacote %s (índice truncado?)"

6089

6090 #: parse-options-cb.c:20 parse-options-cb.c:24

6112 -#, fuzzy, c-format

6091 +#, c-format

6092 msgid "option `%s' expects a numerical value"

6093 msgstr ""

6094

@@ -6139,7 +6118,7 @@ msgid "%s is incompatible with %s"

6118 msgstr "%s é incompatível com %s"

6119

6120 #: parse-options.c:78

6142 -#, fuzzy, c-format

6121 +#, c-format

6122 msgid "%s : incompatible with something else"

6123 msgstr ""

6124

@@ -6174,12 +6153,12 @@ msgid "alias of --%s"

6153 msgstr ""

6154

6155 #: parse-options.c:879

6177 -#, fuzzy, c-format

6156 +#, c-format

6157 msgid "unknown option `%s'"

6158 msgstr ""

6159

6160 #: parse-options.c:881

6182 -#, fuzzy, c-format

6161 +#, c-format

6162 msgid "unknown switch `%c'"

6163 msgstr ""

6164

@@ -6348,12 +6327,12 @@ msgid "the remote end hung up unexpectedly"

6327 msgstr "O remoto desligou após contacto inicial"

6328

6329 #: pkt-line.c:369 pkt-line.c:371

6351 -#, fuzzy, c-format

6330 +#, c-format

6331 msgid "protocol error: bad line length character: %.4s"

6332 msgstr ""

6333

6334 #: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396

6356 -#, fuzzy, c-format

6335 +#, c-format

6336 msgid "protocol error: bad line length %d"

6337 msgstr ""

6338

@@ -6430,12 +6409,10 @@ msgid "could not parse git header '%.*s'"

6409 msgstr "incapaz analisar cabeçalho git '%.*s'"

6410

6411 #: range-diff.c:307

6433 -#, fuzzy

6412 msgid "failed to generate diff"

6413 msgstr ""

6414

6415 #: range-diff.c:559

6438 -#, fuzzy

6416 msgid "--left-only and --right-only are mutually exclusive"

6417 msgstr ""

6418

@@ -6450,7 +6427,6 @@ msgid "will not add file alias '%s' ('%s' already exists in index)"

6427 msgstr "%s: já existe no índice"

6428

6429 #: read-cache.c:726

6453 -#, fuzzy

6430 msgid "cannot create an empty blob in the object database"

6431 msgstr ""

6432

@@ -6508,7 +6484,7 @@ msgstr ""

6484 "A usar a versão %i"

6485

6486 #: read-cache.c:1771

6511 -#, fuzzy, c-format

6487 +#, c-format

6488 msgid "bad signature 0x%08x"

6489 msgstr ""

6490

@@ -6518,7 +6494,6 @@ msgid "bad index version %d"

6494 msgstr "versão de índice '%s' incorreta"

6495

6496 #: read-cache.c:1783

6521 -#, fuzzy

6497 msgid "bad index file sha1 signature"

6498 msgstr ""

6499

@@ -6558,10 +6533,10 @@ msgstr "entradas de estágio desordenadas para '%s'"

6533

6534 #: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095

6535 #: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183

6561 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987

6536 +#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987

6537 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505

6538 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291

6564 -#: builtin/submodule--helper.c:331

6539 +#: builtin/submodule--helper.c:333

6540 msgid "index file corrupt"

6541 msgstr ""

6542

@@ -6615,37 +6590,36 @@ msgstr "incapaz refrescar index partilhado '%s'"

6590 msgid "broken index, expect %s in %s, got %s"

6591 msgstr ""

6592

6618 -#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145

6593 +#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146

6594 #, c-format

6595 msgid "could not close '%s'"

6596 msgstr "incapaz fechar '%s'"

6597

6623 -#: read-cache.c:3074

6624 -#, fuzzy

6598 +#: read-cache.c:3075

6599 msgid "failed to convert to a sparse-index"

6600 msgstr ""

6601

6628 -#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440

6602 +#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440

6603 #, fuzzy, c-format

6604 msgid "could not stat '%s'"

6605 msgstr "incapaz obter estatutário '%s'"

6606

6633 -#: read-cache.c:3158

6607 +#: read-cache.c:3159

6608 #, c-format

6609 msgid "unable to open git dir: %s"

6610 msgstr "incapaz abrir pasta git: %s"

6611

6638 -#: read-cache.c:3170

6612 +#: read-cache.c:3171

6613 #, c-format

6614 msgid "unable to unlink: %s"

6615 msgstr "incapaz deslinkar: %s"

6616

6643 -#: read-cache.c:3199

6617 +#: read-cache.c:3200

6618 #, fuzzy, c-format

6619 msgid "cannot fix permission bits on '%s'"

6620 msgstr "incapaz arranjar bits de permissão em '%s'"

6621

6648 -#: read-cache.c:3348

6622 +#: read-cache.c:3349

6623 #, fuzzy, c-format

6624 msgid "%s: cannot drop to stage #0"

6625 msgstr "%s: incapaz baixar para estágio #0"

@@ -7047,17 +7021,17 @@ msgstr "ignorando ref com nome quebrado %s"

7021 msgid "ignoring broken ref %s"

7022 msgstr "a referência %s danificada foi ignorada"

7023

7050 -#: ref-filter.c:2498

7024 +#: ref-filter.c:2502

7025 #, c-format

7026 msgid "format: %%(end) atom missing"

7027 msgstr "formato: falta átomo %%(end)"

7028

7055 -#: ref-filter.c:2592

7029 +#: ref-filter.c:2596

7030 #, c-format

7031 msgid "malformed object name %s"

7032 msgstr "nome de objeto malformado %s"

7033

7060 -#: ref-filter.c:2597

7034 +#: ref-filter.c:2601

7035 #, fuzzy, c-format

7036 msgid "option `%s' must point to a commit"

7037 msgstr "opção '%s' tem apontar para um commit"

@@ -7118,7 +7092,7 @@ msgid "refusing to update ref with bad name '%s'"

7092 msgstr "recusando atualizar ref com nome inválido '%s'"

7093

7094 #: refs.c:1157

7121 -#, fuzzy, c-format

7095 +#, c-format

7096 msgid "update_ref failed for ref '%s': %s"

7097 msgstr ""

7098

@@ -7162,7 +7136,7 @@ msgid "could not delete references: %s"

7136 msgstr "incapaz apagar referências: %s"

7137

7138 #: refspec.c:170

7165 -#, fuzzy, c-format

7139 +#, c-format

7140 msgid "invalid refspec '%s'"

7141 msgstr ""

7142

@@ -7442,7 +7416,7 @@ msgid "there were errors while writing '%s' (%s)"

7416 msgstr ""

7417

7418 #: rerere.c:482

7445 -#, fuzzy, c-format

7419 +#, c-format

7420 msgid "failed to flush '%s'"

7421 msgstr ""

7422

@@ -7452,12 +7426,12 @@ msgid "could not parse conflict hunks in '%s'"

7426 msgstr "incapaz analisar pedaços conflituosos em '%s'"

7427

7428 #: rerere.c:668

7455 -#, fuzzy, c-format

7429 +#, c-format

7430 msgid "failed utime() on '%s'"

7431 msgstr ""

7432

7433 #: rerere.c:678

7460 -#, fuzzy, c-format

7434 +#, c-format

7435 msgid "writing '%s' failed"

7436 msgstr ""

7437

@@ -7487,7 +7461,7 @@ msgid "Recorded preimage for '%s'"

7461 msgstr ""

7462

7463 #: rerere.c:865 submodule.c:2076 builtin/log.c:2002

7490 -#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890

7464 +#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848

7465 #, c-format

7466 msgid "could not create directory '%s'"

7467 msgstr "incapaz criar pasta '%s'"

@@ -7527,7 +7501,7 @@ msgstr "incapaz abrir pasta rr-cache"

7501 msgid "could not determine HEAD revision"

7502 msgstr "incapaz determinar revisão de HEAD"

7503

7530 -#: reset.c:70 reset.c:76 sequencer.c:3689

7504 +#: reset.c:69 reset.c:75 sequencer.c:3689

7505 #, fuzzy, c-format

7506 msgid "failed to find tree of %s"

7507 msgstr "Falha ao procurar árvore de %s."

@@ -7739,7 +7713,7 @@ msgid "unable to dequote value of '%s'"

7713 msgstr "incapaz retirar valor, da citação '%s'"

7714

7715 #: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729

7742 -#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910

7716 +#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910

7717 #, c-format

7718 msgid "could not open '%s' for reading"

7719 msgstr "incapaz abrir '%s' para leitura"

@@ -7757,7 +7731,7 @@ msgid "'GIT_AUTHOR_DATE' already given"

7731 msgstr ""

7732

7733 #: sequencer.c:851

7760 -#, fuzzy, c-format

7734 +#, c-format

7735 msgid "unknown variable '%s'"

7736 msgstr ""

7737

@@ -7887,7 +7861,7 @@ msgstr "incapaz processar HEAD"

7861 msgid "HEAD %s is not a commit!"

7862 msgstr "HEAD %s é commit nenhum!"

7863

7890 -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702

7864 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705

7865 msgid "could not parse HEAD commit"

7866 msgstr "incapaz analisar commit HEAD"

7867

@@ -7896,7 +7870,7 @@ msgstr "incapaz analisar commit HEAD"

7870 msgid "unable to parse commit author"

7871 msgstr "incapaz processar autor de commit"

7872

7899 -#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706

7873 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707

7874 msgid "git write-tree failed to write a tree"

7875 msgstr ""

7876

@@ -7906,7 +7880,7 @@ msgid "unable to read commit message from '%s'"

7880 msgstr "incapaz ler mensagem de commit de '%s'"

7881

7882 #: sequencer.c:1485 sequencer.c:1517

7909 -#, fuzzy, c-format

7883 +#, c-format

7884 msgid "invalid author identity '%s'"

7885 msgstr ""

7886

@@ -7914,8 +7888,8 @@ msgstr ""

7888 msgid "corrupt author: missing date information"

7889 msgstr ""

7890

7917 -#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909

7918 -#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78

7891 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910

7892 +#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78

7893 msgid "failed to write commit object"

7894 msgstr ""

7895

@@ -8052,7 +8026,7 @@ msgid "%s does not accept arguments: '%s'"

8026 msgstr "%s rejeita argumentos: '%s'"

8027

8028 #: sequencer.c:2434

8055 -#, fuzzy, c-format

8029 +#, c-format

8030 msgid "missing arguments for %s"

8031 msgstr ""

8032

@@ -8195,7 +8169,6 @@ msgid "no cherry-pick in progress"

8169 msgstr "cherry-pick nenhum em curso"

8170

8171 #: sequencer.c:3239

8198 -#, fuzzy

8172 msgid "failed to skip the commit"

8173 msgstr ""

8174

@@ -8609,7 +8582,7 @@ msgstr[0] "versão de repo é 0, mas encontrou-se extensão vi-only:"

8582 msgstr[1] "versão de repo é 0, mas encontrou-se extensões vi-only:"

8583

8584 #: setup.c:701

8612 -#, fuzzy, c-format

8585 +#, c-format

8586 msgid "error opening '%s'"

8587 msgstr ""

8588

@@ -8659,7 +8632,7 @@ msgid "cannot come back to cwd"

8632 msgstr "incapaz de voltar para cwd"

8633

8634 #: setup.c:988

8662 -#, fuzzy, c-format

8635 +#, c-format

8636 msgid "failed to stat '%*s%s%s'"

8637 msgstr ""

8638

@@ -8707,7 +8680,6 @@ msgid "fork failed"

8680 msgstr "falha ao invocar fseek"

8681

8682 #: setup.c:1450 t/helper/test-simple-ipc.c:285

8710 -#, fuzzy

8683 msgid "setsid failed"

8684 msgstr ""

8685

@@ -8715,12 +8687,12 @@ msgstr ""

8687 msgid "attempting to use sparse-index without cone mode"

8688 msgstr ""

8689

8718 -#: sparse-index.c:174

8690 +#: sparse-index.c:176

8691 #, fuzzy

8692 msgid "unable to update cache-tree, staying full"

8693 msgstr "incapaz atualizar árvore de cache"

8694

8723 -#: sparse-index.c:261

8695 +#: sparse-index.c:263

8696 #, c-format

8697 msgid "index entry is a directory, but not sparse (%08x)"

8698 msgstr ""

@@ -8874,7 +8846,7 @@ msgstr ""

8846 msgid "process for submodule '%s' failed"

8847 msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"

8848

8877 -#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469

8849 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486

8850 msgid "Failed to resolve HEAD as a valid ref."

8851 msgstr "Falha ao resolver HEAD numa referência válida."

8852

@@ -9000,7 +8972,7 @@ msgid "ls-tree returned unexpected return code %d"

8972 msgstr "ls-tree retornou código de retorno inesperado %d"

8973

8974 #: symlinks.c:244

9003 -#, fuzzy, c-format

8975 +#, c-format

8976 msgid "failed to lstat '%s'"

8977 msgstr ""

8978

@@ -9085,7 +9057,7 @@ msgid "this remote helper should implement refspec capability"

9057 msgstr ""

9058

9059 #: transport-helper.c:287 transport-helper.c:429

9088 -#, fuzzy, c-format

9060 +#, c-format

9061 msgid "%s unexpectedly said: '%s'"

9062 msgstr ""

9063

@@ -9100,7 +9072,6 @@ msgid "couldn't run fast-import"

9072 msgstr "incapaz executar fast-import"

9073

9074 #: transport-helper.c:520

9103 -#, fuzzy

9075 msgid "error while running fast-import"

9076 msgstr ""

9077

@@ -9119,7 +9090,6 @@ msgid "setting remote service path not supported by protocol"

9090 msgstr ""

9091

9092 #: transport-helper.c:618

9122 -#, fuzzy

9093 msgid "invalid remote service path"

9094 msgstr ""

9095

@@ -9142,7 +9112,7 @@ msgid "'option' without a matching 'ok/error' directive"

9112 msgstr ""

9113

9114 #: transport-helper.c:798

9145 -#, fuzzy, c-format

9115 +#, c-format

9116 msgid "expected ok/error, helper said '%s'"

9117 msgstr ""

9118

@@ -9196,7 +9166,6 @@ msgid "couldn't run fast-export"

9166 msgstr "incapaz executar fast-export"

9167

9168 #: transport-helper.c:1117

9199 -#, fuzzy

9169 msgid "error while running fast-export"

9170 msgstr ""

9171

@@ -9218,22 +9187,22 @@ msgid "malformed response in ref list: %s"

9187 msgstr "resposta em lista de ref malformada: %s"

9188

9189 #: transport-helper.c:1385

9221 -#, fuzzy, c-format

9190 +#, c-format

9191 msgid "read(%s) failed"

9192 msgstr ""

9193

9194 #: transport-helper.c:1412

9226 -#, fuzzy, c-format

9195 +#, c-format

9196 msgid "write(%s) failed"

9197 msgstr ""

9198

9199 #: transport-helper.c:1461

9231 -#, fuzzy, c-format

9200 +#, c-format

9201 msgid "%s thread failed"

9202 msgstr ""

9203

9204 #: transport-helper.c:1465

9236 -#, fuzzy, c-format

9205 +#, c-format

9206 msgid "%s thread failed to join: %s"

9207 msgstr ""

9208

@@ -9248,7 +9217,7 @@ msgid "%s process failed to wait"

9217 msgstr ""

9218

9219 #: transport-helper.c:1529

9251 -#, fuzzy, c-format

9220 +#, c-format

9221 msgid "%s process failed"

9222 msgstr ""

9223

@@ -9622,7 +9591,7 @@ msgstr ""

9591 msgid "Updating index flags"

9592 msgstr "Atualizando flags de cenário"

9593

9625 -#: unpack-trees.c:2707

9594 +#: unpack-trees.c:2718

9595 #, c-format

9596 msgid "worktree and untracked commit have duplicate entries: %s"

9597 msgstr ""

@@ -9710,12 +9679,10 @@ msgid ".git file broken"

9679 msgstr ""

9680

9681 #: worktree.c:616

9713 -#, fuzzy

9682 msgid ".git file incorrect"

9683 msgstr ""

9684

9685 #: worktree.c:722

9718 -#, fuzzy

9686 msgid "not a valid path"

9687 msgstr ""

9688

@@ -9743,7 +9710,6 @@ msgid "gitdir incorrect"

9710 msgstr ""

9711

9712 #: worktree.c:771

9746 -#, fuzzy

9713 msgid "not a valid directory"

9714 msgstr ""

9715

@@ -10349,7 +10315,7 @@ msgid "could not read IPC response"

10315 msgstr "incapaz de ler ref %s"

10316

10317 #: compat/simple-ipc/ipc-unix-socket.c:866

10352 -#, fuzzy, c-format

10318 +#, c-format

10319 msgid "could not start accept_thread '%s'"

10320 msgstr ""

10321

@@ -10435,7 +10401,7 @@ msgstr "simular ação"

10401 msgid "interactive picking"

10402 msgstr "seleção interativa"

10403

10438 -#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308

10404 +#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308

10405 msgid "select hunks interactively"

10406 msgstr "selecionar blocos interativamente"

10407

@@ -10528,17 +10494,14 @@ msgid "adding files failed"

10494 msgstr "falha ao adicionar ficheiros"

10495

10496 #: builtin/add.c:488

10531 -#, fuzzy

10497 msgid "--dry-run is incompatible with --interactive/--patch"

10498 msgstr ""

10499

10500 #: builtin/add.c:490 builtin/commit.c:357

10536 -#, fuzzy

10501 msgid "--pathspec-from-file is incompatible with --interactive/--patch"

10502 msgstr ""

10503

10504 #: builtin/add.c:507

10541 -#, fuzzy

10505 msgid "--pathspec-from-file is incompatible with --edit"

10506 msgstr ""

10507

@@ -10555,13 +10518,13 @@ msgstr "A opção --ignore-missing só pode ser usada em conjunto com --dry-run"

10518 msgid "--chmod param '%s' must be either -x or +x"

10519 msgstr "o parâmetro '%s' de --chmod tem de ser -x ou +x"

10520

10558 -#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363

10521 +#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363

10522 #: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633

10523 #, fuzzy

10524 msgid "--pathspec-from-file is incompatible with pathspec arguments"

10525 msgstr "--patch é incompatível com --{hard,mixed,soft}"

10526

10564 -#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369

10527 +#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369

10528 #: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639

10529 msgid "--pathspec-file-nul requires --pathspec-from-file"

10530 msgstr ""

@@ -10793,7 +10756,7 @@ msgid "Invalid value for --show-current-patch: %s"

10756 msgstr "Valor inválido de --patch-format: %s"

10757

10758 #: builtin/am.c:2231

10796 -#, fuzzy, c-format

10759 +#, c-format

10760 msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"

10761 msgstr ""

10762

@@ -11011,7 +10974,6 @@ msgid "git archive: expected a flush"

10974 msgstr "git archive: esvaziamento de cache (flush) esperado"

10975

10976 #: builtin/bisect--helper.c:23

11014 -#, fuzzy

10977 msgid "git bisect--helper --bisect-reset [<commit>]"

10978 msgstr ""

10979

@@ -11036,27 +10998,22 @@ msgid ""

10998 msgstr ""

10999

11000 #: builtin/bisect--helper.c:28

11039 -#, fuzzy

11001 msgid "git bisect--helper --bisect-next"

11002 msgstr ""

11003

11004 #: builtin/bisect--helper.c:29

11044 -#, fuzzy

11005 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"

11006 msgstr ""

11007

11008 #: builtin/bisect--helper.c:30

11049 -#, fuzzy

11009 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"

11010 msgstr ""

11011

11012 #: builtin/bisect--helper.c:31

11054 -#, fuzzy

11013 msgid "git bisect--helper --bisect-replay <filename>"

11014 msgstr ""

11015

11016 #: builtin/bisect--helper.c:32

11059 -#, fuzzy

11017 msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"

11018 msgstr ""

11019

@@ -11226,7 +11183,7 @@ msgid "bad HEAD - strange symbolic ref"

11183 msgstr "HEAD incorreta - referência simbólica desconhecida"

11184

11185 #: builtin/bisect--helper.c:757

11229 -#, fuzzy, c-format

11186 +#, c-format

11187 msgid "invalid ref: '%s'"

11188 msgstr ""

11189

@@ -11278,7 +11235,6 @@ msgid "cannot read file '%s' for replaying"

11235 msgstr "incapaz ler $file para reproduzir"

11236

11237 #: builtin/bisect--helper.c:1056

11281 -#, fuzzy

11238 msgid "reset the bisection state"

11239 msgstr ""

11240

@@ -11305,7 +11261,6 @@ msgid "mark the state of ref (or refs)"

11261 msgstr ""

11262

11263 #: builtin/bisect--helper.c:1068

11308 -#, fuzzy

11264 msgid "list the bisection steps so far"

11265 msgstr ""

11266

@@ -11373,7 +11328,6 @@ msgid "invalid color '%s' in color.blame.repeatedLines"

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

11329

11330 #: builtin/blame.c:746

11376 -#, fuzzy

11331 msgid "invalid value for blame.coloring"

11332 msgstr ""

11333

@@ -11403,7 +11357,7 @@ msgstr "Tratar commits raiz como limite nenhum (Predefinição: desativado)"

11357 msgid "show work cost statistics"

11358 msgstr "Mostrar estatísticas de custo de atividade"

11359

11406 -#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94

11360 +#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94

11361 #: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179

11362 #: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119

11363 #: builtin/push.c:566 builtin/send-pack.c:198

@@ -11477,7 +11431,6 @@ msgid "ignore <rev> when blaming"

11431 msgstr "ignorar o índice ao verificar"

11432

11433 #: builtin/blame.c:884

11480 -#, fuzzy

11434 msgid "ignore revisions from <file>"

11435 msgstr ""

11436

@@ -12231,7 +12184,7 @@ msgstr "ler os nomes dos ficheiros da entrada padrão"

12184 msgid "terminate input and output records by a NUL character"

12185 msgstr "terminar registos da entrada e da saída com um carácter NUL"

12186

12234 -#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549

12187 +#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549

12188 #: builtin/worktree.c:493

12189 msgid "suppress progress reporting"

12190 msgstr "suprimir informação de progresso"

@@ -12291,9 +12244,10 @@ msgid "git checkout--worker [<options>]"

12244 msgstr "git checkout--worker [<opções>]"

12245

12246 #: builtin/checkout--worker.c:118 builtin/checkout-index.c:201

12294 -#: builtin/column.c:31 builtin/submodule--helper.c:1824

12295 -#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835

12296 -#: builtin/submodule--helper.c:2333 builtin/worktree.c:491

12247 +#: builtin/column.c:31 builtin/submodule--helper.c:1892

12248 +#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903

12249 +#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896

12250 +#: builtin/submodule--helper.c:2899 builtin/worktree.c:491

12251 #: builtin/worktree.c:728

12252 msgid "string"

12253 msgstr "cadeia"

@@ -12391,118 +12345,118 @@ msgstr "path '%s': incapaz juntar"

12345 msgid "Unable to add merge result for '%s'"

12346 msgstr "Impossível adicionar o resultado da junção para '%s'"

12347

12394 -#: builtin/checkout.c:414

12348 +#: builtin/checkout.c:411

12349 #, c-format

12350 msgid "Recreated %d merge conflict"

12351 msgid_plural "Recreated %d merge conflicts"

12352 msgstr[0] ""

12353 msgstr[1] ""

12354

12401 -#: builtin/checkout.c:419

12355 +#: builtin/checkout.c:416

12356 #, fuzzy, c-format

12357 msgid "Updated %d path from %s"

12358 msgid_plural "Updated %d paths from %s"

12359 msgstr[0] "%d caminho atualizado"

12360 msgstr[1] "%d caminhos atualizados"

12361

12408 -#: builtin/checkout.c:426

12409 -#, fuzzy, c-format

12362 +#: builtin/checkout.c:423

12363 +#, c-format

12364 msgid "Updated %d path from the index"

12365 msgid_plural "Updated %d paths from the index"

12366 msgstr[0] ""

12367 msgstr[1] ""

12368

12415 -#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455

12416 -#: builtin/checkout.c:459

12369 +#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452

12370 +#: builtin/checkout.c:456

12371 #, c-format

12372 msgid "'%s' cannot be used with updating paths"

12373 msgstr "'%s' incapaz ser usado com paths em atualização"

12374

12421 -#: builtin/checkout.c:462 builtin/checkout.c:465

12375 +#: builtin/checkout.c:459 builtin/checkout.c:462

12376 #, c-format

12377 msgid "'%s' cannot be used with %s"

12378 msgstr "'%s' incapaz ser usado com %s"

12379

12426 -#: builtin/checkout.c:469

12380 +#: builtin/checkout.c:466

12381 #, c-format

12382 msgid "Cannot update paths and switch to branch '%s' at the same time."

12383 msgstr "Incapaz atualizar paths e mudar para ramo '%s' ao mesmo tempo."

12384

12431 -#: builtin/checkout.c:473

12385 +#: builtin/checkout.c:470

12386 #, c-format

12387 msgid "neither '%s' or '%s' is specified"

12388 msgstr ""

12389

12436 -#: builtin/checkout.c:477

12390 +#: builtin/checkout.c:474

12391 #, fuzzy, c-format

12392 msgid "'%s' must be used when '%s' is not specified"

12393 msgstr "'%s' tem de ser usado quando '%s' está por ser especificado"

12394

12441 -#: builtin/checkout.c:482 builtin/checkout.c:487

12395 +#: builtin/checkout.c:479 builtin/checkout.c:484

12396 #, fuzzy, c-format

12397 msgid "'%s' or '%s' cannot be used with %s"

12398 msgstr "'%s' ou '%s' impossível ser usado com %s"

12399

12446 -#: builtin/checkout.c:563 builtin/checkout.c:570

12400 +#: builtin/checkout.c:558 builtin/checkout.c:565

12401 #, c-format

12402 msgid "path '%s' is unmerged"

12403 msgstr "path '%s' está por juntar"

12404

12451 -#: builtin/checkout.c:739

12405 +#: builtin/checkout.c:734

12406 msgid "you need to resolve your current index first"

12407 msgstr "primeiro deve resolver o índice atual"

12408

12455 -#: builtin/checkout.c:793

12409 +#: builtin/checkout.c:788

12410 #, c-format

12411 msgid ""

12412 "cannot continue with staged changes in the following files:\n"

12413 "%s"

12414 msgstr ""

12415

12462 -#: builtin/checkout.c:886

12416 +#: builtin/checkout.c:881

12417 #, c-format

12418 msgid "Can not do reflog for '%s': %s\n"

12419 msgstr "Incapaz fazer reflog para '%s': %s\n"

12420

12467 -#: builtin/checkout.c:928

12421 +#: builtin/checkout.c:923

12422 msgid "HEAD is now at"

12423 msgstr "HEAD está agora em"

12424

12471 -#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203

12425 +#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203

12426 msgid "unable to update HEAD"

12427 msgstr "incapaz atualizar HEAD"

12428

12475 -#: builtin/checkout.c:936

12429 +#: builtin/checkout.c:931

12430 #, c-format

12431 msgid "Reset branch '%s'\n"

12432 msgstr "Repor ramo '%s'\n"

12433

12480 -#: builtin/checkout.c:939

12434 +#: builtin/checkout.c:934

12435 #, c-format

12436 msgid "Already on '%s'\n"

12437 msgstr "Já em '%s'\n"

12438

12485 -#: builtin/checkout.c:943

12439 +#: builtin/checkout.c:938

12440 #, c-format

12441 msgid "Switched to and reset branch '%s'\n"

12442 msgstr "Mudou para e repôs o ramo '%s'\n"

12443

12490 -#: builtin/checkout.c:945 builtin/checkout.c:1376

12444 +#: builtin/checkout.c:940 builtin/checkout.c:1371

12445 #, c-format

12446 msgid "Switched to a new branch '%s'\n"

12447 msgstr "Mudou para o novo ramo '%s'\n"

12448

12495 -#: builtin/checkout.c:947

12449 +#: builtin/checkout.c:942

12450 #, c-format

12451 msgid "Switched to branch '%s'\n"

12452 msgstr "Mudou para o ramo '%s'\n"

12453

12500 -#: builtin/checkout.c:998

12454 +#: builtin/checkout.c:993

12455 #, c-format

12456 msgid " ... and %d more.\n"

12457 msgstr " ... e mais %d.\n"

12458

12505 -#: builtin/checkout.c:1004

12459 +#: builtin/checkout.c:999

12460 #, c-format

12461 msgid ""

12462 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -12525,7 +12479,7 @@ msgstr[1] ""

12479 "\n"

12480 "%s\n"

12481

12528 -#: builtin/checkout.c:1023

12482 +#: builtin/checkout.c:1018

12483 #, c-format

12484 msgid ""

12485 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -12552,26 +12506,26 @@ msgstr[1] ""

12506 " git branch <nome-do-novo-ramo> %s\n"

12507 "\n"

12508

12555 -#: builtin/checkout.c:1058

12509 +#: builtin/checkout.c:1053

12510 msgid "internal error in revision walk"

12511 msgstr "erro interno durante o curso de revisões"

12512

12559 -#: builtin/checkout.c:1062

12513 +#: builtin/checkout.c:1057

12514 msgid "Previous HEAD position was"

12515 msgstr "A posição anterior de HEAD era"

12516

12563 -#: builtin/checkout.c:1102 builtin/checkout.c:1371

12517 +#: builtin/checkout.c:1097 builtin/checkout.c:1366

12518 msgid "You are on a branch yet to be born"

12519 msgstr "Está num ramo ainda por nascer"

12520

12567 -#: builtin/checkout.c:1184

12521 +#: builtin/checkout.c:1179

12522 #, c-format

12523 msgid ""

12524 "'%s' could be both a local file and a tracking branch.\n"

12525 "Please use -- (and optionally --no-guess) to disambiguate"

12526 msgstr ""

12527

12574 -#: builtin/checkout.c:1191

12528 +#: builtin/checkout.c:1186

12529 msgid ""

12530 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"

12531 "you can do so by fully qualifying the name with the --track option:\n"

@@ -12583,217 +12537,214 @@ msgid ""

12537 "checkout.defaultRemote=origin in your config."

12538 msgstr ""

12539

12586 -#: builtin/checkout.c:1201

12540 +#: builtin/checkout.c:1196

12541 #, fuzzy, c-format

12542 msgid "'%s' matched multiple (%d) remote tracking branches"

12543 msgstr "atuar sobre ramos de monitorização remotos"

12544

12591 -#: builtin/checkout.c:1267

12545 +#: builtin/checkout.c:1262

12546 #, fuzzy

12547 msgid "only one reference expected"

12548 msgstr "esperava-se apenas uma referência, %d fornecidas."

12549

12596 -#: builtin/checkout.c:1284

12550 +#: builtin/checkout.c:1279

12551 #, c-format

12552 msgid "only one reference expected, %d given."

12553 msgstr "esperava-se apenas uma referência, %d fornecidas."

12554

12601 -#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436

12555 +#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436

12556 #, c-format

12557 msgid "invalid reference: %s"

12558 msgstr "referência inválida: %s"

12559

12606 -#: builtin/checkout.c:1343 builtin/checkout.c:1709

12560 +#: builtin/checkout.c:1338 builtin/checkout.c:1707

12561 #, c-format

12562 msgid "reference is not a tree: %s"

12563 msgstr "referência é árvore nenhuma: %s"

12564

12611 -#: builtin/checkout.c:1390

12565 +#: builtin/checkout.c:1385

12566 #, fuzzy, c-format

12567 msgid "a branch is expected, got tag '%s'"

12568 msgstr "esperado um ramo, recebi tag '%s'"

12569

12616 -#: builtin/checkout.c:1392

12570 +#: builtin/checkout.c:1387

12571 #, fuzzy, c-format

12572 msgid "a branch is expected, got remote branch '%s'"

12573 msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s."

12574

12621 -#: builtin/checkout.c:1393 builtin/checkout.c:1401

12575 +#: builtin/checkout.c:1388 builtin/checkout.c:1396

12576 #, fuzzy, c-format

12577 msgid "a branch is expected, got '%s'"

12578 msgstr "O ramo %s está a ser bissetado em %s"

12579

12626 -#: builtin/checkout.c:1396

12580 +#: builtin/checkout.c:1391

12581 #, fuzzy, c-format

12582 msgid "a branch is expected, got commit '%s'"

12583 msgstr "é suposto um branch, recebi um commit '%s'"

12584

12631 -#: builtin/checkout.c:1412

12585 +#: builtin/checkout.c:1407

12586 msgid ""

12587 "cannot switch branch while merging\n"

12588 "Consider \"git merge --quit\" or \"git worktree add\"."

12589 msgstr ""

12590

12637 -#: builtin/checkout.c:1416

12591 +#: builtin/checkout.c:1411

12592 msgid ""

12593 "cannot switch branch in the middle of an am session\n"

12594 "Consider \"git am --quit\" or \"git worktree add\"."

12595 msgstr ""

12596

12643 -#: builtin/checkout.c:1420

12597 +#: builtin/checkout.c:1415

12598 msgid ""

12599 "cannot switch branch while rebasing\n"

12600 "Consider \"git rebase --quit\" or \"git worktree add\"."

12601 msgstr ""

12602

12649 -#: builtin/checkout.c:1424

12603 +#: builtin/checkout.c:1419

12604 msgid ""

12605 "cannot switch branch while cherry-picking\n"

12606 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."

12607 msgstr ""

12608

12655 -#: builtin/checkout.c:1428

12609 +#: builtin/checkout.c:1423

12610 msgid ""

12611 "cannot switch branch while reverting\n"

12612 "Consider \"git revert --quit\" or \"git worktree add\"."

12613 msgstr ""

12614

12661 -#: builtin/checkout.c:1432

12615 +#: builtin/checkout.c:1427

12616 #, fuzzy

12617 msgid "you are switching branch while bisecting"

12618 msgstr "Está a bissetar neste momento."

12619

12666 -#: builtin/checkout.c:1439

12620 +#: builtin/checkout.c:1434

12621 msgid "paths cannot be used with switching branches"

12622 msgstr "incapaz mudar ramo com o uso de paths"

12623

12670 -#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450

12624 +#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445

12625 #, c-format

12626 msgid "'%s' cannot be used with switching branches"

12627 msgstr "incapaz de mudar ramo com o uso de '%s'"

12628

12675 -#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460

12676 -#: builtin/checkout.c:1465 builtin/checkout.c:1470

12629 +#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455

12630 +#: builtin/checkout.c:1460 builtin/checkout.c:1465

12631 #, c-format

12632 msgid "'%s' cannot be used with '%s'"

12633 msgstr "'%s' é incapaz de ser usado com '%s'"

12634

12681 -#: builtin/checkout.c:1467

12635 +#: builtin/checkout.c:1462

12636 #, fuzzy, c-format

12637 msgid "'%s' cannot take <start-point>"

12638 msgstr "'%s' incapaz receber <start-point>"

12639

12686 -#: builtin/checkout.c:1475

12640 +#: builtin/checkout.c:1470

12641 #, c-format

12642 msgid "Cannot switch branch to a non-commit '%s'"

12643 msgstr "Incapaz mudar ramo para '%s', pois está fora de ser um commit"

12644

12691 -#: builtin/checkout.c:1482

12645 +#: builtin/checkout.c:1477

12646 #, fuzzy

12647 msgid "missing branch or commit argument"

12648 msgstr "Falta um nome dum ramo; tente -b"

12649

12696 -#: builtin/checkout.c:1525

12650 +#: builtin/checkout.c:1520

12651 msgid "perform a 3-way merge with the new branch"

12652 msgstr "realizar uma integração com 3 pontos com o novo ramo"

12653

12700 -#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323

12654 +#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323

12655 msgid "style"

12656 msgstr "estilo"

12657

12704 -#: builtin/checkout.c:1527

12658 +#: builtin/checkout.c:1522

12659 msgid "conflict style (merge or diff3)"

12660 msgstr "estilo de conflito (merge ou diff3)"

12661

12708 -#: builtin/checkout.c:1539 builtin/worktree.c:488

12662 +#: builtin/checkout.c:1534 builtin/worktree.c:488

12663 msgid "detach HEAD at named commit"

12664 msgstr "destacar HEAD no commit indicado"

12665

12712 -#: builtin/checkout.c:1540

12666 +#: builtin/checkout.c:1535

12667 msgid "set upstream info for new branch"

12668 msgstr "definir a informação do ramo a montante do novo ramo"

12669

12716 -#: builtin/checkout.c:1542

12670 +#: builtin/checkout.c:1537

12671 msgid "force checkout (throw away local modifications)"

12672 msgstr "forçar extração (descartar modificações locais)"

12673

12720 -#: builtin/checkout.c:1544

12674 +#: builtin/checkout.c:1539

12675 msgid "new-branch"

12676 msgstr "novo-ramo"

12677

12724 -#: builtin/checkout.c:1544

12678 +#: builtin/checkout.c:1539

12679 msgid "new unparented branch"

12680 msgstr "novo ramo sem pai"

12681

12728 -#: builtin/checkout.c:1546 builtin/merge.c:301

12682 +#: builtin/checkout.c:1541 builtin/merge.c:301

12683 msgid "update ignored files (default)"

12684 msgstr "atualizar ficheiros ignorados (predefinição)"

12685

12732 -#: builtin/checkout.c:1549

12686 +#: builtin/checkout.c:1544

12687 msgid "do not check if another worktree is holding the given ref"

12688 msgstr "incapaz verificar se outra worktree contém referência dada"

12689

12736 -#: builtin/checkout.c:1562

12690 +#: builtin/checkout.c:1557

12691 msgid "checkout our version for unmerged files"

12692 msgstr "checkout a nossa versão dos ficheiros por juntar"

12693

12740 -#: builtin/checkout.c:1565

12694 +#: builtin/checkout.c:1560

12695 msgid "checkout their version for unmerged files"

12696 msgstr "checkout a versão deles dos ficheiros por juntar"

12697

12744 -#: builtin/checkout.c:1569

12698 +#: builtin/checkout.c:1564

12699 msgid "do not limit pathspecs to sparse entries only"

12700 msgstr "abrange especificadores de path além de entradas dispersas"

12701

12748 -#: builtin/checkout.c:1624

12749 -#, fuzzy, c-format

12702 +#: builtin/checkout.c:1622

12703 +#, c-format

12704 msgid "-%c, -%c and --orphan are mutually exclusive"

12705 msgstr ""

12706

12753 -#: builtin/checkout.c:1628

12754 -#, fuzzy

12707 +#: builtin/checkout.c:1626

12708 msgid "-p and --overlay are mutually exclusive"

12709 msgstr ""

12710

12758 -#: builtin/checkout.c:1665

12711 +#: builtin/checkout.c:1663

12712 msgid "--track needs a branch name"

12713 msgstr "--track requer um nome dum ramo"

12714

12762 -#: builtin/checkout.c:1670

12715 +#: builtin/checkout.c:1668

12716 #, fuzzy, c-format

12717 msgid "missing branch name; try -%c"

12718 msgstr "Falta um nome dum ramo; tente -b"

12719

12767 -#: builtin/checkout.c:1702

12720 +#: builtin/checkout.c:1700

12721 #, fuzzy, c-format

12722 msgid "could not resolve %s"

12723 msgstr "incapaz resolver %s"

12724

12772 -#: builtin/checkout.c:1718

12725 +#: builtin/checkout.c:1716

12726 msgid "invalid path specification"

12727 msgstr "especificação de caminho inválida"

12728

12776 -#: builtin/checkout.c:1725

12729 +#: builtin/checkout.c:1723

12730 #, c-format

12731 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"

12732 msgstr ""

12733

12781 -#: builtin/checkout.c:1729

12734 +#: builtin/checkout.c:1727

12735 #, c-format

12736 msgid "git checkout: --detach does not take a path argument '%s'"

12737 msgstr "git checkout: --detach recusa path '%s' como argumento"

12738

12786 -#: builtin/checkout.c:1738

12787 -#, fuzzy

12739 +#: builtin/checkout.c:1736

12740 msgid "--pathspec-from-file is incompatible with --detach"

12741 msgstr ""

12742

12791 -#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630

12792 -#, fuzzy

12743 +#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630

12744 msgid "--pathspec-from-file is incompatible with --patch"

12745 msgstr ""

12746

12796 -#: builtin/checkout.c:1754

12747 +#: builtin/checkout.c:1752

12748 msgid ""

12749 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

12750 "checking out of the index."

@@ -12801,80 +12752,80 @@ msgstr ""

12752 "git checkout: --ours/--theirs, --force e --merge são incompatíveis\n"

12753 "durante a extração do índice."

12754

12804 -#: builtin/checkout.c:1759

12755 +#: builtin/checkout.c:1757

12756 #, fuzzy

12757 msgid "you must specify path(s) to restore"

12758 msgstr "Deve especificar um diretório."

12759

12809 -#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836

12810 -#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170

12811 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484

12760 +#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834

12761 +#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170

12762 +#: builtin/remote.c:172 builtin/submodule--helper.c:2736

12763 +#: builtin/submodule--helper.c:2887 builtin/worktree.c:484

12764 #: builtin/worktree.c:486

12765 msgid "branch"

12766 msgstr "ramo"

12767

12816 -#: builtin/checkout.c:1786

12768 +#: builtin/checkout.c:1784

12769 msgid "create and checkout a new branch"

12770 msgstr "criar e extrair um novo ramo"

12771

12820 -#: builtin/checkout.c:1788

12772 +#: builtin/checkout.c:1786

12773 msgid "create/reset and checkout a branch"

12774 msgstr "criar/repor e extrair um ramo"

12775

12824 -#: builtin/checkout.c:1789

12776 +#: builtin/checkout.c:1787

12777 msgid "create reflog for new branch"

12778 msgstr "criar reflog do novo ramo"

12779

12828 -#: builtin/checkout.c:1791

12780 +#: builtin/checkout.c:1789

12781 #, fuzzy

12782 msgid "second guess 'git checkout <no-such-branch>' (default)"

12783 msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"

12784

12833 -#: builtin/checkout.c:1792

12834 -#, fuzzy

12785 +#: builtin/checkout.c:1790

12786 msgid "use overlay mode (default)"

12787 msgstr ""

12788

12838 -#: builtin/checkout.c:1837

12789 +#: builtin/checkout.c:1835

12790 #, fuzzy

12791 msgid "create and switch to a new branch"

12792 msgstr "criar e extrair um novo ramo"

12793

12843 -#: builtin/checkout.c:1839

12794 +#: builtin/checkout.c:1837

12795 #, fuzzy

12796 msgid "create/reset and switch to a branch"

12797 msgstr "criar/repor e extrair um ramo"

12798

12848 -#: builtin/checkout.c:1841

12799 +#: builtin/checkout.c:1839

12800 #, fuzzy

12801 msgid "second guess 'git switch <no-such-branch>'"

12802 msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"

12803

12853 -#: builtin/checkout.c:1843

12804 +#: builtin/checkout.c:1841

12805 #, fuzzy

12806 msgid "throw away local modifications"

12807 msgstr "forçar extração (descartar modificações locais)"

12808

12858 -#: builtin/checkout.c:1877

12809 +#: builtin/checkout.c:1875

12810 msgid "which tree-ish to checkout from"

12811 msgstr ""

12812

12862 -#: builtin/checkout.c:1879

12813 +#: builtin/checkout.c:1877

12814 #, fuzzy

12815 msgid "restore the index"

12816 msgstr "restaurar o cenário"

12817

12867 -#: builtin/checkout.c:1881

12818 +#: builtin/checkout.c:1879

12819 #, fuzzy

12820 msgid "restore the working tree (default)"

12821 msgstr "Mostrar o estado da árvores de trabalho"

12822

12872 -#: builtin/checkout.c:1883

12823 +#: builtin/checkout.c:1881

12824 #, fuzzy

12825 msgid "ignore unmerged entries"

12826 msgstr "ignora unmerged entries"

12827

12877 -#: builtin/checkout.c:1884

12828 +#: builtin/checkout.c:1882

12829 msgid "use overlay mode"

12830 msgstr ""

12831

@@ -13105,13 +13056,13 @@ msgstr "diretório-modelo"

13056 msgid "directory from which templates will be used"

13057 msgstr "diretório que contém os modelos usados"

13058

13108 -#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831

13109 -#: builtin/submodule--helper.c:2336

13059 +#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899

13060 +#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903

13061 msgid "reference repository"

13062 msgstr "repositório de referência"

13063

13113 -#: builtin/clone.c:123 builtin/submodule--helper.c:1833

13114 -#: builtin/submodule--helper.c:2338

13064 +#: builtin/clone.c:123 builtin/submodule--helper.c:1901

13065 +#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905

13066 msgid "use --reference only while cloning"

13067 msgstr "usar --reference apenas para clonar"

13068

@@ -13160,8 +13111,8 @@ msgstr "revisão"

13111 msgid "deepen history of shallow clone, excluding rev"

13112 msgstr "aprofundar o histórico de um clone raso, excluindo a revisão"

13113

13163 -#: builtin/clone.c:137 builtin/submodule--helper.c:1843

13164 -#: builtin/submodule--helper.c:2352

13114 +#: builtin/clone.c:137 builtin/submodule--helper.c:1911

13115 +#: builtin/submodule--helper.c:2369

13116 msgid "clone only one branch, HEAD or --branch"

13117 msgstr "clonar apenas um ramo, HEAD ou --branch"

13118

@@ -13504,7 +13455,7 @@ msgid "unexpected non-hex object ID: %s"

13455 msgstr "reutilizar o objeto de nota especificado"

13456

13457 #: builtin/commit-graph.c:160

13507 -#, fuzzy, c-format

13458 +#, c-format

13459 msgid "invalid object: %s"

13460 msgstr ""

13461

@@ -13574,17 +13525,17 @@ msgid "not a valid object name %s"

13525 msgstr "nome de objeto inválido %s"

13526

13527 #: builtin/commit-tree.c:93

13577 -#, fuzzy, c-format

13528 +#, c-format

13529 msgid "git commit-tree: failed to open '%s'"

13530 msgstr ""

13531

13532 #: builtin/commit-tree.c:96

13582 -#, fuzzy, c-format

13533 +#, c-format

13534 msgid "git commit-tree: failed to read '%s'"

13535 msgstr ""

13536

13537 #: builtin/commit-tree.c:98

13587 -#, fuzzy, c-format

13538 +#, c-format

13539 msgid "git commit-tree: failed to close '%s'"

13540 msgstr ""

13541

@@ -13594,7 +13545,6 @@ msgid "parent"

13545 msgstr "número-pai"

13546

13547 #: builtin/commit-tree.c:112

13597 -#, fuzzy

13548 msgid "id of a parent commit object"

13549 msgstr ""

13550

@@ -13609,7 +13559,6 @@ msgid "commit message"

13559 msgstr "mensagem de commit"

13560

13561 #: builtin/commit-tree.c:118

13612 -#, fuzzy

13562 msgid "read commit log message from file"

13563 msgstr ""

13564

@@ -13619,12 +13568,10 @@ msgid "GPG sign commit"

13568 msgstr "assinar o commit com GPG"

13569

13570 #: builtin/commit-tree.c:133

13622 -#, fuzzy

13571 msgid "must give exactly one tree"

13572 msgstr ""

13573

13574 #: builtin/commit-tree.c:140

13627 -#, fuzzy

13575 msgid "git commit-tree: failed to read"

13576 msgstr ""

13577

@@ -14221,36 +14168,36 @@ msgstr "aceitar o registo duma alteração vazia"

14168 msgid "ok to record a change with an empty message"

14169 msgstr "aceitar o registo duma alteração com uma mensagem vazia"

14170

14224 -#: builtin/commit.c:1747

14171 +#: builtin/commit.c:1750

14172 #, c-format

14173 msgid "Corrupt MERGE_HEAD file (%s)"

14174 msgstr "Ficheiro MERGE_HEAD roto (%s)"

14175

14229 -#: builtin/commit.c:1754

14176 +#: builtin/commit.c:1757

14177 msgid "could not read MERGE_MODE"

14178 msgstr "incapaz ler MERGE_MODE"

14179

14233 -#: builtin/commit.c:1775

14180 +#: builtin/commit.c:1778

14181 #, c-format

14182 msgid "could not read commit message: %s"

14183 msgstr "incapaz ler mensagem de commit: %s"

14184

14238 -#: builtin/commit.c:1782

14185 +#: builtin/commit.c:1785

14186 #, c-format

14187 msgid "Aborting commit due to empty commit message.\n"

14188 msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"

14189

14243 -#: builtin/commit.c:1787

14190 +#: builtin/commit.c:1790

14191 #, c-format

14192 msgid "Aborting commit; you did not edit the message.\n"

14193 msgstr "Abortando commit; mensagem ficou por editar.\n"

14194

14248 -#: builtin/commit.c:1798

14195 +#: builtin/commit.c:1801

14196 #, fuzzy, c-format

14197 msgid "Aborting commit due to empty commit message body.\n"

14198 msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"

14199

14253 -#: builtin/commit.c:1834

14200 +#: builtin/commit.c:1837

14201 #, fuzzy

14202 msgid ""

14203 "repository has been updated, but unable to write\n"

@@ -14292,7 +14239,6 @@ msgid "use repository config file"

14239 msgstr ""

14240

14241 #: builtin/config.c:134

14295 -#, fuzzy

14242 msgid "use per-worktree config file"

14243 msgstr ""

14244

@@ -14463,7 +14409,7 @@ msgid "invalid key pattern: %s"

14409 msgstr "chave inválida: %s"

14410

14411 #: builtin/config.c:377

14466 -#, fuzzy, c-format

14412 +#, c-format

14413 msgid "failed to format default config value: %s"

14414 msgstr ""

14415

@@ -14511,12 +14457,10 @@ msgid "only one config file at a time"

14457 msgstr ""

14458

14459 #: builtin/config.c:658

14514 -#, fuzzy

14460 msgid "--local can only be used inside a git repository"

14461 msgstr ""

14462

14463 #: builtin/config.c:660

14519 -#, fuzzy

14464 msgid "--blob can only be used inside a git repository"

14465 msgstr ""

14466

@@ -14568,7 +14512,6 @@ msgid "unable to read config file '%s'"

14512 msgstr "incapaz ler ficheiro config '%s'"

14513

14514 #: builtin/config.c:825

14571 -#, fuzzy

14515 msgid "error processing config file(s)"

14516 msgstr ""

14517

@@ -14809,7 +14752,6 @@ msgid "--broken is incompatible with commit-ishes"

14752 msgstr "--broken é incompatível com commits ou semelhantes"

14753

14754 #: builtin/diff-tree.c:155

14812 -#, fuzzy

14755 msgid "--stdin and --merge-base are mutually exclusive"

14756 msgstr ""

14757

@@ -14962,7 +14904,6 @@ msgid "--dir-diff is incompatible with --no-index"

14904 msgstr "--dir-diff é incompatível com --no-index"

14905

14906 #: builtin/difftool.c:744

14965 -#, fuzzy

14907 msgid "--gui, --tool and --extcmd are mutually exclusive"

14908 msgstr ""

14909

@@ -15109,12 +15050,12 @@ msgid "Cannot pass both --import-marks and --import-marks-if-exists"

15050 msgstr ""

15051

15052 #: builtin/fast-import.c:3088

15112 -#, fuzzy, c-format

15053 +#, c-format

15054 msgid "Missing from marks for submodule '%s'"

15055 msgstr ""

15056

15057 #: builtin/fast-import.c:3090

15117 -#, fuzzy, c-format

15058 +#, c-format

15059 msgid "Missing to marks for submodule '%s'"

15060 msgstr ""

15061

@@ -15443,7 +15384,6 @@ msgid "not setting upstream for a remote remote-tracking branch"

15384 msgstr "desdefinindo upstream para remoto de ramo de monitorização remoto"

15385

15386 #: builtin/fetch.c:1635

15446 -#, fuzzy

15387 msgid "not setting upstream for a remote tag"

15388 msgstr ""

15389

@@ -15537,12 +15477,10 @@ msgid ""

15477 msgstr ""

15478

15479 #: builtin/fetch.c:2086

15540 -#, fuzzy

15480 msgid "--atomic can only be used when fetching from one remote"

15481 msgstr ""

15482

15483 #: builtin/fetch.c:2090

15545 -#, fuzzy

15484 msgid "--stdin can only be used when fetching from one remote"

15485 msgstr ""

15486

@@ -15642,15 +15580,15 @@ msgstr "imprimir apenas refs que contenham outros commits"

15580 msgid "git for-each-repo --config=<config> <command-args>"

15581 msgstr ""

15582

15645 -#: builtin/for-each-repo.c:37

15583 +#: builtin/for-each-repo.c:34

15584 msgid "config"

15585 msgstr ""

15586

15649 -#: builtin/for-each-repo.c:38

15587 +#: builtin/for-each-repo.c:35

15588 msgid "config key storing a list of repository paths"

15589 msgstr ""

15590

15653 -#: builtin/for-each-repo.c:46

15591 +#: builtin/for-each-repo.c:43

15592 msgid "missing --config=<config>"

15593 msgstr ""

15594

@@ -15689,7 +15627,7 @@ msgid ""

15627 msgstr ""

15628

15629 #: builtin/fsck.c:264

15692 -#, fuzzy, c-format

15630 +#, c-format

15631 msgid "missing %s %s"

15632 msgstr ""

15633

@@ -15748,7 +15686,7 @@ msgid "%s: object corrupt or missing"

15686 msgstr ""

15687

15688 #: builtin/fsck.c:482

15751 -#, fuzzy, c-format

15689 +#, c-format

15690 msgid "%s: invalid reflog entry %s"

15691 msgstr ""

15692

@@ -15822,7 +15760,6 @@ msgid "notice: %s points to an unborn branch (%s)"

15760 msgstr ""

15761

15762 #: builtin/fsck.c:706

15825 -#, fuzzy

15763 msgid "Checking cache tree"

15764 msgstr ""

15765

@@ -15911,7 +15848,7 @@ msgid "Failed to fstat %s: %s"

15848 msgstr "falha ao invocar fstat sobre %s: %s"

15849

15850 #: builtin/gc.c:129

15914 -#, fuzzy, c-format

15851 +#, c-format

15852 msgid "failed to parse '%s' value '%s'"

15853 msgstr ""

15854

@@ -16015,12 +15952,10 @@ msgid "unrecognized --schedule argument '%s'"

15952 msgstr "argumento --schedule desconhecido: '%s'"

15953

15954 #: builtin/gc.c:869

16018 -#, fuzzy

15955 msgid "failed to write commit-graph"

15956 msgstr ""

15957

15958 #: builtin/gc.c:905

16023 -#, fuzzy

15959 msgid "failed to prefetch remotes"

15960 msgstr ""

15961

@@ -16035,7 +15970,6 @@ msgid "failed to finish 'git pack-objects' process"

15970 msgstr "terminar processo 'git pack-objects' falhou"

15971

15972 #: builtin/gc.c:1091

16038 -#, fuzzy

15973 msgid "failed to write multi-pack-index"

15974 msgstr ""

15975

@@ -16044,7 +15978,6 @@ msgid "'git multi-pack-index expire' failed"

15978 msgstr ""

15979

15980 #: builtin/gc.c:1170

16047 -#, fuzzy

15981 msgid "'git multi-pack-index repack' failed"

15982 msgstr ""

15983

@@ -16128,12 +16061,10 @@ msgid "failed to bootstrap service %s"

16061 msgstr "bootstrap serviços %s falhou"

16062

16063 #: builtin/gc.c:1745

16131 -#, fuzzy

16064 msgid "failed to create temp xml file"

16065 msgstr ""

16066

16067 #: builtin/gc.c:1835

16136 -#, fuzzy

16068 msgid "failed to start schtasks"

16069 msgstr ""

16070

@@ -16146,7 +16077,6 @@ msgid "failed to run 'crontab'; your system might not support 'cron'"

16077 msgstr ""

16078

16079 #: builtin/gc.c:1900

16149 -#, fuzzy

16080 msgid "failed to open stdin of 'crontab'"

16081 msgstr ""

16082

@@ -16159,7 +16089,6 @@ msgid "another process is scheduling background maintenance"

16089 msgstr ""

16090

16091 #: builtin/gc.c:2000

16162 -#, fuzzy

16092 msgid "failed to add repo to global config"

16093 msgstr ""

16094

@@ -16257,7 +16186,6 @@ msgid "process binary files with textconv filters"

16186 msgstr "processar ficheiros binários com filtros textconv"

16187

16188 #: builtin/grep.c:861

16260 -#, fuzzy

16189 msgid "search in subdirectories (default)"

16190 msgstr ""

16191

@@ -16738,7 +16666,6 @@ msgid "invalid blob object %s"

16666 msgstr "objeto blob inválido %s"

16667

16668 #: builtin/index-pack.c:848 builtin/index-pack.c:867

16741 -#, fuzzy

16669 msgid "fsck error in packed object"

16670 msgstr ""

16671

@@ -16884,7 +16811,7 @@ msgid "bad %s"

16811 msgstr "%s incorreto"

16812

16813 #: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614

16887 -#, fuzzy, c-format

16814 +#, c-format

16815 msgid "unknown hash algorithm '%s'"

16816 msgstr ""

16817

@@ -17030,7 +16957,6 @@ msgid "specify the hash algorithm to use"

16957 msgstr ""

16958

16959 #: builtin/init-db.c:560

17033 -#, fuzzy

16960 msgid "--separate-git-dir and --bare are mutually exclusive"

16961 msgstr ""

16962

@@ -17211,7 +17137,6 @@ msgid "cannot open patch file %s"

17137 msgstr "incapaz abrir ficheiro patch %s"

17138

17139 #: builtin/log.c:999

17214 -#, fuzzy

17140 msgid "need exactly one range"

17141 msgstr ""

17142

@@ -17226,7 +17151,6 @@ msgid "cover letter needs email format"

17151 msgstr "A carta de apresentação precisa de um formato de e-mail"

17152

17153 #: builtin/log.c:1179

17229 -#, fuzzy

17154 msgid "failed to create cover-letter file"

17155 msgstr ""

17156

@@ -17515,7 +17439,6 @@ msgid "--check does not make sense"

17439 msgstr "--check faz sentido nenhum"

17440

17441 #: builtin/log.c:1967

17518 -#, fuzzy

17442 msgid "--stdout, --output, and --output-directory are mutually exclusive"

17443 msgstr ""

17444

@@ -17560,7 +17483,6 @@ msgid "Generating patches"

17483 msgstr "falha ao editar patch"

17484

17485 #: builtin/log.c:2204

17563 -#, fuzzy

17486 msgid "failed to create output files"

17487 msgstr ""

17488

@@ -18091,37 +18013,37 @@ msgstr "Mensagem de junção nenhuma -- deixar HEAD por atualizar\n"

18013 msgid "'%s' does not point to a commit"

18014 msgstr "'%s' aponta para commit nenhum"

18015

18094 -#: builtin/merge.c:602

18016 +#: builtin/merge.c:603

18017 #, c-format

18018 msgid "Bad branch.%s.mergeoptions string: %s"

18019 msgstr "Valor de branch.%s.mergeoptions incorreto: %s"

18020

18099 -#: builtin/merge.c:728

18021 +#: builtin/merge.c:729

18022 msgid "Not handling anything other than two heads merge."

18023 msgstr "Lidando nada além da junção de duas heads."

18024

18103 -#: builtin/merge.c:741

18025 +#: builtin/merge.c:742

18026 #, c-format

18027 msgid "Unknown option for merge-recursive: -X%s"

18028 msgstr "Opção desconhecida de merge-recursive: -X%s"

18029

18108 -#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223

18030 +#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223

18031 #, c-format

18032 msgid "unable to write %s"

18033 msgstr "incapaz escrever %s"

18034

18113 -#: builtin/merge.c:812

18035 +#: builtin/merge.c:813

18036 #, c-format

18037 msgid "Could not read from '%s'"

18038 msgstr "Incapaz ler de '%s'"

18039

18118 -#: builtin/merge.c:821

18040 +#: builtin/merge.c:822

18041 #, c-format

18042 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

18043 msgstr ""

18044 "Usa 'git commit' para completar a junção. Committando junção nenhuma.\n"

18045

18124 -#: builtin/merge.c:827

18046 +#: builtin/merge.c:828

18047 #, fuzzy

18048 msgid ""

18049 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -18133,12 +18055,12 @@ msgstr ""

18055 "branch.\n"

18056 "\n"

18057

18136 -#: builtin/merge.c:832

18058 +#: builtin/merge.c:833

18059 #, fuzzy

18060 msgid "An empty message aborts the commit.\n"

18061 msgstr "Uma mensagem vazia aborta o commit.\n"

18062

18141 -#: builtin/merge.c:835

18063 +#: builtin/merge.c:836

18064 #, fuzzy, c-format

18065 msgid ""

18066 "Lines starting with '%c' will be ignored, and an empty message aborts\n"

@@ -18147,75 +18069,75 @@ msgstr ""

18069 "Linhas começadas com '%c' são ignoradas, e uma messagem vazia aborta\n"

18070 "o commit.\n"

18071

18150 -#: builtin/merge.c:888

18072 +#: builtin/merge.c:889

18073 msgid "Empty commit message."

18074 msgstr "Mensagem commit vazia."

18075

18154 -#: builtin/merge.c:903

18076 +#: builtin/merge.c:904

18077 #, c-format

18078 msgid "Wonderful.\n"

18079 msgstr "Maravilhoso.\n"

18080

18159 -#: builtin/merge.c:964

18081 +#: builtin/merge.c:965

18082 #, c-format

18083 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

18084 msgstr ""

18085 "Merge automático falhou; resolve os conflitos e depois podes commitar o "

18086 "resultado.\n"

18087

18166 -#: builtin/merge.c:1003

18088 +#: builtin/merge.c:1004

18089 msgid "No current branch."

18090 msgstr "Nenhum ramo atual."

18091

18170 -#: builtin/merge.c:1005

18092 +#: builtin/merge.c:1006

18093 msgid "No remote for the current branch."

18094 msgstr "Ŕamo atual de remoto nenhum."

18095

18174 -#: builtin/merge.c:1007

18096 +#: builtin/merge.c:1008

18097 msgid "No default upstream defined for the current branch."

18098 msgstr "Ramo atual sem upstream default definido."

18099

18178 -#: builtin/merge.c:1012

18100 +#: builtin/merge.c:1013

18101 #, c-format

18102 msgid "No remote-tracking branch for %s from %s"

18103 msgstr "Nenhum ramo de monitorização remoto seguido por %s de %s"

18104

18183 -#: builtin/merge.c:1069

18105 +#: builtin/merge.c:1070

18106 #, c-format

18107 msgid "Bad value '%s' in environment '%s'"

18108 msgstr "Valor '%s' incorreto no ambiente '%s'"

18109

18188 -#: builtin/merge.c:1172

18110 +#: builtin/merge.c:1173

18111 #, c-format

18112 msgid "not something we can merge in %s: %s"

18113 msgstr "podemos juntar em %s nenhum(a): %s"

18114

18193 -#: builtin/merge.c:1206

18115 +#: builtin/merge.c:1207

18116 msgid "not something we can merge"

18117 msgstr "podemos juntar nada"

18118

18197 -#: builtin/merge.c:1316

18119 +#: builtin/merge.c:1317

18120 msgid "--abort expects no arguments"

18121 msgstr "--abort supõe argumento nenhum"

18122

18201 -#: builtin/merge.c:1320

18123 +#: builtin/merge.c:1321

18124 msgid "There is no merge to abort (MERGE_HEAD missing)."

18125 msgstr "Há junção nenhuma para abortar (MERGE_HEAD faltando)."

18126

18205 -#: builtin/merge.c:1338

18127 +#: builtin/merge.c:1339

18128 #, fuzzy

18129 msgid "--quit expects no arguments"

18130 msgstr "--abort supõe argumento nenhum"

18131

18210 -#: builtin/merge.c:1351

18132 +#: builtin/merge.c:1352

18133 msgid "--continue expects no arguments"

18134 msgstr "--continue supõe argumento nenhum"

18135

18214 -#: builtin/merge.c:1355

18136 +#: builtin/merge.c:1356

18137 msgid "There is no merge in progress (MERGE_HEAD missing)."

18138 msgstr "Há junção nenhuma em curso (MERGE_HEAD faltando)."

18139

18218 -#: builtin/merge.c:1371

18140 +#: builtin/merge.c:1372

18141 msgid ""

18142 "You have not concluded your merge (MERGE_HEAD exists).\n"

18143 "Please, commit your changes before you merge."

@@ -18223,7 +18145,7 @@ msgstr ""

18145 "Junção está por concluir (MERGE_HEAD existe).\n"

18146 "Por favor, faz commit das tuas alterações antes de juntar."

18147

18226 -#: builtin/merge.c:1378

18148 +#: builtin/merge.c:1379

18149 msgid ""

18150 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

18151 "Please, commit your changes before you merge."

@@ -18231,89 +18153,89 @@ msgstr ""

18153 "Cherry-pick por concluir (existe CHERRY_PICK_HEAD).\n"

18154 "Por favor, memorize suas alterações antes de juntar."

18155

18234 -#: builtin/merge.c:1381

18156 +#: builtin/merge.c:1382

18157 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

18158 msgstr "Cherry-pick por concluir (existe CHERRY_PICK_HEAD)."

18159

18238 -#: builtin/merge.c:1395

18160 +#: builtin/merge.c:1396

18161 msgid "You cannot combine --squash with --no-ff."

18162 msgstr "Impossível combinar --squash com --no-ff."

18163

18242 -#: builtin/merge.c:1397

18164 +#: builtin/merge.c:1398

18165 #, fuzzy

18166 msgid "You cannot combine --squash with --commit."

18167 msgstr "Impossível combinar --squash com --commit."

18168

18247 -#: builtin/merge.c:1413

18169 +#: builtin/merge.c:1414

18170 msgid "No commit specified and merge.defaultToUpstream not set."

18171 msgstr "Especificado commit nenhum e merge.defaultToUpstream indefinido."

18172

18251 -#: builtin/merge.c:1430

18173 +#: builtin/merge.c:1431

18174 msgid "Squash commit into empty head not supported yet"

18175 msgstr "Esmagar commit para uma cabeça vazia por enquanto tem suporte nenhum"

18176

18255 -#: builtin/merge.c:1432

18177 +#: builtin/merge.c:1433

18178 msgid "Non-fast-forward commit does not make sense into an empty head"

18179 msgstr "Non-fast-forward commit para uma cabeça vazia faz sentido nenhum"

18180

18259 -#: builtin/merge.c:1437

18181 +#: builtin/merge.c:1438

18182 #, c-format

18183 msgid "%s - not something we can merge"

18184 msgstr "%s - nada que se pode juntar"

18185

18264 -#: builtin/merge.c:1439

18186 +#: builtin/merge.c:1440

18187 msgid "Can merge only exactly one commit into empty head"

18188 msgstr "Só se pode integrar exatamente um commit numa cabeça vazia"

18189

18268 -#: builtin/merge.c:1520

18190 +#: builtin/merge.c:1521

18191 msgid "refusing to merge unrelated histories"

18192 msgstr "recusando juntar históricos diferentes"

18193

18272 -#: builtin/merge.c:1539

18194 +#: builtin/merge.c:1540

18195 #, c-format

18196 msgid "Updating %s..%s\n"

18197 msgstr "Atualizando %s..%s\n"

18198

18277 -#: builtin/merge.c:1585

18199 +#: builtin/merge.c:1587

18200 #, c-format

18201 msgid "Trying really trivial in-index merge...\n"

18202 msgstr "A tentar integração mesmo trivial no interior do índice...\n"

18203

18282 -#: builtin/merge.c:1592

18204 +#: builtin/merge.c:1594

18205 #, c-format

18206 msgid "Nope.\n"

18207 msgstr "Nada.\n"

18208

18287 -#: builtin/merge.c:1623

18209 +#: builtin/merge.c:1625

18210 msgid "Not possible to fast-forward, aborting."

18211 msgstr "Impossível fazer fast-forward, abortando."

18212

18291 -#: builtin/merge.c:1651 builtin/merge.c:1716

18213 +#: builtin/merge.c:1653 builtin/merge.c:1719

18214 #, c-format

18215 msgid "Rewinding the tree to pristine...\n"

18216 msgstr "Recuando a árvore para estado pristino...\n"

18217

18296 -#: builtin/merge.c:1655

18218 +#: builtin/merge.c:1657

18219 #, c-format

18220 msgid "Trying merge strategy %s...\n"

18221 msgstr "Tentando estratégia merge %s...\n"

18222

18301 -#: builtin/merge.c:1707

18223 +#: builtin/merge.c:1709

18224 #, c-format

18225 msgid "No merge strategy handled the merge.\n"

18226 msgstr "A junção lidou com estratégia de junção nenhuma.\n"

18227

18306 -#: builtin/merge.c:1709

18228 +#: builtin/merge.c:1711

18229 #, c-format

18230 msgid "Merge with strategy %s failed.\n"

18231 msgstr "Falha ao integrar com a estratégia %s.\n"

18232

18311 -#: builtin/merge.c:1718

18312 -#, c-format

18313 -msgid "Using the %s to prepare resolving by hand.\n"

18233 +#: builtin/merge.c:1721

18234 +#, fuzzy, c-format

18235 +msgid "Using the %s strategy to prepare resolving by hand.\n"

18236 msgstr "A usar %s para preparar resolução manual.\n"

18237

18316 -#: builtin/merge.c:1732

18238 +#: builtin/merge.c:1735

18239 #, c-format

18240 msgid "Automatic merge went well; stopped before committing as requested\n"

18241 msgstr "Merge automática correu bem; parei antes de commitar como pedido\n"

@@ -18747,7 +18669,6 @@ msgstr "foi recusado efetuar %s de notas em %s (fora de refs/notes/)"

18669 #: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665

18670 #: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985

18671 #: builtin/prune-packed.c:25 builtin/tag.c:586

18750 -#, fuzzy

18672 msgid "too many arguments"

18673 msgstr ""

18674

@@ -18808,7 +18729,6 @@ msgid "load rewriting config for <command> (implies --stdin)"

18729 msgstr "carregar configuração de reescrita do <comando> (implica --stdin)"

18730

18731 #: builtin/notes.c:517

18811 -#, fuzzy

18732 msgid "too few arguments"

18733 msgstr ""

18734

@@ -18999,12 +18919,12 @@ msgid ""

18919 msgstr ""

18920

18921 #: builtin/pack-objects.c:580

19002 -#, fuzzy, c-format

18922 +#, c-format

18923 msgid "bad packed object CRC for %s"

18924 msgstr ""

18925

18926 #: builtin/pack-objects.c:591

19007 -#, fuzzy, c-format

18927 +#, c-format

18928 msgid "corrupt packed object for %s"

18929 msgstr ""

18930

@@ -19050,7 +18970,7 @@ msgstr ""

18970 "compactados"

18971

18972 #: builtin/pack-objects.c:1971

19053 -#, fuzzy, c-format

18973 +#, c-format

18974 msgid "delta base offset overflow in pack for %s"

18975 msgstr ""

18976

@@ -19139,7 +19059,6 @@ msgid ""

19059 msgstr ""

19060

19061 #: builtin/pack-objects.c:3482

19142 -#, fuzzy

19062 msgid "invalid value for --missing"

19063 msgstr ""

19064

@@ -19259,7 +19178,6 @@ msgid "include objects referred to by the index"

19178 msgstr "incluir objetos referenciados pelo índice"

19179

19180 #: builtin/pack-objects.c:3955

19262 -#, fuzzy

19181 msgid "read packs from stdin"

19182 msgstr ""

19183

@@ -19393,7 +19311,6 @@ msgid "cannot use internal rev list with --stdin-packs"

19311 msgstr "incapaz especificar pathnames com --stdin"

19312

19313 #: builtin/pack-objects.c:4175

19396 -#, fuzzy

19314 msgid "Enumerating objects"

19315 msgstr ""

19316

@@ -20174,7 +20091,6 @@ msgid "skip commit"

20091 msgstr "commit"

20092

20093 #: builtin/rebase.c:512

20177 -#, fuzzy

20094 msgid "edit the todo list"

20095 msgstr ""

20096

@@ -20279,7 +20195,6 @@ msgid "cmd"

20195 msgstr "comando"

20196

20197 #: builtin/rebase.c:547

20282 -#, fuzzy

20198 msgid "the command to run"

20199 msgstr ""

20200

@@ -20431,7 +20346,6 @@ msgid "passed to 'git apply'"

20346 msgstr "passado para 'git apply'"

20347

20348 #: builtin/rebase.c:1345

20434 -#, fuzzy

20349 msgid "ignore changes in whitespace"

20350 msgstr ""

20351

@@ -20608,7 +20522,6 @@ msgstr ""

20522 "de valor aí.\n"

20523

20524 #: builtin/rebase.c:1648

20611 -#, fuzzy

20525 msgid "switch `C' expects a numerical value"

20526 msgstr ""

20527

@@ -20626,7 +20539,7 @@ msgid "cannot combine apply options with merge options"

20539 msgstr ""

20540

20541 #: builtin/rebase.c:1772

20629 -#, fuzzy, c-format

20542 +#, c-format

20543 msgid "Unknown rebase backend: %s"

20544 msgstr ""

20545

@@ -20644,7 +20557,7 @@ msgid ""

20557 msgstr ""

20558

20559 #: builtin/rebase.c:1850

20647 -#, fuzzy, c-format

20560 +#, c-format

20561 msgid "invalid upstream '%s'"

20562 msgstr ""

20563

@@ -20659,7 +20572,7 @@ msgid "'%s': need exactly one merge base with branch"

20572 msgstr ""

20573

20574 #: builtin/rebase.c:1885

20662 -#, fuzzy, c-format

20575 +#, c-format

20576 msgid "'%s': need exactly one merge base"

20577 msgstr ""

20578

@@ -20674,7 +20587,7 @@ msgid "fatal: no such branch/commit '%s'"

20587 msgstr "fatal: nenhum ramo/commit '%s'"

20588

20589 #: builtin/rebase.c:1929 builtin/submodule--helper.c:39

20677 -#: builtin/submodule--helper.c:2414

20590 +#: builtin/submodule--helper.c:2431

20591 #, c-format

20592 msgid "No such ref: %s"

20593 msgstr "Referência inexistente: %s"

@@ -20827,7 +20740,7 @@ msgid "'%s' is not a valid timestamp"

20740 msgstr "'%s' é um carimbo de data/hora inválido"

20741

20742 #: builtin/reflog.c:609

20830 -#, fuzzy, c-format

20743 +#, c-format

20744 msgid "Marking reachable objects..."

20745 msgstr ""

20746

@@ -21502,7 +21415,6 @@ msgid "--keep-unreachable and -A are incompatible"

21415 msgstr "--keep-unreachable e -A são incompatíveis"

21416

21417 #: builtin/repack.c:527

21505 -#, fuzzy

21418 msgid "--geometric is incompatible with -A, -a"

21419 msgstr ""

21420

@@ -21511,7 +21423,7 @@ msgid "Nothing new to pack."

21423 msgstr ""

21424

21425 #: builtin/repack.c:669

21514 -#, fuzzy, c-format

21426 +#, c-format

21427 msgid "missing required file: %s"

21428 msgstr ""

21429

@@ -21741,12 +21653,10 @@ msgid "--format cannot be used when not listing"

21653 msgstr "--format apenas pode ser usado quando faz listagem"

21654

21655 #: builtin/replace.c:577

21744 -#, fuzzy

21656 msgid "-f only makes sense when writing a replacement"

21657 msgstr ""

21658

21659 #: builtin/replace.c:581

21749 -#, fuzzy

21660 msgid "--raw only makes sense with --edit"

21661 msgstr ""

21662

@@ -21759,7 +21669,6 @@ msgid "bad number of arguments"

21669 msgstr ""

21670

21671 #: builtin/replace.c:599

21762 -#, fuzzy

21672 msgid "-e needs exactly one argument"

21673 msgstr ""

21674

@@ -21952,7 +21861,6 @@ msgid "rev-list does not support display of notes"

21861 msgstr "rev-list insustenta mostrar notas"

21862

21863 #: builtin/rev-list.c:679

21955 -#, fuzzy

21864 msgid "marked counting is incompatible with --objects"

21865 msgstr ""

21866

@@ -22068,7 +21976,7 @@ msgid "git cherry-pick <subcommand>"

21976 msgstr "git cherry-pick <subcommando>"

21977

21978 #: builtin/revert.c:72

22071 -#, fuzzy, c-format

21979 +#, c-format

21980 msgid "option `%s' expects a number greater than zero"

21981 msgstr ""

21982

@@ -22090,7 +21998,6 @@ msgid "cancel revert or cherry-pick sequence"

21998 msgstr "cancelar reversão ou cherry-pick"

21999

22000 #: builtin/revert.c:105

22093 -#, fuzzy

22001 msgid "skip current commit and continue"

22002 msgstr ""

22003

@@ -22313,7 +22220,6 @@ msgid "group by field"

22220 msgstr ""

22221

22222 #: builtin/shortlog.c:391

22316 -#, fuzzy

22223 msgid "too many arguments given outside repository"

22224 msgstr ""

22225

@@ -22546,7 +22452,6 @@ msgid "toggle the use of a sparse index"

22452 msgstr ""

22453

22454 #: builtin/sparse-checkout.c:340

22549 -#, fuzzy

22455 msgid "failed to modify sparse-index config"

22456 msgstr ""

22457

@@ -22555,39 +22460,38 @@ msgstr ""

22460 msgid "failed to open '%s'"

22461 msgstr "falha ao abrir '%s'"

22462

22558 -#: builtin/sparse-checkout.c:419

22463 +#: builtin/sparse-checkout.c:413

22464 #, fuzzy, c-format

22465 msgid "could not normalize path %s"

22466 msgstr "incapaz normalizar patch %s"

22467

22563 -#: builtin/sparse-checkout.c:431

22468 +#: builtin/sparse-checkout.c:425

22469 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"

22470 msgstr ""

22471

22567 -#: builtin/sparse-checkout.c:456

22472 +#: builtin/sparse-checkout.c:450

22473 #, fuzzy, c-format

22474 msgid "unable to unquote C-style string '%s'"

22475 msgstr "incapaz de unquote string de C-style '%s'"

22476

22572 -#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534

22477 +#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528

22478 msgid "unable to load existing sparse-checkout patterns"

22479 msgstr ""

22480

22576 -#: builtin/sparse-checkout.c:579

22577 -#, fuzzy

22481 +#: builtin/sparse-checkout.c:573

22482 msgid "read patterns from standard in"

22483 msgstr ""

22484

22581 -#: builtin/sparse-checkout.c:594

22485 +#: builtin/sparse-checkout.c:588

22486 msgid "git sparse-checkout reapply"

22487 msgstr ""

22488

22585 -#: builtin/sparse-checkout.c:613

22489 +#: builtin/sparse-checkout.c:607

22490 #, fuzzy

22491 msgid "git sparse-checkout disable"

22492 msgstr "ignorar a aplicação do filtro de extração esparsa"

22493

22590 -#: builtin/sparse-checkout.c:644

22494 +#: builtin/sparse-checkout.c:638

22495 #, fuzzy

22496 msgid "error while refreshing working directory"

22497 msgstr "erro enquanto refrescava pasta de trabalho"

@@ -22716,7 +22620,6 @@ msgid "Index was not unstashed."

22620 msgstr "Index está por despreparar."

22621

22622 #: builtin/stash.c:591 builtin/stash.c:689

22719 -#, fuzzy

22623 msgid "attempt to recreate the index"

22624 msgstr ""

22625

@@ -22878,7 +22781,7 @@ msgstr ""

22781 msgid "prepend comment character and space to each line"

22782 msgstr "preceder cada linha com um carácter de comentário e um espaço"

22783

22881 -#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423

22784 +#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440

22785 #, c-format

22786 msgid "Expecting a full ref name, got %s"

22787 msgstr "Esperava-se um nome completo de uma referência, obteve-se %s"

@@ -22892,33 +22795,34 @@ msgstr ""

22795 msgid "cannot strip one component off url '%s'"

22796 msgstr "incapaz despir um componente a partir do url '%s'"

22797

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

22798 +#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887

22799 +#: builtin/submodule--helper.c:2891

22800 msgid "alternative anchor for relative paths"

22801 msgstr "âncora alternativa para caminhos relativos"

22802

22899 -#: builtin/submodule--helper.c:414

22803 +#: builtin/submodule--helper.c:416

22804 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"

22805 msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"

22806

22903 -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629

22904 -#: builtin/submodule--helper.c:652

22807 +#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631

22808 +#: builtin/submodule--helper.c:654

22809 #, c-format

22810 msgid "No url found for submodule path '%s' in .gitmodules"

22811 msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules"

22812

22909 -#: builtin/submodule--helper.c:524

22813 +#: builtin/submodule--helper.c:526

22814 #, fuzzy, c-format

22815 msgid "Entering '%s'\n"

22816 msgstr "Entrando em '%s'\n"

22817

22914 -#: builtin/submodule--helper.c:527

22818 +#: builtin/submodule--helper.c:529

22819 #, c-format

22820 msgid ""

22821 "run_command returned non-zero status for %s\n"

22822 "."

22823 msgstr ""

22824

22921 -#: builtin/submodule--helper.c:549

22825 +#: builtin/submodule--helper.c:551

22826 #, c-format

22827 msgid ""

22828 "run_command returned non-zero status while recursing in the nested "

@@ -22926,22 +22830,21 @@ msgid ""

22830 "."

22831 msgstr ""

22832

22929 -#: builtin/submodule--helper.c:565

22930 -#, fuzzy

22833 +#: builtin/submodule--helper.c:567

22834 msgid "suppress output of entering each submodule command"

22835 msgstr ""

22836

22934 -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888

22935 -#: builtin/submodule--helper.c:1487

22837 +#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890

22838 +#: builtin/submodule--helper.c:1489

22839 #, fuzzy

22840 msgid "recurse into nested submodules"

22841 msgstr "percorrer recursivamente submódulos aninhados"

22842

22940 -#: builtin/submodule--helper.c:572

22843 +#: builtin/submodule--helper.c:574

22844 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"

22845 msgstr ""

22846

22944 -#: builtin/submodule--helper.c:599

22847 +#: builtin/submodule--helper.c:601

22848 #, fuzzy, c-format

22849 msgid ""

22850 "could not look up configuration '%s'. Assuming this repository is its own "

@@ -22950,163 +22853,155 @@ msgstr ""

22853 "incapaz encontrar configuração '%s'. Assumindo que este repositório é o "

22854 "próprio repositório upstream autoritário."

22855

22953 -#: builtin/submodule--helper.c:666

22856 +#: builtin/submodule--helper.c:668

22857 #, c-format

22858 msgid "Failed to register url for submodule path '%s'"

22859 msgstr "Falha ao registar o URL do caminho de submódulo '%s'"

22860

22958 -#: builtin/submodule--helper.c:670

22861 +#: builtin/submodule--helper.c:672

22862 #, c-format

22863 msgid "Submodule '%s' (%s) registered for path '%s'\n"

22864 msgstr "Submódulo '%s' (%s) registado para path '%s'\n"

22865

22963 -#: builtin/submodule--helper.c:680

22866 +#: builtin/submodule--helper.c:682

22867 #, c-format

22868 msgid "warning: command update mode suggested for submodule '%s'\n"

22869 msgstr "aviso: modo command update sugerido para submódulo '%s'\n"

22870

22968 -#: builtin/submodule--helper.c:687

22871 +#: builtin/submodule--helper.c:689

22872 #, c-format

22873 msgid "Failed to register update mode for submodule path '%s'"

22874 msgstr ""

22875

22973 -#: builtin/submodule--helper.c:709

22974 -#, fuzzy

22876 +#: builtin/submodule--helper.c:711

22877 msgid "suppress output for initializing a submodule"

22878 msgstr ""

22879

22978 -#: builtin/submodule--helper.c:714

22979 -#, fuzzy

22880 +#: builtin/submodule--helper.c:716

22881 msgid "git submodule--helper init [<options>] [<path>]"

22882 msgstr ""

22883

22983 -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922

22884 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924

22885 #, c-format

22886 msgid "no submodule mapping found in .gitmodules for path '%s'"

22887 msgstr ""

22888 "para path '%s' encontrei em .gitmodules, mapeamento de submódulo nenhum"

22889

22989 -#: builtin/submodule--helper.c:835

22890 +#: builtin/submodule--helper.c:837

22891 #, fuzzy, c-format

22892 msgid "could not resolve HEAD ref inside the submodule '%s'"

22893 msgstr "incapaz resolver ref HEAD dentro de submódulo '%s'"

22894

22994 -#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457

22895 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459

22896 #, fuzzy, c-format

22897 msgid "failed to recurse into submodule '%s'"

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

22899

22999 -#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623

22900 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625

22901 #, fuzzy

22902 msgid "suppress submodule status output"

22903 msgstr "preceder isto ao caminho do submódulo"

22904

23004 -#: builtin/submodule--helper.c:887

23005 -#, fuzzy

22905 +#: builtin/submodule--helper.c:889

22906 msgid ""

22907 "use commit stored in the index instead of the one stored in the submodule "

22908 "HEAD"

22909 msgstr ""

22910

23011 -#: builtin/submodule--helper.c:893

22911 +#: builtin/submodule--helper.c:895

22912 #, fuzzy

22913 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"

22914 msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"

22915

23016 -#: builtin/submodule--helper.c:917

22916 +#: builtin/submodule--helper.c:919

22917 msgid "git submodule--helper name <path>"

22918 msgstr "git submodule--helper name <caminho>"

22919

23020 -#: builtin/submodule--helper.c:989

22920 +#: builtin/submodule--helper.c:991

22921 #, c-format

22922 msgid "* %s %s(blob)->%s(submodule)"

22923 msgstr ""

22924

23025 -#: builtin/submodule--helper.c:992

22925 +#: builtin/submodule--helper.c:994

22926 #, c-format

22927 msgid "* %s %s(submodule)->%s(blob)"

22928 msgstr ""

22929

23030 -#: builtin/submodule--helper.c:1005

22930 +#: builtin/submodule--helper.c:1007

22931 #, fuzzy, c-format

22932 msgid "%s"

22933 msgstr "[%s]"

22934

23035 -#: builtin/submodule--helper.c:1055

22935 +#: builtin/submodule--helper.c:1057

22936 #, fuzzy, c-format

22937 msgid "couldn't hash object from '%s'"

22938 msgstr "incapaz fazer hash a objeto a partir de '%s'"

22939

23040 -#: builtin/submodule--helper.c:1059

22940 +#: builtin/submodule--helper.c:1061

22941 #, fuzzy, c-format

22942 msgid "unexpected mode %o\n"

22943 msgstr "modo inesperado %o\n"

22944

23045 -#: builtin/submodule--helper.c:1300

23046 -#, fuzzy

22945 +#: builtin/submodule--helper.c:1302

22946 msgid "use the commit stored in the index instead of the submodule HEAD"

22947 msgstr ""

22948

23050 -#: builtin/submodule--helper.c:1302

22949 +#: builtin/submodule--helper.c:1304

22950 #, fuzzy

22951 msgid "compare the commit in the index with that in the submodule HEAD"

22952 msgstr "compara a memória no arquivador com aquela no submódulo HEAD"

22953

23055 -#: builtin/submodule--helper.c:1304

22954 +#: builtin/submodule--helper.c:1306

22955 msgid "skip submodules with 'ignore_config' value set to 'all'"

22956 msgstr ""

22957

23059 -#: builtin/submodule--helper.c:1306

22958 +#: builtin/submodule--helper.c:1308

22959 #, fuzzy

22960 msgid "limit the summary size"

22961 msgstr "restringir-se a cabeças"

22962

23064 -#: builtin/submodule--helper.c:1311

23065 -#, fuzzy

22963 +#: builtin/submodule--helper.c:1313

22964 msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"

22965 msgstr ""

22966

23069 -#: builtin/submodule--helper.c:1335

22967 +#: builtin/submodule--helper.c:1337

22968 #, fuzzy

22969 msgid "could not fetch a revision for HEAD"

22970 msgstr "incapaz buscar uma revisão para HEAD"

22971

23074 -#: builtin/submodule--helper.c:1340

23075 -#, fuzzy

22972 +#: builtin/submodule--helper.c:1342

22973 msgid "--cached and --files are mutually exclusive"

22974 msgstr ""

22975

23079 -#: builtin/submodule--helper.c:1407

22976 +#: builtin/submodule--helper.c:1409

22977 #, fuzzy, c-format

22978 msgid "Synchronizing submodule url for '%s'\n"

22979 msgstr "Sincronizando url de submódulo para '%s'\n"

22980

23084 -#: builtin/submodule--helper.c:1413

22981 +#: builtin/submodule--helper.c:1415

22982 #, fuzzy, c-format

22983 msgid "failed to register url for submodule path '%s'"

22984 msgstr "Falha ao registar o URL do caminho de submódulo '%s'"

22985

23089 -#: builtin/submodule--helper.c:1427

23090 -#, fuzzy, c-format

22986 +#: builtin/submodule--helper.c:1429

22987 +#, c-format

22988 msgid "failed to get the default remote for submodule '%s'"

22989 msgstr ""

22990

23094 -#: builtin/submodule--helper.c:1438

23095 -#, fuzzy, c-format

22991 +#: builtin/submodule--helper.c:1440

22992 +#, c-format

22993 msgid "failed to update remote for submodule '%s'"

22994 msgstr ""

22995

23099 -#: builtin/submodule--helper.c:1485

23100 -#, fuzzy

22996 +#: builtin/submodule--helper.c:1487

22997 msgid "suppress output of synchronizing submodule url"

22998 msgstr ""

22999

23104 -#: builtin/submodule--helper.c:1492

23105 -#, fuzzy

23000 +#: builtin/submodule--helper.c:1494

23001 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"

23002 msgstr ""

23003

23109 -#: builtin/submodule--helper.c:1546

23004 +#: builtin/submodule--helper.c:1548

23005 #, fuzzy, c-format

23006 msgid ""

23007 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "

@@ -23115,7 +23010,7 @@ msgstr ""

23010 "Submodule work tree '%s' tem uma pasta .git (usa 'rm -rf' se queres mesmo "

23011 "removê-la e remover toda a história)"

23012

23118 -#: builtin/submodule--helper.c:1558

23013 +#: builtin/submodule--helper.c:1560

23014 #, fuzzy, c-format

23015 msgid ""

23016 "Submodule work tree '%s' contains local modifications; use '-f' to discard "

@@ -23124,46 +23019,45 @@ msgstr ""

23019 "A árvore de trabalho do submódulo '$displaypath' contém alterações locais; "

23020 "use '-f' para as descartar"

23021

23127 -#: builtin/submodule--helper.c:1566

23022 +#: builtin/submodule--helper.c:1568

23023 #, fuzzy, c-format

23024 msgid "Cleared directory '%s'\n"

23025 msgstr "Pasta '%s' limpa\n"

23026

23132 -#: builtin/submodule--helper.c:1568

23027 +#: builtin/submodule--helper.c:1570

23028 #, fuzzy, c-format

23029 msgid "Could not remove submodule work tree '%s'\n"

23030 msgstr "Impossível remover submodule work tree '%s'\n"

23031

23137 -#: builtin/submodule--helper.c:1579

23032 +#: builtin/submodule--helper.c:1581

23033 #, fuzzy, c-format

23034 msgid "could not create empty submodule directory %s"

23035 msgstr "incapaz criar pasta vazio de submódulo %s"

23036

23142 -#: builtin/submodule--helper.c:1595

23037 +#: builtin/submodule--helper.c:1597

23038 #, fuzzy, c-format

23039 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"

23040 msgstr "Submódulo '%s' (%s) unregistred para caminho '%s'\n"

23041

23147 -#: builtin/submodule--helper.c:1624

23042 +#: builtin/submodule--helper.c:1626

23043 msgid "remove submodule working trees even if they contain local changes"

23044 msgstr ""

23045

23151 -#: builtin/submodule--helper.c:1625

23152 -#, fuzzy

23046 +#: builtin/submodule--helper.c:1627

23047 msgid "unregister all submodules"

23048 msgstr ""

23049

23156 -#: builtin/submodule--helper.c:1630

23050 +#: builtin/submodule--helper.c:1632

23051 msgid ""

23052 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"

23053 msgstr ""

23054

23161 -#: builtin/submodule--helper.c:1644

23055 +#: builtin/submodule--helper.c:1646

23056 msgid "Use '--all' if you really want to deinitialize all submodules"

23057 msgstr ""

23058 "Use '--all' se pretende mesmo anular a inicialização todos os submódulos"

23059

23166 -#: builtin/submodule--helper.c:1713

23060 +#: builtin/submodule--helper.c:1690

23061 msgid ""

23062 "An alternate computed from a superproject's alternate is invalid.\n"

23063 "To allow Git to clone without an alternate in such a case, set\n"

@@ -23171,47 +23065,68 @@ msgid ""

23065 "'--reference-if-able' instead of '--reference'."

23066 msgstr ""

23067

23174 -#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755

23068 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732

23069 #, c-format

23070 msgid "submodule '%s' cannot add alternate: %s"

23071 msgstr "submódulo '%s' incapaz adicionar alternativo: %s"

23072

23179 -#: builtin/submodule--helper.c:1791

23073 +#: builtin/submodule--helper.c:1768

23074 #, c-format

23075 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"

23076 msgstr "Valor '%s' de submodule.alternateErrorStrategy é irreconhecível"

23077

23184 -#: builtin/submodule--helper.c:1798

23078 +#: builtin/submodule--helper.c:1775

23079 #, c-format

23080 msgid "Value '%s' for submodule.alternateLocation is not recognized"

23081 msgstr "Valor '%s' de submodule.alternateLocation é irreconhecível"

23082

23189 -#: builtin/submodule--helper.c:1822

23083 +#: builtin/submodule--helper.c:1800

23084 +#, c-format

23085 +msgid "refusing to create/use '%s' in another submodule's git dir"

23086 +msgstr ""

23087 +

23088 +#: builtin/submodule--helper.c:1841

23089 +#, c-format

23090 +msgid "clone of '%s' into submodule path '%s' failed"

23091 +msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"

23092 +

23093 +#: builtin/submodule--helper.c:1846

23094 +#, fuzzy, c-format

23095 +msgid "directory not empty: '%s'"

23096 +msgstr "pasta com conteúdo: '%s'"

23097 +

23098 +#: builtin/submodule--helper.c:1858

23099 +#, c-format

23100 +msgid "could not get submodule directory for '%s'"

23101 +msgstr "incapaz obter pasta de submódulo para '%s'"

23102 +

23103 +#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894

23104 msgid "where the new submodule will be cloned to"

23105 msgstr "sítio para aonde o novo submódulo será clonado"

23106

23193 -#: builtin/submodule--helper.c:1825

23107 +#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897

23108 msgid "name of the new submodule"

23109 msgstr "nome do novo submódulo"

23110

23197 -#: builtin/submodule--helper.c:1828

23111 +#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900

23112 msgid "url where to clone the submodule from"

23113 msgstr "url donde clonar o submódulos"

23114

23201 -#: builtin/submodule--helper.c:1836

23115 +#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907

23116 msgid "depth for shallow clones"

23117 msgstr "profundidade de clones rasos"

23118

23205 -#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348

23119 +#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365

23120 +#: builtin/submodule--helper.c:2909

23121 msgid "force cloning progress"

23122 msgstr "forçar progresso da clonagem"

23123

23209 -#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350

23124 +#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367

23125 #, fuzzy

23126 msgid "disallow cloning into non-empty directory"

23127 msgstr "a aplicar a um histórico vazio"

23128

23214 -#: builtin/submodule--helper.c:1848

23129 +#: builtin/submodule--helper.c:1916

23130 #, fuzzy

23131 msgid ""

23132 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "

@@ -23221,106 +23136,86 @@ msgstr ""

23136 "git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference "

23137 "<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>"

23138

23224 -#: builtin/submodule--helper.c:1873

23225 -#, c-format

23226 -msgid "refusing to create/use '%s' in another submodule's git dir"

23227 -msgstr ""

23228 -

23229 -#: builtin/submodule--helper.c:1884

23139 +#: builtin/submodule--helper.c:1953

23140 #, c-format

23231 -msgid "clone of '%s' into submodule path '%s' failed"

23232 -msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"

23233 -

23234 -#: builtin/submodule--helper.c:1888

23235 -#, fuzzy, c-format

23236 -msgid "directory not empty: '%s'"

23237 -msgstr "pasta com conteúdo: '%s'"

23238 -

23239 -#: builtin/submodule--helper.c:1900

23240 -#, c-format

23241 -msgid "could not get submodule directory for '%s'"

23242 -msgstr "incapaz obter pasta de submódulo para '%s'"

23243 -

23244 -#: builtin/submodule--helper.c:1936

23245 -#, fuzzy, c-format

23141 msgid "Invalid update mode '%s' for submodule path '%s'"

23142 msgstr ""

23143

23249 -#: builtin/submodule--helper.c:1940

23250 -#, fuzzy, c-format

23144 +#: builtin/submodule--helper.c:1957

23145 +#, c-format

23146 msgid "Invalid update mode '%s' configured for submodule path '%s'"

23147 msgstr ""

23148

23254 -#: builtin/submodule--helper.c:2041

23149 +#: builtin/submodule--helper.c:2058

23150 #, c-format

23151 msgid "Submodule path '%s' not initialized"

23152 msgstr "Path de submódulo '%s' por inicializar"

23153

23259 -#: builtin/submodule--helper.c:2045

23154 +#: builtin/submodule--helper.c:2062

23155 msgid "Maybe you want to use 'update --init'?"

23156 msgstr "Pretendias usar 'update --init'?"

23157

23263 -#: builtin/submodule--helper.c:2075

23158 +#: builtin/submodule--helper.c:2092

23159 #, c-format

23160 msgid "Skipping unmerged submodule %s"

23161 msgstr "Passando à frente submódulo por juntar %s"

23162

23268 -#: builtin/submodule--helper.c:2104

23163 +#: builtin/submodule--helper.c:2121

23164 #, c-format

23165 msgid "Skipping submodule '%s'"

23166 msgstr "Passando à frente submódulo '%s'"

23167

23273 -#: builtin/submodule--helper.c:2254

23168 +#: builtin/submodule--helper.c:2271

23169 #, c-format

23170 msgid "Failed to clone '%s'. Retry scheduled"

23171 msgstr "Falha ao clonar '%s'. Nova tentativa agendada"

23172

23278 -#: builtin/submodule--helper.c:2265

23173 +#: builtin/submodule--helper.c:2282

23174 #, c-format

23175 msgid "Failed to clone '%s' a second time, aborting"

23176 msgstr "Falha ao clonar '%s' pela segunda vez, abortado"

23177

23283 -#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573

23178 +#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590

23179 msgid "path into the working tree"

23180 msgstr "caminho para árvore de trabalho"

23181

23287 -#: builtin/submodule--helper.c:2330

23182 +#: builtin/submodule--helper.c:2347

23183 msgid "path into the working tree, across nested submodule boundaries"

23184 msgstr ""

23185 "caminho para a árvore de trabalho, atravessando limites de submódulos "

23186 "aninhados"

23187

23293 -#: builtin/submodule--helper.c:2334

23188 +#: builtin/submodule--helper.c:2351

23189 msgid "rebase, merge, checkout or none"

23190 msgstr "rebase, merge, checkout ou none"

23191

23297 -#: builtin/submodule--helper.c:2340

23192 +#: builtin/submodule--helper.c:2357

23193 #, fuzzy

23194 msgid "create a shallow clone truncated to the specified number of revisions"

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

23196

23302 -#: builtin/submodule--helper.c:2343

23197 +#: builtin/submodule--helper.c:2360

23198 msgid "parallel jobs"

23199 msgstr "trabalhos em paralelo"

23200

23306 -#: builtin/submodule--helper.c:2345

23201 +#: builtin/submodule--helper.c:2362

23202 msgid "whether the initial clone should follow the shallow recommendation"

23203 msgstr "se o clone inicial deve seguir a recomendação rasa"

23204

23310 -#: builtin/submodule--helper.c:2346

23205 +#: builtin/submodule--helper.c:2363

23206 msgid "don't print cloning progress"

23207 msgstr "imprimir progresso da clonagem nenhum"

23208

23314 -#: builtin/submodule--helper.c:2357

23209 +#: builtin/submodule--helper.c:2374

23210 #, fuzzy

23211 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"

23212 msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"

23213

23319 -#: builtin/submodule--helper.c:2370

23214 +#: builtin/submodule--helper.c:2387

23215 msgid "bad value for update parameter"

23216 msgstr "valor incorreto no parâmetro update"

23217

23323 -#: builtin/submodule--helper.c:2418

23218 +#: builtin/submodule--helper.c:2435

23219 #, c-format

23220 msgid ""

23221 "Submodule (%s) branch configured to inherit branch from superproject, but "

@@ -23329,97 +23224,149 @@ msgstr ""

23224 "Ramo de submódulo (%s) foi configurado para herdar o ramo do superprojeto, "

23225 "mas o superprojeto está em ramo nenhum"

23226

23332 -#: builtin/submodule--helper.c:2541

23227 +#: builtin/submodule--helper.c:2558

23228 #, fuzzy, c-format

23229 msgid "could not get a repository handle for submodule '%s'"

23230 msgstr "incapaz obter pega de repositório para submódulo '%s'"

23231

23337 -#: builtin/submodule--helper.c:2574

23232 +#: builtin/submodule--helper.c:2591

23233 msgid "recurse into submodules"

23234 msgstr "percorrer recursivamente submódulos"

23235

23341 -#: builtin/submodule--helper.c:2580

23236 +#: builtin/submodule--helper.c:2597

23237 #, fuzzy

23238 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"

23239 msgstr "git submodule--helper embed-git-dir [<caminho>...]"

23240

23346 -#: builtin/submodule--helper.c:2636

23241 +#: builtin/submodule--helper.c:2653

23242 msgid "check if it is safe to write to the .gitmodules file"

23243 msgstr ""

23244

23350 -#: builtin/submodule--helper.c:2639

23245 +#: builtin/submodule--helper.c:2656

23246 #, fuzzy

23247 msgid "unset the config in the .gitmodules file"

23248 msgstr "falha ao preparar .gitmodules atualizado"

23249

23355 -#: builtin/submodule--helper.c:2644

23250 +#: builtin/submodule--helper.c:2661

23251 #, fuzzy

23252 msgid "git submodule--helper config <name> [<value>]"

23253 msgstr "git submodule--helper name <caminho>"

23254

23360 -#: builtin/submodule--helper.c:2645

23361 -#, fuzzy

23255 +#: builtin/submodule--helper.c:2662

23256 msgid "git submodule--helper config --unset <name>"

23257 msgstr ""

23258

23365 -#: builtin/submodule--helper.c:2646

23366 -#, fuzzy

23259 +#: builtin/submodule--helper.c:2663

23260 msgid "git submodule--helper config --check-writeable"

23261 msgstr ""

23262

23370 -#: builtin/submodule--helper.c:2665 git-submodule.sh:150

23263 +#: builtin/submodule--helper.c:2682 git-submodule.sh:150

23264 #, fuzzy, sh-format

23265 msgid "please make sure that the .gitmodules file is in the working tree"

23266 msgstr ""

23267 "Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"

23268

23376 -#: builtin/submodule--helper.c:2681

23377 -#, fuzzy

23269 +#: builtin/submodule--helper.c:2698

23270 msgid "suppress output for setting url of a submodule"

23271 msgstr ""

23272

23381 -#: builtin/submodule--helper.c:2685

23382 -#, fuzzy

23273 +#: builtin/submodule--helper.c:2702

23274 msgid "git submodule--helper set-url [--quiet] <path> <newurl>"

23275 msgstr ""

23276

23386 -#: builtin/submodule--helper.c:2718

23387 -#, fuzzy

23277 +#: builtin/submodule--helper.c:2735

23278 msgid "set the default tracking branch to master"

23279 msgstr ""

23280

23391 -#: builtin/submodule--helper.c:2720

23392 -#, fuzzy

23281 +#: builtin/submodule--helper.c:2737

23282 msgid "set the default tracking branch"

23283 msgstr ""

23284

23396 -#: builtin/submodule--helper.c:2724

23285 +#: builtin/submodule--helper.c:2741

23286 #, fuzzy

23287 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"

23288 msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <caminho>"

23289

23401 -#: builtin/submodule--helper.c:2725

23290 +#: builtin/submodule--helper.c:2742

23291 #, fuzzy

23292 msgid ""

23293 "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"

23405 -msgstr "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <ramo> <caminho>"

23294 +msgstr ""

23295 +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <ramo> <caminho>"

23296

23407 -#: builtin/submodule--helper.c:2732

23297 +#: builtin/submodule--helper.c:2749

23298 #, fuzzy

23299 msgid "--branch or --default required"

23300 msgstr "nome do ramo é obrigatório"

23301

23412 -#: builtin/submodule--helper.c:2735

23413 -#, fuzzy

23302 +#: builtin/submodule--helper.c:2752

23303 msgid "--branch and --default are mutually exclusive"

23304 msgstr ""

23305

23417 -#: builtin/submodule--helper.c:2792 git.c:449 git.c:724

23306 +#: builtin/submodule--helper.c:2815

23307 +#, fuzzy, c-format

23308 +msgid "Adding existing repo at '%s' to the index\n"

23309 +msgstr "Adicionando repo existente em '$sm_path' ao index"

23310 +

23311 +#: builtin/submodule--helper.c:2818

23312 +#, fuzzy, c-format

23313 +msgid "'%s' already exists and is not a valid git repo"

23314 +msgstr "'$sm_path' já existe e é repositório git inválido"

23315 +

23316 +#: builtin/submodule--helper.c:2828

23317 +#, fuzzy, c-format

23318 +msgid "A git directory for '%s' is found locally with remote(s):"

23319 +msgstr ""

23320 +"Um diretório git de '$sm_name' foi encontrado localmente com os remotos:"

23321 +

23322 +#: builtin/submodule--helper.c:2833

23323 +#, fuzzy, c-format

23324 +msgid ""

23325 +"If you want to reuse this local git directory instead of cloning again from\n"

23326 +" %s\n"

23327 +"use the '--force' option. If the local git directory is not the correct "

23328 +"repo\n"

23329 +"or if you are unsure what this means, choose another name with the '--name' "

23330 +"option.\n"

23331 +msgstr ""

23332 +"Se queres reutilizar esta past git local, em vez de voltares a clonar\n"

23333 +" $realrepo\n"

23334 +"usa a opção --force. Se a pasta git local é o repo incorreto ou\n"

23335 +"se tens pouca certeza sobre o que isto significa, podes mudar o nome com a "

23336 +"opção '--name'."

23337 +

23338 +#: builtin/submodule--helper.c:2842

23339 +#, fuzzy, c-format

23340 +msgid "Reactivating local git directory for submodule '%s'\n"

23341 +msgstr "A reativar o diretório git local do submódulo '$sm_name'."

23342 +

23343 +#: builtin/submodule--helper.c:2875

23344 +#, fuzzy, c-format

23345 +msgid "unable to checkout submodule '%s'"

23346 +msgstr "Incapaz de checkout submódulo '$sm_path'"

23347 +

23348 +#: builtin/submodule--helper.c:2888

23349 +msgid "branch of repository to checkout on cloning"

23350 +msgstr ""

23351 +

23352 +#: builtin/submodule--helper.c:2910

23353 +#, fuzzy

23354 +msgid "allow adding an otherwise ignored submodule path"

23355 +msgstr "permitir adicionar ficheiros ignorados"

23356 +

23357 +#: builtin/submodule--helper.c:2917

23358 +#, fuzzy

23359 +msgid ""

23360 +"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"

23361 +"name <name>"

23362 +msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"

23363 +

23364 +#: builtin/submodule--helper.c:2985 git.c:449 git.c:724

23365 #, c-format

23366 msgid "%s doesn't support --super-prefix"

23367 msgstr "%s insustenta --super-prefix"

23368

23422 -#: builtin/submodule--helper.c:2798

23369 +#: builtin/submodule--helper.c:2991

23370 #, c-format

23371 msgid "'%s' is not a valid submodule--helper subcommand"

23372 msgstr "'%s' é subcomando inválido de submodule--helper"

@@ -24174,7 +24121,6 @@ msgid "added with --lock"

24121 msgstr "adicionado com --lock"

24122

24123 #: builtin/worktree.c:574

24177 -#, fuzzy

24124 msgid "--[no-]track can only be used if a new branch is created"

24125 msgstr ""

24126

@@ -24188,7 +24134,6 @@ msgid "add 'prunable' annotation to worktrees older than <time>"

24134 msgstr "expirar árvores de trabalho mais antigos que <tempo>"

24135

24136 #: builtin/worktree.c:702

24191 -#, fuzzy

24137 msgid "--verbose and --porcelain are mutually exclusive"

24138 msgstr ""

24139

@@ -24255,7 +24200,7 @@ msgid "validation failed, cannot move working tree: %s"

24200 msgstr ""

24201

24202 #: builtin/worktree.c:878

24258 -#, fuzzy, c-format

24203 +#, c-format

24204 msgid "failed to move '%s' to '%s'"

24205 msgstr ""

24206

@@ -24409,12 +24354,10 @@ msgid "recursive alias: %s"

24354 msgstr ""

24355

24356 #: git.c:476

24412 -#, fuzzy

24357 msgid "write failure on standard output"

24358 msgstr ""

24359

24360 #: git.c:478

24417 -#, fuzzy

24361 msgid "unknown write failure on standard output"

24362 msgstr ""

24363

@@ -24506,7 +24449,7 @@ msgid "socket/pipe already in use: '%s'"

24449 msgstr ""

24450

24451 #: t/helper/test-simple-ipc.c:264

24509 -#, fuzzy, c-format

24452 +#, c-format

24453 msgid "could not start server on: '%s'"

24454 msgstr ""

24455

@@ -24515,7 +24458,6 @@ msgid "could not spawn daemon in the background"

24458 msgstr ""

24459

24460 #: t/helper/test-simple-ipc.c:356

24518 -#, fuzzy

24461 msgid "waitpid failed"

24462 msgstr ""

24463

@@ -24524,7 +24466,6 @@ msgid "daemon not online yet"

24466 msgstr ""

24467

24468 #: t/helper/test-simple-ipc.c:406

24527 -#, fuzzy

24469 msgid "daemon failed to start"

24470 msgstr ""

24471

@@ -24658,7 +24599,7 @@ msgstr ""

24599 " redireção: %s"

24600

24601 #: remote-curl.c:183

24661 -#, fuzzy, c-format

24602 +#, c-format

24603 msgid "invalid quoting in push-option value: '%s'"

24604 msgstr ""

24605

@@ -24672,7 +24613,7 @@ msgid "invalid server response; expected service, got flush packet"

24613 msgstr ""

24614

24615 #: remote-curl.c:439

24675 -#, fuzzy, c-format

24616 +#, c-format

24617 msgid "invalid server response; got '%s'"

24618 msgstr ""

24619

@@ -24754,7 +24695,6 @@ msgid "dumb http transport does not support shallow capabilities"

24695 msgstr "transporte http estúpido insustenta capacidades shallow"

24696

24697 #: remote-curl.c:1149

24757 -#, fuzzy

24698 msgid "fetch failed."

24699 msgstr ""

24700

@@ -24763,7 +24703,7 @@ msgid "cannot fetch by sha1 over smart http"

24703 msgstr ""

24704

24705 #: remote-curl.c:1239 remote-curl.c:1245

24766 -#, fuzzy, c-format

24706 +#, c-format

24707 msgid "protocol error: expected sha/ref, got '%s'"

24708 msgstr ""

24709

@@ -24773,7 +24713,6 @@ msgid "http transport does not support %s"

24713 msgstr "transporte http insustenta %s"

24714

24715 #: remote-curl.c:1293

24776 -#, fuzzy

24716 msgid "git-http-push failed"

24717 msgstr ""

24718

@@ -24913,7 +24852,6 @@ msgid "Provide content or type and size information for repository objects"

24852 msgstr ""

24853

24854 #: command-list.h:62

24916 -#, fuzzy

24855 msgid "Display gitattributes information"

24856 msgstr ""

24857

@@ -24931,7 +24869,6 @@ msgid "Switch branches or restore working tree files"

24869 msgstr "Mudar de ramos ou restaurar os ficheiros da árvore de trabalho"

24870

24871 #: command-list.h:66

24934 -#, fuzzy

24872 msgid "Copy files from the index to the working tree"

24873 msgstr ""

24874

@@ -24952,7 +24889,6 @@ msgid "Graphical alternative to git-commit"

24889 msgstr ""

24890

24891 #: command-list.h:71

24955 -#, fuzzy

24892 msgid "Remove untracked files from the working tree"

24893 msgstr ""

24894

@@ -24974,7 +24910,6 @@ msgid "Write and verify Git commit-graph files"

24910 msgstr ""

24911

24912 #: command-list.h:76

24977 -#, fuzzy

24913 msgid "Create a new commit object"

24914 msgstr ""

24915

@@ -25024,12 +24959,10 @@ msgstr ""

24959 "Mostrar alterações entre commits, entre commit e árvore de trabalho, etc"

24960

24961 #: command-list.h:88

25027 -#, fuzzy

24962 msgid "Compares files in the working tree and the index"

24963 msgstr ""

24964

24965 #: command-list.h:89

25032 -#, fuzzy

24966 msgid "Compare a tree to the working tree or index"

24967 msgstr ""

24968

@@ -25054,7 +24987,6 @@ msgid "Download objects and refs from another repository"

24987 msgstr "Download objectos e refs de outro repositório"

24988

24989 #: command-list.h:95

25057 -#, fuzzy

24990 msgid "Receive missing objects from another repository"

24991 msgstr ""

24992

@@ -25064,12 +24996,10 @@ msgid "Rewrite branches"

24996 msgstr " Ramo remoto:%s"

24997

24998 #: command-list.h:97

25067 -#, fuzzy

24999 msgid "Produce a merge commit message"

25000 msgstr ""

25001

25002 #: command-list.h:98

25072 -#, fuzzy

25003 msgid "Output information on each ref"

25004 msgstr ""

25005

@@ -25082,7 +25012,6 @@ msgid "Prepare patches for e-mail submission"

25012 msgstr ""

25013

25014 #: command-list.h:101

25085 -#, fuzzy

25015 msgid "Verifies the connectivity and validity of the objects in the database"

25016 msgstr ""

25017

@@ -25115,12 +25044,10 @@ msgid "Server side implementation of Git over HTTP"

25044 msgstr ""

25045

25046 #: command-list.h:109

25118 -#, fuzzy

25047 msgid "Download from a remote Git repository via HTTP"

25048 msgstr ""

25049

25050 #: command-list.h:110

25123 -#, fuzzy

25051 msgid "Push objects over HTTP/DAV to another repository"

25052 msgstr ""

25053

@@ -25164,7 +25091,6 @@ msgid "List references in a remote repository"

25091 msgstr "repositório de referência"

25092

25093 #: command-list.h:120

25167 -#, fuzzy

25094 msgid "List the contents of a tree object"

25095 msgstr ""

25096

@@ -25242,7 +25168,6 @@ msgid "Import from and submit to Perforce repositories"

25168 msgstr ""

25169

25170 #: command-list.h:138

25245 -#, fuzzy

25171 msgid "Create a packed archive of objects"

25172 msgstr ""

25173

@@ -25260,7 +25185,6 @@ msgid "Compute unique ID for a patch"

25185 msgstr ""

25186

25187 #: command-list.h:142

25263 -#, fuzzy

25188 msgid "Prune all unreachable objects from the object database"

25189 msgstr ""

25190

@@ -25286,7 +25210,6 @@ msgid "Compare two commit ranges (e.g. two versions of a branch)"

25210 msgstr ""

25211

25212 #: command-list.h:148

25289 -#, fuzzy

25213 msgid "Reads tree information into the index"

25214 msgstr ""

25215

@@ -25305,12 +25228,10 @@ msgid "Manage reflog information"

25228 msgstr "mostrar informação de resolver-desfazer"

25229

25230 #: command-list.h:152

25308 -#, fuzzy

25231 msgid "Manage set of tracked repositories"

25232 msgstr ""

25233

25234 #: command-list.h:153

25313 -#, fuzzy

25235 msgid "Pack unpacked objects in a repository"

25236 msgstr ""

25237

@@ -25342,7 +25263,6 @@ msgid "Revert some existing commits"

25263 msgstr "Reverter algumas memórias existentes"

25264

25265 #: command-list.h:160

25345 -#, fuzzy

25266 msgid "Lists commit objects in reverse chronological order"

25267 msgstr ""

25268

@@ -25360,7 +25280,6 @@ msgid "Send a collection of patches as emails"

25280 msgstr ""

25281

25282 #: command-list.h:164

25363 -#, fuzzy

25283 msgid "Push objects over Git protocol to another repository"

25284 msgstr ""

25285

@@ -25451,7 +25370,6 @@ msgid "Unpack objects from a packed archive"

25370 msgstr ""

25371

25372 #: command-list.h:185

25454 -#, fuzzy

25373 msgid "Register file contents in the working tree to the index"

25374 msgstr ""

25375

@@ -25697,69 +25615,27 @@ msgstr "'$sm_path' já existe no index e é submódulo nenhum"

25615 msgid "'$sm_path' does not have a commit checked out"

25616 msgstr "'$sm_path' tem memória nenhuma checked out"

25617

25700 -#: git-submodule.sh:249

25701 -#, sh-format

25702 -msgid "Adding existing repo at '$sm_path' to the index"

25703 -msgstr "Adicionando repo existente em '$sm_path' ao index"

25704 -

25705 -#: git-submodule.sh:251

25706 -#, sh-format

25707 -msgid "'$sm_path' already exists and is not a valid git repo"

25708 -msgstr "'$sm_path' já existe e é repositório git inválido"

25709 -

25710 -#: git-submodule.sh:259

25711 -#, sh-format

25712 -msgid "A git directory for '$sm_name' is found locally with remote(s):"

25713 -msgstr ""

25714 -"Um diretório git de '$sm_name' foi encontrado localmente com os remotos:"

25715 -

25716 -#: git-submodule.sh:261

25717 -#, sh-format

25718 -msgid ""

25719 -"If you want to reuse this local git directory instead of cloning again from\n"

25720 -" $realrepo\n"

25721 -"use the '--force' option. If the local git directory is not the correct "

25722 -"repo\n"

25723 -"or you are unsure what this means choose another name with the '--name' "

25724 -"option."

25725 -msgstr ""

25726 -"Se queres reutilizar esta past git local, em vez de voltares a clonar\n"

25727 -" $realrepo\n"

25728 -"usa a opção --force. Se a pasta git local é o repo incorreto ou\n"

25729 -"se tens pouca certeza sobre o que isto significa, podes mudar o nome com a "

25730 -"opção '--name'."

25731 -

25732 -#: git-submodule.sh:267

25733 -#, sh-format

25734 -msgid "Reactivating local git directory for submodule '$sm_name'."

25735 -msgstr "A reativar o diretório git local do submódulo '$sm_name'."

25736 -

25737 -#: git-submodule.sh:279

25738 -#, sh-format

25739 -msgid "Unable to checkout submodule '$sm_path'"

25740 -msgstr "Incapaz de checkout submódulo '$sm_path'"

25741 -

25742 -#: git-submodule.sh:284

25618 +#: git-submodule.sh:248

25619 #, sh-format

25620 msgid "Failed to add submodule '$sm_path'"

25621 msgstr "Falha ao adicionar o submódulo '$sm_path'"

25622

25747 -#: git-submodule.sh:293

25623 +#: git-submodule.sh:257

25624 #, sh-format

25625 msgid "Failed to register submodule '$sm_path'"

25626 msgstr "Falha ao registar submódulo '$sm_path'"

25627

25752 -#: git-submodule.sh:568

25628 +#: git-submodule.sh:532

25629 #, sh-format

25630 msgid "Unable to find current revision in submodule path '$displaypath'"

25631 msgstr "Incapaz encontrar revisão atual em path de submódulo '$displaypath'"

25632

25757 -#: git-submodule.sh:578

25633 +#: git-submodule.sh:542

25634 #, sh-format

25635 msgid "Unable to fetch in submodule path '$sm_path'"

25636 msgstr "Incapaz de buscar em path de submódulo '$sm_path'"

25637

25762 -#: git-submodule.sh:583

25638 +#: git-submodule.sh:547

25639 #, sh-format

25640 msgid ""

25641 "Unable to find current ${remote_name}/${branch} revision in submodule path "

@@ -25768,7 +25644,7 @@ msgstr ""

25644 "Incapaz de encontrar revisão atual ${remote_name}/${branch} em path de "

25645 "submódulo '$sm_path'"

25646

25771 -#: git-submodule.sh:601

25647 +#: git-submodule.sh:565

25648 #, fuzzy, sh-format

25649 msgid ""

25650 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "

@@ -25777,7 +25653,7 @@ msgstr ""

25653 "Incapaz de buscar em path de submódulo '$displaypath'; tentando buscar $sha1 "

25654 "directamente:"

25655

25780 -#: git-submodule.sh:607

25656 +#: git-submodule.sh:571

25657 #, sh-format

25658 msgid ""

25659 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "

@@ -25786,48 +25662,48 @@ msgstr ""

25662 "Buscado na path de submódulo '$displaypath', mas continha nenhum $sha1. "

25663 "Falha ao buscar aquela memória diretamente."

25664

25789 -#: git-submodule.sh:614

25665 +#: git-submodule.sh:578

25666 #, sh-format

25667 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"

25668 msgstr "Incapaz de checkout '$sha1' no path de submódulo '$displaypath'"

25669

25794 -#: git-submodule.sh:615

25670 +#: git-submodule.sh:579

25671 #, sh-format

25672 msgid "Submodule path '$displaypath': checked out '$sha1'"

25673 msgstr "Path de submódulo '$displaypath': '$sha1' checked out"

25674

25799 -#: git-submodule.sh:619

25675 +#: git-submodule.sh:583

25676 #, sh-format

25677 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"

25678 msgstr "Incapaz de rebasear '$sha1' em path de submódulo '$displaypath'"

25679

25804 -#: git-submodule.sh:620

25680 +#: git-submodule.sh:584

25681 #, sh-format

25682 msgid "Submodule path '$displaypath': rebased into '$sha1'"

25683 msgstr "Path de submódulo '$displaypath': rebaseado em '$sha1'"

25684

25809 -#: git-submodule.sh:625

25685 +#: git-submodule.sh:589

25686 #, sh-format

25687 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"

25688 msgstr "Incapaz juntar '$sha1' em path de submódulo '$displaypath'"

25689

25814 -#: git-submodule.sh:626

25690 +#: git-submodule.sh:590

25691 #, sh-format

25692 msgid "Submodule path '$displaypath': merged in '$sha1'"

25693 msgstr "Caminho de submódulo '$displaypath': integrado em '$sha1'"

25694

25819 -#: git-submodule.sh:631

25695 +#: git-submodule.sh:595

25696 #, sh-format

25697 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"

25698 msgstr ""

25699 "Falha ao executar '$command $sha1' no caminho de submódulo '$displaypath'"

25700

25825 -#: git-submodule.sh:632

25701 +#: git-submodule.sh:596

25702 #, sh-format

25703 msgid "Submodule path '$displaypath': '$command $sha1'"

25704 msgstr "Caminho de submódulo '$displaypath': '$command $sha1'"

25705

25830 -#: git-submodule.sh:663

25706 +#: git-submodule.sh:627

25707 #, sh-format

25708 msgid "Failed to recurse into submodule path '$displaypath'"

25709 msgstr "Falha ao percorrer o caminho de submódulo '$displaypath'"

l10n: pt_PT: git-po-helper update