summaryrefslogtreecommitdiff
path: root/po/pt_PT.po
diff options
context:
space:
mode:
authorDaniel Santos <hello@brighterdan.com>2021-08-14 11:08:39 (GMT)
committerDaniel Santos <hello@brighterdan.com>2021-08-14 14:13:11 (GMT)
commit7d3bc0806b272fe8d48f0e005d05628f3a8a44b2 (patch)
treea093da6d60787cf5dfee08db1981d0462df56226 /po/pt_PT.po
parent88e7a933918bac8e515680fcb4f64d7dd8a202f8 (diff)
downloadgit-7d3bc0806b272fe8d48f0e005d05628f3a8a44b2.zip
git-7d3bc0806b272fe8d48f0e005d05628f3a8a44b2.tar.gz
git-7d3bc0806b272fe8d48f0e005d05628f3a8a44b2.tar.bz2
l10n: pt_PT: git-po-helper update
* run git-po-helper update pt_PT.po Signed-off-by: Daniel Santos <hello@brighterdan.com>
Diffstat (limited to 'po/pt_PT.po')
-rw-r--r--po/pt_PT.po1358
1 files changed, 617 insertions, 741 deletions
diff --git a/po/pt_PT.po b/po/pt_PT.po
index ff26889..41a61a4 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -215,7 +215,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2021-08-03 17:06+0800\n"
+"POT-Creation-Date: 2021-08-14 07:56+0800\n"
"PO-Revision-Date: 2020-10-14 11:43+0100\n"
"Last-Translator: Daniel Santos <hello@brighterdan.com>\n"
"Language-Team: Git L10N Português <https://github.com/git-l10n-pt-PT/>\n"
@@ -230,7 +230,7 @@ msgstr ""
msgid "Huh (%s)?"
msgstr "O quê (%s)?"
-#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
+#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493
#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
#: builtin/rebase.c:1953
msgid "could not read index"
@@ -260,7 +260,7 @@ msgstr "Atualizar"
msgid "could not stage '%s'"
msgstr "incapaz de stage '%s'"
-#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
#, fuzzy
msgid "could not write index"
msgstr "incapaz de escrever index"
@@ -430,9 +430,10 @@ msgstr "unstaged"
#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309
#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128
#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818
-#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326
-#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886
+#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343
+#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589
+#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893
#: git-add--interactive.perl:213
msgid "path"
msgstr "path"
@@ -1029,7 +1030,7 @@ msgstr ""
msgid "Exiting because of an unresolved conflict."
msgstr "Saindo devido a conflito por resolver."
-#: advice.c:283 builtin/merge.c:1374
+#: advice.c:283 builtin/merge.c:1375
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "O teu juntar ficou por concluir (MERGE_HEAD presente)."
@@ -1802,7 +1803,7 @@ msgstr "incapaz ler %s"
#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095
#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
-#: builtin/merge.c:1143
+#: builtin/merge.c:1144
#, c-format
msgid "could not read '%s'"
msgstr "incapaz ler '%s'"
@@ -1894,7 +1895,8 @@ msgid "list supported archive formats"
msgstr "listar formatos de arquivo suportados"
#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
-#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352
+#: builtin/submodule--helper.c:2902
msgid "repo"
msgstr "repo"
@@ -2088,7 +2090,7 @@ msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse e --first-parent juntos requer que se especifique o último commit"
-#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333
+#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333
#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414
#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346
#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806
@@ -2456,7 +2458,6 @@ msgid "Clearing commit marks in commit graph"
msgstr ""
#: commit-graph.c:1424
-#, fuzzy
msgid "Computing commit graph topological levels"
msgstr ""
@@ -2530,7 +2531,6 @@ msgid "unable to open commit-graph chain file"
msgstr "incapaz abrir ficheiro commit-graph chain"
#: commit-graph.c:1939
-#, fuzzy
msgid "failed to rename base commit-graph file"
msgstr ""
@@ -2742,12 +2742,11 @@ msgid "invalid key: %s"
msgstr "chave inválida: %s"
#: config.c:478
-#, fuzzy, c-format
+#, c-format
msgid "invalid key (newline): %s"
msgstr ""
#: config.c:511
-#, fuzzy
msgid "empty config key"
msgstr ""
@@ -2767,7 +2766,7 @@ msgid "bogus count in %s"
msgstr "contagem falsa em %s"
#: config.c:626
-#, fuzzy, c-format
+#, c-format
msgid "too many entries in %s"
msgstr ""
@@ -2777,7 +2776,7 @@ msgid "missing config key %s"
msgstr "ficheiro config inválido %s"
#: config.c:644
-#, fuzzy, c-format
+#, c-format
msgid "missing config value %s"
msgstr ""
@@ -3026,12 +3025,12 @@ msgid "could not unset '%s'"
msgstr "incapaz desdefinir '%s'"
#: config.c:3276
-#, fuzzy, c-format
+#, c-format
msgid "invalid section name: %s"
msgstr ""
#: config.c:3443
-#, fuzzy, c-format
+#, c-format
msgid "missing value for '%s'"
msgstr ""
@@ -3076,7 +3075,7 @@ msgid "protocol error: unexpected capabilities^{}"
msgstr ""
#: connect.c:306
-#, fuzzy, c-format
+#, c-format
msgid "protocol error: expected shallow sha-1, got '%s'"
msgstr ""
@@ -3085,12 +3084,11 @@ msgid "repository on the other end cannot be shallow"
msgstr ""
#: connect.c:347
-#, fuzzy
msgid "invalid packet"
msgstr ""
#: connect.c:367
-#, fuzzy, c-format
+#, c-format
msgid "protocol error: unexpected '%s'"
msgstr ""
@@ -3100,7 +3098,7 @@ msgid "unknown object format '%s' specified by server"
msgstr "objeto desconhecido '%s' pelo formato em servidor."
#: connect.c:526
-#, fuzzy, c-format
+#, c-format
msgid "invalid ls-refs response: %s"
msgstr ""
@@ -3122,7 +3120,7 @@ msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
#: connect.c:757 connect.c:820
-#, fuzzy, c-format
+#, c-format
msgid "Looking up %s ... "
msgstr ""
@@ -3160,7 +3158,7 @@ msgid "unable to look up %s (%s)"
msgstr "incapaz procurar %s (%s)"
#: connect.c:830
-#, fuzzy, c-format
+#, c-format
msgid "unknown port %s"
msgstr ""
@@ -3319,7 +3317,6 @@ msgid "external filter '%s' failed"
msgstr "filtro externo '%s' falhou"
#: convert.c:826
-#, fuzzy
msgid "unexpected filter type"
msgstr ""
@@ -3327,23 +3324,23 @@ msgstr ""
msgid "path name too long for external filter"
msgstr ""
-#: convert.c:934
+#: convert.c:935
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr ""
-#: convert.c:1234
+#: convert.c:1236
msgid "true/false are no valid working-tree-encodings"
msgstr ""
-#: convert.c:1414 convert.c:1447
-#, fuzzy, c-format
+#: convert.c:1416 convert.c:1449
+#, c-format
msgid "%s: clean filter '%s' failed"
msgstr ""
-#: convert.c:1490
+#: convert.c:1492
#, fuzzy, c-format
msgid "%s: smudge filter %s failed"
msgstr "falha ao atualizar os ficheiros"
@@ -3454,7 +3451,7 @@ msgid "bad tree object %s"
msgstr "objeto árvore"
#: delta-islands.c:334
-#, fuzzy, c-format
+#, c-format
msgid "failed to load island regex for '%s': %s"
msgstr ""
@@ -3558,7 +3555,6 @@ msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check e -s são mutuamente exclusivos"
#: diff.c:4637
-#, fuzzy
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
@@ -3568,9 +3564,8 @@ msgid ""
msgstr ""
#: diff.c:4643
-#, fuzzy
msgid ""
-"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
"with -G and -S"
msgstr ""
@@ -3585,7 +3580,7 @@ msgstr "valor de cor inválido: %.*s"
#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318
#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
-#, fuzzy, c-format
+#, c-format
msgid "%s expects a numerical value"
msgstr ""
@@ -3640,12 +3635,12 @@ msgid ""
msgstr ""
#: diff.c:5114 diff.c:5134
-#, fuzzy, c-format
+#, c-format
msgid "invalid argument to %s"
msgstr ""
#: diff.c:5238
-#, fuzzy, c-format
+#, c-format
msgid "invalid regex given to -I: '%s'"
msgstr ""
@@ -3686,12 +3681,10 @@ msgid "generate the diff in raw format"
msgstr ""
#: diff.c:5398
-#, fuzzy
msgid "synonym for '-p --raw'"
msgstr ""
#: diff.c:5402
-#, fuzzy
msgid "synonym for '-p --stat'"
msgstr ""
@@ -3731,12 +3724,10 @@ msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
#: diff.c:5430
-#, fuzzy
msgid "show only names of changed files"
msgstr ""
#: diff.c:5433
-#, fuzzy
msgid "show only names and status of changed files"
msgstr ""
@@ -3850,7 +3841,6 @@ msgid "specify the character to indicate a context instead of ' '"
msgstr ""
#: diff.c:5498
-#, fuzzy
msgid "Diff rename options"
msgstr ""
@@ -3900,7 +3890,6 @@ msgid ""
msgstr ""
#: diff.c:5527
-#, fuzzy
msgid "Diff algorithm options"
msgstr ""
@@ -3909,17 +3898,14 @@ msgid "produce the smallest possible diff"
msgstr ""
#: diff.c:5532
-#, fuzzy
msgid "ignore whitespace when comparing lines"
msgstr ""
#: diff.c:5535
-#, fuzzy
msgid "ignore changes in amount of whitespace"
msgstr ""
#: diff.c:5538
-#, fuzzy
msgid "ignore changes in whitespace at EOL"
msgstr ""
@@ -3936,7 +3922,6 @@ msgid "<regex>"
msgstr ""
#: diff.c:5547
-#, fuzzy
msgid "ignore changes whose all lines match <regex>"
msgstr ""
@@ -3995,7 +3980,6 @@ msgid "how white spaces are ignored in --color-moved"
msgstr ""
#: diff.c:5581
-#, fuzzy
msgid "Other diff options"
msgstr ""
@@ -4050,7 +4034,6 @@ msgid "specify how differences in submodules are shown"
msgstr ""
#: diff.c:5608
-#, fuzzy
msgid "hide 'git add -N' entries from the index"
msgstr ""
@@ -4138,7 +4121,8 @@ msgstr "submeter somente os ficheiros especificados"
#: diff.c:6298
#, fuzzy
msgid "exhaustive rename detection was skipped due to too many files."
-msgstr "detecção de renomeação exaustiva foi ignorada devido a demasiados ficheiros."
+msgstr ""
+"detecção de renomeação exaustiva foi ignorada devido a demasiados ficheiros."
#: diff.c:6301
msgid "only found copies from modified paths due to too many files."
@@ -4158,7 +4142,7 @@ msgstr ""
msgid "failed to read orderfile '%s'"
msgstr "falha ao ler ficheiro de comando '%s'"
-#: diffcore-rename.c:1510
+#: diffcore-rename.c:1514
msgid "Performing inexact rename detection"
msgstr "Deteção de mudança de nome inexata em curso"
@@ -4178,50 +4162,50 @@ msgstr ""
msgid "unrecognized pattern: '%s'"
msgstr "padrão irreconhecível: '%s'"
-#: dir.c:792 dir.c:806
+#: dir.c:790 dir.c:804
#, fuzzy, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "por reconhecer padrão negativo: '%s'"
-#: dir.c:824
+#: dir.c:820
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
-#: dir.c:834
+#: dir.c:830
msgid "disabling cone pattern matching"
msgstr ""
-#: dir.c:1221
+#: dir.c:1214
#, fuzzy, c-format
msgid "cannot use %s as an exclude file"
msgstr "incapaz usar %s como ficheiro de exclusão"
-#: dir.c:2358
+#: dir.c:2351
#, fuzzy, c-format
msgid "could not open directory '%s'"
msgstr "incapaz abrir pasta '%s'"
-#: dir.c:2660
+#: dir.c:2653
msgid "failed to get kernel name and information"
msgstr "falha ao obter nome e informação do kernel"
-#: dir.c:2784
+#: dir.c:2777
#, fuzzy
msgid "untracked cache is disabled on this system or location"
msgstr "cache untracked está desativada neste sistema ou localização."
-#: dir.c:3617
-#, fuzzy, c-format
+#: dir.c:3610
+#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3664 dir.c:3669
+#: dir.c:3657 dir.c:3662
#, c-format
msgid "could not create directories for %s"
msgstr "incapaz criar pasta para %s"
-#: dir.c:3698
+#: dir.c:3691
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "incapaz migrar pasta git de '%s' para '%s'"
@@ -4246,13 +4230,13 @@ msgstr "incapaz de stat o ficheiro '%s'"
msgid "bad git namespace path \"%s\""
msgstr ""
-#: environment.c:335
+#: environment.c:334
#, fuzzy, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "incapaz definir GIT_DIR para '%s'"
#: exec-cmd.c:363
-#, fuzzy, c-format
+#, c-format
msgid "too many args to run %s"
msgstr ""
@@ -4451,7 +4435,7 @@ msgid "error reading section header '%s'"
msgstr ""
#: fetch-pack.c:1353
-#, fuzzy, c-format
+#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
@@ -4479,12 +4463,12 @@ msgid "error processing shallow info: %d"
msgstr ""
#: fetch-pack.c:1494
-#, fuzzy, c-format
+#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
#: fetch-pack.c:1499
-#, fuzzy, c-format
+#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
@@ -4507,7 +4491,6 @@ msgid "remote did not send all necessary objects"
msgstr "remoto faltou enviar todos objetos necessários"
#: fetch-pack.c:2065
-#, fuzzy
msgid "unexpected 'ready' from remote"
msgstr ""
@@ -4797,7 +4780,7 @@ msgid "'%s' for 'object:type=<type>' is not a valid object type"
msgstr "'%s' para 'object:type=<type>' é um tipo de objecto inválido"
#: list-objects-filter-options.c:124
-#, fuzzy, c-format
+#, c-format
msgid "invalid filter-spec '%s'"
msgstr ""
@@ -4868,7 +4851,7 @@ msgid "Unable to create '%s.lock': %s"
msgstr "Incapaz de criar '%s.lock': %s"
#: ls-refs.c:37
-#, fuzzy, c-format
+#, c-format
msgid "invalid value '%s' for lsrefs.unborn"
msgstr ""
@@ -4885,39 +4868,39 @@ msgstr ""
msgid "bad action '%s' for '%s'"
msgstr "ação inválida '%s' para '%s'"
-#: merge-ort.c:1228 merge-recursive.c:1206
-#, fuzzy, c-format
+#: merge-ort.c:1569 merge-recursive.c:1201
+#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr ""
-#: merge-ort.c:1237 merge-recursive.c:1213
-#, fuzzy, c-format
+#: merge-ort.c:1578 merge-recursive.c:1208
+#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr ""
-#: merge-ort.c:1246 merge-recursive.c:1220
+#: merge-ort.c:1587 merge-recursive.c:1215
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr ""
-#: merge-ort.c:1256 merge-ort.c:1263
-#, fuzzy, c-format
+#: merge-ort.c:1597 merge-ort.c:1604
+#, c-format
msgid "Note: Fast-forwarding submodule %s to %s"
msgstr ""
-#: merge-ort.c:1284
+#: merge-ort.c:1625
#, fuzzy, c-format
msgid "Failed to merge submodule %s"
msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"
-#: merge-ort.c:1291
-#, fuzzy, c-format
+#: merge-ort.c:1632
+#, c-format
msgid ""
"Failed to merge submodule %s, but a possible merge resolution exists:\n"
"%s\n"
msgstr ""
-#: merge-ort.c:1295 merge-recursive.c:1274
+#: merge-ort.c:1636 merge-recursive.c:1269
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4928,42 +4911,42 @@ msgid ""
"which will accept this suggestion.\n"
msgstr ""
-#: merge-ort.c:1308
-#, fuzzy, c-format
+#: merge-ort.c:1649
+#, c-format
msgid ""
"Failed to merge submodule %s, but multiple possible merges exist:\n"
"%s"
msgstr ""
-#: merge-ort.c:1527 merge-recursive.c:1363
+#: merge-ort.c:1868 merge-recursive.c:1358
msgid "Failed to execute internal merge"
msgstr "Falha ao executar integração interna"
-#: merge-ort.c:1532 merge-recursive.c:1368
+#: merge-ort.c:1873 merge-recursive.c:1363
#, c-format
msgid "Unable to add %s to database"
msgstr "Incapaz de adicionar %s à base de dados"
-#: merge-ort.c:1539 merge-recursive.c:1401
+#: merge-ort.c:1880 merge-recursive.c:1396
#, c-format
msgid "Auto-merging %s"
msgstr "A integrar automaticamente %s"
-#: merge-ort.c:1678 merge-recursive.c:2123
+#: merge-ort.c:2019 merge-recursive.c:2118
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
"implicit directory rename(s) putting the following path(s) there: %s."
msgstr ""
-#: merge-ort.c:1688 merge-recursive.c:2133
+#: merge-ort.c:2029 merge-recursive.c:2128
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
"implicit directory renames tried to put these paths there: %s"
msgstr ""
-#: merge-ort.c:1746
+#: merge-ort.c:2087
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
@@ -4971,49 +4954,49 @@ msgid ""
"majority of the files."
msgstr ""
-#: merge-ort.c:1900 merge-recursive.c:2469
+#: merge-ort.c:2241 merge-recursive.c:2464
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
-#: merge-ort.c:2044 merge-recursive.c:3252
+#: merge-ort.c:2385 merge-recursive.c:3247
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
"moving it to %s."
msgstr ""
-#: merge-ort.c:2051 merge-recursive.c:3259
+#: merge-ort.c:2392 merge-recursive.c:3254
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
"%s; moving it to %s."
msgstr ""
-#: merge-ort.c:2064 merge-recursive.c:3255
+#: merge-ort.c:2405 merge-recursive.c:3250
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
"in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-ort.c:2072 merge-recursive.c:3262
+#: merge-ort.c:2413 merge-recursive.c:3257
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
"was renamed in %s, suggesting it should perhaps be moved to %s."
msgstr ""
-#: merge-ort.c:2228
+#: merge-ort.c:2569
#, fuzzy, c-format
msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
msgstr ""
"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
"%s->%s em %s"
-#: merge-ort.c:2323
+#: merge-ort.c:2664
#, c-format
msgid ""
"CONFLICT (rename involved in collision): rename of %s -> %s has content "
@@ -5021,62 +5004,62 @@ msgid ""
"markers."
msgstr ""
-#: merge-ort.c:2342 merge-ort.c:2366
+#: merge-ort.c:2683 merge-ort.c:2707
#, fuzzy, c-format
msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
msgstr ""
"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
"%s"
-#: merge-ort.c:2819 merge-recursive.c:3013
+#: merge-ort.c:3182 merge-recursive.c:3008
#, c-format
msgid "cannot read object %s"
msgstr "incapaz ler objeto %s"
-#: merge-ort.c:2822 merge-recursive.c:3016
+#: merge-ort.c:3185 merge-recursive.c:3011
#, c-format
msgid "object %s is not a blob"
msgstr "objeto %s é blob nenhum"
-#: merge-ort.c:3250
+#: merge-ort.c:3613
#, c-format
msgid ""
"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
"%s instead."
msgstr ""
-#: merge-ort.c:3326
+#: merge-ort.c:3689
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed both "
"of them so each can be recorded somewhere."
msgstr ""
-#: merge-ort.c:3333
+#: merge-ort.c:3696
#, c-format
msgid ""
"CONFLICT (distinct types): %s had different types on each side; renamed one "
"of them so each can be recorded somewhere."
msgstr ""
-#: merge-ort.c:3433 merge-recursive.c:3092
+#: merge-ort.c:3796 merge-recursive.c:3087
msgid "content"
msgstr "conteúdo"
-#: merge-ort.c:3435 merge-recursive.c:3096
+#: merge-ort.c:3798 merge-recursive.c:3091
msgid "add/add"
msgstr "adicionar/adicionar"
-#: merge-ort.c:3437 merge-recursive.c:3141
+#: merge-ort.c:3800 merge-recursive.c:3136
msgid "submodule"
msgstr "submódulo"
-#: merge-ort.c:3439 merge-recursive.c:3142
+#: merge-ort.c:3802 merge-recursive.c:3137
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLITO (%s): conflito de integração em %s"
-#: merge-ort.c:3470
+#: merge-ort.c:3833
#, fuzzy, c-format
msgid ""
"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
@@ -5085,7 +5068,7 @@ msgstr ""
"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
"deixada na árvore."
-#: merge-ort.c:3757
+#: merge-ort.c:4120
#, c-format
msgid ""
"Note: %s not up to date and in way of checking out conflicted version; old "
@@ -5095,12 +5078,12 @@ msgstr ""
#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
#. base, and 2-3) the trees for the two trees we're merging.
#.
-#: merge-ort.c:4116
-#, fuzzy, c-format
+#: merge-ort.c:4487
+#, c-format
msgid "collecting merge info failed for trees %s, %s, %s"
msgstr ""
-#: merge-ort-wrappers.c:13 merge-recursive.c:3707
+#: merge-ort-wrappers.c:13 merge-recursive.c:3702
#, fuzzy, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -5110,105 +5093,105 @@ msgstr ""
"integrar:\n"
"%%s"
-#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
#, fuzzy
msgid "Already up to date."
msgstr "Já está atualizado."
-#: merge-recursive.c:357
+#: merge-recursive.c:352
msgid "(bad commit)\n"
msgstr "(commit incorreto)\n"
-#: merge-recursive.c:380
+#: merge-recursive.c:375
#, fuzzy, c-format
msgid "add_cacheinfo failed for path '%s'; merge aborting."
msgstr "addinfo_cache falhou no caminho '%s'"
-#: merge-recursive.c:389
+#: merge-recursive.c:384
#, fuzzy, c-format
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
msgstr "addinfo_cache falhou no caminho '%s'"
-#: merge-recursive.c:877
+#: merge-recursive.c:872
#, c-format
msgid "failed to create path '%s'%s"
msgstr "falha ao criar o caminho '%s'%s"
-#: merge-recursive.c:888
+#: merge-recursive.c:883
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "A remover %s para criar espaço para o subdiretório\n"
-#: merge-recursive.c:902 merge-recursive.c:921
+#: merge-recursive.c:897 merge-recursive.c:916
msgid ": perhaps a D/F conflict?"
msgstr ": talvez um conflito D/F?"
-#: merge-recursive.c:911
+#: merge-recursive.c:906
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "recusando perder ficheiro untracked em '%s'"
-#: merge-recursive.c:952 builtin/cat-file.c:41
+#: merge-recursive.c:947 builtin/cat-file.c:41
#, c-format
msgid "cannot read object %s '%s'"
msgstr "incapaz ler objeto %s '%s'"
-#: merge-recursive.c:957
+#: merge-recursive.c:952
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:982
+#: merge-recursive.c:977
#, c-format
msgid "failed to open '%s': %s"
msgstr "falhou ao abrir '%s': %s"
-#: merge-recursive.c:993
+#: merge-recursive.c:988
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "falha ao criar a ligação simbólica '%s': %s"
-#: merge-recursive.c:998
+#: merge-recursive.c:993
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "desconheço que fazer com %06o %s '%s'"
-#: merge-recursive.c:1228 merge-recursive.c:1240
+#: merge-recursive.c:1223 merge-recursive.c:1235
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr ""
-#: merge-recursive.c:1231 merge-recursive.c:1243
+#: merge-recursive.c:1226 merge-recursive.c:1238
#, fuzzy, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Avançando submódulo %s"
-#: merge-recursive.c:1266
+#: merge-recursive.c:1261
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-#: merge-recursive.c:1270
-#, fuzzy, c-format
+#: merge-recursive.c:1265
+#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr ""
-#: merge-recursive.c:1271
+#: merge-recursive.c:1266
msgid "Found a possible merge resolution for the submodule:\n"
msgstr ""
-#: merge-recursive.c:1283
+#: merge-recursive.c:1278
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr ""
-#: merge-recursive.c:1425
+#: merge-recursive.c:1420
#, fuzzy, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
msgstr ""
"Erro: Recusando perder ficheiro untracked de '%s'; escrevendo invés para %s"
-#: merge-recursive.c:1497
+#: merge-recursive.c:1492
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5217,7 +5200,7 @@ msgstr ""
"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
"deixada na árvore."
-#: merge-recursive.c:1502
+#: merge-recursive.c:1497
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5226,7 +5209,7 @@ msgstr ""
"CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s "
"de %s deixada na árvore."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1504
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -5235,7 +5218,7 @@ msgstr ""
"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %s de %s "
"deixada na árvore em %s."
-#: merge-recursive.c:1514
+#: merge-recursive.c:1509
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -5244,43 +5227,43 @@ msgstr ""
"CONFLITO (%s/eliminar): %s eliminado em %s e %s para %s em %s. Versão de %s "
"de %s deixada na árvore em %s."
-#: merge-recursive.c:1549
+#: merge-recursive.c:1544
msgid "rename"
msgstr "mudar nome"
-#: merge-recursive.c:1549
+#: merge-recursive.c:1544
msgid "renamed"
msgstr "nome mudado"
-#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
#, fuzzy, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Recusando perder ficheiro sujo de %s"
-#: merge-recursive.c:1610
+#: merge-recursive.c:1605
#, fuzzy, c-format
msgid "Refusing to lose untracked file at %s, even though it's in the way."
msgstr ""
"Recusando perder ficheiro untracked de %s, apesar de este estar no caminho."
-#: merge-recursive.c:1668
+#: merge-recursive.c:1663
#, fuzzy, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
"%s"
-#: merge-recursive.c:1699
+#: merge-recursive.c:1694
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s é um diretório em %s adicionando %s no seu lugar"
-#: merge-recursive.c:1704
+#: merge-recursive.c:1699
#, fuzzy, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Recusando perder ficheiro untracked de %s; adicionado-o como %s invés"
-#: merge-recursive.c:1731
+#: merge-recursive.c:1726
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -5289,18 +5272,18 @@ msgstr ""
"CONFLITO (mudar nome/mudar nome): Mudar o nome \"%s\"->\"%s\" no ramo \"%s\" "
"mudar o nome \"%s\"->\"%s\" em \"%s\"%s"
-#: merge-recursive.c:1736
+#: merge-recursive.c:1731
msgid " (left unresolved)"
msgstr " (por resolver)"
-#: merge-recursive.c:1828
+#: merge-recursive.c:1823
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
"%s->%s em %s"
-#: merge-recursive.c:2091
+#: merge-recursive.c:2086
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -5308,7 +5291,7 @@ msgid ""
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:2225
+#: merge-recursive.c:2220
#, fuzzy, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -5317,79 +5300,79 @@ msgstr ""
"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
"%s->%s em %s"
-#: merge-recursive.c:3080
+#: merge-recursive.c:3075
msgid "modify"
msgstr "modificar"
-#: merge-recursive.c:3080
+#: merge-recursive.c:3075
msgid "modified"
msgstr "modificado"
-#: merge-recursive.c:3119
+#: merge-recursive.c:3114
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ignorado (integrado é igual ao existente)"
-#: merge-recursive.c:3172
+#: merge-recursive.c:3167
#, c-format
msgid "Adding as %s instead"
msgstr "A adicionar como %s, em alternativa."
-#: merge-recursive.c:3376
+#: merge-recursive.c:3371
#, c-format
msgid "Removing %s"
msgstr "A remover %s"
-#: merge-recursive.c:3399
+#: merge-recursive.c:3394
msgid "file/directory"
msgstr "ficheiro/diretório"
-#: merge-recursive.c:3404
+#: merge-recursive.c:3399
msgid "directory/file"
msgstr "diretório/ficheiro"
-#: merge-recursive.c:3411
+#: merge-recursive.c:3406
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLITO (%s): Há um diretório designado %s em %s. A adicionar %s como %s"
-#: merge-recursive.c:3420
+#: merge-recursive.c:3415
#, c-format
msgid "Adding %s"
msgstr "A adicionar %s"
-#: merge-recursive.c:3429
+#: merge-recursive.c:3424
#, fuzzy, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "CONFLITO (%s): conflito de integração em %s"
-#: merge-recursive.c:3482
+#: merge-recursive.c:3477
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "falha ao integrar as árvores %s e %s"
-#: merge-recursive.c:3576
+#: merge-recursive.c:3571
msgid "Merging:"
msgstr "A integrar:"
-#: merge-recursive.c:3589
+#: merge-recursive.c:3584
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u antecessor comum encontrado:"
msgstr[1] "%u antecessores comuns encontrados:"
-#: merge-recursive.c:3639
+#: merge-recursive.c:3634
msgid "merge returned no commit"
msgstr "junção retornou commit nenhum"
-#: merge-recursive.c:3804
+#: merge-recursive.c:3799
#, c-format
msgid "Could not parse object '%s'"
msgstr "Incapaz de analisar objeto '%s'"
-#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
#: builtin/stash.c:473
msgid "Unable to write index."
msgstr "Incapaz de escrever no index."
@@ -5399,7 +5382,7 @@ msgid "failed to read the cache"
msgstr "falha ao ler a cache"
#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
-#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
+#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821
#: builtin/stash.c:267
msgid "unable to write new index file"
msgstr "incapaz escrever novo ficheiro index"
@@ -5460,17 +5443,17 @@ msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
#: midx.c:490
-#, fuzzy, c-format
+#, c-format
msgid "failed to add packfile '%s'"
msgstr ""
#: midx.c:496
-#, fuzzy, c-format
+#, c-format
msgid "failed to open pack-index '%s'"
msgstr ""
#: midx.c:564
-#, fuzzy, c-format
+#, c-format
msgid "failed to locate object %d in packfile"
msgstr ""
@@ -5493,7 +5476,7 @@ msgid "did not see pack-file %s to drop"
msgstr ""
#: midx.c:1034
-#, fuzzy, c-format
+#, c-format
msgid "unknown preferred pack: '%s'"
msgstr ""
@@ -5513,7 +5496,7 @@ msgid "failed to remove %s"
msgstr "falha ao remover %s"
#: midx.c:1166
-#, fuzzy, c-format
+#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr ""
@@ -5549,12 +5532,10 @@ msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
#: midx.c:1294
-#, fuzzy
msgid "Sorting objects by packfile"
msgstr ""
#: midx.c:1301
-#, fuzzy
msgid "Verifying object offsets"
msgstr ""
@@ -5564,7 +5545,7 @@ msgid "failed to load pack entry for oid[%d] = %s"
msgstr "falhou carregar entrada pack para oid[%d] = %s"
#: midx.c:1323
-#, fuzzy, c-format
+#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr ""
@@ -5725,7 +5706,7 @@ msgid "mmap failed%s"
msgstr "mmap falhou%s"
#: object-file.c:1218
-#, fuzzy, c-format
+#, c-format
msgid "object file %s is empty"
msgstr ""
@@ -5775,12 +5756,12 @@ msgid "replacement %s not found for %s"
msgstr "%s substituto, por encontrar para %s"
#: object-file.c:1725
-#, fuzzy, c-format
+#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
#: object-file.c:1729
-#, fuzzy, c-format
+#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
@@ -5795,12 +5776,10 @@ msgid "unable to set permission to '%s'"
msgstr "incapaz definir permissão para '%s'"
#: object-file.c:1848
-#, fuzzy
msgid "file write error"
msgstr ""
#: object-file.c:1868
-#, fuzzy
msgid "error when closing loose object file"
msgstr ""
@@ -5835,7 +5814,7 @@ msgid "confused by unstable object source data for %s"
msgstr ""
#: object-file.c:1983 builtin/pack-objects.c:1237
-#, fuzzy, c-format
+#, c-format
msgid "failed utime() on %s"
msgstr ""
@@ -6020,7 +5999,7 @@ msgid "object %s is a %s, not a %s"
msgstr "objeto %s é %s, é %s nenhum(a)"
#: object.c:250
-#, fuzzy, c-format
+#, c-format
msgid "object %s has unknown type id %d"
msgstr ""
@@ -6050,12 +6029,12 @@ msgid "reverse-index file %s is too small"
msgstr ""
#: pack-revindex.c:226
-#, fuzzy, c-format
+#, c-format
msgid "reverse-index file %s is corrupt"
msgstr ""
#: pack-revindex.c:234
-#, fuzzy, c-format
+#, c-format
msgid "reverse-index file %s has unknown signature"
msgstr ""
@@ -6109,7 +6088,7 @@ msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset depois do fim do índice do pacote %s (índice truncado?)"
#: parse-options-cb.c:20 parse-options-cb.c:24
-#, fuzzy, c-format
+#, c-format
msgid "option `%s' expects a numerical value"
msgstr ""
@@ -6139,7 +6118,7 @@ msgid "%s is incompatible with %s"
msgstr "%s é incompatível com %s"
#: parse-options.c:78
-#, fuzzy, c-format
+#, c-format
msgid "%s : incompatible with something else"
msgstr ""
@@ -6174,12 +6153,12 @@ msgid "alias of --%s"
msgstr ""
#: parse-options.c:879
-#, fuzzy, c-format
+#, c-format
msgid "unknown option `%s'"
msgstr ""
#: parse-options.c:881
-#, fuzzy, c-format
+#, c-format
msgid "unknown switch `%c'"
msgstr ""
@@ -6348,12 +6327,12 @@ msgid "the remote end hung up unexpectedly"
msgstr "O remoto desligou após contacto inicial"
#: pkt-line.c:369 pkt-line.c:371
-#, fuzzy, c-format
+#, c-format
msgid "protocol error: bad line length character: %.4s"
msgstr ""
#: pkt-line.c:386 pkt-line.c:388 pkt-line.c:394 pkt-line.c:396
-#, fuzzy, c-format
+#, c-format
msgid "protocol error: bad line length %d"
msgstr ""
@@ -6430,12 +6409,10 @@ msgid "could not parse git header '%.*s'"
msgstr "incapaz analisar cabeçalho git '%.*s'"
#: range-diff.c:307
-#, fuzzy
msgid "failed to generate diff"
msgstr ""
#: range-diff.c:559
-#, fuzzy
msgid "--left-only and --right-only are mutually exclusive"
msgstr ""
@@ -6450,7 +6427,6 @@ msgid "will not add file alias '%s' ('%s' already exists in index)"
msgstr "%s: já existe no índice"
#: read-cache.c:726
-#, fuzzy
msgid "cannot create an empty blob in the object database"
msgstr ""
@@ -6508,7 +6484,7 @@ msgstr ""
"A usar a versão %i"
#: read-cache.c:1771
-#, fuzzy, c-format
+#, c-format
msgid "bad signature 0x%08x"
msgstr ""
@@ -6518,7 +6494,6 @@ msgid "bad index version %d"
msgstr "versão de índice '%s' incorreta"
#: read-cache.c:1783
-#, fuzzy
msgid "bad index file sha1 signature"
msgstr ""
@@ -6558,10 +6533,10 @@ msgstr "entradas de estágio desordenadas para '%s'"
#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095
#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183
-#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987
+#: builtin/checkout.c:519 builtin/checkout.c:706 builtin/clean.c:987
#: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505
#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291
-#: builtin/submodule--helper.c:331
+#: builtin/submodule--helper.c:333
msgid "index file corrupt"
msgstr ""
@@ -6615,37 +6590,36 @@ msgstr "incapaz refrescar index partilhado '%s'"
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
#, c-format
msgid "could not close '%s'"
msgstr "incapaz fechar '%s'"
-#: read-cache.c:3074
-#, fuzzy
+#: read-cache.c:3075
msgid "failed to convert to a sparse-index"
msgstr ""
-#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440
+#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
#, fuzzy, c-format
msgid "could not stat '%s'"
msgstr "incapaz obter estatutário '%s'"
-#: read-cache.c:3158
+#: read-cache.c:3159
#, c-format
msgid "unable to open git dir: %s"
msgstr "incapaz abrir pasta git: %s"
-#: read-cache.c:3170
+#: read-cache.c:3171
#, c-format
msgid "unable to unlink: %s"
msgstr "incapaz deslinkar: %s"
-#: read-cache.c:3199
+#: read-cache.c:3200
#, fuzzy, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "incapaz arranjar bits de permissão em '%s'"
-#: read-cache.c:3348
+#: read-cache.c:3349
#, fuzzy, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: incapaz baixar para estágio #0"
@@ -7047,17 +7021,17 @@ msgstr "ignorando ref com nome quebrado %s"
msgid "ignoring broken ref %s"
msgstr "a referência %s danificada foi ignorada"
-#: ref-filter.c:2498
+#: ref-filter.c:2502
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta átomo %%(end)"
-#: ref-filter.c:2592
+#: ref-filter.c:2596
#, c-format
msgid "malformed object name %s"
msgstr "nome de objeto malformado %s"
-#: ref-filter.c:2597
+#: ref-filter.c:2601
#, fuzzy, c-format
msgid "option `%s' must point to a commit"
msgstr "opção '%s' tem apontar para um commit"
@@ -7118,7 +7092,7 @@ msgid "refusing to update ref with bad name '%s'"
msgstr "recusando atualizar ref com nome inválido '%s'"
#: refs.c:1157
-#, fuzzy, c-format
+#, c-format
msgid "update_ref failed for ref '%s': %s"
msgstr ""
@@ -7162,7 +7136,7 @@ msgid "could not delete references: %s"
msgstr "incapaz apagar referências: %s"
#: refspec.c:170
-#, fuzzy, c-format
+#, c-format
msgid "invalid refspec '%s'"
msgstr ""
@@ -7442,7 +7416,7 @@ msgid "there were errors while writing '%s' (%s)"
msgstr ""
#: rerere.c:482
-#, fuzzy, c-format
+#, c-format
msgid "failed to flush '%s'"
msgstr ""
@@ -7452,12 +7426,12 @@ msgid "could not parse conflict hunks in '%s'"
msgstr "incapaz analisar pedaços conflituosos em '%s'"
#: rerere.c:668
-#, fuzzy, c-format
+#, c-format
msgid "failed utime() on '%s'"
msgstr ""
#: rerere.c:678
-#, fuzzy, c-format
+#, c-format
msgid "writing '%s' failed"
msgstr ""
@@ -7487,7 +7461,7 @@ msgid "Recorded preimage for '%s'"
msgstr ""
#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
-#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:1805 builtin/submodule--helper.c:1848
#, c-format
msgid "could not create directory '%s'"
msgstr "incapaz criar pasta '%s'"
@@ -7527,7 +7501,7 @@ msgstr "incapaz abrir pasta rr-cache"
msgid "could not determine HEAD revision"
msgstr "incapaz determinar revisão de HEAD"
-#: reset.c:70 reset.c:76 sequencer.c:3689
+#: reset.c:69 reset.c:75 sequencer.c:3689
#, fuzzy, c-format
msgid "failed to find tree of %s"
msgstr "Falha ao procurar árvore de %s."
@@ -7739,7 +7713,7 @@ msgid "unable to dequote value of '%s'"
msgstr "incapaz retirar valor, da citação '%s'"
#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
-#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910
+#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr "incapaz abrir '%s' para leitura"
@@ -7757,7 +7731,7 @@ msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
#: sequencer.c:851
-#, fuzzy, c-format
+#, c-format
msgid "unknown variable '%s'"
msgstr ""
@@ -7887,7 +7861,7 @@ msgstr "incapaz processar HEAD"
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s é commit nenhum!"
-#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
msgid "could not parse HEAD commit"
msgstr "incapaz analisar commit HEAD"
@@ -7896,7 +7870,7 @@ msgstr "incapaz analisar commit HEAD"
msgid "unable to parse commit author"
msgstr "incapaz processar autor de commit"
-#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
msgid "git write-tree failed to write a tree"
msgstr ""
@@ -7906,7 +7880,7 @@ msgid "unable to read commit message from '%s'"
msgstr "incapaz ler mensagem de commit de '%s'"
#: sequencer.c:1485 sequencer.c:1517
-#, fuzzy, c-format
+#, c-format
msgid "invalid author identity '%s'"
msgstr ""
@@ -7914,8 +7888,8 @@ msgstr ""
msgid "corrupt author: missing date information"
msgstr ""
-#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909
-#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
+#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1819 builtin/merge.c:910
+#: builtin/merge.c:935 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr ""
@@ -8052,7 +8026,7 @@ msgid "%s does not accept arguments: '%s'"
msgstr "%s rejeita argumentos: '%s'"
#: sequencer.c:2434
-#, fuzzy, c-format
+#, c-format
msgid "missing arguments for %s"
msgstr ""
@@ -8195,7 +8169,6 @@ msgid "no cherry-pick in progress"
msgstr "cherry-pick nenhum em curso"
#: sequencer.c:3239
-#, fuzzy
msgid "failed to skip the commit"
msgstr ""
@@ -8609,7 +8582,7 @@ msgstr[0] "versão de repo é 0, mas encontrou-se extensão vi-only:"
msgstr[1] "versão de repo é 0, mas encontrou-se extensões vi-only:"
#: setup.c:701
-#, fuzzy, c-format
+#, c-format
msgid "error opening '%s'"
msgstr ""
@@ -8659,7 +8632,7 @@ msgid "cannot come back to cwd"
msgstr "incapaz de voltar para cwd"
#: setup.c:988
-#, fuzzy, c-format
+#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr ""
@@ -8707,7 +8680,6 @@ msgid "fork failed"
msgstr "falha ao invocar fseek"
#: setup.c:1450 t/helper/test-simple-ipc.c:285
-#, fuzzy
msgid "setsid failed"
msgstr ""
@@ -8715,12 +8687,12 @@ msgstr ""
msgid "attempting to use sparse-index without cone mode"
msgstr ""
-#: sparse-index.c:174
+#: sparse-index.c:176
#, fuzzy
msgid "unable to update cache-tree, staying full"
msgstr "incapaz atualizar árvore de cache"
-#: sparse-index.c:261
+#: sparse-index.c:263
#, c-format
msgid "index entry is a directory, but not sparse (%08x)"
msgstr ""
@@ -8874,7 +8846,7 @@ msgstr ""
msgid "process for submodule '%s' failed"
msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
-#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Falha ao resolver HEAD numa referência válida."
@@ -9000,7 +8972,7 @@ msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree retornou código de retorno inesperado %d"
#: symlinks.c:244
-#, fuzzy, c-format
+#, c-format
msgid "failed to lstat '%s'"
msgstr ""
@@ -9085,7 +9057,7 @@ msgid "this remote helper should implement refspec capability"
msgstr ""
#: transport-helper.c:287 transport-helper.c:429
-#, fuzzy, c-format
+#, c-format
msgid "%s unexpectedly said: '%s'"
msgstr ""
@@ -9100,7 +9072,6 @@ msgid "couldn't run fast-import"
msgstr "incapaz executar fast-import"
#: transport-helper.c:520
-#, fuzzy
msgid "error while running fast-import"
msgstr ""
@@ -9119,7 +9090,6 @@ msgid "setting remote service path not supported by protocol"
msgstr ""
#: transport-helper.c:618
-#, fuzzy
msgid "invalid remote service path"
msgstr ""
@@ -9142,7 +9112,7 @@ msgid "'option' without a matching 'ok/error' directive"
msgstr ""
#: transport-helper.c:798
-#, fuzzy, c-format
+#, c-format
msgid "expected ok/error, helper said '%s'"
msgstr ""
@@ -9196,7 +9166,6 @@ msgid "couldn't run fast-export"
msgstr "incapaz executar fast-export"
#: transport-helper.c:1117
-#, fuzzy
msgid "error while running fast-export"
msgstr ""
@@ -9218,22 +9187,22 @@ msgid "malformed response in ref list: %s"
msgstr "resposta em lista de ref malformada: %s"
#: transport-helper.c:1385
-#, fuzzy, c-format
+#, c-format
msgid "read(%s) failed"
msgstr ""
#: transport-helper.c:1412
-#, fuzzy, c-format
+#, c-format
msgid "write(%s) failed"
msgstr ""
#: transport-helper.c:1461
-#, fuzzy, c-format
+#, c-format
msgid "%s thread failed"
msgstr ""
#: transport-helper.c:1465
-#, fuzzy, c-format
+#, c-format
msgid "%s thread failed to join: %s"
msgstr ""
@@ -9248,7 +9217,7 @@ msgid "%s process failed to wait"
msgstr ""
#: transport-helper.c:1529
-#, fuzzy, c-format
+#, c-format
msgid "%s process failed"
msgstr ""
@@ -9622,7 +9591,7 @@ msgstr ""
msgid "Updating index flags"
msgstr "Atualizando flags de cenário"
-#: unpack-trees.c:2707
+#: unpack-trees.c:2718
#, c-format
msgid "worktree and untracked commit have duplicate entries: %s"
msgstr ""
@@ -9710,12 +9679,10 @@ msgid ".git file broken"
msgstr ""
#: worktree.c:616
-#, fuzzy
msgid ".git file incorrect"
msgstr ""
#: worktree.c:722
-#, fuzzy
msgid "not a valid path"
msgstr ""
@@ -9743,7 +9710,6 @@ msgid "gitdir incorrect"
msgstr ""
#: worktree.c:771
-#, fuzzy
msgid "not a valid directory"
msgstr ""
@@ -10349,7 +10315,7 @@ msgid "could not read IPC response"
msgstr "incapaz de ler ref %s"
#: compat/simple-ipc/ipc-unix-socket.c:866
-#, fuzzy, c-format
+#, c-format
msgid "could not start accept_thread '%s'"
msgstr ""
@@ -10435,7 +10401,7 @@ msgstr "simular ação"
msgid "interactive picking"
msgstr "seleção interativa"
-#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "selecionar blocos interativamente"
@@ -10528,17 +10494,14 @@ msgid "adding files failed"
msgstr "falha ao adicionar ficheiros"
#: builtin/add.c:488
-#, fuzzy
msgid "--dry-run is incompatible with --interactive/--patch"
msgstr ""
#: builtin/add.c:490 builtin/commit.c:357
-#, fuzzy
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr ""
#: builtin/add.c:507
-#, fuzzy
msgid "--pathspec-from-file is incompatible with --edit"
msgstr ""
@@ -10555,13 +10518,13 @@ msgstr "A opção --ignore-missing só pode ser usada em conjunto com --dry-run"
msgid "--chmod param '%s' must be either -x or +x"
msgstr "o parâmetro '%s' de --chmod tem de ser -x ou +x"
-#: builtin/add.c:544 builtin/checkout.c:1735 builtin/commit.c:363
+#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
#, fuzzy
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--patch é incompatível com --{hard,mixed,soft}"
-#: builtin/add.c:551 builtin/checkout.c:1747 builtin/commit.c:369
+#: builtin/add.c:551 builtin/checkout.c:1745 builtin/commit.c:369
#: builtin/reset.c:334 builtin/rm.c:279 builtin/stash.c:1639
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr ""
@@ -10793,7 +10756,7 @@ msgid "Invalid value for --show-current-patch: %s"
msgstr "Valor inválido de --patch-format: %s"
#: builtin/am.c:2231
-#, fuzzy, c-format
+#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr ""
@@ -11011,7 +10974,6 @@ msgid "git archive: expected a flush"
msgstr "git archive: esvaziamento de cache (flush) esperado"
#: builtin/bisect--helper.c:23
-#, fuzzy
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr ""
@@ -11036,27 +10998,22 @@ msgid ""
msgstr ""
#: builtin/bisect--helper.c:28
-#, fuzzy
msgid "git bisect--helper --bisect-next"
msgstr ""
#: builtin/bisect--helper.c:29
-#, fuzzy
msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
msgstr ""
#: builtin/bisect--helper.c:30
-#, fuzzy
msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
msgstr ""
#: builtin/bisect--helper.c:31
-#, fuzzy
msgid "git bisect--helper --bisect-replay <filename>"
msgstr ""
#: builtin/bisect--helper.c:32
-#, fuzzy
msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
msgstr ""
@@ -11226,7 +11183,7 @@ msgid "bad HEAD - strange symbolic ref"
msgstr "HEAD incorreta - referência simbólica desconhecida"
#: builtin/bisect--helper.c:757
-#, fuzzy, c-format
+#, c-format
msgid "invalid ref: '%s'"
msgstr ""
@@ -11278,7 +11235,6 @@ msgid "cannot read file '%s' for replaying"
msgstr "incapaz ler $file para reproduzir"
#: builtin/bisect--helper.c:1056
-#, fuzzy
msgid "reset the bisection state"
msgstr ""
@@ -11305,7 +11261,6 @@ msgid "mark the state of ref (or refs)"
msgstr ""
#: builtin/bisect--helper.c:1068
-#, fuzzy
msgid "list the bisection steps so far"
msgstr ""
@@ -11373,7 +11328,6 @@ msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "ignorar cor inválida '%.*s' em log.graphColors"
#: builtin/blame.c:746
-#, fuzzy
msgid "invalid value for blame.coloring"
msgstr ""
@@ -11403,7 +11357,7 @@ msgstr "Tratar commits raiz como limite nenhum (Predefinição: desativado)"
msgid "show work cost statistics"
msgstr "Mostrar estatísticas de custo de atividade"
-#: builtin/blame.c:871 builtin/checkout.c:1524 builtin/clone.c:94
+#: builtin/blame.c:871 builtin/checkout.c:1519 builtin/clone.c:94
#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:179
#: builtin/merge.c:297 builtin/multi-pack-index.c:55 builtin/pull.c:119
#: builtin/push.c:566 builtin/send-pack.c:198
@@ -11477,7 +11431,6 @@ msgid "ignore <rev> when blaming"
msgstr "ignorar o índice ao verificar"
#: builtin/blame.c:884
-#, fuzzy
msgid "ignore revisions from <file>"
msgstr ""
@@ -12231,7 +12184,7 @@ msgstr "ler os nomes dos ficheiros da entrada padrão"
msgid "terminate input and output records by a NUL character"
msgstr "terminar registos da entrada e da saída com um carácter NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
+#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
#: builtin/worktree.c:493
msgid "suppress progress reporting"
msgstr "suprimir informação de progresso"
@@ -12291,9 +12244,10 @@ msgid "git checkout--worker [<options>]"
msgstr "git checkout--worker [<opções>]"
#: builtin/checkout--worker.c:118 builtin/checkout-index.c:201
-#: builtin/column.c:31 builtin/submodule--helper.c:1824
-#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835
-#: builtin/submodule--helper.c:2333 builtin/worktree.c:491
+#: builtin/column.c:31 builtin/submodule--helper.c:1892
+#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:1903
+#: builtin/submodule--helper.c:2350 builtin/submodule--helper.c:2896
+#: builtin/submodule--helper.c:2899 builtin/worktree.c:491
#: builtin/worktree.c:728
msgid "string"
msgstr "cadeia"
@@ -12391,118 +12345,118 @@ msgstr "path '%s': incapaz juntar"
msgid "Unable to add merge result for '%s'"
msgstr "Impossível adicionar o resultado da junção para '%s'"
-#: builtin/checkout.c:414
+#: builtin/checkout.c:411
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:419
+#: builtin/checkout.c:416
#, fuzzy, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "%d caminho atualizado"
msgstr[1] "%d caminhos atualizados"
-#: builtin/checkout.c:426
-#, fuzzy, c-format
+#: builtin/checkout.c:423
+#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
-#: builtin/checkout.c:459
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
+#: builtin/checkout.c:456
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' incapaz ser usado com paths em atualização"
-#: builtin/checkout.c:462 builtin/checkout.c:465
+#: builtin/checkout.c:459 builtin/checkout.c:462
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' incapaz ser usado com %s"
-#: builtin/checkout.c:469
+#: builtin/checkout.c:466
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Incapaz atualizar paths e mudar para ramo '%s' ao mesmo tempo."
-#: builtin/checkout.c:473
+#: builtin/checkout.c:470
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr ""
-#: builtin/checkout.c:477
+#: builtin/checkout.c:474
#, fuzzy, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "'%s' tem de ser usado quando '%s' está por ser especificado"
-#: builtin/checkout.c:482 builtin/checkout.c:487
+#: builtin/checkout.c:479 builtin/checkout.c:484
#, fuzzy, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' ou '%s' impossível ser usado com %s"
-#: builtin/checkout.c:563 builtin/checkout.c:570
+#: builtin/checkout.c:558 builtin/checkout.c:565
#, c-format
msgid "path '%s' is unmerged"
msgstr "path '%s' está por juntar"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:734
msgid "you need to resolve your current index first"
msgstr "primeiro deve resolver o índice atual"
-#: builtin/checkout.c:793
+#: builtin/checkout.c:788
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-#: builtin/checkout.c:886
+#: builtin/checkout.c:881
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Incapaz fazer reflog para '%s': %s\n"
-#: builtin/checkout.c:928
+#: builtin/checkout.c:923
msgid "HEAD is now at"
msgstr "HEAD está agora em"
-#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
msgid "unable to update HEAD"
msgstr "incapaz atualizar HEAD"
-#: builtin/checkout.c:936
+#: builtin/checkout.c:931
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Repor ramo '%s'\n"
-#: builtin/checkout.c:939
+#: builtin/checkout.c:934
#, c-format
msgid "Already on '%s'\n"
msgstr "Já em '%s'\n"
-#: builtin/checkout.c:943
+#: builtin/checkout.c:938
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Mudou para e repôs o ramo '%s'\n"
-#: builtin/checkout.c:945 builtin/checkout.c:1376
+#: builtin/checkout.c:940 builtin/checkout.c:1371
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Mudou para o novo ramo '%s'\n"
-#: builtin/checkout.c:947
+#: builtin/checkout.c:942
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Mudou para o ramo '%s'\n"
-#: builtin/checkout.c:998
+#: builtin/checkout.c:993
#, c-format
msgid " ... and %d more.\n"
msgstr " ... e mais %d.\n"
-#: builtin/checkout.c:1004
+#: builtin/checkout.c:999
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -12525,7 +12479,7 @@ msgstr[1] ""
"\n"
"%s\n"
-#: builtin/checkout.c:1023
+#: builtin/checkout.c:1018
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -12552,26 +12506,26 @@ msgstr[1] ""
" git branch <nome-do-novo-ramo> %s\n"
"\n"
-#: builtin/checkout.c:1058
+#: builtin/checkout.c:1053
msgid "internal error in revision walk"
msgstr "erro interno durante o curso de revisões"
-#: builtin/checkout.c:1062
+#: builtin/checkout.c:1057
msgid "Previous HEAD position was"
msgstr "A posição anterior de HEAD era"
-#: builtin/checkout.c:1102 builtin/checkout.c:1371
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
msgid "You are on a branch yet to be born"
msgstr "Está num ramo ainda por nascer"
-#: builtin/checkout.c:1184
+#: builtin/checkout.c:1179
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/checkout.c:1191
+#: builtin/checkout.c:1186
msgid ""
"If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
"you can do so by fully qualifying the name with the --track option:\n"
@@ -12583,217 +12537,214 @@ msgid ""
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/checkout.c:1201
+#: builtin/checkout.c:1196
#, fuzzy, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "atuar sobre ramos de monitorização remotos"
-#: builtin/checkout.c:1267
+#: builtin/checkout.c:1262
#, fuzzy
msgid "only one reference expected"
msgstr "esperava-se apenas uma referência, %d fornecidas."
-#: builtin/checkout.c:1284
+#: builtin/checkout.c:1279
#, c-format
msgid "only one reference expected, %d given."
msgstr "esperava-se apenas uma referência, %d fornecidas."
-#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436
+#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
#, c-format
msgid "invalid reference: %s"
msgstr "referência inválida: %s"
-#: builtin/checkout.c:1343 builtin/checkout.c:1709
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
#, c-format
msgid "reference is not a tree: %s"
msgstr "referência é árvore nenhuma: %s"
-#: builtin/checkout.c:1390
+#: builtin/checkout.c:1385
#, fuzzy, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "esperado um ramo, recebi tag '%s'"
-#: builtin/checkout.c:1392
+#: builtin/checkout.c:1387
#, fuzzy, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s."
-#: builtin/checkout.c:1393 builtin/checkout.c:1401
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
#, fuzzy, c-format
msgid "a branch is expected, got '%s'"
msgstr "O ramo %s está a ser bissetado em %s"
-#: builtin/checkout.c:1396
+#: builtin/checkout.c:1391
#, fuzzy, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "é suposto um branch, recebi um commit '%s'"
-#: builtin/checkout.c:1412
+#: builtin/checkout.c:1407
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1416
+#: builtin/checkout.c:1411
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1420
+#: builtin/checkout.c:1415
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1424
+#: builtin/checkout.c:1419
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1428
+#: builtin/checkout.c:1423
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1432
+#: builtin/checkout.c:1427
#, fuzzy
msgid "you are switching branch while bisecting"
msgstr "Está a bissetar neste momento."
-#: builtin/checkout.c:1439
+#: builtin/checkout.c:1434
msgid "paths cannot be used with switching branches"
msgstr "incapaz mudar ramo com o uso de paths"
-#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "incapaz de mudar ramo com o uso de '%s'"
-#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
-#: builtin/checkout.c:1465 builtin/checkout.c:1470
+#: builtin/checkout.c:1449 builtin/checkout.c:1452 builtin/checkout.c:1455
+#: builtin/checkout.c:1460 builtin/checkout.c:1465
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' é incapaz de ser usado com '%s'"
-#: builtin/checkout.c:1467
+#: builtin/checkout.c:1462
#, fuzzy, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' incapaz receber <start-point>"
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1470
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Incapaz mudar ramo para '%s', pois está fora de ser um commit"
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1477
#, fuzzy
msgid "missing branch or commit argument"
msgstr "Falta um nome dum ramo; tente -b"
-#: builtin/checkout.c:1525
+#: builtin/checkout.c:1520
msgid "perform a 3-way merge with the new branch"
msgstr "realizar uma integração com 3 pontos com o novo ramo"
-#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1527
+#: builtin/checkout.c:1522
msgid "conflict style (merge or diff3)"
msgstr "estilo de conflito (merge ou diff3)"
-#: builtin/checkout.c:1539 builtin/worktree.c:488
+#: builtin/checkout.c:1534 builtin/worktree.c:488
msgid "detach HEAD at named commit"
msgstr "destacar HEAD no commit indicado"
-#: builtin/checkout.c:1540
+#: builtin/checkout.c:1535
msgid "set upstream info for new branch"
msgstr "definir a informação do ramo a montante do novo ramo"
-#: builtin/checkout.c:1542
+#: builtin/checkout.c:1537
msgid "force checkout (throw away local modifications)"
msgstr "forçar extração (descartar modificações locais)"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1539
msgid "new-branch"
msgstr "novo-ramo"
-#: builtin/checkout.c:1544
+#: builtin/checkout.c:1539
msgid "new unparented branch"
msgstr "novo ramo sem pai"
-#: builtin/checkout.c:1546 builtin/merge.c:301
+#: builtin/checkout.c:1541 builtin/merge.c:301
msgid "update ignored files (default)"
msgstr "atualizar ficheiros ignorados (predefinição)"
-#: builtin/checkout.c:1549
+#: builtin/checkout.c:1544
msgid "do not check if another worktree is holding the given ref"
msgstr "incapaz verificar se outra worktree contém referência dada"
-#: builtin/checkout.c:1562
+#: builtin/checkout.c:1557
msgid "checkout our version for unmerged files"
msgstr "checkout a nossa versão dos ficheiros por juntar"
-#: builtin/checkout.c:1565
+#: builtin/checkout.c:1560
msgid "checkout their version for unmerged files"
msgstr "checkout a versão deles dos ficheiros por juntar"
-#: builtin/checkout.c:1569
+#: builtin/checkout.c:1564
msgid "do not limit pathspecs to sparse entries only"
msgstr "abrange especificadores de path além de entradas dispersas"
-#: builtin/checkout.c:1624
-#, fuzzy, c-format
+#: builtin/checkout.c:1622
+#, c-format
msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1628
-#, fuzzy
+#: builtin/checkout.c:1626
msgid "-p and --overlay are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1663
msgid "--track needs a branch name"
msgstr "--track requer um nome dum ramo"
-#: builtin/checkout.c:1670
+#: builtin/checkout.c:1668
#, fuzzy, c-format
msgid "missing branch name; try -%c"
msgstr "Falta um nome dum ramo; tente -b"
-#: builtin/checkout.c:1702
+#: builtin/checkout.c:1700
#, fuzzy, c-format
msgid "could not resolve %s"
msgstr "incapaz resolver %s"
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1716
msgid "invalid path specification"
msgstr "especificação de caminho inválida"
-#: builtin/checkout.c:1725
+#: builtin/checkout.c:1723
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1727
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach recusa path '%s' como argumento"
-#: builtin/checkout.c:1738
-#, fuzzy
+#: builtin/checkout.c:1736
msgid "--pathspec-from-file is incompatible with --detach"
msgstr ""
-#: builtin/checkout.c:1741 builtin/reset.c:325 builtin/stash.c:1630
-#, fuzzy
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
msgid "--pathspec-from-file is incompatible with --patch"
msgstr ""
-#: builtin/checkout.c:1754
+#: builtin/checkout.c:1752
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -12801,80 +12752,80 @@ msgstr ""
"git checkout: --ours/--theirs, --force e --merge são incompatíveis\n"
"durante a extração do índice."
-#: builtin/checkout.c:1759
+#: builtin/checkout.c:1757
#, fuzzy
msgid "you must specify path(s) to restore"
msgstr "Deve especificar um diretório."
-#: builtin/checkout.c:1785 builtin/checkout.c:1787 builtin/checkout.c:1836
-#: builtin/checkout.c:1838 builtin/clone.c:126 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:484
+#: builtin/checkout.c:1783 builtin/checkout.c:1785 builtin/checkout.c:1834
+#: builtin/checkout.c:1836 builtin/clone.c:126 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2736
+#: builtin/submodule--helper.c:2887 builtin/worktree.c:484
#: builtin/worktree.c:486
msgid "branch"
msgstr "ramo"
-#: builtin/checkout.c:1786
+#: builtin/checkout.c:1784
msgid "create and checkout a new branch"
msgstr "criar e extrair um novo ramo"
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1786
msgid "create/reset and checkout a branch"
msgstr "criar/repor e extrair um ramo"
-#: builtin/checkout.c:1789
+#: builtin/checkout.c:1787
msgid "create reflog for new branch"
msgstr "criar reflog do novo ramo"
-#: builtin/checkout.c:1791
+#: builtin/checkout.c:1789
#, fuzzy
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
-#: builtin/checkout.c:1792
-#, fuzzy
+#: builtin/checkout.c:1790
msgid "use overlay mode (default)"
msgstr ""
-#: builtin/checkout.c:1837
+#: builtin/checkout.c:1835
#, fuzzy
msgid "create and switch to a new branch"
msgstr "criar e extrair um novo ramo"
-#: builtin/checkout.c:1839
+#: builtin/checkout.c:1837
#, fuzzy
msgid "create/reset and switch to a branch"
msgstr "criar/repor e extrair um ramo"
-#: builtin/checkout.c:1841
+#: builtin/checkout.c:1839
#, fuzzy
msgid "second guess 'git switch <no-such-branch>'"
msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
-#: builtin/checkout.c:1843
+#: builtin/checkout.c:1841
#, fuzzy
msgid "throw away local modifications"
msgstr "forçar extração (descartar modificações locais)"
-#: builtin/checkout.c:1877
+#: builtin/checkout.c:1875
msgid "which tree-ish to checkout from"
msgstr ""
-#: builtin/checkout.c:1879
+#: builtin/checkout.c:1877
#, fuzzy
msgid "restore the index"
msgstr "restaurar o cenário"
-#: builtin/checkout.c:1881
+#: builtin/checkout.c:1879
#, fuzzy
msgid "restore the working tree (default)"
msgstr "Mostrar o estado da árvores de trabalho"
-#: builtin/checkout.c:1883
+#: builtin/checkout.c:1881
#, fuzzy
msgid "ignore unmerged entries"
msgstr "ignora unmerged entries"
-#: builtin/checkout.c:1884
+#: builtin/checkout.c:1882
msgid "use overlay mode"
msgstr ""
@@ -13105,13 +13056,13 @@ msgstr "diretório-modelo"
msgid "directory from which templates will be used"
msgstr "diretório que contém os modelos usados"
-#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831
-#: builtin/submodule--helper.c:2336
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1899
+#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
msgid "reference repository"
msgstr "repositório de referência"
-#: builtin/clone.c:123 builtin/submodule--helper.c:1833
-#: builtin/submodule--helper.c:2338
+#: builtin/clone.c:123 builtin/submodule--helper.c:1901
+#: builtin/submodule--helper.c:2355 builtin/submodule--helper.c:2905
msgid "use --reference only while cloning"
msgstr "usar --reference apenas para clonar"
@@ -13160,8 +13111,8 @@ msgstr "revisão"
msgid "deepen history of shallow clone, excluding rev"
msgstr "aprofundar o histórico de um clone raso, excluindo a revisão"
-#: builtin/clone.c:137 builtin/submodule--helper.c:1843
-#: builtin/submodule--helper.c:2352
+#: builtin/clone.c:137 builtin/submodule--helper.c:1911
+#: builtin/submodule--helper.c:2369
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar apenas um ramo, HEAD ou --branch"
@@ -13504,7 +13455,7 @@ msgid "unexpected non-hex object ID: %s"
msgstr "reutilizar o objeto de nota especificado"
#: builtin/commit-graph.c:160
-#, fuzzy, c-format
+#, c-format
msgid "invalid object: %s"
msgstr ""
@@ -13574,17 +13525,17 @@ msgid "not a valid object name %s"
msgstr "nome de objeto inválido %s"
#: builtin/commit-tree.c:93
-#, fuzzy, c-format
+#, c-format
msgid "git commit-tree: failed to open '%s'"
msgstr ""
#: builtin/commit-tree.c:96
-#, fuzzy, c-format
+#, c-format
msgid "git commit-tree: failed to read '%s'"
msgstr ""
#: builtin/commit-tree.c:98
-#, fuzzy, c-format
+#, c-format
msgid "git commit-tree: failed to close '%s'"
msgstr ""
@@ -13594,7 +13545,6 @@ msgid "parent"
msgstr "número-pai"
#: builtin/commit-tree.c:112
-#, fuzzy
msgid "id of a parent commit object"
msgstr ""
@@ -13609,7 +13559,6 @@ msgid "commit message"
msgstr "mensagem de commit"
#: builtin/commit-tree.c:118
-#, fuzzy
msgid "read commit log message from file"
msgstr ""
@@ -13619,12 +13568,10 @@ msgid "GPG sign commit"
msgstr "assinar o commit com GPG"
#: builtin/commit-tree.c:133
-#, fuzzy
msgid "must give exactly one tree"
msgstr ""
#: builtin/commit-tree.c:140
-#, fuzzy
msgid "git commit-tree: failed to read"
msgstr ""
@@ -14221,36 +14168,36 @@ msgstr "aceitar o registo duma alteração vazia"
msgid "ok to record a change with an empty message"
msgstr "aceitar o registo duma alteração com uma mensagem vazia"
-#: builtin/commit.c:1747
+#: builtin/commit.c:1750
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Ficheiro MERGE_HEAD roto (%s)"
-#: builtin/commit.c:1754
+#: builtin/commit.c:1757
msgid "could not read MERGE_MODE"
msgstr "incapaz ler MERGE_MODE"
-#: builtin/commit.c:1775
+#: builtin/commit.c:1778
#, c-format
msgid "could not read commit message: %s"
msgstr "incapaz ler mensagem de commit: %s"
-#: builtin/commit.c:1782
+#: builtin/commit.c:1785
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
-#: builtin/commit.c:1787
+#: builtin/commit.c:1790
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abortando commit; mensagem ficou por editar.\n"
-#: builtin/commit.c:1798
+#: builtin/commit.c:1801
#, fuzzy, c-format
msgid "Aborting commit due to empty commit message body.\n"
msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
-#: builtin/commit.c:1834
+#: builtin/commit.c:1837
#, fuzzy
msgid ""
"repository has been updated, but unable to write\n"
@@ -14292,7 +14239,6 @@ msgid "use repository config file"
msgstr ""
#: builtin/config.c:134
-#, fuzzy
msgid "use per-worktree config file"
msgstr ""
@@ -14463,7 +14409,7 @@ msgid "invalid key pattern: %s"
msgstr "chave inválida: %s"
#: builtin/config.c:377
-#, fuzzy, c-format
+#, c-format
msgid "failed to format default config value: %s"
msgstr ""
@@ -14511,12 +14457,10 @@ msgid "only one config file at a time"
msgstr ""
#: builtin/config.c:658
-#, fuzzy
msgid "--local can only be used inside a git repository"
msgstr ""
#: builtin/config.c:660
-#, fuzzy
msgid "--blob can only be used inside a git repository"
msgstr ""
@@ -14568,7 +14512,6 @@ msgid "unable to read config file '%s'"
msgstr "incapaz ler ficheiro config '%s'"
#: builtin/config.c:825
-#, fuzzy
msgid "error processing config file(s)"
msgstr ""
@@ -14809,7 +14752,6 @@ msgid "--broken is incompatible with commit-ishes"
msgstr "--broken é incompatível com commits ou semelhantes"
#: builtin/diff-tree.c:155
-#, fuzzy
msgid "--stdin and --merge-base are mutually exclusive"
msgstr ""
@@ -14962,7 +14904,6 @@ msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff é incompatível com --no-index"
#: builtin/difftool.c:744
-#, fuzzy
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr ""
@@ -15109,12 +15050,12 @@ msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr ""
#: builtin/fast-import.c:3088
-#, fuzzy, c-format
+#, c-format
msgid "Missing from marks for submodule '%s'"
msgstr ""
#: builtin/fast-import.c:3090
-#, fuzzy, c-format
+#, c-format
msgid "Missing to marks for submodule '%s'"
msgstr ""
@@ -15443,7 +15384,6 @@ msgid "not setting upstream for a remote remote-tracking branch"
msgstr "desdefinindo upstream para remoto de ramo de monitorização remoto"
#: builtin/fetch.c:1635
-#, fuzzy
msgid "not setting upstream for a remote tag"
msgstr ""
@@ -15537,12 +15477,10 @@ msgid ""
msgstr ""
#: builtin/fetch.c:2086
-#, fuzzy
msgid "--atomic can only be used when fetching from one remote"
msgstr ""
#: builtin/fetch.c:2090
-#, fuzzy
msgid "--stdin can only be used when fetching from one remote"
msgstr ""
@@ -15642,15 +15580,15 @@ msgstr "imprimir apenas refs que contenham outros commits"
msgid "git for-each-repo --config=<config> <command-args>"
msgstr ""
-#: builtin/for-each-repo.c:37
+#: builtin/for-each-repo.c:34
msgid "config"
msgstr ""
-#: builtin/for-each-repo.c:38
+#: builtin/for-each-repo.c:35
msgid "config key storing a list of repository paths"
msgstr ""
-#: builtin/for-each-repo.c:46
+#: builtin/for-each-repo.c:43
msgid "missing --config=<config>"
msgstr ""
@@ -15689,7 +15627,7 @@ msgid ""
msgstr ""
#: builtin/fsck.c:264
-#, fuzzy, c-format
+#, c-format
msgid "missing %s %s"
msgstr ""
@@ -15748,7 +15686,7 @@ msgid "%s: object corrupt or missing"
msgstr ""
#: builtin/fsck.c:482
-#, fuzzy, c-format
+#, c-format
msgid "%s: invalid reflog entry %s"
msgstr ""
@@ -15822,7 +15760,6 @@ msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
#: builtin/fsck.c:706
-#, fuzzy
msgid "Checking cache tree"
msgstr ""
@@ -15911,7 +15848,7 @@ msgid "Failed to fstat %s: %s"
msgstr "falha ao invocar fstat sobre %s: %s"
#: builtin/gc.c:129
-#, fuzzy, c-format
+#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr ""
@@ -16015,12 +15952,10 @@ msgid "unrecognized --schedule argument '%s'"
msgstr "argumento --schedule desconhecido: '%s'"
#: builtin/gc.c:869
-#, fuzzy
msgid "failed to write commit-graph"
msgstr ""
#: builtin/gc.c:905
-#, fuzzy
msgid "failed to prefetch remotes"
msgstr ""
@@ -16035,7 +15970,6 @@ msgid "failed to finish 'git pack-objects' process"
msgstr "terminar processo 'git pack-objects' falhou"
#: builtin/gc.c:1091
-#, fuzzy
msgid "failed to write multi-pack-index"
msgstr ""
@@ -16044,7 +15978,6 @@ msgid "'git multi-pack-index expire' failed"
msgstr ""
#: builtin/gc.c:1170
-#, fuzzy
msgid "'git multi-pack-index repack' failed"
msgstr ""
@@ -16128,12 +16061,10 @@ msgid "failed to bootstrap service %s"
msgstr "bootstrap serviços %s falhou"
#: builtin/gc.c:1745
-#, fuzzy
msgid "failed to create temp xml file"
msgstr ""
#: builtin/gc.c:1835
-#, fuzzy
msgid "failed to start schtasks"
msgstr ""
@@ -16146,7 +16077,6 @@ msgid "failed to run 'crontab'; your system might not support 'cron'"
msgstr ""
#: builtin/gc.c:1900
-#, fuzzy
msgid "failed to open stdin of 'crontab'"
msgstr ""
@@ -16159,7 +16089,6 @@ msgid "another process is scheduling background maintenance"
msgstr ""
#: builtin/gc.c:2000
-#, fuzzy
msgid "failed to add repo to global config"
msgstr ""
@@ -16257,7 +16186,6 @@ msgid "process binary files with textconv filters"
msgstr "processar ficheiros binários com filtros textconv"
#: builtin/grep.c:861
-#, fuzzy
msgid "search in subdirectories (default)"
msgstr ""
@@ -16738,7 +16666,6 @@ msgid "invalid blob object %s"
msgstr "objeto blob inválido %s"
#: builtin/index-pack.c:848 builtin/index-pack.c:867
-#, fuzzy
msgid "fsck error in packed object"
msgstr ""
@@ -16884,7 +16811,7 @@ msgid "bad %s"
msgstr "%s incorreto"
#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
-#, fuzzy, c-format
+#, c-format
msgid "unknown hash algorithm '%s'"
msgstr ""
@@ -17030,7 +16957,6 @@ msgid "specify the hash algorithm to use"
msgstr ""
#: builtin/init-db.c:560
-#, fuzzy
msgid "--separate-git-dir and --bare are mutually exclusive"
msgstr ""
@@ -17211,7 +17137,6 @@ msgid "cannot open patch file %s"
msgstr "incapaz abrir ficheiro patch %s"
#: builtin/log.c:999
-#, fuzzy
msgid "need exactly one range"
msgstr ""
@@ -17226,7 +17151,6 @@ msgid "cover letter needs email format"
msgstr "A carta de apresentação precisa de um formato de e-mail"
#: builtin/log.c:1179
-#, fuzzy
msgid "failed to create cover-letter file"
msgstr ""
@@ -17515,7 +17439,6 @@ msgid "--check does not make sense"
msgstr "--check faz sentido nenhum"
#: builtin/log.c:1967
-#, fuzzy
msgid "--stdout, --output, and --output-directory are mutually exclusive"
msgstr ""
@@ -17560,7 +17483,6 @@ msgid "Generating patches"
msgstr "falha ao editar patch"
#: builtin/log.c:2204
-#, fuzzy
msgid "failed to create output files"
msgstr ""
@@ -18091,37 +18013,37 @@ msgstr "Mensagem de junção nenhuma -- deixar HEAD por atualizar\n"
msgid "'%s' does not point to a commit"
msgstr "'%s' aponta para commit nenhum"
-#: builtin/merge.c:602
+#: builtin/merge.c:603
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
-#: builtin/merge.c:728
+#: builtin/merge.c:729
msgid "Not handling anything other than two heads merge."
msgstr "Lidando nada além da junção de duas heads."
-#: builtin/merge.c:741
+#: builtin/merge.c:742
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opção desconhecida de merge-recursive: -X%s"
-#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
#, c-format
msgid "unable to write %s"
msgstr "incapaz escrever %s"
-#: builtin/merge.c:812
+#: builtin/merge.c:813
#, c-format
msgid "Could not read from '%s'"
msgstr "Incapaz ler de '%s'"
-#: builtin/merge.c:821
+#: builtin/merge.c:822
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Usa 'git commit' para completar a junção. Committando junção nenhuma.\n"
-#: builtin/merge.c:827
+#: builtin/merge.c:828
#, fuzzy
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -18133,12 +18055,12 @@ msgstr ""
"branch.\n"
"\n"
-#: builtin/merge.c:832
+#: builtin/merge.c:833
#, fuzzy
msgid "An empty message aborts the commit.\n"
msgstr "Uma mensagem vazia aborta o commit.\n"
-#: builtin/merge.c:835
+#: builtin/merge.c:836
#, fuzzy, c-format
msgid ""
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -18147,75 +18069,75 @@ msgstr ""
"Linhas começadas com '%c' são ignoradas, e uma messagem vazia aborta\n"
"o commit.\n"
-#: builtin/merge.c:888
+#: builtin/merge.c:889
msgid "Empty commit message."
msgstr "Mensagem commit vazia."
-#: builtin/merge.c:903
+#: builtin/merge.c:904
#, c-format
msgid "Wonderful.\n"
msgstr "Maravilhoso.\n"
-#: builtin/merge.c:964
+#: builtin/merge.c:965
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Merge automático falhou; resolve os conflitos e depois podes commitar o "
"resultado.\n"
-#: builtin/merge.c:1003
+#: builtin/merge.c:1004
msgid "No current branch."
msgstr "Nenhum ramo atual."
-#: builtin/merge.c:1005
+#: builtin/merge.c:1006
msgid "No remote for the current branch."
msgstr "Ŕamo atual de remoto nenhum."
-#: builtin/merge.c:1007
+#: builtin/merge.c:1008
msgid "No default upstream defined for the current branch."
msgstr "Ramo atual sem upstream default definido."
-#: builtin/merge.c:1012
+#: builtin/merge.c:1013
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Nenhum ramo de monitorização remoto seguido por %s de %s"
-#: builtin/merge.c:1069
+#: builtin/merge.c:1070
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Valor '%s' incorreto no ambiente '%s'"
-#: builtin/merge.c:1172
+#: builtin/merge.c:1173
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "podemos juntar em %s nenhum(a): %s"
-#: builtin/merge.c:1206
+#: builtin/merge.c:1207
msgid "not something we can merge"
msgstr "podemos juntar nada"
-#: builtin/merge.c:1316
+#: builtin/merge.c:1317
msgid "--abort expects no arguments"
msgstr "--abort supõe argumento nenhum"
-#: builtin/merge.c:1320
+#: builtin/merge.c:1321
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Há junção nenhuma para abortar (MERGE_HEAD faltando)."
-#: builtin/merge.c:1338
+#: builtin/merge.c:1339
#, fuzzy
msgid "--quit expects no arguments"
msgstr "--abort supõe argumento nenhum"
-#: builtin/merge.c:1351
+#: builtin/merge.c:1352
msgid "--continue expects no arguments"
msgstr "--continue supõe argumento nenhum"
-#: builtin/merge.c:1355
+#: builtin/merge.c:1356
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Há junção nenhuma em curso (MERGE_HEAD faltando)."
-#: builtin/merge.c:1371
+#: builtin/merge.c:1372
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18223,7 +18145,7 @@ msgstr ""
"Junção está por concluir (MERGE_HEAD existe).\n"
"Por favor, faz commit das tuas alterações antes de juntar."
-#: builtin/merge.c:1378
+#: builtin/merge.c:1379
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -18231,89 +18153,89 @@ msgstr ""
"Cherry-pick por concluir (existe CHERRY_PICK_HEAD).\n"
"Por favor, memorize suas alterações antes de juntar."
-#: builtin/merge.c:1381
+#: builtin/merge.c:1382
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Cherry-pick por concluir (existe CHERRY_PICK_HEAD)."
-#: builtin/merge.c:1395
+#: builtin/merge.c:1396
msgid "You cannot combine --squash with --no-ff."
msgstr "Impossível combinar --squash com --no-ff."
-#: builtin/merge.c:1397
+#: builtin/merge.c:1398
#, fuzzy
msgid "You cannot combine --squash with --commit."
msgstr "Impossível combinar --squash com --commit."
-#: builtin/merge.c:1413
+#: builtin/merge.c:1414
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Especificado commit nenhum e merge.defaultToUpstream indefinido."
-#: builtin/merge.c:1430
+#: builtin/merge.c:1431
msgid "Squash commit into empty head not supported yet"
msgstr "Esmagar commit para uma cabeça vazia por enquanto tem suporte nenhum"
-#: builtin/merge.c:1432
+#: builtin/merge.c:1433
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Non-fast-forward commit para uma cabeça vazia faz sentido nenhum"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1438
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nada que se pode juntar"
-#: builtin/merge.c:1439
+#: builtin/merge.c:1440
msgid "Can merge only exactly one commit into empty head"
msgstr "Só se pode integrar exatamente um commit numa cabeça vazia"
-#: builtin/merge.c:1520
+#: builtin/merge.c:1521
msgid "refusing to merge unrelated histories"
msgstr "recusando juntar históricos diferentes"
-#: builtin/merge.c:1539
+#: builtin/merge.c:1540
#, c-format
msgid "Updating %s..%s\n"
msgstr "Atualizando %s..%s\n"
-#: builtin/merge.c:1585
+#: builtin/merge.c:1587
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "A tentar integração mesmo trivial no interior do índice...\n"
-#: builtin/merge.c:1592
+#: builtin/merge.c:1594
#, c-format
msgid "Nope.\n"
msgstr "Nada.\n"
-#: builtin/merge.c:1623
+#: builtin/merge.c:1625
msgid "Not possible to fast-forward, aborting."
msgstr "Impossível fazer fast-forward, abortando."
-#: builtin/merge.c:1651 builtin/merge.c:1716
+#: builtin/merge.c:1653 builtin/merge.c:1719
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Recuando a árvore para estado pristino...\n"
-#: builtin/merge.c:1655
+#: builtin/merge.c:1657
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Tentando estratégia merge %s...\n"
-#: builtin/merge.c:1707
+#: builtin/merge.c:1709
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "A junção lidou com estratégia de junção nenhuma.\n"
-#: builtin/merge.c:1709
+#: builtin/merge.c:1711
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Falha ao integrar com a estratégia %s.\n"
-#: builtin/merge.c:1718
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
+#: builtin/merge.c:1721
+#, fuzzy, c-format
+msgid "Using the %s strategy to prepare resolving by hand.\n"
msgstr "A usar %s para preparar resolução manual.\n"
-#: builtin/merge.c:1732
+#: builtin/merge.c:1735
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "Merge automática correu bem; parei antes de commitar como pedido\n"
@@ -18747,7 +18669,6 @@ msgstr "foi recusado efetuar %s de notas em %s (fora de refs/notes/)"
#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
#: builtin/prune-packed.c:25 builtin/tag.c:586
-#, fuzzy
msgid "too many arguments"
msgstr ""
@@ -18808,7 +18729,6 @@ msgid "load rewriting config for <command> (implies --stdin)"
msgstr "carregar configuração de reescrita do <comando> (implica --stdin)"
#: builtin/notes.c:517
-#, fuzzy
msgid "too few arguments"
msgstr ""
@@ -18999,12 +18919,12 @@ msgid ""
msgstr ""
#: builtin/pack-objects.c:580
-#, fuzzy, c-format
+#, c-format
msgid "bad packed object CRC for %s"
msgstr ""
#: builtin/pack-objects.c:591
-#, fuzzy, c-format
+#, c-format
msgid "corrupt packed object for %s"
msgstr ""
@@ -19050,7 +18970,7 @@ msgstr ""
"compactados"
#: builtin/pack-objects.c:1971
-#, fuzzy, c-format
+#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
@@ -19139,7 +19059,6 @@ msgid ""
msgstr ""
#: builtin/pack-objects.c:3482
-#, fuzzy
msgid "invalid value for --missing"
msgstr ""
@@ -19259,7 +19178,6 @@ msgid "include objects referred to by the index"
msgstr "incluir objetos referenciados pelo índice"
#: builtin/pack-objects.c:3955
-#, fuzzy
msgid "read packs from stdin"
msgstr ""
@@ -19393,7 +19311,6 @@ msgid "cannot use internal rev list with --stdin-packs"
msgstr "incapaz especificar pathnames com --stdin"
#: builtin/pack-objects.c:4175
-#, fuzzy
msgid "Enumerating objects"
msgstr ""
@@ -20174,7 +20091,6 @@ msgid "skip commit"
msgstr "commit"
#: builtin/rebase.c:512
-#, fuzzy
msgid "edit the todo list"
msgstr ""
@@ -20279,7 +20195,6 @@ msgid "cmd"
msgstr "comando"
#: builtin/rebase.c:547
-#, fuzzy
msgid "the command to run"
msgstr ""
@@ -20431,7 +20346,6 @@ msgid "passed to 'git apply'"
msgstr "passado para 'git apply'"
#: builtin/rebase.c:1345
-#, fuzzy
msgid "ignore changes in whitespace"
msgstr ""
@@ -20608,7 +20522,6 @@ msgstr ""
"de valor aí.\n"
#: builtin/rebase.c:1648
-#, fuzzy
msgid "switch `C' expects a numerical value"
msgstr ""
@@ -20626,7 +20539,7 @@ msgid "cannot combine apply options with merge options"
msgstr ""
#: builtin/rebase.c:1772
-#, fuzzy, c-format
+#, c-format
msgid "Unknown rebase backend: %s"
msgstr ""
@@ -20644,7 +20557,7 @@ msgid ""
msgstr ""
#: builtin/rebase.c:1850
-#, fuzzy, c-format
+#, c-format
msgid "invalid upstream '%s'"
msgstr ""
@@ -20659,7 +20572,7 @@ msgid "'%s': need exactly one merge base with branch"
msgstr ""
#: builtin/rebase.c:1885
-#, fuzzy, c-format
+#, c-format
msgid "'%s': need exactly one merge base"
msgstr ""
@@ -20674,7 +20587,7 @@ msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: nenhum ramo/commit '%s'"
#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
-#: builtin/submodule--helper.c:2414
+#: builtin/submodule--helper.c:2431
#, c-format
msgid "No such ref: %s"
msgstr "Referência inexistente: %s"
@@ -20827,7 +20740,7 @@ msgid "'%s' is not a valid timestamp"
msgstr "'%s' é um carimbo de data/hora inválido"
#: builtin/reflog.c:609
-#, fuzzy, c-format
+#, c-format
msgid "Marking reachable objects..."
msgstr ""
@@ -21502,7 +21415,6 @@ msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable e -A são incompatíveis"
#: builtin/repack.c:527
-#, fuzzy
msgid "--geometric is incompatible with -A, -a"
msgstr ""
@@ -21511,7 +21423,7 @@ msgid "Nothing new to pack."
msgstr ""
#: builtin/repack.c:669
-#, fuzzy, c-format
+#, c-format
msgid "missing required file: %s"
msgstr ""
@@ -21741,12 +21653,10 @@ msgid "--format cannot be used when not listing"
msgstr "--format apenas pode ser usado quando faz listagem"
#: builtin/replace.c:577
-#, fuzzy
msgid "-f only makes sense when writing a replacement"
msgstr ""
#: builtin/replace.c:581
-#, fuzzy
msgid "--raw only makes sense with --edit"
msgstr ""
@@ -21759,7 +21669,6 @@ msgid "bad number of arguments"
msgstr ""
#: builtin/replace.c:599
-#, fuzzy
msgid "-e needs exactly one argument"
msgstr ""
@@ -21952,7 +21861,6 @@ msgid "rev-list does not support display of notes"
msgstr "rev-list insustenta mostrar notas"
#: builtin/rev-list.c:679
-#, fuzzy
msgid "marked counting is incompatible with --objects"
msgstr ""
@@ -22068,7 +21976,7 @@ msgid "git cherry-pick <subcommand>"
msgstr "git cherry-pick <subcommando>"
#: builtin/revert.c:72
-#, fuzzy, c-format
+#, c-format
msgid "option `%s' expects a number greater than zero"
msgstr ""
@@ -22090,7 +21998,6 @@ msgid "cancel revert or cherry-pick sequence"
msgstr "cancelar reversão ou cherry-pick"
#: builtin/revert.c:105
-#, fuzzy
msgid "skip current commit and continue"
msgstr ""
@@ -22313,7 +22220,6 @@ msgid "group by field"
msgstr ""
#: builtin/shortlog.c:391
-#, fuzzy
msgid "too many arguments given outside repository"
msgstr ""
@@ -22546,7 +22452,6 @@ msgid "toggle the use of a sparse index"
msgstr ""
#: builtin/sparse-checkout.c:340
-#, fuzzy
msgid "failed to modify sparse-index config"
msgstr ""
@@ -22555,39 +22460,38 @@ msgstr ""
msgid "failed to open '%s'"
msgstr "falha ao abrir '%s'"
-#: builtin/sparse-checkout.c:419
+#: builtin/sparse-checkout.c:413
#, fuzzy, c-format
msgid "could not normalize path %s"
msgstr "incapaz normalizar patch %s"
-#: builtin/sparse-checkout.c:431
+#: builtin/sparse-checkout.c:425
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr ""
-#: builtin/sparse-checkout.c:456
+#: builtin/sparse-checkout.c:450
#, fuzzy, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "incapaz de unquote string de C-style '%s'"
-#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
+#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
msgid "unable to load existing sparse-checkout patterns"
msgstr ""
-#: builtin/sparse-checkout.c:579
-#, fuzzy
+#: builtin/sparse-checkout.c:573
msgid "read patterns from standard in"
msgstr ""
-#: builtin/sparse-checkout.c:594
+#: builtin/sparse-checkout.c:588
msgid "git sparse-checkout reapply"
msgstr ""
-#: builtin/sparse-checkout.c:613
+#: builtin/sparse-checkout.c:607
#, fuzzy
msgid "git sparse-checkout disable"
msgstr "ignorar a aplicação do filtro de extração esparsa"
-#: builtin/sparse-checkout.c:644
+#: builtin/sparse-checkout.c:638
#, fuzzy
msgid "error while refreshing working directory"
msgstr "erro enquanto refrescava pasta de trabalho"
@@ -22716,7 +22620,6 @@ msgid "Index was not unstashed."
msgstr "Index está por despreparar."
#: builtin/stash.c:591 builtin/stash.c:689
-#, fuzzy
msgid "attempt to recreate the index"
msgstr ""
@@ -22878,7 +22781,7 @@ msgstr ""
msgid "prepend comment character and space to each line"
msgstr "preceder cada linha com um carácter de comentário e um espaço"
-#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Esperava-se um nome completo de uma referência, obteve-se %s"
@@ -22892,33 +22795,34 @@ msgstr ""
msgid "cannot strip one component off url '%s'"
msgstr "incapaz despir um componente a partir do url '%s'"
-#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
+#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2891
msgid "alternative anchor for relative paths"
msgstr "âncora alternativa para caminhos relativos"
-#: builtin/submodule--helper.c:414
+#: builtin/submodule--helper.c:416
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:652
+#: builtin/submodule--helper.c:474 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:654
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules"
-#: builtin/submodule--helper.c:524
+#: builtin/submodule--helper.c:526
#, fuzzy, c-format
msgid "Entering '%s'\n"
msgstr "Entrando em '%s'\n"
-#: builtin/submodule--helper.c:527
+#: builtin/submodule--helper.c:529
#, c-format
msgid ""
"run_command returned non-zero status for %s\n"
"."
msgstr ""
-#: builtin/submodule--helper.c:549
+#: builtin/submodule--helper.c:551
#, c-format
msgid ""
"run_command returned non-zero status while recursing in the nested "
@@ -22926,22 +22830,21 @@ msgid ""
"."
msgstr ""
-#: builtin/submodule--helper.c:565
-#, fuzzy
+#: builtin/submodule--helper.c:567
msgid "suppress output of entering each submodule command"
msgstr ""
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
-#: builtin/submodule--helper.c:1487
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:1489
#, fuzzy
msgid "recurse into nested submodules"
msgstr "percorrer recursivamente submódulos aninhados"
-#: builtin/submodule--helper.c:572
+#: builtin/submodule--helper.c:574
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr ""
-#: builtin/submodule--helper.c:599
+#: builtin/submodule--helper.c:601
#, fuzzy, c-format
msgid ""
"could not look up configuration '%s'. Assuming this repository is its own "
@@ -22950,163 +22853,155 @@ msgstr ""
"incapaz encontrar configuração '%s'. Assumindo que este repositório é o "
"próprio repositório upstream autoritário."
-#: builtin/submodule--helper.c:666
+#: builtin/submodule--helper.c:668
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:670
+#: builtin/submodule--helper.c:672
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submódulo '%s' (%s) registado para path '%s'\n"
-#: builtin/submodule--helper.c:680
+#: builtin/submodule--helper.c:682
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "aviso: modo command update sugerido para submódulo '%s'\n"
-#: builtin/submodule--helper.c:687
+#: builtin/submodule--helper.c:689
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:709
-#, fuzzy
+#: builtin/submodule--helper.c:711
msgid "suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:714
-#, fuzzy
+#: builtin/submodule--helper.c:716
msgid "git submodule--helper init [<options>] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"para path '%s' encontrei em .gitmodules, mapeamento de submódulo nenhum"
-#: builtin/submodule--helper.c:835
+#: builtin/submodule--helper.c:837
#, fuzzy, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "incapaz resolver ref HEAD dentro de submódulo '%s'"
-#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
#, fuzzy, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"
-#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
#, fuzzy
msgid "suppress submodule status output"
msgstr "preceder isto ao caminho do submódulo"
-#: builtin/submodule--helper.c:887
-#, fuzzy
+#: builtin/submodule--helper.c:889
msgid ""
"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-#: builtin/submodule--helper.c:893
+#: builtin/submodule--helper.c:895
#, fuzzy
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:917
+#: builtin/submodule--helper.c:919
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <caminho>"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:991
#, c-format
msgid "* %s %s(blob)->%s(submodule)"
msgstr ""
-#: builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:994
#, c-format
msgid "* %s %s(submodule)->%s(blob)"
msgstr ""
-#: builtin/submodule--helper.c:1005
+#: builtin/submodule--helper.c:1007
#, fuzzy, c-format
msgid "%s"
msgstr "[%s]"
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1057
#, fuzzy, c-format
msgid "couldn't hash object from '%s'"
msgstr "incapaz fazer hash a objeto a partir de '%s'"
-#: builtin/submodule--helper.c:1059
+#: builtin/submodule--helper.c:1061
#, fuzzy, c-format
msgid "unexpected mode %o\n"
msgstr "modo inesperado %o\n"
-#: builtin/submodule--helper.c:1300
-#, fuzzy
+#: builtin/submodule--helper.c:1302
msgid "use the commit stored in the index instead of the submodule HEAD"
msgstr ""
-#: builtin/submodule--helper.c:1302
+#: builtin/submodule--helper.c:1304
#, fuzzy
msgid "compare the commit in the index with that in the submodule HEAD"
msgstr "compara a memória no arquivador com aquela no submódulo HEAD"
-#: builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1306
msgid "skip submodules with 'ignore_config' value set to 'all'"
msgstr ""
-#: builtin/submodule--helper.c:1306
+#: builtin/submodule--helper.c:1308
#, fuzzy
msgid "limit the summary size"
msgstr "restringir-se a cabeças"
-#: builtin/submodule--helper.c:1311
-#, fuzzy
+#: builtin/submodule--helper.c:1313
msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1335
+#: builtin/submodule--helper.c:1337
#, fuzzy
msgid "could not fetch a revision for HEAD"
msgstr "incapaz buscar uma revisão para HEAD"
-#: builtin/submodule--helper.c:1340
-#, fuzzy
+#: builtin/submodule--helper.c:1342
msgid "--cached and --files are mutually exclusive"
msgstr ""
-#: builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1409
#, fuzzy, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Sincronizando url de submódulo para '%s'\n"
-#: builtin/submodule--helper.c:1413
+#: builtin/submodule--helper.c:1415
#, fuzzy, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
-#: builtin/submodule--helper.c:1427
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1429
+#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1438
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1440
+#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1485
-#, fuzzy
+#: builtin/submodule--helper.c:1487
msgid "suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/submodule--helper.c:1492
-#, fuzzy
+#: builtin/submodule--helper.c:1494
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1546
+#: builtin/submodule--helper.c:1548
#, fuzzy, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -23115,7 +23010,7 @@ msgstr ""
"Submodule work tree '%s' tem uma pasta .git (usa 'rm -rf' se queres mesmo "
"removê-la e remover toda a história)"
-#: builtin/submodule--helper.c:1558
+#: builtin/submodule--helper.c:1560
#, fuzzy, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -23124,46 +23019,45 @@ msgstr ""
"A árvore de trabalho do submódulo '$displaypath' contém alterações locais; "
"use '-f' para as descartar"
-#: builtin/submodule--helper.c:1566
+#: builtin/submodule--helper.c:1568
#, fuzzy, c-format
msgid "Cleared directory '%s'\n"
msgstr "Pasta '%s' limpa\n"
-#: builtin/submodule--helper.c:1568
+#: builtin/submodule--helper.c:1570
#, fuzzy, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "Impossível remover submodule work tree '%s'\n"
-#: builtin/submodule--helper.c:1579
+#: builtin/submodule--helper.c:1581
#, fuzzy, c-format
msgid "could not create empty submodule directory %s"
msgstr "incapaz criar pasta vazio de submódulo %s"
-#: builtin/submodule--helper.c:1595
+#: builtin/submodule--helper.c:1597
#, fuzzy, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submódulo '%s' (%s) unregistred para caminho '%s'\n"
-#: builtin/submodule--helper.c:1624
+#: builtin/submodule--helper.c:1626
msgid "remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1625
-#, fuzzy
+#: builtin/submodule--helper.c:1627
msgid "unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1630
+#: builtin/submodule--helper.c:1632
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1644
+#: builtin/submodule--helper.c:1646
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
"Use '--all' se pretende mesmo anular a inicialização todos os submódulos"
-#: builtin/submodule--helper.c:1713
+#: builtin/submodule--helper.c:1690
msgid ""
"An alternate computed from a superproject's alternate is invalid.\n"
"To allow Git to clone without an alternate in such a case, set\n"
@@ -23171,47 +23065,68 @@ msgid ""
"'--reference-if-able' instead of '--reference'."
msgstr ""
-#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "submódulo '%s' incapaz adicionar alternativo: %s"
-#: builtin/submodule--helper.c:1791
+#: builtin/submodule--helper.c:1768
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Valor '%s' de submodule.alternateErrorStrategy é irreconhecível"
-#: builtin/submodule--helper.c:1798
+#: builtin/submodule--helper.c:1775
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Valor '%s' de submodule.alternateLocation é irreconhecível"
-#: builtin/submodule--helper.c:1822
+#: builtin/submodule--helper.c:1800
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+
+#: builtin/submodule--helper.c:1841
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
+
+#: builtin/submodule--helper.c:1846
+#, fuzzy, c-format
+msgid "directory not empty: '%s'"
+msgstr "pasta com conteúdo: '%s'"
+
+#: builtin/submodule--helper.c:1858
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "incapaz obter pasta de submódulo para '%s'"
+
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
msgid "where the new submodule will be cloned to"
msgstr "sítio para aonde o novo submódulo será clonado"
-#: builtin/submodule--helper.c:1825
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
msgid "name of the new submodule"
msgstr "nome do novo submódulo"
-#: builtin/submodule--helper.c:1828
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
msgid "url where to clone the submodule from"
msgstr "url donde clonar o submódulos"
-#: builtin/submodule--helper.c:1836
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
msgid "depth for shallow clones"
msgstr "profundidade de clones rasos"
-#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
+#: builtin/submodule--helper.c:2909
msgid "force cloning progress"
msgstr "forçar progresso da clonagem"
-#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
#, fuzzy
msgid "disallow cloning into non-empty directory"
msgstr "a aplicar a um histórico vazio"
-#: builtin/submodule--helper.c:1848
+#: builtin/submodule--helper.c:1916
#, fuzzy
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
@@ -23221,106 +23136,86 @@ msgstr ""
"git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference "
"<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>"
-#: builtin/submodule--helper.c:1873
-#, c-format
-msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr ""
-
-#: builtin/submodule--helper.c:1884
+#: builtin/submodule--helper.c:1953
#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
-
-#: builtin/submodule--helper.c:1888
-#, fuzzy, c-format
-msgid "directory not empty: '%s'"
-msgstr "pasta com conteúdo: '%s'"
-
-#: builtin/submodule--helper.c:1900
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "incapaz obter pasta de submódulo para '%s'"
-
-#: builtin/submodule--helper.c:1936
-#, fuzzy, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1940
-#, fuzzy, c-format
+#: builtin/submodule--helper.c:1957
+#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2041
+#: builtin/submodule--helper.c:2058
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Path de submódulo '%s' por inicializar"
-#: builtin/submodule--helper.c:2045
+#: builtin/submodule--helper.c:2062
msgid "Maybe you want to use 'update --init'?"
msgstr "Pretendias usar 'update --init'?"
-#: builtin/submodule--helper.c:2075
+#: builtin/submodule--helper.c:2092
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Passando à frente submódulo por juntar %s"
-#: builtin/submodule--helper.c:2104
+#: builtin/submodule--helper.c:2121
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Passando à frente submódulo '%s'"
-#: builtin/submodule--helper.c:2254
+#: builtin/submodule--helper.c:2271
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Falha ao clonar '%s'. Nova tentativa agendada"
-#: builtin/submodule--helper.c:2265
+#: builtin/submodule--helper.c:2282
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Falha ao clonar '%s' pela segunda vez, abortado"
-#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
msgid "path into the working tree"
msgstr "caminho para árvore de trabalho"
-#: builtin/submodule--helper.c:2330
+#: builtin/submodule--helper.c:2347
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"caminho para a árvore de trabalho, atravessando limites de submódulos "
"aninhados"
-#: builtin/submodule--helper.c:2334
+#: builtin/submodule--helper.c:2351
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:2340
+#: builtin/submodule--helper.c:2357
#, fuzzy
msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "criar um clone raso, truncado ao número especificado de revisões"
-#: builtin/submodule--helper.c:2343
+#: builtin/submodule--helper.c:2360
msgid "parallel jobs"
msgstr "trabalhos em paralelo"
-#: builtin/submodule--helper.c:2345
+#: builtin/submodule--helper.c:2362
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "se o clone inicial deve seguir a recomendação rasa"
-#: builtin/submodule--helper.c:2346
+#: builtin/submodule--helper.c:2363
msgid "don't print cloning progress"
msgstr "imprimir progresso da clonagem nenhum"
-#: builtin/submodule--helper.c:2357
+#: builtin/submodule--helper.c:2374
#, fuzzy
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
-#: builtin/submodule--helper.c:2370
+#: builtin/submodule--helper.c:2387
msgid "bad value for update parameter"
msgstr "valor incorreto no parâmetro update"
-#: builtin/submodule--helper.c:2418
+#: builtin/submodule--helper.c:2435
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -23329,97 +23224,149 @@ msgstr ""
"Ramo de submódulo (%s) foi configurado para herdar o ramo do superprojeto, "
"mas o superprojeto está em ramo nenhum"
-#: builtin/submodule--helper.c:2541
+#: builtin/submodule--helper.c:2558
#, fuzzy, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "incapaz obter pega de repositório para submódulo '%s'"
-#: builtin/submodule--helper.c:2574
+#: builtin/submodule--helper.c:2591
msgid "recurse into submodules"
msgstr "percorrer recursivamente submódulos"
-#: builtin/submodule--helper.c:2580
+#: builtin/submodule--helper.c:2597
#, fuzzy
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper embed-git-dir [<caminho>...]"
-#: builtin/submodule--helper.c:2636
+#: builtin/submodule--helper.c:2653
msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2639
+#: builtin/submodule--helper.c:2656
#, fuzzy
msgid "unset the config in the .gitmodules file"
msgstr "falha ao preparar .gitmodules atualizado"
-#: builtin/submodule--helper.c:2644
+#: builtin/submodule--helper.c:2661
#, fuzzy
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper name <caminho>"
-#: builtin/submodule--helper.c:2645
-#, fuzzy
+#: builtin/submodule--helper.c:2662
msgid "git submodule--helper config --unset <name>"
msgstr ""
-#: builtin/submodule--helper.c:2646
-#, fuzzy
+#: builtin/submodule--helper.c:2663
msgid "git submodule--helper config --check-writeable"
msgstr ""
-#: builtin/submodule--helper.c:2665 git-submodule.sh:150
+#: builtin/submodule--helper.c:2682 git-submodule.sh:150
#, fuzzy, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"Prepare as suas alterações em .gitmodules ou esconda-as para prosseguir"
-#: builtin/submodule--helper.c:2681
-#, fuzzy
+#: builtin/submodule--helper.c:2698
msgid "suppress output for setting url of a submodule"
msgstr ""
-#: builtin/submodule--helper.c:2685
-#, fuzzy
+#: builtin/submodule--helper.c:2702
msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
msgstr ""
-#: builtin/submodule--helper.c:2718
-#, fuzzy
+#: builtin/submodule--helper.c:2735
msgid "set the default tracking branch to master"
msgstr ""
-#: builtin/submodule--helper.c:2720
-#, fuzzy
+#: builtin/submodule--helper.c:2737
msgid "set the default tracking branch"
msgstr ""
-#: builtin/submodule--helper.c:2724
+#: builtin/submodule--helper.c:2741
#, fuzzy
msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <caminho>"
-#: builtin/submodule--helper.c:2725
+#: builtin/submodule--helper.c:2742
#, fuzzy
msgid ""
"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
-msgstr "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <ramo> <caminho>"
+msgstr ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <ramo> <caminho>"
-#: builtin/submodule--helper.c:2732
+#: builtin/submodule--helper.c:2749
#, fuzzy
msgid "--branch or --default required"
msgstr "nome do ramo é obrigatório"
-#: builtin/submodule--helper.c:2735
-#, fuzzy
+#: builtin/submodule--helper.c:2752
msgid "--branch and --default are mutually exclusive"
msgstr ""
-#: builtin/submodule--helper.c:2792 git.c:449 git.c:724
+#: builtin/submodule--helper.c:2815
+#, fuzzy, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "Adicionando repo existente em '$sm_path' ao index"
+
+#: builtin/submodule--helper.c:2818
+#, fuzzy, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "'$sm_path' já existe e é repositório git inválido"
+
+#: builtin/submodule--helper.c:2828
+#, fuzzy, c-format
+msgid "A git directory for '%s' is found locally with remote(s):"
+msgstr ""
+"Um diretório git de '$sm_name' foi encontrado localmente com os remotos:"
+
+#: builtin/submodule--helper.c:2833
+#, fuzzy, c-format
+msgid ""
+"If you want to reuse this local git directory instead of cloning again from\n"
+" %s\n"
+"use the '--force' option. If the local git directory is not the correct "
+"repo\n"
+"or if you are unsure what this means, choose another name with the '--name' "
+"option.\n"
+msgstr ""
+"Se queres reutilizar esta past git local, em vez de voltares a clonar\n"
+" $realrepo\n"
+"usa a opção --force. Se a pasta git local é o repo incorreto ou\n"
+"se tens pouca certeza sobre o que isto significa, podes mudar o nome com a "
+"opção '--name'."
+
+#: builtin/submodule--helper.c:2842
+#, fuzzy, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "A reativar o diretório git local do submódulo '$sm_name'."
+
+#: builtin/submodule--helper.c:2875
+#, fuzzy, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "Incapaz de checkout submódulo '$sm_path'"
+
+#: builtin/submodule--helper.c:2888
+msgid "branch of repository to checkout on cloning"
+msgstr ""
+
+#: builtin/submodule--helper.c:2910
+#, fuzzy
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "permitir adicionar ficheiros ignorados"
+
+#: builtin/submodule--helper.c:2917
+#, fuzzy
+msgid ""
+"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
+"name <name>"
+msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
+
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s insustenta --super-prefix"
-#: builtin/submodule--helper.c:2798
+#: builtin/submodule--helper.c:2991
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' é subcomando inválido de submodule--helper"
@@ -24174,7 +24121,6 @@ msgid "added with --lock"
msgstr "adicionado com --lock"
#: builtin/worktree.c:574
-#, fuzzy
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
@@ -24188,7 +24134,6 @@ msgid "add 'prunable' annotation to worktrees older than <time>"
msgstr "expirar árvores de trabalho mais antigos que <tempo>"
#: builtin/worktree.c:702
-#, fuzzy
msgid "--verbose and --porcelain are mutually exclusive"
msgstr ""
@@ -24255,7 +24200,7 @@ msgid "validation failed, cannot move working tree: %s"
msgstr ""
#: builtin/worktree.c:878
-#, fuzzy, c-format
+#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
@@ -24409,12 +24354,10 @@ msgid "recursive alias: %s"
msgstr ""
#: git.c:476
-#, fuzzy
msgid "write failure on standard output"
msgstr ""
#: git.c:478
-#, fuzzy
msgid "unknown write failure on standard output"
msgstr ""
@@ -24506,7 +24449,7 @@ msgid "socket/pipe already in use: '%s'"
msgstr ""
#: t/helper/test-simple-ipc.c:264
-#, fuzzy, c-format
+#, c-format
msgid "could not start server on: '%s'"
msgstr ""
@@ -24515,7 +24458,6 @@ msgid "could not spawn daemon in the background"
msgstr ""
#: t/helper/test-simple-ipc.c:356
-#, fuzzy
msgid "waitpid failed"
msgstr ""
@@ -24524,7 +24466,6 @@ msgid "daemon not online yet"
msgstr ""
#: t/helper/test-simple-ipc.c:406
-#, fuzzy
msgid "daemon failed to start"
msgstr ""
@@ -24658,7 +24599,7 @@ msgstr ""
" redireção: %s"
#: remote-curl.c:183
-#, fuzzy, c-format
+#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr ""
@@ -24672,7 +24613,7 @@ msgid "invalid server response; expected service, got flush packet"
msgstr ""
#: remote-curl.c:439
-#, fuzzy, c-format
+#, c-format
msgid "invalid server response; got '%s'"
msgstr ""
@@ -24754,7 +24695,6 @@ msgid "dumb http transport does not support shallow capabilities"
msgstr "transporte http estúpido insustenta capacidades shallow"
#: remote-curl.c:1149
-#, fuzzy
msgid "fetch failed."
msgstr ""
@@ -24763,7 +24703,7 @@ msgid "cannot fetch by sha1 over smart http"
msgstr ""
#: remote-curl.c:1239 remote-curl.c:1245
-#, fuzzy, c-format
+#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr ""
@@ -24773,7 +24713,6 @@ msgid "http transport does not support %s"
msgstr "transporte http insustenta %s"
#: remote-curl.c:1293
-#, fuzzy
msgid "git-http-push failed"
msgstr ""
@@ -24913,7 +24852,6 @@ msgid "Provide content or type and size information for repository objects"
msgstr ""
#: command-list.h:62
-#, fuzzy
msgid "Display gitattributes information"
msgstr ""
@@ -24931,7 +24869,6 @@ msgid "Switch branches or restore working tree files"
msgstr "Mudar de ramos ou restaurar os ficheiros da árvore de trabalho"
#: command-list.h:66
-#, fuzzy
msgid "Copy files from the index to the working tree"
msgstr ""
@@ -24952,7 +24889,6 @@ msgid "Graphical alternative to git-commit"
msgstr ""
#: command-list.h:71
-#, fuzzy
msgid "Remove untracked files from the working tree"
msgstr ""
@@ -24974,7 +24910,6 @@ msgid "Write and verify Git commit-graph files"
msgstr ""
#: command-list.h:76
-#, fuzzy
msgid "Create a new commit object"
msgstr ""
@@ -25024,12 +24959,10 @@ msgstr ""
"Mostrar alterações entre commits, entre commit e árvore de trabalho, etc"
#: command-list.h:88
-#, fuzzy
msgid "Compares files in the working tree and the index"
msgstr ""
#: command-list.h:89
-#, fuzzy
msgid "Compare a tree to the working tree or index"
msgstr ""
@@ -25054,7 +24987,6 @@ msgid "Download objects and refs from another repository"
msgstr "Download objectos e refs de outro repositório"
#: command-list.h:95
-#, fuzzy
msgid "Receive missing objects from another repository"
msgstr ""
@@ -25064,12 +24996,10 @@ msgid "Rewrite branches"
msgstr " Ramo remoto:%s"
#: command-list.h:97
-#, fuzzy
msgid "Produce a merge commit message"
msgstr ""
#: command-list.h:98
-#, fuzzy
msgid "Output information on each ref"
msgstr ""
@@ -25082,7 +25012,6 @@ msgid "Prepare patches for e-mail submission"
msgstr ""
#: command-list.h:101
-#, fuzzy
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
@@ -25115,12 +25044,10 @@ msgid "Server side implementation of Git over HTTP"
msgstr ""
#: command-list.h:109
-#, fuzzy
msgid "Download from a remote Git repository via HTTP"
msgstr ""
#: command-list.h:110
-#, fuzzy
msgid "Push objects over HTTP/DAV to another repository"
msgstr ""
@@ -25164,7 +25091,6 @@ msgid "List references in a remote repository"
msgstr "repositório de referência"
#: command-list.h:120
-#, fuzzy
msgid "List the contents of a tree object"
msgstr ""
@@ -25242,7 +25168,6 @@ msgid "Import from and submit to Perforce repositories"
msgstr ""
#: command-list.h:138
-#, fuzzy
msgid "Create a packed archive of objects"
msgstr ""
@@ -25260,7 +25185,6 @@ msgid "Compute unique ID for a patch"
msgstr ""
#: command-list.h:142
-#, fuzzy
msgid "Prune all unreachable objects from the object database"
msgstr ""
@@ -25286,7 +25210,6 @@ msgid "Compare two commit ranges (e.g. two versions of a branch)"
msgstr ""
#: command-list.h:148
-#, fuzzy
msgid "Reads tree information into the index"
msgstr ""
@@ -25305,12 +25228,10 @@ msgid "Manage reflog information"
msgstr "mostrar informação de resolver-desfazer"
#: command-list.h:152
-#, fuzzy
msgid "Manage set of tracked repositories"
msgstr ""
#: command-list.h:153
-#, fuzzy
msgid "Pack unpacked objects in a repository"
msgstr ""
@@ -25342,7 +25263,6 @@ msgid "Revert some existing commits"
msgstr "Reverter algumas memórias existentes"
#: command-list.h:160
-#, fuzzy
msgid "Lists commit objects in reverse chronological order"
msgstr ""
@@ -25360,7 +25280,6 @@ msgid "Send a collection of patches as emails"
msgstr ""
#: command-list.h:164
-#, fuzzy
msgid "Push objects over Git protocol to another repository"
msgstr ""
@@ -25451,7 +25370,6 @@ msgid "Unpack objects from a packed archive"
msgstr ""
#: command-list.h:185
-#, fuzzy
msgid "Register file contents in the working tree to the index"
msgstr ""
@@ -25697,69 +25615,27 @@ msgstr "'$sm_path' já existe no index e é submódulo nenhum"
msgid "'$sm_path' does not have a commit checked out"
msgstr "'$sm_path' tem memória nenhuma checked out"
-#: git-submodule.sh:249
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "Adicionando repo existente em '$sm_path' ao index"
-
-#: git-submodule.sh:251
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "'$sm_path' já existe e é repositório git inválido"
-
-#: git-submodule.sh:259
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-"Um diretório git de '$sm_name' foi encontrado localmente com os remotos:"
-
-#: git-submodule.sh:261
-#, sh-format
-msgid ""
-"If you want to reuse this local git directory instead of cloning again from\n"
-" $realrepo\n"
-"use the '--force' option. If the local git directory is not the correct "
-"repo\n"
-"or you are unsure what this means choose another name with the '--name' "
-"option."
-msgstr ""
-"Se queres reutilizar esta past git local, em vez de voltares a clonar\n"
-" $realrepo\n"
-"usa a opção --force. Se a pasta git local é o repo incorreto ou\n"
-"se tens pouca certeza sobre o que isto significa, podes mudar o nome com a "
-"opção '--name'."
-
-#: git-submodule.sh:267
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "A reativar o diretório git local do submódulo '$sm_name'."
-
-#: git-submodule.sh:279
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Incapaz de checkout submódulo '$sm_path'"
-
-#: git-submodule.sh:284
+#: git-submodule.sh:248
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Falha ao adicionar o submódulo '$sm_path'"
-#: git-submodule.sh:293
+#: git-submodule.sh:257
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Falha ao registar submódulo '$sm_path'"
-#: git-submodule.sh:568
+#: git-submodule.sh:532
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Incapaz encontrar revisão atual em path de submódulo '$displaypath'"
-#: git-submodule.sh:578
+#: git-submodule.sh:542
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Incapaz de buscar em path de submódulo '$sm_path'"
-#: git-submodule.sh:583
+#: git-submodule.sh:547
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -25768,7 +25644,7 @@ msgstr ""
"Incapaz de encontrar revisão atual ${remote_name}/${branch} em path de "
"submódulo '$sm_path'"
-#: git-submodule.sh:601
+#: git-submodule.sh:565
#, fuzzy, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -25777,7 +25653,7 @@ msgstr ""
"Incapaz de buscar em path de submódulo '$displaypath'; tentando buscar $sha1 "
"directamente:"
-#: git-submodule.sh:607
+#: git-submodule.sh:571
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -25786,48 +25662,48 @@ msgstr ""
"Buscado na path de submódulo '$displaypath', mas continha nenhum $sha1. "
"Falha ao buscar aquela memória diretamente."
-#: git-submodule.sh:614
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Incapaz de checkout '$sha1' no path de submódulo '$displaypath'"
-#: git-submodule.sh:615
+#: git-submodule.sh:579
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Path de submódulo '$displaypath': '$sha1' checked out"
-#: git-submodule.sh:619
+#: git-submodule.sh:583
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Incapaz de rebasear '$sha1' em path de submódulo '$displaypath'"
-#: git-submodule.sh:620
+#: git-submodule.sh:584
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Path de submódulo '$displaypath': rebaseado em '$sha1'"
-#: git-submodule.sh:625
+#: git-submodule.sh:589
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Incapaz juntar '$sha1' em path de submódulo '$displaypath'"
-#: git-submodule.sh:626
+#: git-submodule.sh:590
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Caminho de submódulo '$displaypath': integrado em '$sha1'"
-#: git-submodule.sh:631
+#: git-submodule.sh:595
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Falha ao executar '$command $sha1' no caminho de submódulo '$displaypath'"
-#: git-submodule.sh:632
+#: git-submodule.sh:596
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Caminho de submódulo '$displaypath': '$command $sha1'"
-#: git-submodule.sh:663
+#: git-submodule.sh:627
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Falha ao percorrer o caminho de submódulo '$displaypath'"