diff --git a/po/documentation.fr.po b/po/documentation.fr.po index c312f70d24416cfdc8d83005974c648541454ff4..038211342eb7fbc48a46e9c26340154a1f745be2 100644 --- a/po/documentation.fr.po +++ b/po/documentation.fr.po @@ -3,19 +3,7 @@ # This file is distributed under the same license as the Git package. # Jean-No챘l Avila <jn.avila@free.fr>, 2019. msgid "" -msgstr "" -"Project-Id-Version: git documentation\n" -"Report-Msgid-Bugs-To: jn.avila@free.fr\n" -"POT-Creation-Date: 2021-02-27 18:16+0100\n" -"PO-Revision-Date: 2021-02-23 20:50+0000\n" -"Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n" -"Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n" -"Language: fr\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.5\n" +msgstr "Project-Id-Version: git documentation\nReport-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-02-27 18:16+0100\nPO-Revision-Date: 2021-03-02 12:11+0000\nLast-Translator: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage-Team: Jean-No챘l Avila <jn.avila@free.fr>\nLanguage: fr\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.5\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:738 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 @@ -800,10 +788,9 @@ msgstr "linkgit:gitdiffcore[7]" #. type: Plain text #: en/cmds-guide.txt:18 -#, fuzzy, priority:100 -#| msgid "Munging the diff output" +#, priority:100 msgid "Tweaking diff output." -msgstr "Bricoler la sortie diff" +msgstr "Bricoler la sortie diff." #. type: Labeled list #: en/cmds-guide.txt:19 @@ -837,10 +824,9 @@ msgstr "linkgit:gitglossary[7]" #. type: Plain text #: en/cmds-guide.txt:27 -#, fuzzy, priority:100 -#| msgid "gitglossary(7)" +#, priority:100 msgid "A Git Glossary." -msgstr "gitglossary(7)" +msgstr "Un glossaire de Git." #. type: Labeled list #: en/cmds-guide.txt:28 @@ -898,10 +884,9 @@ msgstr "linkgit:gitnamespaces[7]" #. type: Plain text #: en/cmds-guide.txt:42 -#, fuzzy, priority:100 -#| msgid "whitespace" +#, priority:100 msgid "Git namespaces." -msgstr "whitespace" +msgstr "Espaces de noms Git." #. type: Plain text #: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 @@ -3083,10 +3068,9 @@ msgstr "FORMATS DE DATE" #. type: Plain text #: en/date-formats.txt:6 -#, fuzzy, priority:280 -#| msgid "The `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` environment variables" +#, priority:280 msgid "The `GIT_AUTHOR_DATE` and `GIT_COMMITTER_DATE` environment variables support the following date formats:" -msgstr "Les variables d'environnement `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE`" +msgstr "Les variables d'environnement `GIT_AUTHOR_DATE` et `GIT_COMMITTER_DATE` supportent les formats de date suivants :" #. type: Labeled list #: en/date-formats.txt:7 @@ -4031,38 +4015,33 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:43 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=(off|none):" -msgstr "--diff-merges=off" +msgstr "--diff-merges=(off|none):" #. type: Labeled list #: en/diff-options.txt:44 -#, fuzzy, no-wrap, priority:280 -#| msgid "--no-diff-merges" +#, no-wrap, priority:280 msgid "--no-diff-merges:" -msgstr "--no-diff-merges" +msgstr "--no-diff-merges:" #. type: Plain text #: en/diff-options.txt:47 -#, fuzzy, priority:280 -#| msgid "Disable output of diffs for merge commits (default). Useful to override `-m`, `-c`, or `--cc`." +#, priority:280 msgid "Disable output of diffs for merge commits. Useful to override implied value." -msgstr "D챕sactive la sortie des diffs pour des commits de fusion (par d챕faut). Utile pour passer outre `-m`, `-c`, ou `--cc`." +msgstr "D챕sactive la sortie des diffs pour des commits de fusion. Utile pour passer outre la valeur sous-entendue." #. type: Labeled list #: en/diff-options.txt:48 -#, fuzzy, no-wrap, priority:280 -#| msgid "--first-parent" +#, no-wrap, priority:280 msgid "--diff-merges=first-parent:" -msgstr "--first-parent" +msgstr "--diff-merges=first-parent:" #. type: Labeled list #: en/diff-options.txt:49 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=1:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=1:" #. type: Plain text #: en/diff-options.txt:52 @@ -4072,24 +4051,21 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:53 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=separate:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=separate:" #. type: Labeled list #: en/diff-options.txt:54 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=m:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=m:" #. type: Labeled list #: en/diff-options.txt:55 -#, fuzzy, no-wrap, priority:280 -#| msgid "-m" +#, no-wrap, priority:280 msgid "-m:" -msgstr "-m" +msgstr "-m:" #. type: Plain text #: en/diff-options.txt:59 @@ -4099,52 +4075,45 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:60 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=combined:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=combined:" #. type: Labeled list #: en/diff-options.txt:61 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=c:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=c:" #. type: Labeled list #: en/diff-options.txt:62 -#, fuzzy, no-wrap, priority:280 -#| msgid "-c" +#, no-wrap, priority:280 msgid "-c:" -msgstr "-c" +msgstr "-c:" #. type: Plain text #: en/diff-options.txt:69 -#, fuzzy, priority:280 -#| msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents." +#, priority:280 msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents. `-c` implies `-p`." -msgstr "Avec cette option, la sortie de diff pour un commit de fusion montre les diff챕rences de chacun des parents vers le r챕sultat de la fusion simultan챕ment au lieu de montrer une 횪 une les diff챕rences par paires entre un parent et le r챕sultat. De plus, il ne r챕pertorie que les fichiers qui ont 챕t챕 modifi챕s par tous les parents." +msgstr "Avec cette option, la sortie de diff pour un commit de fusion montre les diff챕rences de chacun des parents vers le r챕sultat de la fusion simultan챕ment au lieu de montrer une 횪 une les diff챕rences par paires entre un parent et le r챕sultat. De plus, il ne r챕pertorie que les fichiers qui ont 챕t챕 modifi챕s par tous les parents.`-c` implique `-p`." #. type: Labeled list #: en/diff-options.txt:70 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=dense-combined:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=dense-combined:" #. type: Labeled list #: en/diff-options.txt:71 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=cc:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=cc:" #. type: Labeled list #: en/diff-options.txt:72 -#, fuzzy, no-wrap, priority:280 -#| msgid "--cc" +#, no-wrap, priority:280 msgid "--cc:" -msgstr "--cc" +msgstr "--cc:" #. type: Plain text #: en/diff-options.txt:78 @@ -5784,10 +5753,9 @@ msgstr "--atomic" #. type: Plain text #: en/fetch-options.txt:13 -#, fuzzy, priority:220 -#| msgid "Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail." +#, priority:220 msgid "Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated." -msgstr "Utiliser une transaction atomique 횪 distance, si possible. Soit toutes les r챕f챕rences sont mises 횪 jour, soit, en cas d'erreur, aucune r챕f챕rence n'est mise 횪 jour. Si le serveur ne prend pas en charge les pouss챕es atomiques, la pouss챕e 챕chouera." +msgstr "Utiliser une transaction atomique pour mettre 횪 jour les r챕f챕rences locales. Soit toutes les r챕f챕rences sont mises 횪 jour, soit, en cas d'erreur, aucune r챕f챕rence n'est mise 횪 jour." #. type: Labeled list #: en/fetch-options.txt:14 @@ -39130,10 +39098,9 @@ msgstr "git-range-diff(1)" #. type: Plain text #: en/git-range-diff.txt:7 -#, fuzzy, priority:100 -#| msgid "Compare two commit ranges (e.g. two versions of a branch)." +#, priority:100 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" -msgstr "Comparer deux plages de commits (par exemple deux versions d'une branche)." +msgstr "git-range-diff - Comparer deux plages de commits (par exemple deux versions d'une branche)" #. type: Plain text #: en/git-range-diff.txt:15 @@ -39270,10 +39237,9 @@ msgstr "" #. type: Labeled list #: en/git-range-diff.txt:88 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "--reverse <rev>..<rev>" +#, ignore-ellipsis, no-wrap, priority:100 msgid "<rev1>...<rev2>" -msgstr "--reverse <r챕v>..<r챕v>" +msgstr "<r챕v1>...<r챕v2>" #. type: Plain text #: en/git-range-diff.txt:90 @@ -39283,10 +39249,9 @@ msgstr "" #. type: Labeled list #: en/git-range-diff.txt:91 -#, fuzzy, no-wrap, priority:100 -#| msgid "--reverse <rev>..<rev>" +#, no-wrap, priority:100 msgid "<base> <rev1> <rev2>" -msgstr "--reverse <r챕v>..<r챕v>" +msgstr "<base> <r챕v1> <r챕v2>" #. type: Plain text #: en/git-range-diff.txt:97 @@ -39437,29 +39402,15 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:208 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " B D\n" -#| " / /\n" -#| " ---X---A\n" +#, no-wrap, priority:100 msgid " 1 A\n" -msgstr "" -" B D\n" -" / /\n" -" ---X---A\n" +msgstr " 1 A\n" #. type: delimited block - #: en/git-range-diff.txt:210 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " B D\n" -#| " / /\n" -#| " ---X---A\n" +#, no-wrap, priority:100 msgid " 2 B\n" -msgstr "" -" B D\n" -" / /\n" -" ---X---A\n" +msgstr " 2 B\n" #. type: delimited block - #: en/git-range-diff.txt:212 en/git-range-diff.txt:224 @@ -39475,19 +39426,12 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:222 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " .----W\n" -#| " / /\n" -#| " -----H----I\n" +#, no-wrap, priority:100 msgid "" " 1 A\n" "\t /\n" " 2 --------' B\n" -msgstr "" -" .----W\n" -" / /\n" -" -----H----I\n" +msgstr " 1 A\n\t /\n 2 --------' B\n" #. type: Plain text #: en/git-range-diff.txt:229 @@ -39497,11 +39441,7 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:237 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " .----W\n" -#| " / /\n" -#| " -----H----I\n" +#, no-wrap, priority:100 msgid "" " 1 ----. A\n" "\t | /\n" @@ -39509,10 +39449,7 @@ msgid "" "\t |\n" "\t `----- C\n" "\t c>0\n" -msgstr "" -" .----W\n" -" / /\n" -" -----H----I\n" +msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n\t |\n\t `----- C\n\t c>0\n" #. type: Plain text #: en/git-range-diff.txt:245 @@ -39522,14 +39459,7 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:254 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| "\t .-A---M--. N\n" -#| "\t / / \\ /\n" -#| "\tI B R\n" -#| "\t \\ / /\n" -#| "\t \\ / /\n" -#| "\t `---X--'\n" +#, no-wrap, priority:100 msgid "" " 1 ----. A\n" "\t | /\n" @@ -39538,26 +39468,13 @@ msgid "" " o `----- C\n" "\t c>0\n" " o o\n" -msgstr "" -"\t .-A---M--. N\n" -"\t / / \\ /\n" -"\tI B R\n" -"\t \\ / /\n" -"\t \\ / /\n" -"\t `---X--'\n" +msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n\t |\n o `----- C\n\t c>0\n o o\n" #. type: delimited block - #: en/git-range-diff.txt:256 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " B D\n" -#| " / /\n" -#| " ---X---A\n" +#, no-wrap, priority:100 msgid " o o\n" -msgstr "" -" B D\n" -" / /\n" -" ---X---A\n" +msgstr " o o\n" #. type: Plain text #: en/git-range-diff.txt:266 @@ -39573,13 +39490,7 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:282 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " o---o---o---o---o\n" -#| " / \\\n" -#| " / o---o---o---o---M\n" -#| " / /\n" -#| "---2---1---o---o---o---A\n" +#, no-wrap, priority:100 msgid "" " 1 ----. A\n" "\t | /\n" @@ -39588,12 +39499,7 @@ msgid "" " o -' `----- C\n" "\t c>0\n" " o ---------- o\n" -msgstr "" -" o---o---o---o---o\n" -" / \\\n" -" / o---o---o---o---M\n" -" / /\n" -"---2---1---o---o---o---A\n" +msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n .--+-----'\n o -' `----- C\n\t c>0\n o ---------- o\n" #. type: delimited block - #: en/git-range-diff.txt:284 @@ -45653,10 +45559,9 @@ msgstr "Appliquer un patchset quilt sur la branche courante." #. type: delimited block - #: en/git-rev-list.txt:41 -#, fuzzy, no-wrap, priority:100 -#| msgid "git-rev-list(1)" +#, no-wrap, priority:100 msgid "git rev-list HEAD\n" -msgstr "git-rev-list(1)" +msgstr "git rev-list HEAD\n" #. type: Plain text #: en/git-rev-list.txt:45 @@ -45705,10 +45610,9 @@ msgstr "Cr챕e une archive tar qui contient le contenu du dernier commit sur la b #. type: delimited block - #: en/git-rev-list.txt:70 -#, fuzzy, no-wrap, priority:100 -#| msgid "`git grep solution -- :^Documentation`" +#, no-wrap, priority:100 msgid "git rev-list HEAD -- Documentation/\n" -msgstr "`git grep solution -- :^Documentation`" +msgstr "git rev-list HEAD -- Documentation/\n" #. type: Plain text #: en/git-rev-list.txt:74 @@ -59019,20 +58923,13 @@ msgstr "" #. type: delimited block - #: en/git-worktree.txt:439 -#, fuzzy, no-wrap, priority:240 -#| msgid "" -#| "worktree /path/to/linked-worktree\n" -#| "HEAD abcd1234abcd1234abcd1234abcd1234abcd1234\n" -#| "branch refs/heads/master\n" +#, no-wrap, priority:240 msgid "" "worktree /path/to/linked-worktree-locked-no-reason\n" "HEAD 5678abc5678abc5678abc5678abc5678abc5678c\n" "branch refs/heads/locked-no-reason\n" "locked\n" -msgstr "" -"worktree /chemin/vers/arbre-de-travail-li챕\n" -"HEAD abcd1234abcd1234abcd1234abcd1234abcd1234\n" -"branch refs/heads/master\n" +msgstr "worktree /path/to/linked-worktree-locked-no-reason\nHEAD 5678abc5678abc5678abc5678abc5678abc5678c\nbranch refs/heads/locked-no-reason\nlocked\n" #. type: delimited block - #: en/git-worktree.txt:444 @@ -59046,44 +58943,29 @@ msgstr "" #. type: delimited block - #: en/git-worktree.txt:449 -#, fuzzy, no-wrap, priority:240 -#| msgid "" -#| "worktree /path/to/linked-worktree\n" -#| "HEAD abcd1234abcd1234abcd1234abcd1234abcd1234\n" -#| "branch refs/heads/master\n" +#, no-wrap, priority:240 msgid "" "worktree /path/to/linked-worktree-prunable\n" "HEAD 1233def1234def1234def1234def1234def1234b\n" "detached\n" "prunable gitdir file points to non-existent location\n" -msgstr "" -"worktree /chemin/vers/arbre-de-travail-li챕\n" -"HEAD abcd1234abcd1234abcd1234abcd1234abcd1234\n" -"branch refs/heads/master\n" +msgstr "worktree /path/to/linked-worktree-prunable\nHEAD 1233def1234def1234def1234def1234def1234b\ndetached\nprunable gitdir file points to non-existent location\n" #. type: Plain text #: en/git-worktree.txt:456 -#, fuzzy, priority:240 -#| msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])." +#, priority:240 msgid "If the lock reason contains \"unusual\" characters such as newline, they are escaped and the entire reason is quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). For Example:" -msgstr "Les noms de chemin avec des caract챔res 짬혻inhabituels혻쨩 sont cit챕s comme expliqu챕 pour la variable de configuration `core.quotePath` (voir linkgit:git-config[1])." +msgstr "Si la raison du verrouillage contient des caract챔res 짬혻inhabituels혻쨩 tels que des retours chariot, ils sont 챕chapp챕s et la raison est enti챔rement cit챕e comme expliqu챕 pour la variable de configuration `core.quotePath` (voir linkgit:git-config[1]). Par exemple혻:" #. type: delimited block - #: en/git-worktree.txt:462 -#, fuzzy, ignore-ellipsis, no-wrap, priority:240 -#| msgid "" -#| "$ git worktree list --porcelain\n" -#| "worktree /path/to/bare-source\n" -#| "bare\n" +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "$ git worktree list --porcelain\n" "...\n" "locked \"reason\\nwhy is locked\"\n" "...\n" -msgstr "" -"$ git worktree list --porcelain\n" -"worktree /chemin/vers/source-nu\n" -"bare\n" +msgstr "$ git worktree list --porcelain\n...\nlocked \"reason\\nwhy is locked\"\n...\n" #. type: Plain text #: en/git-worktree.txt:474 @@ -62297,10 +62179,9 @@ msgstr "'%(trailers[:options])'" #. type: Plain text #: en/pretty-formats.txt:258 -#, 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:" +#, 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." -msgstr "afficher les lignes ajout챕es du corps comme interpr챕t챕es par linkgit:git-interpret-trailers[1]. La cha챤ne `trailers` peut 챗tre suivie de deux-points et de z챕ro ou plus d'options s챕par챕es par des virgules :" +msgstr "afficher les lignes ajout챕es du corps comme interpr챕t챕es par linkgit:git-interpret-trailers[1]. La cha챤ne `trailers` peut 챗tre suivie de deux-points et de z챕ro ou plus d'options s챕par챕es par des virgules. Si une option est fournie plusieurs fois la derni챔re option l'emporte." #. type: Plain text #: en/pretty-formats.txt:263 diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po index 63263373cd350b44771211a31f9c6c314d2e2886..9542392c222d6f84bbdc4589c96abbad8f12afac 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-02-27 18:16+0100\n" -"PO-Revision-Date: 2021-01-19 16:32+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.5-dev\n" +msgstr "Report-Msgid-Bugs-To: jn.avila@free.fr\nPOT-Creation-Date: 2021-02-27 13:35+0100\nPO-Revision-Date: 2021-03-02 12:11+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.5\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:738 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 @@ -24,10 +13,9 @@ msgstr "-b" #. type: Plain text #: en/blame-options.txt:4 -#, fuzzy, priority:100 -#| msgid "Show blank SHA-1 for boundary commits. This can also be controlled via the `blame.blankboundary` config option." +#, priority:100 msgid "Show blank SHA-1 for boundary commits. This can also be controlled via the `blame.blankBoundary` config option." -msgstr "Exiba o SHA-1 em branco para os commits limite. Tamb챕m pode ser controlado atrav챕s da op챌찾o da configura챌찾o `blame.blankboundary`." +msgstr "Exiba o SHA-1 em branco para os commits limite. Tamb챕m pode ser controlado atrav챕s da configura챌찾o da op챌찾o `blame.blankBoundary`." #. type: Labeled list #: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:359 en/git-fsck.txt:38 en/git-rebase.txt:582 @@ -739,10 +727,9 @@ msgstr "linkgit:gitattributes[5]" #. type: Plain text #: en/cmds-guide.txt:3 -#, fuzzy, priority:100 -#| msgid "Listing all attributes for a file:" +#, priority:100 msgid "Defining attributes per path." -msgstr "Listando todos os atributos de um arquivo:" +msgstr "Definindo todos os atributos por caminho." #. type: Labeled list #: en/cmds-guide.txt:4 @@ -790,7 +777,7 @@ msgstr "linkgit:gitcvs-migration[7]" #: en/cmds-guide.txt:15 #, priority:100 msgid "Git for CVS users." -msgstr "" +msgstr "Git para os usu찼rios do CVS." #. type: Labeled list #: en/cmds-guide.txt:16 @@ -800,10 +787,9 @@ msgstr "linkgit:gitdiffcore[7]" #. type: Plain text #: en/cmds-guide.txt:18 -#, fuzzy, priority:100 -#| msgid "Munging the diff output" +#, priority:100 msgid "Tweaking diff output." -msgstr "Arruinando a sa챠da diff" +msgstr "Ajustando a sa챠da diff." #. type: Labeled list #: en/cmds-guide.txt:19 @@ -837,10 +823,9 @@ msgstr "linkgit:gitglossary[7]" #. type: Plain text #: en/cmds-guide.txt:27 -#, fuzzy, priority:100 -#| msgid "gitglossary - A Git Glossary" +#, priority:100 msgid "A Git Glossary." -msgstr "gitglossary - Um Gloss찼rio do Git" +msgstr "Um Gloss찼rio do Git." #. type: Labeled list #: en/cmds-guide.txt:28 @@ -852,7 +837,7 @@ msgstr "linkgit:githooks[5]" #: en/cmds-guide.txt:30 #, priority:100 msgid "Hooks used by Git." -msgstr "" +msgstr "Ganchos utilizados pelo Git." #. type: Plain text #: en/cmds-guide.txt:31 en/git-clean.txt:139 en/git-status.txt:452 @@ -898,10 +883,9 @@ msgstr "linkgit:gitnamespaces[7]" #. type: Plain text #: en/cmds-guide.txt:42 -#, fuzzy, priority:100 -#| msgid "whitespace" +#, priority:100 msgid "Git namespaces." -msgstr "whitespace (espa챌o)" +msgstr "Espa챌os de nome do Git." #. type: Plain text #: en/cmds-guide.txt:43 en/git-remote-ext.txt:122 en/git-remote-fd.txt:56 @@ -924,10 +908,9 @@ msgstr "linkgit:gitrepository-layout[5]" #. type: Plain text #: en/cmds-guide.txt:48 -#, fuzzy, priority:100 -#| msgid "The Git Repository" +#, priority:100 msgid "Git Repository Layout." -msgstr "O Reposit처rio Git" +msgstr "O Layout do Reposit처rio Git." #. type: Labeled list #: en/cmds-guide.txt:49 @@ -939,7 +922,7 @@ msgstr "linkgit:gitrevisions[7]" #: en/cmds-guide.txt:51 #, priority:100 msgid "Specifying revisions and ranges for Git." -msgstr "" +msgstr "Determinando as revis천es e os intervalor para o Git." #. type: Labeled list #: en/cmds-guide.txt:52 @@ -951,7 +934,7 @@ msgstr "linkgit:gitsubmodules[7]" #: en/cmds-guide.txt:54 #, priority:100 msgid "Mounting one repository inside another." -msgstr "" +msgstr "Montando um reposit처rio dentro do outro." #. type: Labeled list #: en/cmds-guide.txt:55 @@ -961,10 +944,9 @@ msgstr "linkgit:gittutorial[7]" #. type: Plain text #: en/cmds-guide.txt:57 -#, fuzzy, priority:100 -#| msgid "A portable graphical interface to Git." +#, priority:100 msgid "A tutorial introduction to Git." -msgstr "Uma interface gr찼fica port찼til para o Git." +msgstr "Um tutorial de introdu챌찾o ao Git." #. type: Labeled list #: en/cmds-guide.txt:58 @@ -976,7 +958,7 @@ msgstr "linkgit:gittutorial-2[7]" #: en/cmds-guide.txt:60 #, priority:100 msgid "A tutorial introduction to Git: part two." -msgstr "" +msgstr "Um tutorial de introdu챌찾o ao Git: parte dois." #. type: Labeled list #: en/cmds-guide.txt:61 @@ -1589,7 +1571,7 @@ msgstr "linkgit:git-for-each-repo[1]" #: en/cmds-plumbinginterrogators.txt:21 #, priority:100 msgid "Run a Git command on a list of repositories." -msgstr "" +msgstr "Execute um comando Git numa lista de reposit처rios." #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:22 @@ -1863,10 +1845,9 @@ msgstr "linkgit:git-mktag[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:27 -#, fuzzy, priority:100 -#| msgid "Creates a tag object." +#, priority:100 msgid "Creates a tag object with extra validation." -msgstr "Cria um objeto tag." +msgstr "Cria um objeto tag com valida챌찾o extra." #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:28 @@ -3084,10 +3065,9 @@ msgstr "OS FORMATOS DA DATA" #. type: Plain text #: en/date-formats.txt:6 -#, fuzzy, priority:280 -#| msgid "The `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` environment variables" +#, priority:280 msgid "The `GIT_AUTHOR_DATE` and `GIT_COMMITTER_DATE` environment variables support the following date formats:" -msgstr "As vari찼veis de ambiente `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE`" +msgstr "As vari찼veis de ambiente `GIT_AUTHOR_DATE` e `GIT_COMMITTER_DATE` s찾o compat챠veis com os seguintes formatos de data:" #. type: Labeled list #: en/date-formats.txt:7 @@ -3135,7 +3115,7 @@ msgstr "Al챕m disso, a parte da data 챕 aceita nos seguintes formatos: `YYYY.MM. #: en/date-formats.txt:31 #, priority:280 msgid "In addition to recognizing all date formats above, the `--date` option will also try to make sense of other, more human-centric date formats, such as relative dates like \"yesterday\" or \"last Friday at noon\"." -msgstr "" +msgstr "Al챕m de reconhecer todos os formatos da data acima, a op챌찾o `--date` tamb챕m tentar찼 dar sentido aos outros formatos para que sejam leg챠veis, como \"ontem\" ou \"a 첬ltima sexta-feira ao meio-dia\"." #. type: Title - #: en/diff-format.txt:2 @@ -4016,7 +3996,7 @@ msgstr "Suprime a sa챠da diff. 횣til para comandos como `git show` que por prede #: en/diff-options.txt:37 #, no-wrap, priority:280 msgid "--diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc)" -msgstr "" +msgstr "--diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc)" #. type: Labeled list #: en/diff-options.txt:38 @@ -4028,131 +4008,115 @@ msgstr "--no-diff-merges" #: en/diff-options.txt:42 #, priority:280 msgid "Specify diff format to be used for merge commits. Default is {diff-merges-default} unless `--first-parent` is in use, in which case `first-parent` is the default." -msgstr "" +msgstr "Define o formato diff que ser찼 usado para a mesclagem dos commits. A predefini챌찾o 챕 {diff-merges-default} a menos que a op챌찾o `--first-parent` esteja em uso, nesse caso a predefini챌찾o ser찼 `first-parent`." #. type: Labeled list #: en/diff-options.txt:43 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=(off|none):" -msgstr "--diff-merges=off" +msgstr "--diff-merges=(off|none):" #. type: Labeled list #: en/diff-options.txt:44 -#, fuzzy, no-wrap, priority:280 -#| msgid "--no-diff-merges" +#, no-wrap, priority:280 msgid "--no-diff-merges:" -msgstr "--no-diff-merges" +msgstr "--no-diff-merges:" #. type: Plain text #: en/diff-options.txt:47 -#, fuzzy, priority:280 -#| msgid "Disable output of diffs for merge commits (default). Useful to override `-m`, `-c`, or `--cc`." +#, priority:280 msgid "Disable output of diffs for merge commits. Useful to override implied value." -msgstr "Desativa a sa챠da dos diffs para a mesclagem dos commits (padr찾o). 횣til para substituir '-m', '-c', ou '--cc'." +msgstr "Desativa a sa챠da dos diffs para a mesclagem dos commits. 횣til para substituir valores impl챠citos." #. type: Labeled list #: en/diff-options.txt:48 -#, fuzzy, no-wrap, priority:280 -#| msgid "--first-parent" +#, no-wrap, priority:280 msgid "--diff-merges=first-parent:" -msgstr "--first-parent" +msgstr "--diff-merges=first-parent:" #. type: Labeled list #: en/diff-options.txt:49 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=1:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=1:" #. type: Plain text #: en/diff-options.txt:52 #, priority:280 msgid "This option makes merge commits show the full diff with respect to the first parent only." -msgstr "" +msgstr "Esta op챌찾o faz com que os commits mesclados mostrem a diferen챌a total apenas com ao que estiver relacionado com a primeira origem." #. type: Labeled list #: en/diff-options.txt:53 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=separate:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=separate:" #. type: Labeled list #: en/diff-options.txt:54 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=m:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=m:" #. type: Labeled list #: en/diff-options.txt:55 -#, fuzzy, no-wrap, priority:280 -#| msgid "-m" +#, no-wrap, priority:280 msgid "-m:" -msgstr "-m" +msgstr "-m:" #. type: Plain text #: en/diff-options.txt:59 #, 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`." -msgstr "" +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`." #. type: Labeled list #: en/diff-options.txt:60 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=combined:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=combined:" #. type: Labeled list #: en/diff-options.txt:61 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=c:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=c:" #. type: Labeled list #: en/diff-options.txt:62 -#, fuzzy, no-wrap, priority:280 -#| msgid "-c" +#, no-wrap, priority:280 msgid "-c:" -msgstr "-c" +msgstr "-c:" #. type: Plain text #: en/diff-options.txt:69 -#, fuzzy, priority:280 -#| msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents." +#, priority:280 msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents. `-c` implies `-p`." -msgstr "Com esta op챌찾o, a sa챠da \"diff\" para um commit de mesclagem exibe as diferen챌as de cada uma das origens para a mesclagem resultante de forma simult창nea em vez de mostrar a diferen챌a pareada entre uma origem e o resultado, um de cada vez. Al챕m disso, lista apenas os arquivos que foram modificados por todas as origens." +msgstr "Com esta op챌찾o, a sa챠da \"diff\" para um commit de mesclagem exibe as diferen챌as de cada uma das origens para a mesclagem resultante de forma simult창nea em vez de mostrar a diferen챌a pareada entre uma origem e o resultado, um de cada vez. Al챕m disso, lista apenas os arquivos que foram alterados a partir de todas as origens. A op챌찾o `-c` exige o uso de `-p`." #. type: Labeled list #: en/diff-options.txt:70 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=dense-combined:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=dense-combined:" #. type: Labeled list #: en/diff-options.txt:71 -#, fuzzy, no-wrap, priority:280 -#| msgid "--diff-merges=off" +#, no-wrap, priority:280 msgid "--diff-merges=cc:" -msgstr "--diff-merges=off" +msgstr "--diff-merges=cc:" #. type: Labeled list #: en/diff-options.txt:72 -#, fuzzy, no-wrap, priority:280 -#| msgid "--cc" +#, no-wrap, priority:280 msgid "--cc:" -msgstr "--cc" +msgstr "--cc:" #. type: Plain text #: en/diff-options.txt:78 -#, fuzzy, priority:280 -#| msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification." +#, priority:280 msgid "With this option the output produced by `--diff-merges=combined` is further compressed by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification. `--cc` implies `-p`." -msgstr "Ao usar esta op챌찾o fica impl챠cito o uso da op챌찾o `-c` e comprime ainda mais a sa챠da do patch, omitindo os blocos menos importantes, cujo conte첬do nos pais possua apenas duas variantes e o resultado da mesclagem escolhe um deles sem modifica챌찾o." +msgstr "Com esta op챌찾o, a sa챠da gerada pelo comando `--diff-merges=combined` 챕 ainda mais comprimido ao omitir os blocos menos importantes cujo conte첬do relacionado possua apenas duas variantes e o resultado da mesclagem escolhe um deles sem altera챌찾o. A op챌찾o `-c` exige o uso de `-p`." #. type: Labeled list #: en/diff-options.txt:79 en/git-diff-tree.txt:113 @@ -4162,10 +4126,9 @@ msgstr "--combined-all-paths" #. type: Plain text #: en/diff-options.txt:85 -#, fuzzy, priority:280 -#| msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)." +#, priority:280 msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when `--diff-merges=[dense-]combined` is in use, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)." -msgstr "Esta op챌찾o faz com que os diffs combinados (usados para a mesclagem dos commits) listem o nome do arquivo de todos os pais. Dessa forma, s처 tem efeito quando `-c` ou `-cc` s찾o utilizados e provavelmente 챕 첬til apenas caso as altera챌천es no nome do arquivo sejam detectados (ou seja, quando a renomea챌찾o ou a detec챌찾o da c처pia forem solicitadas)." +msgstr "Esta op챌찾o faz com que os diffs combinados (usados para a mesclagem dos commits) listem o nome relacionados de todos os arquivos. Dessa forma, s처 tem efeito quando a op챌찾o `--diff-merges=[dense-]combined` s찾o utilizados e provavelmente 챕 첬til apenas caso as altera챌천es no nome do arquivo sejam detectados (ou seja, quando a renomea챌찾o ou a detec챌찾o da c처pia forem solicitadas)." #. type: Labeled list #: en/diff-options.txt:87 @@ -5441,23 +5404,21 @@ msgstr "Os padr천es t챗m a mesma sintaxe e sem창ntica que os padr천es utilizados #. type: Labeled list #: en/diff-options.txt:703 en/git-difftool.txt:41 -#, fuzzy, no-wrap, priority:280 -#| msgid "--output=<file>" +#, no-wrap, priority:280 msgid "--skip-to=<file>" -msgstr "--output=<arquivo>" +msgstr "--skip-to=<arquivo>" #. type: Labeled list #: en/diff-options.txt:704 en/git-difftool.txt:37 -#, fuzzy, no-wrap, priority:280 -#| msgid "--template=<file>" +#, no-wrap, priority:280 msgid "--rotate-to=<file>" -msgstr "--template=<arquivo>" +msgstr "--rotate-to=<arquivo>" #. type: Plain text #: en/diff-options.txt:710 #, priority:280 msgid "Discard the files before the named <file> from the output (i.e. 'skip to'), or move them to the end of the output (i.e. 'rotate to'). These were invented primarily for use of the `git difftool` command, and may not be very useful otherwise." -msgstr "" +msgstr "Descarte os arquivos da sa챠da antes do <arquivo> (ou seja, 'pule para'), ou mova-os para o final da sa챠da (ou seja, 'redirecione para'). Estas op챌천es foram inventadas para uso do comando `git difftool` e podem n찾o ser muito 첬teis para outra coisa." #. type: Labeled list #: en/diff-options.txt:712 en/git-apply.txt:104 en/git-cvsimport.txt:168 @@ -5785,10 +5746,9 @@ msgstr "--atomic" #. type: Plain text #: en/fetch-options.txt:13 -#, fuzzy, priority:220 -#| msgid "Use an atomic transaction on the remote side if available. Either all refs are updated, or on error, no refs are updated. If the server does not support atomic pushes the push will fail." +#, priority:220 msgid "Use an atomic transaction to update local refs. Either all refs are updated, or on error, no refs are updated." -msgstr "Utilize uma transa챌찾o at척mica no lado remoto, caso esteja dispon챠vel. Ou todas as refs s찾o atualizadas ou, por erro, nenhuma ser찼. Caso o servidor n찾o seja compat챠vel com impulsionamento at척mico, o impulsionamento \"push\" ir찼 falhar." +msgstr "Utilize uma transa챌찾o at척mica para atualizar as refs locais. Ou todas as refs s찾o atualizadas ou por erro, nenhuma ser찼." #. type: Labeled list #: en/fetch-options.txt:14 @@ -9927,10 +9887,9 @@ msgstr "MAPEANDO AUTORES" #. type: Plain text #: en/git-blame.txt:230 en/git-check-mailmap.txt:50 en/git-shortlog.txt:115 -#, fuzzy, priority:260 -#| msgid "See linkgit:git-add[1]." +#, priority:260 msgid "See linkgit:gitmailmap[5]." -msgstr "Consulte linkgit:git-add[1]." +msgstr "Consulte linkgit:gitmailmap[5]." #. type: Title = #: en/git-branch.txt:2 @@ -14587,7 +14546,7 @@ msgid "" "*NOTE*: this operation can race with concurrent modification to the\n" "source repository, similar to running `cp -r src dst` while modifying\n" "`src`.\n" -msgstr "" +msgstr "*OBSERVA횉횄O*: esta opera챌찾o pode competir com as altera챌천es concomitantes ao\nc처digo fonte no reposit처rio, semelhante ao executar `cp -r src dst` enquanto altera\no \"crc\".\n" #. type: Labeled list #: en/git-clone.txt:65 @@ -16921,17 +16880,15 @@ msgstr "GIT_CONFIG_COUNT" #. type: Labeled list #: en/git-config.txt:350 -#, fuzzy, no-wrap, priority:100 -#| msgid "GIT_CONFIG" +#, no-wrap, priority:100 msgid "GIT_CONFIG_KEY_<n>" -msgstr "GIT_CONFIG" +msgstr "GIT_CONFIG_KEY_<n>" #. type: Labeled list #: en/git-config.txt:351 -#, fuzzy, no-wrap, priority:100 -#| msgid "GIT_CONFIG" +#, no-wrap, priority:100 msgid "GIT_CONFIG_VALUE_<n>" -msgstr "GIT_CONFIG" +msgstr "GIT_CONFIG_VALUE_<n>" #. type: Plain text #: en/git-config.txt:360 @@ -23817,19 +23774,12 @@ msgstr "M 777 inline bob\n" #. type: delimited block = #: en/git-fast-import.txt:1321 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| "Active Branch LRU\n" -#| "-----------------\n" -#| "active_branches = 1 cur, 5 max\n" +#, no-wrap, priority:100 msgid "" "Active Branch LRU\n" "-----------------\n" "active_branches = 1 cur, 5 max\n" -msgstr "" -"Ramo Ativo LRU\n" -"--------------\n" -"active_branches = 1 cur, 5 max\n" +msgstr "Ramo Ativo LRU\n-----------------\nactive_branches = 1 cur, 5 max\n" #. type: delimited block = #: en/git-fast-import.txt:1324 @@ -28369,10 +28319,9 @@ msgstr "A documenta챌찾o abaixo 챕 igual 횪 encontrada no linkgit:git-config[1]: #. type: Plain text #: en/git-gc.txt:128 -#, fuzzy, priority:100 -#| msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references." +#, priority:100 msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace. Note that a note (of the kind created by 'git notes') attached to an object does not contribute in keeping the object alive. If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references." -msgstr "O comando 'git gc' evita muito a n찾o exclus찾o dos objetos que possuam referencias em qualquer lugar do seu reposit처rio. Ele manter찼 n찾o apenas os objetos referenciados pelo seu conjunto atual das ramifica챌천es e as tags, mas tamb챕m os objetos referenciados atrav챕s do 챠ndice, as ramifica챌천es monitoradas remotamente, as notas salvas atrav챕s do comando 'git notes' no 'refs/notes/', reflogs (que podem fazer refer챗ncia no commit dos ramos que foram alterados ou retrocedido posteriormente) e qualquer outra coisa no espa챌o dos nomes 'refs/*'. Caso voc챗 esteja esperando que alguns objetos sejam exclu챠dos e n찾o foram, verifique todos estes locais e decida se faz sentido remover as refer챗ncias ou n찾o." +msgstr "O comando 'git gc' evita muito a n찾o exclus찾o dos objetos que possuam referencias em qualquer lugar do seu reposit처rio. Ele manter찼 n찾o apenas os objetos referenciados pelo seu conjunto atual das ramifica챌천es e as tags, mas tamb챕m os objetos referenciados atrav챕s do 챠ndice, as ramifica챌천es monitoradas remotamente, reflogs (que podem fazer refer챗ncia no commit dos ramos que foram alterados ou retrocedido posteriormente) e qualquer outra coisa no espa챌o dos nomes refs/*. Observe que uma nota (do tipo criado atrav챕s do 'git notes') anexada a um objeto n찾o contribui para manter o objeto vivo. Caso esteja esperando que alguns objetos sejam exclu챠dos e n찾o foram, verifique todos estes locais e decida se faz sentido remover as refer챗ncias ou n찾o." #. type: Plain text #: en/git-gc.txt:135 @@ -30916,26 +30865,18 @@ msgstr "git-index-pack - Construa um pacote do arquivo do 챠ndice para um arquiv #. type: Plain text #: en/git-index-pack.txt:15 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| "'git index-pack' [-v] [-o <index-file>] <pack-file>\n" -#| "'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]\n" -#| " [<pack-file>]\n" +#, no-wrap, priority:100 msgid "" "'git index-pack' [-v] [-o <index-file>] [--[no-]rev-index] <pack-file>\n" "'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]\n" "\t\t [--[no-]rev-index] [<pack-file>]\n" -msgstr "" -"'git index-pack' [-v] [-o <index-file>] <pack-file>\n" -"'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]\n" -" [<pack-file>]\n" +msgstr "'git index-pack' [-v] [-o <index-file>] [--[no-]rev-index] <pack-file>\n'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]\n\t\t [--[no-]rev-index] [<pack-file>]\n" #. type: Plain text #: en/git-index-pack.txt:24 -#, fuzzy, priority:100 -#| msgid "Reads a packed archive (.pack) from the specified file, and builds a pack index file (.idx) for it. The packed archive together with the pack index can then be placed in the objects/pack/ directory of a Git repository." +#, priority:100 msgid "Reads a packed archive (.pack) from the specified file, and builds a pack index file (.idx) for it. Optionally writes a reverse-index (.rev) for the specified pack. The packed archive together with the pack index can then be placed in the objects/pack/ directory of a Git repository." -msgstr "Faz a leitura de um arquivo compactado (.pack) do arquivo informado e cria um pacote do arquivo do 챠ndice (.idx) para ele. O arquivo compactado junto com o pacote do 챠ndice pode ser colocado no diret처rio 'objects/pack/' de um reposit처rio Git." +msgstr "Faz a leitura de um arquivo compactado (.pack) do arquivo informado e cria um pacote do arquivo do 챠ndice (.idx) para ele. Opcionalmente escreve um 챠ndice reverso(.rev) para o pacote informado. O arquivo compactado junto com o pacote do 챠ndice pode ser colocado no diret처rio objects/pack/ de um reposit처rio Git." #. type: Plain text #: en/git-index-pack.txt:30 @@ -32752,19 +32693,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:100 -#| 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[-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:100 msgid "" "'git ls-files' [-z] [-t] [-v] [-f]\n" "\t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*\n" @@ -32778,18 +32707,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[-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(--[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" #. type: Plain text #: en/git-ls-files.txt:29 @@ -33644,10 +33562,9 @@ msgstr "Quando -k n찾o est찼 em vigor, todas as cadeias iniciais entre par챗ntes #. type: Plain text #: en/git-mailinfo.txt:58 -#, fuzzy, priority:100 -#| msgid "The commit log message, author name and author email are taken from the e-mail, and after minimally decoding MIME transfer encoding, re-coded in the charset specified by i18n.commitencoding (defaulting to UTF-8) by transliterating them. This used to be optional but now it is the default." +#, priority:100 msgid "The commit log message, author name and author email are taken from the e-mail, and after minimally decoding MIME transfer encoding, re-coded in the charset specified by `i18n.commitEncoding` (defaulting to UTF-8) by transliterating them. This used to be optional but now it is the default." -msgstr "A mensagem do registro log do commit, o nome do autor e seu e-mail s찾o obtidos a partir do e-mail e ap처s a decodifica챌찾o m챠nima da codifica챌찾o de transfer챗ncia MIME, recodificados no conjunto de caracteres definido pela op챌찾o de configura챌찾o `i18n.commitencoding` (predefinido para UTF-8), transliterando-os. Isto costumava ser opcional, agora 챕 a predefini챌찾o." +msgstr "A mensagem do registro log do commit, o nome do autor e seu e-mail s찾o obtidos a partir do e-mail e ap처s a decodifica챌찾o m챠nima da codifica챌찾o de transfer챗ncia MIME, recodificados no conjunto de caracteres definido pela op챌찾o de configura챌찾o `i18n.commitEncoding` (predefinido para UTF-8), transliterando-os. Isso costumava ser opcional, agora 챕 o padr찾o." #. type: Plain text #: en/git-mailinfo.txt:61 @@ -33657,10 +33574,9 @@ msgstr "Observe que o patch 챕 sempre utilizado como est찼, sem convers찾o do 'c #. type: Plain text #: en/git-mailinfo.txt:65 -#, fuzzy, priority:100 -#| msgid "Similar to -u. But when re-coding, the charset specified here is used instead of the one specified by i18n.commitencoding or UTF-8." +#, priority:100 msgid "Similar to -u. But when re-coding, the charset specified here is used instead of the one specified by `i18n.commitEncoding` or UTF-8." -msgstr "Semelhante ao -u. Por챕m, ao re-codificar, o conjunto dos caracteres informados aqui 챕 utilizado em vez do informado pelo i18n.commitencoding ou o UTF-8." +msgstr "Semelhante ao -u. Por챕m, ao re-codificar, o conjunto dos caracteres informados aqui 챕 utilizado em vez do informado pelo `i18n.commitEncoding` ou o UTF-8." #. type: Plain text #: en/git-mailinfo.txt:68 @@ -34602,10 +34518,9 @@ msgstr "retorna o caminho personalizado para uma ferramenta de mesclagem." #. type: Labeled list #: en/git-mergetool--lib.txt:41 -#, fuzzy, no-wrap, priority:100 -#| msgid "get_merge_tool" +#, no-wrap, priority:100 msgid "initialize_merge_tool" -msgstr "get_merge_tool" +msgstr "initialize_merge_tool" #. type: Plain text #: en/git-mergetool--lib.txt:44 @@ -35319,10 +35234,9 @@ msgstr "git-mktag(1)" #. type: Plain text #: en/git-mktag.txt:7 -#, fuzzy, priority:100 -#| msgid "git-mktag - Creates a tag object" +#, priority:100 msgid "git-mktag - Creates a tag object with extra validation" -msgstr "git-mktag - Cria um objeto tag" +msgstr "git-mktag - Cria um objeto tag com valida챌찾o extra" #. type: Plain text #: en/git-mktag.txt:13 @@ -35338,10 +35252,9 @@ msgstr "" #. type: Plain text #: en/git-mktag.txt:27 -#, fuzzy, priority:100 -#| msgid "Reads a tag contents on standard input and creates a tag object that can also be used to sign other objects." +#, priority:100 msgid "Reads a tag contents on standard input and creates a tag object. The output is the new tag's <object> identifier." -msgstr "L챗 o conte첬do de uma tag na entrada padr찾o e cria um objeto tag que tamb챕m pode ser utilizado para assinar os outros objetos." +msgstr "L챗 o conte첬do de uma tag na entrada padr찾o e cria um objeto tag. A sa챠da se torna o novo identificador do <objeto> da nova tag." #. type: Plain text #: en/git-mktag.txt:31 @@ -35355,7 +35268,7 @@ msgstr "" msgid "" " git mktag <my-tag\n" " git hash-object -t tag -w --stdin <my-tag\n" -msgstr "" +msgstr " git mktag <minha-tag\n git hash-object -t tag -w --stdin <minha-tag\n" #. type: Plain text #: en/git-mktag.txt:37 @@ -35379,7 +35292,7 @@ msgstr "" #: en/git-mktag.txt:47 #, no-wrap, priority:100 msgid " git -c fsck.extraHeaderEntry=ignore mktag <my-tag-with-headers\n" -msgstr "" +msgstr " git -c fsck.extraHeaderEntry=ignore mktag <minha-tag-com-cabe챌alhos\n" #. type: Title - #: en/git-mktag.txt:49 @@ -35395,22 +35308,13 @@ msgstr "Um arquivo de assinatura da tag que ser찼 alimentado na entrada padr찾o #. type: Plain text #: en/git-mktag.txt:57 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " object <sha1>\n" -#| " type <typename>\n" -#| " tag <tagname>\n" -#| " tagger <tagger>\n" +#, no-wrap, priority:100 msgid "" " object <hash>\n" " type <typename>\n" " tag <tagname>\n" " tagger <tagger>\n" -msgstr "" -" object <sha1>\n" -" type <typename>\n" -" tag <tagname>\n" -" tagger <tagger>\n" +msgstr " object <hash>\n type <typename>\n tag <tagname>\n tagger <tagger>\n" #. type: Plain text #: en/git-mktag.txt:63 @@ -40194,10 +40098,9 @@ msgstr "git-range-diff(1)" #. type: Plain text #: en/git-range-diff.txt:7 -#, fuzzy, priority:100 -#| msgid "Compare two commit ranges (e.g. two versions of a branch)." +#, priority:100 msgid "git-range-diff - Compare two commit ranges (e.g. two versions of a branch)" -msgstr "Compara os dois intervalos de um commit (duas vers천es de um ramo por exemplo)." +msgstr "git-range-diff - Compara os dois intervalos de um commit (as duas vers천es de um ramo por exemplo)" #. type: Plain text #: en/git-range-diff.txt:15 @@ -40207,7 +40110,7 @@ msgid "" "\t[--no-dual-color] [--creation-factor=<factor>]\n" "\t[--left-only | --right-only]\n" "\t( <range1> <range2> | <rev1>...<rev2> | <base> <rev1> <rev2> )\n" -msgstr "" +msgstr "'git range-diff' [--color=[<quando>]] [--no-color] [<diff-options>]\n\t[--no-dual-color] [--creation-factor=<fator>]\n\t[--left-only | --right-only]\n\t( <range1> <range2> | <rev1>...<rev2> | <base> <rev1> <rev2> )\n" #. type: Plain text #: en/git-range-diff.txt:21 @@ -40229,10 +40132,9 @@ msgstr "" #. type: Plain text #: en/git-range-diff.txt:33 -#, fuzzy, priority:100 -#| msgid "There are two ways to specify which commits to operate on." +#, priority:100 msgid "There are three ways to specify the commit ranges:" -msgstr "Existem duas maneiras de especificar em quais commits operar." +msgstr "Existem tr챗s maneiras de definir os intervalos do commit:" #. type: Plain text #: en/git-range-diff.txt:37 @@ -40244,13 +40146,13 @@ msgstr "" #: en/git-range-diff.txt:40 #, ignore-ellipsis, priority:100 msgid "`<rev1>...<rev2>`. This is equivalent to `<rev2>..<rev1> <rev1>..<rev2>`." -msgstr "" +msgstr "`<rev1>...<rev2>`. 횋 equivalente a `<rev2>..<rev1> <rev1>..<rev2>`." #. type: Plain text #: en/git-range-diff.txt:43 #, priority:100 msgid "`<base> <rev1> <rev2>`: This is equivalent to `<base>..<rev1> <base>..<rev2>`." -msgstr "" +msgstr "`<base> <rev1> <rev2>`: 횋 equivalente a `<base>..<rev1> <base>..<rev2>`." #. type: Labeled list #: en/git-range-diff.txt:46 @@ -40308,24 +40210,21 @@ msgstr "" #. type: Labeled list #: en/git-range-diff.txt:80 -#, fuzzy, no-wrap, priority:100 -#| msgid "--notes[=<ref>]" +#, no-wrap, priority:100 msgid "--[no-]notes[=<ref>]" -msgstr "--notes[=<ref>]" +msgstr "--[no-]notes[=<ref>]" #. type: Plain text #: en/git-range-diff.txt:83 -#, fuzzy, priority:100 -#| msgid "This flag is passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply." +#, priority:100 msgid "This flag is passed to the `git log` program (see linkgit:git-log[1]) that generates the patches." -msgstr "Esta op챌찾o 챕 repassada para o comando 'git apply' que aplica o patch (consulte linkgit:git-apply[1]). Implica no uso da op챌찾o --apply." +msgstr "Esta op챌찾o 챕 repassada para o comando `git apply` que aplica as corre챌천es (patch) (consulte linkgit:git-log[1])." #. type: Labeled list #: en/git-range-diff.txt:84 -#, fuzzy, no-wrap, priority:100 -#| msgid "<revision range>" +#, no-wrap, priority:100 msgid "<range1> <range2>" -msgstr "<intervalo da revis찾o>" +msgstr "<intervalo da revis찾o1> <intervalo da revis찾o2>" #. type: Plain text #: en/git-range-diff.txt:87 @@ -40335,10 +40234,9 @@ msgstr "" #. type: Labeled list #: en/git-range-diff.txt:88 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "'<rev1>\\...<rev2>'" +#, ignore-ellipsis, no-wrap, priority:100 msgid "<rev1>...<rev2>" -msgstr "'<rev1>\\...<rev2>'" +msgstr "<rev1>...<rev2>" #. type: Plain text #: en/git-range-diff.txt:90 @@ -40348,10 +40246,9 @@ msgstr "" #. type: Labeled list #: en/git-range-diff.txt:91 -#, fuzzy, no-wrap, priority:100 -#| msgid "'<rev1>..<rev2>'" +#, no-wrap, priority:100 msgid "<base> <rev1> <rev2>" -msgstr "'<rev1>..<rev2>'" +msgstr "<base> <rev1> <rev2>" #. type: Plain text #: en/git-range-diff.txt:97 @@ -40367,10 +40264,9 @@ msgstr "" #. type: Title - #: en/git-range-diff.txt:106 -#, fuzzy, no-wrap, priority:100 -#| msgid "OUTPUT FORMAT" +#, no-wrap, priority:100 msgid "OUTPUT STABILITY" -msgstr "FORMATO DE SA횒DA" +msgstr "ESTABILIDADE DA SA횒DA" #. type: Plain text #: en/git-range-diff.txt:115 @@ -40417,7 +40313,7 @@ msgid "" "2: f00dbal ! 3: decafe1 Describe a bug\n" " @@ -1,3 +1,3 @@\n" " Author: A U Thor <author@example.com>\n" -msgstr "" +msgstr "-: ------- > 1: 0ddba11 Se prepare para o inevit찼vel!\n1: c0debee = 2: cab005e Adicione uma mensagem de ajuda no in챠cio\n2: f00dbal ! 3: decafe1 Descreva o problema\n @@ -1,3 +1,3 @@\n Autor: A U Thor <author@example.com>\n" #. type: delimited block - #: en/git-range-diff.txt:154 @@ -40427,7 +40323,7 @@ msgid "" " +Describe a bug\n" " @@ -324,5 +324,6\n" " This is expected.\n" -msgstr "" +msgstr " -TODO: Descreva um problema\n +Descreva um problema\n @@ -324,5 +324,6\n J찼 era esperado.\n" #. type: delimited block - #: en/git-range-diff.txt:158 @@ -40472,10 +40368,9 @@ msgstr "" #. type: Title - #: en/git-range-diff.txt:187 -#, fuzzy, no-wrap, priority:100 -#| msgid "Skip algorithm" +#, no-wrap, priority:100 msgid "Algorithm" -msgstr "Algoritmo de salto" +msgstr "Algoritmo" #. type: Plain text #: en/git-range-diff.txt:191 @@ -40503,35 +40398,21 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:208 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " B D\n" -#| " / /\n" -#| " ---X---A\n" +#, no-wrap, priority:100 msgid " 1 A\n" -msgstr "" -" B D\n" -" / /\n" -" ---X---A\n" +msgstr " 1 A\n" #. type: delimited block - #: en/git-range-diff.txt:210 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " B D\n" -#| " / /\n" -#| " ---X---A\n" +#, no-wrap, priority:100 msgid " 2 B\n" -msgstr "" -" B D\n" -" / /\n" -" ---X---A\n" +msgstr " 2 B\n" #. type: delimited block - #: en/git-range-diff.txt:212 en/git-range-diff.txt:224 #, no-wrap, priority:100 msgid "\t\t C\n" -msgstr "" +msgstr "\t\t C\n" #. type: Plain text #: en/git-range-diff.txt:216 @@ -40541,19 +40422,12 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:222 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " .----W\n" -#| " / /\n" -#| " -----H----I\n" +#, no-wrap, priority:100 msgid "" " 1 A\n" "\t /\n" " 2 --------' B\n" -msgstr "" -" .----W\n" -" / /\n" -" -----H----I\n" +msgstr " 1 A\n\t /\n 2 --------' B\n" #. type: Plain text #: en/git-range-diff.txt:229 @@ -40563,11 +40437,7 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:237 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " .----W\n" -#| " / /\n" -#| " -----H----I\n" +#, no-wrap, priority:100 msgid "" " 1 ----. A\n" "\t | /\n" @@ -40575,10 +40445,7 @@ msgid "" "\t |\n" "\t `----- C\n" "\t c>0\n" -msgstr "" -" .----W\n" -" / /\n" -" -----H----I\n" +msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n\t |\n\t `----- C\n\t c>0\n" #. type: Plain text #: en/git-range-diff.txt:245 @@ -40588,13 +40455,7 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:254 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " G-H-I-J\n" -#| " / \\\n" -#| "A-B-C-D-E-F O\n" -#| " \\ /\n" -#| " K-L-M-N\n" +#, no-wrap, priority:100 msgid "" " 1 ----. A\n" "\t | /\n" @@ -40603,25 +40464,13 @@ msgid "" " o `----- C\n" "\t c>0\n" " o o\n" -msgstr "" -" G-H-I-J\n" -" / \\\n" -"A-B-C-D-E-F O\n" -" \\ /\n" -" K-L-M-N\n" +msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n\t |\n o `----- C\n\t c>0\n o o\n" #. type: delimited block - #: en/git-range-diff.txt:256 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " B D\n" -#| " / /\n" -#| " ---X---A\n" +#, no-wrap, priority:100 msgid " o o\n" -msgstr "" -" B D\n" -" / /\n" -" ---X---A\n" +msgstr " o o\n" #. type: Plain text #: en/git-range-diff.txt:266 @@ -40637,13 +40486,7 @@ msgstr "" #. type: delimited block - #: en/git-range-diff.txt:282 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| " X\n" -#| " \\\n" -#| " A---M---B\n" -#| " /\n" -#| "---o---O---P---Q\n" +#, no-wrap, priority:100 msgid "" " 1 ----. A\n" "\t | /\n" @@ -40652,19 +40495,13 @@ msgid "" " o -' `----- C\n" "\t c>0\n" " o ---------- o\n" -msgstr "" -" X\n" -" \\\n" -" A---M---B\n" -" /\n" -"---o---O---P---Q\n" +msgstr " 1 ----. A\n\t | /\n 2 ----+---' B\n .--+-----'\n o -' `----- C\n\t c>0\n o ---------- o\n" #. type: delimited block - #: en/git-range-diff.txt:284 -#, fuzzy, no-wrap, priority:100 -#| msgid " E---H'---I'---J' topicA\n" +#, no-wrap, priority:100 msgid " o ---------- o\n" -msgstr " E---H'---I'---J' topicA\n" +msgstr " o ---------- o\n" #. type: Title = #: en/git-read-tree.txt:2 @@ -46961,10 +46798,9 @@ msgstr "indica o cabe챌alho do ramo atual." #. type: delimited block - #: en/git-rev-list.txt:41 -#, fuzzy, no-wrap, priority:100 -#| msgid "`git revert HEAD~3`" +#, no-wrap, priority:100 msgid "git rev-list HEAD\n" -msgstr "`git revert HEAD~3`" +msgstr "git rev-list HEAD\n" #. type: Plain text #: en/git-rev-list.txt:45 @@ -46976,7 +46812,7 @@ msgstr "" #: en/git-rev-list.txt:48 #, no-wrap, priority:100 msgid "git rev-list @{upstream}..HEAD\n" -msgstr "" +msgstr "git rev-list @{upstream}..HEAD\n" #. type: Plain text #: en/git-rev-list.txt:52 @@ -46986,10 +46822,9 @@ msgstr "" #. type: delimited block - #: en/git-rev-list.txt:55 -#, fuzzy, no-wrap, priority:100 -#| msgid "$ git rev-parse --verify HEAD\n" +#, no-wrap, priority:100 msgid "git rev-list --format=medium HEAD\n" -msgstr "$ git rev-parse --verify HEAD\n" +msgstr "git rev-list --format=medium HEAD\n" #. type: Plain text #: en/git-rev-list.txt:59 @@ -47003,7 +46838,7 @@ msgstr "" msgid "" "git rev-list HEAD |\n" "git diff-tree --stdin --format=medium -p\n" -msgstr "" +msgstr "git rev-list HEAD |\ngit diff-tree --stdin --format=medium -p\n" #. type: Plain text #: en/git-rev-list.txt:67 @@ -47014,10 +46849,9 @@ msgstr "Crie um arquivo tar com o conte첬do do commit mais recente no ramo atual #. type: delimited block - #: en/git-rev-list.txt:70 -#, fuzzy, no-wrap, priority:100 -#| msgid "`git grep solution -- :^Documentation`" +#, no-wrap, priority:100 msgid "git rev-list HEAD -- Documentation/\n" -msgstr "`git grep solu챌찾o -- :^Documenta챌찾o`" +msgstr "git rev-list HEAD -- Documenta챌찾o/\n" #. type: Plain text #: en/git-rev-list.txt:74 @@ -47029,7 +46863,7 @@ msgstr "" #: en/git-rev-list.txt:77 #, no-wrap, priority:100 msgid "git rev-list --author=you@example.com --since=1.year.ago --all\n" -msgstr "" +msgstr "git rev-list --author=you@example.com --since=1.year.ago --all\n" #. type: Plain text #: en/git-rev-list.txt:81 @@ -47039,10 +46873,9 @@ msgstr "" #. type: delimited block - #: en/git-rev-list.txt:84 -#, fuzzy, no-wrap, priority:100 -#| msgid "$ git rev-parse --verify HEAD\n" +#, no-wrap, priority:100 msgid "git rev-list --objects HEAD\n" -msgstr "$ git rev-parse --verify HEAD\n" +msgstr "git rev-list --objects HEAD\n" #. type: Plain text #: en/git-rev-list.txt:91 @@ -47062,7 +46895,7 @@ msgid "" "du -c .git/objects/pack/*.pack .git/objects/??/*\n" "# alternative to du: add up \"size\" and \"size-pack\" fields\n" "git count-objects -v\n" -msgstr "" +msgstr "# objetos acess챠veis\ngit rev-list --disk-usage --objects --all\n# mais os reflogs\ngit rev-list --disk-usage --objects --all --reflog\n# tamanho total da utiliza챌찾o do disco\ndu -c .git/objects/pack/*.pack .git/objects/??/*\n# 챕 uma alternativa para du: add up \"size\" e os campos \"size-pack\"\ngit count-objects -v\n" #. type: Plain text #: en/git-rev-list.txt:107 @@ -47081,7 +46914,7 @@ msgid "" "\techo \"$size $branch\"\n" "done |\n" "sort -n\n" -msgstr "" +msgstr "git for-each-ref --format='%(refname)' |\nwhile read branch\ndo\n\tsize=$(git rev-list --disk-usage --objects HEAD..$branch)\n\techo \"$size $branch\"\ndone |\nsort -n\n" #. type: Plain text #: en/git-rev-list.txt:122 @@ -47093,7 +46926,7 @@ msgstr "" #: en/git-rev-list.txt:125 #, no-wrap, priority:100 msgid "git rev-list --disk-usage --objects --remotes=$suspect --not --remotes=origin\n" -msgstr "" +msgstr "git rev-list --disk-usage --objects --remotes=$suspect --not --remotes=origin\n" #. type: Title = #: en/git-rev-parse.txt:2 @@ -47497,7 +47330,7 @@ msgstr "Liste as vari찼vel de ambiente do GIT_* que s찾o locais no reposit처rio #: en/git-rev-parse.txt:215 #, no-wrap, priority:100 msgid "--path-format=(absolute|relative)" -msgstr "" +msgstr "--path-format=(absolute|relative)" #. type: Plain text #: en/git-rev-parse.txt:220 @@ -51089,10 +50922,9 @@ msgstr "Esta op챌찾o j찼 est찼 obsoleta em favor da op챌찾o 'git stash push'. D #. type: Labeled list #: en/git-stash.txt:70 -#, fuzzy, no-wrap, priority:240 -#| msgid "list [<options>]" +#, no-wrap, priority:240 msgid "list [<log-options>]" -msgstr "list [<op챌천es>]" +msgstr "list [<op챌천es-do-registro-log>]" #. type: Plain text #: en/git-stash.txt:77 @@ -51118,10 +50950,9 @@ msgstr "O comando aceita as op챌천es aplic찼veis ao comando 'git log' para contr #. type: Labeled list #: en/git-stash.txt:86 -#, fuzzy, no-wrap, priority:240 -#| msgid "show [<options>] [<stash>]" +#, no-wrap, priority:240 msgid "show [<diff-options>] [<stash>]" -msgstr "show [<op챌천es>] [<stash>]" +msgstr "show [<op챌천es-diff>] [<stash>]" #. type: Plain text #: en/git-stash.txt:96 @@ -51683,10 +51514,9 @@ msgstr "Terminar as entradas com `NUL`, em vez de `LF`. Isto implica o formato #. type: Plain text #: en/git-status.txt:136 -#, fuzzy, priority:280 -#| msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively." +#, priority:280 msgid "Display untracked files in columns. See configuration variable `column.status` for option syntax. `--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively." -msgstr "Exiba os arquivos que n찾o foram rastreados em colunas. Veja a vari찼vel de configura챌찾o `column.status` para conhecer a sintaxe desta op챌찾o.`--column` e `--no-column` sem as op챌천es s찾o equivalentes a 'always' e 'never' respectivamente." +msgstr "Exiba os arquivos que n찾o foram rastreados em colunas. Veja a vari찼vel de configura챌찾o `column.status` para conhecer a sintaxe desta op챌찾o.`--column` e `--no-column` sem estas op챌천es, 챕 o mesmo que 'always' e 'never' respectivamente." #. type: Labeled list #: en/git-status.txt:137 @@ -51780,50 +51610,49 @@ msgstr "Os campos (incluindo o `->`) est찾o separados um do outro por um 첬nico #: en/git-status.txt:189 #, priority:280 msgid "There are three different types of states that are shown using this format, and each one uses the `XY` syntax differently:" -msgstr "" +msgstr "Existem tr챗s tipos de estados diferentes que s찾o mostrados utilizando este formato e cada um utiliza a sintaxe `XY` de forma diferente:" #. type: Plain text #: en/git-status.txt:191 #, priority:280 msgid "When a merge is occurring and the merge was successful, or outside of a merge" -msgstr "" +msgstr "Quando uma mesclagem est찼 ocorrendo e a mesclagem foi bem sucedida ou esteja fora de uma mesclagem" #. type: Plain text #: en/git-status.txt:193 -#, fuzzy, priority:280 -#| msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree." +#, priority:280 msgid "situation, `X` shows the status of the index and `Y` shows the status of the working tree." -msgstr "onde `H` 챕 o commit `HEAD`, `I` 챕 um commit que registra a condi챌찾o do 챠ndice e `W` 챕 um commit que registra a condi챌찾o da 찼rvore de trabalho." +msgstr "situa챌찾o, `X` mostra o status do 챠ndice e o `Y` mostra o status da 찼rvore de trabalho." #. type: Plain text #: en/git-status.txt:194 #, priority:280 msgid "When a merge conflict has occurred and has not yet been resolved, `X` and `Y`" -msgstr "" +msgstr "Quando o corre um conflito na mesclagem e ainda n찾o foi resolvido, `X` e `Y`" #. type: Plain text #: en/git-status.txt:196 #, priority:280 msgid "show the state introduced by each head of the merge, relative to the common ancestor. These paths are said to be _unmerged_." -msgstr "" +msgstr "mostram o estado introduzido por cada cabe챌alho da mesclagem com rela챌찾o ao ancestral comum. Dizem que estes caminhos s찾o _unmerged_ ou n찾o mesclados." #. type: Plain text #: en/git-status.txt:197 #, priority:280 msgid "When a path is untracked, `X` and `Y` are always the same, since they are" -msgstr "" +msgstr "Quando um caminho 챕 desmarcado, o `X` e o `Y` sempre s찾o o mesmo, pois s찾o" #. type: Plain text #: en/git-status.txt:200 #, priority:280 msgid "unknown to the index. `??` is used for untracked paths. Ignored files are not listed unless `--ignored` is used; if it is, ignored files are indicated by `!!`." -msgstr "" +msgstr "desconhecidos ao 챠ndice. O `??` 챕 usado para caminhos n찾o rastreados. Os arquivos ignorados n찾o s찾o listados a menos que a op챌찾o `--ignored` seja usado; caso seja, os arquivos ignorados s찾o indicados atrav챕s do s챠mbolo `!!`." #. type: Plain text #: en/git-status.txt:203 #, priority:280 msgid "Note that the term _merge_ here also includes rebases using the default `--merge` strategy, cherry-picks, and anything else using the merge machinery." -msgstr "" +msgstr "Observe que o termo _merge_ aqui tamb챕m inclui rebases usando a estrat챕gia padr찾o `--merge`, cherry-picks e qualquer outra coisa que use o mecanismo da mesclagem." #. type: Plain text #: en/git-status.txt:207 @@ -56118,14 +55947,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>]\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" @@ -56133,13 +55955,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>]\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 @@ -56231,10 +56047,9 @@ msgstr "Note que ao omitir `=` no comando `git -c foo.bar ...` 챕 permitido e de #. type: Labeled list #: en/git.txt:83 -#, fuzzy, no-wrap, priority:100 -#| msgid "--config <key>=<value>" +#, no-wrap, priority:100 msgid "--config-env=<name>=<envvar>" -msgstr "--config <chave>=<valor>" +msgstr "--config-env=<nome>=<envvar>" #. type: Plain text #: en/git.txt:92 @@ -60679,20 +60494,13 @@ msgstr "" #. type: delimited block - #: en/git-worktree.txt:439 -#, fuzzy, no-wrap, priority:240 -#| msgid "" -#| "worktree /path/to/linked-worktree\n" -#| "HEAD abcd1234abcd1234abcd1234abcd1234abcd1234\n" -#| "branch refs/heads/master\n" +#, no-wrap, priority:240 msgid "" "worktree /path/to/linked-worktree-locked-no-reason\n" "HEAD 5678abc5678abc5678abc5678abc5678abc5678c\n" "branch refs/heads/locked-no-reason\n" "locked\n" -msgstr "" -"worktree /path/to/linked-worktree\n" -"HEAD abcd1234abcd1234abcd1234abcd1234abcd1234\n" -"branch refs/heads/master\n" +msgstr "worktree /path/to/linked-worktree-locked-no-reason\nHEAD 5678abc5678abc5678abc5678abc5678abc5678c\nbranch refs/heads/locked-no-reason\nlocked\n" #. type: delimited block - #: en/git-worktree.txt:444 @@ -60702,48 +60510,33 @@ msgid "" "HEAD 3456def3456def3456def3456def3456def3456b\n" "branch refs/heads/locked-with-reason\n" "locked reason why is locked\n" -msgstr "" +msgstr "worktree /path/to/linked-worktree-locked-with-reason\nHEAD 3456def3456def3456def3456def3456def3456b\nbranch refs/heads/locked-with-reason\nlocked reason why is locked\n" #. type: delimited block - #: en/git-worktree.txt:449 -#, fuzzy, no-wrap, priority:240 -#| msgid "" -#| "worktree /path/to/linked-worktree\n" -#| "HEAD abcd1234abcd1234abcd1234abcd1234abcd1234\n" -#| "branch refs/heads/master\n" +#, no-wrap, priority:240 msgid "" "worktree /path/to/linked-worktree-prunable\n" "HEAD 1233def1234def1234def1234def1234def1234b\n" "detached\n" "prunable gitdir file points to non-existent location\n" -msgstr "" -"worktree /path/to/linked-worktree\n" -"HEAD abcd1234abcd1234abcd1234abcd1234abcd1234\n" -"branch refs/heads/master\n" +msgstr "worktree /path/to/linked-worktree-prunable\nHEAD 1233def1234def1234def1234def1234def1234b\ndetached\nprunable gitdir file points to non-existent location\n" #. type: Plain text #: en/git-worktree.txt:456 -#, fuzzy, priority:240 -#| msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])." +#, priority:240 msgid "If the lock reason contains \"unusual\" characters such as newline, they are escaped and the entire reason is quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). For Example:" -msgstr "Os nomes dos caminhos com caracteres \"incomuns\" s찾o citados como j찼 explicado na vari찼vel de configura챌찾o `core.quotePath` (consulte linkgit:git-config[1])." +msgstr "Caso o motivo do bloqueio contenha caracteres \"incomuns\" como uma nova linha, eles ser찾o ignorados conforme 챕 explicado na vari찼vel de configura챌찾o `core.quotePath` (consulte linkgit:git-config[1]). Por exemplo:" #. type: delimited block - #: en/git-worktree.txt:462 -#, fuzzy, ignore-ellipsis, no-wrap, priority:240 -#| msgid "" -#| "$ git worktree list --porcelain\n" -#| "worktree /path/to/bare-source\n" -#| "bare\n" +#, ignore-ellipsis, no-wrap, priority:240 msgid "" "$ git worktree list --porcelain\n" "...\n" "locked \"reason\\nwhy is locked\"\n" "...\n" -msgstr "" -"$ git worktree list --porcelain\n" -"worktree /path/to/bare-source\n" -"bare\n" +msgstr "$ git worktree list --porcelain\n...\nlocked \"reason\\nwhy is locked\"\n...\n" #. type: Plain text #: en/git-worktree.txt:474 @@ -62214,17 +62007,15 @@ msgstr "Caso `:<funcname>` seja informado no lugar do '<inicio>' e '<fim>', 챕 u #. type: Labeled list #: en/line-range-options.txt:1 -#, fuzzy, no-wrap, priority:100 -#| msgid "-L <start>,<end>:<file>" +#, no-wrap, priority:100 msgid "-L<start>,<end>:<file>" -msgstr "-L <inicio>,<fim>:<arquivo>" +msgstr "-L<inicio>,<fim>:<arquivo>" #. type: Labeled list #: en/line-range-options.txt:2 -#, fuzzy, no-wrap, priority:100 -#| msgid "-L :<funcname>:<file>" +#, no-wrap, priority:100 msgid "-L:<funcname>:<file>" -msgstr "-L :<nome-da-fun챌찾o>:<arquivo>" +msgstr "-L:<nome-da-fun챌찾o>:<arquivo>" #. type: Plain text #: en/line-range-options.txt:14 @@ -62703,10 +62494,9 @@ msgstr "bc3" #. type: Plain text #: en/mergetools-merge.txt:5 -#, fuzzy, priority:240 -#| msgid "bc" +#, priority:240 msgid "bc4" -msgstr "bc" +msgstr "bc4" #. type: Plain text #: en/mergetools-merge.txt:6 @@ -62764,10 +62554,9 @@ msgstr "gvimdiff" #. type: Plain text #: en/mergetools-merge.txt:15 -#, fuzzy, priority:240 -#| msgid "gvimdiff" +#, priority:240 msgid "gvimdiff1" -msgstr "gvimdiff" +msgstr "gvimdiff1" #. type: Plain text #: en/mergetools-merge.txt:16 @@ -62801,10 +62590,9 @@ msgstr "nvimdiff" #. type: Plain text #: en/mergetools-merge.txt:21 -#, fuzzy, priority:240 -#| msgid "nvimdiff" +#, priority:240 msgid "nvimdiff1" -msgstr "nvimdiff" +msgstr "nvimdiff1" #. type: Plain text #: en/mergetools-merge.txt:22 @@ -62856,10 +62644,9 @@ msgstr "vimdiff" #. type: Plain text #: en/mergetools-merge.txt:30 -#, fuzzy, priority:240 -#| msgid "vimdiff" +#, priority:240 msgid "vimdiff1" -msgstr "vimdiff" +msgstr "vimdiff1" #. type: Plain text #: en/mergetools-merge.txt:31 @@ -63957,10 +63744,9 @@ msgstr "'%(trailers[:options])'" #. type: Plain text #: en/pretty-formats.txt:258 -#, 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:" +#, 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." -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:" +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." #. type: Plain text #: en/pretty-formats.txt:263 @@ -65061,17 +64847,15 @@ msgstr "Assim, o seguinte comando:" #. type: delimited block - #: en/rev-list-description.txt:18 -#, fuzzy, no-wrap, priority:100 -#| msgid "\t$ git rev-list foo bar ^baz\n" +#, no-wrap, priority:100 msgid "$ git rev-list foo bar ^baz\n" -msgstr "\t$ git rev-list foo bar ^baz\n" +msgstr "$ git rev-list foo bar ^baz\n" #. type: delimited block - #: en/rev-list-description.txt:23 -#, fuzzy, no-wrap, priority:100 -#| msgid "\t$ git rev-list foo bar ^baz\n" +#, no-wrap, priority:100 msgid "$ git log foo bar ^baz\n" -msgstr "\t$ git rev-list foo bar ^baz\n" +msgstr "$ git log foo bar ^baz\n" #. type: Plain text #: en/rev-list-description.txt:28 @@ -65088,29 +64872,19 @@ msgstr "Uma nota챌찾o especial \"'<commit1>'..'<commit2>'\" pode ser utilizada c #. type: delimited block - #: en/rev-list-description.txt:37 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| "\t$ git rev-list origin..HEAD\n" -#| "\t$ git rev-list HEAD ^origin\n" +#, no-wrap, priority:100 msgid "" "$ git rev-list origin..HEAD\n" "$ git rev-list HEAD ^origin\n" -msgstr "" -"\t$ git rev-list origin..HEAD\n" -"\t$ git rev-list HEAD ^origin\n" +msgstr "$ git rev-list origin..HEAD\n$ git rev-list HEAD ^origin\n" #. type: delimited block - #: en/rev-list-description.txt:43 -#, fuzzy, no-wrap, priority:100 -#| msgid "" -#| "\t$ git rev-list origin..HEAD\n" -#| "\t$ git rev-list HEAD ^origin\n" +#, no-wrap, priority:100 msgid "" "$ git log origin..HEAD\n" "$ git log HEAD ^origin\n" -msgstr "" -"\t$ git rev-list origin..HEAD\n" -"\t$ git rev-list HEAD ^origin\n" +msgstr "$ git log origin..HEAD\n$ git log HEAD ^origin\n" #. type: Plain text #: en/rev-list-description.txt:49 @@ -65120,29 +64894,19 @@ msgstr "Outra nota챌찾o especial 챕 \"'<commit1>'...'<commit2>'\", 첬til para me #. type: delimited block - #: en/rev-list-description.txt:54 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "" -#| "\t$ git rev-list A B --not $(git merge-base --all A B)\n" -#| "\t$ git rev-list A...B\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git rev-list A B --not $(git merge-base --all A B)\n" "$ git rev-list A...B\n" -msgstr "" -"\t$ git rev-list A B --not $(git merge-base --all A B)\n" -"\t$ git rev-list A...B\n" +msgstr "$ git rev-list A B --not $(git merge-base --all A B)\n$ git rev-list A...B\n" #. type: delimited block - #: en/rev-list-description.txt:60 -#, fuzzy, ignore-ellipsis, no-wrap, priority:100 -#| msgid "" -#| "\t$ git rev-list A B --not $(git merge-base --all A B)\n" -#| "\t$ git rev-list A...B\n" +#, ignore-ellipsis, no-wrap, priority:100 msgid "" "$ git log A B --not $(git merge-base --all A B)\n" "$ git log A...B\n" -msgstr "" -"\t$ git rev-list A B --not $(git merge-base --all A B)\n" -"\t$ git rev-list A...B\n" +msgstr "$ git log A B --not $(git merge-base --all A B)\n$ git log A...B\n" #. type: Title ~ #: en/rev-list-options.txt:2