diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po index 613c1b886acff493b3b034eef11e10a3576a5e1f..f171b533039f4d879aaa20ecd6a040dfaec5202a 100644 --- a/po/documentation.pt_BR.po +++ b/po/documentation.pt_BR.po @@ -3,18 +3,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # msgid "" -msgstr "" -"Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2022-01-11 13:34+0100\n" -"PO-Revision-Date: 2021-11-09 08:51+0000\n" -"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n" -"Language-Team: none\n" -"Language: pt_BR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.9-dev\n" +msgstr "Report-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2022-01-11 13:34+0100\nPO-Revision-Date: 2022-01-17 19:56+0000\nLast-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\nLanguage-Team: none\nLanguage: pt_BR\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=n > 1;\nX-Generator: Weblate 4.11-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:754 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:129 en/git-status.txt:31 @@ -3136,10 +3125,9 @@ msgstr "Formato interno do Git" #. type: Plain text #: en/date-formats.txt:12 -#, fuzzy, priority:280 -#| msgid "It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the number of seconds since the UNIX epoch. `<time zone offset>` is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) is `+0100`." +#, priority:280 msgid "It is `<unix-timestamp> <time-zone-offset>`, where `<unix-timestamp>` is the number of seconds since the UNIX epoch. `<time-zone-offset>` is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) is `+0100`." -msgstr "횋 `<unix timestamp> <time zone offset>`, onde desde a 챕poca do UNIX `<unix timestamp>` 챕 o valor em segundos. O `<time zone offset>` 챕 o desvio positivo ou negativo com bate no UTC. O CET por exemplo (onde 챕 1 hora 횪 frente do UTC ) 챕 `+0100`." +msgstr "횋 `<unix-timestamp> <time-zone-offset>`, onde desde a 챕poca do UNIX `<unix-timestamp>` 챕 o valor em segundos. O `<time-zone-offset>` 챕 o desvio positivo ou negativo a partir do UTC. O CET por exemplo (onde 챕 1 hora 횪 frente do UTC ) 챕 `+0100`." #. type: Labeled list #: en/date-formats.txt:13 @@ -7187,17 +7175,7 @@ msgstr "git-am - Aplica uma s챕rie de patches vindas de um mailbox (caixa de cor #. type: Plain text #: en/git-am.txt:22 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "" -#| "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n" -#| "\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n" -#| "\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n" -#| "\t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]\n" -#| "\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n" -#| "\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n" -#| "\t [--quoted-cr=<action>]\n" -#| "\t [(<mbox> | <Maildir>)...]\n" -#| "'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n" "\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n" @@ -7209,16 +7187,7 @@ msgid "" "\t [--empty=(stop|drop|keep)]\n" "\t [(<mbox> | <Maildir>)...]\n" "'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty)\n" -msgstr "" -"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n" -"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n" -"\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n" -"\t [--whitespace=<op챌찾o>] [-C<n>] [-p<n>] [--directory=<dir>]\n" -"\t [--exclude=<caminho>] [--include=<caminho>] [--reject] [-q | --quiet]\n" -"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<formato>]\n" -"\t [--quoted-cr=<a챌찾o>]\n" -"\t [(<mbox> | <Maildir>)...]\n" -"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n" +msgstr "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n\t [--whitespace=<op챌찾o>] [-C<n>] [-p<n>] [--directory=<dir>]\n\t [--exclude=<caminho>] [--include=<caminho>] [--reject] [-q | --quiet]\n\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<formato>]\n\t [--quoted-cr=<a챌찾o>]\n\t [--empty=(stop|drop|keep)]\n\t [(<mbox> | <Maildir>)...]\n'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)]) | --allow-empty)\n" #. type: Plain text #: en/git-am.txt:28 @@ -7318,10 +7287,9 @@ msgstr "Esta op챌찾o ser찼 passada ao comando 'git mailinfo' (consulte linkgit:g #. type: Labeled list #: en/git-am.txt:67 -#, fuzzy, no-wrap, priority:100 -#| msgid "--empty={drop,keep,ask}" +#, no-wrap, priority:100 msgid "--empty=(stop|drop|keep)" -msgstr "--empty={drop,keep,ask}" +msgstr "--empty=(stop|drop|keep)" #. type: Plain text #: en/git-am.txt:74 @@ -7797,16 +7765,7 @@ msgstr "git-apply - Aplica um patch aos arquivos e/ou ao 챠ndice" #. type: Plain text #: en/git-apply.txt:20 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "" -#| "'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]\n" -#| "\t [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]\n" -#| "\t [--allow-binary-replacement | --binary] [--reject] [-z]\n" -#| "\t [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]\n" -#| "\t [--ignore-space-change | --ignore-whitespace]\n" -#| "\t [--whitespace=(nowarn|warn|fix|error|error-all)]\n" -#| "\t [--exclude=<path>] [--include=<path>] [--directory=<root>]\n" -#| "\t [--verbose] [--unsafe-paths] [<patch>...]\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]\n" "\t [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse]\n" @@ -7816,15 +7775,7 @@ msgid "" "\t [--whitespace=(nowarn|warn|fix|error|error-all)]\n" "\t [--exclude=<path>] [--include=<path>] [--directory=<root>]\n" "\t [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]\n" -msgstr "" -"'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]\n" -"\t [--apply] [--no-add] [--build-fake-ancestor=<arquivo>] [-R | --reverse]\n" -"\t [--allow-binary-replacement | --binary] [--reject] [-z]\n" -"\t [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]\n" -"\t [--ignore-space-change | --ignore-whitespace]\n" -"\t [--whitespace=(nowarn|warn|fix|error|error-all)]\n" -"\t [--exclude=<caminho>] [--include=<caminho>] [--directory=<root>]\n" -"\t [--verbose] [--unsafe-paths] [<patch>...]\n" +msgstr "'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way]\n\t [--apply] [--no-add] [--build-fake-ancestor=<arquivo>] [-R | --reverse]\n\t [--allow-binary-replacement | --binary] [--reject] [-z]\n\t [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]\n\t [--ignore-space-change | --ignore-whitespace]\n\t [--whitespace=(nowarn|warn|fix|error|error-all)]\n\t [--exclude=<caminho>] [--include=<caminho>] [--directory=<root>]\n\t [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]\n" #. type: Plain text #: en/git-apply.txt:30 @@ -8266,16 +8217,11 @@ msgstr "git-archimport - Importe um reposit처rio do GNU Arch para o Git" #. type: Plain text #: en/git-archimport.txt:14 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "" -#| "'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]\n" -#| " <archive/branch>[:<git-branch>] ...\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D <depth>] [-t <tempdir>]\n" "\t <archive>/<branch>[:<git-branch>]...\n" -msgstr "" -"'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D profundidade] [-t tempdir]\n" -" <arquivo/ramo>[:<git-branch>] ...\n" +msgstr "'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D <profundidade>] [-t <tempdir>]\n\t <arquivo>/<ramo>[:<git-branch>]...\n" #. type: Plain text #: en/git-archimport.txt:23 @@ -8311,10 +8257,9 @@ msgstr "Para a importa챌찾o inicial, o comando 'git archimport' espera se encont #. type: Plain text #: en/git-archimport.txt:49 -#, fuzzy, priority:100 -#| msgid "While 'git archimport' will try to create sensible branch names for the archives that it imports, it is also possible to specify Git branch names manually. To do so, write a Git branch name after each <archive/branch> parameter, separated by a colon. This way, you can shorten the Arch branch names and convert Arch jargon to Git jargon, for example mapping a \"PROJECT{litdd}devo{litdd}VERSION\" branch to \"master\"." +#, priority:100 msgid "While 'git archimport' will try to create sensible branch names for the archives that it imports, it is also possible to specify Git branch names manually. To do so, write a Git branch name after each <archive>/<branch> parameter, separated by a colon. This way, you can shorten the Arch branch names and convert Arch jargon to Git jargon, for example mapping a \"PROJECT{litdd}devo{litdd}VERSION\" branch to \"master\"." -msgstr "Enquanto o 'git archimport' tentar찼 criar os nomes exatos das ramifica챌천es para os arquivos importados, tamb챕m 챕 poss챠vel especificar os nomes das ramifica챌천es do Git manualmente. Para fazer isso, escreva um nome do ramo Git ap처s cada par창metro <arquivo/ramo>, separado por dois pontos. Dessa forma, voc챗 pode encurtar os nomes das ramifica챌천es do Arch e converter o jarg찾o do Arch para o Git mapeando uma ramifica챌찾o \"PROJECT{litdd}devo{litdd}VERSION\" para \"master\" por exemplo." +msgstr "Enquanto o 'git archimport' tentar찼 criar os nomes exatos das ramifica챌천es para os arquivos importados, tamb챕m 챕 poss챠vel especificar os nomes das ramifica챌천es do Git manualmente. Para fazer isso, escreva cada nome do ramo depois de cada par창metro <arquivo>/<ramo>, separado por dois pontos. Dessa forma, voc챗 pode encurtar os nomes das ramifica챌천es do Arch e converter o jarg찾o do Arch para o Git mapeando uma ramifica챌찾o \"PROJECT{litdd}devo{litdd}VERSION\" para \"master\" por exemplo." #. type: Plain text #: en/git-archimport.txt:54 @@ -8414,17 +8359,15 @@ msgstr "Sobrescreve o diret처rio tempor찼rio predefinido." #. type: Labeled list #: en/git-archimport.txt:107 -#, fuzzy, no-wrap, priority:100 -#| msgid "<archive/branch>" +#, no-wrap, priority:100 msgid "<archive>/<branch>" -msgstr "<arquivo/ramo>" +msgstr "<arquivo>/<ramo>" #. type: Plain text #: en/git-archimport.txt:109 -#, fuzzy, priority:100 -#| msgid "Archive/branch identifier in a format that `tla log` understands." +#, priority:100 msgid "<archive>/<branch> identifier in a format that `tla log` understands." -msgstr "Identificador do arquivo/ramo em um formato que o `tla log` compreenda." +msgstr "<arquivo>/<ramo > 챕 um identificador em um formato que o `tla log` compreende." #. type: Title = #: en/git-archive.txt:2 @@ -10126,23 +10069,7 @@ msgstr "git-branch - Lista, cria ou exclui ramifica챌천es" #. type: Plain text #: en/git-branch.txt:26 -#, fuzzy, ignore-ellipsis, no-wrap, priority:260 -#| msgid "" -#| "'git branch' [--color[=<when>] | --no-color] [--show-current]\n" -#| "\t[-v [--abbrev=<n> | --no-abbrev]]\n" -#| "\t[--column[=<options>] | --no-column] [--sort=<key>]\n" -#| "\t[--merged [<commit>]] [--no-merged [<commit>]]\n" -#| "\t[--contains [<commit>]] [--no-contains [<commit>]]\n" -#| "\t[--points-at <object>] [--format=<format>]\n" -#| "\t[(-r | --remotes) | (-a | --all)]\n" -#| "\t[--list] [<pattern>...]\n" -#| "'git branch' [--track | --no-track] [-f] <branchname> [<start-point>]\n" -#| "'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]\n" -#| "'git branch' --unset-upstream [<branchname>]\n" -#| "'git branch' (-m | -M) [<oldbranch>] <newbranch>\n" -#| "'git branch' (-c | -C) [<oldbranch>] <newbranch>\n" -#| "'git branch' (-d | -D) [-r] <branchname>...\n" -#| "'git branch' --edit-description [<branchname>]\n" +#, ignore-ellipsis, no-wrap, priority:260 msgid "" "'git branch' [--color[=<when>] | --no-color] [--show-current]\n" "\t[-v [--abbrev=<n> | --no-abbrev]]\n" @@ -10159,22 +10086,7 @@ msgid "" "'git branch' (-c | -C) [<oldbranch>] <newbranch>\n" "'git branch' (-d | -D) [-r] <branchname>...\n" "'git branch' --edit-description [<branchname>]\n" -msgstr "" -"'git branch' [--color[=<quando>] | --no-color] [--show-current]\n" -"\t[-v [--abbrev=<n> | --no-abbrev]]\n" -"\t[--column[=<op챌천es>] | --no-column] [--sort=<chaves>]\n" -"\t[--merged [<commit>]] [--no-merged [<commit>]]\n" -"\t[--contains [<commit>]] [--no-contains [<commit>]]\n" -"\t[--points-at <objeto>] [--format=<formato>]\n" -"\t[(-r | --remotes) | (-a | --all)]\n" -"\t[--list] [<padr찾o>...]\n" -"'git branch' [--track | --no-track] [-f] <nome-do-ramo> [<ponto-de-partida>]\n" -"'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<nome-do-ramo>]\n" -"'git branch' --unset-upstream [<nome-do-ramo>]\n" -"'git branch' (-m | -M) [<ramo-antigo>] <nome-do-ramo>\n" -"'git branch' (-c | -C) [<ramo-antigo>] <novo-ramo>\n" -"'git branch' (-d | -D) [-r] <nome-do-ramo>...\n" -"'git branch' --edit-description [<nome-do-ramo>]\n" +msgstr "'git branch' [--color[=<quando>] | --no-color] [--show-current]\n\t[-v [--abbrev=<n> | --no-abbrev]]\n\t[--column[=<op챌천es>] | --no-column] [--sort=<chaves>]\n\t[--merged [<commit>]] [--no-merged [<commit>]]\n\t[--contains [<commit>]] [--no-contains [<commit>]]\n\t[--points-at <objeto>] [--format=<formato>]\n\t[(-r | --remotes) | (-a | --all)]\n\t[--list] [<padr찾o>...]\n'git branch' [--track [direct|inherit] | --no-track] [-f] <nome-do-ramo> [<ponto-de-partida>]\n'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<nome-do-ramo>]\n'git branch' --unset-upstream [<nome-do-ramo>]\n'git branch' (-m | -M) [<ramo-antigo>] <nome-do-ramo>\n'git branch' (-c | -C) [<ramo-antigo>] <novo-ramo>\n'git branch' (-d | -D) [-r] <nome-do-ramo>...\n'git branch' --edit-description [<nome-do-ramo>]\n" #. type: Plain text #: en/git-branch.txt:36 @@ -10456,7 +10368,7 @@ msgstr "Exibe o sha1 completo na sa챠da da listagem em vez de abrevi찼-los." #: en/git-branch.txt:209 #, no-wrap, priority:260 msgid "--track [inherit|direct]" -msgstr "" +msgstr "--track [inherit|direct]" #. type: Plain text #: en/git-branch.txt:217 @@ -10492,10 +10404,9 @@ msgstr "--no-track" #. type: Plain text #: en/git-branch.txt:237 -#, fuzzy, priority:260 -#| msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true." +#, priority:260 msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is set." -msgstr "N찾o configure o \"upstream\", ainda que a vari찼vel de configura챌찾o `branch.autoSetupMerge` seja verdadeira." +msgstr "N찾o configure o \"upstream\", ainda que a vari찼vel de configura챌찾o `branch.autoSetupMerge` seja definida." #. type: Plain text #: en/git-branch.txt:241 @@ -12837,15 +12748,7 @@ msgstr "git-checkout - Alterne entre os ramos ou restaure os arquivos da 찼rvore #. type: Plain text #: en/git-checkout.txt:18 -#, fuzzy, ignore-ellipsis, no-wrap, priority:240 -#| msgid "" -#| "'git checkout' [-q] [-f] [-m] [<branch>]\n" -#| "'git checkout' [-q] [-f] [-m] --detach [<branch>]\n" -#| "'git checkout' [-q] [-f] [-m] [--detach] <commit>\n" -#| "'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]\n" -#| "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>...\n" -#| "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]\n" -#| "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]\n" +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "'git checkout' [-q] [-f] [-m] [<branch>]\n" "'git checkout' [-q] [-f] [-m] --detach [<branch>]\n" @@ -12854,14 +12757,7 @@ msgid "" "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>...\n" "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]\n" "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]\n" -msgstr "" -"'git checkout' [-q] [-f] [-m] [<ramo>]\n" -"'git checkout' [-q] [-f] [-m] --detach [<ramo>]\n" -"'git checkout' [-q] [-f] [-m] [--detach] <commit>\n" -"'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <novo-ramo>] [<ponto-de-partida>]\n" -"'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<찼rvore>] [--] <pathspec>...\n" -"'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<찼rvore>] --pathspec-from-file=<arquivo> [--pathspec-file-nul]\n" -"'git checkout' (-p|--patch) [<찼rvore>] [--] [<pathspec>...]\n" +msgstr "'git checkout' [-q] [-f] [-m] [<ramo>]\n'git checkout' [-q] [-f] [-m] --detach [<ramo>]\n'git checkout' [-q] [-f] [-m] [--detach] <commit>\n'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <novo-ramo>] [<ponto-de-partida>]\n'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<찼rvore>] [--] <pathspec>...\n'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<찼rvore>] --pathspec-from-file=<arquivo> [--pathspec-file-nul]\n'git checkout' (-p|--patch) [<찼rvore>] [--] [<pathspec>...]\n" #. type: Plain text #: en/git-checkout.txt:25 @@ -12901,10 +12797,9 @@ msgstr "Voc챗 pode omitir o `<ramo>` no caso em que o comando se degenera para \ #. type: Labeled list #: en/git-checkout.txt:46 -#, fuzzy, no-wrap, priority:240 -#| msgid "'git checkout' -b|-B <new_branch> [<start point>]" +#, no-wrap, priority:240 msgid "'git checkout' -b|-B <new-branch> [<start-point>]" -msgstr "'git checkout' -b|-B <new_branch> [<ponto de in챠cio>]" +msgstr "'git checkout' -b|-B <new-branch> [<ponto-de-partida>]" #. type: Plain text #: en/git-checkout.txt:54 @@ -12914,23 +12809,17 @@ msgstr "Usando a op챌찾o `-b` faz com que um novo ramo seja criado como se o lin #. type: Plain text #: en/git-checkout.txt:57 -#, fuzzy, priority:240 -#| msgid "If `-B` is given, `<new_branch>` is created if it doesn't exist; otherwise, it is reset. This is the transactional equivalent of" +#, priority:240 msgid "If `-B` is given, `<new-branch>` is created if it doesn't exist; otherwise, it is reset. This is the transactional equivalent of" msgstr "Caso a op챌찾o `-B` seja utilizada, ent찾o um `<novo-ramo>` 챕 criado caso ainda n찾o exista, sen찾o, ser찼 redefinido. Este 챕 o equivalente transacional do" #. type: delimited block - #: en/git-checkout.txt:61 -#, fuzzy, no-wrap, priority:240 -#| msgid "" -#| "$ git branch -f <branch> [<start point>]\n" -#| "$ git checkout <branch>\n" +#, no-wrap, priority:240 msgid "" "$ git branch -f <branch> [<start-point>]\n" "$ git checkout <branch>\n" -msgstr "" -"$ git branch -f <ramo> [<ponto-de-partida>]\n" -"$ git checkout <ramo>\n" +msgstr "$ git branch -f <ramo> [<ponto-de-partida>]\n$ git checkout <ramo>\n" #. type: Plain text #: en/git-checkout.txt:65 @@ -13072,10 +12961,9 @@ msgstr "-b <novo-ramo>" #. type: Plain text #: en/git-checkout.txt:151 -#, fuzzy, priority:240 -#| msgid "Create a new branch named `<new_branch>` and start it at `<start_point>`; see linkgit:git-branch[1] for details." +#, priority:240 msgid "Create a new branch named `<new-branch>` and start it at `<start-point>`; see linkgit:git-branch[1] for details." -msgstr "Crie uma nova ramifica챌찾o chamada `<new_branch>` e inicie-a em `<start_point>`; para mais detalhes consulte linkgit:git-branch[1]." +msgstr "Crie uma nova ramifica챌찾o chamada `<-novo-ramo>` e inicie-a em `<ponto-de-partida>`; para mais detalhes consulte linkgit:git-branch[1]." #. type: Labeled list #: en/git-checkout.txt:152 en/git-worktree.txt:178 @@ -13085,8 +12973,7 @@ msgstr "-B <novo-ramo>" #. type: Plain text #: en/git-checkout.txt:157 -#, fuzzy, priority:240 -#| msgid "Creates the branch `<new_branch>` and start it at `<start_point>`; if it already exists, then reset it to `<start_point>`. This is equivalent to running \"git branch\" with \"-f\"; see linkgit:git-branch[1] for details." +#, priority:240 msgid "Creates the branch `<new-branch>` and start it at `<start-point>`; if it already exists, then reset it to `<start-point>`. This is equivalent to running \"git branch\" with \"-f\"; see linkgit:git-branch[1] for details." msgstr "Cria o `<novo-ramo>` e inicia no `<ponto-de-partida>`; caso j찼 exista, redefina-o para o `<ponto-de-partida>`. 횋 o mesmo que executar o comando \"git branch\" com a op챌찾o \"-f\"; para mais detalhes, consulte linkgit:git-branch[1]." @@ -13094,7 +12981,7 @@ msgstr "Cria o `<novo-ramo>` e inicia no `<ponto-de-partida>`; caso j찼 exista, #: en/git-checkout.txt:159 en/git-switch.txt:154 #, no-wrap, priority:240 msgid "--track [direct|inherit]" -msgstr "" +msgstr "--track [direct|inherit]" #. type: Plain text #: en/git-checkout.txt:162 @@ -13176,15 +13063,13 @@ msgstr "--orphan <novo-ramo>" #. type: Plain text #: en/git-checkout.txt:219 -#, fuzzy, priority:240 -#| msgid "Create a new 'orphan' branch, named `<new_branch>`, started from `<start_point>` and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits." +#, priority:240 msgid "Create a new 'orphan' branch, named `<new-branch>`, started from `<start-point>` and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits." msgstr "Crie um novo ramo 'orphan', chamado `<novo-ramo>`, iniciado a partir do `<ponto-de-partida>` e alterne para ele. O primeiro commit feito neste novo ramo n찾o ter찼 pais e ser찼 a raiz de um novo hist처rico totalmente desconectado de todos os outros ramos e commits." #. type: Plain text #: en/git-checkout.txt:224 -#, fuzzy, priority:240 -#| msgid "The index and the working tree are adjusted as if you had previously run `git checkout <start_point>`. This allows you to start a new history that records a set of paths similar to `<start_point>` by easily running `git commit -a` to make the root commit." +#, priority:240 msgid "The index and the working tree are adjusted as if you had previously run `git checkout <start-point>`. This allows you to start a new history that records a set of paths similar to `<start-point>` by easily running `git commit -a` to make the root commit." msgstr "O 챠ndice e a 찼rvore de trabalho s찾o ajustadas como se voc챗 tivesse rodado o comando `git checkout <ponto-de-partida>` antes. Isto permite que voc챗 inicie um novo hist처rico que registra um conjunto dos caminhos semelhante ao `<ponto-de-partida>` atrav챕s da execu챌찾o do comando `git commit -a` para fazer o commit principal." @@ -13196,8 +13081,7 @@ msgstr "Isso pode ser 첬til quando voc챗 quer publicar a 찼rvore a partir de um #. type: Plain text #: en/git-checkout.txt:237 -#, fuzzy, priority:240 -#| msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of `<start_point>`, then you should clear the index and the working tree right after creating the orphan branch by running `git rm -rf .` from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc." +#, priority:240 msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of `<start-point>`, then you should clear the index and the working tree right after creating the orphan branch by running `git rm -rf .` from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc." msgstr "Caso queira iniciar um hist처rico desconectado que registre um conjunto dos caminhos totalmente diferentes de um dos `<ponto-de-partida>`, limpe o 챠ndice e a 찼rvore de trabalho logo ap처s criar o ramo 처rf찾o executando o comando `git rm -rf.` Do cume da 찼rvore de trabalho. Depois, voc챗 estar찼 pronto para preparar os seus arquivos novos, populando novamente a 찼rvore de trabalho, copiando-os dos outros lugares, extraindo um tarball, etc." @@ -13251,10 +13135,9 @@ msgstr "--conflict=<estilo>" #. type: Plain text #: en/git-checkout.txt:270 en/git-restore.txt:96 en/git-switch.txt:141 -#, fuzzy, priority:280 -#| msgid "The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable. Possible values are \"merge\" (default) and \"diff3\" (in addition to what is shown by \"merge\" style, shows the original contents)." +#, priority:280 msgid "The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable. Possible values are \"merge\" (default), \"diff3\", and \"zdiff3\"." -msgstr "O mesmo que a op챌찾o `--merge` acima, por챕m altera a maneira como os blocos conflitantes s찾o apresentados, ao substituir a vari찼vel de configura챌찾o `merge.conflictStyle`. Os valores poss챠veis s찾o `merge` (predefinido) e `diff3` (al챕m do que 챕 exibido atrav챕s do estilo \"merge\", exibe os conte첬dos originais)." +msgstr "O mesmo que a op챌찾o `--merge` acima, por챕m altera a maneira como os blocos conflitantes s찾o apresentados, ao substituir a vari찼vel de configura챌찾o `merge.conflictStyle`. Os valores poss챠veis s찾o `merge` (predefinido), \"diff3\" e \"zdiff3\"." #. type: Plain text #: en/git-checkout.txt:277 @@ -14034,19 +13917,12 @@ msgstr "git-cherry-pick - Aplique as altera챌천es introduzidas por alguns commit #. type: Plain text #: en/git-cherry-pick.txt:14 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "" -#| "'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]\n" -#| "\t\t [-S[<keyid>]] <commit>...\n" -#| "'git cherry-pick' (--continue | --skip | --abort | --quit)\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git cherry-pick' [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n" "\t\t [-S[<keyid>]] <commit>...\n" "'git cherry-pick' (--continue | --skip | --abort | --quit)\n" -msgstr "" -"'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]\n" -"\t\t [-S[<keyid>]] <commit>...\n" -"'git cherry-pick' (--continue | --skip | --abort | --quit)\n" +msgstr "'git cherry-pick' [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n\t\t [-S[<keyid>]] <commit>...\n'git cherry-pick' (--continue | --skip | --abort | --quit)\n" #. type: Plain text #: en/git-cherry-pick.txt:21 @@ -14153,10 +14029,9 @@ msgstr "-m parent-number" #. type: Labeled list #: en/git-cherry-pick.txt:85 -#, fuzzy, no-wrap, priority:100 -#| msgid "--mainline parent-number" +#, no-wrap, priority:100 msgid "--mainline <parent-number>" -msgstr "--mainline parent-number" +msgstr "--mainline <n첬mero-relacionado>" #. type: Plain text #: en/git-cherry-pick.txt:91 @@ -14908,17 +14783,7 @@ msgstr "git-clone - Clona um reposit처rio em um novo diret처rio" #. type: Plain text #: en/git-clone.txt:21 -#, fuzzy, no-wrap, priority:300 -#| msgid "" -#| "'git clone' [--template=<template_directory>]\n" -#| "\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n" -#| "\t [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]\n" -#| "\t [--dissociate] [--separate-git-dir <git dir>]\n" -#| "\t [--depth <depth>] [--[no-]single-branch] [--no-tags]\n" -#| "\t [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n" -#| "\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n" -#| "\t [--filter=<filter>] [--] <repository>\n" -#| "\t [<directory>]\n" +#, no-wrap, priority:300 msgid "" "'git clone' [--template=<template-directory>]\n" "\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n" @@ -14929,16 +14794,7 @@ msgid "" "\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n" "\t [--filter=<filter>] [--] <repository>\n" "\t [<directory>]\n" -msgstr "" -"'git clone' [--template=<diret처rio-modelo>]\n" -"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n" -"\t [-o <nome>] [-b <nome>] [-u <upload-pack>] [--reference <reposit처rio>]\n" -"\t [--dissociate] [--separate-git-dir <dir git>]\n" -"\t [--depth <profundidade>] [--[no-]single-branch] [--no-tags]\n" -"\t [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n" -"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n" -"\t [--filter=<filter>] [--] <reposit처rio>\n" -"\t [<diret처rio>]\n" +msgstr "'git clone' [--template=<diret처rio-modelo>]\n\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n\t [-o <nome>] [-b <nome>] [-u <upload-pack>] [--reference <reposit처rio>]\n\t [--dissociate] [--separate-git-dir <dir-git>]\n\t [--depth <profundidade>] [--[no-]single-branch] [--no-tags]\n\t [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]\n\t [--filter=<filter>] [--] <reposit처rio>\n\t [<diret처rio>]\n" #. type: Plain text #: en/git-clone.txt:30 @@ -15132,10 +14988,9 @@ msgstr "Fa챌a um reposit처rio Git 'vazio'. Ou seja, em vez de criar o `<diret처 #. type: Plain text #: en/git-clone.txt:174 -#, fuzzy, priority:300 -#| msgid "Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed." +#, priority:300 msgid "Employ a sparse-checkout, with only files in the toplevel directory initially being present. The linkgit:git-sparse-checkout[1] command can be used to grow the working directory as needed." -msgstr "Inicialize a averigua챌찾o esparsa para que o diret처rio de trabalho comece apenas com os arquivos na raiz do reposit처rio. O arquivo \"checkout esparso\" pode ser modificado para aumentar o diret처rio de trabalho conforme a necessidade." +msgstr "Empregue a averigua챌찾o esparsa (sparse-checkout), apenas nos arquivos inicialmente presentes no diret처rio do primeiro n챠vel. O comando linkgit:git-sparse-checkout[1] para aumentar o diret처rio de trabalho sempre que for necess찼rio." #. type: Labeled list #: en/git-clone.txt:175 en/git-pack-objects.txt:270 en/rev-list-options.txt:883 @@ -15211,8 +15066,7 @@ msgstr "Quando informado e o reposit처rio a ser clonado for acess챠vel atrav챕s #. type: Labeled list #: en/git-clone.txt:214 en/git-init.txt:60 en/git-svn.txt:578 -#, fuzzy, no-wrap, priority:300 -#| msgid "--template=<template_directory>" +#, no-wrap, priority:300 msgid "--template=<template-directory>" msgstr "--template=<diret처rio-modelo>" @@ -15338,10 +15192,9 @@ msgstr "Todos os subm처dulos que forem clonados, para realizar a atualiza챌찾o o #. type: Labeled list #: en/git-clone.txt:297 en/git-init.txt:65 -#, fuzzy, no-wrap, priority:300 -#| msgid "--separate-git-dir=<git dir>" +#, no-wrap, priority:300 msgid "--separate-git-dir=<git-dir>" -msgstr "--separate-git-dir=<dir git>" +msgstr "--separate-git-dir=<dir-git>" #. type: Plain text #: en/git-clone.txt:303 @@ -16157,7 +16010,7 @@ msgstr "--[no-]verify" #: en/git-commit.txt:219 #, priority:280 msgid "By default, the pre-commit and commit-msg hooks are run. When any of `--no-verify` or `-n` is given, these are bypassed. See also linkgit:githooks[5]." -msgstr "" +msgstr "횋 predefinido que os ganchos pre-commit e commit-msg sejam executados. Quando qualquer uma das op챌천es `--no-verify` ou `-n` s찾o usadas, elas s찾o ignoradas. Consulte tamb챕m linkgit:githooks[5]." #. type: Plain text #: en/git-commit.txt:225 @@ -16879,17 +16732,15 @@ msgstr "Como a op챌찾o `--get-all`, por챕m interpreta o nome como uma express찾o #. type: Labeled list #: en/git-config.txt:105 -#, fuzzy, no-wrap, priority:100 -#| msgid "--get-urlmatch name URL" +#, no-wrap, priority:100 msgid "--get-urlmatch <name> <URL>" -msgstr "--get-urlmatch nome URL" +msgstr "--get-urlmatch <nome> <URL>" #. type: Plain text #: en/git-config.txt:112 -#, fuzzy, priority:100 -#| msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback). When given just the section as name, do so for all the keys in the section and list them. Returns error code 1 if no value is found." +#, priority:100 msgid "When given a two-part name section.key, the value for section.<URL>.key whose <URL> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback). When given just the section as name, do so for all the keys in the section and list them. Returns error code 1 if no value is found." -msgstr "Quando 챕 utilizado em um nome com duas partes `section.key`, o valor da `section.<url>.key` cuja parte da <url> coincida para o retorno da melhor URL informada (caso essa chave n찾o exista, o valor do `section.key` ser찼 usado como substituto). Quando receber apenas a se챌찾o como nome, fa챌a-o para todas as chaves da se챌찾o e liste-as. Retorna o c처digo de erro 1 caso nenhum valor seja encontrado." +msgstr "Quando 챕 utilizado em um nome com duas partes `section.key`, o valor da `section.<URL>.key` cuja parte da <URL> coincida para o retorno da melhor URL informada (caso essa chave n찾o exista, o valor do `section.key` ser찼 usado como substituto). Quando receber apenas a se챌찾o como nome, fa챌a-o para todas as chaves da se챌찾o e liste-as. Retorna o c처digo de erro 1 caso nenhum valor seja encontrado." #. type: Labeled list #: en/git-config.txt:113 @@ -16959,17 +16810,15 @@ msgstr "Semelhante a op챌찾o `--local`, exceto que o a op챌찾o de configura챌찾o #. type: Labeled list #: en/git-config.txt:148 -#, fuzzy, no-wrap, priority:100 -#| msgid "-f config-file" +#, no-wrap, priority:100 msgid "-f <config-file>" -msgstr "-f arquivo-config" +msgstr "-f <arquivo-de-config>" #. type: Labeled list #: en/git-config.txt:149 -#, fuzzy, no-wrap, priority:100 -#| msgid "--file config-file" +#, no-wrap, priority:100 msgid "--file <config-file>" -msgstr "--file arquivo-config" +msgstr "--file <arquivo-de-config>" #. type: Plain text #: en/git-config.txt:152 @@ -16985,10 +16834,9 @@ msgstr "Para as op챌천es da leitura: leia somente no arquivo definido em vez de #. type: Labeled list #: en/git-config.txt:158 -#, fuzzy, no-wrap, priority:100 -#| msgid "--blob blob" +#, no-wrap, priority:100 msgid "--blob <blob>" -msgstr "--blob blob" +msgstr "--blob <bolha>" #. type: Plain text #: en/git-config.txt:164 @@ -17202,24 +17050,21 @@ msgstr "Semelhante a op챌찾o `--show-origin`, na medida em que aumenta a sa챠da #. type: Labeled list #: en/git-config.txt:249 -#, fuzzy, no-wrap, priority:100 -#| msgid "--get-colorbool name [stdout-is-tty]" +#, no-wrap, priority:100 msgid "--get-colorbool <name> [<stdout-is-tty>]" -msgstr "--get-colorbool nome [stdout-is-tty]" +msgstr "--get-colorbool <nome> [<stdout-is-tty>]" #. type: Plain text #: en/git-config.txt:259 -#, fuzzy, priority:100 -#| msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback." +#, priority:100 msgid "Find the color setting for `<name>` (e.g. `color.diff`) and output \"true\" or \"false\". `<stdout-is-tty>` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `<stdout-is-tty>` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback." -msgstr "Encontre a configura챌찾o das cores para `nome` (por exemplo, `color.diff`) e gere 'true' ou 'false'. O `stdout-is-tty` deve ser 'true' ou 'false' e 챕 levado em considera챌찾o quando a configura챌찾o diz \"auto\". Caso `stdout-is-tty` esteja ausente, verifique a sa챠da padr찾o do pr처prio comando e encerre com a condi챌찾o '0' caso a cor deva ser utilizada, ou caso contr찼rio, encerre com a condi챌찾o '1'. Quando a configura챌찾o das cores para `nome` for indefinida, o comando retroage e em vez disso usa `color.ui`." +msgstr "Encontre a configura챌찾o das cores para `<nome>` (por exemplo, `color.diff`) e gere 'true' ou 'false'. O `<stdout-is-tty>` deve ser 'true' ou 'false' e 챕 levado em considera챌찾o quando a configura챌찾o diz \"auto\". Caso `<stdout-is-tty>` esteja ausente, verifique a sa챠da padr찾o do pr처prio comando e encerre com a condi챌찾o '0' caso a cor deva ser utilizada, ou caso contr찼rio, encerre com a condi챌찾o '1'. Quando a configura챌찾o das cores para `nome` for indefinida, o comando retroage e em vez disso usa `color.ui`." #. type: Labeled list #: en/git-config.txt:260 -#, fuzzy, no-wrap, priority:100 -#| msgid "--get-color name [default]" +#, no-wrap, priority:100 msgid "--get-color <name> [<default>]" -msgstr "--get-color nome [default]" +msgstr "--get-color <nome> [<padr찾o>]" #. type: Plain text #: en/git-config.txt:266 @@ -18169,10 +18014,9 @@ msgstr "git-credential - Recupere e armazene as credenciais do usu찼rio" #. type: delimited block - #: en/git-credential.txt:12 -#, fuzzy, no-wrap, priority:100 -#| msgid "git credential <fill|approve|reject>\n" +#, no-wrap, priority:100 msgid "'git credential' (fill|approve|reject)\n" -msgstr "git credential <fill|approve|reject>\n" +msgstr "'git credential' (fill|approve|reject)\n" #. type: Plain text #: en/git-credential.txt:24 @@ -18424,16 +18268,11 @@ msgstr "git-cvsexportcommit - Exportar um 첬nico commit para uma averigua챌찾o d #. type: Plain text #: en/git-cvsexportcommit.txt:14 -#, fuzzy, no-wrap, priority:90 -#| msgid "" -#| "'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]\n" -#| "\t[-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID\n" +#, no-wrap, priority:90 msgid "" "'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d <cvsroot>]\n" "\t[-w <cvs-workdir>] [-W] [-f] [-m <msgprefix>] [<parent-commit>] <commit-id>\n" -msgstr "" -"'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]\n" -"\t[-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID\n" +msgstr "'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d <cvsroot>]\n\t[-w <cvs-workdir>] [-W] [-f] [-m <msgprefix>] [<commit-relacionado>] <id-do-commit>\n" #. type: Plain text #: en/git-cvsexportcommit.txt:20 @@ -18613,25 +18452,14 @@ msgstr "git-cvsimport - Recupere seus dados de outro SCM que as pessoas amam odi #. type: Plain text #: en/git-cvsimport.txt:17 -#, fuzzy, no-wrap, priority:90 -#| msgid "" -#| "'git cvsimport' [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>]\n" -#| "\t [-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>]\n" -#| "\t [-C <git_repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]\n" -#| "\t [-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>]\n" -#| "\t [-r <remote>] [-R] [<CVS_module>]\n" +#, no-wrap, priority:90 msgid "" "'git cvsimport' [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>]\n" "\t [-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>]\n" "\t [-C <git-repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]\n" "\t [-a] [-m] [-M <regex>] [-S <regex>] [-L <commit-limit>]\n" "\t [-r <remote>] [-R] [<CVS-module>]\n" -msgstr "" -"'git cvsimport' [-o <ramo-para-o-HEAD>] [-h] [-v] [-d <CVSROOT>]\n" -"\t [-A <arquivos-conv-do-autor>] [-p <op챌천es-para-o-cvsps>] [-P <arquivo>]\n" -"\t [-C <reposit처rio-git>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]\n" -"\t [-a] [-m] [-M <express찾o-regular>] [-S <express찾o-regular>] [-L <commitlimit>]\n" -"\t [-r <remoto>] [-R] [<m처dulo-CVS>]\n" +msgstr "'git cvsimport' [-o <ramo-para-o-HEAD>] [-h] [-v] [-d <CVSROOT>]\n\t [-A <arquivos-conv-do-autor>] [-p <op챌천es-para-o-cvsps>] [-P <arquivo>]\n\t [-C <reposit처rio-git>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]\n\t [-a] [-m] [-M <express찾o-regular>] [-S <express찾o-regular>] [-L <limite-do-commit>]\n\t [-r <remoto>] [-R] [<m처dulo-CVS>]\n" #. type: Plain text #: en/git-cvsimport.txt:26 @@ -18703,8 +18531,7 @@ msgstr "A raiz do arquivo CVS. Pode ser local (um caminho simples) ou remoto; at #. type: Labeled list #: en/git-cvsimport.txt:62 -#, fuzzy, no-wrap, priority:90 -#| msgid "<CVS_module>" +#, no-wrap, priority:90 msgid "<CVS-module>" msgstr "<m처dulo-CVS>" @@ -20710,8 +20537,7 @@ msgstr "git-diff-files - Compara os arquivos na 찼rvore de trabalho e no 챠ndice #. type: Plain text #: en/git-diff-files.txt:13 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common-diff-options>] [<path>...]\n" msgstr "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<op챌천es-comuns-ao-diff>] [<caminho>...]\n" @@ -20783,8 +20609,7 @@ msgstr "git-diff-index - Compara uma 찼rvore com a 찼rvore ou 챠ndice de trabalh #. type: Plain text #: en/git-diff-index.txt:13 -#, fuzzy, ignore-ellipsis, no-wrap, priority:80 -#| msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>...]\n" +#, ignore-ellipsis, no-wrap, priority:80 msgid "'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]\n" msgstr "'git diff-index' [-m] [--cached] [--merge-base] [<op챌천es-comuns-ao-diff>] <찼rvore> [<caminho>...]\n" @@ -21306,19 +21131,12 @@ msgstr "git-diff-tree - Compara o conte첬do e o modo das bolhas encontradas atra #. type: Plain text #: en/git-diff-tree.txt:15 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "" -#| "'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n" -#| "\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n" -#| "\t [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n" "\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n" "\t [<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]\n" -msgstr "" -"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n" -"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n" -"\t [<op챌천es-comuns-ao-diff>] <찼rvore> [<찼rvore>] [<caminho>...]\n" +msgstr "'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]\n\t [<op챌천es-comuns-ao-diff>] <찼rvore> [<찼rvore>] [<caminho>...]\n" #. type: Plain text #: en/git-diff-tree.txt:19 @@ -26322,16 +26140,11 @@ msgstr "git-fmt-merge-msg - Gera uma mensagem de commit da mesclagem" #. type: Plain text #: en/git-fmt-merge-msg.txt:14 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| "'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log]\n" -#| "'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file>\n" +#, no-wrap, priority:100 msgid "" "'git fmt-merge-msg' [-m <message>] [--into-name <branch>] [--log[=<n>] | --no-log]\n" "'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file>\n" -msgstr "" -"'git fmt-merge-msg' [-m <mensagem>] [--log[=<n>] | --no-log]\n" -"'git fmt-merge-msg' [-m <mensagem>] [--log[=<n>] | --no-log] -F <arquivo>\n" +msgstr "'git fmt-merge-msg' [-m <mensagem>] [--into-name <ramo>] [--log[=<n>] | --no-log]\n'git fmt-merge-msg' [-m <mensagem>] [--log[=<n>] | --no-log] -F <arquivo>\n" #. type: Plain text #: en/git-fmt-merge-msg.txt:20 @@ -26395,10 +26208,9 @@ msgstr "Para a primeira linha da mensagem do registro log utilize `<mensagem>` e #. type: Labeled list #: en/git-fmt-merge-msg.txt:47 en/git-merge.txt:80 -#, fuzzy, no-wrap, priority:240 -#| msgid "--state-branch <branch>" +#, no-wrap, priority:240 msgid "--into-name <branch>" -msgstr "--state-branch <ramo>" +msgstr "--into-name <ramo>" #. type: Plain text #: en/git-fmt-merge-msg.txt:50 @@ -27180,31 +26992,7 @@ msgstr "git-format-patch - Preparar os patches para o envio de e-mails" #. type: Plain text #: en/git-format-patch.txt:35 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| "'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]\n" -#| "\t\t [--no-thread | --thread[=<style>]]\n" -#| "\t\t [(--attach|--inline)[=<boundary>] | --no-attach]\n" -#| "\t\t [-s | --signoff]\n" -#| "\t\t [--signature=<signature> | --no-signature]\n" -#| "\t\t [--signature-file=<file>]\n" -#| "\t\t [-n | --numbered | -N | --no-numbered]\n" -#| "\t\t [--start-number <n>] [--numbered-files]\n" -#| "\t\t [--in-reply-to=<message id>] [--suffix=.<sfx>]\n" -#| "\t\t [--ignore-if-in-upstream]\n" -#| "\t\t [--cover-from-description=<mode>]\n" -#| "\t\t [--rfc] [--subject-prefix=<subject prefix>]\n" -#| "\t\t [(--reroll-count|-v) <n>]\n" -#| "\t\t [--to=<email>] [--cc=<email>]\n" -#| "\t\t [--[no-]cover-letter] [--quiet]\n" -#| "\t\t [--[no-]encode-email-headers]\n" -#| "\t\t [--no-notes | --notes[=<ref>]]\n" -#| "\t\t [--interdiff=<previous>]\n" -#| "\t\t [--range-diff=<previous> [--creation-factor=<percent>]]\n" -#| "\t\t [--filename-max-length=<n>]\n" -#| "\t\t [--progress]\n" -#| "\t\t [<common diff options>]\n" -#| "\t\t [ <since> | <revision range> ]\n" +#, no-wrap, priority:100 msgid "" "'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]\n" "\t\t [--no-thread | --thread[=<style>]]\n" @@ -27229,30 +27017,7 @@ msgid "" "\t\t [--progress]\n" "\t\t [<common diff options>]\n" "\t\t [ <since> | <revision range> ]\n" -msgstr "" -"'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]\n" -"\t\t [--no-thread | --thread[=<estilo>]]\n" -"\t\t [(--attach|--inline)[=<limite>] | --no-attach]\n" -"\t\t [-s | --signoff]\n" -"\t\t [--signature=<assinatura> | --no-signature]\n" -"\t\t [--signature-file=<arquivo>]\n" -"\t\t [-n | --numbered | -N | --no-numbered]\n" -"\t\t [--start-number <n>] [--numbered-files]\n" -"\t\t [--in-reply-to=<id-da-mensagem>] [--suffix=.<sfx>]\n" -"\t\t [--ignore-if-in-upstream]\n" -"\t\t [--cover-from-description=<modo>]\n" -"\t\t [--rfc] [--subject-prefix=<subject prefix>]\n" -"\t\t [(--reroll-count|-v) <n>]\n" -"\t\t [--to=<e-mail>] [--cc=<e-mail>]\n" -"\t\t [--[no-]cover-letter] [--quiet]\n" -"\t\t [--[no-]encode-email-headers]\n" -"\t\t [--no-notes | --notes[=<ref>]]\n" -"\t\t [--interdiff=<anterior>]\n" -"\t\t [--range-diff=<anterior> [--creation-factor=<percentual>]]\n" -"\t\t [--filename-max-length=<n>]\n" -"\t\t [--progress]\n" -"\t\t [<op챌천es-comuns-ao-diff>]\n" -"\t\t [ <desde> | <faixa-da-revis찾o> ]\n" +msgstr "'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]\n\t\t [--no-thread | --thread[=<estilo>]]\n\t\t [(--attach|--inline)[=<limite>] | --no-attach]\n\t\t [-s | --signoff]\n\t\t [--signature=<assinatura> | --no-signature]\n\t\t [--signature-file=<arquivo>]\n\t\t [-n | --numbered | -N | --no-numbered]\n\t\t [--start-number <n>] [--numbered-files]\n\t\t [--in-reply-to=<id-da-mensagem>] [--suffix=.<sfx>]\n\t\t [--ignore-if-in-upstream] [--always]\n\t\t [--cover-from-description=<modo>]\n\t\t [--rfc] [--subject-prefix=<subject prefix>]\n\t\t [(--reroll-count|-v) <n>]\n\t\t [--to=<e-mail>] [--cc=<e-mail>]\n\t\t [--[no-]cover-letter] [--quiet]\n\t\t [--[no-]encode-email-headers]\n\t\t [--no-notes | --notes[=<ref>]]\n\t\t [--interdiff=<anterior>]\n\t\t [--range-diff=<anterior> [--creation-factor=<percentual>]]\n\t\t [--filename-max-length=<n>]\n\t\t [--progress]\n\t\t [<op챌천es-comuns-ao-diff>]\n\t\t [ <desde> | <faixa-da-revis찾o> ]\n" #. type: Plain text #: en/git-format-patch.txt:43 @@ -28555,22 +28320,13 @@ msgstr "git-fsck - Verifica a conectividade e a validade dos objetos no banco de #. type: Plain text #: en/git-fsck.txt:16 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "" -#| "'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" -#| "\t [--[no-]full] [--strict] [--verbose] [--lost-found]\n" -#| "\t [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" -#| "\t [--[no-]name-objects] [<object>*]\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" "\t [--[no-]full] [--strict] [--verbose] [--lost-found]\n" "\t [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" "\t [--[no-]name-objects] [<object>...]\n" -msgstr "" -"'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" -"\t [--[no-]full] [--strict] [--verbose] [--lost-found]\n" -"\t [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" -"\t [--[no-]name-objects] [<objeto>*]\n" +msgstr "'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n\t [--[no-]full] [--strict] [--verbose] [--lost-found]\n\t [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n\t [--[no-]name-objects] [<objeto>...]\n" #. type: Plain text #: en/git-fsck.txt:25 @@ -29862,10 +29618,9 @@ msgstr "git-gui - Uma interface gr찼fica port찼til para o Git" #. type: Plain text #: en/git-gui.txt:12 -#, fuzzy, no-wrap, priority:100 -#| msgid "'git gui' [<command>] [arguments]\n" +#, no-wrap, priority:100 msgid "'git gui' [<command>] [<arguments>]\n" -msgstr "'git gui' [<comando>] [argumentos]\n" +msgstr "'git gui' [<comando>] [<argumentos>]\n" #. type: Plain text #: en/git-gui.txt:19 @@ -30179,29 +29934,19 @@ msgstr "git-help - Exiba informa챌천es de ajuda sobre o Git" #. type: Plain text #: en/git-help.txt:15 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| "'git help' [-a|--all [--[no-]verbose]]\n" -#| "\t [[-i|--info] [-m|--man] [-w|--web]] [COMMAND|GUIDE]\n" -#| "'git help' [-g|--guides]\n" -#| "'git help' [-c|--config]\n" +#, no-wrap, priority:100 msgid "" "'git help' [-a|--all [--[no-]verbose]]\n" "\t [[-i|--info] [-m|--man] [-w|--web]] [<command>|<guide>]\n" "'git help' [-g|--guides]\n" "'git help' [-c|--config]\n" -msgstr "" -"'git help' [-a|--all [--[no-]verbose]]\n" -"\t [[-i|--info] [-m|--man] [-w|--web]] [COMMAND|GUIDE]\n" -"'git help' [-g|--guides]\n" -"'git help' [-c|--config]\n" +msgstr "'git help' [-a|--all [--[no-]verbose]]\n\t [[-i|--info] [-m|--man] [-w|--web]] [<comando>|<guia>]\n'git help' [-g|--guides]\n'git help' [-c|--config]\n" #. type: Plain text #: en/git-help.txt:22 -#, fuzzy, priority:100 -#| msgid "With no options and no COMMAND or GUIDE given, the synopsis of the 'git' command and a list of the most commonly used Git commands are printed on the standard output." +#, priority:100 msgid "With no options and no '<command>' or '<guide>' given, the synopsis of the 'git' command and a list of the most commonly used Git commands are printed on the standard output." -msgstr "Sem op챌천es e sem informar \"COMMAND\" ou \"GUIDE\", ser찾o exibidos na sa챠da padr찾o um resumo do comando 'git' e uma lista dos comandos Git mais comumente utilizados." +msgstr "Sem op챌천es e sem informar '<comando>' ou '<guia>', ser찾o exibidos na sa챠da padr찾o um resumo do comando 'git' e uma lista dos comandos Git mais comumente utilizados." #. type: Plain text #: en/git-help.txt:25 @@ -30223,10 +29968,9 @@ msgstr "Caso um comando, ou um guia, seja utilizado, uma p찼gina do manual para #. type: Plain text #: en/git-help.txt:37 -#, fuzzy, priority:100 -#| msgid "If an alias is given, git shows the definition of the alias on standard output. To get the manual page for the aliased command, use `git COMMAND --help`." +#, priority:100 msgid "If an alias is given, git shows the definition of the alias on standard output. To get the manual page for the aliased command, use `git <command> --help`." -msgstr "Caso um apelido seja utilizado, o git exibe a defini챌찾o do apelido na sa챠da padr찾o. Para ver a p찼gina do manual para o comando ou apelido em quest찾o, utilize `git COMMAND --help`." +msgstr "Caso um apelido seja utilizado, o git exibe a defini챌찾o do apelido na sa챠da padr찾o. Para ver a p찼gina do manual para o comando ou apelido em quest찾o, utilize `git <comando> --help`." #. type: Plain text #: en/git-help.txt:40 @@ -31096,10 +30840,9 @@ msgstr "git-http-fetch - Fa챌a o download de um reposit처rio Git remoto atrav챕s #. type: Plain text #: en/git-http-fetch.txt:13 -#, fuzzy, no-wrap, priority:100 -#| msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n" +#, no-wrap, priority:100 msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n" -msgstr "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w nome-do-arquivo] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n" +msgstr "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <nome-do-arquivo>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>\n" #. type: Plain text #: en/git-http-fetch.txt:17 @@ -31217,10 +30960,9 @@ msgstr "git-http-push - Impulsiona os objetos por HTTP/DAV para um outro reposit #. type: Plain text #: en/git-http-push.txt:13 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n" -msgstr "'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]\n" +msgstr "'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]\n" #. type: Plain text #: en/git-http-push.txt:18 @@ -31314,24 +31056,21 @@ msgstr "Uma especifica챌찾o '<ref>' pode ser um padr찾o 첬nico ou um par desses #. type: Plain text #: en/git-http-push.txt:70 -#, fuzzy, priority:100 -#| msgid "Each pattern pair consists of the source side (before the colon) and the destination side (after the colon). The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side." +#, priority:100 msgid "Each pattern pair '<src>:<dst>' consists of the source side (before the colon) and the destination side (after the colon). The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side." -msgstr "Cada par de padr천es consiste no lado da origem (antes dos dois pontos) e no lado do destino (depois dos dois pontos). O \"ref\" a ser impulsionado 챕 determinado ao localizar uma coincid챗ncia que corresponda com a origem, a localiza챌찾o da origem 챕 determinada utilizando o lado do destino." +msgstr "Cada par de padr천es '<src>:<dst>' consiste no lado da origem (antes dos dois pontos) e no lado do destino (depois dos dois pontos). O \"ref\" a ser impulsionado 챕 determinado ao localizar uma coincid챗ncia que corresponda com a origem, a localiza챌찾o da origem 챕 determinada utilizando o lado do destino." #. type: Plain text #: en/git-http-push.txt:73 -#, fuzzy, priority:100 -#| msgid "It is an error if <src> does not match exactly one of the local refs." +#, priority:100 msgid "It is an error if '<src>' does not match exactly one of the local refs." -msgstr "횋 um erro caso `<src>` n찾o corresponda exatamente a um dos `refs` locais." +msgstr "횋 um erro caso '<src>' n찾o corresponda exatamente a um dos refs locais." #. type: Plain text #: en/git-http-push.txt:75 -#, fuzzy, priority:100 -#| msgid "If <dst> does not match any remote ref, either" +#, priority:100 msgid "If '<dst>' does not match any remote ref, either" -msgstr "Caso `<dst>` n찾o corresponda a nenhum `ref` remoto" +msgstr "Caso '<dst>' n찾o corresponda a nenhum 'ref' remoto" #. type: Plain text #: en/git-http-push.txt:78 en/git-send-pack.txt:138 @@ -31813,10 +31552,9 @@ msgstr "git-init-db - Cria um reposit처rio Git vazio" #. type: Plain text #: en/git-init-db.txt:13 -#, fuzzy, no-wrap, priority:100 -#| msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]\n" +#, no-wrap, priority:100 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]\n" -msgstr "'git init-db' [-q | --quiet] [--bare] [--template=<diret처rio-modelo>] [--separate-git-dir <dir git>] [--shared[=<permiss천es>]]\n" +msgstr "'git init-db' [-q | --quiet] [--bare] [--template=<diret처rio-modelo>] [--separate-git-dir <dir-git>] [--shared[=<permiss천es>]]\n" #. type: Plain text #: en/git-init-db.txt:20 @@ -31838,22 +31576,13 @@ msgstr "git-init - Cria um reposit처rio Git vazio ou reinicializa um j찼 existen #. type: Plain text #: en/git-init.txt:16 -#, fuzzy, no-wrap, priority:300 -#| msgid "" -#| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n" -#| "\t [--separate-git-dir <git dir>] [--object-format=<format>]\n" -#| "\t [-b <branch-name> | --initial-branch=<branch-name>]\n" -#| "\t [--shared[=<permissions>]] [directory]\n" +#, no-wrap, priority:300 msgid "" "'git init' [-q | --quiet] [--bare] [--template=<template-directory>]\n" "\t [--separate-git-dir <git-dir>] [--object-format=<format>]\n" "\t [-b <branch-name> | --initial-branch=<branch-name>]\n" "\t [--shared[=<permissions>]] [<directory>]\n" -msgstr "" -"'git init' [-q | --quiet] [--bare] [--template=<diret처rio-modelo>]\n" -"\t [--separate-git-dir <dir git>] [--object-format=<formato>]\n" -"\t [-b <nome-do-ramo> | --initial-branch=<nome-do-ramo>]\n" -"\t [--shared[=<permiss천es>]] [diret처rio]\n" +msgstr "'git init' [-q | --quiet] [--bare] [--template=<diret처rio-modelo>]\n\t [--separate-git-dir <dir-git>] [--object-format=<formato>]\n\t [-b <nome-do-ramo> | --initial-branch=<nome-do-ramo>]\n\t [--shared[=<permiss천es>]] [<diret처rio>]\n" #. type: Plain text #: en/git-init.txt:26 @@ -31941,10 +31670,9 @@ msgstr "Use o nome definido para o ramo inicial no reposit처rio que foi rec챕m-c #. type: Labeled list #: en/git-init.txt:82 -#, fuzzy, no-wrap, priority:300 -#| msgid "--shared[=(false|true|umask|group|all|world|everybody)]" +#, no-wrap, priority:300 msgid "--shared[=(false|true|umask|group|all|world|everybody|<perm>)]" -msgstr "--shared[=(false|true|umask|group|all|world|everybody)]" +msgstr "--shared[=(false|true|umask|group|all|world|everybody|<perm>)]" #. type: Plain text #: en/git-init.txt:90 @@ -31998,14 +31726,13 @@ msgstr "O mesmo que 'group', mas torna o reposit처rio leg챠vel por todos os usu #: en/git-init.txt:113 #, no-wrap, priority:300 msgid "'<perm>'" -msgstr "" +msgstr "'<perm>'" #. type: Plain text #: en/git-init.txt:123 -#, fuzzy, priority:300 -#| msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others." +#, priority:300 msgid "'<perm>' is a 3-digit octal number prefixed with `0` and each file will have mode '<perm>'. '<perm>' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others (directories and executable files get their `x` bit from the `r` bit for corresponding classes of users)." -msgstr "'0xxx' 챕 um n첬mero octal e cada arquivo ter찼 o modo '0xxx'. '0xxx' substituir찼 o valor `umask(2)` dos usu찼rios (e n찾o apenas diminuir찼 as permiss천es como 'group' e 'all'). '0640' criar찼 um reposit처rio de apenas leitura por grupo, sem permiss찾o escrita ou acess챠vel a outros. '0660' criar찼 um reposit처rio com permiss찾o de leitura e escrita ao usu찼rio e ao grupo atual, por챕m, inacess챠vel aos outros." +msgstr "'<perm>' 챕 um n첬mero octal com 3 d챠gitos prefixado com `0` e cada arquivo ter찼 o modo '<perm>'. '<perm>' substituir찼 o valor `umask(2)` dos usu찼rios (e n찾o apenas diminuir찼 as permiss천es como 'group' e 'all'). '0640' criar찼 um reposit처rio de apenas leitura por grupo, sem permiss찾o escrita ou acess챠vel a outros. '0660' criar찼 um reposit처rio com permiss찾o de leitura e escrita ao usu찼rio e ao grupo atual, por챕m, inacess챠vel aos outros (os diret처rios e os arquivos execut찼veis recebem seu bit 'x' do bit 'r' para as classes correspondentes dos usu찼rios)." #. type: Plain text #: en/git-init.txt:128 @@ -33137,8 +32864,7 @@ msgstr "git-log - Exibe os registros log do commit" #. type: Plain text #: en/git-log.txt:13 -#, fuzzy, ignore-ellipsis, no-wrap, priority:260 -#| msgid "'git log' [<options>] [<revision range>] [[--] <path>...]\n" +#, ignore-ellipsis, no-wrap, priority:260 msgid "'git log' [<options>] [<revision-range>] [[--] <path>...]\n" msgstr "'git log' [<op챌천es>] [<intervalo-das-revis천es>] [[--] <caminho>...]\n" @@ -33264,17 +32990,15 @@ msgstr "Inclua uma linha ``log size <n첬mero>'' na sa챠da para cada commit, onde #. type: Labeled list #: en/git-log.txt:84 en/git-shortlog.txt:92 -#, fuzzy, no-wrap, priority:260 -#| msgid "<revision range>" +#, no-wrap, priority:260 msgid "<revision-range>" -msgstr "<intervalo da revis찾o>" +msgstr "<intervalo-da-revis찾o>" #. type: Plain text #: en/git-log.txt:92 -#, fuzzy, priority:260 -#| msgid "Show only commits in the specified revision range. When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit). `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]." +#, priority:260 msgid "Show only commits in the specified revision range. When no <revision-range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit). `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision-range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]." -msgstr "Exibe apenas os commits no intervalo definido das revis천es. Quando um <intervalo de revis찾o> n찾o 챕 definido, a predefini챌찾o retorna para `HEAD` (ou seja, todo o hist처rico que leva ao commit atual). O `origin..HEAD` define todos os commits acess챠veis a partir do commit atual (ou seja, `HEAD`), por챕m n찾o a partir do `origin`. Para obter uma lista mais completa de maneiras de soletrar os nomes dos objetos, consulte a se챌찾o \"DEFININDO OS INTERVALOS\" no linkgit:gitrevisions[7]." +msgstr "Exibe apenas os commits no intervalo definido das revis천es. Quando um <intervalo-da-revis찾o> n찾o 챕 definido, a predefini챌찾o retorna para `HEAD` (ou seja, todo o hist처rico que leva ao commit atual). O `origin..HEAD` define todos os commits acess챠veis a partir do commit atual (ou seja, `HEAD`), por챕m n찾o a partir do `origin`. Para obter uma lista mais completa de maneiras de soletrar o <intervalo-da-revis찾o>, consulte a se챌찾o \"DEFININDO OS INTERVALOS\" no linkgit:gitrevisions[7]." #. type: Labeled list #: en/git-log.txt:93 en/git-shortlog.txt:101 @@ -33566,20 +33290,7 @@ msgstr "git-ls-files - Exiba as informa챌천es sobre os arquivos no 챠ndice e na #. type: Plain text #: en/git-ls-files.txt:24 -#, fuzzy, ignore-ellipsis, no-wrap, priority:80 -#| msgid "" -#| "'git ls-files' [-z] [-t] [-v] [-f]\n" -#| "\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*\n" -#| "\t\t(-[c|d|o|i|s|u|k|m])*\n" -#| "\t\t[--eol]\n" -#| "\t\t[--deduplicate]\n" -#| "\t\t[-x <pattern>|--exclude=<pattern>]\n" -#| "\t\t[-X <file>|--exclude-from=<file>]\n" -#| "\t\t[--exclude-per-directory=<file>]\n" -#| "\t\t[--exclude-standard]\n" -#| "\t\t[--error-unmatch] [--with-tree=<tree-ish>]\n" -#| "\t\t[--full-name] [--recurse-submodules]\n" -#| "\t\t[--abbrev[=<n>]] [--] [<file>...]\n" +#, ignore-ellipsis, no-wrap, priority:80 msgid "" "'git ls-files' [-z] [-t] [-v] [-f]\n" "\t\t[-c|--cached] [-d|--deleted] [-o|--others] [-i|--|ignored]\n" @@ -33593,19 +33304,7 @@ msgid "" "\t\t[--error-unmatch] [--with-tree=<tree-ish>]\n" "\t\t[--full-name] [--recurse-submodules]\n" "\t\t[--abbrev[=<n>]] [--] [<file>...]\n" -msgstr "" -"'git ls-files' [-z] [-t] [-v] [-f]\n" -"\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*\n" -"\t\t(-[c|d|o|i|s|u|k|m])*\n" -"\t\t[--eol]\n" -"\t\t[--deduplicate]\n" -"\t\t[-x <padr찾o>|--exclude=<padr찾o>]\n" -"\t\t[-X <arquivo>|--exclude-from=<arquivo>]\n" -"\t\t[--exclude-per-directory=<arquivo>]\n" -"\t\t[--exclude-standard]\n" -"\t\t[--error-unmatch] [--with-tree=<찼rvore>]\n" -"\t\t[--full-name] [--recurse-submodules]\n" -"\t\t[--abbrev[=<n>]] [--] [<arquivo>...]\n" +msgstr "'git ls-files' [-z] [-t] [-v] [-f]\n\t\t[-c|--cached] [-d|--deleted] [-o|--others] [-i|--|ignored]\n\t\t[-s|--stage] [-u|--unmerged] [-k|--|killed] [-m|--modified]\n\t\t[--directory [--no-empty-directory]] [--eol]\n\t\t[--deduplicate]\n\t\t[-x <padr찾o>|--exclude=<padr찾o>]\n\t\t[-X <arquivo>|--exclude-from=<arquivo>]\n\t\t[--exclude-per-directory=<arquivo>]\n\t\t[--exclude-standard]\n\t\t[--error-unmatch] [--with-tree=<찼rvore>]\n\t\t[--full-name] [--recurse-submodules]\n\t\t[--abbrev[=<n>]] [--] [<arquivo>...]\n" #. type: Plain text #: en/git-ls-files.txt:29 @@ -35225,10 +34924,9 @@ msgstr "--zdiff3" #. type: Plain text #: en/git-merge-file.txt:75 -#, fuzzy, priority:90 -#| msgid "Show conflicts in \"diff3\" style." +#, priority:90 msgid "Show conflicts in \"zdiff3\" style." -msgstr "Exibe conflitos no estilo \"diff3\"." +msgstr "Exibe conflitos no estilo \"zdiff3\"." #. type: Labeled list #: en/git-merge-file.txt:78 @@ -35280,10 +34978,9 @@ msgstr "git-merge-index - Executa uma mesclagem para os arquivos que precisam se #. type: Plain text #: en/git-merge-index.txt:13 -#, fuzzy, ignore-ellipsis, no-wrap, priority:90 -#| msgid "'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*)\n" +#, ignore-ellipsis, no-wrap, priority:90 msgid "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )\n" -msgstr "'git merge-index' [-o] [-q] <merge-program> (-a | [--] <arquivo>*)\n" +msgstr "'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <arquivo>...) )\n" #. type: Plain text #: en/git-merge-index.txt:20 @@ -35681,13 +35378,7 @@ msgstr "git-merge - Une dois ou mais hist처ricos de desenvolvimento" #. type: Plain text #: en/git-merge.txt:18 -#, fuzzy, ignore-ellipsis, no-wrap, priority:240 -#| msgid "" -#| "'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n" -#| "\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n" -#| "\t[--[no-]allow-unrelated-histories]\n" -#| "\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n" -#| "'git merge' (--continue | --abort | --quit)\n" +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n" "\t[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]\n" @@ -35695,12 +35386,7 @@ msgid "" "\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>]\n" "\t[--into-name <branch>] [<commit>...]\n" "'git merge' (--continue | --abort | --quit)\n" -msgstr "" -"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n" -"\t[--no-verify] [-s <estrat챕gia>] [-X <op챌찾o-da-estrat챕gia>] [-S[<keyid>]]\n" -"\t[--[no-]allow-unrelated-histories]\n" -"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <arquivo>] [<commit>...]\n" -"'git merge' (--continue | --abort | --quit)\n" +msgstr "'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n\t[--no-verify] [-s <estrat챕gia>] [-X <op챌찾o-da-estrat챕gia>] [-S[<keyid>]]\n\t[--[no-]allow-unrelated-histories]\n\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <arquivo>] [<commit>...]\n\t[--into-name <ramo>] [<commit>...]\n'git merge' (--continue | --abort | --quit)\n" #. type: Plain text #: en/git-merge.txt:26 @@ -36010,17 +35696,7 @@ msgstr "횋 predefinido que o Git utilize o mesmo estilo que o utilizado pelo pro #. type: delimited block - #: en/git-merge.txt:258 -#, fuzzy, no-wrap, priority:240 -#| msgid "" -#| "Here are lines that are either unchanged from the common\n" -#| "ancestor, or cleanly resolved because only one side changed.\n" -#| "<<<<<<< yours:sample.txt\n" -#| "Conflict resolution is hard;\n" -#| "let's go shopping.\n" -#| "=======\n" -#| "Git makes conflict resolution easy.\n" -#| ">>>>>>> theirs:sample.txt\n" -#| "And here is another line that is cleanly resolved or unmodified.\n" +#, no-wrap, priority:240 msgid "" "Here are lines that are either unchanged from the common\n" "ancestor, or cleanly resolved because only one side changed,\n" @@ -36032,16 +35708,7 @@ msgid "" "Git makes conflict resolution easy.\n" ">>>>>>> theirs:sample.txt\n" "And here is another line that is cleanly resolved or unmodified.\n" -msgstr "" -"Aqui est찾o as linhas que n찾o s찾o alteradas em rela챌찾o ao ancestral\n" -"comum ou resolvido de maneira limpa porque apenas um lado mudou.\n" -"<<<<<<< yours:sample.txt\n" -"A resolu챌찾o de conflitos 챕 dif챠cil;\n" -"vamos 횪s compras.\n" -"=======\n" -"O Git facilita a resolu챌찾o de conflitos.\n" -">>>>>>> theirs:sample.txt\n" -"E aqui est찼 outra linha que foi claramente resolvida ou n찾o foi modificada.\n" +msgstr "Aqui est찾o as linhas que n찾o s찾o alteradas em rela챌찾o ao ancestral\ncomum ou resolvido de maneira limpa porque apenas um lado foi alterado\nou foi resolvido de forma limpa porque ambos os lados foram igualmente alterados.\n<<<<<<< yours:sample.txt\nA resolu챌찾o de conflitos 챕 dif챠cil;\nvamos 횪s compras.\n=======\nO Git facilita a resolu챌찾o de conflitos.\n>>>>>>> theirs:sample.txt\nE aqui est찼 outra linha que foi claramente resolvida ou n찾o foi modificada.\n" #. type: Plain text #: en/git-merge.txt:263 @@ -36057,10 +35724,9 @@ msgstr "O formato predefinido n찾o exibe o que o original disse na 찼rea conflit #. type: Plain text #: en/git-merge.txt:273 -#, fuzzy, priority:240 -#| msgid "An alternative style can be used by setting the \"merge.conflictStyle\" configuration variable to \"diff3\". In \"diff3\" style, the above conflict may look like this:" +#, priority:240 msgid "An alternative style can be used by setting the \"merge.conflictStyle\" configuration variable to either \"diff3\" or \"zdiff3\". In \"diff3\" style, the above conflict may look like this:" -msgstr "Um estilo alternativo pode ser utilizado ao definir a vari찼vel de configura챌찾o \"merge.conflictStyle\" como \"diff3\". No estilo \"diff3\", o conflito acima pode ser assim:" +msgstr "Um estilo alternativo pode ser utilizado ao definir a vari찼vel de configura챌찾o \"merge.conflictStyle\" para \"diff3\" ou \"zdiff3\". No estilo \"diff3\", o conflito acima pode ser assim:" #. type: delimited block - #: en/git-merge.txt:289 @@ -36107,10 +35773,9 @@ msgstr "" #. type: Plain text #: en/git-merge.txt:292 -#, fuzzy, priority:240 -#| msgid "A \"combined diff\" format looks like this:" +#, priority:240 msgid "while in \"zdiff3\" style, it may look like this:" -msgstr "Um formato \"diff combinado\" fica assim:" +msgstr "enquanto no estilo \"zdiff3\", por ficar assim:" #. type: delimited block - #: en/git-merge.txt:307 @@ -37290,22 +36955,13 @@ msgstr "git-p4 - Importe e envie para os reposit처rios Perforce" #. type: Plain text #: en/git-p4.txt:16 -#, fuzzy, ignore-ellipsis, no-wrap, priority:90 -#| msgid "" -#| "'git p4 clone' [<sync options>] [<clone options>] <p4 depot path>...\n" -#| "'git p4 sync' [<sync options>] [<p4 depot path>...]\n" -#| "'git p4 rebase'\n" -#| "'git p4 submit' [<submit options>] [<master branch name>]\n" +#, ignore-ellipsis, no-wrap, priority:90 msgid "" "'git p4 clone' [<sync-options>] [<clone-options>] <p4-depot-path>...\n" "'git p4 sync' [<sync-options>] [<p4-depot-path>...]\n" "'git p4 rebase'\n" "'git p4 submit' [<submit-options>] [<master-branch-name>]\n" -msgstr "" -"'git p4 clone' [<op챌천es-de-sincronismo>] [<op챌천es-da-clonagem>] <caminho-do-dep처sito-p4>...\n" -"'git p4 sync' [<op챌천es-de-sincronismo>] [<caminho-do-dep처sito-p4>...]\n" -"'git p4 rebase'\n" -"'git p4 submit' [<op챌천es-de-envio>] [<nome-do-ramo-master>]\n" +msgstr "'git p4 clone' [<op챌천es-de-sincronismo>] [<op챌천es-da-clonagem>] <caminho-do-dep처sito-p4>...\n'git p4 sync' [<op챌천es-de-sincronismo>] [<caminho-do-dep처sito-p4>...]\n'git p4 rebase'\n'git p4 submit' [<op챌천es-de-envio>] [<nome-do-ramo-master>]\n" #. type: Plain text #: en/git-p4.txt:22 @@ -37983,10 +37639,9 @@ msgstr "Ap처s o envio, sincronize esta ramifica챌찾o informada em vez da predefi #. type: Labeled list #: en/git-p4.txt:364 -#, fuzzy, no-wrap, priority:90 -#| msgid "--commit <sha1>|<sha1..sha1>" +#, no-wrap, priority:90 msgid "--commit (<sha1>|<sha1>..<sha1>)" -msgstr "--commit <sha1>|<sha1..sha1>" +msgstr "--commit (<sha1>|<sha1>..<sha1>)" #. type: Plain text #: en/git-p4.txt:367 @@ -38840,14 +38495,7 @@ msgstr "git-pack-objects - Crie um arquivo compactado dos objetos" #. type: Plain text #: en/git-pack-objects.txt:18 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| "'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied]\n" -#| "\t[--no-reuse-delta] [--delta-base-offset] [--non-empty]\n" -#| "\t[--local] [--incremental] [--window=<n>] [--depth=<n>]\n" -#| "\t[--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n" -#| "\t[--stdout [--filter=<filter-spec>] | base-name]\n" -#| "\t[--shallow] [--keep-true-parents] [--[no-]sparse] < object-list\n" +#, no-wrap, priority:100 msgid "" "'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied]\n" "\t[--no-reuse-delta] [--delta-base-offset] [--non-empty]\n" @@ -38855,13 +38503,7 @@ msgid "" "\t[--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n" "\t[--stdout [--filter=<filter-spec>] | <base-name>]\n" "\t[--shallow] [--keep-true-parents] [--[no-]sparse] < <object-list>\n" -msgstr "" -"'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied]\n" -"\t[--no-reuse-delta] [--delta-base-offset] [--non-empty]\n" -"\t[--local] [--incremental] [--window=<n>] [--depth=<n>]\n" -"\t[--revs [--unpacked | --all]] [--keep-pack=<nome-do-pacote>]\n" -"\t[--stdout [--filter=<filter-spec>] | base-name]\n" -"\t[--shallow] [--keep-true-parents] [--[no-]sparse] < object-list\n" +msgstr "'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied]\n\t[--no-reuse-delta] [--delta-base-offset] [--non-empty]\n\t[--local] [--incremental] [--window=<n>] [--depth=<n>]\n\t[--revs [--unpacked | --all]] [--keep-pack=<nome-do-pacote>]\n\t[--stdout [--filter=<filter-spec>] | <nome-base>]\n\t[--shallow] [--keep-true-parents] [--[no-]sparse] < <lista-do-objeto>\n" #. type: Plain text #: en/git-pack-objects.txt:25 @@ -39401,10 +39043,9 @@ msgstr "git-pack-redundant - Encontre os arquivos dos pacotes redundantes" #. type: Plain text #: en/git-pack-redundant.txt:13 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git pack-redundant' [ --verbose ] [ --alt-odb ] ( --all | <pack-filename>... )\n" -msgstr "'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >\n" +msgstr "'git pack-redundant' [ --verbose ] [ --alt-odb ] ( --all | <nome-do-arquivo-pacote>... >\n" #. type: Plain text #: en/git-pack-redundant.txt:19 @@ -43360,10 +43001,9 @@ msgstr "A rotulagem dos marcadores de conflitos" #. type: Plain text #: en/git-rebase.txt:720 -#, fuzzy, priority:100 -#| msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever." +#, priority:100 msgid "When there are content conflicts, the merge machinery tries to annotate each side's conflict markers with the commits where the content came from. Since the apply backend drops the original information about the rebased commits and their parents (and instead generates new fake commits based off limited information in the generated patches), those commits cannot be identified; instead it has to fall back to a commit summary. Also, when merge.conflictStyle is set to diff3 or zdiff3, the apply backend will use \"constructed merge base\" to label the content from the merge base, and thus provide no information about the merge base commit whatsoever." -msgstr "Quando h찼 conte첬dos conflitantes o mecanismo da mesclagem tenta anotar os marcadores de conflito de cada lado com os commits de onde o conte첬do veio. Como a estrutura descarta o original, as informa챌천es sobre os commits reconstru챠dos e seus pais (em vez disso, gera novos commits falsos com base nas informa챌천es limitadas no patches que foram gerados), estes commits n찾o podem ser identificados; em vez disso tem que retornar para um resumo do commit. Al챕m disso, quando `merge.conflictStyle` 챕 definido para 'diff3', a estrutura aplicada utilizar찼 uma \"mesclagem reconstru챠da da base\" para rotular o conte첬do da base mesclada e portanto, n찾o fornece qualquer informa챌천es sobre o commit da base mesclada." +msgstr "Quando h찼 conte첬dos conflitantes o mecanismo da mesclagem tenta anotar os marcadores de conflito de cada lado com os commits de onde o conte첬do veio. Como a estrutura descarta o original, as informa챌천es sobre os commits reconstru챠dos e seus pais (em vez disso, gera novos commits falsos com base nas informa챌천es limitadas no patches que foram gerados), estes commits n찾o podem ser identificados; em vez disso tem que retornar para um resumo do commit. Al챕m disso, quando `merge.conflictStyle` 챕 definido para 'diff3' ou 'zdiff3', a estrutura aplicada utilizar찼 uma \"mesclagem reconstru챠da da base\" para rotular o conte첬do da base mesclada e portanto, n찾o fornece qualquer informa챌천es sobre o commit da base mesclada." #. type: Plain text #: en/git-rebase.txt:723 @@ -44711,15 +44351,7 @@ msgstr "'git reflog' <subcomando> <op챌천es>\n" #. type: Plain text #: en/git-reflog.txt:27 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "" -#| "'git reflog' ['show'] [log-options] [<ref>]\n" -#| "'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]\n" -#| "\t[--rewrite] [--updateref] [--stale-fix]\n" -#| "\t[--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]\n" -#| "'git reflog delete' [--rewrite] [--updateref]\n" -#| "\t[--dry-run | -n] [--verbose] ref@\\{specifier\\}...\n" -#| "'git reflog exists' <ref>\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git reflog' ['show'] [<log-options>] [<ref>]\n" "'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]\n" @@ -44728,14 +44360,7 @@ msgid "" "'git reflog delete' [--rewrite] [--updateref]\n" "\t[--dry-run | -n] [--verbose] <ref>@\\{<specifier>\\}...\n" "'git reflog exists' <ref>\n" -msgstr "" -"'git reflog' ['show'] [log-options] [<ref>]\n" -"'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]\n" -"\t[--rewrite] [--updateref] [--stale-fix]\n" -"\t[--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]\n" -"'git reflog delete' [--rewrite] [--updateref]\n" -"\t[--dry-run | -n] [--verbose] ref@\\{specifier\\}...\n" -"'git reflog exists' <ref>\n" +msgstr "'git reflog' ['show'] [<log-options>] [<ref>]\n'git reflog expire' [--expire=<tempo>] [--expire-unreachable=<tempo>]\n\t[--rewrite] [--updateref] [--stale-fix]\n\t[--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]\n'git reflog delete' [--rewrite] [--updateref]\n\t[--dry-run | -n] [--verbose] <ref>@\\{<especificador>\\}...\n'git reflog exists' <ref>\n" #. type: Plain text #: en/git-reflog.txt:35 @@ -45237,21 +44862,7 @@ msgstr "git-remote - Gerencie o conjunto dos reposit처rios monitorados" #. type: Plain text #: en/git-remote.txt:25 -#, fuzzy, ignore-ellipsis, no-wrap, priority:220 -#| msgid "" -#| "'git remote' [-v | --verbose]\n" -#| "'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n" -#| "'git remote rename' <old> <new>\n" -#| "'git remote remove' <name>\n" -#| "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n" -#| "'git remote set-branches' [--add] <name> <branch>...\n" -#| "'git remote get-url' [--push] [--all] <name>\n" -#| "'git remote set-url' [--push] <name> <newurl> [<oldurl>]\n" -#| "'git remote set-url --add' [--push] <name> <newurl>\n" -#| "'git remote set-url --delete' [--push] <name> <url>\n" -#| "'git remote' [-v | --verbose] 'show' [-n] <name>...\n" -#| "'git remote prune' [-n | --dry-run] <name>...\n" -#| "'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n" +#, ignore-ellipsis, no-wrap, priority:220 msgid "" "'git remote' [-v | --verbose]\n" "'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>\n" @@ -45266,20 +44877,7 @@ msgid "" "'git remote' [-v | --verbose] 'show' [-n] <name>...\n" "'git remote prune' [-n | --dry-run] <name>...\n" "'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n" -msgstr "" -"'git remote' [-v | --verbose]\n" -"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n" -"'git remote rename' <antigo> <novo>\n" -"'git remote remove' <nome>\n" -"'git remote set-head' <nome> (-a | --auto | -d | --delete | <ramo>)\n" -"'git remote set-branches' [--add] <nome> <ramo>...\n" -"'git remote get-url' [--push] [--all] <nome>\n" -"'git remote set-url' [--push] <nome> <newurl> [<oldurl>]\n" -"'git remote set-url --add' [--push] <nome> <newurl>\n" -"'git remote set-url --delete' [--push] <nome> <url>\n" -"'git remote' [-v | --verbose] 'show' [-n] <nome>...\n" -"'git remote prune' [-n | --dry-run] <nome>...\n" -"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<grupo> | <remoto>)...]\n" +msgstr "'git remote' [-v | --verbose]\n'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>\n'git remote rename' <antigo> <novo>\n'git remote remove' <nome>\n'git remote set-head' <nome> (-a | --auto | -d | --delete | <ramo>)\n'git remote set-branches' [--add] <nome> <ramo>...\n'git remote get-url' [--push] [--all] <nome>\n'git remote set-url' [--push] <nome> <newurl> [<oldurl>]\n'git remote set-url --add' [--push] <nome> <newurl>\n'git remote set-url --delete' [--push] <nome> <URL>\n'git remote' [-v | --verbose] 'show' [-n] <nome>...\n'git remote prune' [-n | --dry-run] <nome>...\n'git remote' [-v | --verbose] 'update' [-p | --prune] [(<grupo> | <remoto>)...]\n" #. type: Plain text #: en/git-remote.txt:30 @@ -46200,10 +45798,9 @@ msgstr "git-request-pull - Gera um resumo das altera챌천es que ainda est찾o pend #. type: Plain text #: en/git-request-pull.txt:12 -#, fuzzy, no-wrap, priority:100 -#| msgid "'git request-pull' [-p] <start> <url> [<end>]\n" +#, no-wrap, priority:100 msgid "'git request-pull' [-p] <start> <URL> [<end>]\n" -msgstr "'git request-pull' [-p] <in챠cio> <url> [<fim>]\n" +msgstr "'git request-pull' [-p] <in챠cio> <URL> [<fim>]\n" #. type: Plain text #: en/git-request-pull.txt:20 @@ -46213,10 +45810,9 @@ msgstr "Gere um pedido solicitando ao seu projeto na upstream que capture as alt #. type: Plain text #: en/git-request-pull.txt:25 -#, fuzzy, priority:100 -#| msgid "The upstream project is expected to have the commit named by `<start>` and the output asks it to integrate the changes you made since that commit, up to the commit named by `<end>`, by visiting the repository named by `<url>`." +#, priority:100 msgid "The upstream project is expected to have the commit named by `<start>` and the output asks it to integrate the changes you made since that commit, up to the commit named by `<end>`, by visiting the repository named by `<URL>`." -msgstr "Espera-se que o projeto \"upstream\" tenha o commit nomeado pelo `<inicio>` e a sa챠da solicite a integra챌찾o das altera챌천es feitas at챕 este commit, at챕 o commit nomeado por `<fim>`, visitando o reposit처rio nomeado por `<url>`." +msgstr "Espera-se que o projeto \"upstream\" tenha o commit nomeado pelo `<inicio>` e a sa챠da solicite a integra챌찾o das altera챌천es feitas at챕 este commit, at챕 o commit nomeado por `<fim>`, visitando o reposit처rio nomeado por `<URL>`." #. type: Plain text #: en/git-request-pull.txt:31 @@ -46262,10 +45858,9 @@ msgstr "Fa챌a o commit para terminar em (a predefini챌찾o retorna para `HEAD`). #. type: Plain text #: en/git-request-pull.txt:47 -#, fuzzy, priority:100 -#| msgid "When the repository named by `<url>` has the commit at a tip of a ref that is different from the ref you have locally, you can use the `<local>:<remote>` syntax, to have its local name, a colon `:`, and its remote name." +#, priority:100 msgid "When the repository named by `<URL>` has the commit at a tip of a ref that is different from the ref you have locally, you can use the `<local>:<remote>` syntax, to have its local name, a colon `:`, and its remote name." -msgstr "Quando o reposit처rio nomeado por `<url>` tem o commit no cume de uma \"ref\" diferente da \"ref\" que voc챗 possui localmente, 챕 poss챠ve utilizar a sintaxe `<local>:<remoto>`, para ter o seu nome local, dois pontos `:` e o nome do seu ramo remoto." +msgstr "Quando o reposit처rio nomeado por `<URL>` tem o commit no cume de uma \"ref\" diferente da \"ref\" que voc챗 possui localmente, 챕 poss챠vel utilizar a sintaxe `<local>:<remoto>`, para ter o seu nome local, dois pontos `:` e o nome do seu ramo remoto." #. type: Plain text #: en/git-request-pull.txt:56 @@ -49299,17 +48894,12 @@ msgstr "git-send-email - Envia uma cole챌찾o de patches como e-mails" #. type: Plain text #: en/git-send-email.txt:15 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "" -#| "'git send-email' [<options>] <file|directory|rev-list options>...\n" -#| "'git send-email' --dump-aliases\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "'git send-email' [<options>] <file|directory>...\n" "'git send-email' [<options>] <format-patch options>\n" "'git send-email' --dump-aliases\n" -msgstr "" -"'git send-email' [<op챌천es>] <arquivo|diret처rio|rev-list op챌천es>...\n" -"'git send-email' --dump-aliases\n" +msgstr "'git send-email' [<op챌천es>] <file|directory>...\n'git send-email' [<op챌천es>] <op챌천es-do-formato-do-patch>\n'git send-email' --dump-aliases\n" #. type: Plain text #: en/git-send-email.txt:25 @@ -50788,16 +50378,11 @@ msgstr "git-shortlog - Resume a sa챠da do comando 'git log'" #. type: Plain text #: en/git-shortlog.txt:13 -#, fuzzy, ignore-ellipsis, no-wrap, priority:260 -#| msgid "" -#| "'git shortlog' [<options>] [<revision range>] [[--] <path>...]\n" -#| "git log --pretty=short | 'git shortlog' [<options>]\n" +#, ignore-ellipsis, no-wrap, priority:260 msgid "" "'git shortlog' [<options>] [<revision-range>] [[--] <path>...]\n" "git log --pretty=short | 'git shortlog' [<options>]\n" -msgstr "" -"'git shortlog' [<op챌천es>] [<intervalo-das-revis천es>] [[--] <caminho>...]\n" -"git log --pretty=short | 'git shortlog' [<op챌천es>]\n" +msgstr "'git shortlog' [<op챌천es>] [<intervalo-da-revis찾o>] [[--] <caminho>...]\ngit log --pretty=short | 'git shortlog' [<op챌천es>]\n" #. type: Plain text #: en/git-shortlog.txt:18 @@ -50939,10 +50524,9 @@ msgstr "Caso a largura seja `0` (zero), recue as linhas da sa챠da sem quebr찼-la #. type: Plain text #: en/git-shortlog.txt:100 -#, fuzzy, priority:260 -#| msgid "Show only commits in the specified revision range. When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit). `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the \"Specifying Ranges\" section of linkgit:gitrevisions[7]." +#, priority:260 msgid "Show only commits in the specified revision range. When no <revision-range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit). `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision-range>, see the \"Specifying Ranges\" section of linkgit:gitrevisions[7]." -msgstr "Exibe apenas os commits no intervalo definido das revis천es. Quando um <intervalo de revis찾o> n찾o 챕 definido, a predefini챌찾o retorna para `HEAD` (ou seja, todo o hist처rico que leva ao commit atual). O `origin..HEAD` define todos os commits acess챠veis a partir do commit atual (ou seja, `HEAD`), por챕m n찾o a partir do `origin`. Para uma lista mais completa das maneiras de escrever os nomes dos objetos, consulte a se챌찾o \"DEFININDO AS REVIS횛ES\" no linkgit:gitrevisions[7]." +msgstr "Exibe apenas os commits no intervalo definido das revis천es. Quando um <intervalo-da-revis찾o> n찾o 챕 definido, a predefini챌찾o retorna para `HEAD` (ou seja, todo o hist처rico que leva ao commit atual). O `origin..HEAD` define todos os commits acess챠veis a partir do commit atual (ou seja, `HEAD`), por챕m n찾o a partir do `origin`. Para uma lista mais completa das maneiras de soletrar o <intervalo-da-revis찾o>, consulte a se챌찾o \"DEFININDO AS REVIS횛ES\" no linkgit:gitrevisions[7]." #. type: Plain text #: en/git-shortlog.txt:104 @@ -51978,10 +51562,9 @@ msgstr "git-stage - Adicione o conte첬do do arquivo na 찼rea de prepara챌찾o" #. type: Plain text #: en/git-stage.txt:13 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "'git stage' args...\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git stage' <arg>...\n" -msgstr "'git stage' args...\n" +msgstr "'git stage' <arg>...\n" #. type: Plain text #: en/git-stage.txt:20 @@ -52003,20 +51586,7 @@ msgstr "git-stash - Guarda as altera챌천es em um outro diret처rio de trabalho" #. type: Plain text #: en/git-stash.txt:23 -#, fuzzy, ignore-ellipsis, no-wrap, priority:240 -#| msgid "" -#| "'git stash' list [<log-options>]\n" -#| "'git stash' show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]\n" -#| "'git stash' drop [-q|--quiet] [<stash>]\n" -#| "'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]\n" -#| "'git stash' branch <branchname> [<stash>]\n" -#| "'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -#| "\t [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -#| "\t [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" -#| "\t [--] [<pathspec>...]]\n" -#| "'git stash' clear\n" -#| "'git stash' create [<message>]\n" -#| "'git stash' store [-m|--message <message>] [-q|--quiet] <commit>\n" +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "'git stash' list [<log-options>]\n" "'git stash' show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]\n" @@ -52030,19 +51600,7 @@ msgid "" "'git stash' clear\n" "'git stash' create [<message>]\n" "'git stash' store [-m|--message <message>] [-q|--quiet] <commit>\n" -msgstr "" -"'git stash' list [<op챌천es-do-log>]\n" -"'git stash' show [-u|--include-untracked|--only-untracked] [<op챌천es-do-diff] [<stash>]\n" -"'git stash' drop [-q|--quiet] [<stash>]\n" -"'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]\n" -"'git stash' branch <nome-do-ramo> [<stash>]\n" -"'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -"\t [-u|--include-untracked] [-a|--all] [-m|--message <mensagem>]\n" -"\t [--pathspec-from-file=<arquivo> [--pathspec-file-nul]]\n" -"\t [--] [<pathspec>...]]\n" -"'git stash' clear\n" -"'git stash' create [<mensagem>]\n" -"'git stash' store [-m|--message <mensagem>] [-q|--quiet] <commit>\n" +msgstr "'git stash' list [<op챌천es-do-log>]\n'git stash' show [-u|--include-untracked|--only-untracked] [<op챌천es-do-diff] [<stash>]\n'git stash' drop [-q|--quiet] [<stash>]\n'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]\n'git stash' branch <nome-do-ramo> [<stash>]\n'git stash' [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--quiet]\n\t [-u|--include-untracked] [-a|--all] [-m|--message <mensagem>]\n\t [--pathspec-from-file=<arquivo> [--pathspec-file-nul]]\n\t [--] [<pathspec>...]]\n'git stash' clear\n'git stash' create [<mensagem>]\n'git stash' store [-m|--message <mensagem>] [-q|--quiet] <commit>\n" #. type: Plain text #: en/git-stash.txt:31 @@ -52064,10 +51622,9 @@ msgstr "O 첬ltimo \"stash\" que voc챗 criou 챕 armazenado em `refs/stash`; os \" #. type: Labeled list #: en/git-stash.txt:50 -#, fuzzy, ignore-ellipsis, no-wrap, priority:240 -#| msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]" +#, ignore-ellipsis, no-wrap, priority:240 msgid "push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]" -msgstr "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <mensagem>] [--pathspec-from-file=<arquivo> [--pathspec-file-nul]] [--] [<pathspec>...]" +msgstr "push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <mensagem>] [--pathspec-from-file=<arquivo> [--pathspec-file-nul]] [--] [<pathspec>...]" #. type: Plain text #: en/git-stash.txt:56 @@ -52083,10 +51640,9 @@ msgstr "Para fazer um instant창neo de forma r찼pida, voc챗 pode omitir o \"push\ #. type: Labeled list #: en/git-stash.txt:63 -#, fuzzy, no-wrap, priority:240 -#| msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]" +#, no-wrap, priority:240 msgid "save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]" -msgstr "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<mensagem>]" +msgstr "save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<mensagem>]" #. type: Plain text #: en/git-stash.txt:69 @@ -53156,23 +52712,21 @@ msgstr "" #. type: Title ^ #: en/git-status.txt:318 -#, fuzzy, no-wrap, priority:280 -#| msgid "Information" +#, no-wrap, priority:280 msgid "Stash Information" -msgstr "Informa챌찾o" +msgstr "Informa챌찾o do empilhamento" #. type: Plain text #: en/git-status.txt:322 #, priority:280 msgid "If `--show-stash` is given, one line is printed showing the number of stash entries if non-zero:" -msgstr "" +msgstr "Caso a op챌찾o `--show-stash` seja usada, uma linha ser찼 impressa mostrando a quantidade das entradas que est찾o empilhadas caso n찾o seja zero:" #. type: Plain text #: en/git-status.txt:324 -#, fuzzy, no-wrap, priority:280 -#| msgid " ? <path>\n" +#, no-wrap, priority:280 msgid " # stash <N>\n" -msgstr " ? <caminho>\n" +msgstr " # stash <N>\n" #. type: Title ^ #: en/git-status.txt:326 @@ -60873,10 +60427,9 @@ msgstr "git-web--browse - Script assistente do Git para iniciar um navegador da #. type: Plain text #: en/git-web--browse.txt:12 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "'git web{litdd}browse' [<options>] <url|file>...\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "'git web{litdd}browse' [<options>] (<URL>|<file>)...\n" -msgstr "'git web{litdd}browse' [<op챌천es>] <url|arquivo>...\n" +msgstr "'git web{litdd}browse' [<op챌천es>] (<URL>|<arquivo>)...\n" #. type: Plain text #: en/git-web--browse.txt:19 @@ -61212,16 +60765,7 @@ msgstr "git-worktree - Gerencie as v찼rias 찼rvores de trabalho" #. type: Plain text #: en/git-worktree.txt:20 -#, fuzzy, ignore-ellipsis, no-wrap, priority:240 -#| msgid "" -#| "'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n" -#| "'git worktree list' [--porcelain]\n" -#| "'git worktree lock' [--reason <string>] <worktree>\n" -#| "'git worktree move' <worktree> <new-path>\n" -#| "'git worktree prune' [-n] [-v] [--expire <expire>]\n" -#| "'git worktree remove' [-f] <worktree>\n" -#| "'git worktree repair' [<path>...]\n" -#| "'git worktree unlock' <worktree>\n" +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]\n" "'git worktree list' [-v | --porcelain]\n" @@ -61231,15 +60775,7 @@ msgid "" "'git worktree remove' [-f] <worktree>\n" "'git worktree repair' [<path>...]\n" "'git worktree unlock' <worktree>\n" -msgstr "" -"'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <novo-ramo>] <caminho> [<commit-ish>]\n" -"'git worktree list' [--porcelain]\n" -"'git worktree lock' [--reason <texto>] <찼rvore de trabalho>\n" -"'git worktree move' <찼rvore de trabalho> <novo caminho>\n" -"'git worktree prune' [-n] [-v] [--expire <expire>]\n" -"'git worktree remove' [-f] <찼rvore de trabalho>\n" -"'git worktree repair' [<caminho>...]\n" -"'git worktree unlock' <찼rvore de trabalho>\n" +msgstr "'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <novo-ramo>] <caminho> [<commit-ish>]\n'git worktree list' [-v | --porcelain]\n'git worktree lock' [--reason <texto>] <찼rvore de trabalho>\n'git worktree move' <찼rvore de trabalho> <novo caminho>\n'git worktree prune' [-n] [-v] [--expire <expire>]\n'git worktree remove' [-f] <찼rvore de trabalho>\n'git worktree repair' [<caminho>...]\n'git worktree unlock' <찼rvore de trabalho>\n" #. type: Plain text #: en/git-worktree.txt:25 @@ -63515,10 +63051,9 @@ msgstr "횣til apenas quando for mesclar." #. type: Plain text #: en/merge-options.txt:139 -#, fuzzy, priority:240 -#| msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]." +#, priority:240 msgid "By default, the pre-merge and commit-msg hooks are run. When `--no-verify` is given, these are bypassed. See also linkgit:githooks[5]." -msgstr "Esta op챌찾o ignora os ganchos dos commits anteriores e os ganchos das mensagens do commit. Consulte tamb챕m linkgit:githooks[5]." +msgstr "횋 predefinido que os ganchos dos commits anteriores e os ganchos das mensagens do commit sejam executados. Quando a op챌찾o `--no-verify` for usada, ela ser찼 ignorada. Consulte tamb챕m linkgit:githooks[5]." #. type: Plain text #: en/merge-options.txt:150 @@ -64080,10 +63615,9 @@ msgstr "'oneline'" #. type: Plain text #: en/pretty-formats.txt:24 -#, fuzzy, no-wrap, priority:260 -#| msgid "<hash> <title line>\n" +#, no-wrap, priority:260 msgid "<hash> <title-line>\n" -msgstr "<hash> <linha do t챠tulo>\n" +msgstr "<hash> <linha-do-t챠tulo>\n" #. type: Plain text #: en/pretty-formats.txt:26 @@ -64109,10 +63643,9 @@ msgstr "" #. type: Plain text #: en/pretty-formats.txt:33 en/pretty-formats.txt:41 en/pretty-formats.txt:51 en/pretty-formats.txt:63 -#, fuzzy, no-wrap, priority:260 -#| msgid "<title line>\n" +#, no-wrap, priority:260 msgid "<title-line>\n" -msgstr "<linha do t챠tulo>\n" +msgstr "<linha-do-t챠tulo>\n" #. type: Plain text #: en/pretty-formats.txt:35 @@ -64122,26 +63655,18 @@ msgstr "'medium'" #. type: Plain text #: en/pretty-formats.txt:39 -#, fuzzy, no-wrap, priority:260 -#| msgid "" -#| "commit <hash>\n" -#| "Author: <author>\n" -#| "Date: <author date>\n" +#, no-wrap, priority:260 msgid "" "commit <hash>\n" "Author: <author>\n" "Date: <author-date>\n" -msgstr "" -"commit <hash>\n" -"Author: <autor>\n" -"Date: <data do autor>\n" +msgstr "commit <hash>\nAuthor: <autor>\nDate: <data-do-autor>\n" #. type: Plain text #: en/pretty-formats.txt:43 en/pretty-formats.txt:53 en/pretty-formats.txt:65 en/pretty-formats.txt:85 -#, fuzzy, priority:260 -#| msgid "<full commit message>" +#, priority:260 msgid "<full-commit-message>" -msgstr "<mensagem completa do commit>" +msgstr "<mensagem-completa-do-commit>" #. type: Plain text #: en/pretty-formats.txt:45 @@ -64169,25 +63694,14 @@ msgstr "'fuller'" #. type: Plain text #: en/pretty-formats.txt:61 -#, fuzzy, no-wrap, priority:260 -#| msgid "" -#| "commit <hash>\n" -#| "Author: <author>\n" -#| "AuthorDate: <author date>\n" -#| "Commit: <committer>\n" -#| "CommitDate: <committer date>\n" +#, no-wrap, priority:260 msgid "" "commit <hash>\n" "Author: <author>\n" "AuthorDate: <author-date>\n" "Commit: <committer>\n" "CommitDate: <committer-date>\n" -msgstr "" -"commit <hash>\n" -"Author: <autor>\n" -"AuthorDate: <data do autor>\n" -"Commit: <quem fez o commit>\n" -"CommitDate: <a data de quem fez o commit>\n" +msgstr "commit <hash>\nAuthor: <autor>\nAuthorDate: <data-do-autor>\nCommit: <quem-fez-o-commit>\nCommitDate: <a-data-de-quem-fez-o-commit>\n" #. type: Plain text #: en/pretty-formats.txt:67 @@ -64197,10 +63711,9 @@ msgstr "'reference'" #. type: Plain text #: en/pretty-formats.txt:69 -#, fuzzy, no-wrap, priority:260 -#| msgid "<abbrev hash> (<title line>, <short author date>)\n" +#, no-wrap, priority:260 msgid "<abbrev-hash> (<title-line>, <short-author-date>)\n" -msgstr "<abbrev hash> (<linha do t챠tulo>, <data do autor abreviada>)\n" +msgstr "<abbrev-hash> (<linha-do-t챠tulo>, <data-do-autor-abreviada>)\n" #. type: Plain text #: en/pretty-formats.txt:76 @@ -64216,22 +63729,13 @@ msgstr "'email'" #. type: Plain text #: en/pretty-formats.txt:83 -#, fuzzy, no-wrap, priority:260 -#| msgid "" -#| "From <hash> <date>\n" -#| "From: <author>\n" -#| "Date: <author date>\n" -#| "Subject: [PATCH] <title line>\n" +#, no-wrap, priority:260 msgid "" "From <hash> <date>\n" "From: <author>\n" "Date: <author-date>\n" "Subject: [PATCH] <title-line>\n" -msgstr "" -"From <hash> <data>\n" -"From: <autor>\n" -"Date: <data do autor>\n" -"Subject: [PATCH] <linha do t챠tulo>\n" +msgstr "From <hash> <data>\nFrom: <autor>\nDate: <data-do-autor>\nSubject: [PATCH] <linha-do-t챠tulo>\n" #. type: Plain text #: en/pretty-formats.txt:87 @@ -64259,17 +63763,15 @@ msgstr "O formato 'bruto' exibe todo o commit exatamente como foi armazenado no #. type: Plain text #: en/pretty-formats.txt:105 -#, fuzzy, priority:260 -#| msgid "'format:<string>'" +#, priority:260 msgid "'format:<format-string>'" -msgstr "'format:<texto>'" +msgstr "'format:<formato-do-texto>'" #. type: Plain text #: en/pretty-formats.txt:110 -#, fuzzy, priority:260 -#| msgid "The 'format:<string>' format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with '%n' instead of '\\n'." +#, priority:260 msgid "The 'format:<format-string>' format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with '%n' instead of '\\n'." -msgstr "O formato 'format:<texto>' permite especificar quais as informa챌천es que voc챗 deseja exibir. Funciona um pouco como o formato \"printf\" com a exce챌찾o not찼vel de que voc챗 obt챕m uma nova linha com '%n' em vez de '\\n'." +msgstr "O formato 'format:<formato-do-texto>' permite especificar quais as informa챌천es que voc챗 deseja exibir. Funciona um pouco como o formato \"printf\" com a exce챌찾o not찼vel de que voc챗 obt챕m uma nova linha com '%n' em vez de '\\n'." #. type: Plain text #: en/pretty-formats.txt:113 @@ -65208,52 +64710,45 @@ msgstr "exibe os trechos do corpo como interpretado atrav챕s do linkgit:git-inte #. type: Plain text #: en/pretty-formats.txt:290 -#, fuzzy, priority:260 -#| msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`." +#, priority:260 msgid "'key=<key>': only show trailers with specified <key>. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`." -msgstr "'key=<K>': exibe apenas os caracteres de resposta com as chaves que forem definidas. A combina챌찾o 챕 feita sem distin챌찾o entre mai첬sculas e min첬sculas, os dois pontos 횪 direita s찾o opcionais. Caso a op챌찾o seja utilizada v찼rias vezes, os atributos das linhas coincidentes a qualquer uma das teclas ser찾o exibidas. Esta op챌찾o ativa automaticamente a op챌찾o `only`, para que as linhas de bloqueio n찾o sejam ocultadas. Caso n찾o seja o efeito desejado, pode ser desativado com a op챌찾o `only=false`. Por exemplo, `%(trailers:key=Revisado-por)` exibe as linhas com caracteres de resposta com a chave `Revisado-por`." +msgstr "'key=<chave>': exibe apenas os caracteres de resposta com as <chaves> que forem definidas. A combina챌찾o 챕 feita sem distin챌찾o entre mai첬sculas e min첬sculas, os dois pontos 횪 direita s찾o opcionais. Caso a op챌찾o seja utilizada v찼rias vezes, os atributos das linhas coincidentes a qualquer uma das teclas ser찾o exibidas. Esta op챌찾o ativa automaticamente a op챌찾o `only`, para que as linhas de bloqueio n찾o sejam ocultadas. Caso n찾o seja o efeito desejado, pode ser desativado com a op챌찾o `only=false`. Por exemplo, `%(trailers:key=Revisado-por)` exibe as linhas com caracteres de resposta com a chave `Revisado-por`." #. type: Plain text #: en/pretty-formats.txt:292 -#, fuzzy, priority:260 -#| msgid "'only[=<BOOL>]': select whether non-trailer lines from the trailer block should be included." +#, priority:260 msgid "'only[=<bool>]': select whether non-trailer lines from the trailer block should be included." -msgstr "'only[=<BOOL>]': selecione se as linhas n찾o relacionadas 횪 resposta a partir do bloco de resposta, devem ser inclu챠das ou n찾o." +msgstr "'only[=<bool>]': selecione se as linhas n찾o relacionadas 횪 resposta a partir do bloco de resposta, devem ser inclu챠das ou n찾o." #. type: Plain text #: en/pretty-formats.txt:300 -#, fuzzy, priority:260 -#| msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space." +#, priority:260 msgid "'separator=<sep>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string <sep> may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space." -msgstr "'separator=<SEP>': defina um separador para ser inserido entre as linhas da resposta. Quando esta op챌찾o n찾o 챕 informada, cada linha de resposta 챕 encerrada com um caractere de alimenta챌찾o da linha. Uma string SEP pode conter os c처digos de formata챌찾o literal descritos acima. Para usar a v챠rgula como separador, deve-se usar `%x2C`, caso contr찼rio, seria analisado como sendo a pr처xima op챌찾o. Por exemplo, `%(trailers:key=Ticket,separator=%x2C )` mostra todas as linhas de resposta cuja palavra principal seja \"Ticket\" separadas por uma v챠rgula e um espa챌o." +msgstr "'separator=<sep>': defina um separador para ser inserido entre as linhas da resposta. Quando esta op챌찾o n찾o 챕 informada, cada linha de resposta 챕 encerrada com um caractere de alimenta챌찾o da linha. Uma string <sep> pode conter os c처digos de formata챌찾o literal descritos acima. Para usar a v챠rgula como separador, deve-se usar `%x2C`, caso contr찼rio, seria analisado como sendo a pr처xima op챌찾o. Por exemplo, `%(trailers:key=Ticket,separator=%x2C )` mostra todas as linhas de resposta cuja palavra principal seja \"Ticket\" separadas por uma v챠rgula e um espa챌o." #. type: Plain text #: en/pretty-formats.txt:303 -#, fuzzy, priority:260 -#| msgid "'unfold[=<BOOL>]': make it behave as if interpret-trailer's `--unfold` option was given. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines." +#, priority:260 msgid "'unfold[=<bool>]': make it behave as if interpret-trailer's `--unfold` option was given. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines." -msgstr "'unfold[=<BOOL>]': fa챌a com que se comporte como se a op챌찾o `--unfold` do caracteres de resposta tenha sido passado. Por exemplo, `%(trailers:only,unfold=true)` desdobra e mostra todas as linhas de resposta." +msgstr "'unfold[=<bool>]': fa챌a com que se comporte como se a op챌찾o `--unfold` do caracteres de resposta tenha sido passado. Por exemplo, `%(trailers:only,unfold=true)` desdobra e mostra todas as linhas de resposta." #. type: Plain text #: en/pretty-formats.txt:304 -#, fuzzy, priority:260 -#| msgid "'keyonly[=<BOOL>]': only show the key part of the trailer." +#, priority:260 msgid "'keyonly[=<bool>]': only show the key part of the trailer." -msgstr "'keyonly[=<BOOL>]': mostra apenas a parte principal da resposta." +msgstr "'keyonly[=<bool>]': mostra apenas a parte principal da resposta." #. type: Plain text #: en/pretty-formats.txt:305 -#, fuzzy, priority:260 -#| msgid "'valueonly[=<BOOL>]': only show the value part of the trailer." +#, priority:260 msgid "'valueonly[=<bool>]': only show the value part of the trailer." -msgstr "'valueonly[=<BOOL>]': mostra apenas o valor da parte da resposta." +msgstr "'valueonly[=<bool>]': mostra apenas o valor da parte da resposta." #. type: Plain text #: en/pretty-formats.txt:309 -#, fuzzy, priority:260 -#| msgid "'key_value_separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer key-value pair is separated by \": \". Otherwise it shares the same semantics as 'separator=<SEP>' above." +#, priority:260 msgid "'key_value_separator=<sep>': specify a separator inserted between trailer lines. When this option is not given each trailer key-value pair is separated by \": \". Otherwise it shares the same semantics as 'separator=<sep>' above." -msgstr "'key_value_separator=<SEP>': define um separador inserido entre as linhas de resposta. Quando esta op챌찾o n찾o 챕 informada, cada par dos valores da palavra principal da resposta 챕 separado por \": \". Caso contr찼rio, ele compartilha a mesma sem창ntica de 'separator=<SEP>' acima." +msgstr "'key_value_separator=<sep>': define um separador inserido entre as linhas de resposta. Quando esta op챌찾o n찾o 챕 informada, cada par dos valores da palavra principal da resposta 챕 separado por \": \". Caso contr찼rio, ele compartilha a mesma sem창ntica de 'separator=<sep>' acima." #. type: Plain text #: en/pretty-formats.txt:316 @@ -65263,10 +64758,9 @@ msgstr "Alguns espa챌os reservados podem depender das outras op챌천es passadas p #. type: Plain text #: en/pretty-formats.txt:321 -#, fuzzy, priority:260 -#| msgid "The boolean options accept an optional value `[=<BOOL>]`. The values `true`, `false`, `on`, `off` etc. are all accepted. See the \"boolean\" sub-section in \"EXAMPLES\" in linkgit:git-config[1]. If a boolean option is given with no value, it's enabled." +#, priority:260 msgid "The boolean options accept an optional value `[=<bool-value>]`. The values `true`, `false`, `on`, `off` etc. are all accepted. See the \"boolean\" sub-section in \"EXAMPLES\" in linkgit:git-config[1]. If a boolean option is given with no value, it's enabled." -msgstr "As op챌천es booleanas aceitam um valor opcional `[=<BOOL>]`. Todos os valores `true`, `false`, `on`, `off` etc. s찾o aceitos. Consulte a subse챌찾o \"booleana\" em \"EXEMPLOS\" em linkgit:git-config[1]. Caso uma op챌찾o booleana seja fornecida sem valor, ela ser찼 ativada." +msgstr "As op챌천es booleanas aceitam um valor opcional `[=<bool>]`. Todos os valores `true`, `false`, `on`, `off` etc. s찾o aceitos. Consulte a subse챌찾o \"booleana\" em \"EXEMPLOS\" em linkgit:git-config[1]. Caso uma op챌찾o booleana seja fornecida sem valor, ela ser찼 ativada." #. type: Plain text #: en/pretty-formats.txt:325 @@ -68036,10 +67530,9 @@ msgstr "--no-walk [=(com classifica챌찾o|sem classifica챌찾o)]" #. type: Plain text #: en/rev-list-options.txt:979 -#, fuzzy, priority:260 -#| msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`. Cannot be combined with `--unsorted-input` if `sorted` or no argument was given." +#, priority:260 msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`." -msgstr "Exibe apenas determinados commits, mas n찾o atravesse os seus ancestrais. Isso n찾o tem nenhum efeito caso um intervalo seja especificado. Caso o argumento `unsorted` (sem classifica챌찾o) seja utilizada, os commits ser찾o exibidos na ordem em que foram utilizadas na linha de comando. Caso contr찼rio (se o argumento `ordenado` ou nenhum outro seja utilizado), os commits ser찾o exibidos em ordem cronol처gica reversa pela data do commit. N찾o pode ser combinado com `--graph`. N찾o pode ser combinado com a op챌찾o `--unsorted-input` caso a op챌찾o `sorted` ou nenhuma op챌찾o seja usada." +msgstr "Exibe apenas determinados commits, mas n찾o atravesse os seus ancestrais. Isso n찾o tem nenhum efeito caso um intervalo seja especificado. Caso o argumento `unsorted` (sem classifica챌찾o) seja utilizada, os commits ser찾o exibidos na ordem em que foram utilizadas na linha de comando. Caso contr찼rio (se o argumento `ordenado` ou nenhum outro seja utilizado), os commits ser찾o exibidos em ordem cronol처gica reversa pela data do commit. N찾o pode ser combinado com `--graph`." #. type: Labeled list #: en/rev-list-options.txt:980 @@ -68163,10 +67656,9 @@ msgstr "A op챌찾o `date=unix` exibe a data como um carimbo de data/hora da 챕poc #. type: Plain text #: en/rev-list-options.txt:1055 -#, fuzzy, ignore-ellipsis, priority:260 -#| msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`." +#, ignore-ellipsis, priority:260 msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %s, %z, and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`." -msgstr "A op챌찾o `--date=format:...` alimenta o formato `...` par ao seu sistema `strftime`, menos para o %z e %Z, que s찾o tratados internamente. Use a op챌찾o `--date=format:%c` para exibir a data no formato preferido do c처digo do idioma do sistema. Consulte o manual do `strftime` para obter uma lista completa dos \"placeholders\". Ao utilizar o `-local`, a sintaxe correta 챕 `--date=format-local:...`." +msgstr "A op챌찾o `--date=format:...` alimenta o formato `...` par ao seu sistema `strftime`, menos para %s, %z, e %Z, que s찾o tratados internamente. Use a op챌찾o `--date=format:%c` para exibir a data no formato preferido do c처digo do idioma do sistema. Consulte o manual do `strftime` para obter uma lista completa dos \"placeholders\". Ao utilizar o `-local`, a sintaxe correta 챕 `--date=format-local:...`." #. type: Plain text #: en/rev-list-options.txt:1058 @@ -68474,25 +67966,14 @@ msgstr "Voc챗 pode optar por informar o nome de um ramo remoto que voc챗 configu #. type: delimited block - #: en/urls-remotes.txt:33 -#, fuzzy, no-wrap, priority:220 -#| msgid "" -#| "\t[remote \"<name>\"]\n" -#| "\t\turl = <url>\n" -#| "\t\tpushurl = <pushurl>\n" -#| "\t\tpush = <refspec>\n" -#| "\t\tfetch = <refspec>\n" +#, no-wrap, priority:220 msgid "" "\t[remote \"<name>\"]\n" "\t\turl = <URL>\n" "\t\tpushurl = <pushurl>\n" "\t\tpush = <refspec>\n" "\t\tfetch = <refspec>\n" -msgstr "" -"\t[remote \"<nome>\"]\n" -"\t\turl = <url>\n" -"\t\tpushurl = <pushurl>\n" -"\t\tpush = <refspec>\n" -"\t\tfetch = <refspec>\n" +msgstr "\t[remote \"<nome>\"]\n\t\turl = <URL>\n\t\tpushurl = <pushurl>\n\t\tpush = <refspec>\n\t\tfetch = <refspec>\n" #. type: Plain text #: en/urls-remotes.txt:37 @@ -68552,10 +68033,9 @@ msgstr "\t<url>#<head>\n" #. type: Plain text #: en/urls-remotes.txt:74 -#, fuzzy, priority:220 -#| msgid "`<url>` is required; `#<head>` is optional." +#, priority:220 msgid "`<URL>` is required; `#<head>` is optional." -msgstr "A `<url>` 챕 necess찼ria; `#<head>` 챕 opcional." +msgstr "A `<URL>` 챕 necess찼ria; `#<head>` 챕 opcional." #. type: Plain text #: en/urls-remotes.txt:79