8af16e2792 · matheusbsbs/matheus-bagliano

@@ -21,7 +21,7 @@

21 # backing store | armazenamento-backup

22 # backward compatibility | retrocompatibilidade

23 # bare repository | repositório nú

24 -# bisect | bisetar

24 +# bisect | bisseção

25 # blame | blame

26 # blob object | objeto-blob

27 # branch | ramo

@@ -118,6 +118,7 @@

118 # revision | revisão

119 # rewind | rebobinar

120 # root commit | memória-raiz

121 +# scheduler | agendador

122 # SCM | SCM

123 # SHA-1 | SHA-1

124 # shallow repository | repositório superficial

@@ -217,7 +218,7 @@ msgid ""

218 msgstr ""

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

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

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

221 +"POT-Creation-Date: 2021-11-10 08:55+0800\n"

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

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

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

@@ -227,215 +228,215 @@ msgstr ""

228 "Content-Transfer-Encoding: 8bit\n"

229 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

230

230 -#: add-interactive.c:376

231 +#: add-interactive.c:380

232 #, c-format

233 msgid "Huh (%s)?"

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

235

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

236 -#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528

237 -#: builtin/rebase.c:1953

236 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512

237 +#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233

238 +#: builtin/rebase.c:1642

239 msgid "could not read index"

240 msgstr "incapaz de ler index"

241

241 -#: add-interactive.c:584 git-add--interactive.perl:269

242 +#: add-interactive.c:588 git-add--interactive.perl:269

243 #: git-add--interactive.perl:294

244 msgid "binary"

245 msgstr "binário"

246

246 -#: add-interactive.c:642 git-add--interactive.perl:278

247 +#: add-interactive.c:646 git-add--interactive.perl:278

248 #: git-add--interactive.perl:332

249 msgid "nothing"

250 msgstr "nada"

251

251 -#: add-interactive.c:643 git-add--interactive.perl:314

252 +#: add-interactive.c:647 git-add--interactive.perl:314

253 #: git-add--interactive.perl:329

254 msgid "unchanged"

255 msgstr "inalterado"

256

256 -#: add-interactive.c:680 git-add--interactive.perl:641

257 +#: add-interactive.c:684 git-add--interactive.perl:641

258 msgid "Update"

259 msgstr "Atualizar"

260

260 -#: add-interactive.c:697 add-interactive.c:885

261 +#: add-interactive.c:701 add-interactive.c:889

262 #, c-format

263 msgid "could not stage '%s'"

264 msgstr "incapaz de stage '%s'"

265

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

266 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718

267 msgid "could not write index"

268 msgstr "incapaz de escrever index"

269

269 -#: add-interactive.c:706 git-add--interactive.perl:626

270 +#: add-interactive.c:710 git-add--interactive.perl:626

271 #, c-format, perl-format

272 msgid "updated %d path\n"

273 msgid_plural "updated %d paths\n"

274 msgstr[0] "actualizou %d path\n"

275 msgstr[1] "actualizou %d paths\n"

276

276 -#: add-interactive.c:724 git-add--interactive.perl:676

277 +#: add-interactive.c:728 git-add--interactive.perl:676

278 #, c-format, perl-format

279 msgid "note: %s is untracked now.\n"

280 msgstr "nota: %s agora está por seguir.\n"

281

281 -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298

282 -#: builtin/reset.c:145

282 +#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298

283 +#: builtin/reset.c:151

284 #, c-format

285 msgid "make_cache_entry failed for path '%s'"

286 msgstr "make_cache_entry falhou para path '%s'"

287

287 -#: add-interactive.c:759 git-add--interactive.perl:653

288 +#: add-interactive.c:763 git-add--interactive.perl:653

289 msgid "Revert"

290 msgstr "Reverter"

291

291 -#: add-interactive.c:775

292 +#: add-interactive.c:779

293 msgid "Could not parse HEAD^{tree}"

294 msgstr "Incapaz de parse HEAD^{tree}"

295

295 -#: add-interactive.c:813 git-add--interactive.perl:629

296 +#: add-interactive.c:817 git-add--interactive.perl:629

297 #, c-format, perl-format

298 msgid "reverted %d path\n"

299 msgid_plural "reverted %d paths\n"

300 msgstr[0] "reverti %d path\n"

301 msgstr[1] "reverti %d paths\n"

302

302 -#: add-interactive.c:864 git-add--interactive.perl:693

303 +#: add-interactive.c:868 git-add--interactive.perl:693

304 #, c-format

305 msgid "No untracked files.\n"

306 msgstr "Nenhuns ficheiros untracked.\n"

307

307 -#: add-interactive.c:868 git-add--interactive.perl:687

308 +#: add-interactive.c:872 git-add--interactive.perl:687

309 msgid "Add untracked"

310 msgstr "Adiciona untracked"

311

311 -#: add-interactive.c:895 git-add--interactive.perl:623

312 +#: add-interactive.c:899 git-add--interactive.perl:623

313 #, c-format, perl-format

314 msgid "added %d path\n"

315 msgid_plural "added %d paths\n"

316 msgstr[0] "adicionei %d path\n"

317 msgstr[1] "adicionei %d paths\n"

318

318 -#: add-interactive.c:925

319 +#: add-interactive.c:929

320 #, c-format

321 msgid "ignoring unmerged: %s"

322 msgstr "ignorando unmerged: %s"

323

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

324 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369

325 #, c-format

326 msgid "Only binary files changed.\n"

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

328

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

329 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371

330 #, c-format

331 msgid "No changes.\n"

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

333

333 -#: add-interactive.c:943 git-add--interactive.perl:1379

334 +#: add-interactive.c:947 git-add--interactive.perl:1379

335 msgid "Patch update"

336 msgstr "Atualizar patch"

337

337 -#: add-interactive.c:982 git-add--interactive.perl:1792

338 +#: add-interactive.c:986 git-add--interactive.perl:1792

339 msgid "Review diff"

340 msgstr "Rever diff"

341

341 -#: add-interactive.c:1010

342 +#: add-interactive.c:1014

343 msgid "show paths with changes"

344 msgstr "mostrar paths modificados"

345

345 -#: add-interactive.c:1012

346 +#: add-interactive.c:1016

347 msgid "add working tree state to the staged set of changes"

348 msgstr "adicionar estado de working tree para conjunto das modificações staged"

349

349 -#: add-interactive.c:1014

350 +#: add-interactive.c:1018

351 msgid "revert staged set of changes back to the HEAD version"

352 msgstr "reverter conjunto das modificações staged de volta para a versão HEAD"

353

353 -#: add-interactive.c:1016

354 +#: add-interactive.c:1020

355 msgid "pick hunks and update selectively"

356 msgstr "apanha os pedaços e atualiza seletivamente"

357

357 -#: add-interactive.c:1018

358 +#: add-interactive.c:1022

359 msgid "view diff between HEAD and index"

360 msgstr "ver diff entre HEAD e índex"

361

361 -#: add-interactive.c:1020

362 +#: add-interactive.c:1024

363 msgid "add contents of untracked files to the staged set of changes"

364 msgstr ""

365 "adiciona conteúdo de ficheiros untracked para conjunto das modificações "

366 "staged"

367

367 -#: add-interactive.c:1028 add-interactive.c:1077

368 +#: add-interactive.c:1032 add-interactive.c:1081

369 msgid "Prompt help:"

370 msgstr "Prompt ajuda:"

371

371 -#: add-interactive.c:1030

372 +#: add-interactive.c:1034

373 msgid "select a single item"

374 msgstr "seleciona um único item"

375

375 -#: add-interactive.c:1032

376 +#: add-interactive.c:1036

377 msgid "select a range of items"

378 msgstr "seleciona um conjunto de items"

379

379 -#: add-interactive.c:1034

380 +#: add-interactive.c:1038

381 msgid "select multiple ranges"

382 msgstr "seleciona múltiplos conjuntos"

383

383 -#: add-interactive.c:1036 add-interactive.c:1081

384 +#: add-interactive.c:1040 add-interactive.c:1085

385 msgid "select item based on unique prefix"

386 msgstr "seleciona item tendo base o prefixo único"

387

387 -#: add-interactive.c:1038

388 +#: add-interactive.c:1042

389 msgid "unselect specified items"

390 msgstr "tira a seleção de items especificados"

391

391 -#: add-interactive.c:1040

392 +#: add-interactive.c:1044

393 msgid "choose all items"

394 msgstr "escolhe todos items"

395

395 -#: add-interactive.c:1042

396 +#: add-interactive.c:1046

397 msgid "(empty) finish selecting"

398 msgstr "(vazio) acaba de selecionar"

399

399 -#: add-interactive.c:1079

400 +#: add-interactive.c:1083

401 msgid "select a numbered item"

402 msgstr "seleciona item numerado"

403

403 -#: add-interactive.c:1083

404 +#: add-interactive.c:1087

405 msgid "(empty) select nothing"

406 msgstr "(vazio) seleciona nada"

407

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

408 +#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896

409 msgid "*** Commands ***"

410 msgstr "*** Comandos ***"

411

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

412 +#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893

413 msgid "What now"

414 msgstr "E agora"

415

415 -#: add-interactive.c:1144 git-add--interactive.perl:213

416 +#: add-interactive.c:1148 git-add--interactive.perl:213

417 msgid "staged"

418 msgstr "staged"

419

419 -#: add-interactive.c:1144 git-add--interactive.perl:213

420 +#: add-interactive.c:1148 git-add--interactive.perl:213

421 msgid "unstaged"

422 msgstr "unstaged"

423

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

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

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

426 -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886

427 -#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343

428 -#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589

429 -#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893

424 +#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311

425 +#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128

426 +#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194

427 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857

428 +#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503

429 +#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573

430 +#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811

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

432 msgid "path"

433 msgstr "caminho"

434

434 -#: add-interactive.c:1151

435 +#: add-interactive.c:1155

436 msgid "could not refresh index"

437 msgstr "incapaz de reactualizar o index"

438

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

439 +#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803

440 #, c-format

441 msgid "Bye.\n"

442 msgstr "Adeus.\n"

@@ -949,7 +950,7 @@ msgstr "Lamento, incapaz de editar este pedaço"

950 msgid "'git apply' failed"

951 msgstr "'git apply' falhou"

952

952 -#: advice.c:145

953 +#: advice.c:78

954 #, c-format

955 msgid ""

956 "\n"

@@ -958,37 +959,37 @@ msgstr ""

959 "\n"

960 "Desative este mensagem com \"git config advice.%s false\""

961

961 -#: advice.c:161

962 +#: advice.c:94

963 #, c-format

964 msgid "%shint: %.*s%s\n"

965 msgstr "%sdica: %.*s%s\n"

966

966 -#: advice.c:252

967 +#: advice.c:178

968 msgid "Cherry-picking is not possible because you have unmerged files."

969 msgstr "Cherry-picking é impossível porque tem ficheiros em separado."

970

970 -#: advice.c:254

971 +#: advice.c:180

972 msgid "Committing is not possible because you have unmerged files."

973 msgstr "Cometer é impossível porque tem ficheiros em separado."

974

974 -#: advice.c:256

975 +#: advice.c:182

976 msgid "Merging is not possible because you have unmerged files."

977 msgstr "Juntar é impossível porque tem ficheiros em separado."

978

978 -#: advice.c:258

979 +#: advice.c:184

980 msgid "Pulling is not possible because you have unmerged files."

981 msgstr "Puxar é impossível porque tem ficheiros em separado."

982

982 -#: advice.c:260

983 +#: advice.c:186

984 msgid "Reverting is not possible because you have unmerged files."

985 msgstr "Reverter é impossível porque tem ficheiros em separado."

986

986 -#: advice.c:262

987 +#: advice.c:188

988 #, c-format

989 msgid "It is not possible to %s because you have unmerged files."

990 msgstr "É impossível fazer %s porque tem ficheiros em separado."

991

991 -#: advice.c:270

992 +#: advice.c:196

993 msgid ""

994 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

995 "as appropriate to mark resolution and make a commit."

@@ -996,36 +997,42 @@ msgstr ""

997 "Corrija-os em worktree, e use 'git add/rm <ficheiro>' apropriadamente\n"

998 "para marcar resolução e fazer uma memória."

999

999 -#: advice.c:278

1000 +#: advice.c:204

1001 msgid "Exiting because of an unresolved conflict."

1002 msgstr "Saindo devido a conflito por resolver."

1003

1003 -#: advice.c:283 builtin/merge.c:1375

1004 +#: advice.c:209 builtin/merge.c:1379

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

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

1007

1007 -#: advice.c:285

1008 +#: advice.c:211

1009 msgid "Please, commit your changes before merging."

1010 msgstr "Por favor, memoriza as tuas modificações antes de juntar."

1011

1011 -#: advice.c:286

1012 +#: advice.c:212

1013 msgid "Exiting because of unfinished merge."

1014 msgstr "Saindo devido a juntar inacabado."

1015

1015 -#: advice.c:296

1016 +#: advice.c:217

1017 +msgid "Not possible to fast-forward, aborting."

1018 +msgstr "Impossível fazer fast-forward, abortando."

1019 +

1020 +#: advice.c:227

1021 #, c-format

1022 msgid ""

1018 -"The following pathspecs didn't match any eligible path, but they do match "

1019 -"index\n"

1020 -"entries outside the current sparse checkout:\n"

1023 +"The following paths and/or pathspecs matched paths that exist\n"

1024 +"outside of your sparse-checkout definition, so will not be\n"

1025 +"updated in the index:\n"

1026 msgstr ""

1027

1023 -#: advice.c:303

1028 +#: advice.c:234

1029 msgid ""

1025 -"Disable or modify the sparsity rules if you intend to update such entries."

1030 +"If you intend to update such entries, try one of the following:\n"

1031 +"* Use the --sparse option.\n"

1032 +"* Disable or modify the sparsity rules."

1033 msgstr ""

1034

1028 -#: advice.c:310

1035 +#: advice.c:242

1036 #, c-format

1037 msgid ""

1038 "Note: switching to '%s'.\n"

@@ -1118,7 +1125,8 @@ msgstr "incapaz de encontrar o nome do ficheiro no patch da linha %d"

1125 #: apply.c:921

1126 #, c-format

1127 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

1121 -msgstr "git apply: git-diff incorreto - esperava /dev/null, tive %s na linha %d"

1128 +msgstr ""

1129 +"git apply: git-diff incorreto - esperava /dev/null, tive %s na linha %d"

1130

1131 #: apply.c:927

1132 #, c-format

@@ -1207,49 +1215,49 @@ msgstr "ficheiro apagado %s ainda tem conteúdos"

1215 msgid "** warning: file %s becomes empty but is not deleted"

1216 msgstr "** aviso: ficheiro %s fica vazio e mantêm-se"

1217

1210 -#: apply.c:1977

1218 +#: apply.c:1978

1219 #, c-format

1220 msgid "corrupt binary patch at line %d: %.*s"

1221 msgstr "patch binário roto na linha %d: %.*s"

1222

1215 -#: apply.c:2014

1223 +#: apply.c:2015

1224 #, c-format

1225 msgid "unrecognized binary patch at line %d"

1226 msgstr "patch binário irreconhecível na linha %d"

1227

1220 -#: apply.c:2176

1228 +#: apply.c:2177

1229 #, c-format

1230 msgid "patch with only garbage at line %d"

1231 msgstr "patch com apenas lixo na linha %d"

1232

1225 -#: apply.c:2262

1233 +#: apply.c:2263

1234 #, c-format

1235 msgid "unable to read symlink %s"

1236 msgstr "incapaz de ler ligação simbólica %s"

1237

1230 -#: apply.c:2266

1238 +#: apply.c:2267

1239 #, c-format

1240 msgid "unable to open or read %s"

1241 msgstr "incapaz de abrir ou ler %s"

1242

1235 -#: apply.c:2935

1243 +#: apply.c:2936

1244 #, c-format

1245 msgid "invalid start of line: '%c'"

1246 msgstr "início de linha inválido: '%c'"

1247

1240 -#: apply.c:3056

1248 +#: apply.c:3057

1249 #, c-format

1250 msgid "Hunk #%d succeeded at %d (offset %d line)."

1251 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

1252 msgstr[0] "Pedaço #%d apareceu em %d (%d offset de linha)."

1253 msgstr[1] "Pedaço #%d apareceu em %d (%d offset de linhas)."

1254

1247 -#: apply.c:3068

1255 +#: apply.c:3069

1256 #, c-format

1257 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

1258 msgstr "Contexto reduzido a (%ld/%ld) para submeter fragmento em %d"

1259

1252 -#: apply.c:3074

1260 +#: apply.c:3075

1261 #, c-format

1262 msgid ""

1263 "while searching for:\n"

@@ -1258,443 +1266,444 @@ msgstr ""

1266 "procurando por:\n"

1267 "%.*s"

1268

1261 -#: apply.c:3096

1269 +#: apply.c:3097

1270 #, c-format

1271 msgid "missing binary patch data for '%s'"

1272 msgstr "faltando patch binário para '%s'"

1273

1266 -#: apply.c:3104

1274 +#: apply.c:3105

1275 #, c-format

1276 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

1277 msgstr "incapaz submeter-inversamente patch binário sem pedaço inverso a '%s'"

1278

1271 -#: apply.c:3151

1279 +#: apply.c:3152

1280 #, c-format

1281 msgid "cannot apply binary patch to '%s' without full index line"

1282 msgstr "incapaz submeter patch binário a '%s' sem a linha completa de index"

1283

1276 -#: apply.c:3162

1284 +#: apply.c:3163

1285 #, c-format

1286 msgid ""

1287 "the patch applies to '%s' (%s), which does not match the current contents."

1288 msgstr ""

1289 "o patch submete-se a '%s' (%s), que corresponde a conteúdo actual nenhum."

1290

1283 -#: apply.c:3170

1291 +#: apply.c:3171

1292 #, c-format

1293 msgid "the patch applies to an empty '%s' but it is not empty"

1294 msgstr "o patch submete-se a um '%s' vazio mas tem conteúdo"

1295

1288 -#: apply.c:3188

1296 +#: apply.c:3189

1297 #, c-format

1298 msgid "the necessary postimage %s for '%s' cannot be read"

1299 msgstr "incapaz ler a postimage necessária %s para '%s'"

1300

1293 -#: apply.c:3201

1301 +#: apply.c:3202

1302 #, c-format

1303 msgid "binary patch does not apply to '%s'"

1304 msgstr "path binário submete-se a '%s' de maneira nenhuma"

1305

1298 -#: apply.c:3208

1306 +#: apply.c:3209

1307 #, c-format

1308 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

1309 msgstr ""

1310 "patch binário para '%s' cria resultado incorreto (esperei %s, recebi %s)"

1311

1304 -#: apply.c:3229

1312 +#: apply.c:3230

1313 #, c-format

1314 msgid "patch failed: %s:%ld"

1315 msgstr "patch falhou: %s:%ld"

1316

1309 -#: apply.c:3352

1317 +#: apply.c:3353

1318 #, c-format

1319 msgid "cannot checkout %s"

1320 msgstr "incapaz de checkout %s"

1321

1314 -#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214

1322 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214

1323 #: setup.c:308

1324 #, c-format

1325 msgid "failed to read %s"

1326 msgstr "falha a ler %s"

1327

1320 -#: apply.c:3412

1328 +#: apply.c:3413

1329 #, c-format

1330 msgid "reading from '%s' beyond a symbolic link"

1331 msgstr "lendo '%s' além de uma ligação simbólica"

1332

1325 -#: apply.c:3441 apply.c:3687

1333 +#: apply.c:3442 apply.c:3709

1334 #, c-format

1335 msgid "path %s has been renamed/deleted"

1336 msgstr "path %s mudou de nome ou foi eliminado"

1337

1330 -#: apply.c:3527 apply.c:3702

1338 +#: apply.c:3549 apply.c:3724

1339 #, c-format

1340 msgid "%s: does not exist in index"

1341 msgstr "%s: tem inexistência no index"

1342

1335 -#: apply.c:3536 apply.c:3710 apply.c:3954

1343 +#: apply.c:3558 apply.c:3732 apply.c:3976

1344 #, c-format

1345 msgid "%s: does not match index"

1346 msgstr "%s: no index há correspondência nenhuma"

1347

1340 -#: apply.c:3571

1348 +#: apply.c:3593

1349 msgid "repository lacks the necessary blob to perform 3-way merge."

1350 msgstr "repositório falta o blob necessário para recorrer à tri-junção."

1351

1344 -#: apply.c:3574

1352 +#: apply.c:3596

1353 #, c-format

1354 msgid "Performing three-way merge...\n"

1355 msgstr "Realizando tri-junção...\n"

1356

1349 -#: apply.c:3590 apply.c:3594

1357 +#: apply.c:3612 apply.c:3616

1358 #, c-format

1359 msgid "cannot read the current contents of '%s'"

1360 msgstr "incapaz ler conteúdo atual de '%s'"

1361

1354 -#: apply.c:3606

1362 +#: apply.c:3628

1363 #, c-format

1364 msgid "Failed to perform three-way merge...\n"

1365 msgstr "Falha a recorrer a integração com 3 pontos...\n"

1366

1359 -#: apply.c:3620

1367 +#: apply.c:3642

1368 #, c-format

1369 msgid "Applied patch to '%s' with conflicts.\n"

1370 msgstr "Patch aplicado a '%s' com conflitos.\n"

1371

1364 -#: apply.c:3625

1372 +#: apply.c:3647

1373 #, c-format

1374 msgid "Applied patch to '%s' cleanly.\n"

1375 msgstr "Patch aplicado a '%s' com sucesso.\n"

1376

1369 -#: apply.c:3642

1377 +#: apply.c:3664

1378 #, c-format

1379 msgid "Falling back to direct application...\n"

1380 msgstr "Recorrendo a aplicação direta...\n"

1381

1374 -#: apply.c:3654

1382 +#: apply.c:3676

1383 msgid "removal patch leaves file contents"

1384 msgstr "patch de remoção deixa conteúdos no ficheiro"

1385

1378 -#: apply.c:3727

1386 +#: apply.c:3749

1387 #, c-format

1388 msgid "%s: wrong type"

1389 msgstr "%s: tipo errado"

1390

1383 -#: apply.c:3729

1391 +#: apply.c:3751

1392 #, c-format

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

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

1395

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

1389 -#: read-cache.c:1353

1396 +#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905

1397 +#: read-cache.c:1368

1398 #, c-format

1399 msgid "invalid path '%s'"

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

1401

1394 -#: apply.c:3952

1402 +#: apply.c:3974

1403 #, c-format

1404 msgid "%s: already exists in index"

1405 msgstr "%s: já existe no cenário"

1406

1399 -#: apply.c:3956

1407 +#: apply.c:3978

1408 #, c-format

1409 msgid "%s: already exists in working directory"

1410 msgstr "%s: já existe na pasta-trabalho"

1411

1404 -#: apply.c:3976

1412 +#: apply.c:3998

1413 #, c-format

1414 msgid "new mode (%o) of %s does not match old mode (%o)"

1415 msgstr "novo modo (%o) de %s é incorrespondente ao modo antigo (%o)"

1416

1409 -#: apply.c:3981

1417 +#: apply.c:4003

1418 #, c-format

1419 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

1420 msgstr "novo modo (%o) de %s é incorrespondente ao modo antigo (%o) de %s"

1421

1414 -#: apply.c:4001

1422 +#: apply.c:4023

1423 #, c-format

1424 msgid "affected file '%s' is beyond a symbolic link"

1425 msgstr "o ficheiro afetado '%s' é indicado por uma ligação simbólica"

1426

1419 -#: apply.c:4005

1427 +#: apply.c:4027

1428 #, c-format

1429 msgid "%s: patch does not apply"

1430 msgstr "%s: patch submete-se de maneira nenhuma"

1431

1424 -#: apply.c:4020

1432 +#: apply.c:4042

1433 #, c-format

1434 msgid "Checking patch %s..."

1435 msgstr ""

1436

1429 -#: apply.c:4112

1437 +#: apply.c:4134

1438 #, c-format

1439 msgid "sha1 information is lacking or useless for submodule %s"

1440 msgstr "sha1 tem falta informação ou é inútil para o submódulo %s"

1441

1434 -#: apply.c:4119

1442 +#: apply.c:4141

1443 #, c-format

1444 msgid "mode change for %s, which is not in current HEAD"

1445 msgstr "alteração de modo para %s, que está fora da HEAD atual"

1446

1439 -#: apply.c:4122

1447 +#: apply.c:4144

1448 #, c-format

1449 msgid "sha1 information is lacking or useless (%s)."

1450 msgstr "informação de sha1 está faltando ou é inútil (%s)."

1451

1444 -#: apply.c:4131

1452 +#: apply.c:4153

1453 #, c-format

1454 msgid "could not add %s to temporary index"

1455 msgstr "incapaz adicionar %s ao índex temporário"

1456

1449 -#: apply.c:4141

1457 +#: apply.c:4163

1458 #, c-format

1459 msgid "could not write temporary index to %s"

1460 msgstr "incapaz escrever index temporário para %s"

1461

1454 -#: apply.c:4279

1462 +#: apply.c:4301

1463 #, c-format

1464 msgid "unable to remove %s from index"

1465 msgstr "impossível remover %s de index"

1466

1459 -#: apply.c:4313

1467 +#: apply.c:4335

1468 #, c-format

1469 msgid "corrupt patch for submodule %s"

1470 msgstr "patch corrompido no submódulo %s"

1471

1464 -#: apply.c:4319

1472 +#: apply.c:4341

1473 #, c-format

1474 msgid "unable to stat newly created file '%s'"

1475 msgstr "incapaz obter estatutário de ficheiro recém-criado '%s'"

1476

1469 -#: apply.c:4327

1477 +#: apply.c:4349

1478 #, c-format

1479 msgid "unable to create backing store for newly created file %s"

1480 msgstr "incapaz criar armazenamento de backup para ficheiro recém-criado %s"

1481

1474 -#: apply.c:4333 apply.c:4478

1482 +#: apply.c:4355 apply.c:4500

1483 #, c-format

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

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

1486

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

1487 +#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241

1488 +#: builtin/gc.c:2276

1489 #, c-format

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

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

1492

1484 -#: apply.c:4380

1493 +#: apply.c:4402

1494 #, c-format

1495 msgid "closing file '%s'"

1496 msgstr "fechando ficheiro '%s'"

1497

1489 -#: apply.c:4450

1498 +#: apply.c:4472

1499 #, c-format

1500 msgid "unable to write file '%s' mode %o"

1501 msgstr "incapaz escrever ficheiro '%s' com modo %o"

1502

1494 -#: apply.c:4548

1503 +#: apply.c:4570

1504 #, c-format

1505 msgid "Applied patch %s cleanly."

1506 msgstr "Patch %s aplicado com sucesso."

1507

1499 -#: apply.c:4556

1508 +#: apply.c:4578

1509 msgid "internal error"

1510 msgstr "erro interno"

1511

1503 -#: apply.c:4559

1512 +#: apply.c:4581

1513 #, c-format

1514 msgid "Applying patch %%s with %d reject..."

1515 msgid_plural "Applying patch %%s with %d rejects..."

1516 msgstr[0] "A aplicar patch %%s com %d rejeição..."

1517 msgstr[1] "A aplicar patch %%s com %d rejeições..."

1518

1510 -#: apply.c:4570

1519 +#: apply.c:4592

1520 #, c-format

1521 msgid "truncating .rej filename to %.*s.rej"

1522 msgstr "a truncar o nome do ficheiro .rej em %.*s.rej"

1523

1515 -#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394

1524 +#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408

1525 #, c-format

1526 msgid "cannot open %s"

1527 msgstr "incapaz abrir %s"

1528

1520 -#: apply.c:4592

1529 +#: apply.c:4614

1530 #, c-format

1531 msgid "Hunk #%d applied cleanly."

1532 msgstr "Excerto nº%d aplicado com sucesso."

1533

1525 -#: apply.c:4596

1534 +#: apply.c:4618

1535 #, c-format

1536 msgid "Rejected hunk #%d."

1537 msgstr "Excerto nº%d rejeitado."

1538

1530 -#: apply.c:4725

1539 +#: apply.c:4747

1540 #, c-format

1541 msgid "Skipped patch '%s'."

1542 msgstr "Patch '%s' ignorado."

1543

1535 -#: apply.c:4733

1544 +#: apply.c:4755

1545 msgid "unrecognized input"

1546 msgstr "input desconhecido"

1547

1539 -#: apply.c:4753

1548 +#: apply.c:4775

1549 msgid "unable to read index file"

1550 msgstr "incapaz ler ficheiro index"

1551

1543 -#: apply.c:4910

1552 +#: apply.c:4932

1553 #, c-format

1554 msgid "can't open patch '%s': %s"

1555 msgstr "incapaz abrir patch '%s': %s"

1556

1548 -#: apply.c:4937

1557 +#: apply.c:4959

1558 #, c-format

1559 msgid "squelched %d whitespace error"

1560 msgid_plural "squelched %d whitespace errors"

1561 msgstr[0] "%d erro de espaço em branco reprimido"

1562 msgstr[1] "%d erros de espaço em branco reprimidos"

1563

1555 -#: apply.c:4943 apply.c:4958

1564 +#: apply.c:4965 apply.c:4980

1565 #, c-format

1566 msgid "%d line adds whitespace errors."

1567 msgid_plural "%d lines add whitespace errors."

1568 msgstr[0] "%d linha adiciona erros de espaço em branco."

1569 msgstr[1] "%d linhas adicionam erros de espaço em branco."

1570

1562 -#: apply.c:4951

1571 +#: apply.c:4973

1572 #, c-format

1573 msgid "%d line applied after fixing whitespace errors."

1574 msgid_plural "%d lines applied after fixing whitespace errors."

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

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

1577

1569 -#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423

1578 +#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429

1579 msgid "Unable to write new index file"

1580 msgstr "Incapaz de escrever novo ficheiro index"

1581

1573 -#: apply.c:4995

1582 +#: apply.c:5017

1583 msgid "don't apply changes matching the given path"

1584 msgstr ""

1585 "submeter de maneira nenhuma alterações correspondentes a path fornecido"

1586

1578 -#: apply.c:4998

1587 +#: apply.c:5020

1588 msgid "apply changes matching the given path"

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

1590

1582 -#: apply.c:5000 builtin/am.c:2318

1591 +#: apply.c:5022 builtin/am.c:2320

1592 msgid "num"

1593 msgstr "num"

1594

1586 -#: apply.c:5001

1595 +#: apply.c:5023

1596 msgid "remove <num> leading slashes from traditional diff paths"

1597 msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional"

1598

1590 -#: apply.c:5004

1599 +#: apply.c:5026

1600 msgid "ignore additions made by the patch"

1601 msgstr "ignorar adições feitas pelo patch"

1602

1594 -#: apply.c:5006

1603 +#: apply.c:5028

1604 msgid "instead of applying the patch, output diffstat for the input"

1605 msgstr "invés aplicada patch, output diffstat para "

1606

1598 -#: apply.c:5010

1607 +#: apply.c:5032

1608 msgid "show number of added and deleted lines in decimal notation"

1609 msgstr "mostrar número de linhas adicionadas e removidas em notação decimal"

1610

1602 -#: apply.c:5012

1611 +#: apply.c:5034

1612 msgid "instead of applying the patch, output a summary for the input"

1613 msgstr "em vez de aplicar o patch, mostrar um resumo da entrada"

1614

1606 -#: apply.c:5014

1615 +#: apply.c:5036

1616 msgid "instead of applying the patch, see if the patch is applicable"

1617 msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado"

1618

1610 -#: apply.c:5016

1619 +#: apply.c:5038

1620 msgid "make sure the patch is applicable to the current index"

1621 msgstr "garantir que o patch pode ser aplicado ao índice atual"

1622

1614 -#: apply.c:5018

1623 +#: apply.c:5040

1624 msgid "mark new files with `git add --intent-to-add`"

1625 msgstr ""

1626

1618 -#: apply.c:5020

1627 +#: apply.c:5042

1628 msgid "apply a patch without touching the working tree"

1629 msgstr "aplicar um patch sem tocar na árvore de trabalho"

1630

1622 -#: apply.c:5022

1631 +#: apply.c:5044

1632 msgid "accept a patch that touches outside the working area"

1633 msgstr "aceitar patches que alteram ficheiros fora da área de trabalho"

1634

1626 -#: apply.c:5025

1635 +#: apply.c:5047

1636 msgid "also apply the patch (use with --stat/--summary/--check)"

1637 msgstr "submeter o remendo também (usa com --stat/--summary/--check)"

1638

1630 -#: apply.c:5027

1639 +#: apply.c:5049

1640 msgid "attempt three-way merge, fall back on normal patch if that fails"

1641 msgstr "tentar tri-junção se um patch submete-se de maneira nenhuma"

1642

1634 -#: apply.c:5029

1643 +#: apply.c:5051

1644 msgid "build a temporary index based on embedded index information"

1645 msgstr ""

1646 "construir um índice temporário baseado na informação incorporada do índice"

1647

1639 -#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617

1648 +#: apply.c:5054 builtin/checkout-index.c:196

1649 msgid "paths are separated with NUL character"

1650 msgstr "caminhos estão separados por caractere NUL"

1651

1643 -#: apply.c:5034

1652 +#: apply.c:5056

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

1654 msgstr "garantir que pelo menos <n> linhas de contexto correspondam"

1655

1647 -#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297

1656 +#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299

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

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

1650 -#: builtin/rebase.c:1347

1658 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960

1659 +#: builtin/rebase.c:1051

1660 msgid "action"

1661 msgstr "ação"

1662

1654 -#: apply.c:5036

1663 +#: apply.c:5058

1664 msgid "detect new or modified lines that have whitespace errors"

1665 msgstr "detetar linhas novas ou modificadas que tenham espaços em branco"

1666

1658 -#: apply.c:5039 apply.c:5042

1667 +#: apply.c:5061 apply.c:5064

1668 msgid "ignore changes in whitespace when finding context"

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

1670

1662 -#: apply.c:5045

1671 +#: apply.c:5067

1672 msgid "apply the patch in reverse"

1673 msgstr "aplicar o patch em reverso"

1674

1666 -#: apply.c:5047

1675 +#: apply.c:5069

1676 msgid "don't expect at least one line of context"

1677 msgstr "conta com linha de contexto nenhuma"

1678

1670 -#: apply.c:5049

1679 +#: apply.c:5071

1680 msgid "leave the rejected hunks in corresponding *.rej files"

1681 msgstr "deixar os pedaços rejeitados nos respetivos ficheiros *.rej"

1682

1674 -#: apply.c:5051

1683 +#: apply.c:5073

1684 msgid "allow overlapping hunks"

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

1686

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

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

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

1687 +#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22

1688 +#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788

1689 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120

1690 msgid "be verbose"

1691 msgstr "ser verboso"

1692

1684 -#: apply.c:5054

1693 +#: apply.c:5076

1694 msgid "tolerate incorrectly detected missing new-line at the end of file"

1695 msgstr ""

1696 "tolerar deteções incorretas de falta de nova linha no final do ficheiro"

1697

1689 -#: apply.c:5057

1698 +#: apply.c:5079

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

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

1701

1693 -#: apply.c:5059 builtin/am.c:2306

1702 +#: apply.c:5081 builtin/am.c:2308

1703 msgid "root"

1704 msgstr "raiz"

1705

1697 -#: apply.c:5060

1706 +#: apply.c:5082

1707 msgid "prepend <root> to all filenames"

1708 msgstr "preceder <root> a todos os nomes de ficheiro"

1709

@@ -1766,152 +1775,151 @@ msgstr "git archive --remote <repo> [--exec <cmd>] --list"

1775 msgid "cannot read %s"

1776 msgstr "incapaz ler %s"

1777

1769 -#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095

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

1771 -#: builtin/merge.c:1144

1778 +#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114

1779 +#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834

1780 +#: builtin/merge.c:1145

1781 #, c-format

1782 msgid "could not read '%s'"

1783 msgstr "incapaz ler '%s'"

1784

1776 -#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328

1785 +#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334

1786 #, c-format

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

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

1789

1781 -#: archive.c:451

1790 +#: archive.c:450

1791 #, c-format

1792 msgid "no such ref: %.*s"

1793 msgstr "ref inexistente: %.*s"

1794

1786 -#: archive.c:457

1795 +#: archive.c:456

1796 #, c-format

1797 msgid "not a valid object name: %s"

1798 msgstr "nome de objeto inválido: %s"

1799

1791 -#: archive.c:470

1800 +#: archive.c:469

1801 #, c-format

1802 msgid "not a tree object: %s"

1803 msgstr "é objeto árvore nenhum: %s"

1804

1796 -#: archive.c:482

1805 +#: archive.c:481

1806 msgid "current working directory is untracked"

1807 msgstr "pasta de trabalho atual está por seguir"

1808

1800 -#: archive.c:523

1809 +#: archive.c:522

1810 #, c-format

1811 msgid "File not found: %s"

1812 msgstr "ficheiro por encontrar: %s"

1813

1805 -#: archive.c:525

1814 +#: archive.c:524

1815 #, c-format

1816 msgid "Not a regular file: %s"

1817 msgstr "É ficheiro normal nenhum: %s"

1818

1810 -#: archive.c:552

1819 +#: archive.c:551

1820 msgid "fmt"

1821 msgstr "fmt"

1822

1814 -#: archive.c:552

1823 +#: archive.c:551

1824 msgid "archive format"

1825 msgstr "formato do arquivo"

1826

1818 -#: archive.c:553 builtin/log.c:1775

1827 +#: archive.c:552 builtin/log.c:1775

1828 msgid "prefix"

1829 msgstr "prefixo"

1830

1822 -#: archive.c:554

1831 +#: archive.c:553

1832 msgid "prepend prefix to each pathname in the archive"

1833 msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo"

1834

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

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

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

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

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

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

1835 +#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884

1836 +#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135

1837 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1838 +#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103

1839 +#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410

1840 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190

1841 msgid "file"

1842 msgstr "ficheiro"

1843

1835 -#: archive.c:556

1844 +#: archive.c:555

1845 msgid "add untracked file to archive"

1846 msgstr "adiciona ficheiro por seguir a arquivo"

1847

1839 -#: archive.c:559 builtin/archive.c:90

1848 +#: archive.c:558 builtin/archive.c:88

1849 msgid "write the archive to this file"

1850 msgstr "escreve arquivo para este ficheiro"

1851

1843 -#: archive.c:561

1852 +#: archive.c:560

1853 msgid "read .gitattributes in working directory"

1854 msgstr "ler .gitattributes da pasta-trabalho"

1855

1847 -#: archive.c:562

1856 +#: archive.c:561

1857 msgid "report archived files on stderr"

1858 msgstr "reportar, na saída de erro padrão, ficheiro arquivados"

1859

1851 -#: archive.c:564

1860 +#: archive.c:563

1861 msgid "set compression level"

1862 msgstr "definir nível de compressão"

1863

1855 -#: archive.c:567

1864 +#: archive.c:566

1865 msgid "list supported archive formats"

1866 msgstr "listar formatos de arquivo suportados"

1867

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

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

1861 -#: builtin/submodule--helper.c:2902

1868 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121

1869 +#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512

1870 msgid "repo"

1871 msgstr "repo"

1872

1865 -#: archive.c:570 builtin/archive.c:92

1873 +#: archive.c:569 builtin/archive.c:90

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

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

1876

1869 -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717

1870 -#: builtin/notes.c:498

1877 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714

1878 +#: builtin/notes.c:496

1879 msgid "command"

1880 msgstr "comando"

1881

1874 -#: archive.c:572 builtin/archive.c:94

1882 +#: archive.c:571 builtin/archive.c:92

1883 msgid "path to the remote git-upload-archive command"

1884 msgstr "caminho para o comando git-upload-archive no remoto"

1885

1878 -#: archive.c:579

1886 +#: archive.c:578

1887 msgid "Unexpected option --remote"

1888 msgstr "Opção inesperada --remote"

1889

1882 -#: archive.c:581

1890 +#: archive.c:580

1891 msgid "Option --exec can only be used together with --remote"

1892 msgstr "Opção --exec apenas pode ser usada com --remote"

1893

1886 -#: archive.c:583

1894 +#: archive.c:582

1895 msgid "Unexpected option --output"

1896 msgstr "Opção inesperada --output"

1897

1890 -#: archive.c:585

1898 +#: archive.c:584

1899 msgid "Options --add-file and --remote cannot be used together"

1900 msgstr "Opções --add-file e --remote podem nada ser usadas juntas"

1901

1894 -#: archive.c:607

1902 +#: archive.c:606

1903 #, c-format

1904 msgid "Unknown archive format '%s'"

1905 msgstr "Formato de arquivo desconhecido '%s'"

1906

1899 -#: archive.c:616

1907 +#: archive.c:615

1908 #, c-format

1909 msgid "Argument not supported for format '%s': -%d"

1910 msgstr "Argumento por ser suportado para formato '%s': -%d"

1911

1904 -#: attr.c:202

1912 +#: attr.c:203

1913 #, c-format

1914 msgid "%.*s is not a valid attribute name"

1915 msgstr "%.*s é nome de atributo inválido"

1916

1909 -#: attr.c:363

1917 +#: attr.c:364

1918 #, c-format

1919 msgid "%s not allowed: %s:%d"

1920 msgstr "%s proibido: %s:%d"

1921

1914 -#: attr.c:403

1922 +#: attr.c:404

1923 msgid ""

1924 "Negative patterns are ignored in git attributes\n"

1925 "Use '\\!' for literal leading exclamation."

@@ -1919,22 +1927,22 @@ msgstr ""

1927 "Os padrões negativos são ignorados nos atributos do git\n"

1928 "Use '\\!' para uma exclamação literal à esquerda."

1929

1922 -#: bisect.c:489

1930 +#: bisect.c:488

1931 #, c-format

1932 msgid "Badly quoted content in file '%s': %s"

1933 msgstr "Conteúdo incorretamente citado no ficheiro '%s': %s"

1934

1927 -#: bisect.c:699

1935 +#: bisect.c:698

1936 #, c-format

1937 msgid "We cannot bisect more!\n"

1938 msgstr "Conseguimos bisectar mais nenhum!\n"

1939

1932 -#: bisect.c:766

1940 +#: bisect.c:764

1941 #, c-format

1942 msgid "Not a valid commit name %s"

1943 msgstr "Nome de commit inválido %s"

1944

1937 -#: bisect.c:791

1945 +#: bisect.c:789

1946 #, c-format

1947 msgid ""

1948 "The merge base %s is bad.\n"

@@ -1943,7 +1951,7 @@ msgstr ""

1951 "A base de integração %s é má (bad).\n"

1952 "Significa que o bug foi corrigido entre %s e [%s].\n"

1953

1946 -#: bisect.c:796

1954 +#: bisect.c:794

1955 #, c-format

1956 msgid ""

1957 "The merge base %s is new.\n"

@@ -1952,7 +1960,7 @@ msgstr ""

1960 "A base de integração %s é nova (new).\n"

1961 "A propriedade foi mudada entre %s e [%s].\n"

1962

1955 -#: bisect.c:801

1963 +#: bisect.c:799

1964 #, c-format

1965 msgid ""

1966 "The merge base %s is %s.\n"

@@ -1961,7 +1969,7 @@ msgstr ""

1969 "A base de integração %s é %s.\n"

1970 "Significa que o primeiro commit '%s' está entre %s e [%s].\n"

1971

1964 -#: bisect.c:809

1972 +#: bisect.c:807

1973 #, c-format

1974 msgid ""

1975 "Some %s revs are not ancestors of the %s rev.\n"

@@ -1972,7 +1980,7 @@ msgstr ""

1980 "git bisect pode funcionar incorretamente nesta situação.\n"

1981 "Talvez tenhas confundido revisões %s e %s?\n"

1982

1975 -#: bisect.c:822

1983 +#: bisect.c:820

1984 #, c-format

1985 msgid ""

1986 "the merge base between %s and [%s] must be skipped.\n"

@@ -1983,36 +1991,36 @@ msgstr ""

1991 "Portanto temos incerteza quanto a o primeiro commit %s estar entre %s e %s.\n"

1992 "Continuemos de qualquer maneira."

1993

1986 -#: bisect.c:861

1994 +#: bisect.c:859

1995 #, c-format

1996 msgid "Bisecting: a merge base must be tested\n"

1997 msgstr "A bissetar: uma base de integração tem de ser testada\n"

1998

1991 -#: bisect.c:911

1999 +#: bisect.c:909

2000 #, c-format

2001 msgid "a %s revision is needed"

2002 msgstr "precisa-se de uma revisão %s"

2003

1996 -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298

2004 +#: bisect.c:939

2005 #, c-format

2006 msgid "could not create file '%s'"

2007 msgstr "incapaz criar ficheiro '%s'"

2008

2001 -#: bisect.c:987 builtin/merge.c:153

2009 +#: bisect.c:985 builtin/merge.c:154

2010 #, c-format

2011 msgid "could not read file '%s'"

2012 msgstr "incapaz ler ficheiro '%s'"

2013

2006 -#: bisect.c:1027

2014 +#: bisect.c:1025

2015 msgid "reading bisect refs failed"

2016 msgstr "falhou ler refs de bisseção"

2017

2010 -#: bisect.c:1057

2018 +#: bisect.c:1055

2019 #, c-format

2020 msgid "%s was both %s and %s\n"

2021 msgstr "%s era %s e %s em simultâneo\n"

2022

2015 -#: bisect.c:1066

2023 +#: bisect.c:1064

2024 #, c-format

2025 msgid ""

2026 "No testable commit found.\n"

@@ -2021,7 +2029,7 @@ msgstr ""

2029 "Nenhum commit testável encontrado.\n"

2030 "Talvez tenha começado com parâmetros de caminho incorretos?\n"

2031

2024 -#: bisect.c:1095

2032 +#: bisect.c:1093

2033 #, c-format

2034 msgid "(roughly %d step)"

2035 msgid_plural "(roughly %d steps)"

@@ -2031,7 +2039,7 @@ msgstr[1] "(aproximadamente %d passos)"

2039 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

2040 #. steps)" translation.

2041 #.

2034 -#: bisect.c:1101

2042 +#: bisect.c:1099

2043 #, c-format

2044 msgid "Bisecting: %d revision left to test after this %s\n"

2045 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

@@ -2048,13 +2056,15 @@ msgstr "usar --contents com nome de objeto commit final é impossível"

2056

2057 #: blame.c:2811

2058 msgid "--reverse and --first-parent together require specified latest commit"

2051 -msgstr "--reverse e --first-parent juntos exige que se especifique a última memória"

2059 +msgstr ""

2060 +"--reverse e --first-parent juntos exige que se especifique a última memória"

2061

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

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

2055 -#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346

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

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

2062 +#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041

2063 +#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114

2064 +#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056

2065 +#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373

2066 +#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790

2067 +#: builtin/shortlog.c:255

2068 msgid "revision walk setup failed"

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

2070

@@ -2232,8 +2242,8 @@ msgstr "'%s' parece-se com ficheiro bundle v2 ou v3 nenhum"

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

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

2244

2235 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

2236 -#: builtin/commit.c:861

2245 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404

2246 +#: builtin/commit.c:862

2247 #, c-format

2248 msgid "could not open '%s'"

2249 msgstr "incapaz abrir '%s'"

@@ -2291,7 +2301,7 @@ msgstr "fora de suporte versão bundle %d"

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

2302 msgstr ""

2303

2294 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396

2304 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399

2305 #, c-format

2306 msgid "unrecognized argument: %s"

2307 msgstr "argumento irreconhecível: %s"

@@ -2333,7 +2343,7 @@ msgstr ""

2343 msgid "invalid color value: %.*s"

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

2345

2336 -#: commit-graph.c:204 midx.c:47

2346 +#: commit-graph.c:204 midx.c:51

2347 msgid "invalid hash version"

2348 msgstr "versão de hash inválida"

2349

@@ -2378,217 +2388,217 @@ msgstr ""

2388 msgid "unable to find all commit-graph files"

2389 msgstr "incapaz de encontrar todos ficheiros commit-graph"

2390

2381 -#: commit-graph.c:745 commit-graph.c:782

2391 +#: commit-graph.c:746 commit-graph.c:783

2392 msgid "invalid commit position. commit-graph is likely corrupt"

2393 msgstr ""

2394

2385 -#: commit-graph.c:766

2395 +#: commit-graph.c:767

2396 #, c-format

2397 msgid "could not find commit %s"

2398 msgstr "incapaz encontrar memória %s"

2399

2390 -#: commit-graph.c:799

2400 +#: commit-graph.c:800

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

2402 msgstr ""

2403

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

2404 +#: commit-graph.c:1105 builtin/am.c:1342

2405 #, c-format

2406 msgid "unable to parse commit %s"

2407 msgstr "incapaz analisar commit %s"

2408

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

2409 +#: commit-graph.c:1367 builtin/pack-objects.c:3070

2410 #, c-format

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

2412 msgstr "incapaz obter tipo de objeto %s"

2413

2404 -#: commit-graph.c:1368

2414 +#: commit-graph.c:1398

2415 msgid "Loading known commits in commit graph"

2416 msgstr ""

2417

2408 -#: commit-graph.c:1385

2418 +#: commit-graph.c:1415

2419 msgid "Expanding reachable commits in commit graph"

2420 msgstr ""

2421

2412 -#: commit-graph.c:1405

2422 +#: commit-graph.c:1435

2423 msgid "Clearing commit marks in commit graph"

2424 msgstr ""

2425

2416 -#: commit-graph.c:1424

2426 +#: commit-graph.c:1454

2427 msgid "Computing commit graph topological levels"

2428 msgstr ""

2429

2420 -#: commit-graph.c:1477

2430 +#: commit-graph.c:1507

2431 msgid "Computing commit graph generation numbers"

2432 msgstr ""

2433

2424 -#: commit-graph.c:1558

2434 +#: commit-graph.c:1588

2435 msgid "Computing commit changed paths Bloom filters"

2436 msgstr ""

2437

2428 -#: commit-graph.c:1635

2438 +#: commit-graph.c:1665

2439 msgid "Collecting referenced commits"

2440 msgstr "Recolhendo commits referênciados"

2441

2432 -#: commit-graph.c:1660

2442 +#: commit-graph.c:1690

2443 #, c-format

2444 msgid "Finding commits for commit graph in %d pack"

2445 msgid_plural "Finding commits for commit graph in %d packs"

2446 msgstr[0] ""

2447 msgstr[1] ""

2448

2439 -#: commit-graph.c:1673

2449 +#: commit-graph.c:1703

2450 #, c-format

2451 msgid "error adding pack %s"

2452 msgstr "error adicionando pacote %s"

2453

2444 -#: commit-graph.c:1677

2454 +#: commit-graph.c:1707

2455 #, c-format

2456 msgid "error opening index for %s"

2457 msgstr ""

2458

2449 -#: commit-graph.c:1714

2459 +#: commit-graph.c:1744

2460 msgid "Finding commits for commit graph among packed objects"

2461 msgstr ""

2462

2453 -#: commit-graph.c:1732

2463 +#: commit-graph.c:1762

2464 msgid "Finding extra edges in commit graph"

2465 msgstr ""

2466

2457 -#: commit-graph.c:1781

2467 +#: commit-graph.c:1811

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

2469 msgstr ""

2470

2461 -#: commit-graph.c:1812 midx.c:911

2471 +#: commit-graph.c:1842 midx.c:1146

2472 #, c-format

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

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

2475

2466 -#: commit-graph.c:1825

2476 +#: commit-graph.c:1855

2477 msgid "unable to create temporary graph layer"

2478 msgstr "incapaz criar camada de grafo temporária"

2479

2470 -#: commit-graph.c:1830

2480 +#: commit-graph.c:1860

2481 #, c-format

2482 msgid "unable to adjust shared permissions for '%s'"

2483 msgstr "incapaz de ajustar permissão partilhada para '%s'"

2484

2475 -#: commit-graph.c:1887

2485 +#: commit-graph.c:1917

2486 #, c-format

2487 msgid "Writing out commit graph in %d pass"

2488 msgid_plural "Writing out commit graph in %d passes"

2489 msgstr[0] ""

2490 msgstr[1] ""

2491

2482 -#: commit-graph.c:1923

2492 +#: commit-graph.c:1953

2493 msgid "unable to open commit-graph chain file"

2494 msgstr "incapaz abrir ficheiro commit-graph chain"

2495

2486 -#: commit-graph.c:1939

2496 +#: commit-graph.c:1969

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

2498 msgstr ""

2499

2490 -#: commit-graph.c:1959

2500 +#: commit-graph.c:1989

2501 msgid "failed to rename temporary commit-graph file"

2502 msgstr "falha a renomear ficheiro commit-graph temporário"

2503

2494 -#: commit-graph.c:2092

2504 +#: commit-graph.c:2122

2505 msgid "Scanning merged commits"

2506 msgstr "A adicionar %s integrado"

2507

2498 -#: commit-graph.c:2136

2508 +#: commit-graph.c:2166

2509 msgid "Merging commit-graph"

2510 msgstr ""

2511

2502 -#: commit-graph.c:2244

2512 +#: commit-graph.c:2274

2513 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2514 msgstr ""

2515

2506 -#: commit-graph.c:2351

2516 +#: commit-graph.c:2381

2517 msgid "too many commits to write graph"

2518 msgstr "demasiados commits para escrever grafo"

2519

2510 -#: commit-graph.c:2449

2520 +#: commit-graph.c:2479

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

2522 msgstr ""

2523

2514 -#: commit-graph.c:2459

2524 +#: commit-graph.c:2489

2525 #, c-format

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

2527 msgstr ""

2528

2519 -#: commit-graph.c:2469 commit-graph.c:2484

2529 +#: commit-graph.c:2499 commit-graph.c:2514

2530 #, c-format

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

2532 msgstr ""

2533

2524 -#: commit-graph.c:2476

2534 +#: commit-graph.c:2506

2535 #, c-format

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

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

2538

2529 -#: commit-graph.c:2494

2539 +#: commit-graph.c:2524

2540 msgid "Verifying commits in commit graph"

2541 msgstr ""

2542

2533 -#: commit-graph.c:2509

2543 +#: commit-graph.c:2539

2544 #, c-format

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

2546 msgstr ""

2547

2538 -#: commit-graph.c:2516

2548 +#: commit-graph.c:2546

2549 #, c-format

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

2551 msgstr ""

2552

2543 -#: commit-graph.c:2526

2553 +#: commit-graph.c:2556

2554 #, c-format

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

2556 msgstr ""

2557

2548 -#: commit-graph.c:2535

2558 +#: commit-graph.c:2565

2559 #, c-format

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

2561 msgstr ""

2562

2553 -#: commit-graph.c:2549

2563 +#: commit-graph.c:2579

2564 #, c-format

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

2566 msgstr ""

2567

2558 -#: commit-graph.c:2554

2568 +#: commit-graph.c:2584

2569 #, c-format

2570 msgid ""

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

2572 msgstr ""

2573

2564 -#: commit-graph.c:2558

2574 +#: commit-graph.c:2588

2575 #, c-format

2576 msgid ""

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

2578 msgstr ""

2579

2570 -#: commit-graph.c:2575

2580 +#: commit-graph.c:2605

2581 #, c-format

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

2583 msgstr ""

2584

2575 -#: commit-graph.c:2581

2585 +#: commit-graph.c:2611

2586 #, c-format

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

2588 msgstr ""

2589

2580 -#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417

2581 -#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457

2590 +#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418

2591 +#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457

2592 #, c-format

2593 msgid "could not parse %s"

2594 msgstr "incapaz analisar %s"

2595

2586 -#: commit.c:54

2596 +#: commit.c:55

2597 #, c-format

2598 msgid "%s %s is not a commit!"

2599 msgstr "%s %s é commit nenhum!"

2600

2591 -#: commit.c:194

2601 +#: commit.c:196

2602 msgid ""

2603 "Support for <GIT_DIR>/info/grafts is deprecated\n"

2604 "and will be removed in a future Git version.\n"

@@ -2600,27 +2610,27 @@ msgid ""

2610 "\"git config advice.graftFileDeprecated false\""

2611 msgstr ""

2612

2603 -#: commit.c:1237

2613 +#: commit.c:1239

2614 #, c-format

2615 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

2616 msgstr "Commit %s tem assinatura GPG desconfiada, alegadamente por %s."

2617

2608 -#: commit.c:1241

2618 +#: commit.c:1243

2619 #, c-format

2620 msgid "Commit %s has a bad GPG signature allegedly by %s."

2621 msgstr "Commit %s tem assinatura GPG incorreta, alegadamente por %s."

2622

2613 -#: commit.c:1244

2623 +#: commit.c:1246

2624 #, c-format

2625 msgid "Commit %s does not have a GPG signature."

2626 msgstr "Commit %s tem assinatura GPG nenhuma."

2627

2618 -#: commit.c:1247

2628 +#: commit.c:1249

2629 #, c-format

2630 msgid "Commit %s has a good GPG signature by %s\n"

2631 msgstr "Commit %s tem assinatura correta, por %s\n"

2632

2623 -#: commit.c:1501

2633 +#: commit.c:1503

2634 msgid ""

2635 "Warning: commit message did not conform to UTF-8.\n"

2636 "You may want to amend it after fixing the message, or set the config\n"

@@ -2635,7 +2645,7 @@ msgstr ""

2645 msgid "memory exhausted"

2646 msgstr "memória esgotada"

2647

2638 -#: config.c:126

2648 +#: config.c:125

2649 #, c-format

2650 msgid ""

2651 "exceeded maximum include depth (%d) while including\n"

@@ -2645,37 +2655,37 @@ msgid ""

2655 "This might be due to circular includes."

2656 msgstr ""

2657

2648 -#: config.c:142

2658 +#: config.c:141

2659 #, c-format

2660 msgid "could not expand include path '%s'"

2661 msgstr "incapaz de expandir include path '%s'"

2662

2653 -#: config.c:153

2663 +#: config.c:152

2664 msgid "relative config includes must come from files"

2665 msgstr ""

2666 "configuração relativa com inclusão condicional deve provir de ficheiros"

2667

2658 -#: config.c:199

2668 +#: config.c:201

2669 msgid "relative config include conditionals must come from files"

2670 msgstr ""

2671 "configuração relativa com inclusão condicional deve provir de ficheiros"

2672

2663 -#: config.c:396

2673 +#: config.c:398

2674 #, c-format

2675 msgid "invalid config format: %s"

2676 msgstr "formato de config inválido: %s"

2677

2668 -#: config.c:400

2678 +#: config.c:402

2679 #, c-format

2680 msgid "missing environment variable name for configuration '%.*s'"

2681 msgstr ""

2682

2673 -#: config.c:405

2683 +#: config.c:407

2684 #, c-format

2685 msgid "missing environment variable '%s' for configuration '%.*s'"

2686 msgstr ""

2687

2678 -#: config.c:442

2688 +#: config.c:443

2689 #, c-format

2690 msgid "key does not contain a section: %s"

2691 msgstr "chave contém secção nenhuma: %s"

@@ -2685,300 +2695,300 @@ msgstr "chave contém secção nenhuma: %s"

2695 msgid "key does not contain variable name: %s"

2696 msgstr ""

2697

2688 -#: config.c:472 sequencer.c:2785

2698 +#: config.c:470 sequencer.c:2804

2699 #, c-format

2700 msgid "invalid key: %s"

2701 msgstr "chave inválida: %s"

2702

2693 -#: config.c:478

2703 +#: config.c:475

2704 #, c-format

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

2706 msgstr ""

2707

2698 -#: config.c:511

2708 +#: config.c:495

2709 msgid "empty config key"

2710 msgstr ""

2711

2702 -#: config.c:529 config.c:541

2712 +#: config.c:513 config.c:525

2713 #, c-format

2714 msgid "bogus config parameter: %s"

2715 msgstr "parâmetro config falso: %s"

2716

2707 -#: config.c:555 config.c:572 config.c:579 config.c:588

2717 +#: config.c:539 config.c:556 config.c:563 config.c:572

2718 #, c-format

2719 msgid "bogus format in %s"

2720 msgstr "formato falso em %s"

2721

2712 -#: config.c:622

2722 +#: config.c:606

2723 #, c-format

2724 msgid "bogus count in %s"

2725 msgstr "contagem falsa em %s"

2726

2717 -#: config.c:626

2727 +#: config.c:610

2728 #, c-format

2729 msgid "too many entries in %s"

2730 msgstr "demasiadas entradas em %s"

2731

2722 -#: config.c:636

2732 +#: config.c:620

2733 #, c-format

2734 msgid "missing config key %s"

2735 msgstr "faltando chave config %s"

2736

2727 -#: config.c:644

2737 +#: config.c:628

2738 #, c-format

2739 msgid "missing config value %s"

2740 msgstr "faltando valor config %s"

2741

2732 -#: config.c:995

2742 +#: config.c:979

2743 #, c-format

2744 msgid "bad config line %d in blob %s"

2745 msgstr "linha de configuração %d incorreta no blob %s"

2746

2737 -#: config.c:999

2747 +#: config.c:983

2748 #, c-format

2749 msgid "bad config line %d in file %s"

2750 msgstr "linha de configuração %d incorreta no ficheiro %s"

2751

2742 -#: config.c:1003

2752 +#: config.c:987

2753 #, c-format

2754 msgid "bad config line %d in standard input"

2755 msgstr "linha de configuração %d incorreta na entrada padrão"

2756

2747 -#: config.c:1007

2757 +#: config.c:991

2758 #, c-format

2759 msgid "bad config line %d in submodule-blob %s"

2760 msgstr "linha de configuração %d incorreta no submódulo-blob %s"

2761

2752 -#: config.c:1011

2762 +#: config.c:995

2763 #, c-format

2764 msgid "bad config line %d in command line %s"

2765 msgstr "linha de configuração %d incorreta na linha de comandos %s"

2766

2757 -#: config.c:1015

2767 +#: config.c:999

2768 #, c-format

2769 msgid "bad config line %d in %s"

2770 msgstr "linha de configuração %d incorreta em %s"

2771

2762 -#: config.c:1152

2772 +#: config.c:1136

2773 msgid "out of range"

2774 msgstr "fora de intervalo"

2775

2766 -#: config.c:1152

2776 +#: config.c:1136

2777 msgid "invalid unit"

2778 msgstr "unidade inválida"

2779

2770 -#: config.c:1153

2780 +#: config.c:1137

2781 #, c-format

2782 msgid "bad numeric config value '%s' for '%s': %s"

2783 msgstr "valor numérico de config '%s' inválido para '%s': %s"

2784

2775 -#: config.c:1163

2785 +#: config.c:1147

2786 #, c-format

2787 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

2788 msgstr "valor numérico '%s' da configuração '%s' incorreto no blob %s: %s"

2789

2780 -#: config.c:1166

2790 +#: config.c:1150

2791 #, c-format

2792 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

2793 msgstr "valor numérico '%s' da configuração '%s' incorreto no ficheiro %s: %s"

2794

2785 -#: config.c:1169

2795 +#: config.c:1153

2796 #, c-format

2797 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

2798 msgstr ""

2799 "valor numérico '%s' da configuração '%s' incorreto na entrada padrão: %s"

2800

2791 -#: config.c:1172

2801 +#: config.c:1156

2802 #, c-format

2803 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

2804 msgstr ""

2805 "valor numérico '%s' da configuração '%s' incorreto no submódulo-blob %s: %s"

2806

2797 -#: config.c:1175

2807 +#: config.c:1159

2808 #, c-format

2809 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

2810 msgstr ""

2811 "valor numérico '%s' da configuração '%s' incorreto na linha de comandos %s: "

2812 "%s"

2813

2804 -#: config.c:1178

2814 +#: config.c:1162

2815 #, c-format

2816 msgid "bad numeric config value '%s' for '%s' in %s: %s"

2817 msgstr "valor numérico '%s' da configuração '%s' incorreto em %s: %s"

2818

2809 -#: config.c:1257

2819 +#: config.c:1241

2820 #, c-format

2821 msgid "bad boolean config value '%s' for '%s'"

2822 msgstr "valor booleano de config '%s' inválido para '%s'"

2823

2814 -#: config.c:1275

2824 +#: config.c:1259

2825 #, c-format

2826 msgid "failed to expand user dir in: '%s'"

2827 msgstr "falha ao expandir diretório de utilizador em: '%s'"

2828

2819 -#: config.c:1284

2829 +#: config.c:1268

2830 #, c-format

2831 msgid "'%s' for '%s' is not a valid timestamp"

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

2833

2824 -#: config.c:1377

2834 +#: config.c:1361

2835 #, c-format

2836 msgid "abbrev length out of range: %d"

2837 msgstr ""

2838

2829 -#: config.c:1391 config.c:1402

2839 +#: config.c:1375 config.c:1386

2840 #, c-format

2841 msgid "bad zlib compression level %d"

2842 msgstr "nível de compressão zlib %d incorreto"

2843

2834 -#: config.c:1494

2844 +#: config.c:1476

2845 msgid "core.commentChar should only be one character"

2846 msgstr ""

2847

2838 -#: config.c:1527

2848 +#: config.c:1509

2849 #, c-format

2850 msgid "invalid mode for object creation: %s"

2851 msgstr "modo inválido para criação de objeto: %s"

2852

2843 -#: config.c:1599

2853 +#: config.c:1581

2854 #, c-format

2855 msgid "malformed value for %s"

2856 msgstr "valor malformado para %s"

2857

2848 -#: config.c:1625

2858 +#: config.c:1607

2859 #, c-format

2860 msgid "malformed value for %s: %s"

2861 msgstr "valor malformado para %s: %s"

2862

2853 -#: config.c:1626

2863 +#: config.c:1608

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

2865 msgstr ""

2866

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

2867 +#: config.c:1669 builtin/pack-objects.c:4053

2868 #, c-format

2869 msgid "bad pack compression level %d"

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

2871

2862 -#: config.c:1809

2872 +#: config.c:1792

2873 #, c-format

2874 msgid "unable to load config blob object '%s'"

2875 msgstr "incapaz carregar objeto blob config '%s'"

2876

2867 -#: config.c:1812

2877 +#: config.c:1795

2878 #, c-format

2879 msgid "reference '%s' does not point to a blob"

2880 msgstr "referência '%s' aponta para blob nenhum"

2881

2872 -#: config.c:1829

2882 +#: config.c:1813

2883 #, c-format

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

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

2886

2877 -#: config.c:1874

2887 +#: config.c:1858

2888 #, c-format

2889 msgid "failed to parse %s"

2890 msgstr "falhou processar %s"

2891

2882 -#: config.c:1930

2892 +#: config.c:1914

2893 msgid "unable to parse command-line config"

2894 msgstr "incapaz analisar config de linha de comandos"

2895

2886 -#: config.c:2294

2896 +#: config.c:2282

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

2898 msgstr ""

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

2900

2891 -#: config.c:2468

2901 +#: config.c:2456

2902 #, c-format

2903 msgid "Invalid %s: '%s'"

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

2905

2896 -#: config.c:2513

2906 +#: config.c:2501

2907 #, c-format

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

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

2910

2901 -#: config.c:2559

2911 +#: config.c:2547

2912 #, c-format

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

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

2915

2906 -#: config.c:2561

2916 +#: config.c:2549

2917 #, c-format

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

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

2920

2911 -#: config.c:2645

2921 +#: config.c:2633

2922 #, c-format

2923 msgid "invalid section name '%s'"

2924 msgstr "nome de seção '%s' inválido"

2925

2916 -#: config.c:2677

2926 +#: config.c:2665

2927 #, c-format

2928 msgid "%s has multiple values"

2929 msgstr "%s tem múltiplos valores"

2930

2921 -#: config.c:2706

2931 +#: config.c:2694

2932 #, c-format

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

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

2935

2926 -#: config.c:2958 config.c:3285

2936 +#: config.c:2946 config.c:3273

2937 #, c-format

2938 msgid "could not lock config file %s"

2939 msgstr "incapaz trancar ficheiro config %s"

2940

2931 -#: config.c:2969

2941 +#: config.c:2957

2942 #, c-format

2943 msgid "opening %s"

2944 msgstr "abrindo %s"

2945

2936 -#: config.c:3006 builtin/config.c:361

2946 +#: config.c:2994 builtin/config.c:361

2947 #, c-format

2948 msgid "invalid pattern: %s"

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

2950

2941 -#: config.c:3031

2951 +#: config.c:3019

2952 #, c-format

2953 msgid "invalid config file %s"

2954 msgstr "ficheiro config inválido %s"

2955

2946 -#: config.c:3044 config.c:3298

2956 +#: config.c:3032 config.c:3286

2957 #, c-format

2958 msgid "fstat on %s failed"

2959 msgstr "fstat em %s falhou"

2960

2951 -#: config.c:3055

2961 +#: config.c:3043

2962 #, c-format

2963 msgid "unable to mmap '%s'%s"

2964 msgstr "incapaz mmap '%s'%s"

2965

2956 -#: config.c:3065 config.c:3303

2966 +#: config.c:3053 config.c:3291

2967 #, c-format

2968 msgid "chmod on %s failed"

2969 msgstr "chmod em %s falhou"

2970

2961 -#: config.c:3150 config.c:3400

2971 +#: config.c:3138 config.c:3388

2972 #, c-format

2973 msgid "could not write config file %s"

2974 msgstr "incapaz escrever ficheiro config %s"

2975

2966 -#: config.c:3184

2976 +#: config.c:3172

2977 #, c-format

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

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

2980

2971 -#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2981 +#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868

2982 #, c-format

2983 msgid "could not unset '%s'"

2984 msgstr "incapaz desdefinir '%s'"

2985

2976 -#: config.c:3276

2986 +#: config.c:3264

2987 #, c-format

2988 msgid "invalid section name: %s"

2989 msgstr ""

2990

2981 -#: config.c:3443

2991 +#: config.c:3431

2992 #, c-format

2993 msgid "missing value for '%s'"

2994 msgstr ""

@@ -3013,79 +3023,79 @@ msgstr "servidor tem fora suporte a característica '%s'"

3023 msgid "expected flush after capabilities"

3024 msgstr ""

3025

3016 -#: connect.c:263

3026 +#: connect.c:265

3027 #, c-format

3028 msgid "ignoring capabilities after first line '%s'"

3029 msgstr ""

3030

3021 -#: connect.c:284

3031 +#: connect.c:286

3032 msgid "protocol error: unexpected capabilities^{}"

3033 msgstr ""

3034

3025 -#: connect.c:306

3035 +#: connect.c:308

3036 #, c-format

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

3038 msgstr ""

3039

3030 -#: connect.c:308

3040 +#: connect.c:310

3041 msgid "repository on the other end cannot be shallow"

3042 msgstr ""

3043

3034 -#: connect.c:347

3044 +#: connect.c:349

3045 msgid "invalid packet"

3046 msgstr ""

3047

3038 -#: connect.c:367

3048 +#: connect.c:369

3049 #, c-format

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

3051 msgstr ""

3052

3043 -#: connect.c:497

3053 +#: connect.c:499

3054 #, c-format

3055 msgid "unknown object format '%s' specified by server"

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

3057

3048 -#: connect.c:526

3058 +#: connect.c:528

3059 #, c-format

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

3061 msgstr ""

3062

3053 -#: connect.c:530

3063 +#: connect.c:532

3064 msgid "expected flush after ref listing"

3065 msgstr ""

3066

3057 -#: connect.c:533

3067 +#: connect.c:535

3068 msgid "expected response end packet after ref listing"

3069 msgstr ""

3070

3061 -#: connect.c:666

3071 +#: connect.c:670

3072 #, c-format

3073 msgid "protocol '%s' is not supported"

3074 msgstr "protocolo '%s' é insustentado"

3075

3066 -#: connect.c:717

3076 +#: connect.c:721

3077 msgid "unable to set SO_KEEPALIVE on socket"

3078 msgstr ""

3079

3070 -#: connect.c:757 connect.c:820

3080 +#: connect.c:761 connect.c:824

3081 #, c-format

3082 msgid "Looking up %s ... "

3083 msgstr ""

3084

3075 -#: connect.c:761

3085 +#: connect.c:765

3086 #, c-format

3087 msgid "unable to look up %s (port %s) (%s)"

3088 msgstr "incapaz procurar %s (porta %s) (%s)"

3089

3090 #. TRANSLATORS: this is the end of "Looking up %s ... "

3081 -#: connect.c:765 connect.c:836

3091 +#: connect.c:769 connect.c:840

3092 #, c-format

3093 msgid ""

3094 "done.\n"

3095 "Connecting to %s (port %s) ... "

3096 msgstr ""

3097

3088 -#: connect.c:787 connect.c:864

3098 +#: connect.c:791 connect.c:868

3099 #, c-format

3100 msgid ""

3101 "unable to connect to %s:\n"

@@ -3095,77 +3105,78 @@ msgstr ""

3105 "%s"

3106

3107 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

3098 -#: connect.c:793 connect.c:870

3108 +#: connect.c:797 connect.c:874

3109 msgid "done."

3110 msgstr "concluído."

3111

3102 -#: connect.c:824

3112 +#: connect.c:828

3113 #, c-format

3114 msgid "unable to look up %s (%s)"

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

3116

3107 -#: connect.c:830

3117 +#: connect.c:834

3118 #, c-format

3119 msgid "unknown port %s"

3120 msgstr ""

3121

3112 -#: connect.c:967 connect.c:1299

3122 +#: connect.c:971 connect.c:1303

3123 #, c-format

3124 msgid "strange hostname '%s' blocked"

3125 msgstr ""

3126

3117 -#: connect.c:969

3127 +#: connect.c:973

3128 #, c-format

3129 msgid "strange port '%s' blocked"

3130 msgstr ""

3131

3122 -#: connect.c:979

3132 +#: connect.c:983

3133 #, c-format

3134 msgid "cannot start proxy %s"

3135 msgstr "incapaz começar proxy %s"

3136

3127 -#: connect.c:1050

3137 +#: connect.c:1054

3138 msgid "no path specified; see 'git help pull' for valid url syntax"

3129 -msgstr "caminho nenhum especificado; vê 'git help pull' para sintaxe de url válida"

3139 +msgstr ""

3140 +"caminho nenhum especificado; vê 'git help pull' para sintaxe de url válida"

3141

3131 -#: connect.c:1190

3142 +#: connect.c:1194

3143 msgid "newline is forbidden in git:// hosts and repo paths"

3144 msgstr "parágrafo é proibido em hosts git:// e caminhos repo"

3145

3135 -#: connect.c:1247

3146 +#: connect.c:1251

3147 msgid "ssh variant 'simple' does not support -4"

3148 msgstr ""

3149

3139 -#: connect.c:1259

3150 +#: connect.c:1263

3151 msgid "ssh variant 'simple' does not support -6"

3152 msgstr ""

3153

3143 -#: connect.c:1276

3154 +#: connect.c:1280

3155 msgid "ssh variant 'simple' does not support setting port"

3156 msgstr "ssh variant 'simple' insustenta definir porta"

3157

3147 -#: connect.c:1388

3158 +#: connect.c:1392

3159 #, c-format

3160 msgid "strange pathname '%s' blocked"

3161 msgstr ""

3162

3152 -#: connect.c:1436

3163 +#: connect.c:1440

3164 msgid "unable to fork"

3165 msgstr "incapaz de aforquilhar"

3166

3156 -#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45

3167 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45

3168 msgid "Checking connectivity"

3169 msgstr "A verificar conectividade"

3170

3160 -#: connected.c:120

3171 +#: connected.c:122

3172 msgid "Could not run 'git rev-list'"

3173 msgstr "Impossível executar 'git rev-list'"

3174

3164 -#: connected.c:144

3175 +#: connected.c:146

3176 msgid "failed write to rev-list"

3177 msgstr "falhou escrever para rev-list"

3178

3168 -#: connected.c:149

3179 +#: connected.c:151

3180 msgid "failed to close rev-list's stdin"

3181 msgstr "falha ao fechar entrada padrão de rev-list"

3182

@@ -3303,17 +3314,17 @@ msgstr ""

3314 msgid "refusing to work with credential missing protocol field"

3315 msgstr ""

3316

3306 -#: credential.c:394

3317 +#: credential.c:395

3318 #, c-format

3319 msgid "url contains a newline in its %s component: %s"

3320 msgstr ""

3321

3311 -#: credential.c:438

3322 +#: credential.c:439

3323 #, c-format

3324 msgid "url has no scheme: %s"

3325 msgstr "Remoto inexistente: %s"

3326

3316 -#: credential.c:511

3327 +#: credential.c:512

3328 #, c-format

3329 msgid "credential url cannot be parsed: %s"

3330 msgstr "incapaz analisar url credencial: %s"

@@ -3415,23 +3426,23 @@ msgstr ""

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

3427 msgstr "valor desconhecido para --diff-merges: %s"

3428

3418 -#: diff-lib.c:557

3429 +#: diff-lib.c:561

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

3431 msgstr "--merge-base é incompatível com intervalos"

3432

3422 -#: diff-lib.c:559

3433 +#: diff-lib.c:563

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

3435 msgstr "--merge-base apenas trabalho com memórias"

3436

3426 -#: diff-lib.c:576

3437 +#: diff-lib.c:580

3438 msgid "unable to get HEAD"

3439 msgstr "incapaz obter HEAD"

3440

3430 -#: diff-lib.c:583

3441 +#: diff-lib.c:587

3442 msgid "no merge base found"

3443 msgstr ""

3444

3434 -#: diff-lib.c:585

3445 +#: diff-lib.c:589

3446 msgid "multiple merge bases found"

3447 msgstr ""

3448

@@ -3445,41 +3456,41 @@ msgid ""

3456 "tree"

3457 msgstr ""

3458

3448 -#: diff.c:156

3459 +#: diff.c:157

3460 #, c-format

3461 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

3462 msgstr " Falha ao analisar percentagem limite de dirstat '%s'\n"

3463

3453 -#: diff.c:161

3464 +#: diff.c:162

3465 #, c-format

3466 msgid " Unknown dirstat parameter '%s'\n"

3467 msgstr " Parâmetro de dirstat desconhecido '%s'\n"

3468

3458 -#: diff.c:297

3469 +#: diff.c:298

3470 msgid ""

3471 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

3472 "'dimmed-zebra', 'plain'"

3473 msgstr ""

3474

3464 -#: diff.c:325

3475 +#: diff.c:326

3476 #, c-format

3477 msgid ""

3478 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

3479 "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"

3480 msgstr ""

3481

3471 -#: diff.c:333

3482 +#: diff.c:334

3483 msgid ""

3484 "color-moved-ws: allow-indentation-change cannot be combined with other "

3485 "whitespace modes"

3486 msgstr ""

3487

3477 -#: diff.c:410

3488 +#: diff.c:411

3489 #, c-format

3490 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

3491 msgstr "Valor desconhecido na variável de configuração 'diff.submodule': '%s'"

3492

3482 -#: diff.c:470

3493 +#: diff.c:471

3494 #, c-format

3495 msgid ""

3496 "Found errors in 'diff.dirstat' config variable:\n"

@@ -3488,46 +3499,46 @@ msgstr ""

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

3500 "%s"

3501

3491 -#: diff.c:4282

3502 +#: diff.c:4290

3503 #, c-format

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

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

3506

3496 -#: diff.c:4634

3507 +#: diff.c:4642

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

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

3510

3500 -#: diff.c:4637

3511 +#: diff.c:4645

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

3513 msgstr "-G, -S e --find-object são mutuamente exclusivos"

3514

3504 -#: diff.c:4640

3515 +#: diff.c:4648

3516 msgid ""

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

3518 msgstr ""

3519

3509 -#: diff.c:4643

3520 +#: diff.c:4651

3521 msgid ""

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

3523 "with -G and -S"

3524 msgstr ""

3525

3515 -#: diff.c:4722

3526 +#: diff.c:4730

3527 msgid "--follow requires exactly one pathspec"

3528 msgstr "--follow exige exatamente um espetro-caminho"

3529

3519 -#: diff.c:4770

3530 +#: diff.c:4778

3531 #, c-format

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

3533 msgstr "valor --stat inválido: %s"

3534

3524 -#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318

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

3535 +#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326

3536 +#: parse-options.c:217 parse-options.c:221

3537 #, c-format

3538 msgid "%s expects a numerical value"

3539 msgstr ""

3540

3530 -#: diff.c:4807

3541 +#: diff.c:4815

3542 #, c-format

3543 msgid ""

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

@@ -3536,515 +3547,516 @@ msgstr ""

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

3548 "%s"

3549

3539 -#: diff.c:4892

3550 +#: diff.c:4900

3551 #, c-format

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

3553 msgstr "classe de mudança '%c' desconhecida em --diff-filter=%s"

3554

3544 -#: diff.c:4916

3555 +#: diff.c:4924

3556 #, c-format

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

3558 msgstr ""

3559

3549 -#: diff.c:4930

3560 +#: diff.c:4938

3561 #, c-format

3562 msgid "unable to resolve '%s'"

3563 msgstr "incapaz resolver '%s'"

3564

3554 -#: diff.c:4980 diff.c:4986

3565 +#: diff.c:4988 diff.c:4994

3566 #, c-format

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

3568 msgstr ""

3569

3559 -#: diff.c:4998

3570 +#: diff.c:5006

3571 #, c-format

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

3573 msgstr ""

3574

3564 -#: diff.c:5019

3575 +#: diff.c:5027

3576 #, c-format

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

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

3579

3569 -#: diff.c:5038

3580 +#: diff.c:5046

3581 #, c-format

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

3583 msgstr "modo inválido '%s' em --color-moved-ws"

3584

3574 -#: diff.c:5078

3585 +#: diff.c:5086

3586 msgid ""

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

3588 "\"histogram\""

3589 msgstr ""

3590

3580 -#: diff.c:5114 diff.c:5134

3591 +#: diff.c:5122 diff.c:5142

3592 #, c-format

3593 msgid "invalid argument to %s"

3594 msgstr ""

3595

3585 -#: diff.c:5238

3596 +#: diff.c:5246

3597 #, c-format

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

3599 msgstr ""

3600

3590 -#: diff.c:5287

3601 +#: diff.c:5295

3602 #, c-format

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

3604 msgstr "Falha a processar parâmetro da opção --submodule: '%s'"

3605

3595 -#: diff.c:5343

3606 +#: diff.c:5351

3607 #, c-format

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

3609 msgstr "argumento --word-diff incorrecto: %s"

3610

3600 -#: diff.c:5379

3611 +#: diff.c:5387

3612 msgid "Diff output format options"

3613 msgstr ""

3614

3604 -#: diff.c:5381 diff.c:5387

3615 +#: diff.c:5389 diff.c:5395

3616 msgid "generate patch"

3617 msgstr "gerar remendo"

3618

3608 -#: diff.c:5384 builtin/log.c:179

3619 +#: diff.c:5392 builtin/log.c:179

3620 msgid "suppress diff output"

3621 msgstr "suprimir saída de diff"

3622

3612 -#: diff.c:5389 diff.c:5503 diff.c:5510

3623 +#: diff.c:5397 diff.c:5511 diff.c:5518

3624 msgid "<n>"

3625 msgstr "<n>"

3626

3616 -#: diff.c:5390 diff.c:5393

3627 +#: diff.c:5398 diff.c:5401

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

3629 msgstr "gerar diffs com <n> linhas de contexto"

3630

3620 -#: diff.c:5395

3631 +#: diff.c:5403

3632 msgid "generate the diff in raw format"

3633 msgstr ""

3634

3624 -#: diff.c:5398

3635 +#: diff.c:5406

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

3637 msgstr "sinónimo de '-p --raw'"

3638

3628 -#: diff.c:5402

3639 +#: diff.c:5410

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

3641 msgstr "sinónimo de '-p --stat'"

3642

3632 -#: diff.c:5406

3643 +#: diff.c:5414

3644 msgid "machine friendly --stat"

3645 msgstr "--stat amigável à máquina"

3646

3636 -#: diff.c:5409

3647 +#: diff.c:5417

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

3649 msgstr ""

3650

3640 -#: diff.c:5411 diff.c:5419

3651 +#: diff.c:5419 diff.c:5427

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

3653 msgstr ""

3654

3644 -#: diff.c:5412

3655 +#: diff.c:5420

3656 msgid ""

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

3658 msgstr ""

3659

3649 -#: diff.c:5416

3660 +#: diff.c:5424

3661 msgid "synonym for --dirstat=cumulative"

3662 msgstr "sinónimo de --dirstat=cumulative"

3663

3653 -#: diff.c:5420

3664 +#: diff.c:5428

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

3666 msgstr ""

3667

3657 -#: diff.c:5424

3668 +#: diff.c:5432

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

3670 msgstr ""

3671

3661 -#: diff.c:5427

3672 +#: diff.c:5435

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

3674 msgstr ""

3675

3665 -#: diff.c:5430

3676 +#: diff.c:5438

3677 msgid "show only names of changed files"

3678 msgstr ""

3679

3669 -#: diff.c:5433

3680 +#: diff.c:5441

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

3682 msgstr ""

3683

3673 -#: diff.c:5435

3684 +#: diff.c:5443

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

3686 msgstr ""

3687

3677 -#: diff.c:5436

3688 +#: diff.c:5444

3689 msgid "generate diffstat"

3690 msgstr "gerar diffstat"

3691

3681 -#: diff.c:5438 diff.c:5441 diff.c:5444

3692 +#: diff.c:5446 diff.c:5449 diff.c:5452

3693 msgid "<width>"

3694 msgstr ""

3695

3685 -#: diff.c:5439

3696 +#: diff.c:5447

3697 msgid "generate diffstat with a given width"

3698 msgstr ""

3699

3689 -#: diff.c:5442

3700 +#: diff.c:5450

3701 msgid "generate diffstat with a given name width"

3702 msgstr ""

3703

3693 -#: diff.c:5445

3704 +#: diff.c:5453

3705 msgid "generate diffstat with a given graph width"

3706 msgstr ""

3707

3697 -#: diff.c:5447

3708 +#: diff.c:5455

3709 msgid "<count>"

3710 msgstr ""

3711

3701 -#: diff.c:5448

3712 +#: diff.c:5456

3713 msgid "generate diffstat with limited lines"

3714 msgstr ""

3715

3705 -#: diff.c:5451

3716 +#: diff.c:5459

3717 msgid "generate compact summary in diffstat"

3718 msgstr ""

3719

3709 -#: diff.c:5454

3720 +#: diff.c:5462

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

3722 msgstr ""

3723

3713 -#: diff.c:5457

3724 +#: diff.c:5465

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

3726 msgstr ""

3727

3717 -#: diff.c:5459

3728 +#: diff.c:5467

3729 msgid "show colored diff"

3730 msgstr "mostrar diff colorida"

3731

3721 -#: diff.c:5460

3732 +#: diff.c:5468

3733 msgid "<kind>"

3734 msgstr ""

3735

3725 -#: diff.c:5461

3736 +#: diff.c:5469

3737 msgid ""

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

3739 "diff"

3740 msgstr ""

3741

3731 -#: diff.c:5464

3742 +#: diff.c:5472

3743 msgid ""

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

3745 "--numstat"

3746 msgstr ""

3747

3737 -#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582

3748 +#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590

3749 msgid "<prefix>"

3750 msgstr "<prefixo>"

3751

3741 -#: diff.c:5468

3752 +#: diff.c:5476

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

3754 msgstr ""

3755

3745 -#: diff.c:5471

3756 +#: diff.c:5479

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

3758 msgstr ""

3759

3749 -#: diff.c:5474

3760 +#: diff.c:5482

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

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

3763

3753 -#: diff.c:5477

3764 +#: diff.c:5485

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

3766 msgstr ""

3767

3757 -#: diff.c:5480

3768 +#: diff.c:5488

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

3759 -msgstr "mostrar contexto entre diff de pedaços até ao número de linhas especificado"

3770 +msgstr ""

3771 +"mostrar contexto entre diff de pedaços até ao número de linhas especificado"

3772

3761 -#: diff.c:5484 diff.c:5489 diff.c:5494

3773 +#: diff.c:5492 diff.c:5497 diff.c:5502

3774 msgid "<char>"

3775 msgstr "<caractere>"

3776

3765 -#: diff.c:5485

3777 +#: diff.c:5493

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

3779 msgstr ""

3780

3769 -#: diff.c:5490

3781 +#: diff.c:5498

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

3783 msgstr ""

3784

3773 -#: diff.c:5495

3785 +#: diff.c:5503

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

3787 msgstr ""

3788

3777 -#: diff.c:5498

3789 +#: diff.c:5506

3790 msgid "Diff rename options"

3791 msgstr ""

3792

3781 -#: diff.c:5499

3793 +#: diff.c:5507

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

3795 msgstr "<n>[/<m>]"

3796

3785 -#: diff.c:5500

3797 +#: diff.c:5508

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

3799 msgstr ""

3800

3789 -#: diff.c:5504

3801 +#: diff.c:5512

3802 msgid "detect renames"

3803 msgstr "detetar renomeações"

3804

3793 -#: diff.c:5508

3805 +#: diff.c:5516

3806 msgid "omit the preimage for deletes"

3807 msgstr ""

3808

3797 -#: diff.c:5511

3809 +#: diff.c:5519

3810 msgid "detect copies"

3811 msgstr ""

3812

3801 -#: diff.c:5515

3813 +#: diff.c:5523

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

3815 msgstr ""

3816

3805 -#: diff.c:5517

3817 +#: diff.c:5525

3818 msgid "disable rename detection"

3819 msgstr "desativar detecção de renomeação"

3820

3809 -#: diff.c:5520

3821 +#: diff.c:5528

3822 msgid "use empty blobs as rename source"

3823 msgstr ""

3824

3813 -#: diff.c:5522

3825 +#: diff.c:5530

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

3827 msgstr ""

3828

3817 -#: diff.c:5525

3829 +#: diff.c:5533

3830 msgid ""

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

3832 "given limit"

3833 msgstr ""

3834

3823 -#: diff.c:5527

3835 +#: diff.c:5535

3836 msgid "Diff algorithm options"

3837 msgstr ""

3838

3827 -#: diff.c:5529

3839 +#: diff.c:5537

3840 msgid "produce the smallest possible diff"

3841 msgstr ""

3842

3831 -#: diff.c:5532

3843 +#: diff.c:5540

3844 msgid "ignore whitespace when comparing lines"

3845 msgstr ""

3846

3835 -#: diff.c:5535

3847 +#: diff.c:5543

3848 msgid "ignore changes in amount of whitespace"

3849 msgstr ""

3850

3839 -#: diff.c:5538

3851 +#: diff.c:5546

3852 msgid "ignore changes in whitespace at EOL"

3853 msgstr ""

3854

3843 -#: diff.c:5541

3855 +#: diff.c:5549

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

3857 msgstr ""

3858

3847 -#: diff.c:5544

3859 +#: diff.c:5552

3860 msgid "ignore changes whose lines are all blank"

3861 msgstr ""

3862

3851 -#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616

3863 +#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624

3864 msgid "<regex>"

3865 msgstr ""

3866

3855 -#: diff.c:5547

3867 +#: diff.c:5555

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

3869 msgstr ""

3870

3859 -#: diff.c:5550

3871 +#: diff.c:5558

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

3873 msgstr ""

3874

3863 -#: diff.c:5553

3875 +#: diff.c:5561

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

3877 msgstr ""

3878

3867 -#: diff.c:5557

3879 +#: diff.c:5565

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

3881 msgstr ""

3882

3871 -#: diff.c:5559

3883 +#: diff.c:5567

3884 msgid "<algorithm>"

3885 msgstr ""

3886

3875 -#: diff.c:5560

3887 +#: diff.c:5568

3888 msgid "choose a diff algorithm"

3889 msgstr ""

3890

3879 -#: diff.c:5562

3891 +#: diff.c:5570

3892 msgid "<text>"

3893 msgstr "<texto>"

3894

3883 -#: diff.c:5563

3895 +#: diff.c:5571

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

3897 msgstr ""

3898

3887 -#: diff.c:5565 diff.c:5574 diff.c:5577

3899 +#: diff.c:5573 diff.c:5582 diff.c:5585

3900 msgid "<mode>"

3901 msgstr "<modo>"

3902

3891 -#: diff.c:5566

3903 +#: diff.c:5574

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

3905 msgstr ""

3906

3895 -#: diff.c:5569

3907 +#: diff.c:5577

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

3909 msgstr ""

3910

3899 -#: diff.c:5572

3911 +#: diff.c:5580

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

3913 msgstr ""

3914

3903 -#: diff.c:5575

3915 +#: diff.c:5583

3916 msgid "moved lines of code are colored differently"

3917 msgstr ""

3918

3907 -#: diff.c:5578

3919 +#: diff.c:5586

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

3921 msgstr ""

3922

3911 -#: diff.c:5581

3923 +#: diff.c:5589

3924 msgid "Other diff options"

3925 msgstr ""

3926

3915 -#: diff.c:5583

3927 +#: diff.c:5591

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

3929 msgstr ""

3930

3919 -#: diff.c:5587

3931 +#: diff.c:5595

3932 msgid "treat all files as text"

3933 msgstr "tratar todos ficheiros como texto"

3934

3923 -#: diff.c:5589

3935 +#: diff.c:5597

3936 msgid "swap two inputs, reverse the diff"

3937 msgstr ""

3938

3927 -#: diff.c:5591

3939 +#: diff.c:5599

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

3941 msgstr ""

3942

3931 -#: diff.c:5593

3943 +#: diff.c:5601

3944 msgid "disable all output of the program"

3945 msgstr ""

3946

3935 -#: diff.c:5595

3947 +#: diff.c:5603

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

3949 msgstr ""

3950

3939 -#: diff.c:5597

3951 +#: diff.c:5605

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

3953 msgstr ""

3954

3943 -#: diff.c:5599

3955 +#: diff.c:5607

3956 msgid "<when>"

3957 msgstr "<quando>"

3958

3947 -#: diff.c:5600

3959 +#: diff.c:5608

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

3961 msgstr ""

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

3963 "(Predefinição: all)"

3964

3953 -#: diff.c:5603

3965 +#: diff.c:5611

3966 msgid "<format>"

3967 msgstr "<formato>"

3968

3957 -#: diff.c:5604

3969 +#: diff.c:5612

3970 msgid "specify how differences in submodules are shown"

3971 msgstr ""

3972

3961 -#: diff.c:5608

3973 +#: diff.c:5616

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

3975 msgstr ""

3976

3965 -#: diff.c:5611

3977 +#: diff.c:5619

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

3979 msgstr ""

3980

3969 -#: diff.c:5613

3981 +#: diff.c:5621

3982 msgid "<string>"

3983 msgstr "<string>"

3984

3973 -#: diff.c:5614

3985 +#: diff.c:5622

3986 msgid ""

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

3988 "string"

3989 msgstr ""

3990

3979 -#: diff.c:5617

3991 +#: diff.c:5625

3992 msgid ""

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

3994 "regex"

3995 msgstr ""

3996

3985 -#: diff.c:5620

3997 +#: diff.c:5628

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

3999 msgstr "mostrar todos as alterações em memória com -S ou -G"

4000

3989 -#: diff.c:5623

4001 +#: diff.c:5631

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

4003 msgstr "tratar <string> em -S como expressão comum estendida de POSIX"

4004

3993 -#: diff.c:5626

4005 +#: diff.c:5634

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

4007 msgstr "controlar a ordem em que os ficheiro aparecem na saída"

4008

3997 -#: diff.c:5627 diff.c:5630

4009 +#: diff.c:5635 diff.c:5638

4010 msgid "<path>"

4011 msgstr "<caminho>"

4012

4001 -#: diff.c:5628

4013 +#: diff.c:5636

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

4015 msgstr ""

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

4017

4006 -#: diff.c:5631

4018 +#: diff.c:5639

4019 msgid "skip the output to the specified path"

4020 msgstr "ignorar saída para caminho especificado"

4021

4010 -#: diff.c:5633

4022 +#: diff.c:5641

4023 msgid "<object-id>"

4024 msgstr "<id-objeto>"

4025

4014 -#: diff.c:5634

4026 +#: diff.c:5642

4027 msgid ""

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

4029 "object"

4030 msgstr ""

4031

4020 -#: diff.c:5636

4032 +#: diff.c:5644

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

4034 msgstr ""

4035

4024 -#: diff.c:5637

4036 +#: diff.c:5645

4037 msgid "select files by diff type"

4038 msgstr ""

4039

4028 -#: diff.c:5639

4040 +#: diff.c:5647

4041 msgid "<file>"

4042 msgstr "<ficheiro>"

4043

4032 -#: diff.c:5640

4044 +#: diff.c:5648

4045 msgid "Output to a specific file"

4046 msgstr "Sair para ficheiro específico"

4047

4036 -#: diff.c:6298

4048 +#: diff.c:6306

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

4050 msgstr ""

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

4052

4041 -#: diff.c:6301

4053 +#: diff.c:6309

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

4055 msgstr ""

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

4057 "ficheiros."

4058

4047 -#: diff.c:6304

4059 +#: diff.c:6312

4060 #, c-format

4061 msgid ""

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

@@ -4056,7 +4068,7 @@ msgstr ""

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

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

4070

4059 -#: diffcore-rename.c:1514

4071 +#: diffcore-rename.c:1564

4072 msgid "Performing inexact rename detection"

4073 msgstr "Realizando detecção de renomeação inexata"

4074

@@ -4068,7 +4080,8 @@ msgstr "path %s inexistente em diff"

4080 #: dir.c:593

4081 #, c-format

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

4071 -msgstr "espetro-caminho '%s' correspondeu a ficheiro(s) nenhum(s) conhecido pelo git"

4083 +msgstr ""

4084 +"espetro-caminho '%s' correspondeu a ficheiro(s) nenhum(s) conhecido pelo git"

4085

4086 #: dir.c:733 dir.c:762 dir.c:775

4087 #, c-format

@@ -4094,445 +4107,516 @@ msgstr "desativando correspondência de padrão em cone"

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

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

4109

4097 -#: dir.c:2351

4110 +#: dir.c:2464

4111 #, c-format

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

4113 msgstr "incapaz abrir pasta '%s'"

4114

4102 -#: dir.c:2653

4115 +#: dir.c:2766

4116 msgid "failed to get kernel name and information"

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

4118

4106 -#: dir.c:2777

4119 +#: dir.c:2890

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

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

4122

4110 -#: dir.c:3610

4123 +#: dir.c:3158

4124 +msgid ""

4125 +"No directory name could be guessed.\n"

4126 +"Please specify a directory on the command line"

4127 +msgstr ""

4128 +"Incapaz adivinhar nome de pasta.\n"

4129 +"Por favor especifique uma pasta na linha de comandos"

4130 +

4131 +#: dir.c:3837

4132 #, c-format

4133 msgid "index file corrupt in repo %s"

4134 msgstr ""

4135

4115 -#: dir.c:3657 dir.c:3662

4136 +#: dir.c:3884 dir.c:3889

4137 #, c-format

4138 msgid "could not create directories for %s"

4139 msgstr "incapaz criar pasta para %s"

4140

4120 -#: dir.c:3691

4141 +#: dir.c:3918

4142 #, c-format

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

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

4145

4125 -#: editor.c:74

4146 +#: editor.c:77

4147 #, c-format

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

4149 msgstr ""

4150

4130 -#: entry.c:176

4151 +#: entry.c:177

4152 msgid "Filtering content"

4153 msgstr "Filtrando conteúdo"

4154

4134 -#: entry.c:497

4155 +#: entry.c:498

4156 #, c-format

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

4158 msgstr "incapaz de stat o ficheiro '%s'"

4159

4139 -#: environment.c:152

4160 +#: environment.c:143

4161 #, c-format

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

4163 msgstr ""

4164

4144 -#: environment.c:334

4145 -#, c-format

4146 -msgid "could not set GIT_DIR to '%s'"

4147 -msgstr "incapaz definir GIT_DIR para '%s'"

4148 -

4165 #: exec-cmd.c:363

4166 #, c-format

4167 msgid "too many args to run %s"

4168 msgstr ""

4169

4154 -#: fetch-pack.c:182

4170 +#: fetch-pack.c:193

4171 msgid "git fetch-pack: expected shallow list"

4172 msgstr "git fetch-pack: esperado lista superficial"

4173

4158 -#: fetch-pack.c:185

4174 +#: fetch-pack.c:196

4175 msgid "git fetch-pack: expected a flush packet after shallow list"

4176 msgstr "git fetch-pack: esperado pacote flush após lista superficial"

4177

4162 -#: fetch-pack.c:196

4178 +#: fetch-pack.c:207

4179 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

4180 msgstr "git fetch-pack: esperado ACK/NAK, obtive um pacote flush"

4181

4166 -#: fetch-pack.c:216

4182 +#: fetch-pack.c:227

4183 #, c-format

4184 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

4185 msgstr "git fetch-pack: esperado ACK/NAK, obtive '%s'"

4186

4171 -#: fetch-pack.c:227

4187 +#: fetch-pack.c:238

4188 msgid "unable to write to remote"

4189 msgstr "incapaz escrever para remoto"

4190

4175 -#: fetch-pack.c:288

4191 +#: fetch-pack.c:299

4192 msgid "--stateless-rpc requires multi_ack_detailed"

4193 msgstr "--stateless-rpc requer multi_ack_detailed"

4194

4179 -#: fetch-pack.c:383 fetch-pack.c:1423

4195 +#: fetch-pack.c:394 fetch-pack.c:1434

4196 #, c-format

4197 msgid "invalid shallow line: %s"

4198 msgstr "linha superficial inválida: %s"

4199

4184 -#: fetch-pack.c:389 fetch-pack.c:1429

4200 +#: fetch-pack.c:400 fetch-pack.c:1440

4201 #, c-format

4202 msgid "invalid unshallow line: %s"

4203 msgstr "linha por aprofundar inválida: %s"

4204

4189 -#: fetch-pack.c:391 fetch-pack.c:1431

4205 +#: fetch-pack.c:402 fetch-pack.c:1442

4206 #, c-format

4207 msgid "object not found: %s"

4208 msgstr "objeto perdido: %s"

4209

4194 -#: fetch-pack.c:394 fetch-pack.c:1434

4210 +#: fetch-pack.c:405 fetch-pack.c:1445

4211 #, c-format

4212 msgid "error in object: %s"

4213 msgstr "erro no objeto: %s"

4214

4199 -#: fetch-pack.c:396 fetch-pack.c:1436

4215 +#: fetch-pack.c:407 fetch-pack.c:1447

4216 #, c-format

4217 msgid "no shallow found: %s"

4218 msgstr "shallow por encontrar: %s"

4219

4204 -#: fetch-pack.c:399 fetch-pack.c:1440

4220 +#: fetch-pack.c:410 fetch-pack.c:1451

4221 #, c-format

4222 msgid "expected shallow/unshallow, got %s"

4223 msgstr "esperado shallow/unshallow, recebi %s"

4224

4209 -#: fetch-pack.c:439

4225 +#: fetch-pack.c:450

4226 #, c-format

4227 msgid "got %s %d %s"

4228 msgstr "obteve-se %s %d %s"

4229

4214 -#: fetch-pack.c:456

4230 +#: fetch-pack.c:467

4231 #, c-format

4232 msgid "invalid commit %s"

4233 msgstr "memória inválida %s"

4234

4219 -#: fetch-pack.c:487

4235 +#: fetch-pack.c:498

4236 msgid "giving up"

4237 msgstr "a desistir"

4238

4223 -#: fetch-pack.c:500 progress.c:339

4239 +#: fetch-pack.c:511 progress.c:339

4240 msgid "done"

4241 msgstr "concluído"

4242

4227 -#: fetch-pack.c:512

4243 +#: fetch-pack.c:523

4244 #, c-format

4245 msgid "got %s (%d) %s"

4246 msgstr "obteve-se %s (%d) %s"

4247

4232 -#: fetch-pack.c:548

4248 +#: fetch-pack.c:559

4249 #, c-format

4250 msgid "Marking %s as complete"

4251 msgstr "Marcado %s como completo"

4252

4237 -#: fetch-pack.c:763

4253 +#: fetch-pack.c:774

4254 #, c-format

4255 msgid "already have %s (%s)"

4256 msgstr "já se tem %s (%s)"

4257

4242 -#: fetch-pack.c:849

4258 +#: fetch-pack.c:860

4259 msgid "fetch-pack: unable to fork off sideband demultiplexer"

4260 msgstr "fetch-pack: incapaz de aforquilhar demultiplexer sideband"

4261

4246 -#: fetch-pack.c:857

4262 +#: fetch-pack.c:868

4263 msgid "protocol error: bad pack header"

4264 msgstr ""

4265

4250 -#: fetch-pack.c:951

4266 +#: fetch-pack.c:962

4267 #, c-format

4268 msgid "fetch-pack: unable to fork off %s"

4269 msgstr "fetch-pack: incapaz de fazer fork a %s"

4270

4255 -#: fetch-pack.c:957

4271 +#: fetch-pack.c:968

4272 msgid "fetch-pack: invalid index-pack output"

4273 msgstr ""

4274

4259 -#: fetch-pack.c:974

4275 +#: fetch-pack.c:985

4276 #, c-format

4277 msgid "%s failed"

4278 msgstr "%s falhou"

4279

4264 -#: fetch-pack.c:976

4280 +#: fetch-pack.c:987

4281 msgid "error in sideband demultiplexer"

4282 msgstr "erro em demultiplexer sideband"

4283

4268 -#: fetch-pack.c:1019

4284 +#: fetch-pack.c:1030

4285 #, c-format

4286 msgid "Server version is %.*s"

4287 msgstr "A versão do servidor é %.*s"

4288

4273 -#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042

4274 -#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058

4275 -#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074

4276 -#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096

4289 +#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053

4290 +#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069

4291 +#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085

4292 +#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107

4293 #, c-format

4294 msgid "Server supports %s"

4295 msgstr "Servidor sustenta %s"

4296

4281 -#: fetch-pack.c:1029

4297 +#: fetch-pack.c:1040

4298 msgid "Server does not support shallow clients"

4299 msgstr "Servidor insustenta clientes shallow"

4300

4285 -#: fetch-pack.c:1089

4301 +#: fetch-pack.c:1100

4302 msgid "Server does not support --shallow-since"

4303 msgstr "Servidor insustenta --shallow-since"

4304

4289 -#: fetch-pack.c:1094

4305 +#: fetch-pack.c:1105

4306 msgid "Server does not support --shallow-exclude"

4307 msgstr "Servidor insustenta --shallow-exclude"

4308

4293 -#: fetch-pack.c:1098

4309 +#: fetch-pack.c:1109

4310 msgid "Server does not support --deepen"

4311 msgstr "Servidor insustenta --deepen"

4312

4297 -#: fetch-pack.c:1100

4313 +#: fetch-pack.c:1111

4314 msgid "Server does not support this repository's object format"

4315 msgstr "Servidor insustenta formato de objeto deste repositório"

4316

4301 -#: fetch-pack.c:1113

4317 +#: fetch-pack.c:1124

4318 msgid "no common commits"

4319 msgstr "commits comuns nenhuns"

4320

4305 -#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238

4321 +#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130

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

4323 msgstr "repositório de origem é raso, rejeita para clonar."

4324

4309 -#: fetch-pack.c:1128 fetch-pack.c:1660

4325 +#: fetch-pack.c:1139 fetch-pack.c:1671

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

4327 msgstr "git fetch-pack: buscar falhou."

4328

4313 -#: fetch-pack.c:1242

4329 +#: fetch-pack.c:1253

4330 #, c-format

4331 msgid "mismatched algorithms: client %s; server %s"

4332 msgstr ""

4333

4318 -#: fetch-pack.c:1246

4334 +#: fetch-pack.c:1257

4335 #, c-format

4336 msgid "the server does not support algorithm '%s'"

4337 msgstr "o servidor insustenta algoritmo '%s'"

4338

4323 -#: fetch-pack.c:1279

4339 +#: fetch-pack.c:1290

4340 msgid "Server does not support shallow requests"

4341 msgstr "Servidor insustenta pedidos shallow"

4342

4327 -#: fetch-pack.c:1286

4343 +#: fetch-pack.c:1297

4344 msgid "Server supports filter"

4345 msgstr "Servidor sustenta filtro"

4346

4331 -#: fetch-pack.c:1329 fetch-pack.c:2043

4347 +#: fetch-pack.c:1340 fetch-pack.c:2053

4348 msgid "unable to write request to remote"

4349 msgstr "incapaz escrever pedidos para remoto"

4350

4335 -#: fetch-pack.c:1347

4351 +#: fetch-pack.c:1358

4352 #, c-format

4353 msgid "error reading section header '%s'"

4354 msgstr ""

4355

4340 -#: fetch-pack.c:1353

4356 +#: fetch-pack.c:1364

4357 #, c-format

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

4359 msgstr ""

4360

4345 -#: fetch-pack.c:1387

4361 +#: fetch-pack.c:1398

4362 #, c-format

4363 msgid "unexpected acknowledgment line: '%s'"

4364 msgstr ""

4365

4350 -#: fetch-pack.c:1392

4366 +#: fetch-pack.c:1403

4367 #, c-format

4368 msgid "error processing acks: %d"

4369 msgstr ""

4370

4355 -#: fetch-pack.c:1402

4371 +#: fetch-pack.c:1413

4372 msgid "expected packfile to be sent after 'ready'"

4373 msgstr ""

4374

4359 -#: fetch-pack.c:1404

4375 +#: fetch-pack.c:1415

4376 msgid "expected no other sections to be sent after no 'ready'"

4377 msgstr ""

4378

4363 -#: fetch-pack.c:1445

4379 +#: fetch-pack.c:1456

4380 #, c-format

4381 msgid "error processing shallow info: %d"

4382 msgstr ""

4383

4368 -#: fetch-pack.c:1494

4384 +#: fetch-pack.c:1505

4385 #, c-format

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

4387 msgstr ""

4388

4373 -#: fetch-pack.c:1499

4389 +#: fetch-pack.c:1510

4390 #, c-format

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

4392 msgstr ""

4393

4378 -#: fetch-pack.c:1504

4394 +#: fetch-pack.c:1515

4395 #, c-format

4396 msgid "error processing wanted refs: %d"

4397 msgstr ""

4398

4383 -#: fetch-pack.c:1534

4399 +#: fetch-pack.c:1545

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

4401 msgstr "git fetch-pack: esperado pacote fim de resposta"

4402

4387 -#: fetch-pack.c:1939

4403 +#: fetch-pack.c:1949

4404 msgid "no matching remote head"

4405 msgstr "corresponde a remote head nenhuma"

4406

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

4407 +#: fetch-pack.c:1972 builtin/clone.c:581

4408 msgid "remote did not send all necessary objects"

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

4410

4395 -#: fetch-pack.c:2065

4411 +#: fetch-pack.c:2075

4412 msgid "unexpected 'ready' from remote"

4413 msgstr ""

4414

4399 -#: fetch-pack.c:2088

4415 +#: fetch-pack.c:2098

4416 #, c-format

4417 msgid "no such remote ref %s"

4418 msgstr "referência remota %s inexistente"

4419

4404 -#: fetch-pack.c:2091

4420 +#: fetch-pack.c:2101

4421 #, c-format

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

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

4424

4409 -#: gpg-interface.c:273

4425 +#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902

4426 +#: gpg-interface.c:918

4427 msgid "could not create temporary file"

4428 msgstr "incapaz criar ficheiro temporário"

4429

4413 -#: gpg-interface.c:276

4430 +#: gpg-interface.c:332 gpg-interface.c:454

4431 #, c-format

4432 msgid "failed writing detached signature to '%s'"

4433 msgstr "falha ao escrever assinatura destacada em '%s'"

4434

4418 -#: gpg-interface.c:470

4435 +#: gpg-interface.c:445

4436 +msgid ""

4437 +"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "

4438 +"signature verification"

4439 +msgstr ""

4440 +

4441 +#: gpg-interface.c:469

4442 +msgid ""

4443 +"ssh-keygen -Y find-principals/verify is needed for ssh signature "

4444 +"verification (available in openssh version 8.2p1+)"

4445 +msgstr ""

4446 +

4447 +#: gpg-interface.c:523

4448 +#, c-format

4449 +msgid "ssh signing revocation file configured but not found: %s"

4450 +msgstr ""

4451 +

4452 +#: gpg-interface.c:576

4453 +#, c-format

4454 +msgid "bad/incompatible signature '%s'"

4455 +msgstr "assinatura '%s' incorreta/incompatível"

4456 +

4457 +#: gpg-interface.c:735 gpg-interface.c:740

4458 +#, c-format

4459 +msgid "failed to get the ssh fingerprint for key '%s'"

4460 +msgstr "obtenção de fingerprint ssh para chave '%s' falhou"

4461 +

4462 +#: gpg-interface.c:762

4463 +msgid ""

4464 +"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"

4465 +msgstr ""

4466 +

4467 +#: gpg-interface.c:780

4468 +#, c-format

4469 +msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"

4470 +msgstr ""

4471 +

4472 +#: gpg-interface.c:786

4473 +#, c-format

4474 +msgid "gpg.ssh.defaultKeyCommand failed: %s %s"

4475 +msgstr ""

4476 +

4477 +#: gpg-interface.c:874

4478 msgid "gpg failed to sign the data"

4479 msgstr "gpg falhou assinar os dados"

4480

4481 +#: gpg-interface.c:895

4482 +msgid "user.signingkey needs to be set for ssh signing"

4483 +msgstr ""

4484 +

4485 +#: gpg-interface.c:906

4486 +#, c-format

4487 +msgid "failed writing ssh signing key to '%s'"

4488 +msgstr "falhou escrita de chave de assinatura ssh para '%s'"

4489 +

4490 +#: gpg-interface.c:924

4491 +#, c-format

4492 +msgid "failed writing ssh signing key buffer to '%s'"

4493 +msgstr "falhou escrita de buffer de chave de assinatura ssh para '%s'"

4494 +

4495 +#: gpg-interface.c:942

4496 +msgid ""

4497 +"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "

4498 +"8.2p1+)"

4499 +msgstr ""

4500 +

4501 +#: gpg-interface.c:954

4502 +#, c-format

4503 +msgid "failed reading ssh signing data buffer from '%s'"

4504 +msgstr "falhou leitura de buffer de data de assinatura ssh de '%s'"

4505 +

4506 #: graph.c:98

4507 #, c-format

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

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

4510

4427 -#: grep.c:531

4511 +#: grep.c:533

4512 msgid ""

4513 "given pattern contains NULL byte (via -f <file>). This is only supported "

4514 "with -P under PCRE v2"

4515 msgstr ""

4516

4433 -#: grep.c:1895

4517 +#: grep.c:1928

4518 #, c-format

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

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

4521

4438 -#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4522 +#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90

4523 #: builtin/rm.c:136

4524 #, c-format

4525 msgid "failed to stat '%s'"

4526 msgstr ""

4527

4444 -#: grep.c:1923

4528 +#: grep.c:1956

4529 #, c-format

4530 msgid "'%s': short read"

4531 msgstr "'%s': leitura truncada"

4532

4449 -#: help.c:23

4533 +#: help.c:24

4534 msgid "start a working area (see also: git help tutorial)"

4535 msgstr "iniciar uma área de trabalho (vê também: git help tutorial)"

4536

4453 -#: help.c:24

4537 +#: help.c:25

4538 msgid "work on the current change (see also: git help everyday)"

4539 msgstr "trabalhar na alteração atual (vê também: git help everyday)"

4540

4457 -#: help.c:25

4541 +#: help.c:26

4542 msgid "examine the history and state (see also: git help revisions)"

4543 msgstr "examinar o histórico e estado (vê também: git help revisions)"

4544

4461 -#: help.c:26

4545 +#: help.c:27

4546 msgid "grow, mark and tweak your common history"

4547 msgstr "aumentar, marcar e ajustar o seu histórico comum"

4548

4465 -#: help.c:27

4549 +#: help.c:28

4550 msgid "collaborate (see also: git help workflows)"

4551 msgstr "colaborar (vê também: git help workflows)"

4552

4469 -#: help.c:31

4553 +#: help.c:32

4554 msgid "Main Porcelain Commands"

4555 msgstr ""

4556

4473 -#: help.c:32

4557 +#: help.c:33

4558 msgid "Ancillary Commands / Manipulators"

4559 msgstr ""

4560

4477 -#: help.c:33

4561 +#: help.c:34

4562 msgid "Ancillary Commands / Interrogators"

4563 msgstr ""

4564

4481 -#: help.c:34

4565 +#: help.c:35

4566 msgid "Interacting with Others"

4567 msgstr ""

4568

4485 -#: help.c:35

4569 +#: help.c:36

4570 msgid "Low-level Commands / Manipulators"

4571 msgstr ""

4572

4489 -#: help.c:36

4573 +#: help.c:37

4574 msgid "Low-level Commands / Interrogators"

4575 msgstr ""

4576

4493 -#: help.c:37

4577 +#: help.c:38

4578 msgid "Low-level Commands / Syncing Repositories"

4579 msgstr ""

4580

4497 -#: help.c:38

4581 +#: help.c:39

4582 msgid "Low-level Commands / Internal Helpers"

4583 msgstr ""

4584

4501 -#: help.c:300

4585 +#: help.c:313

4586 #, c-format

4587 msgid "available git commands in '%s'"

4588 msgstr "comandos de git disponíveis em '%s'"

4589

4506 -#: help.c:307

4590 +#: help.c:320

4591 msgid "git commands available from elsewhere on your $PATH"

4592 msgstr "comandos do git disponíveis noutras localizações em $PATH"

4593

4510 -#: help.c:316

4594 +#: help.c:329

4595 msgid "These are common Git commands used in various situations:"

4596 msgstr "Estes são comandos do Git comuns usados em diversas situações:"

4597

4514 -#: help.c:365 git.c:100

4598 +#: help.c:378 git.c:100

4599 #, c-format

4600 msgid "unsupported command listing type '%s'"

4601 msgstr "insustento para listagem tipo comandos '%s'"

4602

4519 -#: help.c:405

4603 +#: help.c:418

4604 msgid "The Git concept guides are:"

4605 msgstr "Os guias comuns do Git:"

4606

4523 -#: help.c:429

4607 +#: help.c:442

4608 msgid "See 'git help <command>' to read about a specific subcommand"

4609 msgstr ""

4610

4527 -#: help.c:434

4611 +#: help.c:447

4612 msgid "External commands"

4613 msgstr "Comandos externos"

4614

4531 -#: help.c:449

4615 +#: help.c:462

4616 msgid "Command aliases"

4617 msgstr "Aliases de comando"

4618

4535 -#: help.c:527

4619 +#: help.c:543

4620 #, c-format

4621 msgid ""

4622 "'%s' appears to be a git command, but we were not\n"

@@ -4541,31 +4625,36 @@ msgstr ""

4625 "'%s' parece ser comando git, mas incapaz executá-lo.\n"

4626 "Talvez git-%s esteja danificado?"

4627

4544 -#: help.c:543 help.c:631

4628 +#: help.c:565 help.c:662

4629 #, c-format

4630 msgid "git: '%s' is not a git command. See 'git --help'."

4631 msgstr "git: '%s' é comando git nenhum. Vê 'git --help'."

4632

4549 -#: help.c:591

4633 +#: help.c:613

4634 msgid "Uh oh. Your system reports no Git commands at all."

4635 msgstr "Carago. Teu sistema reporta comandos Git nenhuns."

4636

4553 -#: help.c:613

4637 +#: help.c:635

4638 #, c-format

4639 msgid "WARNING: You called a Git command named '%s', which does not exist."

4640 msgstr "AVISO: Chamou comando Git designado '%s', que é inexistente."

4641

4558 -#: help.c:618

4642 +#: help.c:640

4643 #, c-format

4644 msgid "Continuing under the assumption that you meant '%s'."

4645 msgstr ""

4646

4563 -#: help.c:623

4647 +#: help.c:646

4648 +#, c-format

4649 +msgid "Run '%s' instead? (y/N)"

4650 +msgstr ""

4651 +

4652 +#: help.c:654

4653 #, c-format

4654 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4655 msgstr ""

4656

4568 -#: help.c:635

4657 +#: help.c:666

4658 msgid ""

4659 "\n"

4660 "The most similar command is"

@@ -4575,16 +4664,16 @@ msgid_plural ""

4664 msgstr[0] ""

4665 msgstr[1] ""

4666

4578 -#: help.c:675

4667 +#: help.c:706

4668 msgid "git version [<options>]"

4669 msgstr "git version [<opções>]"

4670

4582 -#: help.c:730

4671 +#: help.c:761

4672 #, c-format

4673 msgid "%s: %s - %s"

4674 msgstr "%s: %s - %s"

4675

4587 -#: help.c:734

4676 +#: help.c:765

4677 msgid ""

4678 "\n"

4679 "Did you mean this?"

@@ -4598,6 +4687,13 @@ msgstr[1] ""

4687 "\n"

4688 "Queria dizer deste?"

4689

4690 +#: hook.c:27

4691 +#, c-format

4692 +msgid ""

4693 +"The '%s' hook was ignored because it's not set as executable.\n"

4694 +"You can disable this warning with `git config advice.ignoredHook false`."

4695 +msgstr ""

4696 +

4697 #: ident.c:353

4698 msgid "Author identity unknown\n"

4699 msgstr ""

@@ -4660,7 +4756,7 @@ msgstr "nome de identação vazio (para <%s>) proíbido"

4756 msgid "name consists only of disallowed characters: %s"

4757 msgstr "nome consiste apenas de caracteres proíbidos: %s"

4758

4663 -#: ident.c:454 builtin/commit.c:647

4759 +#: ident.c:454 builtin/commit.c:648

4760 #, c-format

4761 msgid "invalid date format: %s"

4762 msgstr "formato de data inválido: %s"

@@ -4754,7 +4850,12 @@ msgstr "Incapaz de criar '%s.lock': %s"

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

4851 msgstr ""

4852

4757 -#: ls-refs.c:167

4853 +#: ls-refs.c:174

4854 +#, c-format

4855 +msgid "unexpected line: '%s'"

4856 +msgstr "linha inesperada: '%s'"

4857 +

4858 +#: ls-refs.c:178

4859 msgid "expected flush after ls-refs arguments"

4860 msgstr ""

4861

@@ -4762,44 +4863,44 @@ msgstr ""

4863 msgid "quoted CRLF detected"

4864 msgstr ""

4865

4765 -#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46

4866 +#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46

4867 #, c-format

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

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

4870

4770 -#: merge-ort.c:1569 merge-recursive.c:1201

4871 +#: merge-ort.c:1584 merge-recursive.c:1211

4872 #, c-format

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

4874 msgstr ""

4875

4775 -#: merge-ort.c:1578 merge-recursive.c:1208

4876 +#: merge-ort.c:1593 merge-recursive.c:1218

4877 #, c-format

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

4879 msgstr ""

4880

4780 -#: merge-ort.c:1587 merge-recursive.c:1215

4881 +#: merge-ort.c:1602 merge-recursive.c:1225

4882 #, c-format

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

4884 msgstr ""

4885

4785 -#: merge-ort.c:1597 merge-ort.c:1604

4886 +#: merge-ort.c:1612 merge-ort.c:1620

4887 #, c-format

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

4889 msgstr ""

4890

4790 -#: merge-ort.c:1625

4891 +#: merge-ort.c:1642

4892 #, c-format

4893 msgid "Failed to merge submodule %s"

4894 msgstr "Juntar submódulo %s falhou"

4895

4795 -#: merge-ort.c:1632

4896 +#: merge-ort.c:1649

4897 #, c-format

4898 msgid ""

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

4900 "%s\n"

4901 msgstr ""

4902

4802 -#: merge-ort.c:1636 merge-recursive.c:1269

4903 +#: merge-ort.c:1653 merge-recursive.c:1281

4904 #, c-format

4905 msgid ""

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

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

4911 "which will accept this suggestion.\n"

4912 msgstr ""

4913

4813 -#: merge-ort.c:1649

4914 +#: merge-ort.c:1666

4915 #, c-format

4916 msgid ""

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

4918 "%s"

4919 msgstr ""

4920

4820 -#: merge-ort.c:1868 merge-recursive.c:1358

4921 +#: merge-ort.c:1887 merge-recursive.c:1372

4922 msgid "Failed to execute internal merge"

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

4924

4824 -#: merge-ort.c:1873 merge-recursive.c:1363

4925 +#: merge-ort.c:1892 merge-recursive.c:1377

4926 #, c-format

4927 msgid "Unable to add %s to database"

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

4929

4829 -#: merge-ort.c:1880 merge-recursive.c:1396

4930 +#: merge-ort.c:1899 merge-recursive.c:1410

4931 #, c-format

4932 msgid "Auto-merging %s"

4933 msgstr "A integrar automaticamente %s"

4934

4834 -#: merge-ort.c:2019 merge-recursive.c:2118

4935 +#: merge-ort.c:2038 merge-recursive.c:2132

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

4841 -#: merge-ort.c:2029 merge-recursive.c:2128

4942 +#: merge-ort.c:2048 merge-recursive.c:2142

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

4848 -#: merge-ort.c:2087

4949 +#: merge-ort.c:2106

4950 #, c-format

4951 msgid ""

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

@@ -4853,47 +4954,48 @@ msgid ""

4954 "majority of the files."

4955 msgstr ""

4956

4856 -#: merge-ort.c:2241 merge-recursive.c:2464

4957 +#: merge-ort.c:2260 merge-recursive.c:2478

4958 #, c-format

4959 msgid ""

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

4961 "renamed."

4962 msgstr ""

4963

4863 -#: merge-ort.c:2385 merge-recursive.c:3247

4964 +#: merge-ort.c:2400 merge-recursive.c:3261

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

4870 -#: merge-ort.c:2392 merge-recursive.c:3254

4971 +#: merge-ort.c:2407 merge-recursive.c:3268

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

4877 -#: merge-ort.c:2405 merge-recursive.c:3250

4978 +#: merge-ort.c:2420 merge-recursive.c:3264

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

4884 -#: merge-ort.c:2413 merge-recursive.c:3257

4985 +#: merge-ort.c:2428 merge-recursive.c:3271

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

4891 -#: merge-ort.c:2569

4992 +#: merge-ort.c:2584

4993 #, c-format

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

4894 -msgstr "CONFLITO (renomear/renomear): %s renomeado para %s em %s e para %s em %s."

4995 +msgstr ""

4996 +"CONFLITO (renomear/renomear): %s renomeado para %s em %s e para %s em %s."

4997

4896 -#: merge-ort.c:2664

4998 +#: merge-ort.c:2679

4999 #, c-format

5000 msgid ""

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

@@ -4901,69 +5003,70 @@ msgid ""

5003 "markers."

5004 msgstr ""

5005

4904 -#: merge-ort.c:2683 merge-ort.c:2707

5006 +#: merge-ort.c:2698 merge-ort.c:2722

5007 #, c-format

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

4907 -msgstr "CONFLITO (renomear/apagar): %s renomeado para %s em %s, mas apagado em %s."

5009 +msgstr ""

5010 +"CONFLITO (renomear/apagar): %s renomeado para %s em %s, mas apagado em %s."

5011

4909 -#: merge-ort.c:3182 merge-recursive.c:3008

5012 +#: merge-ort.c:3212 merge-recursive.c:3022

5013 #, c-format

5014 msgid "cannot read object %s"

5015 msgstr "incapaz ler objeto %s"

5016

4914 -#: merge-ort.c:3185 merge-recursive.c:3011

5017 +#: merge-ort.c:3215 merge-recursive.c:3025

5018 #, c-format

5019 msgid "object %s is not a blob"

5020 msgstr "objeto %s é blob nenhum"

5021

4919 -#: merge-ort.c:3613

5022 +#: merge-ort.c:3644

5023 #, c-format

5024 msgid ""

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

5026 "%s instead."

5027 msgstr ""

5028

4926 -#: merge-ort.c:3689

5029 +#: merge-ort.c:3721

5030 #, c-format

5031 msgid ""

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

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

5034 msgstr ""

5035

4933 -#: merge-ort.c:3696

5036 +#: merge-ort.c:3728

5037 #, c-format

5038 msgid ""

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

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

5041 msgstr ""

5042

4940 -#: merge-ort.c:3796 merge-recursive.c:3087

5043 +#: merge-ort.c:3819 merge-recursive.c:3101

5044 msgid "content"

5045 msgstr "conteúdo"

5046

4944 -#: merge-ort.c:3798 merge-recursive.c:3091

5047 +#: merge-ort.c:3821 merge-recursive.c:3105

5048 msgid "add/add"

5049 msgstr "adicionar/adicionar"

5050

4948 -#: merge-ort.c:3800 merge-recursive.c:3136

5051 +#: merge-ort.c:3823 merge-recursive.c:3150

5052 msgid "submodule"

5053 msgstr "submódulo"

5054

4952 -#: merge-ort.c:3802 merge-recursive.c:3137

5055 +#: merge-ort.c:3825 merge-recursive.c:3151

5056 #, c-format

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

5058 msgstr "CONFLITO (%s): Conflito de junção em %s"

5059

4957 -#: merge-ort.c:3833

5060 +#: merge-ort.c:3856

5061 #, c-format

5062 msgid ""

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

5064 "of %s left in tree."

5065 msgstr ""

4963 -"CONFLITO (modificar/apagar): %s apagado em %s e modificado em %s. Versão %s de %s "

4964 -"deixada na árvore."

5066 +"CONFLITO (modificar/apagar): %s apagado em %s e modificado em %s. Versão %s "

5067 +"de %s deixada na árvore."

5068

4966 -#: merge-ort.c:4120

5069 +#: merge-ort.c:4152

5070 #, c-format

5071 msgid ""

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

@@ -4973,12 +5076,12 @@ msgstr ""

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

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

5078 #.

4976 -#: merge-ort.c:4487

5079 +#: merge-ort.c:4521

5080 #, c-format

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

5082 msgstr ""

5083

4981 -#: merge-ort-wrappers.c:13 merge-recursive.c:3702

5084 +#: merge-ort-wrappers.c:13 merge-recursive.c:3716

5085 #, c-format

5086 msgid ""

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

@@ -4988,104 +5091,105 @@ msgstr ""

5091 "juntar:\n"

5092 " %s"

5093

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

5094 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403

5095 msgid "Already up to date."

5096 msgstr "Já está atualizado."

5097

4995 -#: merge-recursive.c:352

5098 +#: merge-recursive.c:353

5099 msgid "(bad commit)\n"

5100 msgstr "(commit incorreto)\n"

5101

4999 -#: merge-recursive.c:375

5102 +#: merge-recursive.c:381

5103 #, c-format

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

5105 msgstr "add_cacheinfo falhou para caminho '%s'; abortando junção."

5106

5004 -#: merge-recursive.c:384

5107 +#: merge-recursive.c:390

5108 #, c-format

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

5007 -msgstr "add_cacheinfo falhou no refrescar para o caminho '%s'; abortando junção."

5110 +msgstr ""

5111 +"add_cacheinfo falhou no refrescar para o caminho '%s'; abortando junção."

5112

5009 -#: merge-recursive.c:872

5113 +#: merge-recursive.c:881

5114 #, c-format

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

5116 msgstr "falhou criar caminho '%s'%s"

5117

5014 -#: merge-recursive.c:883

5118 +#: merge-recursive.c:892

5119 #, c-format

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

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

5122

5019 -#: merge-recursive.c:897 merge-recursive.c:916

5123 +#: merge-recursive.c:906 merge-recursive.c:925

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

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

5126

5023 -#: merge-recursive.c:906

5127 +#: merge-recursive.c:915

5128 #, c-format

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

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

5131

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

5132 +#: merge-recursive.c:956 builtin/cat-file.c:41

5133 #, c-format

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

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

5136

5033 -#: merge-recursive.c:952

5137 +#: merge-recursive.c:961

5138 #, c-format

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

5140 msgstr ""

5141

5038 -#: merge-recursive.c:977

5142 +#: merge-recursive.c:986

5143 #, c-format

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

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

5146

5043 -#: merge-recursive.c:988

5147 +#: merge-recursive.c:997

5148 #, c-format

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

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

5151

5048 -#: merge-recursive.c:993

5152 +#: merge-recursive.c:1002

5153 #, c-format

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

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

5156

5053 -#: merge-recursive.c:1223 merge-recursive.c:1235

5157 +#: merge-recursive.c:1233 merge-recursive.c:1246

5158 #, c-format

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

5160 msgstr ""

5161

5058 -#: merge-recursive.c:1226 merge-recursive.c:1238

5162 +#: merge-recursive.c:1236 merge-recursive.c:1249

5163 #, c-format

5164 msgid "Fast-forwarding submodule %s"

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

5166

5063 -#: merge-recursive.c:1261

5167 +#: merge-recursive.c:1273

5168 #, c-format

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

5170 msgstr ""

5171

5068 -#: merge-recursive.c:1265

5172 +#: merge-recursive.c:1277

5173 #, c-format

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

5175 msgstr ""

5176

5073 -#: merge-recursive.c:1266

5177 +#: merge-recursive.c:1278

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

5179 msgstr ""

5180

5077 -#: merge-recursive.c:1278

5181 +#: merge-recursive.c:1290

5182 #, c-format

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

5184 msgstr ""

5185

5082 -#: merge-recursive.c:1420

5186 +#: merge-recursive.c:1434

5187 #, c-format

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

5189 msgstr ""

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

5191

5088 -#: merge-recursive.c:1492

5192 +#: merge-recursive.c:1506

5193 #, c-format

5194 msgid ""

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

@@ -5094,7 +5198,7 @@ msgstr ""

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

5199 "deixada na árvore."

5200

5097 -#: merge-recursive.c:1497

5201 +#: merge-recursive.c:1511

5202 #, c-format

5203 msgid ""

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

@@ -5103,7 +5207,7 @@ msgstr ""

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

5208 "de %s deixada na árvore."

5209

5106 -#: merge-recursive.c:1504

5210 +#: merge-recursive.c:1518

5211 #, c-format

5212 msgid ""

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

@@ -5112,7 +5216,7 @@ msgstr ""

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

5217 "deixada na árvore em %s."

5218

5115 -#: merge-recursive.c:1509

5219 +#: merge-recursive.c:1523

5220 #, c-format

5221 msgid ""

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

@@ -5121,43 +5225,43 @@ msgstr ""

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

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

5227

5124 -#: merge-recursive.c:1544

5228 +#: merge-recursive.c:1558

5229 msgid "rename"

5230 msgstr "renomear"

5231

5128 -#: merge-recursive.c:1544

5232 +#: merge-recursive.c:1558

5233 msgid "renamed"

5234 msgstr "nome mudado"

5235

5132 -#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164

5236 +#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178

5237 #, c-format

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

5239 msgstr "Recusando perder ficheiro sujo de %s"

5240

5137 -#: merge-recursive.c:1605

5241 +#: merge-recursive.c:1619

5242 #, c-format

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

5244 msgstr ""

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

5246

5143 -#: merge-recursive.c:1663

5247 +#: merge-recursive.c:1677

5248 #, c-format

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

5250 msgstr ""

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

5252 "%s"

5253

5150 -#: merge-recursive.c:1694

5254 +#: merge-recursive.c:1708

5255 #, c-format

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

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

5258

5155 -#: merge-recursive.c:1699

5259 +#: merge-recursive.c:1713

5260 #, c-format

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

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

5263

5160 -#: merge-recursive.c:1726

5264 +#: merge-recursive.c:1740

5265 #, c-format

5266 msgid ""

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

@@ -5166,18 +5270,18 @@ msgstr ""

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

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

5272

5169 -#: merge-recursive.c:1731

5273 +#: merge-recursive.c:1745

5274 msgid " (left unresolved)"

5275 msgstr " (por resolver)"

5276

5173 -#: merge-recursive.c:1823

5277 +#: merge-recursive.c:1837

5278 #, c-format

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

5280 msgstr ""

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

5282 "%s->%s em %s"

5283

5180 -#: merge-recursive.c:2086

5284 +#: merge-recursive.c:2100

5285 #, c-format

5286 msgid ""

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

@@ -5185,7 +5289,7 @@ msgid ""

5289 "getting a majority of the files."

5290 msgstr ""

5291

5188 -#: merge-recursive.c:2220

5292 +#: merge-recursive.c:2234

5293 #, c-format

5294 msgid ""

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

@@ -5194,80 +5298,80 @@ msgstr ""

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

5299 "%s->%s em %s"

5300

5197 -#: merge-recursive.c:3075

5301 +#: merge-recursive.c:3089

5302 msgid "modify"

5303 msgstr "modificar"

5304

5201 -#: merge-recursive.c:3075

5305 +#: merge-recursive.c:3089

5306 msgid "modified"

5307 msgstr "modificado"

5308

5205 -#: merge-recursive.c:3114

5309 +#: merge-recursive.c:3128

5310 #, c-format

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

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

5313

5210 -#: merge-recursive.c:3167

5314 +#: merge-recursive.c:3181

5315 #, c-format

5316 msgid "Adding as %s instead"

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

5318

5215 -#: merge-recursive.c:3371

5319 +#: merge-recursive.c:3385

5320 #, c-format

5321 msgid "Removing %s"

5322 msgstr "Removendo %s"

5323

5220 -#: merge-recursive.c:3394

5324 +#: merge-recursive.c:3408

5325 msgid "file/directory"

5326 msgstr "ficheiro/diretório"

5327

5224 -#: merge-recursive.c:3399

5328 +#: merge-recursive.c:3413

5329 msgid "directory/file"

5330 msgstr "diretório/ficheiro"

5331

5228 -#: merge-recursive.c:3406

5332 +#: merge-recursive.c:3420

5333 #, c-format

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

5335 msgstr ""

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

5337

5234 -#: merge-recursive.c:3415

5338 +#: merge-recursive.c:3429

5339 #, c-format

5340 msgid "Adding %s"

5341 msgstr "A adicionar %s"

5342

5239 -#: merge-recursive.c:3424

5343 +#: merge-recursive.c:3438

5344 #, c-format

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

5346 msgstr "CONFLITO (add/add): Conflito de junção em %s"

5347

5244 -#: merge-recursive.c:3477

5348 +#: merge-recursive.c:3491

5349 #, c-format

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

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

5352

5249 -#: merge-recursive.c:3571

5353 +#: merge-recursive.c:3585

5354 msgid "Merging:"

5355 msgstr "A integrar:"

5356

5253 -#: merge-recursive.c:3584

5357 +#: merge-recursive.c:3598

5358 #, c-format

5359 msgid "found %u common ancestor:"

5360 msgid_plural "found %u common ancestors:"

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

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

5363

5260 -#: merge-recursive.c:3634

5364 +#: merge-recursive.c:3648

5365 msgid "merge returned no commit"

5366 msgstr "junção retornou commit nenhum"

5367

5264 -#: merge-recursive.c:3799

5368 +#: merge-recursive.c:3816

5369 #, c-format

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

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

5372

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

5270 -#: builtin/stash.c:473

5373 +#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904

5374 +#: builtin/stash.c:489

5375 msgid "Unable to write index."

5376 msgstr "Incapaz de escrever no index."

5377

@@ -5275,189 +5379,221 @@ msgstr "Incapaz de escrever no index."

5379 msgid "failed to read the cache"

5380 msgstr "falha ao ler a cache"

5381

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

5279 -#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821

5280 -#: builtin/stash.c:267

5382 +#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967

5383 +#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706

5384 +#: builtin/stash.c:269

5385 msgid "unable to write new index file"

5386 msgstr "incapaz escrever novo ficheiro index"

5387

5284 -#: midx.c:74

5388 +#: midx.c:78

5389 msgid "multi-pack-index OID fanout is of the wrong size"

5390 msgstr ""

5391

5288 -#: midx.c:105

5392 +#: midx.c:109

5393 #, c-format

5394 msgid "multi-pack-index file %s is too small"

5395 msgstr ""

5396

5293 -#: midx.c:121

5397 +#: midx.c:125

5398 #, c-format

5399 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

5400 msgstr ""

5401

5298 -#: midx.c:126

5402 +#: midx.c:130

5403 #, c-format

5404 msgid "multi-pack-index version %d not recognized"

5405 msgstr "versão %d de multi-pack-index irreconhecível"

5406

5303 -#: midx.c:131

5407 +#: midx.c:135

5408 #, c-format

5409 msgid "multi-pack-index hash version %u does not match version %u"

5410 msgstr ""

5411

5308 -#: midx.c:148

5412 +#: midx.c:152

5413 msgid "multi-pack-index missing required pack-name chunk"

5414 msgstr ""

5415

5312 -#: midx.c:150

5416 +#: midx.c:154

5417 msgid "multi-pack-index missing required OID fanout chunk"

5418 msgstr ""

5419

5316 -#: midx.c:152

5420 +#: midx.c:156

5421 msgid "multi-pack-index missing required OID lookup chunk"

5422 msgstr ""

5423

5320 -#: midx.c:154

5424 +#: midx.c:158

5425 msgid "multi-pack-index missing required object offsets chunk"

5426 msgstr ""

5427

5324 -#: midx.c:170

5428 +#: midx.c:174

5429 #, c-format

5430 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5431 msgstr ""

5432

5329 -#: midx.c:214

5433 +#: midx.c:221

5434 #, c-format

5435 msgid "bad pack-int-id: %u (%u total packs)"

5436 msgstr ""

5437

5334 -#: midx.c:264

5438 +#: midx.c:271

5439 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5440 msgstr ""

5441

5338 -#: midx.c:490

5442 +#: midx.c:502

5443 #, c-format

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

5445 msgstr ""

5446

5343 -#: midx.c:496

5447 +#: midx.c:508

5448 #, c-format

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

5450 msgstr ""

5451

5348 -#: midx.c:564

5452 +#: midx.c:576

5453 #, c-format

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

5455 msgstr ""

5456

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

5457 +#: midx.c:892

5458 msgid "cannot store reverse index file"

5459 msgstr "incapaz guardar ficheiro de cenário reverso"

5460

5357 -#: midx.c:920

5461 +#: midx.c:990

5462 +#, c-format

5463 +msgid "could not parse line: %s"

5464 +msgstr "incapaz processar linha: %s"

5465 +

5466 +#: midx.c:992

5467 +#, c-format

5468 +msgid "malformed line: %s"

5469 +msgstr "linha malformada: %s"

5470 +

5471 +#: midx.c:1159

5472 msgid "ignoring existing multi-pack-index; checksum mismatch"

5473 msgstr "ignorando multi-pack-index existente; checksum diferente"

5474

5361 -#: midx.c:943

5475 +#: midx.c:1184

5476 +msgid "could not load pack"

5477 +msgstr "incapaz carregar pacote"

5478 +

5479 +#: midx.c:1190

5480 +#, c-format

5481 +msgid "could not open index for %s"

5482 +msgstr "incapaz abrir cenário para %s"

5483 +

5484 +#: midx.c:1201

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

5486 msgstr ""

5487

5365 -#: midx.c:989

5488 +#: midx.c:1244

5489 #, c-format

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

5490 +msgid "unknown preferred pack: '%s'"

5491 msgstr ""

5492

5370 -#: midx.c:1034

5493 +#: midx.c:1289

5494 #, c-format

5372 -msgid "unknown preferred pack: '%s'"

5495 +msgid "cannot select preferred pack %s with no objects"

5496 +msgstr "incapaz selecionar pacote preferido %s sem objetos"

5497 +

5498 +#: midx.c:1321

5499 +#, c-format

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

5501 msgstr ""

5502

5375 -#: midx.c:1039

5503 +#: midx.c:1367

5504 #, c-format

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

5506 msgstr "pacote preferencial '%s' expirou"

5507

5380 -#: midx.c:1055

5508 +#: midx.c:1380

5509 msgid "no pack files to index."

5510 msgstr "pack files nenhuns para index."

5511

5384 -#: midx.c:1135 builtin/clean.c:37

5512 +#: midx.c:1417

5513 +msgid "could not write multi-pack bitmap"

5514 +msgstr "incapaz escrever bitmap de multi-pack"

5515 +

5516 +#: midx.c:1427

5517 +msgid "could not write multi-pack-index"

5518 +msgstr "incapaz escrever multi-pack-index"

5519 +

5520 +#: midx.c:1486 builtin/clean.c:37

5521 #, c-format

5522 msgid "failed to remove %s"

5523 msgstr "falha ao remover %s"

5524

5389 -#: midx.c:1166

5525 +#: midx.c:1517

5526 #, c-format

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

5528 msgstr ""

5529

5394 -#: midx.c:1225

5530 +#: midx.c:1577

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

5532 msgstr ""

5533

5398 -#: midx.c:1233

5534 +#: midx.c:1585

5535 msgid "incorrect checksum"

5536 msgstr "checksum incorreto"

5537

5402 -#: midx.c:1236

5538 +#: midx.c:1588

5539 msgid "Looking for referenced packfiles"

5540 msgstr ""

5541

5406 -#: midx.c:1251

5542 +#: midx.c:1603

5543 #, c-format

5544 msgid ""

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

5546 msgstr ""

5547

5412 -#: midx.c:1256

5548 +#: midx.c:1608

5549 msgid "the midx contains no oid"

5550 msgstr ""

5551

5416 -#: midx.c:1265

5552 +#: midx.c:1617

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

5554 msgstr ""

5555

5420 -#: midx.c:1274

5556 +#: midx.c:1626

5557 #, c-format

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

5559 msgstr ""

5560

5425 -#: midx.c:1294

5561 +#: midx.c:1646

5562 msgid "Sorting objects by packfile"

5563 msgstr ""

5564

5429 -#: midx.c:1301

5565 +#: midx.c:1653

5566 msgid "Verifying object offsets"

5567 msgstr ""

5568

5433 -#: midx.c:1317

5569 +#: midx.c:1669

5570 #, c-format

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

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

5573

5438 -#: midx.c:1323

5574 +#: midx.c:1675

5575 #, c-format

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

5577 msgstr ""

5578

5443 -#: midx.c:1332

5579 +#: midx.c:1684

5580 #, c-format

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

5582 msgstr ""

5583

5448 -#: midx.c:1357

5584 +#: midx.c:1709

5585 msgid "Counting referenced objects"

5586 msgstr "Contando objetos referenciados"

5587

5452 -#: midx.c:1367

5588 +#: midx.c:1719

5589 msgid "Finding and deleting unreferenced packfiles"

5590 msgstr ""

5591

5456 -#: midx.c:1558

5592 +#: midx.c:1911

5593 msgid "could not start pack-objects"

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

5595

5460 -#: midx.c:1578

5596 +#: midx.c:1931

5597 msgid "could not finish pack-objects"

5598 msgstr "incapaz de terminar pack-objects"

5599

@@ -5517,258 +5653,258 @@ msgstr "Reescrita de notas em %s (fora de refs/notes/) recusada"

5653 msgid "Bad %s value: '%s'"

5654 msgstr "Valor incorreto de %s: '%s'"

5655

5520 -#: object-file.c:526

5656 +#: object-file.c:459

5657 #, c-format

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

5659 msgstr ""

5660

5525 -#: object-file.c:584

5661 +#: object-file.c:517

5662 #, c-format

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

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

5665

5530 -#: object-file.c:658

5666 +#: object-file.c:591

5667 #, c-format

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

5669 msgstr ""

5670

5535 -#: object-file.c:665

5671 +#: object-file.c:598

5672 #, c-format

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

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

5675

5540 -#: object-file.c:708

5676 +#: object-file.c:641

5677 msgid "unable to fdopen alternates lockfile"

5678 msgstr "incapaz de fdopen lockfile alternativo"

5679

5544 -#: object-file.c:726

5680 +#: object-file.c:659

5681 msgid "unable to read alternates file"

5682 msgstr "incapaz ler ficheiro alternativo"

5683

5548 -#: object-file.c:733

5684 +#: object-file.c:666

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

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

5687

5552 -#: object-file.c:768

5688 +#: object-file.c:701

5689 #, c-format

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

5691 msgstr "caminho '%s' é inexistente"

5692

5557 -#: object-file.c:789

5693 +#: object-file.c:722

5694 #, c-format

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

5696 msgstr ""

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

5698

5563 -#: object-file.c:795

5699 +#: object-file.c:728

5700 #, c-format

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

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

5703

5568 -#: object-file.c:801

5704 +#: object-file.c:734

5705 #, c-format

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

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

5708

5573 -#: object-file.c:809

5709 +#: object-file.c:742

5710 #, c-format

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

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

5713

5578 -#: object-file.c:869

5714 +#: object-file.c:773

5715 +#, c-format

5716 +msgid "could not find object directory matching %s"

5717 +msgstr "incapaz encontrar pasta objeto correspondendo %s"

5718 +

5719 +#: object-file.c:823

5720 #, c-format

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

5722 msgstr ""

5723

5583 -#: object-file.c:1019

5724 +#: object-file.c:973

5725 #, c-format

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

5727 msgstr ""

5728

5588 -#: object-file.c:1054

5729 +#: object-file.c:1008

5730 #, c-format

5731 msgid "mmap failed%s"

5732 msgstr "mmap falhou%s"

5733

5593 -#: object-file.c:1218

5734 +#: object-file.c:1174

5735 #, c-format

5736 msgid "object file %s is empty"

5737 msgstr ""

5738

5598 -#: object-file.c:1353 object-file.c:2548

5739 +#: object-file.c:1293 object-file.c:2499

5740 #, c-format

5741 msgid "corrupt loose object '%s'"

5742 msgstr "objeto solto '%s' corrupto"

5743

5603 -#: object-file.c:1355 object-file.c:2552

5744 +#: object-file.c:1295 object-file.c:2503

5745 #, c-format

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

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

5748

5608 -#: object-file.c:1397

5749 +#: object-file.c:1417

5750 +#, c-format

5751 +msgid "unable to parse %s header"

5752 +msgstr "incapaz processar cabeçalho %s"

5753 +

5754 +#: object-file.c:1419

5755 msgid "invalid object type"

5756 msgstr "tipo de objeto inválido"

5757

5612 -#: object-file.c:1481

5613 -#, c-format

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

5615 -msgstr ""

5616 -

5617 -#: object-file.c:1484

5758 +#: object-file.c:1430

5759 #, c-format

5760 msgid "unable to unpack %s header"

5761 msgstr "incapaz desempacotar cabeçalho %s"

5762

5622 -#: object-file.c:1490

5763 +#: object-file.c:1434

5764 #, c-format

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

5765 +msgid "header for %s too long, exceeds %d bytes"

5766 msgstr ""

5767

5627 -#: object-file.c:1493

5628 -#, c-format

5629 -msgid "unable to parse %s header"

5630 -msgstr "incapaz processar cabeçalho %s"

5631 -

5632 -#: object-file.c:1717

5768 +#: object-file.c:1664

5769 #, c-format

5770 msgid "failed to read object %s"

5771 msgstr "falhou ler objeto %s"

5772

5637 -#: object-file.c:1721

5773 +#: object-file.c:1668

5774 #, c-format

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

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

5777

5642 -#: object-file.c:1725

5778 +#: object-file.c:1672

5779 #, c-format

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

5781 msgstr ""

5782

5647 -#: object-file.c:1729

5783 +#: object-file.c:1676

5784 #, c-format

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

5786 msgstr ""

5787

5652 -#: object-file.c:1834

5788 +#: object-file.c:1781

5789 #, c-format

5790 msgid "unable to write file %s"

5791 msgstr "incapaz escrever ficheiro %s"

5792

5657 -#: object-file.c:1841

5793 +#: object-file.c:1788

5794 #, c-format

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

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

5797

5662 -#: object-file.c:1848

5798 +#: object-file.c:1795

5799 msgid "file write error"

5800 msgstr ""

5801

5666 -#: object-file.c:1868

5802 +#: object-file.c:1815

5803 msgid "error when closing loose object file"

5804 msgstr ""

5805

5670 -#: object-file.c:1933

5806 +#: object-file.c:1882

5807 #, c-format

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

5809 msgstr ""

5810

5675 -#: object-file.c:1935

5811 +#: object-file.c:1884

5812 msgid "unable to create temporary file"

5813 msgstr "incapaz criar ficheiro temporário"

5814

5679 -#: object-file.c:1959

5815 +#: object-file.c:1908

5816 msgid "unable to write loose object file"

5817 msgstr "incapaz escrever ficheiro objeto solto"

5818

5683 -#: object-file.c:1965

5819 +#: object-file.c:1914

5820 #, c-format

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

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

5823

5688 -#: object-file.c:1969

5824 +#: object-file.c:1918

5825 #, c-format

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

5827 msgstr "deflateEnd em objeto %s falhou (%d)"

5828

5693 -#: object-file.c:1973

5829 +#: object-file.c:1922

5830 #, c-format

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

5832 msgstr ""

5833

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

5834 +#: object-file.c:1933 builtin/pack-objects.c:1243

5835 #, c-format

5836 msgid "failed utime() on %s"

5837 msgstr ""

5838

5703 -#: object-file.c:2060

5839 +#: object-file.c:2011

5840 #, c-format

5841 msgid "cannot read object for %s"

5842 msgstr "incapaz ler objeto para %s"

5843

5708 -#: object-file.c:2111

5844 +#: object-file.c:2062

5845 msgid "corrupt commit"

5846 msgstr "memória de Git rota"

5847

5712 -#: object-file.c:2119

5848 +#: object-file.c:2070

5849 msgid "corrupt tag"

5850 msgstr "etiqueta rota"

5851

5716 -#: object-file.c:2219

5852 +#: object-file.c:2170

5853 #, c-format

5854 msgid "read error while indexing %s"

5855 msgstr ""

5856

5721 -#: object-file.c:2222

5857 +#: object-file.c:2173

5858 #, c-format

5859 msgid "short read while indexing %s"

5860 msgstr "leitura curta enquanto indexando %s"

5861

5726 -#: object-file.c:2295 object-file.c:2305

5862 +#: object-file.c:2246 object-file.c:2256

5863 #, c-format

5864 msgid "%s: failed to insert into database"

5865 msgstr "%s: falhou inserir na base de dados"

5866

5731 -#: object-file.c:2311

5867 +#: object-file.c:2262

5868 #, c-format

5869 msgid "%s: unsupported file type"

5870 msgstr "%s: tipo ficheiro insustentado"

5871

5736 -#: object-file.c:2335

5872 +#: object-file.c:2286 builtin/fetch.c:1445

5873 #, c-format

5874 msgid "%s is not a valid object"

5875 msgstr "%s é objeto inválido"

5876

5741 -#: object-file.c:2337

5877 +#: object-file.c:2288

5878 #, c-format

5879 msgid "%s is not a valid '%s' object"

5880 msgstr "%s é um objeto inválido '%s'"

5881

5746 -#: object-file.c:2364 builtin/index-pack.c:192

5882 +#: object-file.c:2315

5883 #, c-format

5884 msgid "unable to open %s"

5885 msgstr "incapaz abrir %s"

5886

5751 -#: object-file.c:2559 object-file.c:2612

5887 +#: object-file.c:2510

5888 #, c-format

5889 msgid "hash mismatch for %s (expected %s)"

5890 msgstr ""

5891

5756 -#: object-file.c:2583

5892 +#: object-file.c:2533

5893 #, c-format

5894 msgid "unable to mmap %s"

5895 msgstr "incapaz mmap %s"

5896

5761 -#: object-file.c:2588

5897 +#: object-file.c:2539

5898 #, c-format

5899 msgid "unable to unpack header of %s"

5900 msgstr "incapaz desempacotar cabeçalho de %s"

5901

5766 -#: object-file.c:2594

5902 +#: object-file.c:2544

l10n: pt_PT: update Portuguese translation