diff --git a/po/documentation.de.po b/po/documentation.de.po
index f0ce37d9f955148667576fb920e3194a945c8885..993c5b9ac28b63f338f6b03cdf282c73002d098d 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
"POT-Creation-Date: 2020-04-04 19:51+0200\n"
-"PO-Revision-Date: 2020-04-23 20:24+0000\n"
+"PO-Revision-Date: 2020-04-28 14:59+0000\n"
"Last-Translator: Dieter Ziller <max123kl@ziller.de>\n"
"Language-Team: Matthias A횩hauer <mha1993@live.de>\n"
"Language: de\n"
@@ -19,7 +19,7 @@ msgstr ""
"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.0.2-dev\n"
+"X-Generator: Weblate 4.0.2\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:666 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
@@ -5047,7 +5047,7 @@ msgstr ""
#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
-msgstr ""
+msgstr "--ignore-submodules[=<wenn>]"
#. type: Plain text
#: en/diff-options.txt:734
@@ -6417,114 +6417,159 @@ msgstr "PATCHES EDITIEREN"
#, priority:300
msgid "Invoking `git add -e` or selecting `e` from the interactive hunk selector will open a patch in your editor; after the editor exits, the result is applied to the index. You are free to make arbitrary changes to the patch, but note that some changes may have confusing results, or even result in a patch that cannot be applied. If you want to abort the operation entirely (i.e., stage nothing new in the index), simply delete all lines of the patch. The list below describes some common things you may see in a patch, and which editing operations make sense on them."
msgstr ""
+"Der Aufruf von `git add -e` oder die Auswahl von `e` aus dem interaktiven "
+"Hunk-Selector 철ffnet einen Patch in Ihrem Editor. Nach Verlassen des Editors "
+"wird das Ergebnis in den Index 체bernommen. Es ist Ihre Entscheidung, "
+"beliebige 횆nderungen an dem Patch vorzunehmen, aber beachten Sie, dass "
+"einige 횆nderungen irref체hrende Ergebnisse haben oder sogar zu einem Patch "
+"f체hren k철nnen, der nicht angewendet werden kann. Wenn Sie die Operation "
+"vollst채ndig abbrechen wollen (d.h. nichts Neues in den Index stagen), "
+"l철schen Sie einfach alle Zeilen des Patches. Die folgende Liste beschreibt "
+"einige g채ngige Elemente, die Sie in einem Patch sehen k철nnen, und welche "
+"Bearbeitungsvorg채nge bei ihnen sinnvoll sind."
#. type: Labeled list
#: en/git-add.txt:369
#, no-wrap, priority:300
msgid "added content"
-msgstr ""
+msgstr "hinzugef체gter Inhalt"
#. type: Plain text
#: en/git-add.txt:373
#, priority:300
msgid "Added content is represented by lines beginning with \"{plus}\". You can prevent staging any addition lines by deleting them."
msgstr ""
+"Hinzugef체gter Inhalt wird durch Zeilen dargestellt, die mit \"{plus}\" "
+"beginnen. Sie k철nnen das Staging von hinzugef체gten Zeilen verhindern, indem "
+"Sie diese l철schen."
#. type: Labeled list
#: en/git-add.txt:374
#, no-wrap, priority:300
msgid "removed content"
-msgstr ""
+msgstr "entfernter, gel철schter Inhalt"
#. type: Plain text
#: en/git-add.txt:378
#, priority:300
msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)."
msgstr ""
+"Entfernter Inhalt wird durch Zeilen dargestellt, die mit \"-\" beginnen. Sie "
+"k철nnen die Entfernung aus der Staging Area verhindern, indem Sie das \"-\" "
+"in ein \" \" (Leerzeichen) umwandeln."
#. type: Labeled list
#: en/git-add.txt:379
#, no-wrap, priority:300
msgid "modified content"
-msgstr ""
+msgstr "ge채nderter Inhalt"
#. type: Plain text
#: en/git-add.txt:386
#, priority:300
msgid "Modified content is represented by \"-\" lines (removing the old content) followed by \"{plus}\" lines (adding the replacement content). You can prevent staging the modification by converting \"-\" lines to \" \", and removing \"{plus}\" lines. Beware that modifying only half of the pair is likely to introduce confusing changes to the index."
msgstr ""
+"Ge채nderter Inhalt wird durch \"-\" Zeilen (entfernen des alten Inhalts), "
+"gefolgt von \"{plus}\" Zeilen (hinzuf체gen des Ersatzinhalts) dargestellt. "
+"Sie k철nnen das Staging der 횆nderung verhindern, indem Sie \"-\" Zeilen in \" "
+"\" konvertieren und \"{plus}\"-Zeilen entfernen. Achten Sie darauf, dass die "
+"횆nderung von nur der H채lfte des Paares wahrscheinlich irref체hrende "
+"횆nderungen am Index mit sich bringt."
#. type: Plain text
#: en/git-add.txt:394
#, priority:300
msgid "There are also more complex operations that can be performed. But beware that because the patch is applied only to the index and not the working tree, the working tree will appear to \"undo\" the change in the index. For example, introducing a new line into the index that is in neither the HEAD nor the working tree will stage the new line for commit, but the line will appear to be reverted in the working tree."
msgstr ""
+"Es gibt auch komplexere Operationen, die durchgef체hrt werden k철nnten. Aber "
+"Vorsicht: Da der Patch nur auf den Index und nicht auf den Arbeitsbereich "
+"angewendet wird, scheint es, als w체rde der Arbeitsbereich die 횆nderung im "
+"Index \"r체ckg채ngig machen\". Wenn zum Beispiel eine neue Zeile in den Index "
+"eingef체gt wird, die sich weder im HEAD noch im Arbeitsbereich befindet, wird "
+"sie f체r einen Commit bereitgestellt, aber diese Zeile erscheint im "
+"Arbeitsbereich als zur체ckgesetzt."
#. type: Plain text
#: en/git-add.txt:396
#, priority:300
msgid "Avoid using these constructs, or do so with extreme caution."
msgstr ""
+"Vermeiden Sie diese Konstrukte oder gehen Sie mit 채u횩erster Vorsicht vor."
#. type: Labeled list
#: en/git-add.txt:398
#, no-wrap, priority:300
msgid "removing untouched content"
-msgstr ""
+msgstr "entfernen von unver채ndertem Inhalt"
#. type: Plain text
#: en/git-add.txt:404
#, priority:300
msgid "Content which does not differ between the index and working tree may be shown on context lines, beginning with a \" \" (space). You can stage context lines for removal by converting the space to a \"-\". The resulting working tree file will appear to re-add the content."
msgstr ""
+"Inhalt, der nicht zwischen Index und Arbeitsbereich differiert, kann in "
+"Kontextzeilen angezeigt werden, die mit einem \" \" (Leerzeichen) beginnen. "
+"Sie k철nnen Kontextzeilen zum Entfernen vorsehen, indem Sie das Leerzeichen "
+"in ein \"-\" umwandeln. Die resultierende Datei des Arbeitsbereichs wird "
+"angezeigt, um den Inhalt erneut hinzuzuf체gen."
#. type: Labeled list
#: en/git-add.txt:405
#, no-wrap, priority:300
msgid "modifying existing content"
-msgstr ""
+msgstr "채ndern von vorhandenem Inhalt"
#. type: Plain text
#: en/git-add.txt:412
#, priority:300
msgid "One can also modify context lines by staging them for removal (by converting \" \" to \"-\") and adding a \"{plus}\" line with the new content. Similarly, one can modify \"{plus}\" lines for existing additions or modifications. In all cases, the new modification will appear reverted in the working tree."
msgstr ""
+"Man kann auch Kontextzeilen modifizieren, indem man sie zur Entfernung "
+"bereitstellt (man wandelt \" \" in \"-\" um) und eine \"{plus}\" Zeile mit "
+"dem neuen Inhalt hinzuf체gt. In 채hnlicher Weise kann man \"{plus}\" Zeilen "
+"f체r bestehende Erweiterungen oder Modifikationen ver채ndern. In allen F채llen "
+"erscheint die neue Modifikation im Arbeitsbereich als zur체ckgesetzt."
#. type: Labeled list
#: en/git-add.txt:413
#, no-wrap, priority:300
msgid "new content"
-msgstr ""
+msgstr "neuer Inhalt"
#. type: Plain text
#: en/git-add.txt:418
#, priority:300
msgid "You may also add new content that does not exist in the patch; simply add new lines, each starting with \"{plus}\". The addition will appear reverted in the working tree."
msgstr ""
+"Man kann auch Inhalt neu hinzuf체gen, der im Patch nicht vorhanden ist. Dazu "
+"einfach neue Zeilen einf체gen, die jeweils mit \"{plus}\" beginnen. Die "
+"Erweiterung erscheint dann im Arbeitsbereich als zur체ckgesetzt."
#. type: Plain text
#: en/git-add.txt:422
#, priority:300
msgid "There are also several operations which should be avoided entirely, as they will make the patch impossible to apply:"
msgstr ""
+"Es gibt auch einige Operationen, die ganz vermieden werden sollten, da sie "
+"die Anwendung des Patches unm철glich machen w체rden:"
#. type: Plain text
#: en/git-add.txt:424
#, priority:300
msgid "adding context (\" \") or removal (\"-\") lines"
-msgstr ""
+msgstr "Hinzuf체gen von Kontext (\" \") oder Entfernen (\"-\") von Zeilen"
#. type: Plain text
#: en/git-add.txt:425
#, priority:300
msgid "deleting context or removal lines"
-msgstr ""
+msgstr "L철schen von Kontext oder Entfernen von Zeilen"
#. type: Plain text
#: en/git-add.txt:426
#, priority:300
msgid "modifying the contents of context or removal lines"
-msgstr ""
+msgstr "횆ndern des Inhalts von Kontextzeilen oder entfernen von Zeilen"
#. type: Title -
#: en/git-add.txt:428 en/git-am.txt:242 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:238 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:97 en/git-commit.txt:538 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1541 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:706 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:362 en/git-pack-objects.txt:399 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:258 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:201 en/git-revert.txt:137 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:979 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
diff --git a/po/documentation.es.po b/po/documentation.es.po
index fcb0c59fb6c53ea5be6c290d9e32cec9c24e5207..04268c3bd1138e1ec97f10463b3a1aa7be2de767 100644
--- a/po/documentation.es.po
+++ b/po/documentation.es.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
"POT-Creation-Date: 2020-04-04 19:51+0200\n"
-"PO-Revision-Date: 2020-04-23 20:25+0000\n"
+"PO-Revision-Date: 2020-04-28 14:59+0000\n"
"Last-Translator: Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: es\n"
@@ -16,7 +16,7 @@ msgstr ""
"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.0.2-dev\n"
+"X-Generator: Weblate 4.0.2\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:666 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
@@ -4335,13 +4335,17 @@ msgstr ""
#: en/diff-options.txt:349
#, no-wrap, priority:280
msgid "--word-diff[=<mode>]"
-msgstr ""
+msgstr "--word-diff[=<modo>]"
#. type: Plain text
#: en/diff-options.txt:354
#, priority:280
msgid "Show a word diff, using the <mode> to delimit changed words. By default, words are delimited by whitespace; see `--word-diff-regex` below. The <mode> defaults to 'plain', and must be one of:"
msgstr ""
+"Muestra diferencias entre palabras, utilizando el <modo> para delimitar las "
+"palabras cambiadas. De manera predeterminada, las palabras se delimitan por "
+"espacios; consulte `--word-diff-regex` m찼s abajo. El <modo> predeterminado "
+"es 짬plain쨩, y debe ser uno de:"
#. type: Plain text
#: en/diff-options.txt:358
@@ -4377,7 +4381,7 @@ msgstr "none"
#: en/diff-options.txt:371
#, priority:280
msgid "Disable word diff again."
-msgstr ""
+msgstr "Desactiva de nuevo las diferencias entre palabras."
#. type: Plain text
#: en/diff-options.txt:375
@@ -4389,7 +4393,7 @@ msgstr ""
#: en/diff-options.txt:376
#, no-wrap, priority:280
msgid "--word-diff-regex=<regex>"
-msgstr ""
+msgstr "--word-diff-regex=<expresi처n regular>"
#. type: Plain text
#: en/diff-options.txt:380
@@ -4408,6 +4412,8 @@ msgstr ""
#, priority:280
msgid "For example, `--word-diff-regex=.` will treat each character as a word and, correspondingly, show differences character by character."
msgstr ""
+"Por ejemplo, `--word-diff-regex=.` tratar찼 cada car찼cter como si fuese una "
+"palabra y, por tanto, mostrar찼 las diferencias car찼cter por car찼cter."
#. type: Plain text
#: en/diff-options.txt:396
@@ -4419,7 +4425,7 @@ msgstr ""
#: en/diff-options.txt:397
#, no-wrap, priority:280
msgid "--color-words[=<regex>]"
-msgstr ""
+msgstr "--color-words[=<expresi처n regular>]"
#. type: Plain text
#: en/diff-options.txt:400
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 190c458612bc86913c1fec186d2a1039f611677f..8f62c6d0279def20998e3de46246856794945922 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
"POT-Creation-Date: 2020-04-04 19:51+0200\n"
-"PO-Revision-Date: 2020-04-25 12:31+0000\n"
+"PO-Revision-Date: 2020-04-28 14:59+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"
@@ -15,7 +15,7 @@ msgstr ""
"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.0.2-dev\n"
+"X-Generator: Weblate 4.0.2\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:666 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
@@ -2592,7 +2592,18 @@ msgstr "merge.directoryRenames"
#: en/config/merge.txt:58
#, priority:240
msgid "Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history. If merge.directoryRenames is set to \"false\", directory rename detection is disabled, meaning that such new files will be left behind in the old directory. If set to \"true\", directory rename detection is enabled, meaning that such new files will be moved into the new directory. If set to \"conflict\", a conflict will be reported for such paths. If merge.renames is false, merge.directoryRenames is ignored and treated as false. Defaults to \"conflict\"."
-msgstr "Indique si Git doit d챕tecter les noms de r챕pertoire, affectant ce qui se arrive lors d'une fusion 횪 de nouveaux fichiers ajout챕s 횪 un r챕pertoire d'un c척t챕 de l'historique lorsque ce r챕pertoire a 챕t챕 renomm챕 de l'autre c척t챕 de l'histoire. Si merge.directoryRenames est r챕gl챕 횪 \"false\", la d챕tection du r챕pertoire est d챕sactiv챕e, ce qui signifie que ces nouveaux fichiers seront laiss챕s dans l'ancien r챕pertoire. S'il est r챕gl챕 sur \"true\", la d챕tection du r챕pertoire est activ챕e, ce qui signifie que ces nouveaux fichiers seront transf챕r챕s dans le nouveau r챕pertoire. S'il est r챕gl챕 pour \"conflict\", un conflit sera signal챕 pour de tels chemins. Si merge.renames est faux, merge.directoryRenames est ignor챕 et trait챕 comme faux. Par d챕faut, la valeur est \"conflict\"."
+msgstr ""
+"Indique si Git doit d챕tecter les noms de r챕pertoire, affectant ce qui se "
+"arrive lors d'une fusion 횪 de nouveaux fichiers ajout챕s 횪 un r챕pertoire d'un "
+"c척t챕 de l'historique lorsque ce r챕pertoire a 챕t챕 renomm챕 de l'autre c척t챕 de "
+"l'historique. Si merge.directoryRenames est r챕gl챕 횪 \"false\", la d챕tection "
+"du r챕pertoire est d챕sactiv챕e, ce qui signifie que ces nouveaux fichiers "
+"seront laiss챕s dans l'ancien r챕pertoire. S'il est r챕gl챕 sur \"true\", la "
+"d챕tection du r챕pertoire est activ챕e, ce qui signifie que ces nouveaux "
+"fichiers seront transf챕r챕s dans le nouveau r챕pertoire. S'il est r챕gl챕 pour "
+"\"conflict\", un conflit sera signal챕 pour de tels chemins. Si "
+"merge.renames est faux, merge.directoryRenames est ignor챕 et trait챕 comme "
+"faux. Par d챕faut, la valeur est \"conflict\"."
#. type: Labeled list
#: en/config/merge.txt:59
@@ -23568,7 +23579,7 @@ msgstr "`-`"
#: en/git-fetch.txt:216
#, priority:220
msgid "for a successfully pruned ref;"
-msgstr "pour une ref. 챕lagu챕e avec succ챔s;"
+msgstr "pour une ref. 챕lagu챕e avec succ챔s��;"
#. type: Labeled list
#: en/git-fetch.txt:216
@@ -33093,7 +33104,8 @@ msgstr "git-merge(1)"
#: en/git-merge.txt:7
#, priority:240
msgid "git-merge - Join two or more development histories together"
-msgstr "git-merge - Fusionner deux ou plusieurs historiques de d챕veloppement ensemble"
+msgstr ""
+"git-merge - Fusionne deux ou plusieurs historiques de d챕veloppement ensemble"
#. type: Plain text
#: en/git-merge.txt:17
@@ -33117,17 +33129,17 @@ msgstr ""
msgid "Incorporates changes from the named commits (since the time their histories diverged from the current branch) into the current branch. This command is used by 'git pull' to incorporate changes from another repository and can be used by hand to merge changes from one branch into another."
msgstr ""
"Int챔gre les modifications des commits nomm챕s (depuis le moment o첫 leur "
-"histoire a diverg챕 de la branche actuelle) dans la branche actuelle. Cette "
-"commande est utilis챕e par 'git pull' pour incorporer les modifications d'un "
-"autre d챕p척t et peut 챗tre utilis챕e 횪 la main pour fusionner les modifications "
-"d'une branche dans une autre."
+"historique a diverg챕 de la branche actuelle) dans la branche actuelle. "
+"Cette commande est utilis챕e par 'git pull' pour incorporer les modifications "
+"d'un autre d챕p척t et peut 챗tre utilis챕e 횪 la main pour fusionner les "
+"modifications d'une branche dans une autre."
#. type: Plain text
#: en/git-merge.txt:28 en/git-pull.txt:40
#, priority:240
msgid "Assume the following history exists and the current branch is \"`master`\":"
msgstr ""
-"Supposons que l'histoire suivante existe et que la branche actuelle est "
+"Supposons que l'historique suivant existe et que la branche actuelle est "
"`master` :"
#. type: delimited block -
@@ -37791,72 +37803,126 @@ msgstr ""
#, priority:220
msgid "I.e. a fast-forward of commits and tags outside `refs/{tags,heads}/*` is allowed, even in cases where what's being fast-forwarded is not a commit, but a tag object which happens to point to a new commit which is a fast-forward of the commit the last tag (or commit) it's replacing. Replacing a tag with an entirely different tag is also allowed, if it points to the same commit, as well as pushing a peeled tag, i.e. pushing the commit that existing tag object points to, or a new tag object which an existing commit points to."
msgstr ""
+"C'est-횪-dire qu'une avance rapide des commits et des 챕tiquettes en dehors de "
+"`refs/{tags,heads}/*` est autoris챕e, m챗me dans les cas o첫 ce qui est avanc챕 "
+"rapidement n'est pas un commit, mais un objet 챕tiquette qui pointe vers un "
+"nouveau commit qui est une avance rapide de la derni챔re 챕tiquette (ou commit)"
+" qu'il remplace. Le remplacement d'une 챕tiquette par une 챕tiquette "
+"enti챔rement diff챕rente est 챕galement autoris챕, si elle pointe vers le m챗me "
+"commit, ainsi que le fait de pousser une 챕tiquette pel챕e, c'est-횪-dire de "
+"pousser le commit vers lequel l'objet 챕tiquette existant pointe, ou un "
+"nouvel objet 챕tiquette vers lequel un commit existant pointe."
#. type: Plain text
#: en/git-push.txt:126
#, priority:220
msgid "Tree and blob objects outside of `refs/{tags,heads}/*` will be treated the same way as if they were inside `refs/tags/*`, any update of them will be rejected."
msgstr ""
+"Les objets d'arbre et de blob 횪 l'ext챕rieur de `refs/{tags,heads}/*` seront "
+"trait챕s de la m챗me mani챔re que s'ils 챕taient 횪 l'int챕rieur de `refs/tags/*`, "
+"toute mise 횪 jour de ceux-ci sera rejet챕e."
#. type: Plain text
#: en/git-push.txt:135
#, priority:220
msgid "All of the rules described above about what's not allowed as an update can be overridden by adding an the optional leading `+` to a refspec (or using `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object. Hooks and configuration can also override or amend these rules, see e.g. `receive.denyNonFastForwards` in linkgit:git-config[1] and `pre-receive` and `update` in linkgit:githooks[5]."
msgstr ""
+"Toutes les r챔gles d챕crites ci-dessus sur ce qui n'est pas autoris챕 en tant "
+"que mise 횪 jour peuvent 챗tre pass챕es outre en ajoutant le caract챔re "
+"facultatif `+` 횪 une sp챕c-de-r챕f (ou en utilisant l'option de ligne de "
+"commande `--force`). La seule exception 횪 cela est qu'aucune quantit챕 de "
+"for챌age ne fera que l'espace de noms `refs/heads/*` acceptera un objet non-"
+"commit. Les crochets et la configuration peuvent 챕galement remplacer ou "
+"modifier ces r챔gles, voir par ex. `receive.denyNonFastForwards` dans linkgit"
+":git-config[1] et `pre-receive` et `update` dans linkgit:githooks[5]."
#. type: Plain text
#: en/git-push.txt:141
#, priority:220
msgid "Pushing an empty <src> allows you to delete the <dst> ref from the remote repository. Deletions are always accepted without a leading `+` in the refspec (or `--force`), except when forbidden by configuration or hooks. See `receive.denyDeletes` in linkgit:git-config[1] and `pre-receive` and `update` in linkgit:githooks[5]."
msgstr ""
+"Pousser un <src> vide vous permet de supprimer la r챕f챕rence <dst> du d챕p척t "
+"distant. Les suppressions sont toujours accept챕es sans signe `+` dans la "
+"sp챕c-de-r챕f (ou `--force`), sauf lorsque la configuration ou les crochets "
+"l'interdisent. Voir `receive.denyDeletes` dans linkgit:git-config[1] et `pre-"
+"receive` et `update` dans linkgit:githooks[5]."
#. type: Plain text
#: en/git-push.txt:146
#, priority:220
msgid "The special refspec `:` (or `+:` to allow non-fast-forward updates) directs Git to push \"matching\" branches: for every branch that exists on the local side, the remote side is updated if a branch of the same name already exists on the remote side."
msgstr ""
+"La sp챕c-de-r챕f sp챕ciale `:` (ou `+:` pour permettre des mises 횪 jour pas en "
+"avance rapide) ordonne 횪 Git de pousser les branches \"correspondantes\" : "
+"pour chaque branche qui existe du c척t챕 local, le c척t챕 distant est mis 횪 jour "
+"si une branche du m챗me nom existe d챕j횪 du c척t챕 distant."
#. type: Plain text
#: en/git-push.txt:148
#, priority:220
msgid "`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`."
msgstr ""
+"`tag <챕tiquette>` signifie la m챗me chose que `refs/tags/<챕tiquette>:refs/"
+"tags/<챕tiquette>`."
#. type: Plain text
#: en/git-push.txt:152
#, priority:220
msgid "Push all branches (i.e. refs under `refs/heads/`); cannot be used with other <refspec>."
msgstr ""
+"Pousser toutes les branches (c'est-횪-dire les r챕f챕rences sous `refs/heads/`)��"
+"; ne peut pas 챗tre utilis챕 avec d'autres <sp챕c-de-r챕f>."
#. type: Plain text
#: en/git-push.txt:160
#, priority:220
msgid "Remove remote branches that don't have a local counterpart. For example a remote branch `tmp` will be removed if a local branch with the same name doesn't exist any more. This also respects refspecs, e.g. `git push --prune remote refs/heads/*:refs/tmp/*` would make sure that remote `refs/tmp/foo` will be removed if `refs/heads/foo` doesn't exist."
msgstr ""
+"Supprimer les branches distantes qui n'ont pas d'챕quivalent local. Par "
+"exemple, une branche distante `tmp` sera supprim챕e si une branche locale du "
+"m챗me nom n'existe plus. Cela respecte 챕galement les sp챕cificateurs de "
+"r챕f챕rence, par exemple `git push --prune remote refs/heads/*:refs/tmp/*` "
+"s'assurera que la branche distante `refs/tmp/foo` sera supprim챕e si `refs/"
+"heads/foo` n'existe plus."
#. type: Plain text
#: en/git-push.txt:171
#, priority:220
msgid "Instead of naming each ref to push, specifies that all refs under `refs/` (which includes but is not limited to `refs/heads/`, `refs/remotes/`, and `refs/tags/`) be mirrored to the remote repository. Newly created local refs will be pushed to the remote end, locally updated refs will be force updated on the remote end, and deleted refs will be removed from the remote end. This is the default if the configuration option `remote.<remote>.mirror` is set."
msgstr ""
+"Au lieu de nommer chaque r챕f 횪 pousser, sp챕cifier que toutes les r챕fs sous `"
+"refs/` (ce qui inclut mais n'est pas limit챕 횪 `refs/heads/`, `refs/remotes/`"
+", et `refs/tags/`) soient refl챕t챕es dans le d챕p척t distant. Les r챕fs locales "
+"nouvellement cr챕챕es seront pouss챕es vers l'autre extr챕mit챕, les r챕fs mises 횪 "
+"jour localement seront mises 횪 jour de force sur l'extr챕mit챕 distante, et "
+"les r챕fs supprim챕es seront supprim챕es de l'extr챕mit챕 distante. C'est la "
+"valeur par d챕faut si l'option de configuration `remote.<distant>.mirror` est "
+"d챕finie."
#. type: Plain text
#: en/git-push.txt:180
#, priority:220
msgid "Produce machine-readable output. The output status line for each ref will be tab-separated and sent to stdout instead of stderr. The full symbolic names of the refs will be given."
msgstr ""
+"Produire une sortie lisible par machine. La ligne d'챕tat de sortie pour "
+"chaque r챕f챕rence sera s챕par챕e par des tabulations et envoy챕e 횪 stdout au "
+"lieu de stderr. Les noms symboliques complets des r챕fs seront donn챕s."
#. type: Plain text
#: en/git-push.txt:185
#, priority:220
msgid "All listed refs are deleted from the remote repository. This is the same as prefixing all refs with a colon."
msgstr ""
+"Toutes les r챕f챕rences list챕es sont supprim챕es du d챕p척t distant. Cela revient "
+"횪 pr챕fixer toutes les r챕f챕rences par deux points."
#. type: Plain text
#: en/git-push.txt:190
#, priority:220
msgid "All refs under `refs/tags` are pushed, in addition to refspecs explicitly listed on the command line."
msgstr ""
+"Toutes les r챕f챕rences sous `refs/tags` sont pouss챕es, en plus des sp챕c-de-"
+"r챕fs explicitement list챕s sur la ligne de commande."
#. type: Labeled list
#: en/git-push.txt:191
@@ -37869,6 +37935,12 @@ msgstr "--follow-tags"
#, priority:220
msgid "Push all the refs that would be pushed without this option, and also push annotated tags in `refs/tags` that are missing from the remote but are pointing at commit-ish that are reachable from the refs being pushed. This can also be specified with configuration variable `push.followTags`. For more information, see `push.followTags` in linkgit:git-config[1]."
msgstr ""
+"Pousser tous les r챕fs qui seraient pouss챕es sans cette option, et pousser "
+"aussi les 챕tiquettes annot챕es dans `refs/tags` qui sont manquantes du "
+"distant mais qui pointent vers le commit-esque qui sont accessibles depuis "
+"les r챕fs pouss챕es. Cela peut 챕galement 챗tre sp챕cifi챕 avec la variable de "
+"configuration `push.followTags`. Pour plus d'informations, voir "
+"`push.followTags` dans linkgit:git-config[1]."
#. type: Labeled list
#: en/git-push.txt:199 en/git-send-pack.txt:73
@@ -37880,13 +37952,21 @@ msgstr "--[no-]signed"
#: en/git-push.txt:200 en/git-send-pack.txt:74
#, no-wrap, priority:220
msgid "--signed=(true|false|if-asked)"
-msgstr ""
+msgstr "--signed=(true|false|if-asked)"
#. type: Plain text
#: en/git-push.txt:209 en/git-send-pack.txt:83
#, priority:220
msgid "GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be logged. If `false` or `--no-signed`, no signing will be attempted. If `true` or `--signed`, the push will fail if the server does not support signed pushes. If set to `if-asked`, sign if and only if the server supports signed pushes. The push will also fail if the actual call to `gpg --sign` fails. See linkgit:git-receive-pack[1] for the details on the receiving end."
msgstr ""
+"Signer avec GPG la demande de pouss챕e pour mettre 횪 jour les r챕f챕rences du "
+"c척t챕 r챕ception, pour lui permettre d'챗tre v챕rifi챕 par les crochets et/ou "
+"d'챗tre enregistr챕e. Si `false` ou `--no-signed`, aucune signature ne sera "
+"tent챕e. Si `true` ou` --signed`, la pouss챕e 챕chouera si le serveur ne prend "
+"pas en charge les pouss챕es sign챕es. S'il est d챕fini sur `if-asked`, signer "
+"si et seulement si le serveur prend en charge les pouss챕es sign챕es. La "
+"pouss챕e 챕chouera 챕galement si l'appel r챕el 횪 `gpg --sign` 챕choue. Voir "
+"linkgit:git-receive-pack[1] pour les d챕tails sur l'extr챕mit챕 r챕ceptrice."
#. type: Labeled list
#: en/git-push.txt:210
@@ -56703,7 +56783,7 @@ msgstr ""
#: en/git-upload-archive.txt:24 en/transfer-data-leaks.txt:2
#, no-wrap, priority:220
msgid "SECURITY"
-msgstr ""
+msgstr "S횋CURIT횋"
#. type: Plain text
#: en/git-upload-archive.txt:32
@@ -60573,7 +60653,15 @@ msgstr "FORMATS AUTOMATIQUES"
#: en/pretty-formats.txt:13
#, priority:260
msgid "If the commit is a merge, and if the pretty-format is not 'oneline', 'email' or 'raw', an additional line is inserted before the 'Author:' line. This line begins with \"Merge: \" and the hashes of ancestral commits are printed, separated by spaces. Note that the listed commits may not necessarily be the list of the *direct* parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or file."
-msgstr "Si le commit est une fusion, et si la mise en forme n'est pas 'oneline', 'email' ou 'raw', une ligne suppl챕mentaire est ins챕r챕e avant la ligne 'Author:'. Cette ligne commence par \"Merge:\" et les empreintes des commits anc챗tres sont affich챕es, s챕par챕es par des espaces. Notez que les commits 챕num챕r챕s ne sont pas n챕cessairement la liste des commits parents *directs* si vous avez limit챕 votre vue de l'histoire : par exemple, si vous n'챗tes int챕ress챕 que par les modifications li챕es 횪 un certain r챕pertoire ou fichier."
+msgstr ""
+"Si le commit est une fusion, et si la mise en forme n'est pas 'oneline', "
+"'email' ou 'raw', une ligne suppl챕mentaire est ins챕r챕e avant la ligne "
+"'Author:'. Cette ligne commence par \"Merge:\" et les empreintes des "
+"commits anc챗tres sont affich챕es, s챕par챕es par des espaces. Notez que les "
+"commits 챕num챕r챕s ne sont pas n챕cessairement la liste des commits parents "
+"*directs* si vous avez limit챕 votre vue de l'historique : par exemple, si "
+"vous n'챗tes int챕ress챕 que par les modifications li챕es 횪 un certain "
+"r챕pertoire ou fichier."
#. type: Plain text
#: en/pretty-formats.txt:20
@@ -61977,12 +62065,16 @@ msgstr "V챕rifier la validit챕 d'un objet commit sign챕 en passant la signature
#, priority:220
msgid "The \"remote\" repository that is the source of a fetch or pull operation. This parameter can be either a URL (see the section <<URLS,GIT URLS>> below) or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
msgstr ""
+"Le d챕p척t \"distant\" qui est la source d'une op챕ration de r챕cup챕ration ou de "
+"tirage. Ce param챔tre peut 챗tre soit une URL (voir la section <<URLS, URLS "
+"GIT>> ci-dessous) soit le nom d'un remote (voir la section "
+"<<REMOTES,DISTANTS>> ci-dessous)."
#. type: Labeled list
#: en/pull-fetch-param.txt:8
#, no-wrap, priority:220
msgid "<group>"
-msgstr ""
+msgstr "<groupe>"
#. type: Plain text
#: en/pull-fetch-param.txt:12
@@ -62001,78 +62093,146 @@ msgstr "<sp챕cificateur-de-r챕f챕rence>"
#, priority:220
msgid "Specifies which refs to fetch and which local refs to update. When no <refspec>s appear on the command line, the refs to fetch are read from `remote.<repository>.fetch` variables instead"
msgstr ""
+"Pr챕ciser les r챕f챕rences 횪 r챕cup챕rer et les r챕f챕rences locales 횪 mettre 횪 "
+"jour. Lorsqu'aucun <sp챕c-de-r챕f> n'appara챤t sur la ligne de commande, les "
+"r챕f챕rences 횪 r챕cup챕rer sont lues 횪 partir des variables "
+"`remote.<d챕p척t>.fetch` 횪 la place"
#. type: Plain text
#: en/pull-fetch-param.txt:20
#, no-wrap, priority:220
msgid "\t(see <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> below).\n"
msgstr ""
+"\t(voir <<CRTB,BRANCHES DE SUIVI � DISTANCE CONFIGUR횋ES>> ci-dessous).\n"
#. type: Plain text
#: en/pull-fetch-param.txt:23
#, no-wrap, priority:220
msgid "\t(see linkgit:git-fetch[1]).\n"
-msgstr ""
+msgstr "\t(voir linkgit:git-fetch[1]).\n"
#. type: Plain text
#: en/pull-fetch-param.txt:31
#, priority:220
msgid "The format of a <refspec> parameter is an optional plus `+`, followed by the source <src>, followed by a colon `:`, followed by the destination ref <dst>. The colon can be omitted when <dst> is empty. <src> is typically a ref, but it can also be a fully spelled hex object name."
msgstr ""
+"Le format d'un param챔tre <sp챕c-de-r챕f> est un plus `+` optionnel, suivi de "
+"la source <src>, suivi de deux points `:`, suivi de la destination ref <dst>"
+". Les deux points peuvent 챗tre omis lorsque <dst> est vide. <src> est "
+"typiquement une r챕f, mais cela peut aussi 챗tre un nom d'objet hexad챕cimal "
+"entier."
#. type: Plain text
#: en/pull-fetch-param.txt:34
#, priority:220
msgid "`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests fetching everything up to the given tag."
msgstr ""
+"`tag <챕tiquette>` signifie la m챗me chose que `refs/tags/<tag>:refs/tags/"
+"<tag>` ; cela demande de tout r챕cup챕rer jusqu'횪 l'챕tiquette donn챕e."
#. type: Plain text
#: en/pull-fetch-param.txt:38
#, priority:220
msgid "The remote ref that matches <src> is fetched, and if <dst> is not an empty string, an attempt is made to update the local ref that matches it."
msgstr ""
+"La r챕f챕rence distante qui correspond 횪 <src> est r챕cup챕r챕e, et si <dst> "
+"n'est pas une cha챤ne vide, une tentative est faite pour mettre 횪 jour la "
+"r챕f챕rence locale qui lui correspond."
#. type: Plain text
#: en/pull-fetch-param.txt:45
#, ignore-ellipsis, priority:220
msgid "Whether that update is allowed without `--force` depends on the ref namespace it's being fetched to, the type of object being fetched, and whether the update is considered to be a fast-forward. Generally, the same rules apply for fetching as when pushing, see the `<refspec>...` section of linkgit:git-push[1] for what those are. Exceptions to those rules particular to 'git fetch' are noted below."
msgstr ""
+"Le fait que cette mise 횪 jour soit autoris챕e sans `---force` d챕pend de "
+"l'espace de noms de r챕f챕rence vers lequel elle est r챕cup챕r챕e, du type "
+"d'objet r챕cup챕r챕, et si la mise 횪 jour est consid챕r챕e comme une avance "
+"rapide. G챕n챕ralement, les m챗mes r챔gles s'appliquent pour la r챕cup챕ration que "
+"pour la pouss챕e, voir la section `<sp챕c-de-r챕f>...` de linkgit:git-push[1] "
+"pour les conna챤tre. Les exceptions 횪 ces r챔gles particuli챔res 횪 'git fetch' "
+"sont not챕es ci-dessous."
#. type: Plain text
#: en/pull-fetch-param.txt:53
#, priority:220
msgid "Until Git version 2.20, and unlike when pushing with linkgit:git-push[1], any updates to `refs/tags/*` would be accepted without `+` in the refspec (or `--force`). When fetching, we promiscuously considered all tag updates from a remote to be forced fetches. Since Git version 2.20, fetching to update `refs/tags/*` works the same way as when pushing. I.e. any updates will be rejected without `+` in the refspec (or `--force`)."
msgstr ""
+"Jusqu'횪 la version 2.20 de Git, et contrairement 횪 ce qui se passe avec "
+"linkgit:git-push[1], toute mise 횪 jour de `refs/tags/*` serait accept챕e sans "
+"`+` dans la sp챕c-de-r챕f (ou `--force`). Lors de la r챕cup챕ration, nous "
+"consid챕rons sans distinction toutes les mises 횪 jour d'챕tiquettes depuis un "
+"d챕p척t distance comme des r챕cup챕rations forc챕es. Depuis la version 2.20 de "
+"Git, la r챕cup챕ration pour mettre 횪 jour les `refs/tags/*` fonctionne de la "
+"m챗me mani챔re que lors de la pouss챕e. C'est-횪-dire que toute mise 횪 jour sera "
+"rejet챕e sans \"+\" dans le sp챕cificateur de r챕f챕rence (ou `--force`)."
#. type: Plain text
#: en/pull-fetch-param.txt:59
#, priority:220
msgid "Unlike when pushing with linkgit:git-push[1], any updates outside of `refs/{tags,heads}/*` will be accepted without `+` in the refspec (or `--force`), whether that's swapping e.g. a tree object for a blob, or a commit for another commit that's doesn't have the previous commit as an ancestor etc."
msgstr ""
+"Contrairement 횪 une pouss챕e avec linkgit:git-push[1], toute mise 횪 jour en "
+"dehors de `refs/{tags,heads}/*` sera accept챕e sans `+` dans le sp챕c-de-r챕f ("
+"ou `--force`), que ce soit en 챕changeant par exemple un objet arbre pour un "
+"blob, ou un commit pour un autre commit qui n'a pas le commit pr챕c챕dent "
+"comme anc챗tre etc."
#. type: Plain text
#: en/pull-fetch-param.txt:63
#, priority:220
msgid "Unlike when pushing with linkgit:git-push[1], there is no configuration which'll amend these rules, and nothing like a `pre-fetch` hook analogous to the `pre-receive` hook."
msgstr ""
+"Contrairement 횪 une pouss챕e avec linkgit:git-push[1], il n'y a pas de "
+"configuration qui modifie ces r챔gles, et rien de tel qu'un crochet pr챕-"
+"r챕cup챕ration `pre-fetch` analogue 횪 celui de pr챕-r챕ception`pre-receive`."
#. type: Plain text
#: en/pull-fetch-param.txt:70
#, priority:220
msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an the optional leading `+` to a refspec (or using `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
msgstr ""
+"Comme pour la pouss챕e avec linkgit:git-push[1], toutes les r챔gles d챕crites "
+"ci-dessus concernant ce qui n'est pas autoris챕 comme une mise 횪 jour, "
+"peuvent 챗tre annul챕es en ajoutant un \"+\" optionnel 횪 un sp챕cificateur de "
+"r챕f챕rence (ou en utilisant l'option de ligne de commande `--force`). La "
+"seule exception 횪 cette r챔gle est qu'aucun for챌age ne fera accepter 횪 "
+"l'espace de noms `refs/heads/*` un objet non commit."
#. type: Plain text
#: en/pull-fetch-param.txt:82
#, priority:220
msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched). You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches. There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
msgstr ""
+"Lorsque la branche distante que vous voulez r챕cup챕rer est connue pour 챗tre "
+"r챕guli챔rement rembobin챕e et rebas챕e, on s'attend 횪 ce que son nouveau sommet "
+"ne soit pas un descendant de son sommet pr챕c챕dent (telle qu'il 챕tait stock챕 "
+"dans votre branche de suivi 횪 distance la derni챔re fois que vous l'avez "
+"r챕cup챕r챕). Vous pouvez utiliser le signe \"+\" pour indiquer que des mises "
+"횪 jour non en avance rapide seront n챕cessaires pour ces branches. Il n'y a "
+"aucun moyen de d챕terminer ou de d챕clarer qu'une branche sera rendue "
+"disponible dans un d챕p척t avec ce comportement ; l'utilisateur qui tire doit "
+"simplement savoir que c'est le mod챔le d'utilisation attendu pour une branche."
#. type: Plain text
#: en/pull-fetch-param.txt:102
#, priority:220
msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters. <refspec>s listed explicitly on the command line are always merged into the current branch after fetching. In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge. On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch. This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
msgstr ""
+"Il y a une diff챕rence entre le fait de lister plusieurs <sp챕c-de-r챕f> "
+"directement sur la ligne de commande 'git pull' et le fait d'avoir plusieurs "
+"entr챕es `remote.<d챕p척t>.fetch` dans votre configuration pour un <d챕p척t> et "
+"d'ex챕cuter une commande 'git pull' sans aucun param챔tre <sp챕c-de-r챕f> "
+"explicite. Les <sp챕c-de-r챕f>s list챕s explicitement sur la ligne de commande "
+"sont toujours fusionn챕s dans la branche actuelle apr챔s avoir 챕t챕 "
+"r챕cup챕r챕es. En d'autres termes, si vous listez plus d'une r챕f챕rence "
+"distante, 'git pull' cr챕era une fusion Octopus. D'un autre c척t챕, si vous "
+"n'indiquez aucun param챔tre <sp챕c-de-r챕f> explicite sur la ligne de commande, "
+"'git pull' r챕cup챕rera tous les <sp챕c-de-r챕f>s qu'il trouve dans la "
+"configuration `remote.<d챕p척t>.fetch` et fusionnera seulement le premier <r챕f-"
+"de-sp챕c> trouv챕 dans la branche actuelle. C'est parce que faire un Octopus "
+"횪 partir de r챕f챕rences distantes est rarement fait, alors que garder la "
+"trace de plusieurs t챗tes distantes en un seul coup en en r챕cup챕rant "
+"plusieurs est souvent utile."
#. type: Title -
#: en/revisions.txt:2
@@ -63159,7 +63319,11 @@ msgstr "--cherry"
#: en/rev-list-options.txt:263
#, ignore-ellipsis, priority:260
msgid "A synonym for `--right-only --cherry-mark --no-merges`; useful to limit the output to the commits on our side and mark those that have been applied to the other side of a forked history with `git log --cherry upstream...mybranch`, similar to `git cherry upstream mybranch`."
-msgstr "Un synonyme pour `--right-only --cherry-mark --no-merges` ; utile pour limiter la sortie aux commits de notre c척t챕 et marquer ceux qui ont 챕t챕 appliqu챕s de l'autre c척t챕 d'une histoire en fourche avec `git log --cherry amont...mabranche', similaire 횪 `git cherry upstream mabranche`."
+msgstr ""
+"Un synonyme pour `--right-only --cherry-mark --no-merges` ; utile pour "
+"limiter la sortie aux commits de notre c척t챕 et marquer ceux qui ont 챕t챕 "
+"appliqu챕s de l'autre c척t챕 d'un historique en fourche avec `git log --cherry "
+"amont...mabranche', similaire 횪 `git cherry upstream mabranche`."
#. type: Labeled list
#: en/rev-list-options.txt:265
@@ -63267,7 +63431,12 @@ msgstr "Simplification de l'historique"
#: en/rev-list-options.txt:326
#, priority:260
msgid "Sometimes you are only interested in parts of the history, for example the commits modifying a particular <path>. But there are two parts of 'History Simplification', one part is selecting the commits and the other is how to do it, as there are various strategies to simplify the history."
-msgstr "Parfois vous n'챗tes int챕ress챕 que par certaines parties de l'historique, par exemple les commits qui modifient un <chemin> particulier. Mais il y a deux parties dans la 'Simplification de l'historique', une partie est la s챕lection des commits et l'autre la mani챔re de le faire, car il existe diff챕rentes strat챕gies pour simplifier l'histoire."
+msgstr ""
+"Parfois vous n'챗tes int챕ress챕 que par certaines parties de l'historique, par "
+"exemple les commits qui modifient un <chemin> particulier. Mais il y a deux "
+"parties dans la 'Simplification de l'historique', une partie est la "
+"s챕lection des commits et l'autre la mani챔re de le faire, car il existe "
+"diff챕rentes strat챕gies pour simplifier l'historique."
#. type: Plain text
#: en/rev-list-options.txt:328
@@ -63415,7 +63584,9 @@ msgstr ""
#: en/rev-list-options.txt:385
#, priority:260
msgid "The horizontal line of history A---Q is taken to be the first parent of each merge. The commits are:"
-msgstr "La ligne horizontale de l'histoire A---Q est prise pour 챗tre le premier parent de chaque fusion. Les commits sont :"
+msgstr ""
+"La ligne horizontale de l'historique A---Q est prise pour 챗tre le premier "
+"parent de chaque fusion. Les commits sont :"
#. type: Plain text
#: en/rev-list-options.txt:389
@@ -64460,72 +64631,110 @@ msgstr ""
#, priority:220
msgid "The fetch and push protocols are not designed to prevent one side from stealing data from the other repository that was not intended to be shared. If you have private data that you need to protect from a malicious peer, your best option is to store it in another repository. This applies to both clients and servers. In particular, namespaces on a server are not effective for read access control; you should only grant read access to a namespace to clients that you would trust with read access to the entire repository."
msgstr ""
+"Les protocoles \"fetch\" et \"push\" ne sont pas con챌us pour emp챗cher un "
+"tiers de voler des donn챕es de l'autre d챕p척t qui n'챕taient pas destin챕es 횪 "
+"챗tre partag챕es. Si vous avez des donn챕es priv챕es que vous devez prot챕ger "
+"contre un tiers malveillant, la meilleure solution est de les stocker dans "
+"un autre d챕p척t. Cela s'applique aussi bien aux clients qu'aux serveurs. En "
+"particulier, les espaces de noms sur un serveur ne sont pas efficaces pour "
+"le contr척le de l'acc챔s en lecture ; vous ne devez accorder l'acc챔s en "
+"lecture 횪 un espace de noms qu'aux clients auxquels vous feriez confiance "
+"pour l'acc챔s en lecture 횪 l'ensemble du d챕p척t."
#. type: Plain text
#: en/transfer-data-leaks.txt:13
#, priority:220
msgid "The known attack vectors are as follows:"
-msgstr ""
+msgstr "Les vecteurs d'attaque connus sont les suivants :"
#. type: Plain text
#: en/transfer-data-leaks.txt:26
#, priority:220
msgid "The victim sends \"have\" lines advertising the IDs of objects it has that are not explicitly intended to be shared but can be used to optimize the transfer if the peer also has them. The attacker chooses an object ID X to steal and sends a ref to X, but isn't required to send the content of X because the victim already has it. Now the victim believes that the attacker has X, and it sends the content of X back to the attacker later. (This attack is most straightforward for a client to perform on a server, by creating a ref to X in the namespace the client has access to and then fetching it. The most likely way for a server to perform it on a client is to \"merge\" X into a public branch and hope that the user does additional work on this branch and pushes it back to the server without noticing the merge.)"
msgstr ""
+"La victime envoie des lignes \"have\" annon챌ant les identifiants des objets "
+"qu'elle poss챔de et qui ne sont pas explicitement destin챕s 횪 챗tre partag챕s, "
+"mais qui peuvent 챗tre utilis챕s pour optimiser le transfert si le pair les "
+"poss챔de 챕galement. L'attaquant choisit un ID d'objet X 횪 voler et envoie une "
+"r챕f챕rence 횪 X, mais n'est pas oblig챕 d'envoyer le contenu de X parce que la "
+"victime l'a d챕j횪. La victime croit maintenant que l'attaquant a X, et elle "
+"lui renvoie le contenu de X plus tard. (Cette attaque est la plus simple 횪 "
+"r챕aliser pour un client sur un serveur, en cr챕ant une r챕f챕rence 횪 X dans "
+"l'espace de noms auquel le client a acc챔s et en la r챕cup챕rant ensuite. La "
+"fa챌on la plus probable pour un serveur de l'ex챕cuter sur un client est de \""
+"fusionner\" X dans une branche publique et d'esp챕rer que l'utilisateur fasse "
+"un travail suppl챕mentaire sur cette branche et la repousse vers le serveur "
+"sans remarquer la fusion)."
#. type: Plain text
#: en/transfer-data-leaks.txt:30
#, priority:220
msgid "As in #1, the attacker chooses an object ID X to steal. The victim sends an object Y that the attacker already has, and the attacker falsely claims to have X and not Y, so the victim sends Y as a delta against X. The delta reveals regions of X that are similar to Y to the attacker."
msgstr ""
+"Comme en n째1, l'attaquant choisit un objet ID X 횪 voler. La victime envoie "
+"un objet Y que l'attaquant poss챔de d챕j횪, et l'attaquant pr챕tend faussement "
+"avoir X et non Y, de sorte que la victime envoie Y comme delta contre X. Le "
+"delta r챕v챔le 횪 l'attaquant des r챕gions de X qui sont similaires 횪 Y."
#. type: Title -
#: en/urls-remotes.txt:4
#, no-wrap, priority:220
msgid "REMOTES[[REMOTES]]"
-msgstr ""
+msgstr "DISTANTS[[REMOTES]]"
#. type: Plain text
#: en/urls-remotes.txt:8
#, priority:220
msgid "The name of one of the following can be used instead of a URL as `<repository>` argument:"
msgstr ""
+"Le nom de l'un des 챕l챕ments suivants peut 챗tre utilis챕 횪 la place d'une URL "
+"en tant qu'argument `<d챕p척t>` :"
#. type: Plain text
#: en/urls-remotes.txt:10
#, priority:220
msgid "a remote in the Git configuration file: `$GIT_DIR/config`,"
-msgstr ""
+msgstr "un distant dans le fichier de configuration Git : `$GIT_DIR/config`,"
#. type: Plain text
#: en/urls-remotes.txt:11
#, priority:220
msgid "a file in the `$GIT_DIR/remotes` directory, or"
-msgstr ""
+msgstr "un fichier dans le r챕pertoire `$GIT_DIR/remotes`, ou"
#. type: Plain text
#: en/urls-remotes.txt:12
#, priority:220
msgid "a file in the `$GIT_DIR/branches` directory."
-msgstr ""
+msgstr "un fichier dans le r챕pertoire `$GIT_DIR/branches`."
#. type: Plain text
#: en/urls-remotes.txt:15
#, priority:220
msgid "All of these also allow you to omit the refspec from the command line because they each contain a refspec which git will use by default."
msgstr ""
+"Toutes ces options vous permettent 챕galement d'omettre le sp챕cificateur de "
+"r챕f챕rence de la ligne de commande car elles contiennent chacune un "
+"sp챕cificateur de r챕f챕rence que git utilisera par d챕faut."
#. type: Title ~
#: en/urls-remotes.txt:17
#, no-wrap, priority:220
msgid "Named remote in configuration file"
-msgstr ""
+msgstr "distant nomm챕 dans le fichier de configuration"
#. type: Plain text
#: en/urls-remotes.txt:26
#, priority:220
msgid "You can choose to provide the name of a remote which you had previously configured using linkgit:git-remote[1], linkgit:git-config[1] or even by a manual edit to the `$GIT_DIR/config` file. The URL of this remote will be used to access the repository. The refspec of this remote will be used by default when you do not provide a refspec on the command line. The entry in the config file would appear like this:"
msgstr ""
+"Vous pouvez choisir de fournir le nom d'un distant que vous aviez "
+"pr챕c챕demment configur챕 en utilisant linkgit:git-remote[1], linkgit:git-"
+"config[1] ou m챗me par une modification manuelle du fichier `$GIT_DIR/config`"
+". L'URL de ce distant sera utilis챕e pour acc챕der au d챕p척t. Le "
+"sp챕cificateur de r챕f챕rence de ce distant sera utilis챕 par d챕faut lorsque "
+"vous ne fournissez pas de sp챕cificateur de r챕f챕rence sur la ligne de "
+"commande. L'entr챕e dans le fichier de configuration appara챤tra comme ceci :"
#. type: delimited block -
#: en/urls-remotes.txt:33
@@ -64537,24 +64746,36 @@ msgid ""
"\t\tpush = <refspec>\n"
"\t\tfetch = <refspec>\n"
msgstr ""
+"\t[remote \"<nom>\"]\n"
+"\t\turl = <url>\n"
+"\t\tpushurl = <url-pouss챕e>\n"
+"\t\tpush = <sp챕c-de-r챕f>\n"
+"\t\tfetch = <sp챕c-de-r챕f>\n"
#. type: Plain text
#: en/urls-remotes.txt:37
#, priority:220
msgid "The `<pushurl>` is used for pushes only. It is optional and defaults to `<url>`."
msgstr ""
+"Le `<url-pouss챕e>` n'est utilis챕 que pour les pouss챕es. Il est facultatif et "
+"sa valeur par d챕faut est `<url>`."
#. type: Title ~
#: en/urls-remotes.txt:39
#, no-wrap, priority:220
msgid "Named file in `$GIT_DIR/remotes`"
-msgstr ""
+msgstr "Fichier nomm챕 dans `$GIT_DIR/remotes`"
#. type: Plain text
#: en/urls-remotes.txt:47
#, priority:220
msgid "You can choose to provide the name of a file in `$GIT_DIR/remotes`. The URL in this file will be used to access the repository. The refspec in this file will be used as default when you do not provide a refspec on the command line. This file should have the following format:"
msgstr ""
+"Vous pouvez choisir de fournir le nom d'un fichier dans `$GIT_DIR/remotes`. "
+"L'URL dans ce fichier sera utilis챕e pour acc챕der au d챕p척t. Le sp챕cificateur "
+"de r챕f챕rence dans ce fichier sera utilis챕 par d챕faut lorsque vous ne "
+"fournissez pas de sp챕cificateur de r챕f챕rence sur la ligne de commande. Ce "
+"fichier doit avoir le format suivant :"
#. type: delimited block -
#: en/urls-remotes.txt:52
@@ -64564,66 +64785,80 @@ msgid ""
"\tPush: <refspec>\n"
"\tPull: <refspec>\n"
msgstr ""
+"\tURL: un des format d'URL ci-dessus\n"
+"\tPush: <sp챕c-de-r챕f>\n"
+"\tPull: <sp챕c-de-r챕f>\n"
#. type: Plain text
#: en/urls-remotes.txt:59
#, priority:220
msgid "`Push:` lines are used by 'git push' and `Pull:` lines are used by 'git pull' and 'git fetch'. Multiple `Push:` and `Pull:` lines may be specified for additional branch mappings."
msgstr ""
+"Les lignes `Push:`\" sont utilis챕es par 'git push' et les lignes `Pull:` "
+"sont utilis챕es par 'git pull' et 'git fetch'. Des lignes `Push:` et `Pull:` "
+"multiples peuvent 챗tre sp챕cifi챕es pour des mappages suppl챕mentaires de "
+"branches."
#. type: Title ~
#: en/urls-remotes.txt:61
#, no-wrap, priority:220
msgid "Named file in `$GIT_DIR/branches`"
-msgstr ""
+msgstr "Fichier nomm챕 dans `$GIT-DIR/branches`"
#. type: Plain text
#: en/urls-remotes.txt:67
#, priority:220
msgid "You can choose to provide the name of a file in `$GIT_DIR/branches`. The URL in this file will be used to access the repository. This file should have the following format:"
msgstr ""
+"Vous pouvez choisir de fournir le nom d'un fichier dans `$GIT_DIR/branches`"
+". L'URL de ce fichier sera utilis챕e pour acc챕der au d챕p척t. Ce fichier doit "
+"avoir le format suivant :"
#. type: delimited block -
#: en/urls-remotes.txt:71
#, no-wrap, priority:220
msgid "\t<url>#<head>\n"
-msgstr ""
+msgstr "\t<url>#<t챗te>\n"
#. type: Plain text
#: en/urls-remotes.txt:74
#, priority:220
msgid "`<url>` is required; `#<head>` is optional."
-msgstr ""
+msgstr "`<url>` est obligatoire ; `#<t챗te>` est facultatif."
#. type: Plain text
#: en/urls-remotes.txt:79
#, priority:220
msgid "Depending on the operation, git will use one of the following refspecs, if you don't provide one on the command line. `<branch>` is the name of this file in `$GIT_DIR/branches` and `<head>` defaults to `master`."
msgstr ""
+"En fonction de l'op챕ration, git utilisera l'un des sp챕cificateurs de "
+"r챕f챕rence suivants, si vous n'en fournissez pas un en ligne de commande. "
+"`<branche>` est le nom de ce fichier dans `$GIT_DIR/branches` et `<t챗te>` "
+"vaut par d챕faut `master`."
#. type: Plain text
#: en/urls-remotes.txt:81
#, priority:220
msgid "git fetch uses:"
-msgstr ""
+msgstr "git fetch utilise :"
#. type: delimited block -
#: en/urls-remotes.txt:84
#, no-wrap, priority:220
msgid "\trefs/heads/<head>:refs/heads/<branch>\n"
-msgstr ""
+msgstr "\trefs/heads/<t챗te>:refs/heads/<branche>\n"
#. type: Plain text
#: en/urls-remotes.txt:87
#, priority:220
msgid "git push uses:"
-msgstr ""
+msgstr "git push utilise :"
#. type: delimited block -
#: en/urls-remotes.txt:90
#, no-wrap, priority:220
msgid "\tHEAD:refs/heads/<head>\n"
-msgstr ""
+msgstr "\tHEAD:refs/heads/<t챗te>\n"
#. type: Title -
#: en/urls.txt:2
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 540dadf3164b2eda9b762f4fa1b840100be590b3..12012df8bda2537c94a37c27df7dd062ece75407 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
"POT-Creation-Date: 2020-04-04 19:51+0200\n"
-"PO-Revision-Date: 2020-04-25 12:25+0000\n"
+"PO-Revision-Date: 2020-04-28 14:59+0000\n"
"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
"Language-Team: none\n"
"Language: pt_BR\n"
@@ -14,7 +14,7 @@ msgstr ""
"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.0.2-dev\n"
+"X-Generator: Weblate 4.0.2\n"
#. type: Labeled list
#: en/blame-options.txt:1 en/diff-options.txt:666 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
@@ -117,7 +117,7 @@ msgstr ""
#: en/blame-options.txt:31
#, no-wrap, priority:100
msgid "--reverse <rev>..<rev>"
-msgstr "--reverso <rev>..<rev>"
+msgstr "--reverse <rev>..<rev>"
#. type: Plain text
#: en/blame-options.txt:38
@@ -2246,17 +2246,25 @@ msgstr "`onbranch`"
#. type: Plain text
#: en/config.txt:154
-#, fuzzy, priority:100
-#| msgid "The pattern can contain standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. Please refer to linkgit:gitignore[5] for details. For convenience:"
+#, priority:100
msgid "The data that follows the keyword `onbranch:` is taken to be a pattern with standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. If we are in a worktree where the name of the branch that is currently checked out matches the pattern, the include condition is met."
-msgstr "O padr찾o pode conter wildcads globbing padr찾o e dois adicionais, `**/` e `/**`, que podem casar m첬ltplos components de caminho. Por favor procure por linkgit:gitignore[5] para detalhes. Para conveni챗ncia:"
+msgstr ""
+"Os dados que seguem a palavra chave `onbranch:` s찾o considerados um padr찾o "
+"com curingas predefinidos e dois adicionais, `**/` e `/**`, que podem "
+"coincidir com v찼rios componentes do caminho. Caso estejamos em uma 찼rvore de "
+"trabalho onde o nome do ramo que est찼 atualmente sendo verificado "
+"corresponder ao padr찾o, a condi챌찾o de inclus찾o 챕 atendida."
#. type: Plain text
#: en/config.txt:160
-#, fuzzy, priority:100
-#| msgid "If the pattern ends with `/`, `**` will be automatically added. For example, the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and everything inside, recursively."
+#, priority:100
msgid "If the pattern ends with `/`, `**` will be automatically added. For example, the pattern `foo/` becomes `foo/**`. In other words, it matches all branches that begin with `foo/`. This is useful if your branches are organized hierarchically and you would like to apply a configuration to all the branches in that hierarchy."
-msgstr "Se o padr찾o termina com `/`, `**` ser찼 automaticamente adicionado. Por exemplo, o padr찾o `foo/` se torna`foo/**`. Em outras palavras, ele casa \"foo\" e tudo o que estiver dentro, recursivamente."
+msgstr ""
+"Se o padr찾o termina com `/`, `**` ser찼 automaticamente adicionado. Por "
+"exemplo, o padr찾o `foo/` se torna`foo/**`. Em outras palavras, ele coincide "
+"todos os ramos que comecem com `foo/`. 횋 첬til quando as suas ramifica챌천es "
+"s찾o organizadas hierarquicamente e voc챗 precisa aplicar a configura챌찾o em "
+"todas as ramifica챌천es desta hierarquia."
#. type: Plain text
#: en/config.txt:162
@@ -2877,7 +2885,9 @@ msgstr "Formato de sa챠da bruta"
#: en/diff-format.txt:6
#, priority:280
msgid "The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-diff-files\" and \"git diff --raw\" are very similar."
-msgstr "O formato de sa챠da bruta de \"git-diff-index\", \"git-diff-tree\", \"git-diff-files\" e \"git diff --raw\" s찾o muito semelhantes."
+msgstr ""
+"O formato de sa챠da bruta de `git-diff-index`, `git-diff-tree`, `git-diff-"
+"files` e `git diff --raw` s찾o muito semelhantes."
#. type: Plain text
#: en/diff-format.txt:9
@@ -2889,7 +2899,7 @@ msgstr "Todos esses comandos comparam dois conjuntos de coisas; o que 챕 compara
#: en/diff-format.txt:10
#, no-wrap, priority:280
msgid "git-diff-index <tree-ish>"
-msgstr "git-diff-챠ndice <tree-ish>"
+msgstr "git-diff-index <tree-ish>"
#. type: Plain text
#: en/diff-format.txt:12
@@ -2901,7 +2911,7 @@ msgstr "compara o <tree-ish> e os arquivos no sistema de arquivos."
#: en/diff-format.txt:13
#, no-wrap, priority:280
msgid "git-diff-index --cached <tree-ish>"
-msgstr "git-diff-챠ndice --em cache <tree-ish>"
+msgstr "git-diff-index --cached <tree-ish>"
#. type: Plain text
#: en/diff-format.txt:15
@@ -2913,7 +2923,7 @@ msgstr "compara o <tree-ish> e o 챠ndice."
#: en/diff-format.txt:16
#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]"
-msgstr "git-diff-찼rvore [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]"
+msgstr "git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]"
#. type: Plain text
#: en/diff-format.txt:18
@@ -2925,7 +2935,7 @@ msgstr "compara as 찼rvores nomeadas pelos dois argumentos."
#: en/diff-format.txt:19
#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-files [<pattern>...]"
-msgstr "git-diff-arquivos [<pattern>...]"
+msgstr "git-diff-files [<pattern>...]"
#. type: Plain text
#: en/diff-format.txt:21
@@ -3179,7 +3189,7 @@ msgstr ""
#: en/diff-format.txt:106
#, priority:280
msgid "Examples for `-c` and `--cc` without `--combined-all-paths`:"
-msgstr ""
+msgstr "Exemplos para `-c` e `--cc` sem `--combined-all-paths`:"
#. type: delimited block -
#: en/diff-format.txt:110
@@ -3195,6 +3205,8 @@ msgstr ""
#, priority:280
msgid "Examples when `--combined-all-paths` added to either `-c` or `--cc`:"
msgstr ""
+"Exemplos quando `--combined-all-paths` for adicionado para ambos os `-c` ou "
+"`--cc`:"
#. type: delimited block -
#: en/diff-format.txt:118
@@ -3233,7 +3245,7 @@ msgstr "Ao mostrar uma mudan챌a que envolve renomear ou copiar, a sa챠da `--stat
#: en/diff-format.txt:142
#, no-wrap, priority:280
msgid "arch/{i386 => x86}/Makefile | 4 +--\n"
-msgstr "arch/{i386 => x86}/Fazer-arquivo | 4 +--\n"
+msgstr "arch/{i386 => x86}/Makefile| 4 +--\n"
#. type: Plain text
#: en/diff-format.txt:147
@@ -3575,7 +3587,7 @@ msgstr ""
#: en/diff-generate-patch.txt:123
#, no-wrap, priority:260
msgid "diff --combined file\n"
-msgstr "diff --arquivo combinado\n"
+msgstr "diff --combined arquivo\n"
#. type: Plain text
#: en/diff-generate-patch.txt:125
@@ -3732,7 +3744,7 @@ msgstr "Gerar patch (consulte a se챌찾o sobre a gera챌찾o de patches)."
#: en/diff-options.txt:28 en/diff-options.txt:60
#, no-wrap, priority:280
msgid "\tThis is the default.\n"
-msgstr "\tEste 챕 o padr찾o.\n"
+msgstr "\tEssa 챕 a predefini챌찾o.\n"
#. type: Labeled list
#: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:75 en/git-cat-file.txt:40 en/git-cherry-pick.txt:105 en/git-clone.txt:66 en/git-commit.txt:166 en/git-diff-tree.txt:72 en/git-format-patch.txt:119 en/git-ls-files.txt:59 en/git-revert.txt:97 en/git-shortlog.txt:34 en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38 en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31
@@ -3794,19 +3806,19 @@ msgstr "Escreva o arquivo para <arquivo> em vez de stdout."
#: en/diff-options.txt:47
#, no-wrap, priority:280
msgid "--output-indicator-new=<char>"
-msgstr ""
+msgstr "--output-indicator-new=<char>"
#. type: Labeled list
#: en/diff-options.txt:48
#, no-wrap, priority:280
msgid "--output-indicator-old=<char>"
-msgstr ""
+msgstr "--output-indicator-old=<char>"
#. type: Labeled list
#: en/diff-options.txt:49
#, no-wrap, priority:280
msgid "--output-indicator-context=<char>"
-msgstr ""
+msgstr "--output-indicator-context=<char>"
#. type: Plain text
#: en/diff-options.txt:53
@@ -3942,7 +3954,7 @@ msgstr "Se existir uma linha na origem e no destino, existir apenas uma vez e co
#: en/diff-options.txt:103
#, no-wrap, priority:280
msgid "--diff-algorithm={patience|minimal|histogram|myers}"
-msgstr "--diff-algoritmo={paci챗ncia|m챠nima|histograma|myers}"
+msgstr "--diff-algorithm={patience|minimal|histogram|myers}"
#. type: Plain text
#: en/diff-options.txt:105
@@ -4146,7 +4158,7 @@ msgstr "--cumulative"
#: en/diff-options.txt:208
#, priority:280
msgid "Synonym for --dirstat=cumulative"
-msgstr "Sin척nimo para --dirstat=cumulative"
+msgstr "횋 um sin척nimo para `--dirstat=cumulative`"
#. type: Labeled list
#: en/diff-options.txt:209
@@ -4158,7 +4170,7 @@ msgstr "--dirstat-by-file[=<param1,param2>...]"
#: en/diff-options.txt:211
#, ignore-ellipsis, priority:280
msgid "Synonym for --dirstat=files,param1,param2..."
-msgstr "Sin척nimo para --dirstat=files,param1,param2..."
+msgstr "횋 um sin척nimo para `--dirstat=files,param1,param2...`"
#. type: Labeled list
#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
@@ -4182,7 +4194,7 @@ msgstr "--patch-with-stat"
#: en/diff-options.txt:219
#, priority:280
msgid "Synonym for `-p --stat`."
-msgstr "Sin척nimo para `-p --stat`."
+msgstr "횋 um sin척nimo para `-p --stat`."
#. type: Labeled list
#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
@@ -4200,7 +4212,9 @@ msgstr "\tSepare os commits com NULs em vez de com novas newlines.\n"
#: en/diff-options.txt:229
#, priority:280
msgid "Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators."
-msgstr "Al챕m disso, quando `--raw` ou` --numstat` for fornecido, n찾o munge nomes de caminho e use NULs como terminadores de campos de sa챠da."
+msgstr ""
+"Al챕m disso, quando `--raw` ou `--numstat` for informado, n찾o \"munge "
+"pathnames\" e utilize NULs como terminadores dos campos de sa챠da."
#. type: Plain text
#: en/diff-options.txt:233
@@ -4264,7 +4278,10 @@ msgstr "--color [= <quando>]"
#: en/diff-options.txt:262
#, priority:280
msgid "Show colored diff. `--color` (i.e. without '=<when>') is the same as `--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
-msgstr "Mostrar colorido diff. `--color` (isto 챕, sem '=<when>') 챕 o mesmo que `--color=always`. '<when>' pode ser um de `always`, `never`, ou `auto`."
+msgstr ""
+"Exibe um diff colorido. `--color` (isto 챕, sem '=<when>') 챕 o mesmo que "
+"`--color=always`. `<when>` um dos seus valores podem ser `always`, `never`, "
+"ou `auto`."
#. type: Plain text
#: en/diff-options.txt:265
@@ -4304,7 +4321,7 @@ msgstr "\t횋 o mesmo que `--color=never`.\n"
#: en/diff-options.txt:274
#, no-wrap, priority:280
msgid "--color-moved[=<mode>]"
-msgstr "--color-movido[=<mode>]"
+msgstr "--color-moved[=<modo>]"
#. type: Plain text
#: en/diff-options.txt:276
@@ -4412,13 +4429,15 @@ msgstr "--no-color-moved"
#: en/diff-options.txt:316
#, priority:280
msgid "Turn off move detection. This can be used to override configuration settings. It is the same as `--color-moved=no`."
-msgstr "Desativar a detec챌찾o de movimento Isso pode ser usado para substituir as configura챌천es. 횋 o mesmo que `--color-moved = no`."
+msgstr ""
+"Desativar a detec챌찾o de movimento Isso pode ser usado para substituir as "
+"configura챌천es. 횋 o mesmo que `--color-moved=no`."
#. type: Labeled list
#: en/diff-options.txt:317
#, no-wrap, priority:280
msgid "--color-moved-ws=<modes>"
-msgstr "--color-movido-ws=<modes>"
+msgstr "--color-moved-ws=<modos>"
#. type: Plain text
#: en/diff-options.txt:320
@@ -4508,7 +4527,7 @@ msgstr "N찾o ignore espa챌os em branco ao realizar a detec챌찾o de movimento. Is
#: en/diff-options.txt:349
#, no-wrap, priority:280
msgid "--word-diff[=<mode>]"
-msgstr "--palavra-diff[=<mode>]"
+msgstr "--word-diff[=<modo>]"
#. type: Plain text
#: en/diff-options.txt:354
@@ -4562,7 +4581,7 @@ msgstr "Observe que, apesar do nome do primeiro modo, a cor 챕 usada para real챌
#: en/diff-options.txt:376
#, no-wrap, priority:280
msgid "--word-diff-regex=<regex>"
-msgstr "--palavra-diff-regex=<regex>"
+msgstr "--word-diff-regex=<regex>"
#. type: Plain text
#: en/diff-options.txt:380
@@ -4592,13 +4611,15 @@ msgstr "O regex tamb챕m pode ser configurado atrav챕s de um driver diff ou op챌
#: en/diff-options.txt:397
#, no-wrap, priority:280
msgid "--color-words[=<regex>]"
-msgstr "--cor-palavras[=<regex>]"
+msgstr "--color-words[=<regex>]"
#. type: Plain text
#: en/diff-options.txt:400
#, priority:280
msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=<regex>`."
-msgstr "Equivalente a `--word-diff = color` plus (se um regex foi especificado)` --word-diff-regex = <regex> `."
+msgstr ""
+"Equivalente a `--word-diff = color` plus (se um regex foi especificado) "
+"`--word-diff-regex=<regex>`."
#. type: Labeled list
#: en/diff-options.txt:402 en/git-status.txt:143
@@ -4640,7 +4661,7 @@ msgstr "Avisar se as altera챌천es introduzem marcadores de conflito ou erros de
#: en/diff-options.txt:420
#, no-wrap, priority:280
msgid "--ws-error-highlight=<kind>"
-msgstr "--ws-erro-highlight=<kind>"
+msgstr "--ws-error-highlight=<kind>"
#. type: Plain text
#: en/diff-options.txt:429
@@ -4699,7 +4720,7 @@ msgstr "-B[<n>][/<m>]"
#: en/diff-options.txt:450
#, no-wrap, priority:280
msgid "--break-rewrites[=[<n>][/<m>]]"
-msgstr "--pausa-rewrites[=[<n>][/<m>]]"
+msgstr "--break-rewrites[=[<n>][/<m>]]"
#. type: Plain text
#: en/diff-options.txt:453
@@ -4738,7 +4759,7 @@ msgstr "-M[<n>]"
#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
-msgstr "--encontrar-renomea챌천es[=<n>]"
+msgstr "--find-renames[=<n>]"
#. type: Plain text
#: en/diff-options.txt:476
@@ -4793,13 +4814,15 @@ msgstr "-C[<n>]"
#: en/diff-options.txt:493
#, no-wrap, priority:280
msgid "--find-copies[=<n>]"
-msgstr "--encontrar-c처pias[=<n>]"
+msgstr "--find-copies[=<n>]"
#. type: Plain text
#: en/diff-options.txt:496
#, priority:280
msgid "Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M<n>`."
-msgstr "Detectar c처pias e renomear. Veja tamb챕m `--find-copies-harder`. Se `n` 챕 especificado, tem o mesmo significado que para` -M<n> `."
+msgstr ""
+"Detectar c처pias e renomear. Veja tamb챕m `--find-copies-harder`. Caso `n` tem "
+"o mesmo significado que `-M<n>` caso n찾o seja informado."
#. type: Labeled list
#: en/diff-options.txt:497 en/git-svn.txt:626
@@ -4853,7 +4876,7 @@ msgstr "As op챌천es `-M` e` -C` requerem o tempo de processamento O (n^2), onde
#: en/diff-options.txt:527
#, ignore-ellipsis, no-wrap, priority:280
msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
-msgstr "--diff-filtro=[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
#. type: Plain text
#: en/diff-options.txt:538
@@ -4913,7 +4936,9 @@ msgstr "Procure por diferen챌as cujo texto de patch contenha linhas adicionadas/
#: en/diff-options.txt:568
#, priority:280
msgid "To illustrate the difference between `-S<regex> --pickaxe-regex` and `-G<regex>`, consider a commit with the following diff in the same file:"
-msgstr "Para ilustrar a diferen챌a entre `-S <regex> --pickaxe-regex` e` -G <regex> `, considere um commit com o seguinte diff no mesmo arquivo:"
+msgstr ""
+"Para ilustrar a diferen챌a entre `-S<regex> --pickaxe-regex` e `-G<regex>`, "
+"considere um commit com o seguinte diff no mesmo arquivo:"
#. type: delimited block -
#: en/diff-options.txt:573
@@ -4933,14 +4958,16 @@ msgstr ""
msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
"Enquanto o `git log -G\"frotz\\(nitfol\"` mostrar찼 este commit, j찼 `git log -"
-"S\"frotz\\(nitfol\" --pickaxe-regex` n찾o (porque o n첬mero de ocorr챗ncias "
-"dessa string n찾o foi alterado) ."
+"S\"frotz\\(nitfol\" --pickaxe-regex` n찾o (porque a quantidade de ocorr챗ncias "
+"dessa string n찾o foi alterada) ."
#. type: Plain text
#: en/diff-options.txt:581
#, priority:280
msgid "Unless `--text` is supplied patches of binary files without a textconv filter will be ignored."
-msgstr "A menos que `--text` seja fornecido, patches de arquivos bin찼rios sem um filtro textconv ser찾o ignorados."
+msgstr ""
+"A menos que `--text` seja informado, os patches dos arquivos bin찼rios sem um "
+"filtro `textconv` ser찾o ignorados."
#. type: Plain text
#: en/diff-options.txt:584
@@ -4952,7 +4979,7 @@ msgstr "Veja a entrada 'pickaxe' em linkgit:gitdiffcore[7] para mais informa챌천
#: en/diff-options.txt:585
#, no-wrap, priority:280
msgid "--find-object=<object-id>"
-msgstr "--encontrar-objeto=<object-id>"
+msgstr "--find-object=<id-do-objeto>"
#. type: Plain text
#: en/diff-options.txt:590
@@ -5056,7 +5083,7 @@ msgstr "Troque duas entradas; isto 챕, mostre as diferen챌as do 챠ndice ou do ar
#: en/diff-options.txt:647
#, no-wrap, priority:280
msgid "--relative[=<path>]"
-msgstr "--relativo[=<path>]"
+msgstr "--relative[=<caminho>]"
#. type: Plain text
#: en/diff-options.txt:654
@@ -5140,7 +5167,7 @@ msgstr "Ignore as altera챌천es cujas linhas est찾o todas em branco."
#: en/diff-options.txt:681
#, no-wrap, priority:280
msgid "--inter-hunk-context=<lines>"
-msgstr "--inter-peda챌o-contexto=<lines>"
+msgstr "--inter-hunk-context=<linhas>"
#. type: Plain text
#: en/diff-options.txt:686
@@ -5236,7 +5263,7 @@ msgstr "Permitir (ou proibir) filtros de convers찾o de texto externos para serem
#: en/diff-options.txt:722 en/git-status.txt:87
#, no-wrap, priority:280
msgid "--ignore-submodules[=<when>]"
-msgstr "--ignorar-submodulos[=<when>]"
+msgstr "--ignore-submodules[=<quando>]"
#. type: Plain text
#: en/diff-options.txt:734
@@ -5248,7 +5275,7 @@ msgstr "Ignore as altera챌천es nos subm처dulos na gera챌찾o do diff. <when> pode
#: en/diff-options.txt:735
#, no-wrap, priority:280
msgid "--src-prefix=<prefix>"
-msgstr "--src-prefixo=<prefix>"
+msgstr "--src-prefix=<prefixo>"
#. type: Plain text
#: en/diff-options.txt:737
@@ -5260,7 +5287,7 @@ msgstr "Mostrar o prefixo de origem fornecido em vez de \"a/\"."
#: en/diff-options.txt:738
#, no-wrap, priority:280
msgid "--dst-prefix=<prefix>"
-msgstr "--dst-prefixo=<prefix>"
+msgstr "--dst-prefix=<prefixo>"
#. type: Plain text
#: en/diff-options.txt:740
@@ -5302,7 +5329,13 @@ msgstr "--ita-invisible-in-index"
#: en/diff-options.txt:754
#, priority:280
msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\". This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
-msgstr "Por padr찾o, as entradas adicionadas por \"git add -N\" aparecem como um arquivo vazio existente em \"git diff\" e um novo arquivo em \"git diff --cached\". Esta op챌찾o faz a entrada aparecer como um novo arquivo em \"git diff\" e n찾o existe em \"git diff --cached\". Esta op챌찾o pode ser revertida com o `--ita-visible-in-index`. Ambas as op챌천es s찾o experimentais e podem ser removidas no futuro."
+msgstr ""
+"횋 predefinido que as entradas adicionadas com `git add -N` apare챌am como um "
+"arquivo vazio existente em `git diff` e um novo arquivo em `git diff "
+"--cached`. Esta op챌찾o faz a entrada aparecer como um novo arquivo com `git "
+"diff` e n찾o existe em `git diff --cached`. Esta op챌찾o pode ser revertida com "
+"o `--ita-visible-in-index`. Ambas as op챌천es s찾o experimentais e podem ser "
+"removidas no futuro."
#. type: Plain text
#: en/diff-options.txt:756
@@ -5338,7 +5371,7 @@ msgstr "Anexe os nomes das ref e os nomes dos objetos das refer챗ncias buscadas
#: en/fetch-options.txt:10
#, no-wrap, priority:220
msgid "--depth=<depth>"
-msgstr "--profundidade=<profundidade>"
+msgstr "--depth=<profundidade>"
#. type: Plain text
#: en/fetch-options.txt:16
@@ -5350,7 +5383,7 @@ msgstr "Limite a busca para o n첬mero especificado de confirma챌천es da ponta de
#: en/fetch-options.txt:17
#, no-wrap, priority:220
msgid "--deepen=<depth>"
-msgstr "--aprofundar=<profundidade>"
+msgstr "--deepen=<profundidade>"
#. type: Plain text
#: en/fetch-options.txt:21
@@ -5635,7 +5668,7 @@ msgstr "Busque todas as tags do controle remoto (ou seja, busque as tags remotas
#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
-msgstr "--recurso-subm처dulos[=sim|sob-demanda|n찾o]"
+msgstr "--recurse-submodules[=yes|on-demand|no]"
#. type: Plain text
#: en/fetch-options.txt:167
@@ -5653,7 +5686,7 @@ msgstr "-j"
#: en/fetch-options.txt:169
#, no-wrap, priority:220
msgid "--jobs=<n>"
-msgstr "--empregos=<n>"
+msgstr "--jobs=<n>"
#. type: Plain text
#: en/fetch-options.txt:171
@@ -5663,13 +5696,13 @@ msgstr ""
#. type: Plain text
#: en/fetch-options.txt:176
-#, fuzzy, priority:220
+#, priority:220
msgid "If the `--multiple` option was specified, the different remotes will be fetched in parallel. If multiple submodules are fetched, they will be fetched in parallel. To control them independently, use the config settings `fetch.parallel` and `submodule.fetchJobs` (see linkgit:git-config[1])."
msgstr ""
-"If the `--multiple` option was specified, the different remotes will be "
-"fetched in parallel. If multiple submodules are fetched, they will be "
-"fetched in parallel. Para control찼-los independentemente, use as defini챌천es "
-"de configura챌찾o `fetch.parallel` e ` submodule.fetchJobs` (consulte linkgit"
+"Caso a op챌찾o `--multiple` seja especificada, diferentes ramos remotos ser찾o "
+"buscados em paralelo. Caso v찼rios subm처dulos seja buscados, este ser찾o "
+"buscados em paralelo. Para control찼-los independentemente, use as defini챌천es "
+"de configura챌찾o `fetch.parallel` e `submodule.fetchJobs` (consulte linkgit"
":git-config[1])."
#. type: Plain text
@@ -5677,6 +5710,9 @@ msgstr ""
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
+"Normalmente, buscas remotas de m첬ltiplos ramos de forma paralela e recursiva "
+"ser찾o mais r찼pidas. A predefini챌찾o 챕 realizar buscas em sequ챗ncia e n찾o e "
+"paralelo."
#. type: Labeled list
#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
@@ -5688,7 +5724,9 @@ msgstr "--no-recurse-submodules"
#: en/fetch-options.txt:183
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
-msgstr "Desabilite a busca recursiva de subm처dulos (isto tem o mesmo efeito que usar a op챌찾o `--recurse-submodules=no`)."
+msgstr ""
+"Desabilite a busca recursiva de subm처dulos (tem o mesmo efeito que usar a "
+"op챌찾o `--recurse-submodules=no`)."
#. type: Labeled list
#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
@@ -5701,30 +5739,42 @@ msgstr "--set-upstream"
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
msgstr ""
+"Caso a busca remota seja bem sucedida, uma refer챗ncia de rastreamento `pull` "
+"e `add` ser찼 adicionada ao upstream, utilizado pelo argumento `less` linkgit"
+":git-pull[1] e outros comandos. Para mais informa챌천es, consulte "
+"`branch.<name>.merge` e `branch.<name>.remote` em linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:191
#, no-wrap, priority:220
msgid "--submodule-prefix=<path>"
-msgstr "--subm처dulo-prefixo=<path>"
+msgstr "--submodule-prefix=<path>"
#. type: Plain text
#: en/fetch-options.txt:195
#, priority:220
msgid "Prepend <path> to paths printed in informative messages such as \"Fetching submodule foo\". This option is used internally when recursing over submodules."
-msgstr "Prefira <path> a caminhos impressos em mensagens informativas, como \"Buscando submodulo foo\". Essa op챌찾o 챕 usada internamente ao recorrer a subm처dulos."
+msgstr ""
+"Anexar <path> para os caminhos impressos nas mensagens informativas como \""
+"Recolhendo o subm처dulo foo\". Esta op챌찾o 챕 utilizada internamente quando "
+"recorrer as subm처dulos."
#. type: Labeled list
#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
-msgstr "--recurso-subm처dulo-padr찾o=[sim|sob-demanda]"
+msgstr "--recurse-submodules-default=[yes|on-demand]"
#. type: Plain text
#: en/fetch-options.txt:203
#, priority:220
msgid "This option is used internally to temporarily provide a non-negative default value for the --recurse-submodules option. All other methods of configuring fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as does specifying --[no-]recurse-submodules directly."
-msgstr "Essa op챌찾o 챕 usada internamente para fornecer temporariamente um valor padr찾o n찾o negativo para a op챌찾o --recurse-submodules. Todos os outros m챕todos de configura챌찾o da recurs찾o do subm처dulo da busca (como configura챌천es em linkgit:gitmodules[5] e linkgit:git-config[1]) sobrescrevem esta op챌찾o, assim como especificar - [no-]recurse-submodules diretamente."
+msgstr ""
+"Esta op챌찾o 챕 utilizada internamente para prover temporariamente um valor n찾o "
+"negative de forma predefinida para a op챌찾o --recurse-submodules. Todos os "
+"outros m챕todos de configurar a recurs찾o do subm처dulo `fetch` (como as "
+"configura챌천es em linkgit:gitmodules[5] e linkgit:git-config[1]) sobrescreva "
+"esta op챌찾o usando --[no-]recurse-submodules diretamente."
#. type: Labeled list
#: en/fetch-options.txt:206
@@ -5802,7 +5852,7 @@ msgstr "-o <option>"
#: en/fetch-options.txt:239 en/git-clone.txt:135 en/git-ls-remote.txt:76
#, no-wrap, priority:300
msgid "--server-option=<option>"
-msgstr "--servidor-op챌찾o=<option>"
+msgstr "--server-option=<option>"
#. type: Plain text
#: en/fetch-options.txt:246 en/git-clone.txt:142
@@ -5824,12 +5874,13 @@ msgstr "--show-forced-updates"
#. type: Plain text
#: en/fetch-options.txt:252
-#, fuzzy, priority:220
+#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. This can be disabled through fetch.showForcedUpdates, but the --show-forced-updates option guarantees this check occurs. See linkgit:git-config[1]."
msgstr ""
-"By default, git checks if a branch is force-updated during fetch. This can "
-"be disabled through fetch.showForcedUpdates, but the --show-forced-updates "
-"option guarantees this check occurs. Consulte linkgit:git-config[1]."
+"횋 predefinido que o Git verifique se a atualiza챌찾o do ramo foi imposta "
+"durante uma busca. Isso pode ser desativado por meio de "
+"`fetch.showForcedUpdates`, por챕m a op챌찾o `--show-forced-updates garante que "
+"essa verifica챌찾o ocorra. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:253
@@ -5839,14 +5890,15 @@ msgstr "--no-show-forced-updates"
#. type: Plain text
#: en/fetch-options.txt:259
-#, fuzzy, priority:220
+#, priority:220
msgid "By default, git checks if a branch is force-updated during fetch. Pass --no-show-forced-updates or set fetch.showForcedUpdates to false to skip this check for performance reasons. If used during 'git-pull' the --ff-only option will still check for forced updates before attempting a fast-forward update. See linkgit:git-config[1]."
msgstr ""
-"By default, git checks if a branch is force-updated during fetch. Pass --no-"
-"show-forced-updates or set fetch.showForcedUpdates to false to skip this "
-"check for performance reasons. If used during 'git-pull' the --ff-only "
-"option will still check for forced updates before attempting a fast-forward "
-"update. Consulte linkgit:git-config[1]."
+"횋 predefinido que o Git verifique se a atualiza챌찾o do ramo foi imposta "
+"durante uma busca. Use a op챌찾o `--no-show-forced-updates` ou defina "
+"`fetch.showForcedUpdates` como to `false` para ignorar essa verifica챌찾o por "
+"quest천es de desempenho. Se usada durante o `git pull`, a op챌찾o `--ff-only` "
+"ainda verificar찼 as atualiza챌천es impostas antes de tentar uma atualiza챌찾o "
+"r찼pida. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:260 en/git-push.txt:398
@@ -6276,7 +6328,7 @@ msgstr "Adiciona conte첬do de todos os arquivos `*.txt` sob o diret처rio` Docume
#: en/git-add.txt:218
#, no-wrap, priority:300
msgid "$ git add Documentation/\\*.txt\n"
-msgstr "$ git add Documenta챌찾o /\\*.txt\n"
+msgstr "$ git add Documentation/\\*.txt\n"
#. type: Plain text
#: en/git-add.txt:223
@@ -6689,9 +6741,9 @@ 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=<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 [--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"
@@ -6908,7 +6960,7 @@ msgstr "--ignore-whitespace"
#: en/git-am.txt:109 en/git-rebase.txt:425
#, no-wrap, priority:100
msgid "--whitespace=<option>"
-msgstr "--espa챌oembranco=<op챌찾o>"
+msgstr "--whitespace=<op챌찾o>"
#. type: Labeled list
#: en/git-am.txt:110 en/git-apply.txt:129 en/git-rebase.txt:384
@@ -6926,19 +6978,19 @@ msgstr "-p<n>"
#: en/git-am.txt:112
#, no-wrap, priority:100
msgid "--directory=<dir>"
-msgstr "--diret처rio=<dir>"
+msgstr "--directory=<dir>"
#. type: Labeled list
#: en/git-am.txt:113
#, no-wrap, priority:100
msgid "--exclude=<path>"
-msgstr "--excluir=<path>"
+msgstr "--exclude=<caminho>"
#. type: Labeled list
#: en/git-am.txt:114
#, no-wrap, priority:100
msgid "--include=<path>"
-msgstr "--incluir=<path>"
+msgstr "--include=<caminho>"
#. type: Labeled list
#: en/git-am.txt:115 en/git-apply.txt:108
@@ -7016,7 +7068,7 @@ msgstr "-S[<keyid>]"
#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:350 en/git-rebase.txt:356 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap, priority:280
msgid "--gpg-sign[=<keyid>]"
-msgstr "--gpg-sinal[=<keyid>]"
+msgstr "--gpg-sign[=<keyid>]"
#. type: Plain text
#: en/git-am.txt:154 en/git-cherry-pick.txt:115 en/git-commit-tree.txt:67 en/git-commit.txt:354 en/git-rebase.txt:360 en/git-revert.txt:96
@@ -7258,13 +7310,14 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--directory=<root>]\n"
"\t [--verbose] [--unsafe-paths] [<patch>...]\n"
msgstr ""
-"'git aplique' [--stat] [--numstat] [--resumo] [--verifica] [--챠ndice | --inten챌찾o-de-adicionar] [--3caminho]\n"
-"\t [--aplique] [--n찾o-adicionar] [--construir-antepassado-falso=<arquivo>] [-R | --reverso]\n"
-"\t [--permitir-substitui챌찾o-bin찼ria | --bin찼rio] [--rejeitar] [-z]\n"
-"\t [-p<n>] [-C<n>] [--impreciso-eof] [--recontagem] [--em-cache]\n"
-"\t [--ignorar-mudan챌a-de-estado | --ignorar-espa챌o-em-branco]\n"
-"\t [--espa챌o-em-branco=(agora|advertir|consertar|erro|todo-erro)]\n"
-"\t [--excluir=<path>] [--incluir=<path>] [--diret처rio=<root>]\n"
+"'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-"
+"to-add] [--3way]\n"
+"\t [--apply] [--no-add] [--build-fake-ancestor=<arquivo>] [-R | --reverse]\n"
+"\t [--allow-binary-replacement | --binary] [--reject] [-z]\n"
+"\t [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached]\n"
+"\t [--ignore-space-change | --ignore-whitespace]\n"
+"\t [--whitespace=(nowarn|warn|fix|error|error-all)]\n"
+"\t [--exclude=<caminho>] [--include=<caminho>] [--directory=<root>]\n"
"\t [--verbose] [--unsafe-paths] [<patch>...]\n"
#. type: Plain text
@@ -7307,7 +7360,11 @@ msgstr "Em vez de aplicar o patch, imprima o diffstat para a entrada. Desativa
#: en/git-apply.txt:51
#, priority:100
msgid "Similar to `--stat`, but shows the number of added and deleted lines in decimal notation and the pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`. Turns off \"apply\"."
-msgstr "Semelhante ao `--stat`, mas mostra o n첬mero de linhas adicionadas e deletadas em nota챌찾o decimal e o nome do caminho sem abrevia챌찾o, para torn찼-lo mais amig찼vel ao computador. Para arquivos bin찼rios, gera dois `-` ao inv챕s de dizer` 0 0`. Desativa \"aplicar\"."
+msgstr ""
+"Semelhante ao `--stat`, mas exibe a quantidade de linhas adicionadas e "
+"exclu챠das sem a nota챌찾o decimal e o nome do caminho sem abrevia챌찾o para "
+"torn찼-lo mais amig찼vel ao computador. Para os arquivos bin찼rios, geram dois "
+"`-` em vez de ` 0 0`. Desativa o \"apply\"."
#. type: Plain text
#: en/git-apply.txt:57
@@ -7355,13 +7412,19 @@ msgstr "Ao aplicar o patch somente na 찼rvore de trabalho, marque novos arquivos
#: en/git-apply.txt:93
#, priority:100
msgid "When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to, and we have those blobs available locally, possibly leaving the conflict markers in the files in the working tree for the user to resolve. This option implies the `--index` option, and is incompatible with the `--reject` and the `--cached` options."
-msgstr "Quando o patch n찾o se aplica corretamente, use a mesclagem de 3 vias se o patch registrar a identidade dos blobs aos quais ele deve se aplicar, e temos esses blobs dispon챠veis localmente, possivelmente deixando os marcadores de conflito nos arquivos na 찼rvore de trabalho. para o usu찼rio resolver. Esta op챌찾o implica a op챌찾o `--index`, e 챕 incompat챠vel com as op챌천es` --reject` e `--cached`."
+msgstr ""
+"Quando o patch n찾o for aplicado corretamente, use a mesclagem de 3 vias caso "
+"o patch registre a identidade das gotas aos quais devem ser aplicadas "
+"disponibilizando-as localmente, possivelmente deixando os marcadores de "
+"conflito nos arquivos na 찼rvore de trabalho para o usu찼rio resolver. Esta "
+"op챌찾o implica no uso de `--index` sendo incompat챠vel com as op챌천es `--reject`"
+" e `--cached`."
#. type: Labeled list
#: en/git-apply.txt:94
#, no-wrap, priority:100
msgid "--build-fake-ancestor=<file>"
-msgstr "--construir-antepassado-falso=<file>"
+msgstr "--build-fake-ancestor=<arquivo>"
#. type: Plain text
#: en/git-apply.txt:100
@@ -7471,7 +7534,7 @@ msgstr "Historicamente, n찾o permit챠amos que o patch bin찼rio fosse aplicado se
#: en/git-apply.txt:166
#, no-wrap, priority:100
msgid "--exclude=<path-pattern>"
-msgstr "--excluir=<path-padr찾o>"
+msgstr "--exclude=<caminho-padr찾o>"
#. type: Plain text
#: en/git-apply.txt:170
@@ -7483,7 +7546,7 @@ msgstr "N찾o aplique altera챌천es a arquivos correspondentes ao padr찾o de camin
#: en/git-apply.txt:171
#, no-wrap, priority:100
msgid "--include=<path-pattern>"
-msgstr "--incluir=<path-padr찾o>"
+msgstr "--include=<caminho-padr찾o>"
#. type: Plain text
#: en/git-apply.txt:175
@@ -7507,7 +7570,7 @@ msgstr "Ao aplicar um patch, ignore as altera챌천es no espa챌o em branco nas lin
#: en/git-apply.txt:190
#, no-wrap, priority:100
msgid "--whitespace=<action>"
-msgstr "--espa챌oembranco=<action>"
+msgstr "--whitespace=<a챌찾o>"
#. type: Plain text
#: en/git-apply.txt:198
@@ -7593,7 +7656,7 @@ msgstr "N찾o confie nas contagens de linha nos cabe챌alhos, mas deduza-as inspec
#: en/git-apply.txt:235
#, no-wrap, priority:100
msgid "--directory=<root>"
-msgstr "--diret처rio=<root>"
+msgstr "--directory=<raiz>"
#. type: Plain text
#: en/git-apply.txt:238
@@ -7677,7 +7740,10 @@ msgstr "Se `--index` for especificado (explicitamente ou implicitamente), ent찾o
#: en/git-apply.txt:278
#, priority:100
msgid "If `--index` is not specified, then the submodule commits in the patch are ignored and only the absence or presence of the corresponding subdirectory is checked and (if possible) updated."
-msgstr "Se `--index` n찾o for especificado, os subm처dulos confirmados no patch ser찾o ignorados e somente a aus챗ncia ou presen챌a do subdiret처rio correspondente ser찼 verificada e (se poss챠vel) atualizada."
+msgstr ""
+"Caso a op챌찾o `--index` n찾o seja informada, os subm처dulos confirmados no "
+"patch ser찾o ignorados e somente a aus챗ncia ou presen챌a do subdiret처rio "
+"correspondente ser찼 verificada e (se poss챠vel) atualizada."
#. type: Plain text
#: en/git-apply.txt:282
@@ -7875,9 +7941,9 @@ msgid ""
"\t [<path>...]\n"
msgstr ""
"'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]\n"
-"\t [-o <file> | --output=<file>] [--worktree-attributes]\n"
-"\t [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>\n"
-"\t [<path>...]\n"
+"\t [-o <arquivo> | --output=<arquivo>] [--worktree-attributes]\n"
+"\t [--remote=<repo> [--exec=<arquivo-de-upload-git>]] <tree-ish>\n"
+"\t [<caminho>...]\n"
#. type: Plain text
#: en/git-archive.txt:23
@@ -7895,7 +7961,7 @@ msgstr "'git archive' se comporta de maneira diferente quando recebe um ID de 찼
#: en/git-archive.txt:36
#, no-wrap, priority:100
msgid "--format=<fmt>"
-msgstr "--formato=<fmt>"
+msgstr "--format=<fmt>"
#. type: Plain text
#: en/git-archive.txt:42
@@ -7925,7 +7991,7 @@ msgstr "Relatar o progresso para stderr."
#: en/git-archive.txt:51 en/git-write-tree.txt:35
#, no-wrap, priority:100
msgid "--prefix=<prefix>/"
-msgstr "--prefixo=<prefix>/"
+msgstr "--prefix=<prefix>/"
#. type: Plain text
#: en/git-archive.txt:53
@@ -7975,7 +8041,7 @@ msgstr ""
#: en/git-archive.txt:66
#, no-wrap, priority:100
msgid "--remote=<repo>"
-msgstr "--remoto=<repo>"
+msgstr "--remote=<repo>"
#. type: Plain text
#: en/git-archive.txt:72
@@ -7987,13 +8053,15 @@ msgstr "Em vez de criar um arquivo tar do reposit처rio local, recupere um arquiv
#: en/git-archive.txt:73
#, ignore-same, no-wrap, priority:100
msgid "--exec=<git-upload-archive>"
-msgstr "--exec=<git-upload-archive>"
+msgstr "--exec=<arquivo-de-upload-git>"
#. type: Plain text
#: en/git-archive.txt:76
#, priority:100
msgid "Used with --remote to specify the path to the 'git-upload-archive' on the remote side."
-msgstr "Usado com --remote para especificar o caminho para o 'git-upload-archive' no lado remoto."
+msgstr ""
+"Usado com a op챌찾o `--remote` para determinar o caminho para `arquivo-de-"
+"upload-git` no lado remoto."
#. type: Labeled list
#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
@@ -8137,7 +8205,8 @@ msgstr "Observe que os atributos s찾o, por padr찾o, obtidos dos arquivos `.gitat
#: en/git-archive.txt:150
#, no-wrap, priority:100
msgid "`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`"
-msgstr "`git arquivo --formato=tar --prefix = lixo / CABE횉A | (cd/var/tmp/ && tar xf -) `"
+msgstr ""
+"`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`"
#. type: Plain text
#: en/git-archive.txt:155
@@ -8149,7 +8218,9 @@ msgstr "Crie um arquivo tar que contenha o conte첬do do commit mais recente no b
#: en/git-archive.txt:156
#, no-wrap, priority:100
msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz`"
-msgstr "`git arquivo --formato=tar --prefixo=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz`"
+msgstr ""
+"`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip "
+">git-1.4.0.tar.gz`"
#. type: Plain text
#: en/git-archive.txt:159
@@ -8161,7 +8232,8 @@ msgstr "Crie um tarball comprimido para a vers찾o v1.4.0."
#: en/git-archive.txt:160
#, no-wrap, priority:100
msgid "`git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
-msgstr "`git arquivo --formato=tar.gz --prefixo=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
+msgstr ""
+"`git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
#. type: Plain text
#: en/git-archive.txt:163
@@ -8173,7 +8245,7 @@ msgstr "O mesmo que acima, mas usando o manuseio tar.gz embutido."
#: en/git-archive.txt:164
#, no-wrap, priority:100
msgid "`git archive --prefix=git-1.4.0/ -o git-1.4.0.tar.gz v1.4.0`"
-msgstr "`git arquivo --prefixo=git-1.4.0/ -o git-1.4.0.tar.gz v1.4.0`"
+msgstr "`git archive --prefix=git-1.4.0/ -o git-1.4.0.tar.gz v1.4.0`"
#. type: Plain text
#: en/git-archive.txt:167
@@ -8185,7 +8257,9 @@ msgstr "O mesmo que acima, mas o formato 챕 inferido do arquivo de sa챠da."
#: en/git-archive.txt:168
#, no-wrap, priority:100
msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz`"
-msgstr "`git arquivo --formato=tar --prefixo=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz`"
+msgstr ""
+"`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip "
+">git-1.4.0.tar.gz`"
#. type: Plain text
#: en/git-archive.txt:172
@@ -8197,7 +8271,9 @@ msgstr "Crie um tarball compactado para a vers찾o v1.4.0, mas sem um cabe챌alho
#: en/git-archive.txt:173
#, no-wrap, priority:100
msgid "`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-docs.zip`"
-msgstr "`git arquivo --formato=zip --prefixo=git-docs/ CABE횉A: Documenta챌찾o/ > git-1.4.0-docs.zip`"
+msgstr ""
+"`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > "
+"git-1.4.0-docs.zip`"
#. type: Plain text
#: en/git-archive.txt:177
@@ -8276,18 +8352,18 @@ msgid ""
" git bisect run <cmd>...\n"
" git bisect help\n"
msgstr ""
-" git in챠cio de divis찾o [--prazo-{velho,bom}=<prazo> --prazo-{novo,mau}=<prazo>]\n"
-"\t\t [--n찾o-confira] [<mau> [<bom>...]] [--] [<paths>...]\n"
-" git divis찾o (mau|novo|<prazo-novo>) [<rev>]\n"
-" git divis찾o (bom|velho|<prazo-velho>) [<rev>...]\n"
-" git termos de divis찾o [--termo-bom | --termo-ruim]\n"
-" git ignorar skip [(<rev>|<alcance>)...]\n"
-" git redefini챌찾o de divis찾o [<commit>]\n"
-" git divis찾o (visualizar|vis찾o)\n"
-" git reprise de divis찾o <logfile>\n"
-" git divis찾o de registro\n"
-" git divis찾o corrida <cmd>...\n"
-" git ajuda na divis찾o\n"
+" git bisect start [--term-{old,good}=<termo> --term-{new,bad}=<termo>]\n"
+"\t\t [--no-checkout] [<bad> [<good>...]] [--] [<caminhos>...]\n"
+" git bisect (bad|new|<novo-termo>) [<rev>]\n"
+" git bisect (good|old|<termo-antigo>) [<rev>...]\n"
+" git bisect terms [--term-good | --term-bad]\n"
+" git bisect skip [(<rev>|<faixa>)...]\n"
+" git bisect reset [<commit>]\n"
+" git bisect (visualize|view)\n"
+" git bisect replay <logfile>\n"
+" git bisect log\n"
+" git bisect run <cmd>...\n"
+" git bisect help\n"
#. type: Plain text
#: en/git-bisect.txt:40
@@ -8509,7 +8585,7 @@ msgstr "Se voc챗 gostaria de usar seus pr처prios termos em vez de \"ruim\"/ \"bo
#: en/git-bisect.txt:178
#, no-wrap, priority:100
msgid "git bisect start --term-old <term-old> --term-new <term-new>\n"
-msgstr "git in챠cio de divis찾o --termo-velho <termo-velho> --termo-novo <termo-novo>\n"
+msgstr "git bisect start --term-old <termo-antigo> --term-new <novo-termo>\n"
#. type: Plain text
#: en/git-bisect.txt:182
@@ -8521,7 +8597,7 @@ msgstr "Por exemplo, se voc챗 estiver procurando por uma confirma챌찾o que intro
#: en/git-bisect.txt:185
#, no-wrap, priority:100
msgid "git bisect start --term-old fast --term-new slow\n"
-msgstr "git in챠cio de divis찾o --termo-velho r찼pido --termo-novo lento\n"
+msgstr "git bisect start --term-old fast --term-new slow\n"
#. type: Plain text
#: en/git-bisect.txt:188
@@ -8533,7 +8609,7 @@ msgstr "Ou se voc챗 est찼 procurando o commit que corrigiu um bug, voc챗 pode us
#: en/git-bisect.txt:191
#, no-wrap, priority:100
msgid "git bisect start --term-new fixed --term-old broken\n"
-msgstr "git in챠cio de divis찾o --term-novo fixo --term-velho quebrado\n"
+msgstr "git bisect start --term-new fixed --term-old broken\n"
#. type: Plain text
#: en/git-bisect.txt:195
@@ -8569,7 +8645,7 @@ msgstr "Se a vari찼vel de ambiente `DISPLAY` n찾o estiver definida, o 'git log'
#: en/git-bisect.txt:213
#, no-wrap, priority:100
msgid "$ git bisect visualize --stat\n"
-msgstr "$ git visualizar divis찾o --stat\n"
+msgstr "$ git bisect visualize --stat\n"
#. type: Title ~
#: en/git-bisect.txt:216
@@ -8633,8 +8709,9 @@ msgid ""
"$ git reset --hard HEAD~3\t\t# try 3 revisions before what\n"
"\t\t\t\t\t# was suggested\n"
msgstr ""
-"$ git bisect good/bad\t\t\t# a rodada anterior estava bom ou ruim.\n"
-"Bisecting: 337 deixadas para testar depois disso (aproximadamente 9 passos)\n"
+"$ git bisect good/bad\t\t\t# a rodada anterior estava boa ou ruim.\n"
+"Bisecting: 337 deixadas para serem testadas depois disso (aproximadamente 9 "
+"passos)\n"
"$ git bisect visualize\t\t\t# oops, isso n찾o foi interessante.\n"
"$ git reset --hard HEAD~3\t\t# tente 3 revis천es antes do que\n"
"\t\t\t\t\t# foi sugerido\n"
@@ -8722,7 +8799,7 @@ msgstr "Voc챗 pode reduzir ainda mais o n첬mero de tentativas, se voc챗 souber q
#: en/git-bisect.txt:301
#, no-wrap, priority:100
msgid "$ git bisect start -- arch/i386 include/asm-i386\n"
-msgstr "$ git divis찾o start -- arch/i386 incluir/asm-i386\n"
+msgstr "$ git bisect start -- arch/i386 include/asm-i386\n"
#. type: Plain text
#: en/git-bisect.txt:306
@@ -8829,7 +8906,7 @@ msgid ""
"$ git bisect reset # quit the bisect session\n"
msgstr ""
"$ git bisect start HEAD v1.2 -- # HEAD est찼 ruim, v1.2 est찼 bom\n"
-"$ git bisect run make # \"make\" constr처i o app\n"
+"$ git bisect run make # \"make\" compila o app\n"
"$ git bisect reset # encerra a se챌찾o bisect\n"
#. type: Plain text
@@ -8847,7 +8924,7 @@ msgid ""
"$ git bisect reset # quit the bisect session\n"
msgstr ""
"$ git bisect start HEAD origin -- # HEAD est찼 ruim, origin est찼 bom\n"
-"$ git bisect run make test # \"make test\" monta e testa\n"
+"$ git bisect run make test # \"make test\" compila e testa\n"
"$ git bisect reset # encerra a se챌찾o bisect\n"
#. type: Plain text
@@ -8922,6 +8999,18 @@ msgid ""
"\tstatus=125\n"
"fi\n"
msgstr ""
+"# faz ajustes na 찼rvore de trabalho ao mesclar\n"
+"# a solu챌찾o do problema no ramo e tenta compil찼-lo\n"
+"if\tgit merge --no-commit --no-ff hot-fix &&\n"
+"\tmake\n"
+"then\n"
+"\t# executa testes espec챠ficos no projeto e informa a sua condi챌찾o atual\n"
+"\t~/check_test_case.sh\n"
+"\tstatus=$?\n"
+"else\n"
+"\t# informa quem pediu os testes que n찾o foi poss챠vel testar\n"
+"\tstatus=125\n"
+"fi\n"
#. type: delimited block -
#: en/git-bisect.txt:429
@@ -9084,6 +9173,14 @@ msgid ""
"\t [--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>..<rev>]\n"
"\t [--] <file>\n"
msgstr ""
+"'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] "
+"[--incremental]\n"
+"\t [-L <range>] [-S <arquivos-revs>] [-M] [-C] [-C] [-C] [--since=<data>]"
+"\n"
+"\t [--ignore-rev <rev>] [--ignore-revs-file <arquivo>]\n"
+"\t [--progress] [--abbrev=<n>] [<rev> | --contents <arquivo> | --reverse "
+"<rev>..<rev>]\n"
+"\t [--] <arquivo>\n"
#. type: Plain text
#: en/git-blame.txt:22
@@ -9123,9 +9220,10 @@ msgid ""
"5040f17eba15504bad66b14a645bddd9b015ebb7 blame -S <ancestry-file>\n"
"ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output\n"
msgstr ""
-"$ git log --pretty=oneline -S'uso_de_responsabilidade'\n"
-"5040f17eba15504bad66b14a645bddd9b015ebb7 blame -S <arquivo-de-ancestralidade>\n"
-"ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Fa챌a a sa챠da\n"
+"$ git log --pretty=oneline -S'blame_usage'\n"
+"5040f17eba15504bad66b14a645bddd9b015ebb7 blame -S <arquivo-de-ancestralidade>"
+"\n"
+"ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output\n"
#. type: Plain text
#: en/git-blame.txt:55
@@ -9288,10 +9386,10 @@ msgid ""
"\tsed -n 's/^author //p' |\n"
"\tsort | uniq -c | sort -rn\n"
msgstr ""
-"# conta o n첬mero de linhas atribu챠das a cada autor\n"
-"\tgit culpar arquivo de --linha-porcelana |\n"
-"\tsed -n 's/^autor //p' |\n"
-"\tordenar | uniq -c | ordenar -rn\n"
+"\t# conta a quantidade de linhas atribu챠das a cada autor\n"
+"\tgit blame --line-porcelain file |\n"
+"\tsed -n 's/^author //p' |\n"
+"\tsort | uniq -c | sort -rn\n"
#. type: Title -
#: en/git-blame.txt:135 en/revisions.txt:247
@@ -9352,8 +9450,8 @@ msgid ""
"\tgit blame v2.6.18.. -- foo\n"
"\tgit blame --since=3.weeks -- foo\n"
msgstr ""
-"\tgit responsabilidade v2.6.18.. -- foo\n"
-"\tgit responsabilidade --desde=3.semanas -- foo\n"
+"\tgit blame v2.6.18.. -- foo\n"
+"\tgit blame --since=3.weeks -- foo\n"
#. type: Plain text
#: en/git-blame.txt:168
@@ -9371,7 +9469,7 @@ msgstr "Uma maneira particularmente 첬til 챕 verificar se um arquivo adicionado
#: en/git-blame.txt:176
#, no-wrap, priority:100
msgid "\tgit log --diff-filter=A --pretty=short -- foo\n"
-msgstr "\tgit log --diff-filtro=A --pretty=short -- foo\n"
+msgstr "\tgit log --diff-filter=A --pretty=short -- foo\n"
#. type: Plain text
#: en/git-blame.txt:179
@@ -9383,7 +9481,7 @@ msgstr "e ent찾o anote a mudan챌a entre o commit e seus pais, usando a nota챌찾o
#: en/git-blame.txt:181
#, no-wrap, priority:100
msgid "\tgit blame -C -C -f $commit^! -- foo\n"
-msgstr "\tgit responsabilidade -C -C -f $commit^! -- foo\n"
+msgstr "\tgit blame -C -C -f $commit^! -- foo\n"
#. type: Title -
#: en/git-blame.txt:184
@@ -9489,6 +9587,22 @@ msgid ""
"'git branch' (-d | -D) [-r] <branchname>...\n"
"'git branch' --edit-description [<branchname>]\n"
msgstr ""
+"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
+"\t[-v [--abbrev=<comprimento> | --no-abbrev]]\n"
+"\t[--column[=<op챌천es>] | --no-column] [--sort=<key>]\n"
+"\t[(--merged | --no-merged) [<commit>]]\n"
+"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--points-at <objeto>] [--format=<formato>]\n"
+"\t[(-r | --remotes) | (-a | --all)]\n"
+"\t[--list] [<pattern>...]\n"
+"'git branch' [--track | --no-track] [-f] <nome do ramo> [<start-point>]\n"
+"'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<nome do ramo>]"
+"\n"
+"'git branch' --unset-upstream [<nome do ramo>]\n"
+"'git branch' (-m | -M) [<ramo antigo>] <novo ramo>\n"
+"'git branch' (-c | -C) [<ramo antigo>] <novo ramo>\n"
+"'git branch' (-d | -D) [-r] <nome do ramo>...\n"
+"'git branch' --edit-description [<nome do ramo>]\n"
#. type: Plain text
#: en/git-branch.txt:36
@@ -9587,7 +9701,7 @@ msgstr "Exclua uma ramifica챌찾o. A ramifica챌찾o deve ser totalmente integrada
#: en/git-branch.txt:105
#, priority:240
msgid "Shortcut for `--delete --force`."
-msgstr "Atalho para `--excluir--for챌a`."
+msgstr "um atalho para `--delete --force`."
#. type: Labeled list
#: en/git-branch.txt:106 en/git-tag.txt:190
@@ -9629,7 +9743,7 @@ msgstr "-M"
#: en/git-branch.txt:131
#, priority:240
msgid "Shortcut for `--move --force`."
-msgstr "Atalho para `--mover --for챌a`."
+msgstr "Um atalho para `--move --force`."
#. type: Labeled list
#: en/git-branch.txt:133
@@ -9683,7 +9797,7 @@ msgstr "As ramifica챌천es de classifica챌찾o e filtragem n찾o diferenciam mai첬s
#: en/git-branch.txt:153 en/git-status.txt:130 en/git-tag.txt:134
#, no-wrap, priority:280
msgid "--column[=<options>]"
-msgstr "--coluna[=<op챌천es>]"
+msgstr "--column[=<op챌천es>]"
#. type: Labeled list
#: en/git-branch.txt:154 en/git-status.txt:131 en/git-tag.txt:135
@@ -9879,7 +9993,7 @@ msgstr "Abra um editor e edite o texto para explicar para que serve o ramo, para
#: en/git-branch.txt:245 en/git-tag.txt:142
#, no-wrap, priority:240
msgid "--contains [<commit>]"
-msgstr "--cont챕m [<commit>]"
+msgstr "--contains [<commit>]"
#. type: Plain text
#: en/git-branch.txt:248
@@ -9891,7 +10005,7 @@ msgstr "Apenas as ramifica챌천es da lista que cont챗m a confirma챌찾o especifica
#: en/git-branch.txt:249 en/git-tag.txt:146
#, no-wrap, priority:240
msgid "--no-contains [<commit>]"
-msgstr "--n찾o-cont챕m [<commit>]"
+msgstr "--no-contains [<commit>]"
#. type: Plain text
#: en/git-branch.txt:252
@@ -9975,7 +10089,7 @@ msgstr "O novo nome para um ramo existente. As mesmas restri챌천es que para <bra
#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:65 en/git-tag.txt:112
#, no-wrap, priority:240
msgid "--sort=<key>"
-msgstr "--ordenar=<chave>"
+msgstr "--sort=<chave>"
#. type: Plain text
#: en/git-branch.txt:291
@@ -10014,7 +10128,10 @@ msgstr ""
#: en/git-branch.txt:306
#, priority:240
msgid "`pager.branch` is only respected when listing branches, i.e., when `--list` is used or implied. The default is to use a pager. See linkgit:git-config[1]."
-msgstr "`pager.branch` s처 챕 respeitado quando se listam ramifica챌천es, ou seja, quando` --list` 챕 usado ou impl챠cito. O padr찾o 챕 usar um pager. Veja linkgit:git-config[1]."
+msgstr ""
+"`pager.branch` s처 챕 respeitado quando se listam ramifica챌천es, ou seja, "
+"quando `--list` 챕 usado ou impl챠cito. A predefini챌찾o 챕 usar um pager. "
+"Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/git-branch.txt:310
@@ -10201,8 +10318,8 @@ msgid ""
"'git bundle' unbundle <file> [<refname>...]\n"
msgstr ""
"'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-"
-"progress-implied] <file> <git-rev-list-args>\n"
-"'git bundle' verify [-q | --quiet] <file>\n"
+"progress-implied] <arquivo> <git-rev-list-args>\n"
+"'git bundle' verify [-q | --quiet] <arquivo>\n"
"'git bundle' list-heads <file> [<refname>...]\n"
"'git bundle' unbundle <file> [<refname>...]\n"
@@ -10475,7 +10592,7 @@ msgstr "Voc챗 pode usar uma base baseada no tempo:"
#: en/git-bundle.txt:211
#, no-wrap, priority:100
msgid "$ git bundle create mybundle --since=10.days master\n"
-msgstr "$ git criar pacote meu-pacote --desde=10.dias master\n"
+msgstr "$ git bundle create mybundle --since=10.days master\n"
#. type: Plain text
#: en/git-bundle.txt:214
@@ -10551,7 +10668,7 @@ msgid ""
"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
msgstr ""
"'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -"
-"p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
+"p | <tipo> | --textconv | --filters ) [--path=<caminho>] <objeto>\n"
"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] "
"[--follow-symlinks]\n"
@@ -10565,7 +10682,14 @@ msgstr "Em sua primeira forma, o comando fornece o conte첬do ou o tipo de um obj
#: en/git-cat-file.txt:28
#, priority:100
msgid "In the second form, a list of objects (separated by linefeeds) is provided on stdin, and the SHA-1, type, and size of each object is printed on stdout. The output format can be overridden using the optional `<format>` argument. If either `--textconv` or `--filters` was specified, the input is expected to list the object names followed by the path name, separated by a single whitespace, so that the appropriate drivers can be determined."
-msgstr "No segundo formul찼rio, uma lista de objetos (separados por feeds de linha) 챕 fornecida em stdin, e o SHA-1, tipo e tamanho de cada objeto s찾o impressos em stdout. O formato de sa챠da pode ser substitu챠do usando o argumento opcional `<formato>`. Se `--textconv` ou` --filters` forem especificados, a entrada dever찼 listar os nomes dos objetos seguidos pelo nome do caminho, separados por um 첬nico espa챌o em branco, para que os drivers apropriados possam ser determinados."
+msgstr ""
+"No segundo formul찼rio, uma lista de objetos (separados por linhas de "
+"alimenta챌찾o) 챕 fornecida em stdin, e o SHA-1, tipo e tamanho de cada objeto "
+"s찾o impressos em stdout. O formato de sa챠da pode ser substitu챠do usando o "
+"argumento opcional `<formato>`. Se `--textconv` ou` --filters` forem "
+"especificados, a entrada dever찼 listar os nomes dos objetos seguidos pelo "
+"nome do caminho, separados por um 첬nico espa챌o em branco, para que os "
+"drivers apropriados possam ser determinados."
#. type: Labeled list
#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
@@ -10753,7 +10877,9 @@ msgstr "Esta op챌찾o n찾o funciona (atualmente) corretamente quando um objeto no
#: en/git-cat-file.txt:136
#, priority:100
msgid "This option cannot (currently) be used unless `--batch` or `--batch-check` is used."
-msgstr "Esta op챌찾o n찾o pode (atualmente) ser usada, a menos que `--batch` ou` --batch-check` seja usado."
+msgstr ""
+"Esta op챌찾o (atualmente) n찾o pode ser usada, a menos que `--batch` ou "
+"`--batch-check` seja usado."
#. type: Plain text
#: en/git-cat-file.txt:138
@@ -10782,7 +10908,8 @@ msgstr ""
#: en/git-cat-file.txt:148
#, priority:100
msgid "For a regular file `f`, `echo HEAD:f | git cat-file --batch` would print"
-msgstr "Para um arquivo normal `f`,` echo HEAD:f | git cat-file --batch` imprimiria"
+msgstr ""
+"Para um arquivo normal `f`, `echo HEAD:f | git cat-file --batch` imprimiria"
#. type: Plain text
#: en/git-cat-file.txt:151
@@ -10794,13 +10921,17 @@ msgstr "\tce013625030ba8dba906f756967f9e9ca394464a blob 6\n"
#: en/git-cat-file.txt:156
#, priority:100
msgid "And `echo HEAD:link | git cat-file --batch --follow-symlinks` would print the same thing, as would `HEAD:dir/link`, as they both point at `HEAD:f`."
-msgstr "E `echo HEAD:link | git cat-file --batch --follow-symlinks` imprimiria a mesma coisa, assim como `HEAD:dir/link`, como ambos apontam para` HEAD:f`."
+msgstr ""
+"E `echo HEAD:link | git cat-file --batch --follow-symlinks` imprimiria a "
+"mesma coisa, assim como `HEAD:dir/link`, como ambos apontam para `HEAD:f`."
#. type: Plain text
#: en/git-cat-file.txt:159
#, priority:100
msgid "Without `--follow-symlinks`, these would print data about the symlink itself. In the case of `HEAD:link`, you would see"
-msgstr "Sem `- siga-links-simb처licos`, estes iriam imprimir dados sobre o link simb처lico em si. No caso de \"HEAD: link\", voc챗 veria"
+msgstr ""
+"Sem `--follow-symlinks`, estes iriam imprimir dados sobre o link simb처lico "
+"em si. No caso de `HEAD: link`, voc챗 veria"
#. type: Plain text
#: en/git-cat-file.txt:162
@@ -10970,7 +11101,10 @@ msgstr "Se nenhum formato for especificado, o formato padr찾o 챕 `%(objeto-nome)
#: en/git-cat-file.txt:234
#, priority:100
msgid "If `--batch` is specified, the object information is followed by the object contents (consisting of `%(objectsize)` bytes), followed by a newline."
-msgstr "Se `--batch` for especificado, as informa챌천es do objeto s찾o seguidas pelo conte첬do do objeto (consistindo de`% (objeto-tamanho) `bytes), seguido por uma nova linha."
+msgstr ""
+"Se `--batch` for especificado, as informa챌천es do objeto s찾o seguidas pelo "
+"conte첬do do objeto (consistindo de `%(objectsize)` bytes), seguido por uma "
+"nova linha."
#. type: Plain text
#: en/git-cat-file.txt:236
@@ -11156,7 +11290,7 @@ msgstr "Para cada nome de caminho, este comando listar찼 se cada atributo 챕 \"n
#: en/git-check-attr.txt:22
#, no-wrap, priority:100
msgid "-a, --all"
-msgstr "-a, --todo"
+msgstr "-a, --all"
#. type: Plain text
#: en/git-check-attr.txt:26
@@ -11201,7 +11335,10 @@ msgstr "Interprete todos os argumentos anteriores como atributos e todos os argu
#: en/git-check-attr.txt:46
#, priority:100
msgid "If none of `--stdin`, `--all`, or `--` is used, the first argument will be treated as an attribute and the rest of the arguments as pathnames."
-msgstr "Se nenhum `--stdin`,` --todo` ou `--` para usado, o primeiro argumento ser찼 tratado como um atributo e o restante dos argumentos como nomes de caminho."
+msgstr ""
+"Caso nenhum `--stdin`, `--all`, ou `--` seja usado, o primeiro argumento "
+"ser찼 tratado como um atributo e o restante dos argumentos como os nomes do "
+"caminho."
#. type: Plain text
#: en/git-check-attr.txt:52
@@ -11407,8 +11544,8 @@ msgid ""
"'git check-ignore' [<options>] <pathname>...\n"
"'git check-ignore' [<options>] --stdin\n"
msgstr ""
-"'git verificar-ignorar' [<op챌천es>] <pathnome>...\n"
-"'git verificar-ignorar' [<op챌천es>] --stdin\n"
+"'git check-ignore' [<op챌천es>] <pathname>...\n"
+"'git check-ignore' [<op챌천es>] --stdin\n"
#. type: Plain text
#: en/git-check-ignore.txt:22
@@ -11426,7 +11563,7 @@ msgstr "Por padr찾o, os arquivos rastreados n찾o s찾o exibidos, pois n찾o est찾o
#: en/git-check-ignore.txt:28
#, no-wrap, priority:100
msgid "-q, --quiet"
-msgstr "-q, --quieto"
+msgstr "-q, --quiet"
#. type: Plain text
#: en/git-check-ignore.txt:31
@@ -11467,7 +11604,7 @@ msgstr ""
#: en/git-check-ignore.txt:52
#, no-wrap, priority:100
msgid "-n, --non-matching"
-msgstr "-n, --n찾o-coincidindo"
+msgstr "-n, --non-matching"
#. type: Plain text
#: en/git-check-ignore.txt:57
@@ -11527,7 +11664,17 @@ msgstr "<fonte> <NULL> <n첬mero de linhas> <NULL> <padr찾o> <NULL> <nome do path
#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
-msgstr "Se `-n` ou` --n찾o-coincidindo` forem especificados, nomes de caminhos n찾o correspondentes tamb챕m ser찾o emitidos, caso em que todos os campos em cada registro de sa챠da, exceto para <nome do path>, estar찾o vazios. Isso pode ser 첬til ao executar de forma n찾o interativa, para que os arquivos possam ser transmitidos de forma incremental para STDIN de um processo de ignorar cheque de longa execu챌찾o e, para cada um desses arquivos, STDOUT indicar찼 se esse arquivo correspondeu a um padr찾o. (Sem essa op챌찾o, seria imposs챠vel dizer se a aus챗ncia de sa챠da para um determinado arquivo significava que ele n찾o correspondia a nenhum padr찾o ou que a sa챠da ainda n찾o havia sido gerada.)"
+msgstr ""
+"Caso `-n` ou `--n찾o-coincidindo` forem usados, os nomes dos caminhos n찾o "
+"correspondentes tamb챕m ser찾o emitidos, no caso onde todos os campos em cada "
+"registro de sa챠da, exceto para `<nome do caminho>`, estar찾o vazios. Isso "
+"pode ser 첬til ao executar de forma n찾o interativa, para que os arquivos "
+"possam ser transmitidos de forma incremental para STDIN de um processo de "
+"ignorar cheque de longa execu챌찾o e para cada um desses arquivos, STDOUT "
+"indicar찼 se esse arquivo correspondeu a um padr찾o. (Sem essa op챌찾o, seria "
+"imposs챠vel dizer se a aus챗ncia de sa챠da para um determinado arquivo "
+"significava que ele n찾o correspondia a nenhum padr찾o ou que a sa챠da ainda "
+"n찾o havia sido gerada.)"
#. type: Title -
#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
@@ -11699,7 +11846,7 @@ msgstr "Ao criar arquivos, prefixos <string> (geralmente um diret처rio incluindo
#: en/git-checkout-index.txt:52
#, no-wrap, priority:100
msgid "--stage=<number>|all"
-msgstr "--stage=<n첬mero>|todos"
+msgstr "--stage=<n첬mero>|all"
#. type: Plain text
#: en/git-checkout-index.txt:56
@@ -11790,37 +11937,53 @@ msgstr ""
#: en/git-checkout-index.txt:103
#, no-wrap, priority:100
msgid "Using --temp or --stage=all"
-msgstr "Usando --temp ou --stage=all"
+msgstr "Usando `--temp` ou `--stage=all`"
#. type: Plain text
#: en/git-checkout-index.txt:110
#, priority:100
msgid "When `--temp` is used (or implied by `--stage=all`) 'git checkout-index' will create a temporary file for each index entry being checked out. The index will not be updated with stat information. These options can be useful if the caller needs all stages of all unmerged entries so that the unmerged files can be processed by an external merge tool."
msgstr ""
+"Quando o `--temp` 챕 utilizado (ou de forma impl챠cita por `--stage=all`), o "
+"comando 'git checkout-index' cria um arquivo tempor찼rio para cada entrada do "
+"챠ndice que est찼 sendo retirado. O 챠ndice n찾o ser찼 atualizado com "
+"informa챌천es estat챠sticas. Essas op챌천es podem ser 첬teis caso quem chame "
+"precise de todos os est찼gios de todas as entradas n찾o mescladas para que os "
+"arquivos n찾o mesclados possam ser processados por uma ferramenta de "
+"mesclagem externa."
#. type: Plain text
#: en/git-checkout-index.txt:114
#, priority:100
msgid "A listing will be written to stdout providing the association of temporary file names to tracked path names. The listing format has two variations:"
msgstr ""
+"Uma lista ser찼 gravada no stdout, fornecendo a associa챌찾o dos nomes dos "
+"arquivos tempor찼rios para os nomes dos caminhos rastreados. O formato da "
+"listagem possui duas varia챌천es:"
#. type: Plain text
#: en/git-checkout-index.txt:116
#, priority:100
msgid "tempname TAB path RS"
-msgstr ""
+msgstr "tempname TAB path RS"
#. type: Plain text
#: en/git-checkout-index.txt:121
#, priority:100
msgid "The first format is what gets used when `--stage` is omitted or is not `--stage=all`. The field tempname is the temporary file name holding the file content and path is the tracked path name in the index. Only the requested entries are output."
msgstr ""
+"O primeiro formato 챕 o que 챕 usado quando o `--stage` for omitido ou n찾o "
+"seja um `stage=all`. O campo `tempname` 챕 o nome do arquivo tempor찼rio que "
+"contenha o conte첬do do arquivo e `path` 챕 o nome do caminho rastreado no "
+"챠ndice. O campo `tempname` 챕 o arquivo com nome tempor찼rio que armazena o "
+"conte첬do do arquivo e `path` e o nome do caminho rastreado no 챠ndice. "
+"Apenas as entradas solicitadas s찾o produzidas."
#. type: Plain text
#: en/git-checkout-index.txt:123
#, priority:100
msgid "stage1temp SP stage2temp SP stage3tmp TAB path RS"
-msgstr ""
+msgstr "stage1temp SP stage2temp SP stage3tmp TAB path RS"
#. type: Plain text
#: en/git-checkout-index.txt:129
@@ -11870,7 +12033,7 @@ msgstr "A habilidade prefixo basicamente torna trivial o uso do 'git verificar-
#: en/git-checkout-index.txt:157
#, no-wrap, priority:100
msgid "$ git checkout-index --prefix=git-export-dir/ -a\n"
-msgstr "$ git verificar-챠ndice - prefixo = git-exportar-dir / -a\n"
+msgstr "$ git checkout-index --prefix=git-export-dir/ -a\n"
#. type: Plain text
#: en/git-checkout-index.txt:161
@@ -11894,7 +12057,7 @@ msgstr "Exportar arquivos com um prefixo"
#: en/git-checkout-index.txt:170
#, no-wrap, priority:100
msgid "$ git checkout-index --prefix=.merged- Makefile\n"
-msgstr "$ git verificar-챠ndice --prefixo=.merged- Fazer arquivo\n"
+msgstr "$ git checkout-index --prefix=.merged- Makefile\n"
#. type: Plain text
#: en/git-checkout-index.txt:174
@@ -11928,11 +12091,11 @@ msgid ""
"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
"'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]\n"
msgstr ""
-"'git checkout' [-q] [-f] [-m] [<branch>]\n"
-"'git checkout' [-q] [-f] [-m] --detach [<branch>]\n"
+"'git checkout' [-q] [-f] [-m] [<ramo>]\n"
+"'git checkout' [-q] [-f] [-m] --detach [<ramo>]\n"
"'git checkout' [-q] [-f] [-m] [--detach] <commit>\n"
-"'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]"
-"\n"
+"'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <novo_ramo>] "
+"[<ponto_de_in챠cio>]\n"
"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] "
"<pathspec>...\n"
"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] "
@@ -12031,13 +12194,13 @@ msgstr "isto 챕, a ramifica챌찾o n찾o 챕 redefinida/criada a menos que \"git ver
#: en/git-checkout.txt:66
#, no-wrap, priority:240
msgid "'git checkout' --detach [<branch>]"
-msgstr "'git verificar' --desanexar [<branch>]"
+msgstr "'git checkout' --detach [<ramo>]"
#. type: Labeled list
#: en/git-checkout.txt:67
#, no-wrap, priority:240
msgid "'git checkout' [--detach] <commit>"
-msgstr "'git verificar' [--desanexar] <commit>"
+msgstr "'git checkout' [--detach] <commit>"
#. type: Plain text
#: en/git-checkout.txt:75
@@ -12078,12 +12241,19 @@ msgstr ""
#, no-wrap, priority:240
msgid "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]"
msgstr ""
+"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] "
+"--pathspec-from-file=<file> [--pathspec-file-nul]"
#. type: Plain text
#: en/git-checkout.txt:90
#, priority:240
msgid "Overwrite the contents of the files that match the pathspec. When the `<tree-ish>` (most often a commit) is not given, overwrite working tree with the contents in the index. When the `<tree-ish>` is given, overwrite both the index and the working tree with the contents at the `<tree-ish>`."
msgstr ""
+"Substitua o conte첬do dos arquivos que correspondem ao `pathspec`. Quando o "
+"`<tree-ish>` (na maioria das vezes um commit) n찾o for fornecido, substitua a "
+"찼rvore de trabalho pelo conte첬do do 챠ndice. Quando o `<tree-ish>` for "
+"informado, substitua o 챠ndice e a 찼rvore de trabalho pelo conte첬do em `<tree-"
+"ish>`."
#. type: Plain text
#: en/git-checkout.txt:98
@@ -12095,7 +12265,7 @@ msgstr "O 챠ndice pode conter entradas n찾o mescladas devido a uma mesclagem ant
#: en/git-checkout.txt:99
#, ignore-ellipsis, no-wrap, priority:240
msgid "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
-msgstr "'git verificar' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
+msgstr "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
#. type: Plain text
#: en/git-checkout.txt:104
@@ -12259,7 +12429,7 @@ msgstr "Se o branch existir em m첬ltiplos controles remotos e um deles for nomea
#: en/git-checkout.txt:196
#, priority:240
msgid "Use `--no-guess` to disable this."
-msgstr ""
+msgstr "Utilize a op챌찾o `--no-guess` para desativar."
#. type: Plain text
#: en/git-checkout.txt:200
@@ -12287,7 +12457,7 @@ msgstr ""
#: en/git-checkout.txt:208
#, no-wrap, priority:240
msgid "--orphan <new_branch>"
-msgstr "--orf찾o <novo_branch>"
+msgstr "--orphan <novo_ramo>"
#. type: Plain text
#: en/git-checkout.txt:214
@@ -12378,7 +12548,7 @@ msgstr ""
#: en/git-checkout.txt:260 en/git-restore.txt:90 en/git-switch.txt:133
#, no-wrap, priority:240
msgid "--conflict=<style>"
-msgstr "--conflito=<estilo>"
+msgstr "--conflict=<estilo>"
#. type: Plain text
#: en/git-checkout.txt:266 en/git-restore.txt:96 en/git-switch.txt:139
@@ -12484,7 +12654,7 @@ msgstr ""
#: en/git-checkout.txt:324 en/git-rebase.txt:243 en/git-switch.txt:36
#, no-wrap, priority:240
msgid "<branch>"
-msgstr ""
+msgstr "<ramo>"
#. type: Plain text
#: en/git-checkout.txt:330
@@ -12558,7 +12728,7 @@ msgstr "횁rvore para checkout (quando os paths s찾o dados). Se n찾o especificado
#: en/git-checkout.txt:359 en/git-reset.txt:124 en/git-restore.txt:135
#, priority:280
msgid "Limits the paths affected by the operation."
-msgstr ""
+msgstr "Limita os caminhos afetados pela opera챌찾o."
#. type: Plain text
#: en/git-checkout.txt:361 en/git-commit.txt:369 en/git-reset.txt:126 en/git-restore.txt:137 en/git-rm.txt:45 en/git-stash.txt:236
@@ -12579,8 +12749,8 @@ msgstr "CABE횉A DESTACADA"
#, priority:240
msgid "`HEAD` normally refers to a named branch (e.g. `master`). Meanwhile, each branch refers to a specific commit. Let's look at a repo with three commits, one of them tagged, and with branch `master` checked out:"
msgstr ""
-"`HEAD` normalmente se refere a um branch ou ramifica챌찾o de nome pr처prio ("
-"como `master` por exemplo). Enquanto isso, cada ramo ou ramifica챌찾o tem como "
+"Em geral `HEAD` refere-se a um ramo ou ramifica챌찾o de nome pr처prio (como "
+"`master` por exemplo). Enquanto isso, cada ramo ou ramifica챌찾o tem como "
"refer챗ncia um \"commit\" espec챠fico. Vamos olhar para um reposit처rio com "
"tr챗s commits onde um deles est찼 marcado como ramifica챌찾o `master`:"
@@ -12596,6 +12766,13 @@ msgid ""
" |\n"
" tag 'v2.0' (refers to commit 'b')\n"
msgstr ""
+" HEAD (refere-se ao ramo 'master')\n"
+" |\n"
+" v\n"
+"a---b---c branch 'master' (refere-se ao commit 'c')\n"
+" ^\n"
+" |\n"
+" tag 'v2.0' (refere-se ao commit 'b')\n"
#. type: Plain text
#: en/git-checkout.txt:383
@@ -12626,6 +12803,13 @@ msgid ""
" |\n"
" tag 'v2.0' (refers to commit 'b')\n"
msgstr ""
+" HEAD (refere-se ao ramo 'master')\n"
+" |\n"
+" v\n"
+"a---b---c---d branch 'master' (refere-se ao commit 'd')\n"
+" ^\n"
+" |\n"
+" tag 'v2.0' (refere-se ao commit 'b')\n"
#. type: Plain text
#: en/git-checkout.txt:400
@@ -12660,6 +12844,13 @@ msgid ""
" |\n"
" tag 'v2.0' (refers to commit 'b')\n"
msgstr ""
+" HEAD (refere-se ao commit 'b')\n"
+" |\n"
+" v\n"
+"a---b---c---d branch 'master' (refere-se ao commit 'd')\n"
+" ^\n"
+" |\n"
+" tag 'v2.0' (refere-se ao commit 'b')\n"
#. type: Plain text
#: en/git-checkout.txt:418
@@ -12686,6 +12877,15 @@ msgid ""
" |\n"
" tag 'v2.0' (refers to commit 'b')\n"
msgstr ""
+" HEAD (refere-se ao commit 'e')\n"
+" |\n"
+" v\n"
+" e\n"
+" /\n"
+"a---b---c---d branch 'master' (refere-se ao commit 'd')\n"
+" ^\n"
+" |\n"
+" tag 'v2.0' (refere-se ao commit 'b')\n"
#. type: Plain text
#: en/git-checkout.txt:435
@@ -12709,6 +12909,15 @@ msgid ""
" |\n"
" tag 'v2.0' (refers to commit 'b')\n"
msgstr ""
+"\t HEAD (refere-se ao commit 'f')\n"
+"\t |\n"
+"\t v\n"
+" e---f\n"
+" /\n"
+"a---b---c---d branch 'master' (refere-se ao commit 'd')\n"
+" ^\n"
+" |\n"
+" tag 'v2.0' (refere-se ao commit 'b')\n"
#. type: Plain text
#: en/git-checkout.txt:452
@@ -12736,6 +12945,13 @@ msgid ""
" |\n"
" tag 'v2.0' (refers to commit 'b')\n"
msgstr ""
+" HEAD (refere-se ao ramo 'master')\n"
+" e---f |\n"
+" / v\n"
+"a---b---c---d branch 'master' (refere-se ao commit 'd')\n"
+" ^\n"
+" |\n"
+" tag 'v2.0' (refere-se ao commit 'b')\n"
#. type: Plain text
#: en/git-checkout.txt:470
@@ -12801,6 +13017,8 @@ msgid ""
"$ git reflog -2 HEAD # or\n"
"$ git log -g -2 HEAD\n"
msgstr ""
+"$ git reflog -2 HEAD # ou\n"
+"$ git log -g -2 HEAD\n"
#. type: Title -
#: en/git-checkout.txt:498
@@ -12873,7 +13091,7 @@ msgstr "Se voc챗 quiser dar uma olhada nos arquivos de c처digo-fonte, todos fora
#: en/git-checkout.txt:532
#, no-wrap, priority:240
msgid "$ git checkout -- '*.c'\n"
-msgstr "$ git verificar -- '*.c'\n"
+msgstr "$ git checkout -- '*.c'\n"
#. type: Plain text
#: en/git-checkout.txt:538
@@ -12891,7 +13109,7 @@ msgstr "Se voc챗 tem um ramo infeliz chamado `hello.c`, este passo seria confund
#: en/git-checkout.txt:545
#, no-wrap, priority:240
msgid "$ git checkout -- hello.c\n"
-msgstr "$ git verificar -- hello.c\n"
+msgstr "git checkout -- hello.c\n"
#. type: Plain text
#: en/git-checkout.txt:549 en/git-switch.txt:201
@@ -13011,6 +13229,10 @@ msgid ""
" <refname>\n"
"'git check-ref-format' --branch <branchname-shorthand>\n"
msgstr ""
+"'git check-ref-format' [--normalize]\n"
+" [--[no-]allow-onelevel] [--refspec-pattern]\n"
+" <refname>\n"
+"'git check-ref-format' --branch <branchname-shorthand>\n"
#. type: Plain text
#: en/git-check-ref-format.txt:20
@@ -13193,7 +13415,7 @@ msgstr "Imprima o nome da coisa anterior registrada:"
#: en/git-check-ref-format.txt:129
#, no-wrap, priority:100
msgid "$ git check-ref-format --branch @{-1}\n"
-msgstr "$ git verifique-o-formato-ref --branch @{-1}\n"
+msgstr "$ git check-ref-format --branch @{-1}\n"
#. type: Plain text
#: en/git-check-ref-format.txt:132
@@ -13208,8 +13430,9 @@ msgid ""
"$ ref=$(git check-ref-format --normalize \"refs/heads/$newbranch\")||\n"
"{ echo \"we do not like '$newbranch' as a branch name.\" >&2 ; exit 1 ; }\n"
msgstr ""
-"$ ref=$(git verifica-o-formato-ref--normalize \"refs/heads/$novobranch\")||\n"
-"{ echo \"n처s n찾o gostamos '$novobranch' as a branch nome.\" >&2 ; exit 1 ; }\n"
+"$ ref=$(git check-ref-format --normalize \"refs/heads/$newbranch\")||\n"
+"{ echo \"n처s n찾o gostamos do '$newbranch' como um nome de ramo.\" >&2 ; exit "
+"1 ; }\n"
#. type: Title =
#: en/git-cherry-pick.txt:2
@@ -13231,6 +13454,9 @@ msgid ""
"\t\t [-S[<keyid>]] <commit>...\n"
"'git cherry-pick' (--continue | --skip | --abort | --quit)\n"
msgstr ""
+"'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]\n"
+"\t\t [-S[<keyid>]] <commit>...\n"
+"'git cherry-pick' (--continue | --skip | --abort | --quit)\n"
#. type: Plain text
#: en/git-cherry-pick.txt:21
@@ -13302,7 +13528,7 @@ msgstr "Com esta op챌찾o, o 'git cherry-pick' permitir찼 que voc챗 edite a mensa
#: en/git-cherry-pick.txt:58 en/git-commit.txt:192 en/git-revert.txt:70 en/git-tag.txt:183 en/merge-options.txt:35
#, no-wrap, priority:280
msgid "--cleanup=<mode>"
-msgstr ""
+msgstr "--cleanup=<modo>"
#. type: Plain text
#: en/git-cherry-pick.txt:64 en/git-revert.txt:76
@@ -13431,7 +13657,7 @@ msgstr "Se um commit que est찼 sendo escolhido, duplicar um commit j찼 no hist처
#: en/git-cherry-pick.txt:146 en/git-notes.txt:184 en/git-rebase.txt:329 en/git-revert.txt:102 en/git-svn.txt:678 en/merge-options.txt:117
#, no-wrap, priority:240
msgid "--strategy=<strategy>"
-msgstr ""
+msgstr "--strategy=<estrat챕gia>"
#. type: Plain text
#: en/git-cherry-pick.txt:150 en/git-revert.txt:106
@@ -13449,7 +13675,7 @@ msgstr "-X<op챌찾o>"
#: en/git-cherry-pick.txt:152 en/git-revert.txt:108 en/merge-options.txt:125
#, no-wrap, priority:240
msgid "--strategy-option=<option>"
-msgstr "--strategy-op챌찾o=<op챌찾o>"
+msgstr "--strategy-option=<op챌찾o>"
#. type: Plain text
#: en/git-cherry-pick.txt:155 en/git-revert.txt:111
@@ -13539,7 +13765,7 @@ msgstr "Aplique 횪 찼rvore de trabalho e ao 챠ndice as altera챌천es introduzidas
#: en/git-cherry-pick.txt:200
#, no-wrap, priority:100
msgid "`git cherry-pick --ff ..next`"
-msgstr "`git cherry-pick --ff ..pr처ximo`"
+msgstr "`git cherry-pick --ff ..next`"
#. type: Plain text
#: en/git-cherry-pick.txt:207
@@ -13551,7 +13777,7 @@ msgstr "Se o hist처rico for linear e HEAD for um ancestral do pr처ximo, atualize
#: en/git-cherry-pick.txt:208
#, no-wrap, priority:100
msgid "`git rev-list --reverse master -- README | git cherry-pick -n --stdin`"
-msgstr ""
+msgstr "`git rev-list --reverse master -- README | git cherry-pick -n --stdin`"
#. type: Plain text
#: en/git-cherry-pick.txt:214
@@ -13574,6 +13800,10 @@ msgid ""
"$ git reset --merge ORIG_HEAD <3>\n"
"$ git cherry-pick -Xpatience topic^ <4>\n"
msgstr ""
+"$ git cherry-pick topic^ <1>\n"
+"$ git diff <2>\n"
+"$ git reset --merge ORIG_HEAD <3>\n"
+"$ git cherry-pick -Xpatience topic^ <4>\n"
#. type: Plain text
#: en/git-cherry-pick.txt:229
@@ -13741,6 +13971,17 @@ msgid ""
"|/\n"
"o 1234567 branch point\n"
msgstr ""
+"$ git log --graph --oneline --decorate --boundary origin/master...topic\n"
+"* 7654321 (origin/master) upstream tip commit\n"
+"[... ignora alguns outros commits ...]\n"
+"* cccc111 cherry-pick of C\n"
+"* aaaa111 cherry-pick of A\n"
+"[... ignora mais algum outro monte do que aconteceu ...]\n"
+"| * cccc000 (topic) commit C\n"
+"| * bbbb000 commit B\n"
+"| * aaaa000 commit A\n"
+"|/\n"
+"o 1234567 branch point\n"
#. type: Plain text
#: en/git-cherry.txt:90
@@ -13795,6 +14036,20 @@ msgid ""
"|/\n"
"o 1234567 merge-base between upstream and topic\n"
msgstr ""
+"$ git log --graph --oneline --decorate --boundary origin/master...topic\n"
+"* 7654321 (origin/master) upstream tip commit\n"
+"[... ignora alguns outros commits ...]\n"
+"* cccc111 cherry-pick of C\n"
+"* aaaa111 cherry-pick of A\n"
+"[... ignora mais algum outro monte do que aconteceu ...]\n"
+"| * cccc000 (topic) commit C\n"
+"| * bbbb000 commit B\n"
+"| * aaaa000 commit A\n"
+"| * 0000fff (base) unpublished stuff F\n"
+"[... snip ...]\n"
+"| * 0000aaa unpublished stuff A\n"
+"|/\n"
+"o 1234567 merge-base between upstream and topic\n"
#. type: Plain text
#: en/git-cherry.txt:130
@@ -14146,8 +14401,12 @@ msgstr "Quando o reposit처rio para clonar est찼 em uma m찼quina local, esse sina
#, priority:300
msgid "If the repository is specified as a local path (e.g., `/path/to/repo`), this is the default, and --local is essentially a no-op. If the repository is specified as a URL, then this flag is ignored (and we never use the local optimizations). Specifying `--no-local` will override the default when `/path/to/repo` is given, using the regular Git transport instead."
msgstr ""
-"Se o reposit처rio for especificado como um caminho local (por exemplo, `/path/to/repo`), este 챕 o padr찾o, e --local 챕 essencialmente um n찾o operacional. Se o reposit처rio for especificado como um URL, esse sinalizador ser찼 ignorado (e nunca usaremos as otimiza챌천es locais). \n"
-" Especificar `--no-local` ir찼 sobrescrever o padr찾o quando`/path/to/repo` for dado, usando o transporte regular do Git."
+"횋 predefinido que caso o reposit처rio seja informado como um caminho local ("
+"por exemplo, `/path/to/repo`) e `--local` n찾o for operacional. Caso o "
+"reposit처rio seja especificado como um URL, esse sinalizador ser찼 ignorado (e "
+"nunca usaremos as otimiza챌천es locais). Especificar `--no-local` ir찼 "
+"sobrescrever o valor predefinido quando`/path/to/repo` for informado usando "
+"o transporte regular do Git."
#. type: Labeled list
#: en/git-clone.txt:60
@@ -14227,7 +14486,7 @@ msgstr ""
#: en/git-clone.txt:94
#, no-wrap, priority:300
msgid "--reference[-if-able] <repository>"
-msgstr "--refer챗ncia [-if-able] <reposit처rio>"
+msgstr "--reference[-if-able] <reposit처rio>"
#. type: Plain text
#: en/git-clone.txt:104
@@ -14242,8 +14501,8 @@ msgid ""
"*NOTE*: see the NOTE for the `--shared` option, and also the\n"
"`--dissociate` option.\n"
msgstr ""
-"*NOTE*: veja a NOTA para o `--shared` op챌찾o, e tamb챕m o\n"
-"`--dissociate` op챌찾o.\n"
+"*OBSERVA횉횄O*: consulte a NOTA sobre a op챌찾o\n"
+"`--shared` e tamb챕m a op챌찾o `--dissociate`.\n"
#. type: Labeled list
#: en/git-clone.txt:108 en/git-submodule.txt:403
@@ -14335,8 +14594,12 @@ msgstr "--mirror"
#, priority:300
msgid "Set up a mirror of the source repository. This implies `--bare`. Compared to `--bare`, `--mirror` not only maps local branches of the source to local branches of the target, it maps all refs (including remote-tracking branches, notes etc.) and sets up a refspec configuration such that all these refs are overwritten by a `git remote update` in the target repository."
msgstr ""
-"Configure um espelho do reposit처rio de origem. Isso implica `--bare`. \n"
-" Comparado com `--bare`,` --mirror` n찾o apenas mapeia as ramifica챌천es locais da origem para as ramifica챌천es locais do destino, ele mapeia todas as refs (incluindo ramifica챌천es de controle remoto, notas, etc.) e configura uma configura챌찾o de refspec como que todos esses refs s찾o sobrescritos por um `git remote update` no reposit처rio de destino."
+"Configure um espelho do reposit처rio de origem. Isso implica `--bare`. "
+"Comparado com `--bare`, `--mirror` n찾o apenas mapeia as ramifica챌천es locais "
+"da origem para as ramifica챌천es locais do destino, ele mapeia todas as refs ("
+"incluindo ramifica챌천es de controle remoto, notas, etc.) e define uma "
+"configura챌찾o `refspec` como que todos esses `refs` sejam sobrescritos por um "
+"`git remote update` no reposit처rio do destino."
#. type: Labeled list
#: en/git-clone.txt:173
@@ -14348,13 +14611,15 @@ msgstr "-o <nome>"
#: en/git-clone.txt:174
#, no-wrap, priority:300
msgid "--origin <name>"
-msgstr "--origem <nome>"
+msgstr "--origin <nome>"
#. type: Plain text
#: en/git-clone.txt:177
#, priority:300
msgid "Instead of using the remote name `origin` to keep track of the upstream repository, use `<name>`."
-msgstr "Ao inv챕s de usar o nome remoto `origin` para acompanhar o reposit처rio upstream, use o` <nome> `."
+msgstr ""
+"Ao inv챕s de usar o nome remoto `origin` para acompanhar o reposit처rio "
+"upstream, use o `<nome>`."
#. type: Labeled list
#: en/git-clone.txt:178
@@ -14703,6 +14968,8 @@ msgid ""
"'git column' [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>]\n"
"\t [--indent=<string>] [--nl=<string>] [--padding=<n>]\n"
msgstr ""
+"'git column' [--command=<nome>] [--[raw-]mode=<modo>] [--width=<largura>]\n"
+"\t [--indent=<string>] [--nl=<string>] [--padding=<n>]\n"
#. type: Plain text
#: en/git-column.txt:20
@@ -15070,6 +15337,13 @@ msgid ""
"\t [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [-S[<keyid>]] [--] [<pathspec>...]\n"
msgstr ""
+"'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"
#. type: Plain text
#: en/git-commit.txt:27
@@ -15183,7 +15457,7 @@ msgstr ""
#: en/git-commit.txt:78
#, no-wrap, priority:280
msgid "--reuse-message=<commit>"
-msgstr ""
+msgstr "--reuse-message=<commit>"
#. type: Plain text
#: en/git-commit.txt:82
@@ -15201,7 +15475,7 @@ msgstr ""
#: en/git-commit.txt:84
#, no-wrap, priority:280
msgid "--reedit-message=<commit>"
-msgstr ""
+msgstr "--reedit-message=<commit>"
#. type: Plain text
#: en/git-commit.txt:87
@@ -15213,7 +15487,7 @@ msgstr ""
#: en/git-commit.txt:88
#, no-wrap, priority:280
msgid "--fixup=<commit>"
-msgstr ""
+msgstr "--fixup=<commit>"
#. type: Plain text
#: en/git-commit.txt:93
@@ -15326,7 +15600,7 @@ msgstr ""
#: en/git-commit.txt:133 en/git-merge.txt:78 en/git-notes.txt:141 en/git-tag.txt:171
#, no-wrap, priority:280
msgid "--file=<file>"
-msgstr ""
+msgstr "--file=<file>"
#. type: Plain text
#: en/git-commit.txt:136
@@ -15338,7 +15612,7 @@ msgstr ""
#: en/git-commit.txt:137
#, no-wrap, priority:280
msgid "--author=<author>"
-msgstr ""
+msgstr "--author=<author>"
#. type: Plain text
#: en/git-commit.txt:143
@@ -15355,7 +15629,7 @@ msgstr ""
#: en/git-commit.txt:144
#, no-wrap, priority:280
msgid "--date=<date>"
-msgstr ""
+msgstr "--date=<date>"
#. type: Plain text
#: en/git-commit.txt:146
@@ -15373,7 +15647,7 @@ msgstr ""
#: en/git-commit.txt:148 en/git-notes.txt:133 en/git-svn.txt:469 en/git-tag.txt:163
#, no-wrap, priority:280
msgid "--message=<msg>"
-msgstr ""
+msgstr "--message=<msg>"
#. type: Plain text
#: en/git-commit.txt:152
@@ -15399,7 +15673,7 @@ msgstr ""
#: en/git-commit.txt:156
#, no-wrap, priority:280
msgid "--template=<file>"
-msgstr ""
+msgstr "--template=<file>"
#. type: Plain text
#: en/git-commit.txt:165
@@ -15495,7 +15769,7 @@ msgstr ""
#: en/git-commit.txt:211
#, no-wrap, priority:280
msgid "# ------------------------ >8 ------------------------\n"
-msgstr ""
+msgstr "# ------------------------ >8 ------------------------\n"
#. type: Plain text
#: en/git-commit.txt:215
@@ -15555,6 +15829,9 @@ msgid ""
"\t$ ... do something else to come up with the right tree ...\n"
"\t$ git commit -c ORIG_HEAD\n"
msgstr ""
+"\t$ git reset --soft HEAD^\n"
+"\t$ ... fa챌a outra coisa para encontrar a 찼rvore certa ...\n"
+"\t$ git commit -c ORIG_HEAD\n"
#. type: Plain text
#: en/git-commit.txt:252
@@ -15614,7 +15891,7 @@ msgstr ""
#: en/git-commit.txt:296 en/git-status.txt:59
#, no-wrap, priority:280
msgid "--untracked-files[=<mode>]"
-msgstr ""
+msgstr "--untracked-files[=<mode>]"
#. type: Plain text
#: en/git-commit.txt:298 en/git-status.txt:61
@@ -19477,13 +19754,13 @@ msgstr ""
#: en/git-describe.txt:40
#, no-wrap, priority:260
msgid "--dirty[=<mark>]"
-msgstr ""
+msgstr "--dirty[=<mark>]"
#. type: Labeled list
#: en/git-describe.txt:41
#, no-wrap, priority:260
msgid "--broken[=<mark>]"
-msgstr ""
+msgstr "--broken[=<mark>]"
#. type: Plain text
#: en/git-describe.txt:49
@@ -19525,7 +19802,7 @@ msgstr ""
#: en/git-describe.txt:71
#, no-wrap, priority:260
msgid "--candidates=<n>"
-msgstr ""
+msgstr "--candidates=<n>"
#. type: Plain text
#: en/git-describe.txt:77
@@ -19579,7 +19856,7 @@ msgstr ""
#: en/git-describe.txt:106
#, no-wrap, priority:260
msgid "--exclude <pattern>"
-msgstr ""
+msgstr "--exclude <pattern>"
#. type: Plain text
#: en/git-describe.txt:117
@@ -19664,6 +19941,8 @@ msgid ""
"\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
"\ttags/v1.0.0-21-g975b\n"
msgstr ""
+"\t[torvalds@g5 git]$ git describe --all --abbrev=4 v1.0.5^2\n"
+"\ttags/v1.0.0-21-g975b\n"
#. type: Plain text
#: en/git-describe.txt:161
@@ -19672,6 +19951,8 @@ msgid ""
"\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
"\theads/lt/describe-7-g975b\n"
msgstr ""
+"\t[torvalds@g5 git]$ git describe --all --abbrev=4 HEAD^\n"
+"\theads/lt/describe-7-g975b\n"
#. type: Plain text
#: en/git-describe.txt:164
@@ -19686,6 +19967,8 @@ msgid ""
"\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
"\ttags/v1.0.0\n"
msgstr ""
+"\t[torvalds@g5 git]$ git describe --abbrev=0 v1.0.5^2\n"
+"\ttags/v1.0.0\n"
#. type: Plain text
#: en/git-describe.txt:173
@@ -19755,19 +20038,19 @@ msgstr ""
#: en/git-diff-files.txt:25 en/git-diff.txt:100
#, no-wrap, priority:280
msgid "-1 --base"
-msgstr ""
+msgstr "-1 --base"
#. type: Labeled list
#: en/git-diff-files.txt:26 en/git-diff.txt:101
#, no-wrap, priority:280
msgid "-2 --ours"
-msgstr ""
+msgstr "-2 --ours"
#. type: Labeled list
#: en/git-diff-files.txt:27 en/git-diff.txt:102
#, no-wrap, priority:280
msgid "-3 --theirs"
-msgstr ""
+msgstr "-3 --theirs"
#. type: Plain text
#: en/git-diff-files.txt:32
@@ -20058,7 +20341,7 @@ msgstr ""
#: en/git-difftool.txt:38 en/git-mergetool.txt:28
#, no-wrap, priority:240
msgid "--tool=<tool>"
-msgstr ""
+msgstr "--tool=<ferramenta>"
#. type: Plain text
#: en/git-difftool.txt:42
@@ -20497,7 +20780,7 @@ msgstr ""
#: en/git-diff.txt:24
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] [--] [<path>...]"
-msgstr ""
+msgstr "'git diff' [<op챌천es>] [--] [<caminho>...]"
#. type: Plain text
#: en/git-diff.txt:31
@@ -20509,7 +20792,7 @@ msgstr ""
#: en/git-diff.txt:32
#, no-wrap, priority:280
msgid "'git diff' [<options>] --no-index [--] <path> <path>"
-msgstr ""
+msgstr "'git diff' [<op챌천es>] --no-index [--] <caminho> <caminho>"
#. type: Plain text
#: en/git-diff.txt:40
@@ -20521,7 +20804,7 @@ msgstr ""
#: en/git-diff.txt:41
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
-msgstr ""
+msgstr "'git diff' [<op챌천es>] --cached [<commit>] [--] [<caminho>...]"
#. type: Plain text
#: en/git-diff.txt:50
@@ -20533,7 +20816,7 @@ msgstr ""
#: en/git-diff.txt:51
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit> [--] [<path>...]"
-msgstr ""
+msgstr "'git diff' [<op챌천es>] <commit> [--] [<caminho>...]"
#. type: Plain text
#: en/git-diff.txt:58
@@ -20545,7 +20828,7 @@ msgstr ""
#: en/git-diff.txt:59
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
-msgstr ""
+msgstr "'git diff' [<op챌천es>] <commit> <commit> [--] [<caminho>...]"
#. type: Plain text
#: en/git-diff.txt:63
@@ -20557,7 +20840,7 @@ msgstr ""
#: en/git-diff.txt:64
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
-msgstr ""
+msgstr "'git diff' [<op챌천es>] <commit>..<commit> [--] [<caminho>...]"
#. type: Plain text
#: en/git-diff.txt:69
@@ -20569,7 +20852,7 @@ msgstr ""
#: en/git-diff.txt:70
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
-msgstr ""
+msgstr "'git diff' [<op챌천es>] <commit>\\...<commit> [--] [<caminho>...]"
#. type: Plain text
#: en/git-diff.txt:77
@@ -20673,6 +20956,9 @@ msgid ""
"$ git diff HEAD -- ./test <2>\n"
"$ git diff HEAD^ HEAD <3>\n"
msgstr ""
+"$ git diff test <1>\n"
+"$ git diff HEAD -- ./test <2>\n"
+"$ git diff HEAD^ HEAD <3>\n"
#. type: Plain text
#: en/git-diff.txt:149
@@ -20771,6 +21057,8 @@ msgid ""
"$ git diff --find-copies-harder -B -C <1>\n"
"$ git diff -R <2>\n"
msgstr ""
+"$ git diff --find-copies-harder -B -C <1>\n"
+"$ git diff -R <2>\n"
#. type: Plain text
#: en/git-diff.txt:190
@@ -23691,6 +23979,10 @@ msgid ""
"'git fetch' --multiple [<options>] [(<repository> | <group>)...]\n"
"'git fetch' --all [<options>]\n"
msgstr ""
+"'git fetch' [<op챌천es>] [<reposit처rio> [<refspec>...]]\n"
+"'git fetch' [<op챌천es>] <grupo>\n"
+"'git fetch' --multiple [<op챌천es>] [(<reposit처rio> | <grupo>)...]\n"
+"'git fetch' --all [<op챌천es>]\n"
#. type: Plain text
#: en/git-fetch.txt:24
@@ -23706,13 +23998,13 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:37
-#, fuzzy, priority:220
+#, priority:220
msgid "'git fetch' can fetch from either a single named repository or URL, or from several repositories at once if <group> is given and there is a remotes.<group> entry in the configuration file. (See linkgit:git-config[1])."
msgstr ""
-"'git fetch' can fetch from either a single named repository or URL, or from "
-"several repositories at once if <group> is given and there is a "
-"remotes.<group> entry in the configuration file. (Consulte linkgit:git-"
-"config[1])."
+"O 'git fetch' pode buscar em um 첬nico reposit처rio ou em uma determinada URL "
+"assim como em v찼rios reposit처rios de uma vez caso `<group>` seja usado e "
+"exista um entrada `remotes.<group>` no arquivo de configura챌찾o. (Consulte "
+"linkgit:git-config[1])."
#. type: Plain text
#: en/git-fetch.txt:40
@@ -23807,6 +24099,8 @@ msgid ""
"# While fetching\n"
"$ git fetch --prune <name>\n"
msgstr ""
+"# Enquanto estiver fazendo a busca\n"
+"$ git fetch --prune <name>\n"
#. type: delimited block -
#: en/git-fetch.txt:124
@@ -23872,6 +24166,9 @@ msgid ""
"$ git fetch --no-tags origin 'refs/tags/*:refs/tags/*'\n"
"$ git fetch --no-tags --prune-tags origin\n"
msgstr ""
+"# Ambas buscam as tags\n"
+"$ git fetch --no-tags origin 'refs/tags/*:refs/tags/*'\n"
+"$ git fetch --no-tags --prune-tags origin\n"
#. type: Plain text
#: en/git-fetch.txt:172
@@ -23900,6 +24197,10 @@ msgid ""
"$ git fetch <url of origin> --prune --prune-tags\n"
"$ git fetch <url of origin> --prune 'refs/tags/*:refs/tags/*'\n"
msgstr ""
+"$ git fetch origin --prune --prune-tags\n"
+"$ git fetch origin --prune 'refs/tags/*:refs/tags/*'\n"
+"$ git fetch <url of origin> --prune --prune-tags\n"
+"$ git fetch <url of origin> --prune 'refs/tags/*:refs/tags/*'\n"
#. type: Plain text
#: en/git-fetch.txt:195
@@ -25127,7 +25428,7 @@ msgstr ""
#: en/git-fmt-merge-msg.txt:27 en/merge-options.txt:68
#, no-wrap, priority:240
msgid "--log[=<n>]"
-msgstr ""
+msgstr "--log[=<n>]"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:33
@@ -25272,7 +25573,7 @@ msgstr ""
#: en/git-for-each-ref.txt:47 en/git-replace.txt:106 en/git-tag.txt:197 en/pretty-options.txt:2
#, no-wrap, priority:260
msgid "--format=<format>"
-msgstr ""
+msgstr "--format=<formato>"
#. type: Plain text
#: en/git-for-each-ref.txt:59
@@ -26295,7 +26596,7 @@ msgstr ""
#: en/git-format-patch.txt:288 en/pretty-options.txt:60
#, no-wrap, priority:260
msgid "--notes[=<ref>]"
-msgstr ""
+msgstr "--notes[=<ref>]"
#. type: Labeled list
#: en/git-format-patch.txt:289 en/pretty-options.txt:81
@@ -30244,7 +30545,7 @@ msgstr ""
#: en/git-init.txt:92
#, no-wrap, priority:300
msgid "'all' (or 'world' or 'everybody')"
-msgstr "'all' (ou 'world' ou 'everyone')"
+msgstr "'all' (ou 'world' ou 'everybody')"
#. type: Plain text
#: en/git-init.txt:95
@@ -30369,7 +30670,7 @@ msgstr ""
#: en/git-init.txt:149
#, priority:300
msgid "Create a /path/to/my/codebase/.git directory."
-msgstr "Cria um diret처rio /path/to/my/codebase/.git."
+msgstr "Cria um diret처rio `/path/to/my/codebase/.git`."
#. type: Plain text
#: en/git-init.txt:150
@@ -31375,7 +31676,7 @@ msgstr ""
#: en/git-log.txt:13
#, ignore-ellipsis, no-wrap, priority:260
msgid "'git log' [<options>] [<revision range>] [[--] <path>...]\n"
-msgstr ""
+msgstr "'git log' [<op챌천es>] [<faixa de revis천es>] [[--] <caminho>...]\n"
#. type: Plain text
#: en/git-log.txt:17
@@ -31411,7 +31712,7 @@ msgstr "--no-decorate"
#: en/git-log.txt:32
#, no-wrap, priority:260
msgid "--decorate[=short|full|auto|no]"
-msgstr ""
+msgstr "--decorate[=short|full|auto|no]"
#. type: Plain text
#: en/git-log.txt:40
@@ -31423,13 +31724,13 @@ msgstr ""
#: en/git-log.txt:41
#, no-wrap, priority:260
msgid "--decorate-refs=<pattern>"
-msgstr ""
+msgstr "--decorate-refs=<pattern>"
#. type: Labeled list
#: en/git-log.txt:42
#, no-wrap, priority:260
msgid "--decorate-refs-exclude=<pattern>"
-msgstr ""
+msgstr "--decorate-refs-exclude=<pattern>"
#. type: Plain text
#: en/git-log.txt:47
@@ -31528,7 +31829,7 @@ msgstr ""
#: en/git-log.txt:97 en/git-shortlog.txt:72
#, ignore-ellipsis, no-wrap, priority:260
msgid "[--] <path>..."
-msgstr ""
+msgstr "[--] <caminho>..."
#. type: Plain text
#: en/git-log.txt:102
@@ -31552,7 +31853,7 @@ msgstr ""
#: en/git-log.txt:120
#, no-wrap, priority:260
msgid "`git log --no-merges`"
-msgstr ""
+msgstr "`git log --no-merges`"
#. type: Plain text
#: en/git-log.txt:123
@@ -31576,7 +31877,7 @@ msgstr ""
#: en/git-log.txt:129
#, no-wrap, priority:260
msgid "`git log --since=\"2 weeks ago\" -- gitk`"
-msgstr ""
+msgstr "`git log --since=\"2 weeks ago\" -- gitk`"
#. type: Plain text
#: en/git-log.txt:134
@@ -31588,7 +31889,7 @@ msgstr ""
#: en/git-log.txt:135
#, no-wrap, priority:260
msgid "`git log --name-status release..test`"
-msgstr ""
+msgstr "`git log --name-status release..test`"
#. type: Plain text
#: en/git-log.txt:140
@@ -31600,7 +31901,7 @@ msgstr ""
#: en/git-log.txt:141
#, no-wrap, priority:260
msgid "`git log --follow builtin/rev-list.c`"
-msgstr ""
+msgstr "`git log --follow builtin/rev-list.c`"
#. type: Plain text
#: en/git-log.txt:146
@@ -31612,7 +31913,7 @@ msgstr ""
#: en/git-log.txt:147
#, no-wrap, priority:260
msgid "`git log --branches --not --remotes=origin`"
-msgstr ""
+msgstr "`git log --branches --not --remotes=origin`"
#. type: Plain text
#: en/git-log.txt:152
@@ -31624,7 +31925,7 @@ msgstr ""
#: en/git-log.txt:153
#, no-wrap, priority:260
msgid "`git log master --not --remotes=*/master`"
-msgstr ""
+msgstr "`git log master --not --remotes=*/master`"
#. type: Plain text
#: en/git-log.txt:157
@@ -31636,7 +31937,7 @@ msgstr ""
#: en/git-log.txt:158
#, no-wrap, priority:260
msgid "`git log -p -m --first-parent`"
-msgstr ""
+msgstr "`git log -p -m --first-parent`"
#. type: Plain text
#: en/git-log.txt:165
@@ -33593,6 +33894,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:240
msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
msgstr ""
+"'git mergetool' [--tool=<ferramente>] [-y | --[no-]prompt] [<arquivo>...]\n"
#. type: Plain text
#: en/git-mergetool.txt:18
@@ -33764,6 +34066,11 @@ msgid ""
"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]\n"
"'git merge' (--continue | --abort | --quit)\n"
msgstr ""
+"'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n"
+"\t[--no-verify] [-s <estrat챕gia>] [-X <op챌찾o da estrat챕gia>] [-S[<keyid>]]\n"
+"\t[--[no-]allow-unrelated-histories]\n"
+"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <arquivo>] [<commit>...]\n"
+"'git merge' (--continue | --abort | --quit)\n"
#. type: Plain text
#: en/git-merge.txt:25
@@ -33785,6 +34092,9 @@ msgid ""
"\t /\n"
" D---E---F---G master\n"
msgstr ""
+"\t A---B---C topic\n"
+"\t /\n"
+" D---E---F---G master\n"
#. type: Plain text
#: en/git-merge.txt:40
@@ -33800,6 +34110,9 @@ msgid ""
"\t / \\\n"
" D---E---F---G---H master\n"
msgstr ""
+"\t A---B---C topic\n"
+"\t / \\\n"
+" D---E---F---G---H master\n"
#. type: Plain text
#: en/git-merge.txt:54
@@ -34042,6 +34355,9 @@ msgid ""
"git merge v1.2.3^0\n"
"git merge --ff-only v1.2.3\n"
msgstr ""
+"git fetch origin\n"
+"git merge v1.2.3^0\n"
+"git merge --ff-only v1.2.3\n"
#. type: Title -
#: en/git-merge.txt:221
@@ -34205,7 +34521,7 @@ msgstr ""
#: en/git-merge.txt:340
#, no-wrap, priority:240
msgid "$ git merge --no-commit maint\n"
-msgstr ""
+msgstr "$ git merge --no-commit maint\n"
#. type: Plain text
#: en/git-merge.txt:344
@@ -35848,7 +36164,7 @@ msgstr ""
#: en/git-p4.txt:359 en/git-submodule.txt:281
#, no-wrap, priority:220
msgid "--branch <branch>"
-msgstr ""
+msgstr "--branch <ramo>"
#. type: Plain text
#: en/git-p4.txt:363
@@ -36951,7 +37267,7 @@ msgstr ""
#: en/git-pack-objects.txt:258 en/rev-list-options.txt:735
#, no-wrap, priority:260
msgid "--filter=<filter-spec>"
-msgstr ""
+msgstr "--filter=<filter-spec>"
#. type: Plain text
#: en/git-pack-objects.txt:262
@@ -37527,7 +37843,7 @@ msgstr ""
#: en/git-prune.txt:48 en/git-worktree.txt:192
#, no-wrap, priority:240
msgid "--expire <time>"
-msgstr ""
+msgstr "--expire <tempo>"
#. type: Plain text
#: en/git-prune.txt:50
@@ -37629,6 +37945,11 @@ msgid ""
"\t^\n"
"\torigin/master in your repository\n"
msgstr ""
+"\t A---B---C master on origin\n"
+"\t /\n"
+" D---E---F---G master\n"
+"\t^\n"
+"\torigin/master no seu reposit처rio\n"
#. type: Plain text
#: en/git-pull.txt:54
@@ -37644,6 +37965,9 @@ msgid ""
"\t / \\\n"
" D---E---F---G---H master\n"
msgstr ""
+"\t A---B---C origin/master\n"
+"\t / \\\n"
+" D---E---F---G---H master\n"
#. type: Plain text
#: en/git-pull.txt:63
@@ -37765,7 +38089,7 @@ msgstr "--no-rebase"
#: en/git-pull.txt:135
#, priority:220
msgid "Override earlier --rebase."
-msgstr ""
+msgstr "Ignora o `--rebase` anterior."
#. type: Labeled list
#: en/git-pull.txt:136 en/git-rebase.txt:554
@@ -37793,7 +38117,7 @@ msgstr ""
#: en/git-pull.txt:144
#, priority:220
msgid "This option is only valid when \"--rebase\" is used."
-msgstr ""
+msgstr "Essa op챌찾o s처 챕 v찼lida quando a op챌찾o `--rebase` for usada."
#. type: Title ~
#: en/git-pull.txt:146
@@ -37957,6 +38281,14 @@ msgid ""
"\t [--force-with-lease[=<refname>[:<expect>]]]\n"
"\t [--no-verify] [<repository> [<refspec>...]]\n"
msgstr ""
+"'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | "
+"--dry-run] [--receive-pack=<git-receive-pack>]\n"
+"\t [--repo=<reposit처rio>] [-f | --force] [-d | --delete] [--prune] [-v | "
+"--verbose]\n"
+"\t [-u | --set-upstream] [-o <string> | --push-option=<string>]\n"
+"\t [--[no-]signed|--signed=(true|false|if-asked)]\n"
+"\t [--force-with-lease[=<refname>[:<expect>]]]\n"
+"\t [--no-verify] [<repository> [<refspec>...]]\n"
#. type: Plain text
#: en/git-push.txt:24
@@ -38179,20 +38511,23 @@ msgstr "--[no-]signed"
#: en/git-push.txt:200 en/git-send-pack.txt:74
#, no-wrap, priority:220
msgid "--signed=(true|false|if-asked)"
-msgstr ""
+msgstr "--signed=(true|false|if-asked)"
#. type: Plain text
#: en/git-push.txt:209 en/git-send-pack.txt:83
-#, fuzzy, priority:220
+#, priority:220
msgid "GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be logged. If `false` or `--no-signed`, no signing will be attempted. If `true` or `--signed`, the push will fail if the server does not support signed pushes. If set to `if-asked`, sign if and only if the server supports signed pushes. The push will also fail if the actual call to `gpg --sign` fails. See linkgit:git-receive-pack[1] for the details on the receiving end."
msgstr ""
-"GPG-sign the push request to update refs on the receiving side, to allow it "
-"to be checked by the hooks and/or be logged. If `false` or `--no-signed`, "
-"no signing will be attempted. If `true` or `--signed`, the push will fail "
-"if the server does not support signed pushes. If set to `if-asked`, sign if "
-"and only if the server supports signed pushes. The push will also fail if "
-"the actual call to `gpg --sign` fails. Para obter detalhes sobre o "
-"recebimento na parte final, consulte linkgit:git-receive-pack[1]."
+"O GPG assina a solicita챌찾o `push` para atualizar os `refs` no lado do "
+"recebimento permitindo que ele seja verificado pelos ganchos ou seja "
+"catalogado nos registros. Caso as op챌천es `false` ou `--no-signed` sejam "
+"utilizadas, nenhuma tentativa de assinatura ser찼 feita. Caso as op챌천es "
+"`true` ou `--signed` sejam utilizadas, o `push` falhar찼 caso o servidor n찾o "
+"seja compat챠vel com `push` que contenha assinaturas. Caso seja definido com "
+"`if-asked`, a assinatura s처 ser찼 realizada caso o servidor seja compat챠vel "
+"com assinaturas `push`. O `push` falhar찼 se a chamada atual para o comando `"
+"gpg --sign` falhar. Para obter detalhes sobre o recebimento na parte final, "
+"consulte linkgit:git-receive-pack[1]."
#. type: Labeled list
#: en/git-push.txt:210
@@ -38210,7 +38545,7 @@ msgstr ""
#: en/git-push.txt:216
#, no-wrap, priority:220
msgid "--push-option=<option>"
-msgstr ""
+msgstr "--push-option=<op챌찾o>"
#. type: Plain text
#: en/git-push.txt:226
@@ -38222,13 +38557,13 @@ msgstr ""
#: en/git-push.txt:227 en/git-send-pack.txt:28
#, no-wrap, priority:220
msgid "--receive-pack=<git-receive-pack>"
-msgstr ""
+msgstr "--receive-pack=<git-recebe-pacote>"
#. type: Labeled list
#: en/git-push.txt:228 en/git-send-pack.txt:34
#, no-wrap, priority:220
msgid "--exec=<git-receive-pack>"
-msgstr ""
+msgstr "--exec=<git-recebe-pacote>"
#. type: Plain text
#: en/git-push.txt:233 en/git-send-pack.txt:33
@@ -38246,13 +38581,13 @@ msgstr "--[no-]force-with-lease"
#: en/git-push.txt:235
#, no-wrap, priority:220
msgid "--force-with-lease=<refname>"
-msgstr ""
+msgstr "--force-with-lease=<refname>"
#. type: Labeled list
#: en/git-push.txt:236
#, no-wrap, priority:220
msgid "--force-with-lease=<refname>:<expect>"
-msgstr ""
+msgstr "--force-with-lease=<refname>:<expect>"
#. type: Plain text
#: en/git-push.txt:239
@@ -38307,6 +38642,8 @@ msgstr ""
#, priority:220
msgid "\"--no-force-with-lease\" will cancel all the previous --force-with-lease on the command line."
msgstr ""
+"A op챌찾o `--no-force-with-lease` cancelar찼 todos os `--force-with-lease` "
+"anteriores na linha de comando."
#. type: Plain text
#: en/git-push.txt:288
@@ -38344,7 +38681,7 @@ msgstr ""
#: en/git-push.txt:307
#, no-wrap, priority:220
msgid "\tgit push --force-with-lease origin-push\n"
-msgstr ""
+msgstr "\tgit push --force-with-lease origin-push\n"
#. type: Plain text
#: en/git-push.txt:312
@@ -38361,6 +38698,10 @@ msgid ""
"\tgit rebase -i master # rewrite some commits\n"
"\tgit push --force-with-lease=master:base master:master\n"
msgstr ""
+"\tgit fetch # atualiza o 'master' remotamente\n"
+"\tgit tag base master # marca o ponto da nossa base\n"
+"\tgit rebase -i master # reescreve alguns commits\n"
+"\tgit push --force-with-lease=master:base master:master\n"
#. type: Plain text
#: en/git-push.txt:323
@@ -38390,7 +38731,7 @@ msgstr ""
#: en/git-push.txt:344
#, no-wrap, priority:220
msgid "--repo=<repository>"
-msgstr ""
+msgstr "--repo=<reposit처rio>"
#. type: Plain text
#: en/git-push.txt:347
@@ -38426,7 +38767,7 @@ msgstr ""
#: en/git-push.txt:378
#, no-wrap, priority:220
msgid "--recurse-submodules=check|on-demand|only|no"
-msgstr ""
+msgstr "--recurse-submodules=check|on-demand|only|no"
#. type: Plain text
#: en/git-push.txt:392
@@ -38547,15 +38888,15 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:461
-#, fuzzy, priority:220
+#, priority:220
msgid "The remote end refused the update. Usually caused by a hook on the remote side, or because the remote repository has one of the following safety options in effect: `receive.denyCurrentBranch` (for pushes to the checked out branch), `receive.denyNonFastForwards` (for forced non-fast-forward updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. See linkgit:git-config[1]."
msgstr ""
-"The remote end refused the update. Usually caused by a hook on the remote "
-"side, or because the remote repository has one of the following safety "
-"options in effect: `receive.denyCurrentBranch` (for pushes to the checked "
-"out branch), `receive.denyNonFastForwards` (for forced non-fast-forward "
-"updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. Consulte "
-"linkgit:git-config[1]."
+"Quando o lado remoto recusa a atualiza챌찾o. Geralmente causada por um gancho "
+"no lado remoto ou porque o reposit처rio remoto possui uma das seguintes "
+"op챌천es de seguran챌a em vigor: `receive.denyCurrentBranch` (para um `push` "
+"feiro em um ramo verificado), `receive.denyNonFastForwards` (para "
+"atualiza챌천es impostas ou r찼pidas), `receive.denyDeletes` ou "
+"`receive.denyDeleteCurrent`. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/git-push.txt:462
@@ -38667,6 +39008,9 @@ msgid ""
" / /\n"
" ---X---A\n"
msgstr ""
+" B---C\n"
+" / /\n"
+" ---X---A\n"
#. type: Plain text
#: en/git-push.txt:540
@@ -38688,6 +39032,9 @@ msgid ""
" / /\n"
" ---X---A\n"
msgstr ""
+" B D\n"
+" / /\n"
+" ---X---A\n"
#. type: Plain text
#: en/git-push.txt:556
@@ -38859,6 +39206,9 @@ msgid ""
"\t\t \\\n"
"\t\t X---Y---Z dev\n"
msgstr ""
+"\t o---o---o---A---B origin/master\n"
+"\t\t \\\n"
+"\t\t X---Y---Z dev\n"
#. type: Plain text
#: en/git-push.txt:658
@@ -38874,6 +39224,9 @@ msgid ""
"\t\t /\n"
"\t o---o---o---X---Y---Z master\n"
msgstr ""
+"\t\t A---B (ramo sem nome)\n"
+"\t\t /\n"
+"\t o---o---o---X---Y---Z master\n"
#. type: Plain text
#: en/git-push.txt:668
@@ -42574,6 +42927,21 @@ msgid ""
"'git remote prune' [-n | --dry-run] <name>...\n"
"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
msgstr ""
+"'git remote' [-v | --verbose]\n"
+"'git remote add' [-t <ramo>] [-m <master>] [-f] [--[no-]tags] "
+"[--mirror=<fetch|push>] <name> <url>\n"
+"'git remote rename' <antigo> <novo>\n"
+"'git remote remove' <nome>\n"
+"'git remote set-head' <nome> (-a | --auto | -d | --delete | <ramo>)\n"
+"'git remote set-branches' [--add] <nome> <ramo>...\n"
+"'git remote get-url' [--push] [--all] <nome>\n"
+"'git remote set-url' [--push] <nome> <newurl> [<oldurl>]\n"
+"'git remote set-url --add' [--push] <nome> <newurl>\n"
+"'git remote set-url --delete' [--push] <nome> <url>\n"
+"'git remote' [-v | --verbose] 'show' [-n] <nome>...\n"
+"'git remote prune' [-n | --dry-run] <nome>...\n"
+"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<grupo> | "
+"<remoto>)...]\n"
#. type: Plain text
#: en/git-remote.txt:30
@@ -42616,12 +42984,16 @@ msgstr ""
#, priority:220
msgid "With `--tags` option, `git fetch <name>` imports every tag from the remote repository."
msgstr ""
+"Com a op챌찾o `--tags`, o `git fetch <nome>` importa cada tag do reposit처rio "
+"remoto."
#. type: Plain text
#: en/git-remote.txt:61
#, priority:220
msgid "With `--no-tags` option, `git fetch <name>` does not import tags from the remote repository."
msgstr ""
+"Com a op챌찾o `--no-tags`, o `git fetch <nome>` n찾o importa as tags do "
+"reposit처rio remoto."
#. type: Plain text
#: en/git-remote.txt:64
@@ -42855,15 +43227,15 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
-#, fuzzy, priority:220
+#, priority:220
msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated. (See linkgit:git-config[1])."
msgstr ""
-"Fetch updates for remotes or remote groups in the repository as defined by "
-"remotes.<group>. If neither group nor remote is specified on the command "
-"line, the configuration parameter remotes.default will be used; if "
-"remotes.default is not defined, all remotes which do not have the "
-"configuration parameter remote.<name>.skipDefaultUpdate set to true will be "
-"updated. (Consulte linkgit:git-config[1])."
+"Busca atualiza챌천es remoras ou em grupos remotos no reposit처rio como definido "
+"em `remotes.<group>`. Caso nenhum grupo local ou remoto seja especificado "
+"na linha de comandos, o par창metro `remotes.default` ser찼 utilizado; caso "
+"`remotes.default` n찾o esteja definido, todos os remotos que n찾o possuem o "
+"par창metro de configura챌찾o `remote.<name>.skipDefaultUpdate` definido como "
+"`true` ser찾o atualizados. (Consulte linkgit:git-config[1])."
#. type: Plain text
#: en/git-remote.txt:197
@@ -42982,16 +43354,18 @@ msgstr ""
#. type: Plain text
#: en/git-repack.txt:59
-#, fuzzy, priority:100
+#, priority:100
msgid "Same as `-a`, unless `-d` is used. Then any unreachable objects in a previous pack become loose, unpacked objects, instead of being left in the old pack. Unreachable objects are never intentionally added to a pack, even when repacking. This option prevents unreachable objects from being immediately deleted by way of being left in the old pack and then removed. Instead, the loose unreachable objects will be pruned according to normal expiry rules with the next 'git gc' invocation. See linkgit:git-gc[1]."
msgstr ""
-"Same as `-a`, unless `-d` is used. Then any unreachable objects in a "
-"previous pack become loose, unpacked objects, instead of being left in the "
-"old pack. Unreachable objects are never intentionally added to a pack, even "
-"when repacking. This option prevents unreachable objects from being "
-"immediately deleted by way of being left in the old pack and then removed. "
-"Instead, the loose unreachable objects will be pruned according to normal "
-"expiry rules with the next 'git gc' invocation. Consulte linkgit:git-gc[1]."
+"O mesmo que `-a`, a menos que`-d` seja utilizado. Em seguida todos os "
+"objetos inacess챠veis em um pacote anterior tornam-se objetos soltos e "
+"descompactados em vez de serem deixados no pacote antigo. Objetos "
+"inacess챠veis nunca s찾o adicionados intencionalmente a um pacote, mesmo "
+"quando reempacotados. Essa op챌찾o previne que os objetos inacess챠veis sejam "
+"exclu챠dos imediatamente por terem sido deixados no pacote antigo e ent찾o "
+"removidos. Em vez disso, os objetos inacess챠veis soltos ser찾o removidos de "
+"acordo com as regras normais de expira챌찾o com a pr처xima invoca챌찾o 'git gc'. "
+"Consulte linkgit:git-gc[1]."
#. type: Plain text
#: en/git-repack.txt:65
@@ -43261,15 +43635,15 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:77
-#, fuzzy, priority:100
+#, priority:100
msgid "Edit an object's content interactively. The existing content for <object> is pretty-printed into a temporary file, an editor is launched on the file, and the result is parsed to create a new object of the same type as <object>. A replacement ref is then created to replace <object> with the newly created object. See linkgit:git-var[1] for details about how the editor will be chosen."
msgstr ""
-"Edit an object's content interactively. The existing content for <object> is "
-"pretty-printed into a temporary file, an editor is launched on the file, and "
-"the result is parsed to create a new object of the same type as <object>. A "
-"replacement ref is then created to replace <object> with the newly created "
-"object. Para mais detalhes de como o editor ser찼 escolhido, consulte linkgit"
-":git-var[1]."
+"Edita o conte첬do de um objeto interativamente. O conte첬do existente para "
+"`<object>` 챕 impresso em um arquivo tempor찼rio, um editor 챕 iniciado no "
+"arquivo e o resultado 챕 analisado para criar um novo objeto do mesmo tipo "
+"que `<object>`. Um `ref` de substitui챌찾o 챕 criado para substituir `<object>` "
+"com um objeto rec챕m-criado. Para mais detalhes de como o editor ser찼 "
+"escolhido, consulte linkgit:git-var[1]."
#. type: Plain text
#: en/git-replace.txt:85
@@ -43854,6 +44228,12 @@ msgid ""
"'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]\n"
"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]\n"
msgstr ""
+"'git reset' [-q] [<tree-ish>] [--] <pathspec>...\n"
+"'git reset' [-q] [--pathspec-from-file=<arquivo> [--pathspec-file-nul]] "
+"[<tree-ish>]\n"
+"'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]\n"
+"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] "
+"[<commit>]\n"
#. type: Plain text
#: en/git-reset.txt:22
@@ -43872,6 +44252,8 @@ msgstr "'git reset' [-q] [<tree-ish>] [--] <pathspec>..."
#, no-wrap, priority:280
msgid "'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]"
msgstr ""
+"'git reset' [-q] [--pathspec-from-file=<arquivo> [--pathspec-file-nul]] "
+"[<tree-ish>]"
#. type: Plain text
#: en/git-reset.txt:28
@@ -44057,6 +44439,10 @@ msgid ""
"$ edit <2>\n"
"$ git commit -a -c ORIG_HEAD <3>\n"
msgstr ""
+"$ git commit ...\n"
+"$ git reset --soft HEAD^ <1>\n"
+"$ edit <2>\n"
+"$ git commit -a -c ORIG_HEAD <3>\n"
#. type: Plain text
#: en/git-reset.txt:165
@@ -44131,6 +44517,8 @@ msgid ""
"$ git commit ...\n"
"$ git reset --hard HEAD~3 <1>\n"
msgstr ""
+"$ git commit ...\n"
+"$ git reset --hard HEAD~3 <1>\n"
#. type: Plain text
#: en/git-reset.txt:199
@@ -44158,6 +44546,15 @@ msgid ""
"Fast-forward\n"
"$ git reset --hard ORIG_HEAD <4>\n"
msgstr ""
+"$ git pull <1>\n"
+"Mesclagem autom찼tica do nitfol\n"
+"CONFLITO (conte첬do): Houve um conflito durante a mesclagem com nitfol\n"
+"A mesclagem autom찼tica falhou; arrume os conflitos e fa챌a um novo commit.\n"
+"$ git reset --hard <2>\n"
+"$ git pull . topic/branch <3>\n"
+"Atualizando de 41223... to 13134...\n"
+"Fast-forward\n"
+"$ git reset --hard ORIG_HEAD <4>\n"
#. type: Plain text
#: en/git-reset.txt:217
@@ -44245,42 +44642,61 @@ msgid ""
"$ git reset --soft HEAD^ ;# go back to WIP state <2>\n"
"$ git reset <3>\n"
msgstr ""
+"$ git switch feature ;# voc챗 estava trabalhando no ramo \"feature\" e\n"
+"$ work work work ;# foi interrompido\n"
+"$ git commit -a -m \"snapshot WIP\" <1>\n"
+"$ git switch master\n"
+"$ fix fix fix\n"
+"$ git commit ;# faz o commit com o registro log real\n"
+"$ git switch feature\n"
+"$ git reset --soft HEAD^ ;# volta para a condi챌찾o anterior de trabalho <2>\n"
+"$ git reset <3>\n"
#. type: Plain text
#: en/git-reset.txt:270
#, priority:280
msgid "This commit will get blown away so a throw-away log message is OK."
msgstr ""
+"Este commit ser찼 desfeito de modo que o descarte de uma mensagem de registro "
+"log seja OK."
#. type: Plain text
#: en/git-reset.txt:272
#, priority:280
msgid "This removes the 'WIP' commit from the commit history, and sets your working tree to the state just before you made that snapshot."
msgstr ""
+"Isso remove o commit 'WIP' do hist처rico e define a sua 찼rvore de trabalho "
+"para a condi챌찾o anterior antes de voc챗 fazer este instant창neo."
#. type: Plain text
#: en/git-reset.txt:275
#, priority:280
msgid "At this point the index file still has all the WIP changes you committed as 'snapshot WIP'. This updates the index to show your WIP files as uncommitted."
msgstr ""
+"Neste ponto o arquivo do 챠ndice ainda possui todas as altera챌천es do `WIP` "
+"que voc챗 fez o commit como 'instant창neo WIP'. Isso faz a atualiza챌찾o do "
+"챠ndice para mostrar que os seus arquivos WIP est찾o inalterados."
#. type: Plain text
#: en/git-reset.txt:277
#, priority:280
msgid "See also linkgit:git-stash[1]."
-msgstr ""
+msgstr "Consulte tamb챕m linkgit:git-stash[1]."
#. type: Labeled list
#: en/git-reset.txt:278
#, no-wrap, priority:280
msgid "Reset a single file in the index"
-msgstr ""
+msgstr "Redefine um 첬nico arquivo no 챠ndice"
#. type: Plain text
#: en/git-reset.txt:283
#, priority:280
msgid "Suppose you have added a file to your index, but later decide you do not want to add it to your commit. You can remove the file from the index while keeping your changes with git reset."
msgstr ""
+"Suponha que voc챗 tenha adicionado um arquivo ao seu 챠ndice mas depois decida "
+"que voc챗 n찾o quer mais adicion찼-lo ao seu commit. Voc챗 pode remover o "
+"arquivo do 챠ndice enquanto mant챕m suas altera챌천es com o `git reset`."
#. type: delimited block -
#: en/git-reset.txt:288
@@ -44290,36 +44706,47 @@ msgid ""
"$ git commit -m \"Commit files in index\" <2>\n"
"$ git add frotz.c <3>\n"
msgstr ""
+"$ git reset -- frotz.c <1>\n"
+"$ git commit -m \"Faz o commit dos arquivos no 챠ndice\" <2>\n"
+"$ git add frotz.c <3>\n"
#. type: Plain text
#: en/git-reset.txt:292
#, priority:280
msgid "This removes the file from the index while keeping it in the working directory."
msgstr ""
+"Isso remove o arquivo do 챠ndice enquanto o mant챕m no diret처rio de trabalho."
#. type: Plain text
#: en/git-reset.txt:293
#, priority:280
msgid "This commits all other changes in the index."
-msgstr ""
+msgstr "Isso faz o commit de todas as outras modifica챌천es no 챠ndice."
#. type: Plain text
#: en/git-reset.txt:294
#, priority:280
msgid "Adds the file to the index again."
-msgstr ""
+msgstr "Adiciona o arquivo ao 챠ndice novamente."
#. type: Labeled list
#: en/git-reset.txt:295
#, no-wrap, priority:280
msgid "Keep changes in working tree while discarding some previous commits"
msgstr ""
+"Mantenha as altera챌천es na 찼rvore de trabalho ao descartar alguns commits "
+"anteriores"
#. type: Plain text
#: en/git-reset.txt:302
#, priority:280
msgid "Suppose you are working on something and you commit it, and then you continue working a bit more, but now you think that what you have in your working tree should be in another branch that has nothing to do with what you committed previously. You can start a new branch and reset it while keeping the changes in your working tree."
msgstr ""
+"Suponha que voc챗 esteja trabalhando em algo e faz o commit, voc챗 continua "
+"trabalhando mais um pouco, por챕m agora voc챗 acha que o que tem na sua 찼rvore "
+"de trabalho deve estar em outro ramo que n찾o tem nada a ver com o commit que "
+"voc챗 fez anteriormente. Voc챗 pode iniciar um novo ramo e redefini-lo, "
+"mantendo as altera챌천es na sua 찼rvore de trabalho."
#. type: delimited block -
#: en/git-reset.txt:311
@@ -44333,36 +44760,55 @@ msgid ""
"$ git switch -c branch2 <2>\n"
"$ git reset --keep start <3>\n"
msgstr ""
+"$ git tag start\n"
+"$ git switch -c branch1\n"
+"$ edit\n"
+"$ git commit ... <1>\n"
+"$ edit\n"
+"$ git switch -c branch2 <2>\n"
+"$ git reset --keep start <3>\n"
#. type: Plain text
#: en/git-reset.txt:314
#, priority:280
msgid "This commits your first edits in `branch1`."
-msgstr ""
+msgstr "Isso faz o commit das suas primeiras edi챌천es em `branch1`."
#. type: Plain text
#: en/git-reset.txt:318
#, priority:280
msgid "In the ideal world, you could have realized that the earlier commit did not belong to the new topic when you created and switched to `branch2` (i.e. `git switch -c branch2 start`), but nobody is perfect."
msgstr ""
+"Em um mundo ideal voc챗 poderia ter percebido que o commit anterior n찾o "
+"pertencia ao novo t처pico quando voc챗 criou e alternou para o \"branch2\" ("
+"i.e. \"switch -c branch2 start\"), mas ningu챕m 챕 perfeito."
#. type: Plain text
#: en/git-reset.txt:320
#, priority:280
msgid "But you can use `reset --keep` to remove the unwanted commit after you switched to `branch2`."
msgstr ""
+"Por챕m 챕 poss챠vel쨈 usar a op챌찾o `reset --keep` para remover o commit "
+"indesejado depois de alternar para `branch2`."
#. type: Labeled list
#: en/git-reset.txt:321
#, no-wrap, priority:280
msgid "Split a commit apart into a sequence of commits"
-msgstr ""
+msgstr "Divida um commit em uma sequ챗ncia de commits"
#. type: Plain text
#: en/git-reset.txt:329
#, priority:280
msgid "Suppose that you have created lots of logically separate changes and committed them together. Then, later you decide that it might be better to have each logical chunk associated with its own commit. You can use git reset to rewind history without changing the contents of your local files, and then successively use `git add -p` to interactively select which hunks to include into each commit, using `git commit -c` to pre-populate the commit message."
msgstr ""
+"Suponha que voc챗 tenha criado muitas altera챌천es logicamente separados e "
+"tenha feito o commit deles juntos. Depois, voc챗 decide que seria melhor ter "
+"cada peda챌o l처gico associado ao seu pr처prio commit. Voc챗 pode usar o `git "
+"reset` para retroceder o hist처rico sem alterar o conte첬do dos seus arquivos "
+"locais e sucessivamente usar `git add -p` para selecionar interativamente "
+"quais os blocos deseja incluir em cada confirma챌찾o usando o `git commit -c` "
+"para preencher previamente a mensagem de commit."
#. type: delimited block -
#: en/git-reset.txt:339
@@ -44377,24 +44823,45 @@ msgid ""
"$ git diff --cached <7>\n"
"$ git commit ... <8>\n"
msgstr ""
+"$ git reset -N HEAD^ <1>\n"
+"$ git add -p <2>\n"
+"$ git diff --cached <3>\n"
+"$ git commit -c HEAD@{1} <4>\n"
+"... <5>\n"
+"$ git add ... <6>\n"
+"$ git diff --cached <7>\n"
+"$ git commit ... <8>\n"
#. type: Plain text
#: en/git-reset.txt:345
#, priority:280
msgid "First, reset the history back one commit so that we remove the original commit, but leave the working tree with all the changes. The -N ensures that any new files added with `HEAD` are still marked so that `git add -p` will find them."
msgstr ""
+"Primeiro, faz o reset do hist처rico um commit para tr찼s para que possamos "
+"remover o commit original, por챕m, deixe a 찼rvore de trabalho com todas as "
+"altera챌천es. O `-N` garante que quaisquer novos arquivos adicionados com "
+"`HEAD`, ainda sejam marcados para que o `git add -p` os encontre."
#. type: Plain text
#: en/git-reset.txt:349
#, priority:280
msgid "Next, we interactively select diff hunks to add using the `git add -p` facility. This will ask you about each diff hunk in sequence and you can use simple commands such as \"yes, include this\", \"No don't include this\" or even the very powerful \"edit\" facility."
msgstr ""
+"Em seguida, selecionamos interativamente os blocos das diferen챌as para serem "
+"adicionas usando o recurso `git add -p`. Isso lhe perguntar찼 sobre cada "
+"peda챌o diff em sequ챗ncia, assim voc챗 poder찼 usar de comandos simples como \""
+"yes, include this\" (sim, inclua isso), \"no don't include this\" (n찾o, n찾o "
+"inclua isso) ou mesmo o poderoso recurso \"edit\" (editar)."
#. type: Plain text
#: en/git-reset.txt:353
#, priority:280
msgid "Once satisfied with the hunks you want to include, you should verify what has been prepared for the first commit by using `git diff --cached`. This shows all the changes that have been moved into the index and are about to be committed."
msgstr ""
+"Uma vez satisfeito com os blocos que deseja incluir, voc챗 deve verificar o "
+"que foi preparado para o primeiro commit usando a op챌찾o `git diff --cached`. "
+"Isso exibe todas as altera챌천es que foram movidas para o 챠ndice e que est찾o "
+"prontas para o commit."
#. type: Plain text
#: en/git-reset.txt:360
@@ -44414,48 +44881,66 @@ msgstr ""
#, priority:280
msgid "You can repeat steps 2-4 multiple times to break the original code into any number of commits."
msgstr ""
+"Voc챗 pode repetir os passos 2-4 diversas vezes para quebrar o c처digo "
+"originam em diversos commits."
#. type: Plain text
#: en/git-reset.txt:365
#, priority:280
msgid "Now you've split out many of the changes into their own commits, and might no longer use the patch mode of `git add`, in order to select all remaining uncommitted changes."
msgstr ""
+"Agora que voc챗 dividiu diversas altera챌천es em seus pr처prios commits e pode "
+"n찾o mais usar o modo patch do `git add`, para que possa selecionar todas os "
+"commits restantes que n찾o foram alterados."
#. type: Plain text
#: en/git-reset.txt:368
#, priority:280
msgid "Once again, check to verify that you've included what you want to. You may also wish to verify that git diff doesn't show any remaining changes to be committed later."
msgstr ""
+"Novamente, verifique se voc챗 incluiu o que deseja. Voc챗 tamb챕m deve "
+"verificar se o `git diff` n찾o exibe nenhuma outra altera챌찾o restante nos "
+"commits que ser찾o realizados depois."
#. type: Plain text
#: en/git-reset.txt:369
#, priority:280
msgid "And finally create the final commit."
-msgstr ""
+msgstr "E finalmente, crie o commit final."
#. type: Plain text
#: en/git-reset.txt:375
#, priority:280
msgid "The tables below show what happens when running:"
-msgstr ""
+msgstr "As tabelas abaixo mostram o que acontece ao executar:"
#. type: delimited block -
#: en/git-reset.txt:378
#, no-wrap, priority:280
msgid "git reset --option target\n"
-msgstr ""
+msgstr "git reset --option target\n"
#. type: Plain text
#: en/git-reset.txt:382
#, priority:280
msgid "to reset the `HEAD` to another commit (`target`) with the different reset options depending on the state of the files."
msgstr ""
+"para redefinir o `HEAD` para outro commit (` target`) com as diferentes "
+"op챌천es de redefini챌찾o, dependendo do estado dos arquivos."
#. type: Plain text
#: en/git-reset.txt:391
#, priority:280
msgid "In these tables, `A`, `B`, `C` and `D` are some different states of a file. For example, the first line of the first table means that if a file is in state `A` in the working tree, in state `B` in the index, in state `C` in `HEAD` and in state `D` in the target, then `git reset --soft target` will leave the file in the working tree in state `A` and in the index in state `B`. It resets (i.e. moves) the `HEAD` (i.e. the tip of the current branch, if you are on one) to `target` (which has the file in state `D`)."
msgstr ""
+"Nas tabelas, `A`, `B`, `C` e `D` s찾o algumas diferen챌as entre as condi챌천es "
+"de um arquivo. Por exemplo, a primeira linha da primeira tabela significa "
+"que caso um arquivo esteja no estado `A` na 찼rvore de trabalho, no estado` B`"
+" no 챠ndice, no estado `C` em `HEAD` e no estado `D` no alvo, o `git reset --"
+"soft target` deixar찼 o arquivo na 찼rvore de trabalho no estado `A` e o "
+"챠ndice no estado `B`. Ele redefine (ou seja, move) o `HEAD` (ou seja, o "
+"topo do ramo atual, caso tenha um) para `target` (que tem o arquivo no "
+"estado `D`)."
#. type: delimited block .
#: en/git-reset.txt:400
@@ -44469,6 +44954,13 @@ msgid ""
"\t\t\t --merge (disallowed)\n"
"\t\t\t --keep (disallowed)\n"
msgstr ""
+"working index HEAD target working index HEAD\n"
+"----------------------------------------------------\n"
+" A B C D --soft A B D\n"
+"\t\t\t --mixed A D D\n"
+"\t\t\t --hard D D D\n"
+"\t\t\t --merge (desaprovado)\n"
+"\t\t\t --keep (desaprovado)\n"
#. type: delimited block .
#: en/git-reset.txt:410
@@ -44482,6 +44974,13 @@ msgid ""
"\t\t\t --merge (disallowed)\n"
"\t\t\t --keep A C C\n"
msgstr ""
+"working index HEAD target working index HEAD\n"
+"----------------------------------------------------\n"
+" A B C C --soft A B C\n"
+"\t\t\t --mixed A C C\n"
+"\t\t\t --hard C C C\n"
+"\t\t\t --merge (desaprovado)\n"
+"\t\t\t --keep A C C\n"
#. type: delimited block .
#: en/git-reset.txt:420
@@ -44495,6 +44994,13 @@ msgid ""
"\t\t\t --merge D D D\n"
"\t\t\t --keep (disallowed)\n"
msgstr ""
+"working index HEAD target working index HEAD\n"
+"----------------------------------------------------\n"
+" B B C D --soft B B D\n"
+"\t\t\t --mixed B D D\n"
+"\t\t\t --hard D D D\n"
+"\t\t\t --merge D D D\n"
+"\t\t\t --keep (desaprovado)\n"
#. type: delimited block .
#: en/git-reset.txt:430
@@ -44508,6 +45014,13 @@ msgid ""
"\t\t\t --merge C C C\n"
"\t\t\t --keep B C C\n"
msgstr ""
+"working index HEAD target working index HEAD\n"
+"----------------------------------------------------\n"
+" B B C C --soft B B C\n"
+"\t\t\t --mixed B C C\n"
+"\t\t\t --hard C C C\n"
+"\t\t\t --merge C C C\n"
+"\t\t\t --keep B C C\n"
#. type: delimited block .
#: en/git-reset.txt:440
@@ -44521,6 +45034,13 @@ msgid ""
"\t\t\t --merge (disallowed)\n"
"\t\t\t --keep (disallowed)\n"
msgstr ""
+"working index HEAD target working index HEAD\n"
+"----------------------------------------------------\n"
+" B C C D --soft B C D\n"
+"\t\t\t --mixed B D D\n"
+"\t\t\t --hard D D D\n"
+"\t\t\t --merge (desaprovado)\n"
+"\t\t\t --keep (desaprovado)\n"
#. type: delimited block .
#: en/git-reset.txt:450
@@ -44534,6 +45054,13 @@ msgid ""
"\t\t\t --merge B C C\n"
"\t\t\t --keep B C C\n"
msgstr ""
+"working index HEAD target working index HEAD\n"
+"----------------------------------------------------\n"
+" B C C C --soft B C C\n"
+"\t\t\t --mixed B C C\n"
+"\t\t\t --hard C C C\n"
+"\t\t\t --merge B C C\n"
+"\t\t\t --keep B C C\n"
#. type: Plain text
#: en/git-reset.txt:460
@@ -44565,6 +45092,13 @@ msgid ""
"\t\t\t --merge B B B\n"
"\t\t\t --keep (disallowed)\n"
msgstr ""
+"working index HEAD target working index HEAD\n"
+"----------------------------------------------------\n"
+" X U A B --soft (desaprovado)\n"
+"\t\t\t --mixed X B B\n"
+"\t\t\t --hard B B B\n"
+"\t\t\t --merge B B B\n"
+"\t\t\t --keep (desaprovado)\n"
#. type: delimited block .
#: en/git-reset.txt:491
@@ -44578,6 +45112,13 @@ msgid ""
"\t\t\t --merge A A A\n"
"\t\t\t --keep (disallowed)\n"
msgstr ""
+"working index HEAD target working index HEAD\n"
+"----------------------------------------------------\n"
+" X U A A --soft (desaprovado)\n"
+"\t\t\t --mixed X A A\n"
+"\t\t\t --hard A A A\n"
+"\t\t\t --merge A A A\n"
+"\t\t\t --keep (desaprovado)\n"
#. type: Plain text
#: en/git-reset.txt:494
@@ -44628,52 +45169,61 @@ msgstr ""
#: en/git-restore.txt:33 en/git-switch.txt:33
#, priority:100
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
-msgstr ""
+msgstr "ESTE COMANDO 횋 EXPERIMENTAL. O SEU COMPORTAMENTO PODE MUDAR."
#. type: Labeled list
#: en/git-restore.txt:36
#, no-wrap, priority:100
msgid "-s <tree>"
-msgstr "-s <tree>"
+msgstr "-s <찼rvore>"
#. type: Labeled list
#: en/git-restore.txt:37
#, no-wrap, priority:100
msgid "--source=<tree>"
-msgstr "--source=<tree>"
+msgstr "--source=<찼rvore>"
#. type: Plain text
#: en/git-restore.txt:41
#, priority:100
msgid "Restore the working tree files with the content from the given tree. It is common to specify the source tree by naming a commit, branch or tag associated with it."
msgstr ""
+"Restaure arquivos da 찼rvore de trabalho com o conte첬do da 찼rvore informada. "
+"횋 comum especificar a 찼rvore de origem nomeando um commit, ramo ou tag "
+"associado com ela."
#. type: Plain text
#: en/git-restore.txt:46
#, priority:100
msgid "If not specified, the default restore source for the working tree is the index, and the default restore source for the index is `HEAD`. When both `--staged` and `--worktree` are specified, `--source` must also be specified."
msgstr ""
+"Caso n찾o seja especificado, o 챠ndice 챕 a fonte de restaura챌찾o predefinida "
+"para a 찼rvore de trabalho e a fonte de restaura챌찾o predefinida para o 챠ndice "
+"챕 `HEAD '. Quando `--staged` e `--worktree` s찾o informados, a op챌찾o "
+"`--source` tamb챕m deve ser usada."
#. type: Plain text
#: en/git-restore.txt:53
#, priority:100
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
-"Selecione a diferen챌a entre os blocos interativamente entre a origem da "
-"restaura챌찾o e o local da restaura챌찾o. Consulte a se챌찾o ``Modo Interativo'' "
-"do linkgit:git-add[1] para aprender como operar o modo `--patch`."
+"Selecione a diferen챌a entre os blocos interativamente entre a origem e o "
+"local da restaura챌찾o. Consulte a se챌찾o ``Modo Interativo'' do linkgit:git-"
+"add[1] para aprender como operar o modo `--patch`."
#. type: Plain text
#: en/git-restore.txt:56
#, priority:100
msgid "Note that `--patch` can accept no pathspec and will prompt to restore all modified paths."
msgstr ""
+"Note que o comando `--patch` pode n찾o aceitar nenhum `pathspec` e solicitar찼 "
+"a restaura챌찾o de todos os caminhos modificados."
#. type: Labeled list
#: en/git-restore.txt:59
#, no-wrap, priority:100
msgid "-S"
-msgstr ""
+msgstr "-S"
#. type: Labeled list
#: en/git-restore.txt:60
@@ -44686,13 +45236,17 @@ msgstr "--staged"
#, priority:100
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
msgstr ""
+"Especifica o local da restaura챌찾o. 횋 predefinido que caso nenhuma op챌찾o seja "
+"usada, toda a 찼rvore de trabalho ser찼 restaurada. Ao usar a op챌찾o `--staged` "
+"apenas a 챠ndice ser찼 restaurado. A utiliza챌찾o de ambas as op챌천es faz a "
+"restaura챌찾o de ambos."
#. type: Plain text
#: en/git-restore.txt:68
#, priority:100
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
-"Silencioso, suprima as mensagens de feedback. Implica no uso da op챌찾o `--no-"
+"Silencioso, suprime todas as mensagens. Implica no uso da op챌찾o `--no-"
"progress`."
#. type: Plain text
@@ -44708,7 +45262,7 @@ msgstr ""
#, priority:100
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
msgstr ""
-"Note que durante o `git rebase` e` git pull --rebase`, o 'nosso' e o 'deles' "
+"Note que durante o `git rebase` e `git pull --rebase`, o 'nosso' e o 'deles' "
"podem aparecer trocados. Para mais detalhes, consulte a explica챌찾o das "
"mesmas op챌천es em linkgit:git-checkout[1]."
@@ -44731,6 +45285,11 @@ msgstr "--ignore-unmerged"
#, priority:100
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
msgstr ""
+"N찾o aborte a opera챌찾o ao restaurar os arquivos no 챠ndice da 찼rvore de "
+"trabalho caso existam entradas que n찾o foram mescladas e t찾o pouco as op챌천es "
+"`--ours`, `--theirs`, `--merge` ou `--conflict` tenham sido usadas. Nada "
+"acontece com os caminhos das 찼rvores de trabalho caso eles n찾o tenham sido "
+"mesclados."
#. type: Plain text
#: en/git-restore.txt:109
@@ -44747,14 +45306,18 @@ msgstr ""
#, priority:100
msgid "In overlay mode, the command never removes files when restoring. In no-overlay mode, tracked files that do not appear in the `--source` tree are removed, to make them match `<tree>` exactly. The default is no-overlay mode."
msgstr ""
+"No modo de sobreposi챌찾o, o comando nunca remove os arquivos durante a "
+"restaura챌찾o. No modo sem sobreposi챌찾o, os arquivos rastreados que n찾o "
+"aparecem na 찼rvore `--source` s찾o removidos para faz챗-los coincidir "
+"exatamente com a `<찼rvore>`. A predefini챌찾o 챕 sem sobreposi챌찾o."
#. type: Plain text
#: en/git-restore.txt:144
#, priority:100
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
msgstr ""
-"A sequ챗ncia a seguir muda para o ramo `master`, reverte o` Makefile` para "
-"duas revis천es anteriores, apaga o hello.c por engano e o recupera do 챠ndice."
+"A sequ챗ncia a seguir muda para o ramo `master`, reverte o `Makefile` para "
+"duas revis천es anteriores, exclui o hello.c por engano e o recupera do 챠ndice."
#. type: delimited block -
#: en/git-restore.txt:150
@@ -44774,7 +45337,7 @@ msgstr ""
#: en/git-restore.txt:154
#, priority:100
msgid "restore hello.c from the index"
-msgstr "restaurar o hello.c do 챠ndice"
+msgstr "restaura o hello.c do 챠ndice"
#. type: Plain text
#: en/git-restore.txt:157
@@ -44804,7 +45367,7 @@ msgstr ""
#: en/git-restore.txt:168
#, priority:100
msgid "To restore all files in the current directory"
-msgstr ""
+msgstr "Para restaurar todos os arquivos no diret처rio atual"
#. type: delimited block -
#: en/git-restore.txt:171
@@ -44831,6 +45394,8 @@ msgstr "$ git restore :/\n"
#, priority:100
msgid "To restore a file in the index to match the version in `HEAD` (this is the same as using linkgit:git-reset[1])"
msgstr ""
+"Para restaurar um arquivo no 챠ndice que coincida com a vers찾o em `HEAD` (챕 o "
+"mesmo que usar linkgit:git-reset[1])"
#. type: delimited block -
#: en/git-restore.txt:185
@@ -44843,18 +45408,20 @@ msgstr "$ git restore --staged hello.c\n"
#, priority:100
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
+"ou voc챗 pode restaurar o 챠ndice e a 찼rvore de trabalho (챕 o mesmo que usar "
+"linkgit:git-checkout[1])"
#. type: delimited block -
#: en/git-restore.txt:192
#, no-wrap, priority:100
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
-msgstr ""
+msgstr "$ git restore --source=HEAD --staged --worktree hello.c\n"
#. type: Plain text
#: en/git-restore.txt:195
#, priority:100
msgid "or the short form which is more practical but less readable:"
-msgstr ""
+msgstr "ou a forma abreviada que 챕 mais pr찼tica, mas menos leg챠vel:"
#. type: delimited block -
#: en/git-restore.txt:198
@@ -44878,7 +45445,7 @@ msgstr "git-revert(1)"
#: en/git-revert.txt:7
#, priority:100
msgid "git-revert - Revert some existing commits"
-msgstr ""
+msgstr "git-revert - Reverte alguns commits existentes"
#. type: Plain text
#: en/git-revert.txt:13
@@ -44887,12 +45454,19 @@ msgid ""
"'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...\n"
"'git revert' (--continue | --skip | --abort | --quit)\n"
msgstr ""
+"'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] "
+"<commit>...\n"
+"'git revert' (--continue | --skip | --abort | --quit)\n"
#. type: Plain text
#: en/git-revert.txt:21
#, priority:100
msgid "Given one or more existing commits, revert the changes that the related patches introduce, and record some new commits that record them. This requires your working tree to be clean (no modifications from the HEAD commit)."
msgstr ""
+"Dado um ou mais commits existentes, reverta as altera챌천es que os patches "
+"relacionados introduziram e grave alguns commits novos que os gravam. Isto "
+"requer que a sua 찼rvore de trabalho esteja limpa (sem modifica챌천es do commit "
+"em `HEAD`)."
#. type: Plain text
#: en/git-revert.txt:30
@@ -45416,7 +45990,7 @@ msgstr ""
#: en/git-rev-parse.txt:182 en/rev-list-options.txt:166
#, no-wrap, priority:260
msgid "--exclude=<glob-pattern>"
-msgstr ""
+msgstr "--exclude=<glob-pattern>"
#. type: Plain text
#: en/git-rev-parse.txt:189 en/rev-list-options.txt:174
@@ -46014,6 +46588,9 @@ msgid ""
"\t [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n"
msgstr ""
+"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
+"\t [--quiet] [--pathspec-from-file=<arquivo> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
#. type: Plain text
#: en/git-rm.txt:27
@@ -47342,12 +47919,13 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:89
-#, fuzzy, priority:100
+#, priority:100
msgid "Pass the specified string as a push option for consumption by hooks on the server side. If the server doesn't support push options, error out. See linkgit:git-push[1] and linkgit:githooks[5] for details."
msgstr ""
-"Pass the specified string as a push option for consumption by hooks on the "
-"server side. If the server doesn't support push options, error out. Para "
-"mais detalhes consulte linkgit:git-push[1] e linkgit:githooks[5]."
+"Encaminha a string espec챠fica para uma op챌찾o `push` para ser utilizada por "
+"ganchos no lado do servidor. Caso o servidor n찾o seja compat챠vel com as "
+"op챌천es `push`, exibe erro. Para mais detalhes consulte linkgit:git-push[1] "
+"e linkgit:githooks[5]."
#. type: Labeled list
#: en/git-send-pack.txt:90
@@ -47393,15 +47971,16 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:128
-#, fuzzy, priority:100
+#, priority:100
msgid "Each pattern pair consists of the source side (before the colon) and the destination side (after the colon). The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side. The rules used to match a ref are the same rules used by 'git rev-parse' to resolve a symbolic ref name. See linkgit:git-rev-parse[1]."
msgstr ""
-"Each pattern pair consists of the source side (before the colon) and the "
-"destination side (after the colon). The ref to be pushed is determined by "
-"finding a match that matches the source side, and where it is pushed is "
-"determined by using the destination side. The rules used to match a ref are "
-"the same rules used by 'git rev-parse' to resolve a symbolic ref name. "
-"Consulte linkgit:git-rev-parse[1]."
+"Cada par de padr천es consiste no lado da origem (antes dos dois pontos) e no "
+"lado do destino (depois dos dois pontos). O `ref` a ser feito o `push` 챕 "
+"determinado localizando uma coincid챗ncia que corresponda com a origem e a "
+"localiza챌찾o da origem 챕 determinada usando o lado de destino. As regras "
+"utilizadas para coincidir com um `ref` s찾o os mesmos utilizados por `git rev-"
+"parse` para resolver um nome `ref` simb처lico. Consulte linkgit:git-rev-"
+"parse[1]."
#. type: Plain text
#: en/git-send-pack.txt:133
@@ -47671,6 +48250,8 @@ msgid ""
"'git shortlog' [<options>] [<revision range>] [[--] <path>...]\n"
"git log --pretty=short | 'git shortlog' [<options>]\n"
msgstr ""
+"'git shortlog' [<op챌천es>] [<faixa de revis천es>] [[--] <caminho>...]\n"
+"git log --pretty=short | 'git shortlog' [<op챌천es>]\n"
#. type: Plain text
#: en/git-shortlog.txt:18
@@ -47718,7 +48299,7 @@ msgstr ""
#: en/git-shortlog.txt:42
#, no-wrap, priority:260
msgid "--format[=<format>]"
-msgstr ""
+msgstr "--format[=<format>]"
#. type: Plain text
#: en/git-shortlog.txt:47
@@ -48846,6 +49427,9 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:240
msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
msgstr ""
+"push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] "
+"[-q|--quiet] [-m|--message <mensagem>] [--pathspec-from-file=<file> "
+"[--pathspec-file-nul]] [--] [<pathspec>...]"
#. type: Plain text
#: en/git-stash.txt:56
@@ -48864,6 +49448,8 @@ msgstr ""
#, no-wrap, priority:240
msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
+"save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] "
+"[-q|--quiet] [<mensagem>]"
#. type: Plain text
#: en/git-stash.txt:69
@@ -48915,7 +49501,7 @@ msgstr ""
#: en/git-stash.txt:97
#, no-wrap, priority:240
msgid "pop [--index] [-q|--quiet] [<stash>]"
-msgstr ""
+msgstr "pop [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
#: en/git-stash.txt:103
@@ -48933,7 +49519,7 @@ msgstr ""
#: en/git-stash.txt:108
#, no-wrap, priority:240
msgid "apply [--index] [-q|--quiet] [<stash>]"
-msgstr ""
+msgstr "apply [--index] [-q|--quiet] [<stash>]"
#. type: Plain text
#: en/git-stash.txt:113
@@ -48975,7 +49561,7 @@ msgstr ""
#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
-msgstr ""
+msgstr "drop [-q|--quiet] [<stash>]"
#. type: Plain text
#: en/git-stash.txt:136
@@ -49072,6 +49658,8 @@ msgstr ""
#, priority:240
msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
msgstr ""
+"A op챌찾o `--patch` implica no uso de `--keep-index`. Utilize a op챌찾o `--no-"
+"keep-index` para desconsiderar."
#. type: Plain text
#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
@@ -49133,6 +49721,9 @@ msgid ""
" / /\n"
" -----H----I\n"
msgstr ""
+" .----W\n"
+" / /\n"
+" -----H----I\n"
#. type: Plain text
#: en/git-stash.txt:260
@@ -49190,6 +49781,15 @@ msgid ""
"$ git reset --soft HEAD^\n"
"# ... continue hacking ...\n"
msgstr ""
+"# ... hack hack hack ...\n"
+"$ git switch -c my_wip\n"
+"$ git commit -a -m \"WIP\"\n"
+"$ git switch master\n"
+"$ edit emergency fix\n"
+"$ git commit -a -m \"Arruma na pressa\"\n"
+"$ git switch my_wip\n"
+"$ git reset --soft HEAD^\n"
+"# ... continue a hackear ...\n"
#. type: Plain text
#: en/git-stash.txt:306
@@ -49235,6 +49835,19 @@ msgid ""
"$ edit/build/test remaining parts\n"
"$ git commit foo -m 'Remaining parts'\n"
msgstr ""
+"# ... hack hack hack ...\n"
+"$ git add --patch foo # adiciona apenas a primeira parte ao "
+"챠ndice\n"
+"$ git stash push --keep-index # registre todas as outras modifica챌천es no "
+"stash\n"
+"$ edit/build/test first part\n"
+"$ git commit -m 'First part' # fa챌a o commit completo de todas as "
+"modifica챌천es testadas\n"
+"$ git stash pop # prepare para trabalhar em todas as outras "
+"modifica챌천es\n"
+"# ... repita os cinco passos acima at챕 que sobre apenas um commit ...\n"
+"$ edit/build/test remaining parts\n"
+"$ git commit foo -m 'Partes resultantes'\n"
#. type: Labeled list
#: en/git-stash.txt:334
@@ -49256,6 +49869,9 @@ msgid ""
"grep commit | cut -d\\ -f3 |\n"
"xargs git log --merges --no-walk --grep=WIP\n"
msgstr ""
+"git fsck --unreachable |\n"
+"grep commit | cut -d\\ -f3 |\n"
+"xargs git log --merges --no-walk --grep=WIP\n"
#. type: Plain text
#: en/git-stash.txt:355
@@ -49279,7 +49895,7 @@ msgstr ""
#: en/git-status.txt:13
#, ignore-ellipsis, no-wrap, priority:280
msgid "'git status' [<options>...] [--] [<pathspec>...]\n"
-msgstr ""
+msgstr "'git status' [<options>...] [--] [<pathspec>...]\n"
#. type: Plain text
#: en/git-status.txt:23
@@ -49309,7 +49925,7 @@ msgstr ""
#: en/git-status.txt:38
#, no-wrap, priority:280
msgid "--porcelain[=<version>]"
-msgstr ""
+msgstr "--porcelain[=<vers찾o>]"
#. type: Plain text
#: en/git-status.txt:43
@@ -49369,7 +49985,7 @@ msgstr ""
#: en/git-status.txt:102
#, no-wrap, priority:280
msgid "--ignored[=<mode>]"
-msgstr ""
+msgstr "--ignored[=<modo>]"
#. type: Plain text
#: en/git-status.txt:104
@@ -49740,6 +50356,14 @@ msgid ""
"\t\t\t\t\t the commit is present.\n"
"------------------------------------------------------------\n"
msgstr ""
+"Line Notes\n"
+"------------------------------------------------------------\n"
+"# branch.oid <commit> | (inicial) Commit atual.\n"
+"# branch.head <ramo> | (desanexado) Commit atual.\n"
+"# branch.upstream <ramo_upstream> caso o upstream esteja definido.\n"
+"# branch.ab +<adiante> -<atr찼s> caso o upstream esteja definido e\n"
+"\t\t\t\t\t o commit esteja presente.\n"
+"------------------------------------------------------------\n"
#. type: Title ^
#: en/git-status.txt:303
@@ -49757,25 +50381,27 @@ msgstr ""
#: en/git-status.txt:312
#, priority:280
msgid "Ordinary changed entries have the following format:"
-msgstr ""
+msgstr "Os itens comuns que foram alterados t챗m o seguinte formato:"
#. type: Plain text
#: en/git-status.txt:314
#, no-wrap, priority:280
msgid " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>\n"
-msgstr ""
+msgstr " 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <caminho>\n"
#. type: Plain text
#: en/git-status.txt:316
#, priority:280
msgid "Renamed or copied entries have the following format:"
-msgstr ""
+msgstr "As entradas que foram renomeadas ou copiadas t챗m o seguinte formato:"
#. type: Plain text
#: en/git-status.txt:318
#, no-wrap, priority:280
msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
+" 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <caminho><sep><caminho "
+"original>\n"
#. type: delimited block .
#: en/git-status.txt:349
@@ -49811,18 +50437,53 @@ msgid ""
"\t tells where the renamed/copied contents came from.\n"
"--------------------------------------------------------\n"
msgstr ""
+"Campo Significado\n"
+"--------------------------------------------------------\n"
+"<XY> Um campo com 2 caracteres contendo valores XY\n"
+"\t montados e n찾o montados descrito em um formato curto,\n"
+"\t sem modifica챌천es indicadas por um \".\" em vez de\n"
+"\t um espa챌o em branco.\n"
+"<sub> Um campo com 4 caracteres descrevendo a condi챌찾o do subm처dulo.\n"
+"\t \"N...\" quando a entrada n찾o for um subm처dulo.\n"
+"\t \"S<c><m><u>\" quando a entrada for um subm처dulo.\n"
+"\t <c> is \"C\" caso o commit seja modificado; sen찾o \".\".\n"
+"\t <m> is \"M\" caso haja mudan챌as rastreadas; sen찾o \".\".\n"
+"\t <u> is \"U\" caso n찾o haja mudan챌as rastreadas; sen찾o \".\".\n"
+"<mH> O modo de um arquivo octal no HEAD.\n"
+"<mI> O modo de um arquivo octal no index.\n"
+"<mW> O modo de um arquivo octal no 찼rvore de trabalho.\n"
+"<hH> O nome do objeto no HEAD.\n"
+"<hI> O nome do objeto no 챠ndice.\n"
+"<X><score> O renomeamento ou a c처pia do score \"placar\"(denota a "
+"porcentagem\n"
+"\t ou a similaridade entre a fonte e o destino da a챌찾o de\n"
+"\t mover ou copiar. Por exemplo, \"R100\" ou \"C75\".\n"
+"<path> O `pathname` \"nome do caminho\". Em um lan챌amento de renomea챌찾"
+"o/c처pia,\n"
+"\t este 챕 o caminho de destino.\n"
+"<sep> Quando a op챌찾o `-z` for utilizada, os 2 `pathnames` s찾o "
+"separados\n"
+"\t com um byte `NUL` (ASCII 0x00); sen찾o um byte tab (ASCII 0x09)\n"
+"\t que os separam.\n"
+"<origPath> O `pathname` dentro do commit localizado no HEAD ou no 챠ndice.\n"
+"\t S처 est찼 presente no caso de um lan챌amento de renomea챌찾o ou c처pia\n"
+"\t assim como informa de onde a renomea챌찾o ou c처pia vieram.\n"
+"--------------------------------------------------------\n"
#. type: Plain text
#: en/git-status.txt:353
#, priority:280
msgid "Unmerged entries have the following format; the first character is a \"u\" to distinguish from ordinary changed entries."
msgstr ""
+"As entradas que n찾o forem mescladas t챗m o seguinte formato; o primeiro "
+"caractere 챕 um \"u\" para se distinguir das entradas comum que foram "
+"alteradas."
#. type: Plain text
#: en/git-status.txt:355
#, no-wrap, priority:280
msgid " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>\n"
-msgstr ""
+msgstr " u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <caminho>\n"
#. type: delimited block .
#: en/git-status.txt:372
@@ -49844,84 +50505,126 @@ msgid ""
"<path> The pathname.\n"
"--------------------------------------------------------\n"
msgstr ""
+"Campo Significado\n"
+"--------------------------------------------------------\n"
+"<XY> Um campo com 2 caracteres descrevendo o tipo de conflito\n"
+"\t como descrito em um formato curto.\n"
+"<sub> Um campo com 4 caracteres descrevendo a condi챌찾o do subm처dulo\n"
+"\t como descrito abaixo.\n"
+"<m1> O modo de um arquivo octal no est찼gio 1.\n"
+"<m2> O modo de um arquivo octal no est찼gio 2.\n"
+"<m3> O modo de um arquivo octal no est찼gio 3.\n"
+"<mW> O modo de um arquivo octal na 찼rvore de trabalho.\n"
+"<h1> O nome do objeto no est찼gio 1.\n"
+"<h2> O nome do objeto no est찼gio 2.\n"
+"<h3> O nome do objeto no est찼gio 3.\n"
+"<path> O pathname.\n"
+"--------------------------------------------------------\n"
#. type: Title ^
#: en/git-status.txt:375
#, no-wrap, priority:280
msgid "Other Items"
-msgstr ""
+msgstr "Outros itens"
#. type: Plain text
#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
msgstr ""
+"Seguindo as entradas rastreadas (se for solicitado), uma s챕rie de linhas "
+"ser찼 impressa para os itens n찾o rastreados e depois ignorados para os itens "
+"encontrados na 찼rvore de trabalho."
#. type: Plain text
#: en/git-status.txt:382
#, priority:280
msgid "Untracked items have the following format:"
-msgstr ""
+msgstr "Itens n찾o rastreados t챗m o seguinte formato:"
#. type: Plain text
#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
-msgstr " ? <path>\n"
+msgstr " ? <caminho>\n"
#. type: Plain text
#: en/git-status.txt:386
#, priority:280
msgid "Ignored items have the following format:"
-msgstr ""
+msgstr "Os itens ignorados tem o seguinte formato:"
#. type: Plain text
#: en/git-status.txt:388
#, no-wrap, priority:280
msgid " ! <path>\n"
-msgstr ""
+msgstr " ! <caminho>\n"
#. type: Title ^
#: en/git-status.txt:390
#, no-wrap, priority:280
msgid "Pathname Format Notes and -z"
-msgstr ""
+msgstr "Notas sobre o formato do `pathname` e `-z`"
#. type: Plain text
#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
msgstr ""
+"Quando a op챌찾o `z` 챕 usada os `pathnames` s찾o exibidos como est찾o e sem "
+"nenhuma cita챌찾o e as linhas s찾o terminadas com um byte NUL (ASCII 0x00)."
#. type: Plain text
#: en/git-status.txt:399
#, priority:280
msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
+"Sem a op챌찾o `z`, os `pathnames` com caracteres \"incomuns\" s찾o citados "
+"conforme explicado na vari찼vel de configura챌찾o `core.quotePath` (consulte "
+"linkgit:git-config[1])."
#. type: Plain text
#: en/git-status.txt:408
#, priority:280
msgid "The command honors `color.status` (or `status.color` -- they mean the same thing and the latter is kept for backward compatibility) and `color.status.<slot>` configuration variables to colorize its output."
msgstr ""
+"O comando segue a vari찼vel `color.status` (ou `status.color`, ambos t챗m o "
+"mesmo significado, o 첬ltimo 챕 mantido para compatibilidade com vers천es "
+"anteriores). As vari찼veis de configura챌찾o `color.status.` serve para para "
+"colorir a sa챠da."
#. type: Plain text
#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
msgstr ""
+"Se a vari찼vel de configura챌찾o `status.relativePaths` estiver configurada "
+"como `false`, todos os caminhos exibidos ser찾o relativos 횪 raiz do "
+"reposit처rio e n찾o ao diret처rio atual."
#. type: Plain text
#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
msgstr ""
+"Se a vari찼vel `status.submoduleSummary` for definida como um n첬mero "
+"diferente de zero ou `true` (id챗ntico a `-1` ou um n첬mero ilimitado), o "
+"resumo do subm처dulo ser찼 ativado para o formato longo e um resumo das "
+"confirma챌천es para os subm처dulos modificados ser찾o exibidos (consulte a op챌찾o "
+"--summary-limit de linkgit:git-submodule[1]). Por favor note que a sa챠da "
+"resumida do comando status ser찼 suprimida para todos os subm처dulos quando a "
+"vari찼vle `diff.ignoreSubmodules` estiver definida como `all` ou apenas para "
+"aqueles subm처dulos em onde seja o mesmo que `submodule.<name>.ignore=all`. "
+"Para visualizar tamb챕m o resumo dos subm처dulos ignorados, voc챗 pode usar a "
+"op챌찾o de clinha de comando `--ignore-submodules=dirty ` ou o comando `git "
+"submodule summary`, que exibe uma sa챠da semelhante por챕m n찾o respeita estas "
+"configura챌천es."
#. type: Title -
#: en/git-status.txt:425
#, no-wrap, priority:280
msgid "BACKGROUND REFRESH"
-msgstr ""
+msgstr "ATUALIZA횉횄O DO PLANO DE FUNDO"
#. type: Plain text
#: en/git-status.txt:436
@@ -49950,7 +50653,7 @@ msgstr "git-stripspace(1)"
#: en/git-stripspace.txt:7
#, priority:100
msgid "git-stripspace - Remove unnecessary whitespace"
-msgstr ""
+msgstr "git-stripspace - Remove os espa챌os em branco desnecess찼rios"
#. type: Plain text
#: en/git-stripspace.txt:14
@@ -49959,48 +50662,57 @@ msgid ""
"'git stripspace' [-s | --strip-comments]\n"
"'git stripspace' [-c | --comment-lines]\n"
msgstr ""
+"'git stripspace' [-s | --strip-comments]\n"
+"'git stripspace' [-c | --comment-lines]\n"
#. type: Plain text
#: en/git-stripspace.txt:21
#, priority:100
msgid "Read text, such as commit messages, notes, tags and branch descriptions, from the standard input and clean it in the manner used by Git."
msgstr ""
+"Leia o texto, como mensagens de commit, notas, tags e suas respectivas "
+"descri챌천es das ramifica챌천es, da entrada predefinida e limpe-o da maneira "
+"usada pelo Git."
#. type: Plain text
#: en/git-stripspace.txt:23
#, priority:100
msgid "With no arguments, this will:"
-msgstr ""
+msgstr "Sem argumentos, isso ir찼:"
#. type: Plain text
#: en/git-stripspace.txt:25
#, priority:100
msgid "remove trailing whitespace from all lines"
-msgstr ""
+msgstr "remover os espa챌os em branco do final de todas as linhas"
#. type: Plain text
#: en/git-stripspace.txt:26
#, priority:100
msgid "collapse multiple consecutive empty lines into one empty line"
-msgstr ""
+msgstr "recolher as v찼rias linhas vazias consecutivas em apenas uma linha vazia"
#. type: Plain text
#: en/git-stripspace.txt:27
#, priority:100
msgid "remove empty lines from the beginning and end of the input"
-msgstr ""
+msgstr "remover as linhas vazias do in챠cio e do fim da entrada"
#. type: Plain text
#: en/git-stripspace.txt:28
#, priority:100
msgid "add a missing '\\n' to the last line if necessary."
msgstr ""
+"adiciona um '\\n"
+"' ausente 횪 첬ltima linha se for necess찼rio."
#. type: Plain text
#: en/git-stripspace.txt:31
#, priority:100
msgid "In the case where the input consists entirely of whitespace characters, no output will be produced."
msgstr ""
+"No caso em que a entrada consiste inteiramente em caracteres de espa챌o em "
+"branco, nenhuma sa챠da ser찼 produzida."
#. type: Plain text
#: en/git-stripspace.txt:35
@@ -50010,6 +50722,11 @@ msgid ""
"mode of linkgit:git-apply[1] for correcting whitespace of patches or files in\n"
"the repository.\n"
msgstr ""
+"* NOTA *: Destina-se 횪 limpeza de metadados, prefira o modo "
+"`--whitespace=fix`\n"
+"de linkgit:git-apply[1] para corrigir os espa챌os em branco dos patches ou os "
+"arquivos\n"
+"no reposit처rio.\n"
#. type: Labeled list
#: en/git-stripspace.txt:39
@@ -50022,6 +50739,8 @@ msgstr "--strip-comments"
#, priority:100
msgid "Skip and remove all lines starting with comment character (default '#')."
msgstr ""
+"Ignora e remove todas as linhas que come챌am com o caractere predefinido de "
+"coment찼rio ('#')."
#. type: Labeled list
#: en/git-stripspace.txt:43
@@ -50034,12 +50753,16 @@ msgstr "--comment-lines"
#, priority:100
msgid "Prepend comment character and blank to each line. Lines will automatically be terminated with a newline. On empty lines, only the comment character will be prepended."
msgstr ""
+"Coloque um caractere de coment찼rio previamente com espa챌o em branco em cada "
+"linha. As linhas ser찾o automaticamente terminadas com uma nova linha."
#. type: Plain text
#: en/git-stripspace.txt:52
#, priority:100
msgid "Given the following noisy input with '$' indicating the end of a line:"
msgstr ""
+"Dada a seguinte entrada barulhenta com sinal '$' indicando o final de uma "
+"linha:"
#. type: delimited block -
#: en/git-stripspace.txt:65
@@ -50057,12 +50780,23 @@ msgid ""
"|The end.$\n"
"| $\n"
msgstr ""
+"|Uma breve introdu챌찾o ao $\n"
+"| $\n"
+"|$\n"
+"|Um novo par찼grafo$\n"
+"|# com uma linha de coment찼rio $\n"
+"|explicando um monte de coisas.$\n"
+"|$\n"
+"|# Mais um par찼grafo antigo comentado. $\n"
+"| $\n"
+"|O fim.$\n"
+"| $\n"
#. type: Plain text
#: en/git-stripspace.txt:68
#, priority:100
msgid "Use 'git stripspace' with no arguments to obtain:"
-msgstr ""
+msgstr "Utilize `git stripspace` sem argumentos para obter:"
#. type: delimited block -
#: en/git-stripspace.txt:79
@@ -50078,12 +50812,21 @@ msgid ""
"|$\n"
"|The end.$\n"
msgstr ""
+"|Uma breve introdu챌찾o$\n"
+"|$\n"
+"|Um novo par찼grafo$\n"
+"|# com uma linha de coment찼rio$\n"
+"|explicando um monte de coisa.$\n"
+"|$\n"
+"|# Um par찼grafo antigo comentado.$\n"
+"|$\n"
+"|O fim.$\n"
#. type: Plain text
#: en/git-stripspace.txt:82
#, priority:100
msgid "Use 'git stripspace --strip-comments' to obtain:"
-msgstr ""
+msgstr "Utilize `git stripspace --strip-comments` para obter:"
#. type: delimited block -
#: en/git-stripspace.txt:90
@@ -50096,6 +50839,12 @@ msgid ""
"|$\n"
"|The end.$\n"
msgstr ""
+"|Uma breve introdu챌찾o$\n"
+"|$\n"
+"|Um novo par찼grafo$\n"
+"|explicando um monte de coisa.$\n"
+"|$\n"
+"|O fim.$\n"
#. type: Title =
#: en/git-submodule.txt:2
@@ -50107,7 +50856,7 @@ msgstr "git-submodule(1)"
#: en/git-submodule.txt:7
#, priority:220
msgid "git-submodule - Initialize, update or inspect submodules"
-msgstr ""
+msgstr "git-submodule - Inicialize, atualize ou inspecione os subm처dulos"
#. type: Plain text
#: en/git-submodule.txt:24
@@ -50126,12 +50875,25 @@ msgid ""
"'git submodule' [--quiet] sync [--recursive] [--] [<path>...]\n"
"'git submodule' [--quiet] absorbgitdirs [--] [<path>...]\n"
msgstr ""
+"'git submodule' [--quiet] [--cached]\n"
+"'git submodule' [--quiet] add [<op챌천es>] [--] <repository> [<caminho>]\n"
+"'git submodule' [--quiet] status [--cached] [--recursive] [--] [<caminho>...]"
+"\n"
+"'git submodule' [--quiet] init [--] [<caminho>...]\n"
+"'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <caminho>...)\n"
+"'git submodule' [--quiet] update [<op챌천es>] [--] [<caminho>...]\n"
+"'git submodule' [--quiet] set-branch [<op챌천es>] [--] <caminho>\n"
+"'git submodule' [--quiet] set-url [--] <caminho> <newurl>\n"
+"'git submodule' [--quiet] summary [<op챌천es>] [--] [<caminho>...]\n"
+"'git submodule' [--quiet] foreach [--recursive] <command>\n"
+"'git submodule' [--quiet] sync [--recursive] [--] [<caminho>...]\n"
+"'git submodule' [--quiet] absorbgitdirs [--] [<caminho>...]\n"
#. type: Plain text
#: en/git-submodule.txt:29
#, priority:220
msgid "Inspects, updates and manages submodules."
-msgstr ""
+msgstr "Inspeciona, atualiza e gerencia os subm처dulos."
#. type: Plain text
#: en/git-submodule.txt:31
@@ -50145,24 +50907,39 @@ msgstr ""
#, priority:220
msgid "With no arguments, shows the status of existing submodules. Several subcommands are available to perform operations on the submodules."
msgstr ""
+"Sem argumentos, exibe o estado dos subm처dulos existentes. V찼rios subm처dulos "
+"est찾o dispon챠veis para realizar opera챌천es nos subm처dulos."
#. type: Labeled list
#: en/git-submodule.txt:37
#, no-wrap, priority:220
msgid "add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]"
msgstr ""
+"add [-b <ramo>] [-f|--force] [--name <nome>] [--reference <reposit처rio>] [--"
+"depth <profundidade>] [--] <reposit처rio> [<caminho>]"
#. type: Plain text
#: en/git-submodule.txt:41
#, priority:220
msgid "Add the given repository as a submodule at the given path to the changeset to be committed next to the current project: the current project is termed the \"superproject\"."
msgstr ""
+"Adicione o reposit처rio informado como um subm처dulo no caminho especificado "
+"ao conjunto de altera챌천es para ser feito o commit ao lado do projeto atual: "
+"o projeto atual 챕 chamado de \"superproject\"."
#. type: Plain text
#: en/git-submodule.txt:50
#, priority:220
msgid "<repository> is the URL of the new submodule's origin repository. This may be either an absolute URL, or (if it begins with ./ or ../), the location relative to the superproject's default remote repository (Please note that to specify a repository 'foo.git' which is located right next to a superproject 'bar.git', you'll have to use `../foo.git` instead of `./foo.git` - as one might expect when following the rules for relative URLs - because the evaluation of relative URLs in Git is identical to that of relative directories)."
msgstr ""
+"<reposit처rio> 챕 o URL do reposit처rio de origem do novo subm처dulo. Este pode "
+"ser um URL absoluto, ou (se come챌ar com ./ ou ../), a localiza챌찾o relativa "
+"ao reposit처rio predefinido do superprojeto remoto (Por favor note que para "
+"especificar um reposit처rio 'foo.git' que est찼 localizado bem ao lado de um "
+"superproject 'bar.git', voc챗 ter찼 que usar `../foo.git` em vez de `./foo.git`"
+" - como se pode esperar quando se seguem as regras para URLs relativas - "
+"porque a avalia챌찾o das URLs relativas no Git 챕 id챗ntica 횪 dos diret처rios "
+"relativos)."
#. type: Plain text
#: en/git-submodule.txt:57
@@ -50186,7 +50963,7 @@ msgstr ""
#: en/git-submodule.txt:75
#, ignore-ellipsis, no-wrap, priority:220
msgid "status [--cached] [--recursive] [--] [<path>...]"
-msgstr ""
+msgstr "status [--cached] [--recursive] [--] [<caminho>...]"
#. type: Plain text
#: en/git-submodule.txt:83
@@ -50216,7 +50993,7 @@ msgstr ""
#: en/git-submodule.txt:95
#, ignore-ellipsis, no-wrap, priority:220
msgid "init [--] [<path>...]"
-msgstr ""
+msgstr "init [--] [<caminho>...]"
#. type: Plain text
#: en/git-submodule.txt:102
@@ -50246,7 +51023,7 @@ msgstr ""
#: en/git-submodule.txt:118
#, ignore-ellipsis, no-wrap, priority:220
msgid "deinit [-f|--force] (--all|[--] <path>...)"
-msgstr ""
+msgstr "deinit [-f|--force] (--all|[--] <caminho>...)"
#. type: Plain text
#: en/git-submodule.txt:125
@@ -50280,6 +51057,10 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
msgstr ""
+"update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] "
+"[-f|--force] [--checkout|--rebase|--merge] [--reference <reposit처rio>] [--"
+"depth <profundidade>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] "
+"[<caminho>...]"
#. type: Plain text
#: en/git-submodule.txt:148
@@ -50391,13 +51172,13 @@ msgstr ""
#: en/git-submodule.txt:181
#, no-wrap, priority:220
msgid "set-branch (-b|--branch) <branch> [--] <path>"
-msgstr ""
+msgstr "set-branch (-b|--branch) <ramo> [--] <path>"
#. type: Labeled list
#: en/git-submodule.txt:182
#, no-wrap, priority:220
msgid "set-branch (-d|--default) [--] <path>"
-msgstr ""
+msgstr "set-branch (-d|--default) [--] <caminho>"
#. type: Plain text
#: en/git-submodule.txt:187
@@ -50409,7 +51190,7 @@ msgstr ""
#: en/git-submodule.txt:188
#, no-wrap, priority:220
msgid "set-url [--] <path> <newurl>"
-msgstr ""
+msgstr "set-url [--] <caminho> <novo url>"
#. type: Plain text
#: en/git-submodule.txt:192
@@ -50422,6 +51203,8 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
+"summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] "
+"[<caminho>...]"
#. type: Plain text
#: en/git-submodule.txt:202
@@ -50439,7 +51222,7 @@ msgstr ""
#: en/git-submodule.txt:206
#, no-wrap, priority:220
msgid "foreach [--recursive] <command>"
-msgstr ""
+msgstr "foreach [--recursive] <comando>"
#. type: Plain text
#: en/git-submodule.txt:227
@@ -50463,7 +51246,7 @@ msgstr ""
#: en/git-submodule.txt:235
#, ignore-ellipsis, no-wrap, priority:220
msgid "sync [--recursive] [--] [<path>...]"
-msgstr ""
+msgstr "sync [--recursive] [--] [<caminho>...]"
#. type: Plain text
#: en/git-submodule.txt:242
@@ -50712,7 +51495,7 @@ msgstr ""
#: en/git-submodule.txt:394
#, no-wrap, priority:220
msgid "--reference <repository>"
-msgstr ""
+msgstr "--reference <reposit처rio>"
#. type: Plain text
#: en/git-submodule.txt:398 en/git-submodule.txt:407
@@ -50731,12 +51514,15 @@ msgid ""
"for linkgit:git-clone[1]'s `--reference`, `--shared`, and `--dissociate`\n"
"options carefully.\n"
msgstr ""
+"*NOTA*: *N찾o* use esta op챌찾o a menos que tenha lido atentamente as\n"
+"informa챌천es para linkgit:git-clone[1]'s `--reference`, `--shared`, e\n"
+"`--dissociate`.\n"
#. type: Plain text
#: en/git-submodule.txt:409
#, no-wrap, priority:220
msgid "*NOTE*: see the NOTE for the `--reference` option.\n"
-msgstr ""
+msgstr "*NOTA*: veja a NOTA para a op챌찾o `--reference`.\n"
#. type: Plain text
#: en/git-submodule.txt:415
@@ -50796,14 +51582,14 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:449
-#, fuzzy, priority:220
+#, priority:220
msgid "When initializing submodules, a `.gitmodules` file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as `$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\". See linkgit:gitmodules[5] for details."
msgstr ""
-"When initializing submodules, a `.gitmodules` file in the top-level "
-"directory of the containing repository is used to find the url of each "
-"submodule. This file should be formatted in the same way as `$GIT_DIR/"
-"config`. The key to each submodule url is \"submodule.$name.url\". Para "
-"mais detalhes consulte linkgit:gitmodules[5]."
+"Durante a atualiza챌찾o dos subm처dulos um arquivo `.gitmodules` fica no topo "
+"do diret처rio do reposit처rio que o contenha 챕 utilizado para encontrar a URL "
+"de cada subm처dulo. Este arquivo deve ser formatado da mesma maneira que `$"
+"GIT_DIR/config`. A chave para cada URL do subm처dulo 챕 `submodule.$name.url`"
+". Para mais detalhes consulte linkgit:gitmodules[5]."
#. type: Plain text
#: en/git-submodule.txt:453
@@ -53221,6 +54007,14 @@ msgid ""
"\t[--[no-]merged [<commit>]] [<pattern>...]\n"
"'git tag' -v [--format=<format>] <tagname>...\n"
msgstr ""
+"'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <arquivo>] [-e]\n"
+"\t<nome da tag> [<commit> | <objeto>]\n"
+"'git tag' -d <nome da tag>...\n"
+"'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n"
+"\t[--points-at <objeto>] [--column[=<op챌천es>] | --no-column]\n"
+"\t[--create-reflog] [--sort=<key>] [--format=<formato>]\n"
+"\t[--[no-]merged [<commit>]] [<pattern>...]\n"
+"'git tag' -v [--format=<formato>] <tagname>...\n"
#. type: Plain text
#: en/git-tag.txt:26
@@ -53316,7 +54110,7 @@ msgstr ""
#: en/git-tag.txt:76
#, no-wrap, priority:240
msgid "--local-user=<keyid>"
-msgstr ""
+msgstr "--local-user=<keyid>"
#. type: Plain text
#: en/git-tag.txt:78
@@ -55283,13 +56077,14 @@ msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
#: en/git.txt:837
-#, fuzzy, priority:100
+#, priority:100
msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state. This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands. See linkgit:git-config[1] for more details."
msgstr ""
-"Set to 0 to prevent protocols used by fetch/push/clone which are configured "
-"to the `user` state. This is useful to restrict recursive submodule "
-"initialization from an untrusted repository or for programs which feed "
-"potentially-untrusted URLS to git commands. Consulte linkgit:git-config[1]."
+"Defina como `0` para evitar que os protocolos utilizados por `fetch/push/"
+"clone` sejam configurados por `user`. 횋 첬til para restringir a "
+"inicializa챌찾o recursiva do subm처dulo de um reposit처rio n찾o confi찼vel ou para "
+"programas que alimentam as URLS potencialmente n찾o confi찼veis aos comandos "
+"git. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/git.txt:838
@@ -56201,13 +56996,14 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:344
-#, fuzzy, priority:100
+#, priority:100
msgid "In order to set \"assume unchanged\" bit, use `--assume-unchanged` option. To unset, use `--no-assume-unchanged`. To see which files have the \"assume unchanged\" bit set, use `git ls-files -v` (see linkgit:git-ls-files[1])."
msgstr ""
-"In order to set \"assume unchanged\" bit, use `--assume-unchanged` option. "
-"To unset, use `--no-assume-unchanged`. Use `git ls-files -v` (consulte "
-"linkgit:git-ls-files[1]) para ver quais os arquivos possuem o \"bit\" \""
-"assume unchanged\" (assume que est찼 inalterado) definido."
+"Para definir o bit \"assumir inalterado\", utilize a op챌찾o `--assume-"
+"unchanged`. Para remover a defini챌찾o utilize `--no-assume-unchanged`. Use `"
+"git ls-files -v` (consulte linkgit:git-ls-files[1]) para ver quais os "
+"arquivos possuem o \"bit\" \"assume unchanged\" (assumir inalterado) "
+"definido."
#. type: Plain text
#: en/git-update-index.txt:354
@@ -57633,6 +58429,14 @@ msgid ""
"'git worktree remove' [-f] <worktree>\n"
"'git worktree unlock' <worktree>\n"
msgstr ""
+"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <novo ramo>] "
+"<path> [<commit-ish>]\n"
+"'git worktree list' [--porcelain]\n"
+"'git worktree lock' [--reason <string>] <찼rvore de trabalho>\n"
+"'git worktree move' <찼rvore de trabalho> <novo caminho>\n"
+"'git worktree prune' [-n] [-v] [--expire <expire>]\n"
+"'git worktree remove' [-f] <찼rvore de trabalho>\n"
+"'git worktree unlock' <찼rvore de trabalho>\n"
#. type: Plain text
#: en/git-worktree.txt:24
@@ -57680,7 +58484,7 @@ msgstr ""
#: en/git-worktree.txt:61
#, no-wrap, priority:240
msgid "$ git worktree add --track -b <branch> <path> <remote>/<branch>\n"
-msgstr ""
+msgstr "$ git worktree add --track -b <ramo> <caminho> <remoto>/<branch>\n"
#. type: Plain text
#: en/git-worktree.txt:80
@@ -57872,7 +58676,7 @@ msgstr ""
#: en/git-worktree.txt:195
#, no-wrap, priority:240
msgid "--reason <string>"
-msgstr ""
+msgstr "--reason <string>"
#. type: Plain text
#: en/git-worktree.txt:197
@@ -58049,17 +58853,18 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:315
-#, fuzzy, priority:240
+#, priority:240
msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned. See linkgit:gitrepository-layout[5] for details."
msgstr ""
-"To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful "
-"in some situations, such as when the entry's working tree is stored on a "
-"portable device), use the `git worktree lock` command, which adds a file "
-"named 'locked' to the entry's directory. The file contains the reason in "
-"plain text. For example, if a linked working tree's `.git` file points to `/"
-"path/main/.git/worktrees/test-next` then a file named `/path/main/.git/"
-"worktrees/test-next/locked` will prevent the `test-next` entry from being "
-"pruned. Para mais detalhes consulte linkgit:gitrepository-layout[5]."
+"Para impedir que uma entrada `$GIT_DIR/worktrees` seja removida (que pode "
+"ser 첬til em algumas situa챌천es, como quando a 찼rvore de trabalho da entrada 챕 "
+"armazenada em um dispositivo port찼til), use o comando `git worktree lock` "
+"que adiciona um arquivo chamado 'locked' ao diret처rio da entrada. O arquivo "
+"cont챕m o motivo no formato texto puro, sem formata챌찾o. Por exemplo, caso o "
+"arquivo `.git` aponte para `/path/main/.git/worktrees/test-next` ent찾o o "
+"arquivo de nome `/path/main/.git/worktrees/test-next/locked` prevenir찼 que a "
+"entrada `test-next` seja exclu챠da. Para mais detalhes consulte linkgit"
+":gitrepository-layout[5]."
#. type: Plain text
#: en/git-worktree.txt:318
@@ -58109,6 +58914,9 @@ msgid ""
"worktree /path/to/bare-source\n"
"bare\n"
msgstr ""
+"$ git worktree list --porcelain\n"
+"worktree /path/to/bare-source\n"
+"bare\n"
#. type: delimited block -
#: en/git-worktree.txt:347
@@ -58586,13 +59394,13 @@ msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, fuzzy, priority:100
+#, priority:100
msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
msgstr ""
-"A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a "
-"<<def_branch,branch>>. Heads are stored in a file in `$GIT_DIR/refs/heads/` "
-"directory, except when using packed refs. (Consulte linkgit:git-pack-"
-"refs[1].)"
+"Um <<def_ref,named reference>> para o <<def_commit,commit>> no topo do "
+"<<def_branch,branch>>. Os `HEADS` s찾o armazenados em um arquivo no "
+"diret처rio `$GIT_DIR/refs/heads/`, exceto quando 챕 utilizado um `ref` "
+"empacotado. (Consulte linkgit:git-pack-refs[1].)"
#. type: Labeled list
#: en/glossary-content.txt:193
@@ -58956,13 +59764,14 @@ msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, fuzzy, priority:100
+#, priority:100
msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching. See linkgit:gitattributes[5]."
msgstr ""
-"After `attr:` comes a space separated list of \"attribute requirements\", "
-"all of which must be met in order for the path to be considered a match; "
-"this is in addition to the usual non-magic pathspec pattern matching. "
-"Consulte linkgit:gitattributes[5]."
+"Ap처s o `attr:`, vem um espa챌o separado da lista do \"attribute requirements\""
+" (requerimentos dos atributos), todos os quais devem ser atendidos para que "
+"o caminho seja considerado uma correspond챗ncia; isso 챕 um acr챕scimo 횪 "
+"coincid챗ncia usual de padr천es do `pathspec`. Consulte "
+"linkgit:gitattributes[5]."
#. type: Plain text
#: en/glossary-content.txt:405
@@ -60001,14 +60810,14 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:41
-#, fuzzy, priority:240
+#, priority:240
msgid "This option determines how the merge message will be cleaned up before committing. See linkgit:git-commit[1] for more details. In addition, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on to the commit machinery in the case of a merge conflict."
msgstr ""
-"This option determines how the merge message will be cleaned up before "
-"committing. Para mais detalhes consulte linkgit:git-commit[1]. In addition, "
-"if the '<mode>' is given a value of `scissors`, scissors will be appended to "
-"`MERGE_MSG` before being passed on to the commit machinery in the case of a "
-"merge conflict."
+"Esta op챌찾o determina como a mensagem de mesclagem ser찼 limpa antes da "
+"confirma챌찾o. Para mais detalhes consulte linkgit:git-commit[1]. Al챕m disso, "
+"caso o '<mode>' seja dado o valor de `scissors`, `scissors` (tesouras) ser찼 "
+"anexada a `MERGE_MSG` antes de ser repassada para o mecanismo de commit caso "
+"exista mesclagens conflitantes."
#. type: Labeled list
#: en/merge-options.txt:44
@@ -60069,6 +60878,7 @@ msgstr "--no-signoff"
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
msgstr ""
+"A op챌찾o `--no-signoff` n찾o adiciona a linha de assinatura \"Signed-off-by\"."
#. type: Plain text
#: en/merge-options.txt:93
@@ -60170,7 +60980,7 @@ msgstr ""
#: en/merge-options.txt:146
#, priority:240
msgid "Operate quietly. Implies --no-progress."
-msgstr ""
+msgstr "Trabalha em sil챗ncio. Implica no uso da op챌찾o `--no-progress`."
#. type: Plain text
#: en/merge-options.txt:157
@@ -60360,12 +61170,13 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:97
-#, fuzzy, priority:240
+#, priority:240
msgid "Turn on rename detection, optionally setting the similarity threshold. This is the default. This overrides the 'merge.renames' configuration variable. See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
-"Turn on rename detection, optionally setting the similarity threshold. "
-"This overrides the 'merge.renames' configuration variable. See also linkgit"
-":git-diff[1] `--find-renames`."
+"Ativa a detec챌찾o de renomea챌찾o, configurando opcionalmente o limite de "
+"similaridade. Esta 챕 a predefini챌찾o. Isso sobrescreve a configura챌찾o da "
+"vari찼vel 'merge.renames'. Consulte tamb챕m linkgit:git-diff[1] `--find-"
+"renames`."
#. type: Labeled list
#: en/merge-strategies.txt:98
@@ -61869,6 +62680,12 @@ msgid ""
"4da45be\n"
"7134973 -- NO NEWLINE\n"
msgstr ""
+"$ git log -2 --pretty=format:%h 4da45bef \\\n"
+" | perl -pe '$_ .= \" -- NO NEWLINE\\n"
+"\" unless /\\n"
+"/'\n"
+"4da45be\n"
+"7134973 -- NO NEWLINE\n"
#. type: delimited block -
#: en/pretty-formats.txt:319
@@ -61879,6 +62696,12 @@ msgid ""
"4da45be\n"
"7134973\n"
msgstr ""
+"$ git log -2 --pretty=tformat:%h 4da45bef \\\n"
+" | perl -pe '$_ .= \" -- NO NEWLINE\\n"
+"\" unless /\\n"
+"/'\n"
+"4da45be\n"
+"7134973\n"
#. type: Plain text
#: en/pretty-formats.txt:324
@@ -61893,12 +62716,14 @@ msgid ""
"$ git log -2 --pretty=tformat:%h 4da45bef\n"
"$ git log -2 --pretty=%h 4da45bef\n"
msgstr ""
+"$ git log -2 --pretty=tformat:%h 4da45bef\n"
+"$ git log -2 --pretty=%h 4da45bef\n"
#. type: Labeled list
#: en/pretty-options.txt:1
#, no-wrap, priority:260
msgid "--pretty[=<format>]"
-msgstr ""
+msgstr "--pretty[=<formato>]"
#. type: Plain text
#: en/pretty-options.txt:10
@@ -61966,7 +62791,7 @@ msgstr ""
#: en/pretty-options.txt:45
#, no-wrap, priority:260
msgid "--expand-tabs=<n>"
-msgstr ""
+msgstr "--expand-tabs=<n>"
#. type: Labeled list
#: en/pretty-options.txt:46
@@ -62349,60 +63174,86 @@ msgstr "'<refname>@{<n>}', e.g. 'master@\\{1\\}'"
#, priority:100
msgid "A ref followed by the suffix '@' with an ordinal specification enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies the n-th prior value of that ref. For example 'master@\\{1\\}' is the immediate prior value of 'master' while 'master@\\{5\\}' is the 5th prior value of 'master'. This suffix may only be used immediately following a ref name and the ref must have an existing log ('$GIT_DIR/logs/<refname>')."
msgstr ""
+"Um `ref` seguido pelo sufixo '@' com uma especifica챌찾o ordinal inclu챠da em "
+"um par de chaves (exemplo, '\\{1\\}', '\\{15\\}') especifica o en챕simo valor "
+"anterior dessa ref. Por exemplo, 'master@\\{1\\}' 챕 o valor anterior "
+"imediato de 'master', enquanto 'master@\\{5\\}' 챕 o quinto valor anterior do "
+"'master'. Este sufixo poder찼 ser usado imediatamente ap처s um nome `ref` e o "
+"mesmo deve ter um registro log existente em ('$GIT_DIR/logs/<refname>')."
#. type: Labeled list
#: en/revisions.txt:89
#, no-wrap, priority:100
msgid "'@{<n>}', e.g. '@\\{1\\}'"
-msgstr ""
+msgstr "'@{<n>}', exemplo. '@\\{1\\}'"
#. type: Plain text
#: en/revisions.txt:93
#, priority:100
msgid "You can use the '@' construct with an empty ref part to get at a reflog entry of the current branch. For example, if you are on branch 'blabla' then '@\\{1\\}' means the same as 'blabla@\\{1\\}'."
msgstr ""
+"Voc챗 pode usar a constru챌찾o '@' com um `ref` vazio para obter uma entrada "
+"`reflog` da ramifica챌찾o atual. Por exemplo, caso esteja no ramo 'blabla' "
+"ent찾o '@\\{1\\}' significa o mesmo que 'blabla@\\{1\\}'."
#. type: Labeled list
#: en/revisions.txt:94
#, no-wrap, priority:100
msgid "'@{-<n>}', e.g. '@{-1}'"
-msgstr ""
+msgstr "'@{-<n>}', exemplo, '@{-1}'"
#. type: Plain text
#: en/revisions.txt:97
#, priority:100
msgid "The construct '@{-<n>}' means the <n>th branch/commit checked out before the current one."
msgstr ""
+"O construtor '@{-<n>}' significa que <n> do ramo/commit foi verificado antes "
+"da atual."
#. type: Labeled list
#: en/revisions.txt:98
#, no-wrap, priority:100
msgid "'[<branchname>]@\\{upstream\\}', e.g. 'master@\\{upstream\\}', '@\\{u\\}'"
msgstr ""
+"'[<branchname>]@\\{upstream\\}', exemplo, 'master@\\{upstream\\}', '@\\{u\\}'"
#. type: Plain text
#: en/revisions.txt:105
#, priority:100
msgid "The suffix '@\\{upstream\\}' to a branchname (short form '<branchname>@\\{u\\}') refers to the branch that the branch specified by branchname is set to build on top of (configured with `branch.<name>.remote` and `branch.<name>.merge`). A missing branchname defaults to the current one. These suffixes are also accepted when spelled in uppercase, and they mean the same thing no matter the case."
msgstr ""
+"O sufixo '@ {upstream}' para uma ramifica챌찾o (formato abreviado "
+"'<branchname>@\\{u\\}') refere-se ao ramo da ramifica챌찾o especificada pelo "
+"nome do ramo, est찼 configurado para construir em cima de "
+"`branch.<name>.remote` e `branch.<name>.merge`). 횋 predefinido que na falta "
+"do nome de um ramo o atual seja usado. Esses sufixos tamb챕m s찾o aceitos "
+"quando digitados em mai첬sculas e significam a mesma coisa, n찾o importa o "
+"caso."
#. type: Labeled list
#: en/revisions.txt:106
#, no-wrap, priority:100
msgid "'[<branchname>]@\\{push\\}', e.g. 'master@\\{push\\}', '@\\{push\\}'"
msgstr ""
+"'[<branchname>]@\\{push\\}', exemplo, 'master@\\{push\\}', '@\\{push\\}'"
#. type: Plain text
#: en/revisions.txt:112
#, priority:100
msgid "The suffix '@\\{push}' reports the branch \"where we would push to\" if `git push` were run while `branchname` was checked out (or the current `HEAD` if no branchname is specified). Since our push destination is in a remote repository, of course, we report the local tracking branch that corresponds to that branch (i.e., something in `refs/remotes/`)."
msgstr ""
+"O sufixo '@\\{push}' relata ao ramo \"para onde estivermos fazendo o push\" "
+"se `git push` fosse executado enquanto `branchname` foi verificado (ou o "
+"`HEAD` atual, caso nenhum nome do ramo tenha sido especificado). Como o "
+"nosso `push` foi feito em um reposit처rio remoto, 챕 claro, relatamos o ramo "
+"de rastreamento local que tenha correspond챗ncia a esse ramo (ou seja, algo "
+"em `refs/remotes/`)."
#. type: Plain text
#: en/revisions.txt:114
#, priority:100
msgid "Here's an example to make it more clear:"
-msgstr ""
+msgstr "Aqui um exemplo para deixar mais claro:"
#. type: delimited block -
#: en/revisions.txt:119
@@ -62412,6 +63263,9 @@ msgid ""
"$ git config remote.pushdefault myfork\n"
"$ git switch -c mybranch origin/master\n"
msgstr ""
+"$ git config push.default current\n"
+"$ git config remote.pushdefault myfork\n"
+"$ git switch -c mybranch origin/master\n"
#. type: delimited block -
#: en/revisions.txt:122
@@ -62420,6 +63274,8 @@ msgid ""
"$ git rev-parse --symbolic-full-name @{upstream}\n"
"refs/remotes/origin/master\n"
msgstr ""
+"$ git rev-parse --symbolic-full-name @{upstream}\n"
+"refs/remotes/origin/master\n"
#. type: delimited block -
#: en/revisions.txt:125
@@ -62428,132 +63284,201 @@ msgid ""
"$ git rev-parse --symbolic-full-name @{push}\n"
"refs/remotes/myfork/mybranch\n"
msgstr ""
+"$ git rev-parse --symbolic-full-name @{push}\n"
+"refs/remotes/myfork/mybranch\n"
#. type: Plain text
#: en/revisions.txt:130
#, priority:100
msgid "Note in the example that we set up a triangular workflow, where we pull from one location and push to another. In a non-triangular workflow, '@\\{push}' is the same as '@\\{upstream}', and there is no need for it."
msgstr ""
+"Observe no exemplo que configuramos um fluxo de trabalho triangular, onde "
+"fazemos o `pull` de um local e o `push` para outro. Em um fluxo de trabalho "
+"n찾o triangular, '@\\{push}' 챕 igual como '@\\{upstream}' e n찾o 챕 necess찼rio."
#. type: Plain text
#: en/revisions.txt:133
#, priority:100
msgid "This suffix is also accepted when spelled in uppercase, and means the same thing no matter the case."
msgstr ""
+"Esse sufixo tamb챕m 챕 aceito quando escrito em mai첬sculas e significa a mesma "
+"coisa, n찾o importa o caso."
#. type: Labeled list
#: en/revisions.txt:134
#, no-wrap, priority:100
msgid "'<rev>{caret}[<n>]', e.g. 'HEAD{caret}, v1.5.1{caret}0'"
-msgstr ""
+msgstr "'<rev>{caret}[<n>]', exemplo, 'HEAD{caret}, v1.5.1{caret}0'"
#. type: Plain text
#: en/revisions.txt:141
#, priority:100
msgid "A suffix '{caret}' to a revision parameter means the first parent of that commit object. '{caret}<n>' means the <n>th parent (i.e. '<rev>{caret}' is equivalent to '<rev>{caret}1'). As a special rule, '<rev>{caret}0' means the commit itself and is used when '<rev>' is the object name of a tag object that refers to a commit object."
msgstr ""
+"Um sufixo '{caret}' para um par창metro de revis찾o significa que a primeira "
+"matriz desse objeto commit. '{caret}<n>' significa que 챕 a <n>th matriz (ou "
+"seja, '<rev>{caret}' 챕 equivamente a '<rev>{caret}1'). Como regra "
+"especial, '<rev>{caret}0' significa o commit em si e 챕 usado quando '<rev>' "
+"for o nome do objeto de um objeto `tag` que tenha refer챗ncia a um objeto de "
+"commit."
#. type: Labeled list
#: en/revisions.txt:142
#, no-wrap, priority:100
msgid "'<rev>{tilde}[<n>]', e.g. 'HEAD{tilde}, master{tilde}3'"
-msgstr ""
+msgstr "'<rev>{tilde}[<n>]', exemplo, 'HEAD{tilde}, master{tilde}3'"
#. type: Plain text
#: en/revisions.txt:151
#, priority:100
msgid "A suffix '{tilde}' to a revision parameter means the first parent of that commit object. A suffix '{tilde}<n>' to a revision parameter means the commit object that is the <n>th generation ancestor of the named commit object, following only the first parents. I.e. '<rev>{tilde}3' is equivalent to '<rev>{caret}{caret}{caret}' which is equivalent to '<rev>{caret}1{caret}1{caret}1'. See below for an illustration of the usage of this form."
msgstr ""
+"Um sufixo '{tilde}' para um par창metro de revis찾o significa o que a primeira "
+"matriz deste objeto commit. Um sufixo '{tilde}<n>' para um par창metro de "
+"revis찾o significa que o objeto commit 챕 o <n> do ancestral da gera챌찾o do "
+"objeto commit nomeado, seguindo apenas os primeiras matrizes. Ou seja, "
+"'<rev>{tilde}3' 챕 equivalente a '<rev>{caret}{caret}{caret}' que 챕 "
+"equivalente a '<rev>{caret}1{caret}1{caret}1'. Veja abaixo uma ilustra챌찾o "
+"do uso deste formato."
#. type: Labeled list
#: en/revisions.txt:152
#, no-wrap, priority:100
msgid "'<rev>{caret}{<type>}', e.g. 'v0.99.8{caret}\\{commit\\}'"
-msgstr ""
+msgstr "'<rev>{caret}{<type>}', exemplo, 'v0.99.8{caret}\\{commit\\}'"
#. type: Plain text
#: en/revisions.txt:163
#, priority:100
msgid "A suffix '{caret}' followed by an object type name enclosed in brace pair means dereference the object at '<rev>' recursively until an object of type '<type>' is found or the object cannot be dereferenced anymore (in which case, barf). For example, if '<rev>' is a commit-ish, '<rev>{caret}\\{commit\\}' describes the corresponding commit object. Similarly, if '<rev>' is a tree-ish, '<rev>{caret}\\{tree\\}' describes the corresponding tree object. '<rev>{caret}0' is a short-hand for '<rev>{caret}\\{commit\\}'."
msgstr ""
+"Um sufixo '{caret}' seguido por um tipo de objeto com nome fechado entre "
+"chaves significa remover a refer챗ncia do objeto em '<ref>' recursivamente "
+"at챕 que um objeto do tipo '<type>' seja encontrado ou n찾o seja mais poss챠vel "
+"remover a refer챗ncia do (nesse caso, `barf`). Por exemplo, caso '<ref>' "
+"seja um commit ish, '<rev>{caret}\\{commit\\}' descreve o objeto commit "
+"correspondente. Da mesma forma caso '<re>' seja um ish da 찼rvore "
+"'<rev>{caret}\\{tree\\}', descreve o objeto da 찼rvore correspondente."
#. type: Plain text
#: en/revisions.txt:168
#, priority:100
msgid "'<rev>{caret}\\{object\\}' can be used to make sure '<rev>' names an object that exists, without requiring '<rev>' to be a tag, and without dereferencing '<rev>'; because a tag is already an object, it does not have to be dereferenced even once to get to an object."
msgstr ""
+"'<rev>{caret}\\{object\\}' pode ser utilizado para ter certeza que os nomes "
+"'<rev>' de um determinado objeto existam, sem requerer que '<rev>' seja uma "
+"tag e sem perder a refer챗ncia com '<rev>'; pois `tag` j찼 챕 um objeto, n찾o a "
+"necessidade que seja perdido a refer챗ncia nenhuma vez para chegar a um "
+"objeto."
#. type: Plain text
#: en/revisions.txt:171
#, priority:100
msgid "'<rev>{caret}\\{tag\\}' can be used to ensure that '<rev>' identifies an existing tag object."
msgstr ""
+"'<rev>{caret}\\{tag\\}' pode ser utilizado para ter certeza que '<rev>' "
+"identifique um objeto `tag` j찼 existente."
#. type: Labeled list
#: en/revisions.txt:172
#, no-wrap, priority:100
msgid "'<rev>{caret}{}', e.g. 'v0.99.8{caret}{}'"
-msgstr ""
+msgstr "'<rev>{caret}{}', exemplo, 'v0.99.8{caret}{}'"
#. type: Plain text
#: en/revisions.txt:177
#, priority:100
msgid "A suffix '{caret}' followed by an empty brace pair means the object could be a tag, and dereference the tag recursively until a non-tag object is found."
msgstr ""
+"Um sufixo '{caret}' seguido por um par de chaves vazias significa que o "
+"objeto pode ser uma tag e perder a refer챗ncia de uma tag recursivamente, at챕 "
+"que um objeto que n찾o seja tag, seja encontrada."
#. type: Labeled list
#: en/revisions.txt:178
#, no-wrap, priority:100
msgid "'<rev>{caret}{/<text>}', e.g. 'HEAD^{/fix nasty bug}'"
-msgstr ""
+msgstr "'<rev>{caret}{/<text>}', exemplo, 'HEAD^{/fix nasty bug}'"
#. type: Plain text
#: en/revisions.txt:184
#, priority:100
msgid "A suffix '{caret}' to a revision parameter, followed by a brace pair that contains a text led by a slash, is the same as the ':/fix nasty bug' syntax below except that it returns the youngest matching commit which is reachable from the '<rev>' before '{caret}'."
msgstr ""
+"Um sufixo '{caret}' para um par창metro de revis찾o, seguido por um par de "
+"chaves que cont챕m um texto liderado por uma barra, 챕 o mesmo que a sintaxe "
+"':/fix nasty bug' abaixo, exceto que ele retorna o commit coincidente mais "
+"jovem que 챕 acess챠vel a partir de '<rev>' antes de '{caret}'."
#. type: Labeled list
#: en/revisions.txt:185
#, no-wrap, priority:100
msgid "':/<text>', e.g. ':/fix nasty bug'"
-msgstr ""
+msgstr "':/<text>', exemplo, ':/fix nasty bug'"
#. type: Plain text
#: en/revisions.txt:198
#, priority:100
msgid "A colon, followed by a slash, followed by a text, names a commit whose commit message matches the specified regular expression. This name returns the youngest matching commit which is reachable from any ref, including HEAD. The regular expression can match any part of the commit message. To match messages starting with a string, one can use e.g. ':/^foo'. The special sequence ':/!' is reserved for modifiers to what is matched. ':/!-foo' performs a negative match, while ':/!!foo' matches a literal '!' character, followed by 'foo'. Any other sequence beginning with ':/!' is reserved for now. Depending on the given text, the shell's word splitting rules might require additional quoting."
msgstr ""
+"Da nome a um commit aqueles que forem seguidos por um tra챌o e por um texto, "
+"e a mensagem de commit coincidir 횪 express찾o regular especificada. Esse "
+"nome retorna o commit coincidente mais jovem, acess챠vel a partir de qualquer "
+"refer챗ncia, incluindo `HEAD`. A express찾o regular pode corresponder a "
+"qualquer parte da mensagem do commit. Para coincidir mensagens que comecem "
+"com uma string, pode-se utilizar ':/^foo' por exemplo. A sequ챗ncia especial "
+"': /!' est찼 reservada para modificadores que tenham coincid챗ncias. ':/!-foo' "
+"executa uma coincid챗ncia negativa, enquanto ':/!!foo' coincide com um "
+"caractere literal '!', seguido por 'foo'. No momento, qualquer outra "
+"sequ챗ncia come챌ando com ':/!' est찼 reservada. Dependendo do texto informado, "
+"as regras de divis찾o de palavras do shell podem exigir cita챌천es adicionais."
#. type: Labeled list
#: en/revisions.txt:199
#, no-wrap, priority:100
msgid "'<rev>:<path>', e.g. 'HEAD:README', 'master:./README'"
-msgstr ""
+msgstr "'<rev>:<path>', exemplo, 'HEAD:README', 'master:./README'"
#. type: Plain text
#: en/revisions.txt:207
#, priority:100
msgid "A suffix ':' followed by a path names the blob or tree at the given path in the tree-ish object named by the part before the colon. A path starting with './' or '../' is relative to the current working directory. The given path will be converted to be relative to the working tree's root directory. This is most useful to address a blob or tree from a commit or tree that has the same tree structure as the working tree."
msgstr ""
+"Um sufixo ':' seguido de um caminho nomeia a gota ou a 찼rvore no caminho "
+"especificado no objeto da 찼rvore \"ish\" nomeado pela parte antes dos dois "
+"pontos. Um caminho come챌ando com './' ou '../' 챕 relativo ao diret처rio de "
+"trabalho atual. O caminho especificado ser찼 convertido para ser relativo ao "
+"diret처rio raiz da 찼rvore de trabalho. Isso 챕 mais 첬til para abordar uma "
+"gota ou 찼rvore de um commit ou uma 찼rvore que tenha a mesma estrutura de "
+"찼rvore que uma 찼rvore de trabalho."
#. type: Labeled list
#: en/revisions.txt:208
#, no-wrap, priority:100
msgid "':[<n>:]<path>', e.g. ':0:README', ':README'"
-msgstr ""
+msgstr "':[<n>:]<path>', exemplo, ':0:README', ':README'"
#. type: Plain text
#: en/revisions.txt:216
#, priority:100
msgid "A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path, names a blob object in the index at the given path. A missing stage number (and the colon that follows it) names a stage 0 entry. During a merge, stage 1 is the common ancestor, stage 2 is the target branch's version (typically the current branch), and stage 3 is the version from the branch which is being merged."
msgstr ""
+"Os dois pontos opcionalmente seguidos por um n첬mero de est찼gio (0 para 3) e "
+"dois pontos, seguidos por um caminho, nomeiam um objeto gota no 챠ndice no "
+"caminho especificado. Nomeia uma entrada de est찼gio quando o n첬mero estiver "
+"ausente (assim como dois pontos que o seguem). Durante uma mesclagem, o "
+"est찼gio 1 챕 o ancestral comum, o est찼gio 2 챕 a vers찾o do ramo de destino ("
+"normalmente o ramo atual) e o est찼gio 3 챕 a vers찾o do ramo que est찼 sendo "
+"mesclado."
#. type: Plain text
#: en/revisions.txt:220
#, priority:100
msgid "Here is an illustration, by Jon Loeliger. Both commit nodes B and C are parents of commit node A. Parent commits are ordered left-to-right."
msgstr ""
+"Aqui est찼 uma ilustra챌찾o, de Jon Loeliger. Ambos os n처s do commit B e C s찾o "
+"as matrizes do n처s do commit A. Os commits matriz s찾o ordenados da esquerda "
+"para a direita."
#. type: delimited block .
#: en/revisions.txt:232
@@ -62570,6 +63495,16 @@ msgid ""
" \\ /\n"
" A\n"
msgstr ""
+"G H I J\n"
+" \\ / \\ /\n"
+" D E F\n"
+" \\ | / \\\n"
+" \\ | / |\n"
+" \\|/ |\n"
+" B C\n"
+" \\ /\n"
+" \\ /\n"
+" A\n"
#. type: Plain text
#: en/revisions.txt:244
@@ -62586,30 +63521,47 @@ msgid ""
" I = F^ = B^3^ = A^^3^\n"
" J = F^2 = B^3^2 = A^^3^2\n"
msgstr ""
+" A = = A^0\n"
+" B = A^ = A^1 = A~1\n"
+" C = A^2 = A^2\n"
+" D = A^^ = A^1^1 = A~2\n"
+" E = B^2 = A^^2\n"
+" F = B^3 = A^^3\n"
+" G = A^^^ = A^1^1^1 = A~3\n"
+" H = D^2 = B^^2 = A^^^2 = A~2^2\n"
+" I = F^ = B^3^ = A^^3^\n"
+" J = F^2 = B^3^2 = A^^3^2\n"
#. type: Plain text
#: en/revisions.txt:251
#, priority:100
msgid "History traversing commands such as `git log` operate on a set of commits, not just a single commit."
msgstr ""
+"O hist처rico que atravessa os comandos como o `git log` opera em um "
+"determinado conjunto de commits e n찾o apenas em 첬nico commit."
#. type: Plain text
#: en/revisions.txt:256
#, priority:100
msgid "For these commands, specifying a single revision, using the notation described in the previous section, means the set of commits `reachable` from the given commit."
msgstr ""
+"Para esses comandos, especifique uma 첬nica revis찾o usando a nota챌찾o descrita "
+"na se챌찾o anterior, significa que o conjunto de commits `alcan챌찼veis` a "
+"partir da confirma챌찾o fornecida."
#. type: Plain text
#: en/revisions.txt:259
#, priority:100
msgid "A commit's reachable set is the commit itself and the commits in its ancestry chain."
msgstr ""
+"O conjunto acess챠vel de um commit 챕 o pr처prio commit e o commit em sua "
+"cadeia de ancestrais."
#. type: Title ~
#: en/revisions.txt:262
#, no-wrap, priority:100
msgid "Commit Exclusions"
-msgstr ""
+msgstr "Exclus천es de Commits"
#. type: Labeled list
#: en/revisions.txt:264
@@ -62859,7 +63811,7 @@ msgstr ""
#: en/rev-list-options.txt:18
#, no-wrap, priority:260
msgid "--max-count=<number>"
-msgstr ""
+msgstr "--max-count=<quantidade>"
#. type: Plain text
#: en/rev-list-options.txt:20
@@ -62871,7 +63823,7 @@ msgstr ""
#: en/rev-list-options.txt:21
#, no-wrap, priority:260
msgid "--skip=<number>"
-msgstr ""
+msgstr "--skip=<quantidade>"
#. type: Plain text
#: en/rev-list-options.txt:23
@@ -62883,13 +63835,13 @@ msgstr ""
#: en/rev-list-options.txt:24
#, no-wrap, priority:260
msgid "--since=<date>"
-msgstr ""
+msgstr "--since=<data>"
#. type: Labeled list
#: en/rev-list-options.txt:25
#, no-wrap, priority:260
msgid "--after=<date>"
-msgstr ""
+msgstr "--after=<data>"
#. type: Plain text
#: en/rev-list-options.txt:27
@@ -62901,13 +63853,13 @@ msgstr ""
#: en/rev-list-options.txt:28
#, no-wrap, priority:260
msgid "--until=<date>"
-msgstr ""
+msgstr "--until=<data>"
#. type: Labeled list
#: en/rev-list-options.txt:29
#, no-wrap, priority:260
msgid "--before=<date>"
-msgstr ""
+msgstr "--before=<data>"
#. type: Plain text
#: en/rev-list-options.txt:31
@@ -62919,13 +63871,13 @@ msgstr ""
#: en/rev-list-options.txt:33
#, no-wrap, priority:260
msgid "--max-age=<timestamp>"
-msgstr ""
+msgstr "--max-age=<timestamp>"
#. type: Labeled list
#: en/rev-list-options.txt:34
#, no-wrap, priority:260
msgid "--min-age=<timestamp>"
-msgstr ""
+msgstr "--min-age=<timestamp>"
#. type: Plain text
#: en/rev-list-options.txt:36
@@ -62937,13 +63889,13 @@ msgstr ""
#: en/rev-list-options.txt:38
#, no-wrap, priority:260
msgid "--author=<pattern>"
-msgstr ""
+msgstr "--author=<pattern>"
#. type: Labeled list
#: en/rev-list-options.txt:39
#, no-wrap, priority:260
msgid "--committer=<pattern>"
-msgstr ""
+msgstr "--committer=<pattern>"
#. type: Plain text
#: en/rev-list-options.txt:45
@@ -62955,7 +63907,7 @@ msgstr ""
#: en/rev-list-options.txt:46
#, no-wrap, priority:260
msgid "--grep-reflog=<pattern>"
-msgstr ""
+msgstr "--grep-reflog=<pattern>"
#. type: Plain text
#: en/rev-list-options.txt:52
@@ -62967,7 +63919,7 @@ msgstr ""
#: en/rev-list-options.txt:53
#, no-wrap, priority:260
msgid "--grep=<pattern>"
-msgstr ""
+msgstr "--grep=<pattern>"
#. type: Plain text
#: en/rev-list-options.txt:59
@@ -63075,13 +64027,13 @@ msgstr ""
#: en/rev-list-options.txt:111
#, no-wrap, priority:260
msgid "--min-parents=<number>"
-msgstr ""
+msgstr "--min-parents=<quantidade>"
#. type: Labeled list
#: en/rev-list-options.txt:112
#, no-wrap, priority:260
msgid "--max-parents=<number>"
-msgstr ""
+msgstr "--max-parents=<quantidade>"
#. type: Labeled list
#: en/rev-list-options.txt:113
@@ -63129,7 +64081,7 @@ msgstr ""
#: en/rev-list-options.txt:142
#, no-wrap, priority:260
msgid "--branches[=<pattern>]"
-msgstr ""
+msgstr "--branches[=<pattern>]"
#. type: Plain text
#: en/rev-list-options.txt:147
@@ -63141,7 +64093,7 @@ msgstr ""
#: en/rev-list-options.txt:148
#, no-wrap, priority:260
msgid "--tags[=<pattern>]"
-msgstr ""
+msgstr "--tags[=<pattern>]"
#. type: Plain text
#: en/rev-list-options.txt:153
@@ -63153,7 +64105,7 @@ msgstr ""
#: en/rev-list-options.txt:154
#, no-wrap, priority:260
msgid "--remotes[=<pattern>]"
-msgstr ""
+msgstr "--remotes[=<pattern>]"
#. type: Plain text
#: en/rev-list-options.txt:159
@@ -63165,7 +64117,7 @@ msgstr ""
#: en/rev-list-options.txt:160
#, no-wrap, priority:260
msgid "--glob=<glob-pattern>"
-msgstr ""
+msgstr "--glob=<glob-pattern>"
#. type: Plain text
#: en/rev-list-options.txt:165
@@ -63396,7 +64348,7 @@ msgstr ""
#: en/rev-list-options.txt:314
#, no-wrap, priority:260
msgid "--progress=<header>"
-msgstr ""
+msgstr "--progress=<header>"
#. type: Plain text
#: en/rev-list-options.txt:317
@@ -63552,6 +64504,11 @@ msgid ""
"\t \\ / / / / /\n"
"\t `-------------' X\n"
msgstr ""
+"\t .-A---M---N---O---P---Q\n"
+"\t / / / / / /\n"
+"\tI B C D E Y\n"
+"\t \\ / / / / /\n"
+"\t `-------------' X\n"
#. type: Plain text
#: en/rev-list-options.txt:385
@@ -63627,6 +64584,9 @@ msgid ""
"\t / / /\n"
"\tI---------D\n"
msgstr ""
+"\t .-A---N---O\n"
+"\t / / /\n"
+"\tI---------D\n"
#. type: Plain text
#: en/rev-list-options.txt:433
@@ -63698,6 +64658,11 @@ msgid ""
"\t \\ / / / /\n"
"\t `-------------'\n"
msgstr ""
+"\t .-A---M---N---O---P---Q\n"
+"\t / / / / /\n"
+"\tI B / D /\n"
+"\t \\ / / / /\n"
+"\t `-------------'\n"
#. type: Plain text
#: en/rev-list-options.txt:477
@@ -63775,6 +64740,11 @@ msgid ""
"\t \\ / /\n"
"\t `---------'\n"
msgstr ""
+"\t .-A---M---N---O\n"
+"\t / / /\n"
+"\tI B D\n"
+"\t \\ / /\n"
+"\t `---------'\n"
#. type: Plain text
#: en/rev-list-options.txt:524
@@ -63828,6 +64798,11 @@ msgid ""
"\t / \\\n"
"\tA-------K---------------L--M\n"
msgstr ""
+"\t D---E-------F\n"
+"\t / \\ \\\n"
+"\t B---C---G---H---I---J\n"
+"\t / \\\n"
+"\tA-------K---------------L--M\n"
#. type: Plain text
#: en/rev-list-options.txt:561
@@ -63851,6 +64826,11 @@ msgid ""
"\t\t\t \\\n"
"\t\t\t\tL--M\n"
msgstr ""
+"\t\tE-------F\n"
+"\t\t \\ \\\n"
+"\t\t G---H---I---J\n"
+"\t\t\t \\\n"
+"\t\t\t\tL--M\n"
#. type: Plain text
#: en/rev-list-options.txt:583
@@ -63874,7 +64854,7 @@ msgstr ""
#: en/rev-list-options.txt:599
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
-msgstr ""
+msgstr "\t$ git rev-list --bisect foo ^bar ^baz\n"
#. type: Plain text
#: en/rev-list-options.txt:602
@@ -63982,6 +64962,9 @@ msgid ""
"\t\\\t \\\n"
"\t 3----5----6----8---\n"
msgstr ""
+" ---1----2----4----7\n"
+"\t\\\t \\\n"
+"\t 3----5----6----8---\n"
#. type: Plain text
#: en/rev-list-options.txt:674
@@ -64203,7 +65186,7 @@ msgstr ""
#: en/rev-list-options.txt:815
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
-msgstr ""
+msgstr "--no-walk[=(com classifica챌찾o|sem classifica챌찾o)]"
#. type: Plain text
#: en/rev-list-options.txt:823
@@ -64245,13 +65228,13 @@ msgstr "--relative-date"
#: en/rev-list-options.txt:842
#, priority:260
msgid "Synonym for `--date=relative`."
-msgstr ""
+msgstr "횋 um sin척nimo para `--date=relative`."
#. type: Labeled list
#: en/rev-list-options.txt:843
#, no-wrap, priority:260
msgid "--date=<format>"
-msgstr ""
+msgstr "--date=<formato>"
#. type: Plain text
#: en/rev-list-options.txt:850
@@ -64269,7 +65252,7 @@ msgstr ""
#: en/rev-list-options.txt:857
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
-msgstr ""
+msgstr "`--date=local` 챕 um apelido para `--date=default-local`."
#. type: Plain text
#: en/rev-list-options.txt:860
@@ -64312,6 +65295,7 @@ msgstr ""
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
+"`--date=short` exibe apenas a data em formato `AAAA-MM-DD` por챕m n찾o a hora."
#. type: Plain text
#: en/rev-list-options.txt:881
@@ -64342,6 +65326,8 @@ msgstr ""
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
+"A op챌찾o `--date=default` 챕 o formato predefinido e similar ao "
+"`--date=rfc2822` com algumas excess천es:"
#. type: Plain text
#: en/rev-list-options.txt:904
@@ -64425,6 +65411,11 @@ msgid ""
"\t / / \\\n"
"\t o---x---a---a branch A\n"
msgstr ""
+"\t y---b---b ramo B\n"
+"\t / \\ /\n"
+"\t / .\n"
+"\t / / \\\n"
+"\t o---x---a---a ramo A\n"
#. type: Plain text
#: en/rev-list-options.txt:943
@@ -64436,7 +65427,7 @@ msgstr ""
#: en/rev-list-options.txt:946
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
-msgstr ""
+msgstr "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
#. type: delimited block -
#: en/rev-list-options.txt:953
@@ -64478,7 +65469,7 @@ msgstr ""
#: en/rev-list-options.txt:967
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
-msgstr ""
+msgstr "--show-linear-break[=<barreira>]"
#. type: Plain text
#: en/rev-list-options.txt:973
@@ -64866,7 +65857,7 @@ msgstr ""
#, priority:300
msgid "'git clone', 'git fetch' and 'git pull', but not 'git push', will also accept a suitable bundle file. See linkgit:git-bundle[1]."
msgstr ""
-"'git clone', 'git fetch' e 'git pull', mas n찾o 'git push', tamb챕m aceitar찾o "
+"`git clone`, `git fetch` e `git pull`, mas n찾o `git push`, tamb챕m aceitar찾o "
"um arquivo de pacote adequado. Consulte linkgit:git-bundle[1]."
#. type: Plain text
@@ -64886,7 +65877,7 @@ msgstr ""
#, priority:300
msgid "where <address> may be a path, a server and path, or an arbitrary URL-like string recognized by the specific remote helper being invoked. See linkgit:gitremote-helpers[7] for details."
msgstr ""
-"onde <address> pode ser um caminho, um servidor e um caminho ou uma "
+"onde `<endere챌o>` pode ser um caminho, um servidor e um caminho ou uma "
"seq체챗ncia arbitr찼ria semelhante a uma URL reconhecida pelo ajudante remoto "
"que foi invocado. Para mais detalhes consulte linkgit:gitremote-helpers[7]."