diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po index 1a5bc200ae11e3bee5cb09411089157e7dc15c4f..eab1fd88aa8a52eb23c8b09d147f472e7e58c94b 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: 2021-05-17 17:03+0200\n" -"PO-Revision-Date: 2021-03-27 08:29+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.6-dev\n" +msgstr "Report-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-05-17 17:03+0200\nPO-Revision-Date: 2021-05-20 07:34+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.7-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:748 en/git-instaweb.txt:45 en/git-mailinfo.txt:49 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 @@ -2364,10 +2353,9 @@ msgstr "\t[se챌찾o \"subse챌찾o\"]\n" #. type: Plain text #: en/config.txt:53 -#, fuzzy, priority:100 -#| msgid "Subsection names are case sensitive and can contain any characters except newline and the null byte. Doublequote `\"` and backslash can be included by escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding other characters are dropped when reading; for example, `\\t` is read as `t` and `\\0` is read as `0` Section headers cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have `[section]` if you have `[section \"subsection\"]`, but you don't need to." +#, priority:100 msgid "Subsection names are case sensitive and can contain any characters except newline and the null byte. Doublequote `\"` and backslash can be included by escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding other characters are dropped when reading; for example, `\\t` is read as `t` and `\\0` is read as `0`. Section headers cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have `[section]` if you have `[section \"subsection\"]`, but you don't need to." -msgstr "Os nomes das subse챌천es diferenciam as mai첬sculas das min첬sculas, podem conter qualquer caractere, exceto os que definem uma nova linha e um byte nulo. As aspas duplas `\"` e a barra invertida podem ser inclu챠das escapando-as como` \\\"` e `\\\\` respectivamente. As barras invertidas anteriores aos outros caracteres s찾o descartadas durante a leitura; `\\t` 챕 lido como` t` e `\\0` 챕 lido como `0` cabe챌alhos da se챌찾o por exemplo e n찾o podem abranger v찼rias linhas. As vari찼veis podem pertencer diretamente a uma se챌찾o ou a uma determinada subse챌찾o. Voc챗 pode ter `[section]` caso tenha `[section \"subsection\"]`, mas n찾o 챕 necess찼rio." +msgstr "Os nomes das subse챌천es diferenciam as mai첬sculas das min첬sculas, podem conter qualquer caractere, exceto os que definem uma nova linha e um byte nulo. As aspas duplas `\"` e a barra invertida podem ser inclu챠das escapando-as como` \\\"` e `\\\\` respectivamente. As barras invertidas anteriores aos outros caracteres s찾o descartadas durante a leitura; por exemplo, `\\t` 챕 lido como` t` e `\\0` 챕 lido como `0`. Os cabe챌alhos da se챌찾o n찾o podem abranger v찼rias linhas. As vari찼veis podem pertencer diretamente a uma se챌찾o ou a uma determinada subse챌찾o. Voc챗 pode ter `[section]` caso tenha `[section \"subsection\"]`, mas n찾o 챕 necess찼rio." #. type: Plain text #: en/config.txt:58 @@ -2727,10 +2715,9 @@ msgstr "verdadeiro" #. type: Plain text #: en/config.txt:247 -#, fuzzy, priority:100 -#| msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true." +#, priority:100 msgid "Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable defined without `= <value>` is taken as true." -msgstr "Os verdadeiros literais booleanos s찾o `yes, `on`, `true` e `1`. Al챕m disso 챕 considerada como verdadeira uma vari찼vel definida sem `= <valor>`." +msgstr "Os verdadeiros literais booleanos s찾o `yes`, `on`, `true` e `1`. Al챕m disso, 챕 considerada como verdadeira uma vari찼vel definida sem `= <valor>`." #. type: Labeled list #: en/config.txt:248 @@ -2740,8 +2727,7 @@ msgstr "falso" #. type: Plain text #: en/config.txt:250 -#, fuzzy, priority:100 -#| msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string." +#, priority:100 msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string." msgstr "Os falsos literais booleanos s찾o `no`, `off`, `false`, `0` e a string vazia." @@ -3613,10 +3599,9 @@ msgstr "Gerando a corre챌찾o em um formato texto com a op챌찾o `-p`" #. type: Plain text #: en/diff-generate-patch.txt:15 -#, fuzzy, priority:280 -#| msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text. You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables (see linkgit:git[1])." +#, priority:280 msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text. You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables (see linkgit:git[1]), and the `diff` attribute (see linkgit:gitattributes[5])." -msgstr "Executando linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], ou linkgit:git-diff-files[1] com a op챌찾o `-p` produz um patch em formato texto. 횋 poss챠vel personalizar a cria챌찾o do patch em um formato texto atrav챕s das vari찼veis de ambiente `GIT_EXTERNAL_DIFF` e `GIT_DIFF_OPTS` (consulte linkgit:git[1])." +msgstr "Executando linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], ou linkgit:git-diff-files[1] com a op챌찾o `-p` produz um patch em formato texto. 횋 poss챠vel personalizar a cria챌찾o do patch em um formato texto atrav챕s das vari찼veis de ambiente `GIT_EXTERNAL_DIFF`, `GIT_DIFF_OPTS` (consulte linkgit:git[1]) e o atributo `diff` (consulte linkgit:gitattributes[5])." #. type: Plain text #: en/diff-generate-patch.txt:18 @@ -3740,7 +3725,7 @@ msgstr "" #: en/diff-generate-patch.txt:81 #, priority:280 msgid "Hunk headers mention the name of the function to which the hunk applies. See \"Defining a custom hunk-header\" in linkgit:gitattributes[5] for details of how to tailor to this to specific languages." -msgstr "" +msgstr "Os cabe챌alhos \"hunk\" mencionam o nome da fun챌찾o 횪 qual o \"hunk\" se aplica. Consulte \"Definindo um cabe챌alho personalizado do hunk\" em linkgit:gitattributes[5] para detalhes de como adaptar a isto e para linguagens espec챠ficas." #. type: Title - #: en/diff-generate-patch.txt:84 @@ -4012,10 +3997,9 @@ msgstr "Suprime a sa챠da diff. 횣til para comandos como `git show` que por prede #. type: Labeled list #: en/diff-options.txt:37 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc)" +#, no-wrap, priority:280 msgid "--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)" -msgstr "--diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc)" +msgstr "--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)" #. type: Labeled list #: en/diff-options.txt:38 en/diff-options.txt:44 @@ -4031,10 +4015,9 @@ msgstr "Define o formato diff que ser찼 usado para a mesclagem dos commits. A pr #. type: Labeled list #: en/diff-options.txt:43 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=(off|none):" +#, no-wrap, priority:280 msgid "--diff-merges=(off|none)" -msgstr "--diff-merges=(off|none):" +msgstr "--diff-merges=(off|none)" #. type: Plain text #: en/diff-options.txt:47 @@ -4044,17 +4027,15 @@ msgstr "Desativa a sa챠da dos diffs para a mesclagem dos commits. 횣til para sub #. type: Labeled list #: en/diff-options.txt:48 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=1:" +#, no-wrap, priority:280 msgid "--diff-merges=on" -msgstr "--diff-merges=1:" +msgstr "--diff-merges=on" #. type: Labeled list #: en/diff-options.txt:49 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=m:" +#, no-wrap, priority:280 msgid "--diff-merges=m" -msgstr "--diff-merges=m:" +msgstr "--diff-merges=m" #. type: Labeled list #: en/diff-options.txt:50 en/git-am.txt:66 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:71 en/git-read-tree.txt:34 en/git-rebase.txt:341 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49 @@ -4070,17 +4051,15 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:57 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=first-parent:" +#, no-wrap, priority:280 msgid "--diff-merges=first-parent" -msgstr "--diff-merges=first-parent:" +msgstr "--diff-merges=first-parent" #. type: Labeled list #: en/diff-options.txt:58 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=1:" +#, no-wrap, priority:280 msgid "--diff-merges=1" -msgstr "--diff-merges=1:" +msgstr "--diff-merges=1" #. type: Plain text #: en/diff-options.txt:61 @@ -4090,31 +4069,27 @@ msgstr "Esta op챌찾o faz com que os commits mesclados mostrem a diferen챌a total #. type: Labeled list #: en/diff-options.txt:62 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=separate:" +#, no-wrap, priority:280 msgid "--diff-merges=separate" -msgstr "--diff-merges=separate:" +msgstr "--diff-merges=separate" #. type: Plain text #: en/diff-options.txt:66 -#, fuzzy, priority:280 -#| msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent. `-m` doesn't produce any output without `-p`." +#, priority:280 msgid "This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated for each parent." -msgstr "Faz com que os commits mesclados mostrem a diferen챌a total com rela챌찾o a cada uma das suas origens. 횋 gerado uma entrada de registro separada e um diff para cada um dos commits relacionados. O `-m` n찾o gera nenhuma sa챠da sem `-p`." +msgstr "Faz com que os commits mesclados mostrem a diferen챌a total com rela챌찾o a cada uma das suas origens. 횋 gerado uma entrada de registro separada e um diff para cada um dos commits relacionados." #. type: Labeled list #: en/diff-options.txt:67 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=combined:" +#, no-wrap, priority:280 msgid "--diff-merges=combined" -msgstr "--diff-merges=combined:" +msgstr "--diff-merges=combined" #. type: Labeled list #: en/diff-options.txt:68 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=c:" +#, no-wrap, priority:280 msgid "--diff-merges=c" -msgstr "--diff-merges=c:" +msgstr "--diff-merges=c" #. type: Labeled list #: en/diff-options.txt:69 en/git-am.txt:54 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:93 en/git-grep.txt:187 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:79 en/git-stripspace.txt:42 @@ -4130,17 +4105,15 @@ msgstr "Com esta op챌찾o, a sa챠da \"diff\" para um commit de mesclagem exibe as #. type: Labeled list #: en/diff-options.txt:77 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=dense-combined:" +#, no-wrap, priority:280 msgid "--diff-merges=dense-combined" -msgstr "--diff-merges=dense-combined:" +msgstr "--diff-merges=dense-combined" #. type: Labeled list #: en/diff-options.txt:78 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=cc:" +#, no-wrap, priority:280 msgid "--diff-merges=cc" -msgstr "--diff-merges=cc:" +msgstr "--diff-merges=cc" #. type: Labeled list #: en/diff-options.txt:79 en/git-diff-files.txt:38 en/git-diff-tree.txt:103 @@ -4657,10 +4630,9 @@ msgstr "--name-status" #. type: Plain text #: en/diff-options.txt:311 -#, fuzzy, priority:280 -#| msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean." +#, priority:280 msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean. Just like `--name-only` the file names are often encoded in UTF-8." -msgstr "Exiba apenas os nomes e a condi챌찾o atual dos arquivos que foram alterados. Consulte a descri챌찾o da op챌찾o `--diff-filter` sobre o significado das letras de condi챌찾o." +msgstr "Exiba apenas os nomes e a condi챌찾o atual dos arquivos que foram alterados. Consulte a descri챌찾o da op챌찾o `--diff-filter` sobre o significado das letras de condi챌찾o. Assim como os nomes dos arquivos com `--name-only` geralmente s찾o codificados em UTF-8." #. type: Labeled list #: en/diff-options.txt:312 @@ -7124,16 +7096,7 @@ msgstr "git-am - Aplica uma s챕rie de patches vindas de um mailbox (caixa de cor #. type: Plain text #: en/git-am.txt:21 -#, 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 [(<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" @@ -7144,15 +7107,7 @@ msgid "" "\t [--quoted-cr=<action>]\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 [(<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 [(<mbox> | <Maildir>)...]\n'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n" #. type: Plain text #: en/git-am.txt:27 @@ -7240,17 +7195,15 @@ msgstr "Ignore linhas \"scissors\" (tesouras) (veja linkgit:git-mailinfo[1])." #. type: Labeled list #: en/git-am.txt:63 en/git-mailinfo.txt:94 -#, fuzzy, no-wrap, priority:100 -#| msgid "--whitespace=<action>" +#, no-wrap, priority:100 msgid "--quoted-cr=<action>" -msgstr "--whitespace=<a챌찾o>" +msgstr "--quoted-cr=<a챌찾o>" #. type: Plain text #: en/git-am.txt:65 -#, fuzzy, priority:100 -#| msgid "Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])." +#, priority:100 msgid "This flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1])." -msgstr "Repasse o comando `-k` para o comando 'git mailinfo' (consulte linkgit:git-mailinfo[1])." +msgstr "Esta op챌찾o ser찼 passada ao comando 'git mailinfo' (consulte linkgit:git-mailinfo[1])." #. type: Labeled list #: en/git-am.txt:67 en/git-mailinfo.txt:72 @@ -11176,22 +11129,19 @@ msgstr "Em vez do conte첬do, exiba o tipo do objeto identificado por `<objeto>`. #. type: Plain text #: en/git-cat-file.txt:43 -#, fuzzy, priority:100 -#| msgid "Instead of the content, show the object size identified by <object>." +#, priority:100 msgid "Instead of the content, show the object size identified by `<object>`." msgstr "Em vez do conte첬do, exiba o tamanho do objeto identificado por `<objeto>`." #. type: Plain text #: en/git-cat-file.txt:48 -#, fuzzy, priority:100 -#| msgid "Exit with zero status if <object> exists and is a valid object. If <object> is of an invalid format exit with non-zero and emits an error on stderr." +#, priority:100 msgid "Exit with zero status if `<object>` exists and is a valid object. If `<object>` is of an invalid format exit with non-zero and emits an error on stderr." msgstr "Encerre com a condi챌찾o zero caso o `<objeto>` exista e seja um objeto v찼lido. Caso o `<objeto>` tenha um formato inv찼lido, encerre com um valor diferente de zero e emita uma mensagem de erro no \"stderr\"." #. type: Plain text #: en/git-cat-file.txt:51 -#, fuzzy, priority:100 -#| msgid "Pretty-print the contents of <object> based on its type." +#, priority:100 msgid "Pretty-print the contents of `<object>` based on its type." msgstr "Fa챌a uma impress찾o bonita do conte첬do do `<objeto>` com base no seu tipo." @@ -11203,15 +11153,13 @@ msgstr "<tipo>" #. type: Plain text #: en/git-cat-file.txt:59 -#, fuzzy, priority:100 -#| msgid "Typically this matches the real type of <object> but asking for a type that can trivially be dereferenced from the given <object> is also permitted. An example is to ask for a \"tree\" with <object> being a commit object that contains it, or to ask for a \"blob\" with <object> being a tag object that points at it." +#, priority:100 msgid "Typically this matches the real type of `<object>` but asking for a type that can trivially be dereferenced from the given `<object>` is also permitted. An example is to ask for a \"tree\" with `<object>` being a commit object that contains it, or to ask for a \"blob\" with `<object>` being a tag object that points at it." -msgstr "Normalmente, isso coincide com tipo real do <objeto>, mas solicitar um tipo sem refer챗ncia de um determinado <objeto> tamb챕m 챕 permitido. Um exemplo 챕 pedir uma \"찼rvore\" com o `<objeto>` sendo um objeto commit que o cont챕m, ou pedir uma \"bolha\" com o `<objeto>` sendo uma tag que aponte para ela." +msgstr "Normalmente, isso coincide com tipo real do `<objeto>`, mas solicitar um tipo sem refer챗ncia de um determinado `<objeto>` tamb챕m 챕 permitido. Um exemplo 챕 pedir uma \"찼rvore\" com o `<objeto>` sendo um objeto commit que o cont챕m, ou pedir uma \"bolha\" com o `<objeto>` sendo uma tag que aponte para ela." #. type: Plain text #: en/git-cat-file.txt:65 -#, fuzzy, priority:100 -#| msgid "Show the content as transformed by a textconv filter. In this case, <object> has to be of the form <tree-ish>:<path>, or :<path> in order to apply the filter to the content recorded in the index at <path>." +#, priority:100 msgid "Show the content as transformed by a textconv filter. In this case, `<object>` has to be of the form `<tree-ish>:<path>`, or `:<path>` in order to apply the filter to the content recorded in the index at `<path>`." msgstr "Exiba o conte첬do da maneira que foi transformado por um filtro textconv. Nesse caso, o `<objeto>` deve estar no formato `<찼rvore>:<caminho>` ou `:<caminho>` para aplicar o filtro ao conte첬do registrado no 챠ndice do `<caminho>`." @@ -11223,8 +11171,7 @@ msgstr "--filters" #. type: Plain text #: en/git-cat-file.txt:71 -#, fuzzy, priority:100 -#| msgid "Show the content as converted by the filters configured in the current working tree for the given <path> (i.e. smudge filters, end-of-line conversion, etc). In this case, <object> has to be of the form <tree-ish>:<path>, or :<path>." +#, priority:100 msgid "Show the content as converted by the filters configured in the current working tree for the given `<path>` (i.e. smudge filters, end-of-line conversion, etc). In this case, `<object>` has to be of the form `<tree-ish>:<path>`, or `:<path>`." msgstr "Exiba o conte첬do conforme foi convertido pelos filtros configurados na 찼rvore de trabalho atual para o `<caminho>` informado (por exemplo, filtros de manchas, convers찾o da quebra de linha, etc.). Nesse caso, o `<objeto>` deve estar no formato `<찼rvore>:<caminho>` ou `:<caminho>`." @@ -11236,8 +11183,7 @@ msgstr "--path=<caminho>" #. type: Plain text #: en/git-cat-file.txt:76 -#, fuzzy, priority:100 -#| msgid "For use with --textconv or --filters, to allow specifying an object name and a path separately, e.g. when it is difficult to figure out the revision from which the blob came." +#, priority:100 msgid "For use with `--textconv` or `--filters`, to allow specifying an object name and a path separately, e.g. when it is difficult to figure out the revision from which the blob came." msgstr "Para a utiliza챌찾o com o comando `--textconv` ou `--filters`, permitindo a defini챌찾o de um nome do objeto e um caminho separadamente, quando for dif챠cil descobrir a revis찾o de onde a bolha veio por exemplo." @@ -11321,8 +11267,7 @@ msgstr "--allow-unknown-type" #. type: Plain text #: en/git-cat-file.txt:119 -#, fuzzy, priority:100 -#| msgid "Allow -s or -t to query broken/corrupt objects of unknown type." +#, priority:100 msgid "Allow `-s` or `-t` to query broken/corrupt objects of unknown type." msgstr "Permita que `-s` ou `-t` consultem os objetos quebrados/corrompidos de um tipo desconhecido." @@ -11334,10 +11279,9 @@ msgstr "--follow-symlinks" #. type: Plain text #: en/git-cat-file.txt:129 -#, fuzzy, priority:100 -#| msgid "With --batch or --batch-check, follow symlinks inside the repository when requesting objects with extended SHA-1 expressions of the form tree-ish:path-in-tree. Instead of providing output about the link itself, provide output about the linked-to object. If a symlink points outside the tree-ish (e.g. a link to /foo or a root-level link to ../foo), the portion of the link which is outside the tree will be printed." +#, priority:100 msgid "With `--batch` or `--batch-check`, follow symlinks inside the repository when requesting objects with extended SHA-1 expressions of the form tree-ish:path-in-tree. Instead of providing output about the link itself, provide output about the linked-to object. If a symlink points outside the tree-ish (e.g. a link to `/foo` or a root-level link to `../foo`), the portion of the link which is outside the tree will be printed." -msgstr "Com a op챌찾o `--batch` ou `--batch-check`, siga os links simb처licos dentro do reposit처rio durante a solicita챌찾o dos objetos das express천es SHA-1 estendidas no formato `tree-ish: path-in-tree`. Em vez de providenciar a gera챌찾o sobre o pr처prio link, gere uma sa챠da sobre o objeto que for vinculado. Caso um link simb처lico aponte para fora da 찼rvore (um link para /foo ou um link na raiz para ../foo por exemplo), a parte do link que est찼 fora da 찼rvore ser찼 exibida." +msgstr "Com a op챌찾o `--batch` ou `--batch-check`, siga os links simb처licos dentro do reposit처rio durante a solicita챌찾o dos objetos das express천es SHA-1 estendidas no formato `tree-ish: path-in-tree`. Em vez de providenciar a gera챌찾o sobre o pr처prio link, gere uma sa챠da sobre o objeto que for vinculado. Caso um link simb처lico aponte para fora da 찼rvore (um link para `/foo` ou um link na raiz para `../foo` por exemplo), a parte do link que est찼 fora da 찼rvore ser찼 exibida." #. type: Plain text #: en/git-cat-file.txt:133 @@ -11437,38 +11381,33 @@ msgstr "SA횒DA" #. type: Plain text #: en/git-cat-file.txt:179 -#, fuzzy, priority:100 -#| msgid "If `-t` is specified, one of the <type>." +#, priority:100 msgid "If `-t` is specified, one of the `<type>`." -msgstr "Caso a op챌찾o `-t` seja utilizada, um do <tipo>." +msgstr "Caso a op챌찾o `-t` seja utilizada, um do `<tipo>`." #. type: Plain text #: en/git-cat-file.txt:181 -#, fuzzy, priority:100 -#| msgid "If `-s` is specified, the size of the <object> in bytes." +#, priority:100 msgid "If `-s` is specified, the size of the `<object>` in bytes." -msgstr "Caso a op챌찾o `-s` seja utilizada, o tamanho do <objeto> em bytes." +msgstr "Caso a op챌찾o `-s` seja utilizada, o tamanho do `<objeto>` em bytes." #. type: Plain text #: en/git-cat-file.txt:183 -#, fuzzy, priority:100 -#| msgid "If `-e` is specified, no output, unless the <object> is malformed." +#, priority:100 msgid "If `-e` is specified, no output, unless the `<object>` is malformed." -msgstr "Caso a op챌찾o `-e` seja utilizada, nenhuma sa챠da, a menos que o <objeto> esteja malformado." +msgstr "Caso a op챌찾o `-e` seja utilizada, nenhuma sa챠da, a menos que o `<objeto>` esteja malformado." #. type: Plain text #: en/git-cat-file.txt:185 -#, fuzzy, priority:100 -#| msgid "If `-p` is specified, the contents of <object> are pretty-printed." +#, priority:100 msgid "If `-p` is specified, the contents of `<object>` are pretty-printed." -msgstr "Caso a op챌찾o `-p` seja utilizada, o conte첬do de <objeto> ser찼 bem impresso." +msgstr "Caso a op챌찾o `-p` seja utilizada, o conte첬do de `<objeto>` ser찼 bem impresso." #. type: Plain text #: en/git-cat-file.txt:188 -#, fuzzy, priority:100 -#| msgid "If <type> is specified, the raw (though uncompressed) contents of the <object> will be returned." +#, priority:100 msgid "If `<type>` is specified, the raw (though uncompressed) contents of the `<object>` will be returned." -msgstr "Caso um <tipo> seja utilizada, o conte첬do bruto (embora n찾o compactado) do <objeto> ser찼 retornado." +msgstr "Caso um `<tipo>` seja utilizada, o conte첬do bruto (embora n찾o compactado) do `<objeto>` ser찼 retornado." #. type: Title - #: en/git-cat-file.txt:190 @@ -11496,10 +11435,9 @@ msgstr "`objectname`" #. type: Plain text #: en/git-cat-file.txt:204 -#, fuzzy, priority:100 -#| msgid "are the octal representation of the file modes." +#, priority:100 msgid "The full hex representation of the object name." -msgstr "s찾o a representa챌찾o octais dos modos dos arquivos." +msgstr "A representa챌찾o completa do hex do nome do objeto." #. type: Labeled list #: en/git-cat-file.txt:205 @@ -11582,16 +11520,11 @@ msgstr "Por exemplo, o comando `--batch` sem um formato personalizado produziria #. type: delimited block - #: en/git-cat-file.txt:241 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| "<sha1> SP <type> SP <size> LF\n" -#| "<contents> LF\n" +#, no-wrap, priority:100 msgid "" "<oid> SP <type> SP <size> LF\n" "<contents> LF\n" -msgstr "" -"<sha1> SP <tipo> SP <tamanho> LF\n" -"<conte첬do> LF\n" +msgstr "<oid> SP <tipo> SP <tamanho> LF\n<conte첬do> LF\n" #. type: Plain text #: en/git-cat-file.txt:244 @@ -11601,10 +11534,9 @@ msgstr "Considerando que `--batch-check ='%(objeto-nome)% (objeto-tipo)'` produz #. type: delimited block - #: en/git-cat-file.txt:247 -#, fuzzy, no-wrap, priority:100 -#| msgid "<sha1> SP <type> LF\n" +#, no-wrap, priority:100 msgid "<oid> SP <type> LF\n" -msgstr "<sha1> SP <tipo> LF\n" +msgstr "<oid> SP <tipo> LF\n" #. type: Plain text #: en/git-cat-file.txt:251 @@ -11632,8 +11564,7 @@ msgstr "<objeto> SP amb챠guo LF\n" #. type: Plain text #: en/git-cat-file.txt:265 -#, fuzzy, priority:100 -#| msgid "If --follow-symlinks is used, and a symlink in the repository points outside the repository, then `cat-file` will ignore any custom format and print:" +#, priority:100 msgid "If `--follow-symlinks` is used, and a symlink in the repository points outside the repository, then `cat-file` will ignore any custom format and print:" msgstr "Caso a op챌찾o `--follow-symlinks` seja utilizado e um link-simb처lico no reposit처rio apontar para fora do reposit처rio, ent찾o o `cat-file` ir찼 ignorar qualquer outro formato customizado e exibir찼:" @@ -11649,15 +11580,13 @@ msgstr "" #. type: Plain text #: en/git-cat-file.txt:274 -#, fuzzy, priority:100 -#| msgid "The symlink will either be absolute (beginning with a /), or relative to the tree root. For instance, if dir/link points to ../../foo, then <symlink> will be ../foo. <size> is the size of the symlink in bytes." +#, priority:100 msgid "The symlink will either be absolute (beginning with a `/`), or relative to the tree root. For instance, if dir/link points to `../../foo`, then `<symlink>` will be `../foo`. `<size>` is the size of the symlink in bytes." -msgstr "O link simb처lico ou ser찼 absoluto (come챌ando com um /) ou relativo 횪 raiz da 찼rvore. Por exemplo, caso o dir/link aponte para ../../foo, ent찾o o `<symlink>` ser찼 ../foo. <tamanho> 챕 o tamanho do link simb처lico em bytes." +msgstr "O link simb처lico ou ser찼 absoluto (come챌ando com um `/`) ou relativo 횪 raiz da 찼rvore. Por exemplo, caso o dir/link aponte para `../../foo`, ent찾o o `<symlink>` ser찼 `../foo`. O `<tamanho>` 챕 o tamanho do link simb처lico em bytes." #. type: Plain text #: en/git-cat-file.txt:277 -#, fuzzy, priority:100 -#| msgid "If --follow-symlinks is used, the following error messages will be displayed:" +#, priority:100 msgid "If `--follow-symlinks` is used, the following error messages will be displayed:" msgstr "Caso a op챌찾o `--follow-symlinks` seja utilizado, as seguintes mensagens de erro ser찾o exibidas:" @@ -14565,17 +14494,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]\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" @@ -14586,16 +14505,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]\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 @@ -14773,7 +14683,7 @@ msgstr "--[no-]reject-shallow" #: en/git-clone.txt:156 #, priority:300 msgid "Fail if the source repository is a shallow repository. The 'clone.rejectShallow' configuration variable can be used to specify the default." -msgstr "" +msgstr "Falha caso o reposit처rio de fontes for um reposit처rio superficial. A vari찼vel de configura챌찾o 'clone.rejectShallow' pode ser usada para definir o padr찾o." #. type: Labeled list #: en/git-clone.txt:157 en/git-init.txt:48 en/git-p4.txt:305 en/git.txt:171 @@ -15481,15 +15391,7 @@ msgstr "git-commit - Grava as altera챌천es feitas no reposit처rio" #. type: Plain text #: en/git-commit.txt:19 -#, fuzzy, ignore-ellipsis, no-wrap, priority:280 -#| msgid "" -#| "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" -#| "\t [--dry-run] [(-c | -C | --fixup | --squash) <commit>]\n" -#| "\t [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n" -#| "\t [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n" -#| "\t [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n" -#| "\t [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" -#| "\t [-S[<keyid>]] [--] [<pathspec>...]\n" +#, ignore-ellipsis, no-wrap, priority:280 msgid "" "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n" "\t [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]\n" @@ -15499,14 +15401,7 @@ msgid "" "\t [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" "\t [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n" "\t [--] [<pathspec>...]\n" -msgstr "" -"'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<modo>] [--amend]\n" -"\t [--dry-run] [(-c | -C | --fixup | --squash) <commit>]\n" -"\t [-F <arquivo> | -m <msg>] [--reset-author] [--allow-empty]\n" -"\t [--allow-empty-message] [--no-verify] [-e] [--author=<autor>]\n" -"\t [--date=<data>] [--cleanup=<modo>] [--[no-]status]\n" -"\t [-i | -o] [--pathspec-from-file=<arquivo> [--pathspec-file-nul]]\n" -"\t [-S[<keyid>]] [--] [<pathspec>...]\n" +msgstr "'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<modo>] [--amend]\n\t [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]\n\t [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n\t [--allow-empty-message] [--no-verify] [-e] [--author=<autor>]\n\t [--date=<data>] [--cleanup=<modo>] [--[no-]status]\n\t [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n\t [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n\t [--] [<pathspec>...]\n" #. type: Plain text #: en/git-commit.txt:28 @@ -15612,10 +15507,9 @@ msgstr "Como `-C`, por챕m com `-c` o editor 챕 chamado para que o usu찼rio possa #. type: Labeled list #: en/git-commit.txt:90 -#, fuzzy, no-wrap, priority:280 -#| msgid "--fixup=<commit>" +#, no-wrap, priority:280 msgid "--fixup=[(amend|reword):]<commit>" -msgstr "--fixup=<commit>" +msgstr "--fixup=[(amend|reword):]<commit>" #. type: Plain text #: en/git-commit.txt:100 @@ -26488,10 +26382,9 @@ msgstr "As primeiras `N` linhas da mensagem." #. type: Plain text #: en/git-for-each-ref.txt:266 -#, fuzzy, priority:100 -#| msgid "Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as `trailers` (or by using the historical alias `contents:trailers`). Non-trailer lines from the trailer block can be omitted with `trailers:only`. Whitespace-continuations can be removed from trailers so that each trailer appears on a line by itself with its full content with `trailers:unfold`. Both can be used together as `trailers:unfold,only`." +#, priority:100 msgid "Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as `trailers[:options]` (or by using the historical alias `contents:trailers[:options]`). For valid [:option] values see `trailers` section of linkgit:git-log[1]." -msgstr "Al챕m disso, os trailers interpretados atrav챕s do linkgit:git-interpret-trailers[1] s찾o obtidos como `caractere de resposta` (ou utilizando o alias do hist처rico `contents:trailers`). As linhas que n찾o forem caractere de resposta do bloco dos caracteres de resposta, podem ser omitidos com `trailers:only`. As continua챌천es dos espa챌os podem ser removidos dos caracteres de resposta, para que cada caractere apare챌a em uma linha por si s처 e com o seu conte첬do completo, utilizando `trailers:unfold`. Ambos podem ser utilizados juntos como `trailers:unfold,only`." +msgstr "Al챕m disso, os trailers interpretados por linkgit:git-interpret-trailers[1] s찾o obtidos como `trailers[:op챌천es]` (ou usando o pseud척nimo hist처rico `contents:trailers[:op챌천es]`). Para conhecer os valores v찼lidos para as [:op챌천es], consulte a se챌찾o `trailers` do linkgit:git-log[1]." #. type: Plain text #: en/git-for-each-ref.txt:270 @@ -30671,10 +30564,9 @@ msgstr "Em vez de uma ID para o commit na linha de comando (o que n찾o 챕 espera #. type: Labeled list #: en/git-http-fetch.txt:52 -#, fuzzy, no-wrap, priority:100 -#| msgid "--include-paths=<regex>" +#, no-wrap, priority:100 msgid "--index-pack-args=<args>" -msgstr "--include-paths=<express찾o-regular>" +msgstr "--index-pack-args=<argumentos>" #. type: Plain text #: en/git-http-fetch.txt:55 @@ -32208,10 +32100,9 @@ msgstr "" #. type: Labeled list #: en/git-interpret-trailers.txt:248 -#, fuzzy, no-wrap, priority:100 -#| msgid "trailer.<token>.command" +#, no-wrap, priority:100 msgid "trailer.<token>.cmd" -msgstr "trailer.<token>.command" +msgstr "trailer.<token>.cmd" #. type: Plain text #: en/git-interpret-trailers.txt:253 @@ -32432,7 +32323,7 @@ msgid "" ">\n" "> EOF\n" "subject\n" -msgstr "" +msgstr "$ cat ~/bin/glog-find-author\n#!/bin/sh\ntest -n \"$1\" && git log --author=\"$1\" --pretty=\"%an <%ae>\" -1 || true\n$ git config trailer.help.key \"Auxiliado por: \"\n$ git config trailer.help.ifExists \"addIfDifferentNeighbor\"\n$ git config trailer.help.cmd \"~/bin/glog-find-author\"\n$ git interpret-trailers --trailer=\"help:Junio\" --trailer=\"help:Couder\" <<EOF\n> assunto\n>\n> mensagem\n>\n> EOF\nassunto\n" #. type: delimited block - #: en/git-interpret-trailers.txt:372 @@ -32466,7 +32357,7 @@ msgid "" ">\n" "> EOF\n" "subject\n" -msgstr "" +msgstr "$ cat ~/bin/glog-grep\n#!/bin/sh\ntest -n \"$1\" && git log --grep \"$1\" --pretty=reference -1 || true\n$ git config trailer.ref.key \"Refer챗ncia para: \"\n$ git config trailer.ref.ifExists \"substitua\"\n$ git config trailer.ref.cmd \"~/bin/glog-grep\"\n$ git interpret-trailers --trailer=\"ref:Add copyright notices.\" <<EOF\n> assunto\n>\n> mensagem\n>\n> EOF\nassunto\n" #. type: delimited block - #: en/git-interpret-trailers.txt:396 @@ -33828,13 +33719,12 @@ msgstr "git-mailinfo - Extrai o patch e a autoria de uma 첬nica mensagem de e-ma #. type: Plain text #: en/git-mailinfo.txt:15 -#, fuzzy, no-wrap, priority:100 -#| msgid "'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--[no-]scissors] <msg> <patch>\n" +#, no-wrap, priority:100 msgid "" "'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n]\n" "\t [--[no-]scissors] [--quoted-cr=<action>]\n" "\t <msg> <patch>\n" -msgstr "'git mailinfo' [-k|-b] [-u | --encoding=<codifica챌찾o> | -n] [--[no-]scissors] <msg> <patch>\n" +msgstr "'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n]\n\t [--[no-]scissors] [--quoted-cr=<a챌찾o>]\n\t <msg> <patch>\n" #. type: Plain text #: en/git-mailinfo.txt:25 @@ -33952,34 +33842,33 @@ msgstr "" #. type: Plain text #: en/git-mailinfo.txt:100 -#, fuzzy, priority:100 -#| msgid "The possible options are:" +#, priority:100 msgid "The valid actions are:" -msgstr "As op챌천es dispon챠veis s찾o:" +msgstr "As a챌천es v찼lidas s찾o:" #. type: Plain text #: en/git-mailinfo.txt:103 #, priority:100 msgid "`nowarn`: Git will do nothing when such a CRLF is found." -msgstr "" +msgstr "`nowarn`: O git n찾o far찼 nada quando tal CRLF for encontrado." #. type: Plain text #: en/git-mailinfo.txt:104 #, priority:100 msgid "`warn`: Git will issue a warning for each message if such a CRLF is" -msgstr "" +msgstr "`warn`: O git emitir찼 um aviso para cada mensagem caso tal CRLF seja" #. type: Plain text #: en/git-mailinfo.txt:105 #, priority:100 msgid "found." -msgstr "" +msgstr "encontrado." #. type: Plain text #: en/git-mailinfo.txt:106 #, priority:100 msgid "`strip`: Git will convert those CRLF to LF." -msgstr "" +msgstr "`strip`: O git converter찼 estes CRLF para LF." #. type: Plain text #: en/git-mailinfo.txt:110 @@ -40225,10 +40114,9 @@ msgstr "`git push origin`" #. type: Plain text #: en/git-push.txt:606 -#, fuzzy, priority:220 -#| msgid "Without additional configuration, pushes the current branch to the configured upstream (`remote.origin.merge` configuration variable) if it has the same name as the current branch, and errors out without pushing otherwise." +#, priority:220 msgid "Without additional configuration, pushes the current branch to the configured upstream (`branch.<name>.merge` configuration variable) if it has the same name as the current branch, and errors out without pushing otherwise." -msgstr "Sem uma configura챌찾o adicional, envia a ramifica챌찾o atual para a upstream configurada (a vari찼vel de configura챌찾o `remote.origin.merge`) caso ela tenha o mesmo nome que o ramo atual e os erros ocorrerem sem qualquer outro impulsionamento." +msgstr "Sem uma configura챌찾o adicional, envia a ramifica챌찾o atual para a upstream configurada (a vari찼vel de configura챌찾o `branch.<name>.merge`) caso ela tenha o mesmo nome que o ramo atual e os erros ocorrerem sem qualquer outro impulsionamento." #. type: Plain text #: en/git-push.txt:610 @@ -42488,10 +42376,9 @@ msgstr "--no-autosquash" #. type: Plain text #: en/git-rebase.txt:601 -#, fuzzy, ignore-ellipsis, priority:100 -#| msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`). A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]." +#, ignore-ellipsis, priority:100 msgid "When the commit log message begins with \"squash! ...\" or \"fixup! ...\" or \"amend! ...\", and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of `rebase -i`, so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` or `fixup` or `fixup -C` respectively. A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too. The recommended way to create fixup/amend/squash commits is by using the `--fixup`, `--fixup=amend:` or `--fixup=reword:` and `--squash` options respectively of linkgit:git-commit[1]." -msgstr "Quando a mensagem do registro log do commit come챌ar com \"squash! ...\" (ou \"fixup! ...\"),e j찼 existe um commit na lista de tarefas que coincidem com o mesmo `...`, altera a lista de tarefas automaticamente do 'rebase -i' para que o commit marcado para ser comprimido venha logo ap처s o commit que ser찼 modificado e altere a a챌찾o do commit movido de `pick` para `squash` (ou `fixup`). Um commit coincide com `...` caso haja a coincid챗ncia do assunto do commit ou se o `...` se referir ao hash do commit. Como alternativa, as coincid챗ncias que forem parciais ao assunto do commit, tamb챕m funcionam. A maneira recomendada para se criar os commits para corre챌찾o/compress찾o 챕 utilizando as op챌천es `--fixup`/`--squash` do comando linkgit:git-commit[1]." +msgstr "Quando a mensagem do registro log do commit come챌ar com \"squash! ...\" ou \"fixup! ...\", j찼 existe um commit na lista de tarefas que coincidem com o mesmo `...`, altera a lista de tarefas automaticamente do `rebase -i` para que o commit marcado para ser comprimido venha logo ap처s o commit que ser찼 modificado e altere a a챌찾o do commit movido de `pick` para `squash`, `fixup` ou `fixup -C` respectivamente. Um commit coincide com `...` caso haja a coincid챗ncia do assunto do commit ou se o `...` se referir ao hash do commit. Como alternativa, as coincid챗ncias que forem parciais ao assunto do commit, tamb챕m funcionam. A maneira recomendada para se criar os commits para fixup/amend/squash 챕 utilizando as op챌천es `--fixup`, `--fixup=amend:` ou `--fixup=reword:` e `--squash` respectivamente do comando linkgit:git-commit[1]." #. type: Plain text #: en/git-rebase.txt:605 @@ -45246,13 +45133,13 @@ msgstr "Encaminha a op챌찾o `--delta-islands` para `git-pack-objects`, consulte #: en/git-repack.txt:168 #, no-wrap, priority:100 msgid "-g=<factor>" -msgstr "" +msgstr "-g=<fator>" #. type: Labeled list #: en/git-repack.txt:169 #, no-wrap, priority:100 msgid "--geometric=<factor>" -msgstr "" +msgstr "--geometric=<fator>" #. type: Plain text #: en/git-repack.txt:173 @@ -51323,20 +51210,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 [<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" @@ -51350,19 +51224,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 [<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] [-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 @@ -51444,14 +51306,13 @@ msgstr "O comando aceita as op챌천es aplic찼veis ao comando 'git log' para contr #: en/git-stash.txt:86 #, no-wrap, priority:240 msgid "show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]" -msgstr "" +msgstr "show [-u|--include-untracked|--only-untracked] [<op챌천es-do-diff>] [<stash>]" #. type: Plain text #: en/git-stash.txt:96 -#, fuzzy, priority:240 -#| msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior." +#, priority:240 msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showIncludeUntracked, stash.showStat, and stash.showPatch config variables to change the default behavior." -msgstr "Exiba as altera챌천es registradas na entrada 'stash' como uma diferen챌a entre o conte첬do oculto e o commit quando a entrada stash for criada. 횋 predefinido que o comando exiba o \"diffstat\", por챕m aceite qualquer formato informado pelo comando 'git diff' (por exemplo, `git stash show -p stash@{1}` para exibir a segunda entrada mais recente em formato patch). Voc챗 pode usar as vari찼veis de configura챌찾o `stash.showStat` e/ou `stash.showPatch` para alterar o comportamento predefinido." +msgstr "Exiba as altera챌천es registradas na entrada 'stash' como uma diferen챌a entre o conte첬do oculto e o commit quando a entrada stash for criada. 횋 predefinido que o comando exiba o \"diffstat\", por챕m aceite qualquer formato informado pelo comando 'git diff' (por exemplo, `git stash show -p stash@{1}` para exibir a segunda entrada mais recente em formato patch). Voc챗 pode usar as vari찼veis de configura챌찾o `stash.showIncludeUntracked`, `stash.showStat` e `stash.showPatch` para alterar o comportamento predefinido." #. type: Labeled list #: en/git-stash.txt:97 @@ -51575,10 +51436,9 @@ msgstr "--no-include-untracked" #. type: Plain text #: en/git-stash.txt:167 -#, fuzzy, priority:240 -#| msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`." +#, priority:240 msgid "When used with the `push` and `save` commands, all untracked files are also stashed and then cleaned up with `git clean`." -msgstr "Todos os arquivos ignorados e n찾o monitorados tamb챕m s찾o armazenados em cache e limpos com o comando `git clean`." +msgstr "Quando usado em conjunto com os comandos `push` e `save`, todos os arquivos n찾o monitorados tamb챕m s찾o armazenados em cache e limpos com o comando `git clean`." #. type: Plain text #: en/git-stash.txt:170 @@ -51594,17 +51454,15 @@ msgstr "--only-untracked" #. type: Plain text #: en/git-stash.txt:173 -#, fuzzy, priority:240 -#| msgid "This option is only valid for `push` command." +#, priority:240 msgid "This option is only valid for the `show` command." -msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `push`." +msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `show`." #. type: Plain text #: en/git-stash.txt:175 -#, fuzzy, priority:240 -#| msgid "Output only the trailers, not any other parts of the input." +#, priority:240 msgid "Show only the untracked files in the stash entry as part of the diff." -msgstr "Exibe apenas os caracteres de resposta e n찾o quaisquer outras partes da entrada." +msgstr "Mostra apenas os arquivos n찾o rastreados na entrada do stash como parte do diff." #. type: Plain text #: en/git-stash.txt:178 @@ -56472,14 +56330,7 @@ msgstr "git - o monitor de conte첬do est첬pido" #. type: Plain text #: en/git.txt:18 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| "'git' [--version] [--help] [-C <path>] [-c <name>=<value>]\n" -#| " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -#| " [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n" -#| " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -#| " [--super-prefix=<path>] [--config-env <name>=<envvar>]\n" -#| " <command> [<args>]\n" +#, no-wrap, priority:100 msgid "" "'git' [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -56487,13 +56338,7 @@ msgid "" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" " [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" " <command> [<args>]\n" -msgstr "" -"'git' [--version] [--help] [-C <caminho>] [-c <nome>=<valor>]\n" -" [--exec-path[=<caminho>]] [--html-path] [--man-path] [--info-path]\n" -" [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n" -" [--git-dir=<caminho>] [--work-tree=<caminho>] [--namespace=<nome>]\n" -" [--super-prefix=<caminho>][--config-env <nome>=<envvar>]\n" -" <comando> [<args>]\n" +msgstr "'git' [--version] [--help] [-C <caminho>] [-c <nome>=<valor>]\n [--exec-path[=<caminho>]] [--html-path] [--man-path] [--info-path]\n [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]\n [--git-dir=<caminho>] [--work-tree=<caminho>] [--namespace=<nome>]\n [--super-prefix=<caminho>][--config-env=<nome>=<envvar>]\n <comando> [<args>]\n" #. type: Plain text #: en/git.txt:24 @@ -63889,10 +63734,9 @@ msgstr "'%ah'" #. type: Plain text #: en/pretty-formats.txt:195 -#, fuzzy, priority:260 -#| msgid "ref names, like the --decorate option of linkgit:git-log[1]" +#, priority:260 msgid "author date, human style (like the `--date=human` option of linkgit:git-rev-list[1])" -msgstr "nomes de refer챗ncia \"ref\", como a op챌찾o --decorate do linkgit:git-log[1]" +msgstr "data da autoria, compreens챠vel para pessoas (como a op챌찾o `--date=human` do linkgit:git-rev-list[1])" #. type: Labeled list #: en/pretty-formats.txt:195 @@ -64058,10 +63902,9 @@ msgstr "'%ch'" #. type: Plain text #: en/pretty-formats.txt:213 -#, fuzzy, priority:260 -#| msgid "ref names, like the --decorate option of linkgit:git-log[1]" +#, priority:260 msgid "committer date, human style (like the `--date=human` option of linkgit:git-rev-list[1])" -msgstr "nomes de refer챗ncia \"ref\", como a op챌찾o --decorate do linkgit:git-log[1]" +msgstr "a data de quem fez o commit, compreens챠vel para pessoas (como a op챌찾o `--date=human` do linkgit:git-rev-list[1])" #. type: Labeled list #: en/pretty-formats.txt:213 @@ -64089,10 +63932,9 @@ msgstr "nomes de refer챗ncia \"ref\" sem quebra autom찼tica \" (\", \")\"." #. type: Labeled list #: en/pretty-formats.txt:215 -#, fuzzy, no-wrap, priority:260 -#| msgid "'%(trailers[:options])'" +#, no-wrap, priority:260 msgid "'%(describe[:options])'" -msgstr "'%(trailers[:options])'" +msgstr "'%(describe[:options])'" #. type: Plain text #: en/pretty-formats.txt:222 @@ -64360,8 +64202,7 @@ msgstr "'%(trailers[:options])'" #. type: Plain text #: en/pretty-formats.txt:275 -#, fuzzy, priority:260 -#| msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options. If any option is provided multiple times the last occurance wins." +#, priority:260 msgid "display the trailers of the body as interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options. If any option is provided multiple times the last occurrence wins." msgstr "exibe os trechos do corpo como interpretado atrav챕s do linkgit:git-interpret-trailers[1]. Os trechos do texto da resposta podem ser seguidas por dois pontos, zero ou mais op챌천es separadas por v챠rgula: Caso qualquer op챌찾o seja usada v찼rias vezes, a 첬ltima ocorr챗ncia ganha."