diff --git a/po/documentation.de.po b/po/documentation.de.po
index b6341dc6e6451bdf82718df03ec1cb0a3c854bc1..f0ce37d9f955148667576fb920e3194a945c8885 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -11,15 +11,15 @@ 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-10 21:38+0000\n"
-"Last-Translator: Matthias A횩hauer <mha1993@live.de>\n"
+"PO-Revision-Date: 2020-04-23 20:24+0000\n"
+"Last-Translator: Dieter Ziller <max123kl@ziller.de>\n"
"Language-Team: Matthias A횩hauer <mha1993@live.de>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.0-dev\n"
+"X-Generator: Weblate 4.0.2-dev\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
@@ -5541,7 +5541,7 @@ msgstr ""
#: en/fetch-options.txt:214 en/git-clone.txt:188
#, no-wrap, priority:300
msgid "--upload-pack <upload-pack>"
-msgstr "--upload-pack <upload-pack>"
+msgstr "--upload-pack <Upload-Pack>"
#. type: Plain text
#: en/fetch-options.txt:219
@@ -5695,12 +5695,7 @@ msgstr "횥BERSICHT"
#. type: Plain text
#: en/git-add.txt:16
-#, fuzzy, ignore-ellipsis, no-wrap, priority:300
-#| msgid ""
-#| "'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
-#| "\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
-#| "\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
-#| "\t [--chmod=(+|-)x] [--] [<pathspec>...]\n"
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
@@ -5708,10 +5703,13 @@ msgid ""
"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n"
msgstr ""
-"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
+"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | "
+"-i] [--patch | -p]\n"
"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
-"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
-"\t [--chmod=(+|-)x] [--] [<Pfadspezifikation>...]\n"
+"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] "
+"[--renormalize]\n"
+"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<Pfadspezifikation>...]\n"
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
@@ -5735,7 +5733,11 @@ msgstr "Der \"Index\" enth채lt eine Momentaufnahme des Inhalts des Arbeitsbaumes
#: en/git-add.txt:36
#, priority:300
msgid "This command can be performed multiple times before a commit. It only adds the content of the specified file(s) at the time the add command is run; if you want subsequent changes included in the next commit, then you must run `git add` again to add the new content to the index."
-msgstr "Diese Anweisung kann vor einem Commit mehrfach ausgef체hrt werden. Es wird lediglich der Inhalt der angegebenen Datei(en) zum Ausf체hrungszeitpunkt hinzugef체gt. Soll eine sp채tere 횆nderung einer dieser Dateien in den n채chsten Commit aufgenommen werden, so mu횩 'git add' erneut aufgerufen werden."
+msgstr ""
+"Diese Anweisung kann vor einem Commit mehrfach ausgef체hrt werden. Es wird "
+"lediglich der Inhalt der angegebenen Datei(en) zum Ausf체hrungszeitpunkt "
+"hinzugef체gt. Soll eine sp채tere 횆nderung einer dieser Dateien in den n채chsten "
+"Commit aufgenommen werden, so mu횩 `git add` erneut aufgerufen werden."
#. type: Plain text
#: en/git-add.txt:39
@@ -5774,24 +5776,40 @@ msgstr "<Pfadspezifikation>..."
#, priority:300
msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add all matching files. Also a leading directory name (e.g. `dir` to add `dir/file1` and `dir/file2`) can be given to update the index to match the current state of the directory as a whole (e.g. specifying `dir` will record not just a file `dir/file1` modified in the working tree, a file `dir/file2` added to the working tree, but also a file `dir/file3` removed from the working tree). Note that older versions of Git used to ignore removed files; use `--no-all` option if you want to add modified or new files but ignore removed ones."
msgstr ""
+"Dateien aus denen Inhalt hinzugef체gt wird. Dateien, mit im Namen enthaltenen "
+"Wildcards (sog. Fileglobs, z.B. `*.c`), k철nnen eingegeben werden, um alle "
+"체bereinstimmenden Dateien hinzuzuf체gen. Auch ein vorangestellter "
+"Verzeichnisname (z.B. `dir`, um `dir/file1` und `dir/file2` hinzuzuf체gen) "
+"kann angegeben werden, um den Index zu aktualisieren, damit er dann dem "
+"aktuellen Zustand des Verzeichnisses als Ganzem entspricht (z.B. wird die "
+"Angabe von `dir` nicht nur eine im Arbeitsbereich modifizierte Datei `dir/"
+"file1`, eine zum Arbeitsbereich hinzugef체gte Datei `dir/file2`, sondern auch "
+"eine aus dem Arbeitsbereich entfernte Datei `dir/file3` aufzeichnen). Es ist "
+"zu beachten, dass 채ltere Versionen von Git bisher die gel철schten Dateien "
+"ignoriert haben; benutzen Sie die Option `--no-all`, wenn Sie ge채nderte oder "
+"neue Dateien hinzuf체gen, aber gel철schte ignorieren wollen."
#. type: Plain text
#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
-msgstr "F체r mehr Detail 체ber die <pathspec> Syntax kann der 'pathspec' Eintrag im linkgit:gitglossary[7] zur Rate gezogen werden."
+msgstr ""
+"F체r mehr Detail 체ber die <Pfadspezifikation> Syntax kann der �엙athspec�� "
+"Eintrag im linkgit:gitglossary[7] zur Rate gezogen werden."
#. type: Plain text
#: en/git-add.txt:73
#, priority:300
msgid "Don't actually add the file(s), just show if they exist and/or will be ignored."
-msgstr "F체ge die Datei(en) nicht tats채chlich hinzu, sondern zeige nur ob sie existieren und/oder ignoriert werden."
+msgstr ""
+"F체gt die Datei(en) nicht wirklich hinzu, sondern zeigt nur an, ob sie "
+"existieren und/oder ignoriert werden."
#. type: Plain text
#: en/git-add.txt:81
#, priority:300
msgid "Allow adding otherwise ignored files."
-msgstr "Erzwinge das Hinzuf체gen normalerweise ignorierter Dateien."
+msgstr "Erzwingt das Hinzuf체gen normalerweise ignorierter Dateien."
#. type: Labeled list
#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
@@ -5809,19 +5827,30 @@ msgstr "--interactive"
#: en/git-add.txt:88
#, priority:300
msgid "Add modified contents in the working tree interactively to the index. Optional path arguments may be supplied to limit operation to a subset of the working tree. See ``Interactive mode'' for details."
-msgstr "F체ge ge채nderte Inhalte im Arbeitsbereich interaktiv zum Index hinzu. Optionale Pfad Argumente k철nnen verwendet werden um die Operation auf einen spezifischen Teil des Arbeitsbereichs einzuschr채nken. Siehe ''Interaktiver Modus'' f체r n채here Details."
+msgstr ""
+"F체gt ge채nderte Inhalte im Arbeitsbereich interaktiv zum Index hinzu. "
+"Optionale Pfad-Argumente k철nnen verwendet werden, um die Operation auf einen "
+"spezifischen Teil des Arbeitsbereichs einzuschr채nken. Siehe �얢nteraktiver "
+"Modus�� f체r weitere Details."
#. type: Plain text
#: en/git-add.txt:95
#, priority:300
msgid "Interactively choose hunks of patch between the index and the work tree and add them to the index. This gives the user a chance to review the difference before adding modified contents to the index."
msgstr ""
+"W채hlt interaktiv Bl철cke aus Patches zwischen dem Index und dem "
+"Arbeitsbereich aus und f체gt sie dem Index hinzu. Dadurch hat der Benutzer "
+"die M철glichkeit, die Differenz zu 체berpr체fen, bevor er ge채nderte Inhalte zum "
+"Index hinzuf체gt."
#. type: Plain text
#: en/git-add.txt:99
#, priority:300
msgid "This effectively runs `add --interactive`, but bypasses the initial command menu and directly jumps to the `patch` subcommand. See ``Interactive mode'' for details."
msgstr ""
+"Dadurch wird praktisch `add --interaktiv` ausgef체hrt, aber das anf채ngliche "
+"Befehlsmen체 wird umgangen und direkt zum Unterbefehl `patch` weitergeleitet. "
+"Siehe �얢nteraktiver Modus�� f체r weitere Details."
#. type: Labeled list
#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
@@ -5840,12 +5869,21 @@ msgstr "--edit"
#, priority:300
msgid "Open the diff vs. the index in an editor and let the user edit it. After the editor was closed, adjust the hunk headers and apply the patch to the index."
msgstr ""
+"횜ffnet Diff gegen체ber dem Index in einem Editor und l채sst ihn vom Benutzer "
+"bearbeiten. Nach dem Schlie횩en des Editors sollten die Headerteile (hunk "
+"headers) angepasst werden und der Patch auf den Index angewendet werden."
#. type: Plain text
#: en/git-add.txt:111
#, priority:300
msgid "The intent of this option is to pick and choose lines of the patch to apply, or even to modify the contents of lines to be staged. This can be quicker and more flexible than using the interactive hunk selector. However, it is easy to confuse oneself and create a patch that does not apply to the index. See EDITING PATCHES below."
msgstr ""
+"Der Zweck dieser Option besteht darin, einzelne Zeilen des Patches f체r die "
+"Anwendung auszuw채hlen oder sogar den Inhalt der zu inszenierenden (staged) "
+"Zeilen zu modifizieren. Das geht schneller und ist flexibler als mit dem "
+"interaktiven Hunk-Selector. Es ist jedoch leicht, sich selbst zu verwirren "
+"und einen Patch zu erstellen, der sich nicht auf den Index bezieht. Siehe "
+"bei PATCHES BEARBEITEN weiter unten."
#. type: Labeled list
#: en/git-add.txt:113
@@ -5858,12 +5896,20 @@ msgstr "--update"
#, priority:300
msgid "Update the index just where it already has an entry matching <pathspec>. This removes as well as modifies index entries to match the working tree, but adds no new files."
msgstr ""
+"Aktualisiert den Index genau dort, wo er bereits einen Eintrag hat, der mit "
+"der <Pfadspezifikation> 체bereinstimmt. Dadurch werden sowohl Indexeintr채ge "
+"entfernt als auch modifiziert, um dem Arbeitsbereich zu entsprechen, aber "
+"keine neuen Dateien hinzugef체gt."
#. type: Plain text
#: en/git-add.txt:122
#, priority:300
msgid "If no <pathspec> is given when `-u` option is used, all tracked files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)."
msgstr ""
+"Wenn die Option `-u` verwendet wird und keine <Pfadspezifikation> angegeben "
+"wird, werden alle getrackten Dateien im gesamten Arbeitsbereich aktualisiert "
+"(fr체here Git-Versionen begrenzten die Aktualisierung auf das aktuelle "
+"Verzeichnis und seine Unterverzeichnisse)."
#. type: Labeled list
#: en/git-add.txt:123 en/git-repack.txt:49 en/git-svn.txt:418
@@ -5882,12 +5928,20 @@ msgstr "--no-ignore-removal"
#, priority:300
msgid "Update the index not only where the working tree has a file matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to match the working tree."
msgstr ""
+"Aktualisiert den Index nicht nur dort, wo der Arbeitsbereich eine Datei "
+"enth채lt, die mit der <Pfadspezifikation> 체bereinstimmt, sondern auch dort, "
+"wo der Index bereits einen Eintrag enth채lt. Dadurch werden Indexeintr채ge "
+"hinzugef체gt, modifiziert und entfernt, um dem Arbeitsbereich anzupassen."
#. type: Plain text
#: en/git-add.txt:135
#, priority:300
msgid "If no <pathspec> is given when `-A` option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)."
msgstr ""
+"Wenn keine <Pfadspezifikation> angegeben wird und wenn die Option `-A` "
+"verwendet wird, werden alle Dateien im gesamten Arbeitsbereich aktualisiert ("
+"alte Versionen von Git begrenzten die Aktualisierung auf das aktuelle "
+"Verzeichnis und seine Unterverzeichnisse)."
#. type: Labeled list
#: en/git-add.txt:136
@@ -5906,12 +5960,20 @@ msgstr "--ignore-removal"
#, priority:300
msgid "Update the index by adding new files that are unknown to the index and files modified in the working tree, but ignore files that have been removed from the working tree. This option is a no-op when no <pathspec> is used."
msgstr ""
+"Aktualisiert den Index durch Hinzuf체gen neuer Dateien, die dem Index "
+"unbekannt sind und Dateien, die im Arbeitsbereich ge채ndert wurden, aber "
+"ignoriert Dateien, die aus dem Arbeitsbereich entfernt wurden. Diese Option "
+"ist eine �얧ulloperation��, wenn keine <Pfadspezifikation> verwendet wird."
#. type: Plain text
#: en/git-add.txt:146
#, ignore-ellipsis, priority:300
msgid "This option is primarily to help users who are used to older versions of Git, whose \"git add <pathspec>...\" was a synonym for \"git add --no-all <pathspec>...\", i.e. ignored removed files."
msgstr ""
+"Diese Option soll in erster Linie Benutzern helfen, die mit 채lteren "
+"Versionen von Git vertraut sind und deren \"git add <pathspec>...\" ein "
+"Synonym f체r \"git add --no-all <pathspec>...\" war, d.h. gel철schte Dateien "
+"ignoriert haben."
#. type: Labeled list
#: en/git-add.txt:147 en/git-format-patch.txt:103 en/git-submodule.txt:351
@@ -5930,6 +5992,10 @@ msgstr "--intent-to-add"
#, priority:300
msgid "Record only the fact that the path will be added later. An entry for the path is placed in the index with no content. This is useful for, among other things, showing the unstaged content of such files with `git diff` and committing them with `git commit -a`."
msgstr ""
+"Zeichnet nur den Sachverhalt auf, dass der Pfad sp채ter hinzugef체gt wird. Ein "
+"Eintrag f체r den Pfad wird ohne Inhalt in den Index aufgenommen. Das ist "
+"unter anderem sinnvoll, um den nicht gestagten Inhalt solcher Dateien mit `"
+"git diff` anzuzeigen und sie mit `git commit -a` zu 체bertragen (committen)."
#. type: Labeled list
#: en/git-add.txt:155 en/git-update-index.txt:55
@@ -5966,6 +6032,10 @@ msgstr "--ignore-missing"
#, priority:300
msgid "This option can only be used together with --dry-run. By using this option the user can check if any of the given files would be ignored, no matter if they are already present in the work tree or not."
msgstr ""
+"Diese Option kann nur zusammen mit `--dry-run` verwendet werden. Mit dieser "
+"Option kann der Benutzer pr체fen, ob eine der angegebenen Dateien ignoriert "
+"werden w체rden, unabh채ngig davon, ob sie bereits im Arbeitsbereich vorhanden "
+"sind oder nicht."
#. type: Labeled list
#: en/git-add.txt:172
@@ -5994,6 +6064,11 @@ msgstr "--renormalize"
#, priority:300
msgid "Apply the \"clean\" process freshly to all tracked files to forcibly add them again to the index. This is useful after changing `core.autocrlf` configuration or the `text` attribute in order to correct files added with wrong CRLF/LF line endings. This option implies `-u`."
msgstr ""
+"Den �얿lean�� Prozess neu auf alle getrackten Dateien anwenden, um sie "
+"zwangsweise wieder dem Index hinzuzuf체gen. Dies ist hilfreich, nachdem die "
+"Konfiguration `core.autocrlf` oder das Attribut`text` ge채ndert wurde, um "
+"Dateien zu berichtigen, die mit falschen CRLF/LF-Zeilenenden eingef체gt "
+"wurden. Diese Option impliziert `-u`."
#. type: Labeled list
#: en/git-add.txt:186 en/git-update-index.txt:86
@@ -6006,6 +6081,9 @@ msgstr "--chmod=(+|-)x"
#, priority:300
msgid "Override the executable bit of the added files. The executable bit is only changed in the index, the files on disk are left unchanged."
msgstr ""
+"횥berschreibt das Executable-Bit der hinzugef체gten Dateien. Das Executable-"
+"Bit wird nur im Index ge채ndert, die Dateien auf der Festplatte bleiben "
+"unver채ndert."
#. type: Labeled list
#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
@@ -6018,6 +6096,13 @@ msgstr "--pathspec-from-file=<Datei>"
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
+"Die Pfadangabe wird in `<file>` statt 체ber Befehlszeilen-Argumente "
+"체bergeben. Wenn `<file>` genau `-` ist, wird die Standardeingabe verwendet. "
+"Pfadspezifische Elemente werden durch LF oder CR/LF getrennt. Pathspec-"
+"Elemente k철nnen in Anf체hrungszeichen gesetzt werden, wie f체r die "
+"Konfigurationsvariable `core.quotePath` beschrieben (siehe linkgit:git-"
+"config[1]). Siehe auch `--pathspec-file-nul` und global `--literal-"
+"pathspecs`."
#. type: Labeled list
#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
@@ -6030,6 +6115,10 @@ msgstr "--pathspec-file-nul"
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
+"Nur sinnvoll mit `--pathspec-from-file`. Pfadspezifische Elemente werden mit "
+"dem Steuerzeichen-Code NULL getrennt und alle anderen Zeichen werden "
+"unver채ndert 체bernommen (einschlie횩lich der Zeilenumbr체che und "
+"Anf체hrungszeichen)."
#. type: Labeled list
#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
@@ -6101,7 +6190,11 @@ msgstr "Wird git im interaktiven Modus gestartet, zeigt es zuerst die Ausgabe de
#: en/git-add.txt:244 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
-msgstr "Diese zeigt eine Liste der m철glichen Unterbefehle und fr채gt \"What now> \". Wenn die Frage mit einem einzelnen '>' endet, kann man im Allgemeinen aus einer der folgenden Optionen w채hlen und diese mit der Eingabetaste best채tigen:"
+msgstr ""
+"Diese zeigt eine Liste der m철glichen Unterbefehle und fragt \"What now> \". "
+"Wenn die Frage mit einem einzelnen '>' endet, kann man im Allgemeinen aus "
+"einer der folgenden Optionen w채hlen und diese mit der Eingabetaste "
+"best채tigen:"
#. type: delimited block -
#: en/git-add.txt:250
@@ -6139,7 +6232,11 @@ msgstr "status"
#: en/git-add.txt:264
#, priority:300
msgid "This shows the change between HEAD and index (i.e. what will be committed if you say `git commit`), and between index and working tree files (i.e. what you could stage further before `git commit` using `git add`) for each path. A sample output looks like this:"
-msgstr "Zeigt den Unterschied zwischen HEAD und dem Index (also was committet wird wenn man `git commit` ausf체hrt), sowie zwischen dem Index und den Dateien im Arbeitsbereich (also was man vor einem `git commit` mittels `git-add` hinzuf체gen k철nnte) f체r jeden Pfad. Eine Beispielausgabe:"
+msgstr ""
+"Zeigt den Unterschied zwischen HEAD und dem Index (also was committet wird, "
+"wenn man `git commit` ausf체hrt), sowie zwischen dem Index und den Dateien im "
+"Arbeitsbereich (also was man vor einem `git commit` mittels `git-add` "
+"hinzuf체gen k철nnte) f체r jeden Pfad. Eine Beispielausgabe:"
#. type: delimited block -
#: en/git-add.txt:269
@@ -6193,7 +6290,7 @@ msgstr ""
#: en/git-add.txt:302
#, priority:300
msgid "To remove selection, prefix the input with `-` like this:"
-msgstr "Ein '-' vor der Option macht die Auswahl wieder r체ckg채ngig:"
+msgstr "Ein `-` vor der Option macht die Auswahl wieder r체ckg채ngig:"
#. type: delimited block -
#: en/git-add.txt:305
@@ -6205,7 +6302,9 @@ msgstr "Update>> -2\n"
#: en/git-add.txt:309
#, priority:300
msgid "After making the selection, answer with an empty line to stage the contents of working tree files for selected paths in the index."
-msgstr "Nachdem die Auwahl getroffen wurde kann durch Eingabe einer Leerzeile der Inhalt der ausgew채hlten Dateien in den Index aufgenommen werden."
+msgstr ""
+"Nachdem die Auswahl getroffen wurde, kann durch Eingabe einer Leerzeile der "
+"Inhalt der ausgew채hlten Dateien in den Index aufgenommen werden."
#. type: Labeled list
#: en/git-add.txt:310
@@ -6241,7 +6340,11 @@ msgstr "patch"
#: en/git-add.txt:328
#, priority:300
msgid "This lets you choose one path out of a 'status' like selection. After choosing the path, it presents the diff between the index and the working tree file and asks you if you want to stage the change of each hunk. You can select one of the following options and type return:"
-msgstr "Erm철glicht die Auswahl eines Pfades aus der 'status' Liste. Anschlie횩end wird der 'diff' zwichen dem Index und der Datei im Arbeisbereich angezeigt und gefragt ob die einzelnen Brocken hinzugef체gt werden sollen. Man kann ausw채hlen zwischen (횥beretzung in Klammern):"
+msgstr ""
+"Erm철glicht die Auswahl eines Pfades aus der 'status' Liste. Anschlie횩end "
+"wird der 'diff' zwischen dem Index und der Datei im Arbeitsbereich angezeigt "
+"und gefragt, ob die einzelnen Brocken hinzugef체gt werden sollen. Man kann "
+"ausw채hlen zwischen (횥bersetzung in Klammern):"
#. type: Plain text
#: en/git-add.txt:343
@@ -6299,7 +6402,9 @@ msgstr "diff"
#: en/git-add.txt:354
#, priority:300
msgid "This lets you review what will be committed (i.e. between HEAD and index)."
-msgstr "Zeigt die 횆nderungen an die commited werden w체rden (also zwischen HEAD und Index)."
+msgstr ""
+"Zeigt die 횆nderungen an, die committet werden w체rden (also zwischen HEAD und "
+"Index)."
#. type: Title -
#: en/git-add.txt:357
@@ -12005,14 +12110,14 @@ msgstr ""
#: 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 "Legt die von der Operation betroffenen Pfade fest."
#. 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
-#, fuzzy, priority:280
-#| msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
+#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
-msgstr "F체r mehr Detail 체ber die <pathspec> Syntax kann der 'pathspec' Eintrag im linkgit:gitglossary[7] zur Rate gezogen werden."
+msgstr ""
+"Mehr Details finden Sie im 'pathspec'-Eintrag in linkgit:gitglossary[7]."
#. type: Title -
#: en/git-checkout.txt:363
@@ -13450,12 +13555,7 @@ msgstr "git-clone - Klone ein Projektarchiv (repository) in ein neues Verzeichni
#. type: Plain text
#: en/git-clone.txt:20
-#, fuzzy, no-wrap, priority:300
-#| msgid ""
-#| "'git clone' [--template=<template_directory>]\n"
-#| "\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare]\n"
-#| "\t [-o <name>] [-u <upload-pack>] [--reference <repository>]\n"
-#| "\t [--depth <depth>] [--] <repository> [<directory>]\n"
+#, no-wrap, priority:300
msgid ""
"'git clone' [--template=<template_directory>]\n"
"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
@@ -13466,10 +13566,15 @@ msgid ""
"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--] <repository>\n"
"\t [<directory>]\n"
msgstr ""
-"'git clone' [--template=<template_directory>]\n"
-"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare]\n"
-"\t [-o <name>] [-u <upload-pack>] [--reference <repository>]\n"
-"\t [--depth <depth>] [--] <repository> [<directory>]\n"
+"'git clone' [--template=<Template-Directory>]\n"
+"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
+"\t [-o <Name>] [-b <Name>] [-u <Upload-Pack>] [--reference <Repository>]\n"
+"\t [--dissociate] [--separate-git-dir <Git-Verzeichnis>]\n"
+"\t [--depth <depth>] [--[no-]single-branch] [--no-tags]\n"
+"\t [--recurse-submodules[=<Pfad-Spezifikation>]] [--[no-]shallow-submodules]"
+"\n"
+"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--] <Repository>\n"
+"\t [<Directory>]\n"
#. type: Plain text
#: en/git-clone.txt:29
@@ -13485,13 +13590,22 @@ msgstr ""
#: en/git-clone.txt:35
#, priority:300
msgid "After the clone, a plain `git fetch` without arguments will update all the remote-tracking branches, and a `git pull` without arguments will in addition merge the remote master branch into the current master branch, if any (this is untrue when \"--single-branch\" is given; see below)."
-msgstr "Nach dem Klonen werden durch ein einfaches `git fetch` (ohne weitere Argumente) lokal alle Remote-Tracking-Branches aktualisiert, ein Aufruf von `git pull` wird zus채tzlich die 횆nderungen des fernen Entwicklungszweigs 'master' (falls es einen gibt) in den gleichnamigen lokalen Entwicklungszweig zusammenf체hren (Wenn \"--single-branch\" angegeben wird gilt dies nicht; siehe unten)."
+msgstr ""
+"Nach dem Klonen aktualisiert ein einfaches `git fetch` (ohne weitere "
+"Argumente) alle Remote-Tracking-Branches und ein Aufruf von `git pull` (ohne "
+"weitere Argumente) wird zus채tzlich die 횆nderungen des Remote-Branchs �쉖aster��"
+" in den lokalen Master-Branch mergen (das gilt nicht, wenn ��--single-branch�� "
+"angegeben wird; siehe unten)."
#. type: Plain text
#: en/git-clone.txt:40
#, priority:300
msgid "This default configuration is achieved by creating references to the remote branch heads under `refs/remotes/origin` and by initializing `remote.origin.url` and `remote.origin.fetch` configuration variables."
-msgstr "Diese Standardkonfiguration wird durch Anlegen einer Referenz auf den 'HEAD' des fernen Entwicklungszweigs unter `refs/remotes/origin` und der Einrichtung der Konfigurationsvariablen `remote.origin.url` und `remote.origin.fetch` erreicht."
+msgstr ""
+"Diese Standard-Konfiguration wird durch Anlegen einer Referenz auf den "
+"'HEAD' der Remote-Branch unter `refs/remotes/origin` und der Einrichtung der "
+"Konfigurationsvariablen `remote.origin.url` und `remote.origin.fetch` "
+"erreicht."
#. type: Labeled list
#: en/git-clone.txt:45 en/git-config.txt:127 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
@@ -13510,6 +13624,12 @@ msgstr "Ist das zu klonende Projektarchiv lokal auf der Maschine, kann durch die
#, 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 ""
+"Wenn das Repository als lokaler Pfad angegeben wird (z.B. `/Pfad/zum/Repo`), "
+"das ist ja die Voreinstellung und --local ist eigentlich 체berfl체ssig "
+"(Nulloperation). Sobald das Repository als URL angegeben wird, dann wird "
+"dieses Flag ignoriert (und wird niemals die lokalen Optimierungen anwenden). "
+"Die Angabe von `--no-local` wird die Vorgabe 체berschreiben, wenn `/Pfad/zum/"
+"Repo` angegeben wird, und stattdessen den regul채ren Git-Transport verwenden."
#. type: Labeled list
#: en/git-clone.txt:60
@@ -13521,7 +13641,10 @@ msgstr "--no-hardlinks"
#: en/git-clone.txt:65
#, priority:300
msgid "Force the cloning process from a repository on a local filesystem to copy the files under the `.git/objects` directory instead of using hardlinks. This may be desirable if you are trying to make a back-up of your repository."
-msgstr "Erzwinge ein physikalisches Kopieren aller Dateien im '.git/objects/' Verzeichnis anstelle von Hardlinks. Dies kann erw체nscht sein, wenn Sie eine Sicherung Ihres Repositories erstellen m철chten."
+msgstr ""
+"Erzwingt ein physikalisches Kopieren aller Dateien im `.git/objects/` "
+"Verzeichnis anstelle von Hardlinks. Dies kann erw체nscht sein, wenn eine "
+"Sicherung des Repositorys erstellt werden soll."
#. type: Labeled list
#: en/git-clone.txt:67
@@ -13533,7 +13656,11 @@ msgstr "--shared"
#: en/git-clone.txt:73
#, priority:300
msgid "When the repository to clone is on the local machine, instead of using hard links, automatically setup `.git/objects/info/alternates` to share the objects with the source repository. The resulting repository starts out without any object of its own."
-msgstr "Befindet sich das zu klonende Repository lokal auf der Maschine, dann werden automatisch alle Objkte mittels `.git/objects/info/alternates` gemeinsam verwendet. Das erzeugte Projektarchiv enth채lt initial keine eigenen Objekte."
+msgstr ""
+"Befindet sich das zu klonende Repository lokal auf der Maschine (anstatt "
+"Hard-Links zu verwenden), dann werden automatisch alle Objekte mittels `.git/"
+"objects/info/alternates` gemeinsam verwendet. Das erzeugte Repository "
+"enth채lt initial keine eigenen Objekte."
#. type: Plain text
#: en/git-clone.txt:83
@@ -13550,11 +13677,13 @@ msgid ""
"then the cloned repository will become corrupt.\n"
msgstr ""
"*HINWEIS*: Dies kann m철glicherweise gef채hrlich sein! Verwenden Sie diese\n"
-"Option nicht wenn Sie sich nicht wirklich sicher sind. Wird ein Repository\n"
+"Option *nicht*, wenn Sie sich nicht wirklich sicher sind. Wird ein "
+"Repository\n"
"mit dieser Option geklont und man l철scht z.B. sp채ter einen Branch oder\n"
"f체hrt sonst eine Git-Operation im Quellarchiv durch, die bestehende Commits\n"
"dereferenziert, kann dies das geklonte Repository zerst철ren.\n"
-"Diese \"gef채hrlichen\" Operationen k철nnen auch implizit, z.B. von `git commit`\n"
+"Diese �엃ef채hrlichen�� Operationen k철nnen auch implizit, z.B. von `git commit`"
+"\n"
"(ruft intern automatisch `git gc --auto` auf) ausgef체hrt werden.\n"
"(Siehe linkgit:git-gc[1].)\n"
@@ -13563,12 +13692,22 @@ msgstr ""
#, priority:300
msgid "Note that running `git repack` without the `--local` option in a repository cloned with `--shared` will copy objects from the source repository into a pack in the cloned repository, removing the disk space savings of `clone --shared`. It is safe, however, to run `git gc`, which uses the `--local` option by default."
msgstr ""
+"Man sollte beachten, dass das Ausf체hren von `git repack` ohne die Option "
+"`--local` in einem Repository, das mit `--shared` geklont wurde, Objekte aus "
+"dem Quell-Repository in ein Paket im geklonten Repository kopiert und so den "
+"von `clone --shared` eingesparten Plattenplatz entfernt. Dagegen kann `git "
+"gc` sicher ausgef체hrt werden, das standardm채횩ig die Option `--local` "
+"verwendet."
#. type: Plain text
#: en/git-clone.txt:93
#, priority:300
msgid "If you want to break the dependency of a repository cloned with `--shared` on its source repository, you can simply run `git repack -a` to copy all objects from the source repository into a pack in the cloned repository."
msgstr ""
+"Wenn die Abh채ngigkeit eines mit `--shared` geklonten Repositorys von seinem "
+"Quell-Repository gebrochen werden soll, kann einfach `git repack -a` "
+"ausgef체hrt werden, um alle Objekte aus dem Quell-Repository �엍n einem Rutsch��"
+" in das geklonte Repository zu kopieren."
#. type: Labeled list
#: en/git-clone.txt:94
@@ -13578,10 +13717,17 @@ msgstr "--reference[-if-able] <Repository>"
#. type: Plain text
#: en/git-clone.txt:104
-#, fuzzy, priority:300
-#| msgid "If the reference repository is on the local machine automatically setup .git/objects/info/alternates to obtain objects from the reference repository. Using an already existing repository as an alternate will require fewer objects to be copied from the repository being cloned, reducing network and local storage costs."
+#, priority:300
msgid "If the reference repository is on the local machine, automatically setup `.git/objects/info/alternates` to obtain objects from the reference repository. Using an already existing repository as an alternate will require fewer objects to be copied from the repository being cloned, reducing network and local storage costs. When using the `--reference-if-able`, a non existing directory is skipped with a warning instead of aborting the clone."
-msgstr "Befindet sich das zu klonende Projektarchiv (repository) lokal auf der Maschine, dann setze .git/objects/info/alternates so auf, da횩 Objekte automatisch vom original Projektarchiv genommen werden. Wird ein bereits bestehendes Projektarchiv als 'alternativ' angegeben, m체ssen weniger Objekte von diesem kopiert werden, wodurch weniger Plattenplatz und Bandbreite auf dem Netzwerk verbraucht werden."
+msgstr ""
+"Wenn sich das Referenz-Repository auf dem lokalen Rechner befindet, wird "
+"automatisch `.git/objects/info/alternates` eingerichtet, um Objekte aus dem "
+"Referenz-Repository zu erhalten. Wenn, alternativ, ein bereits vorhandenes "
+"Repository verwendet wird, m체ssen weniger Objekte aus dem zu klonenden "
+"Repository kopiert werden, was die Belastung f체r Netzwerk und lokale "
+"Sicherung reduziert. Bei der Anwendung von `--reference-if-able` wird ein "
+"nicht existierendes Verzeichnis mit einer Warnung 체bersprungen, anstatt den "
+"Klon abzubrechen."
#. type: Plain text
#: en/git-clone.txt:107
@@ -13590,6 +13736,8 @@ msgid ""
"*NOTE*: see the NOTE for the `--shared` option, and also the\n"
"`--dissociate` option.\n"
msgstr ""
+"*HINWEIS*: Siehe den HINWEIS f체r die Option `--shared` \n"
+"und auch f체r die Option `--dissociate`.\n"
#. type: Labeled list
#: en/git-clone.txt:108 en/git-submodule.txt:403
@@ -13602,6 +13750,14 @@ msgstr "--dissociate"
#, priority:300
msgid "Borrow the objects from reference repositories specified with the `--reference` options only to reduce network transfer, and stop borrowing from them after a clone is made by making necessary local copies of borrowed objects. This option can also be used when cloning locally from a repository that already borrows objects from another repository--the new repository will borrow objects from the same repository, and this option can be used to stop the borrowing."
msgstr ""
+"Objekte, die mit der Option `--reference` spezifiziert sind, von Referenz-"
+"Repositorys entlehnen. Dadurch wird der Netzwerktransfer reduziert und die "
+"횥berf체hrung von Objekten aus diesen Repositorys beendet, nachdem ein Klon "
+"mit den notwendigen lokalen Kopien der entlehnten Objekte erstellt wurden. "
+"Diese Option kann auch verwendet werden, wenn lokal von einem Repository "
+"geklont wird, das schon Objekte von einem anderen Repository 체bernimmt �� das "
+"neue Repository wird wiederum Objekte vom selben Repository entlehnen. Diese "
+"Option kann verwendet werden, um die 횥bernahme zu stoppen."
#. type: Plain text
#: en/git-clone.txt:123
@@ -13614,6 +13770,8 @@ msgstr "'stille' Ausf체hrung. Auf dem Standardfehlerstrom wird kein Fortschritt
#, priority:300
msgid "Run verbosely. Does not affect the reporting of progress status to the standard error stream."
msgstr ""
+"�얱ortreich�� ausf체hren. Beeinflusst nicht die Fortschrittsmeldung an den "
+"Standardfehlerstrom."
#. type: Plain text
#: en/git-clone.txt:134
@@ -13625,7 +13783,8 @@ msgstr "Der Fortschritt wird nur standardm채횩ig auf der Standardfehlerausgabe a
#: en/git-clone.txt:146
#, priority:300
msgid "No checkout of HEAD is performed after the clone is complete."
-msgstr "Unterdr체cke das Abrufen (checkout) von HEAD nachdem das Klonen fertig ist."
+msgstr ""
+"Unterdr체ckt das Abrufen (checkout) von HEAD, nachdem das Klonen fertig ist."
#. type: Labeled list
#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
@@ -13651,6 +13810,10 @@ msgstr "--sparse"
#, priority:300
msgid "Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed."
msgstr ""
+"Initialisiert die Sparse-Checkout-Datei so, dass das Arbeitsverzeichnis nur "
+"mit den Dateien im Stammverzeichnis (root) des Repositorys beginnt. Die "
+"Sparse-Checkout-Datei kann modifiziert werden, um das Arbeitsverzeichnis "
+"nach Bedarf zu vergr철횩ern."
#. type: Labeled list
#: en/git-clone.txt:165 en/git-push.txt:161
@@ -13663,12 +13826,18 @@ 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 ""
+"Erstellt einen Spiegel des Quell-Repositorys. Das enth채lt auch `--bare`. Im "
+"Vergleich zu `--bare` bildet `--mirror` nicht nur lokale Branches der Quelle "
+"auf lokale Branches des Ziel-Repositorys ab, sondern bildet auch alle Refs "
+"ab (einschlie횩lich der Remote-Tracking-Branches, Notizen usw.). Es richtet "
+"eine refspec-Konfiguration ein, so dass alle diese Refs durch ein `git "
+"remote update` im Ziel-Repository 체berschrieben werden k철nnen."
#. type: Labeled list
#: en/git-clone.txt:173
#, no-wrap, priority:300
msgid "-o <name>"
-msgstr "-o <name>"
+msgstr "-o <Name>"
#. type: Labeled list
#: en/git-clone.txt:174
@@ -13684,10 +13853,9 @@ msgstr "Verwende den Namen `<Name>` anstatt `origin` zum Verfolgen der 횆nderung
#. type: Labeled list
#: en/git-clone.txt:178
-#, fuzzy, no-wrap, priority:300
-#| msgid "-o <name>"
+#, no-wrap, priority:300
msgid "-b <name>"
-msgstr "-o <name>"
+msgstr "-o <Name>"
#. type: Labeled list
#: en/git-clone.txt:179
@@ -13700,6 +13868,11 @@ msgstr "--branch <Name>"
#, priority:300
msgid "Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository's HEAD, point to `<name>` branch instead. In a non-bare repository, this is the branch that will be checked out. `--branch` can also take tags and detaches the HEAD at that commit in the resulting repository."
msgstr ""
+"Anstatt dass der neu erstellte HEAD auf den Branch zeigt, auf den der HEAD "
+"des geklonten Repositorys zeigt, verweist er stattdessen auf den Branch "
+"`<Name>`. In einem non-bare Repository ist dies der Branch, der ausgecheckt "
+"wird. `--branch` kann auch Tags 체bernehmen und HEAD im resultierenden "
+"Repository von diesem Commit abtrennen."
#. type: Labeled list
#: en/git-clone.txt:187
@@ -13717,37 +13890,52 @@ msgstr "Wird diese Option angegeben und auf das zu klonende Projektarchiv mittel
#: en/git-clone.txt:193 en/git-init.txt:51 en/git-svn.txt:578
#, no-wrap, priority:300
msgid "--template=<template_directory>"
-msgstr "--template=<template_directory>"
+msgstr "--template=<Template_Directory>"
#. type: Plain text
#: en/git-clone.txt:196
#, priority:300
msgid "Specify the directory from which templates will be used; (See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)"
msgstr ""
+"Bestimmt das Verzeichnis, aus dem Templates ausgelesen werden sollen; (Siehe "
+"den Abschnitt \"TEMPLATE DIRECTORY\" in linkgit:git-init[1].)"
#. type: Labeled list
#: en/git-clone.txt:197
#, no-wrap, priority:300
msgid "-c <key>=<value>"
-msgstr "-c <Name>=<Wert>"
+msgstr "-c <Schl체ssel>=<Wert>"
#. type: Labeled list
#: en/git-clone.txt:198
#, no-wrap, priority:300
msgid "--config <key>=<value>"
-msgstr ""
+msgstr "--config <Schl체ssel>=<Wert>"
#. type: Plain text
#: en/git-clone.txt:207
#, priority:300
msgid "Set a configuration variable in the newly-created repository; this takes effect immediately after the repository is initialized, but before the remote history is fetched or any files checked out. The key is in the same format as expected by linkgit:git-config[1] (e.g., `core.eol=true`). If multiple values are given for the same key, each value will be written to the config file. This makes it safe, for example, to add additional fetch refspecs to the origin remote."
msgstr ""
+"Setzt eine Konfigurations-Variable im neu angelegten Repository; die sofort "
+"nach der Initialisierung des Repositorys wirksam wird, noch bevor der Remote-"
+"Verlauf geholt oder irgendwelche Dateien ausgecheckt werden. Der Schl체ssel "
+"hat das gleiche Format wie es von linkgit:git-config[1] erwartet wird (z.B. "
+"`core.eol=true`). Wenn f체r den gleichen Schl체ssel mehrere Werte angegeben "
+"werden, wird jeder Wert in die Konfigurationsdatei geschrieben. Auf diese "
+"Weise ist es z.B. m철glich, zus채tzliche Fetch-Referenzen zum Ursprungs-Remote "
+"hinzuzuf체gen."
#. type: Plain text
#: en/git-clone.txt:213
#, priority:300
msgid "Due to limitations of the current implementation, some configuration variables do not take effect until after the initial fetch and checkout. Configuration variables known to not take effect are: `remote.<name>.mirror` and `remote.<name>.tagOpt`. Use the corresponding `--mirror` and `--no-tags` options instead."
msgstr ""
+"Aufgrund von Einschr채nkungen der aktuellen Implementierung werden einige "
+"Konfigurations-Variablen erst *nach* dem initialen Fetchen und Checkout "
+"wirksam. Konfigurationsvariablen, die bekannterma횩en nicht wirksam werden, "
+"sind: `remote.<Name>.mirror` und `remote.<Name>.tagOpt`. Verwenden Sie "
+"stattdessen die entsprechenden Optionen `---mirror` und `--no-tags`."
#. type: Labeled list
#: en/git-clone.txt:214
@@ -13760,18 +13948,28 @@ msgstr "--depth <Tiefe>"
#, priority:300
msgid "Create a 'shallow' clone with a history truncated to the specified number of commits. Implies `--single-branch` unless `--no-single-branch` is given to fetch the histories near the tips of all branches. If you want to clone submodules shallowly, also pass `--shallow-submodules`."
msgstr ""
+"Erstellt einen �엂lachen�� Klon mit einem auf die angegebene Anzahl von "
+"Commits gek체rzten Verlauf. Das impliziert `--single-branch`, es sei denn, es "
+"wird `--no-single-branch` angegeben, um den Verlauf nahe der Spitzen aller "
+"Branches zu fetchen. Wenn Submodule gek체rzt geklont werden sollen, geben "
+"Sie zus채tzlich `--shallow-submodules` an."
#. type: Plain text
#: en/git-clone.txt:223
#, priority:300
msgid "Create a shallow clone with a history after the specified time."
msgstr ""
+"Erstellt einen �엂lachen��, gek체rzten Klon mit einem Verlauf nach dem "
+"festgelegten Zeitpunkt."
#. type: Plain text
#: en/git-clone.txt:228
#, priority:300
msgid "Create a shallow clone with a history, excluding commits reachable from a specified remote branch or tag. This option can be specified multiple times."
msgstr ""
+"Erstellt einen flachen Klon mit einem Verlauf, der Commits ausschlie횩t, die "
+"von einem angegebenen Remote-Branch oder Tag erreichbar sind. Diese Option "
+"kann mehrfach angegeben werden."
#. type: Labeled list
#: en/git-clone.txt:229 en/git-submodule.txt:433
@@ -13784,18 +13982,34 @@ msgstr "--[no-]single-branch"
#, priority:300
msgid "Clone only the history leading to the tip of a single branch, either specified by the `--branch` option or the primary branch remote's `HEAD` points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when `--single-branch` clone was made, no remote-tracking branch is created."
msgstr ""
+"Klont nur die Historie, die zur Spitze eines einzelnen Branchs geh철rt, "
+"entweder spezifiziert durch die `--branch`-Option oder den prim채ren Branch "
+"auf den der Remote-`HEAD` zeigt. Nachfolgende Fetches in das resultierende "
+"Repository werden nur den Remote-Tracking-Branch f체r den Branch "
+"aktualisieren, auf dem diese Option f체r das anf채ngliche Klonen verwendet "
+"wurde. Wenn der HEAD des Remote-Repositorys auf keinen Branch zeigte, als "
+"mit `--single-branch` geklont wurde, wird kein Remote-Tracking-Branch "
+"erzeugt."
#. type: Plain text
#: en/git-clone.txt:245
#, priority:300
msgid "Don't clone any tags, and set `remote.<remote>.tagOpt=--no-tags` in the config, ensuring that future `git pull` and `git fetch` operations won't follow any tags. Subsequent explicit tag fetches will still work, (see linkgit:git-fetch[1])."
msgstr ""
+"Klont keine Tags und setzt in der Konfiguration `remote.<remote>.tagOpt=--no-"
+"tags`, um sicherzustellen, dass zuk체nftige `git pull` und `git fetch` "
+"Operationen keinen Tags folgen. Nachfolgende explizite Tag-Fetches werden "
+"trotzdem funktionieren (siehe linkgit:git-fetch[1])."
#. type: Plain text
#: en/git-clone.txt:250
#, priority:300
msgid "Can be used in conjunction with `--single-branch` to clone and maintain a branch with no references other than a single cloned branch. This is useful e.g. to maintain minimal clones of the default branch of some repository for search indexing."
msgstr ""
+"Kann in Verbindung mit `--single-branch` verwendet werden, um einen Branch "
+"zu klonen und zu verwalten, der au횩er einem einzelnen geklonten Branch keine "
+"Referenzen enth채lt. Das ist z.B. n체tzlich, um minimale Klone des Standard-"
+"Branchs eines Repositorys f체r die Indexierung von Suchvorg채ngen zu erhalten."
#. type: Labeled list
#: en/git-clone.txt:251
@@ -13808,12 +14022,25 @@ msgstr "--recurse-submodules[=<Pfadspezifikation]"
#, priority:300
msgid "After the clone is created, initialize and clone submodules within based on the provided pathspec. If no pathspec is provided, all submodules are initialized and cloned. This option can be given multiple times for pathspecs consisting of multiple entries. The resulting clone has `submodule.active` set to the provided pathspec, or \".\" (meaning all submodules) if no pathspec is provided."
msgstr ""
+"Initialisiert und klont nach der Erstellung des Klons Submodule auf der "
+"Basis der angegebenen Pfadspezifikation. Wenn keine Pfadspezifikation "
+"angegeben wird, werden alle Submodule initialisiert und geklont. Diese "
+"Option kann f체r Pfadspezifikationen, die aus mehreren Eintr채gen bestehen, "
+"mehrfach angegeben werden. Der resultierende Klon hat `submodule.active` "
+"oder \".\" (d.h. alle Submodule) auf die angegebene Pfadspezifikation "
+"gesetzt, wenn keine Pfadspezifikation vorhanden ist."
#. type: Plain text
#: en/git-clone.txt:266
#, priority:300
msgid "Submodules are initialized and cloned using their default settings. This is equivalent to running `git submodule update --init --recursive <pathspec>` immediately after the clone is finished. This option is ignored if the cloned repository does not have a worktree/checkout (i.e. if any of `--no-checkout`/`-n`, `--bare`, or `--mirror` is given)"
msgstr ""
+"Submodule werden mit ihren Standardeinstellungen initialisiert und geklont. "
+"Dies entspricht dem Ausf체hren von `git submodule update --init --recursive "
+"<Pfadspezifikation>` unmittelbar nachdem der Klon beendet ist. Diese Option "
+"wird ignoriert, wenn das geklonte Repository keinen Arbeitsbereich/Checkout "
+"hat (d.h. wenn eine der Optionen `--no-checkout`/`-n`, `--bare` oder "
+"`--mirror` angegeben wurde)"
#. type: Labeled list
#: en/git-clone.txt:267
@@ -13825,7 +14052,7 @@ msgstr "--[no-]shallow-submodules"
#: en/git-clone.txt:269
#, priority:300
msgid "All submodules which are cloned will be shallow with a depth of 1."
-msgstr ""
+msgstr "Alle zu klonenden Submodule werden auf eine Tiefe von 1 gek체rzt."
#. type: Labeled list
#: en/git-clone.txt:270
@@ -13838,18 +14065,26 @@ msgstr "--[no-]remote-submodules"
#, priority:300
msgid "All submodules which are cloned will use the status of the submodule's remote-tracking branch to update the submodule, rather than the superproject's recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
msgstr ""
+"Alle geklonten Submodule verwenden den Status der Remote-Tracking-Branch des "
+"Submoduls, um das Submodul zu aktualisieren, aber nicht den registrierten "
+"SHA-1 des Hauptprojekts. Das entspricht der Option von `--remote` mitdem "
+"Befehl `git submodule update`."
#. type: Labeled list
#: en/git-clone.txt:276 en/git-init.txt:56
#, no-wrap, priority:300
msgid "--separate-git-dir=<git dir>"
-msgstr ""
+msgstr "--separate-git-dir=<Git-Dir>"
#. type: Plain text
#: en/git-clone.txt:282
#, priority:300
msgid "Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, then make a filesystem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree."
msgstr ""
+"Verwendet das angegebene Verzeichnis als Speicherort f체r das geklonte "
+"Repository, anstatt das 체bliche Verzeichnis zu verwenden. Dann wird ein "
+"Dateisystem-unabh채ngiger, symbolischer Git-Link dorthin erstellt. Das f체hrt "
+"dazu, dass das Git-Repository vom Arbeitsbereich getrennt werden kann."
#. type: Labeled list
#: en/git-clone.txt:283 en/git-submodule.txt:427
@@ -13868,6 +14103,8 @@ msgstr "--jobs <Anz>"
#, priority:300
msgid "The number of submodules fetched at the same time. Defaults to the `submodule.fetchJobs` option."
msgstr ""
+"Anzahl der gleichzeitig abgerufenen Submodule. Standardm채횩ig wird die "
+"Option `submodule.fetchJobs` verwendet."
#. type: Labeled list
#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
@@ -13879,7 +14116,10 @@ msgstr "<Repository>"
#: en/git-clone.txt:292
#, priority:300
msgid "The (possibly remote) repository to clone from. See the <<URLS,GIT URLS>> section below for more information on specifying repositories."
-msgstr "Das (m철glicherweise ferne) Projektarchiv das geklont werden soll. Siehe die <<URLS,GIT URLS>> Sektion f체r weitere Information wie Projektarchive angegeben werden k철nnen."
+msgstr ""
+"Bezeichnet das (m철glicherweise externe) Repository, das geklont werden "
+"soll. Siehe unten den Abschnitt <<URLS,GIT URLS>> f체r weiterf체hrende "
+"Informationen zum Bestimmen von Repositorys."
#. type: Labeled list
#: en/git-clone.txt:293 en/git-cvsserver.txt:53 en/git-daemon.txt:220 en/git-receive-pack.txt:41 en/git-send-pack.txt:95 en/git-upload-archive.txt:57 en/git-upload-pack.txt:44
@@ -13889,17 +14129,20 @@ msgstr "<directory>"
#. type: Plain text
#: en/git-clone.txt:299
-#, fuzzy, priority:300
-#| msgid "The name of a new directory to clone into. The \"humanish\" part of the source repository is used if no directory is explicitly given (\"repo\" for \"/path/to/repo.git\" and \"foo\" for \"host.xz:foo/.git\"). Cloning into an existing directory is not allowed."
+#, priority:300
msgid "The name of a new directory to clone into. The \"humanish\" part of the source repository is used if no directory is explicitly given (`repo` for `/path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an existing directory is only allowed if the directory is empty."
-msgstr "Der Name eines neuen Verzeichnisses in das gekloned wird. Falls kein Verzeichnis explizit angegeben wurde, wird der \"menschenfreundliche\" Teil des Qellprojektarchivs verwendet. (\"repo\" f체r \"/path/to/repo.git\" und \"foo\" f체r \"host.xz:foo/.git\"). Das Klonen in ein bestehendes Verzeichnis ist nicht erlaubt."
+msgstr ""
+"Der Name eines neuen Verzeichnisses, in das geklont werden soll. Der "
+"�엕enschenfreundliche�� Teil des Quell-Repositorys wird verwendet, wenn kein "
+"Verzeichnis explizit angegeben wird (`repo` f체r `/path/to/repo.git` und `foo`"
+" f체r `host.xz:foo/.git`). Das Klonen in ein bestehendes Verzeichnis ist nur "
+"erlaubt, wenn das Verzeichnis leer ist."
#. type: Plain text
#: en/git-clone.txt:307
-#, fuzzy, priority:300
-#| msgid "Clone from upstream"
+#, priority:300
msgid "Clone from upstream:"
-msgstr "Klonen eines 'fernen' Projektarchivs"
+msgstr "Klonen eines Upstream-Repositorys:"
#. type: delimited block -
#: en/git-clone.txt:312
@@ -13915,10 +14158,11 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:316
-#, fuzzy, priority:300
-#| msgid "Make a local clone that borrows from the current directory, without checking things out"
+#, priority:300
msgid "Make a local clone that borrows from the current directory, without checking things out:"
-msgstr "Erzeuge einen lokalen Klon der vom aktuellen Verzeichnis borgt, ohne 'git checkout' durchzuf체hren"
+msgstr ""
+"Erstellt einen lokalen Klon, der vom aktuellen Verzeichnis entlehnt wird, "
+"ohne die Daten auszuchecken:"
#. type: delimited block -
#: en/git-clone.txt:321
@@ -13934,10 +14178,11 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:325
-#, fuzzy, priority:300
-#| msgid "Clone from upstream while borrowing from an existing local directory"
+#, priority:300
msgid "Clone from upstream while borrowing from an existing local directory:"
-msgstr "Klone ein 'fernes' Projektarchiv w채hrend Objekte von einem lokalen Projektarchiv gebort werden"
+msgstr ""
+"Klonen eines Upstream-Repositorys wobei Objekte von einem lokalen Repository "
+"entlehnt werden:"
#. type: delimited block -
#: en/git-clone.txt:331
@@ -13955,10 +14200,10 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:335
-#, fuzzy, priority:300
-#| msgid "Create a bare repository to publish your changes to the public"
+#, priority:300
msgid "Create a bare repository to publish your changes to the public:"
-msgstr "Erzeuge ein 'reines' Projektarchiv um 횆nderungen publik zu machen"
+msgstr ""
+"Erzeugt ein �엓eeres�� (bare) Repository um Ihre 횆nderungen zu ver철ffentlichen:"
#. type: delimited block -
#: en/git-clone.txt:338
@@ -15162,21 +15407,7 @@ msgstr "git-config - Repositoryeigene oder globale Optionen auslesen und setzen"
#. type: Plain text
#: en/git-config.txt:27
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "'git config' [<file-option>] [type] [-z|--null] name [value [value_regex]]\n"
-#| "'git config' [<file-option>] [type] --add name value\n"
-#| "'git config' [<file-option>] [type] --replace-all name [value [value_regex]]\n"
-#| "'git config' [<file-option>] [type] [-z|--null] --get name [value_regex]\n"
-#| "'git config' [<file-option>] [type] [-z|--null] --get-all name [value_regex]\n"
-#| "'git config' [<file-option>] [type] [-z|--null] --get-regexp name_regex [value_regex]\n"
-#| "'git config' [<file-option>] --unset name [value_regex]\n"
-#| "'git config' [<file-option>] --unset-all name [value_regex]\n"
-#| "'git config' [<file-option>] --rename-section old_name new_name\n"
-#| "'git config' [<file-option>] --remove-section name\n"
-#| "'git config' [<file-option>] [-z|--null] -l | --list\n"
-#| "'git config' [<file-option>] --get-color name [default]\n"
-#| "'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
+#, no-wrap, priority:100
msgid ""
"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]\n"
"'git config' [<file-option>] [--type=<type>] --add name value\n"
@@ -15194,19 +15425,29 @@ msgid ""
"'git config' [<file-option>] --get-colorbool name [stdout-is-tty]\n"
"'git config' [<file-option>] -e | --edit\n"
msgstr ""
-"'git config' [<Datei-Option>] [Typ] [-z|--null] Name [Wert [Wert_Regex]]\n"
-"'git config' [<Datei-Option>] [Typ] --add Name Wert\n"
-"'git config' [<Datei-Option>] [Typ] --replace-all Name [Wert [Wert_Regex]]\n"
-"'git config' [<Datei-Option>] [Typ] [-z|--null] --get Name [Wert_Regex]\n"
-"'git config' [<Datei-Option>] [Typ] [-z|--null] --get-all Name [Wert_Regex]\n"
-"'git config' [<Datei-Option>] [Typ] [-z|--null] --get-regexp Name_Regex [Wert_Regex]\n"
+"'git config' [<Datei-Option>] [--type=<Typ>] [--show-origin] [--show-scope] "
+"[-z|--null] Name [Wert [Wert_Regex]]\n"
+"'git config' [<Datei-Option>] [--type=<Typ>] --add Name Wert\n"
+"'git config' [<Datei-Option>] [--type=<Typ>] --replace-all Name Wert "
+"[Wert_Regex]\n"
+"'git config' [<Datei-Option>] [--type=<Typ>] [--show-origin] [--show-scope] "
+"[-z|--null] --get Name [Wert_Regex]\n"
+"'git config' [<Datei-Option>] [--type=<Typ>] [--show-origin] [--show-scope] "
+"[-z|--null] --get-all Name [Wert_Regex]\n"
+"'git config' [<Datei-Option>] [--type=<Typ>] [--show-origin] [--show-scope] "
+"[-z|--null] [--name-only] --get-regexp Name_Regex [Wert_Regex]\n"
+"'git config' [<Datei-Option>] [--type=<Typ>] [-z|--null] --get-urlmatch Name "
+"URL\n"
"'git config' [<Datei-Option>] --unset Name [Wert_Regex]\n"
"'git config' [<Datei-Option>] --unset-all Name [Wert_Regex]\n"
"'git config' [<Datei-Option>] --rename-section alter_Name neuer_Name\n"
"'git config' [<Datei-Option>] --remove-section Name\n"
-"'git config' [<Datei-Option>] [-z|--null] -l | --list\n"
+"'git config' [<Datei-Option>] [--show-origin] [--show-scope] [-z|--null] "
+"[--name-only] -l | --list\n"
"'git config' [<Datei-Option>] --get-color Name [Standard]\n"
-"'git config' [<Datei-Option>] --get-colorbool Name [Standardausgabe-ist-tty]\n"
+"'git config' [<Datei-Option>] --get-colorbool Name [Standardausgabe-ist-tty]"
+"\n"
+"'git config' [<Datei-Option>] -e | --edit\n"
#. type: Plain text
#: en/git-config.txt:33
@@ -29314,32 +29555,42 @@ msgstr "git-init(1)"
#. type: Plain text
#: en/git-init.txt:7
-#, fuzzy, priority:300
-#| msgid "git-init-db - Creates an empty git repository"
+#, priority:300
msgid "git-init - Create an empty Git repository or reinitialize an existing one"
-msgstr "git-init-db - Erstellt ein leeres git-Repository"
+msgstr ""
+"git-init-db �� Erstellt ein leeres Git-Repository oder initialisiert ein "
+"vorhandenes erneut"
#. type: Plain text
#: en/git-init.txt:15
-#, fuzzy, no-wrap, priority:300
-#| msgid "'git init-db' [-q | --quiet] [--template=<template_directory>] [--shared[=<permissions>]]"
+#, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
"\t [--separate-git-dir <git dir>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
-msgstr "'git init-db' [-q | --quiet] [--template=<vorlageverzeichnis>] [--shared[=<berechtigungen>]]"
+msgstr ""
+"'git init' [-q | --quiet] [--bare] [--template=<Template-Verzeichnis>]\n"
+"\t [--separate-git-dir <Git-Verzeichnis>]\n"
+"\t [--shared[=<Berechtigungen>]] [Verzeichnis]\n"
#. type: Plain text
#: en/git-init.txt:24
#, priority:300
msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files. An initial `HEAD` file that references the HEAD of the master branch is also created."
msgstr ""
+"Dieser Befehl erzeugt ein leeres Git-Repository �� im Grunde ein `.git`-"
+"Verzeichnis mit Unterverzeichnissen f체r `objects`, `refs/heads`, `refs/tags` "
+"und f체r die Template-Dateien. Eine initiale `HEAD` Datei, die auf den HEAD "
+"des Master-Branchs verweist, wird ebenfalls erstellt."
#. type: Plain text
#: en/git-init.txt:27
#, priority:300
msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
msgstr ""
+"Wenn die Umgebungsvariable `$GIT_DIR` gesetzt ist, dann gibt sie einen Pfad "
+"an, der anstelle von `./.git` f체r die Basis des Repositorys verwendet werden "
+"soll."
#. type: Plain text
#: en/git-init.txt:32
@@ -29352,184 +29603,241 @@ msgstr "Wenn das Objektverzeichnis 체ber diese Umgebungsvariable angegeben wird
#, priority:300
msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
msgstr ""
+"Das Ausf체hren von `git init` in einem bestehenden Repository ist "
+"ungef채hrlich. Es wird nichts 체berschrieben, was dort bereits vorhanden ist. "
+"Der Hauptgrund f체r das erneute Ausf체hren von `git init` ist das Aufnehmen "
+"neu hinzugef체gter Templates (oder das Verschieben des Repositorys an einen "
+"anderen Ort, wenn `--separate-git-dir` angegeben wird)."
#. type: Plain text
#: en/git-init.txt:45
#, priority:300
msgid "Only print error and warning messages; all other output will be suppressed."
msgstr ""
+"Nur Fehler- und Warnmeldungen ausgeben; alle anderen Meldungen werden "
+"ausgeblendet."
#. type: Plain text
#: en/git-init.txt:50
-#, fuzzy, priority:300
+#, priority:300
msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
-msgstr "Das Repository als Bare-Repository behandeln. Wenn die Umgebungsvariable GIT_DIR nicht gestezt ist, wird sie auf das aktuelle Arbeitsverzeichnis gesetzt."
+msgstr ""
+"Erstellt ein Bare-Repository. Wenn die Umgebungsvariable `GIT_DIR` nicht "
+"festgelegt ist, wird sie auf das aktuelle Arbeitsverzeichnis angewendet."
#. type: Plain text
#: en/git-init.txt:55
#, priority:300
msgid "Specify the directory from which templates will be used. (See the \"TEMPLATE DIRECTORY\" section below.)"
msgstr ""
+"Gib das Verzeichnis an, aus dem Templates verwendet werden sollen (Siehe "
+"unten den Abschnitt �얮EMPLATE VERZEICHNIS��)."
#. type: Plain text
#: en/git-init.txt:62
#, priority:300
msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository."
msgstr ""
+"Anstatt das Repository als ein Verzeichnis entweder nach `$GIT_DIR` oder `./."
+"git/` zu initialisieren, wird hier eine Textdatei erstellt, die den Pfad zum "
+"eigentlichen Repository enth채lt. Diese Datei fungiert als symbolischer Git-"
+"Link zum Repository, der vom Dateisystem unabh채ngig ist."
#. type: Plain text
#: en/git-init.txt:64
#, priority:300
msgid "If this is reinitialization, the repository will be moved to the specified path."
msgstr ""
+"Falls dies eine Neu-Initialisierung ist, wird das Repository auf den "
+"angegebenen Pfad verschoben."
#. type: Labeled list
#: en/git-init.txt:65
#, no-wrap, priority:300
msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
-msgstr ""
+msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
#. type: Plain text
#: en/git-init.txt:73
#, priority:300
msgid "Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository. When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions. When not specified, Git will use permissions reported by umask(2)."
msgstr ""
+"Bestimmt, dass das Git-Repository von mehreren Benutzern gemeinsam genutzt "
+"werden soll. Dadurch k철nnen Benutzer, die derselben Gruppe angeh철ren, in "
+"dieses Repository pushen. Falls spezifiziert, wird die config-Variable \""
+"core.sharedRepository\" so angelegt, dass Dateien und Verzeichnisse unter "
+"`$GIT_DIR` mit den angeforderten Berechtigungen erstellt werden. Wenn "
+"nichts angegeben wird, wird Git die von umask(2) gelieferten Berechtigungen "
+"verwenden."
#. type: Plain text
#: en/git-init.txt:76
#, priority:300
msgid "The option can have the following values, defaulting to 'group' if no value is given:"
msgstr ""
+"Die Option kann die folgenden Werte annehmen, wobei 'group' die "
+"Standardeinstellung ist, falls kein Wert angegeben wird:"
#. type: Labeled list
#: en/git-init.txt:78
#, no-wrap, priority:300
msgid "'umask' (or 'false')"
-msgstr ""
+msgstr "'umask' (or 'false')"
#. type: Plain text
#: en/git-init.txt:82
#, priority:300
msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
msgstr ""
+"Verwendet die von umask(2) gelieferten Berechtigungen. Die Voreinstellung, "
+"falls `--shared` nicht angegeben ist."
#. type: Labeled list
#: en/git-init.txt:83
#, no-wrap, priority:300
msgid "'group' (or 'true')"
-msgstr ""
+msgstr "'group' (or 'true')"
#. type: Plain text
#: en/git-init.txt:91
#, priority:300
msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
msgstr ""
+"Das Repository von der Gruppe beschreibbar machen, (mit g+sx, da die Git-"
+"Gruppe m철glicherweise nicht die prim채re Gruppe aller User ist). Das wird "
+"verwendet, um die Berechtigungen eines ansonsten sicheren umask(2)-Wertes zu "
+"erweitern. Beachten Sie, dass die umask immer noch f체r die anderen "
+"Berechtigungsbits gilt (z.B. wenn umask '0022' ist, wird die Verwendung von "
+"'group' nicht die Leseberechtigungen anderer (Nicht-Gruppen-) Benutzer "
+"entfernen). Siehe bei '0xxx' wie die Repository-Berechtigungen genau gesetzt "
+"werden."
#. type: Labeled list
#: en/git-init.txt:92
#, no-wrap, priority:300
msgid "'all' (or 'world' or 'everybody')"
-msgstr ""
+msgstr "'all' (or 'world' or 'everybody')"
#. type: Plain text
#: en/git-init.txt:95
#, priority:300
msgid "Same as 'group', but make the repository readable by all users."
msgstr ""
+"Das gleiche wie 'group', aber macht das Repository f체r alle Benutzer lesbar."
#. type: Labeled list
#: en/git-init.txt:96
#, no-wrap, priority:300
msgid "'0xxx'"
-msgstr ""
+msgstr "'0xxx'"
#. type: Plain text
#: en/git-init.txt:103
#, priority:300
msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
msgstr ""
+"'0xxx' ist eine Oktalzahl und jede Datei hat den Status '0xxx'. '0xxx' "
+"체berschreibt den umask(2)-Wert des Benutzers (und entsperrt nicht nur die "
+"Berechtigungen, wie es 'group' und 'all' tun). '0640' wird ein Repository "
+"erstellen, das gruppenlesbar, aber nicht gruppenbeschreibbar und f체r andere "
+"nicht zug채nglich ist. '0660' erzeugt ein Repository, das f체r den aktuellen "
+"Benutzer und die aktuelle Gruppe les- und beschreibbar, aber f체r andere "
+"unzug채nglich ist."
#. type: Plain text
#: en/git-init.txt:108
#, priority:300
msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
msgstr ""
+"Standardm채횩ig ist das Konfigurationsflag `receive.denyNonFastForwards` in "
+"gemeinsam genutzten Repositorys aktiviert, sodass Sie keinen non-fast-"
+"forward Push erzwingen k철nnen."
#. type: Plain text
#: en/git-init.txt:111
#, priority:300
msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
msgstr ""
+"Wenn Sie 'directory' angeben, wird der Befehl innerhalb dieses "
+"Verzeichnisses ausgef체hrt. Wenn dieses Verzeichnis nicht existiert, wird es "
+"erstellt."
#. type: Title -
#: en/git-init.txt:113
#, no-wrap, priority:300
msgid "TEMPLATE DIRECTORY"
-msgstr ""
+msgstr "TEMPLATE DIRECTORY"
#. type: Plain text
#: en/git-init.txt:117
#, priority:300
msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
msgstr ""
+"Dateien und Verzeichnisse im Template-Verzeichnis, deren Name nicht mit "
+"einem Punkt beginnt, werden nach der Erstellung in das `$GIT_DIR` kopiert."
#. type: Plain text
#: en/git-init.txt:119
#, priority:300
msgid "The template directory will be one of the following (in order):"
msgstr ""
+"Das Template-Verzeichnis wird aus folgender Einstellung generiert ("
+"Reihenfolge nach Priorit채t):"
#. type: Plain text
#: en/git-init.txt:121
#, priority:300
msgid "the argument given with the `--template` option;"
-msgstr ""
+msgstr "dem Argument, das mit der Option `--template` angegeben wurde;"
#. type: Plain text
#: en/git-init.txt:123
#, priority:300
msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
-msgstr ""
+msgstr "dem Inhalt der Umgebungs-Variablen `$GIT_TEMPLATE_DIR`;"
#. type: Plain text
#: en/git-init.txt:125
-#, fuzzy, priority:300
+#, priority:300
msgid "the `init.templateDir` configuration variable; or"
-msgstr ""
-"#-#-#-#-# git-branch-de.po (PACKAGE VERSION) #-#-#-#-#\n"
-"Dies ist das Gegenteil der '--track' Option, wodurch 'git pull' nicht mehr automatisch auf den fernen Entwicklungszweig (remote branch) zugreift.\n"
-"#-#-#-#-# git-checkout-de.po (PACKAGE VERSION) #-#-#-#-#\n"
-"Ignore the branch.autosetupmerge configuration variable."
+msgstr "der Konfigurations-Variablen `init.templateDir`; oder"
#. type: Plain text
#: en/git-init.txt:127
#, priority:300
msgid "the default template directory: `/usr/share/git-core/templates`."
msgstr ""
+"dem standardm채횩igen Template-Verzeichnis: `/usr/share/git-core/templates`."
#. type: Plain text
#: en/git-init.txt:130
#, priority:300
msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
msgstr ""
+"Das standardm채횩ige Template-Verzeichnis enth채lt eine gewisse "
+"Verzeichnisstruktur, vorgeschlagene �얖usschlussmuster�� (siehe "
+"linkgit:gitignore[5]) und Beispiele f체r Hook-Dateien."
#. type: Plain text
#: en/git-init.txt:133
#, priority:300
msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
msgstr ""
+"Die Beispiel-Hooks sind automatisch alle deaktiviert. Diese Hooks k철nnen "
+"aktiviert werden, indem die Datei-Erweiterung `.sample` entfernt wird."
#. type: Plain text
#: en/git-init.txt:135
#, priority:300
msgid "See linkgit:githooks[5] for more general info on hook execution."
msgstr ""
+"Siehe linkgit:githooks[5] f체r generelle Informationen zur Hook-Anwendung."
#. type: Labeled list
#: en/git-init.txt:139
#, no-wrap, priority:300
msgid "Start a new Git repository for an existing code base"
-msgstr ""
+msgstr "Ein neues Git-Repository mit einer vorhandenen Code-Basis anlegen"
#. type: delimited block -
#: en/git-init.txt:146
@@ -29540,26 +29848,29 @@ msgid ""
"$ git add . <2>\n"
"$ git commit <3>\n"
msgstr ""
+"$ cd /Pfad/zu/meiner/Code-Basis\n"
+"$ git init <1>\n"
+"$ git add . <2>\n"
+"$ git commit <3>\n"
#. type: Plain text
#: en/git-init.txt:149
#, priority:300
msgid "Create a /path/to/my/codebase/.git directory."
-msgstr ""
+msgstr "Erstellt das Verzeichnis /Pfad/zu/meiner/Code-Basis/.git."
#. type: Plain text
#: en/git-init.txt:150
-#, fuzzy, priority:300
-#| msgid "git-add - Add file contents to the index"
+#, priority:300
msgid "Add all existing files to the index."
-msgstr "git-add - F체ge Dateiinhalte zum Index hinzu."
+msgstr "F체gt alle vorhandenen Dateien zum Index hinzu."
#. type: Plain text
#: en/git-init.txt:151
-#, fuzzy, priority:300
-#| msgid "Compare the version before the last commit and the last commit."
+#, priority:300
msgid "Record the pristine state as the first commit in the history."
-msgstr "Vergleiche die Version vor der letzen Eintragung (commit) mit der letzten Eintragung."
+msgstr ""
+"Zeichnet den Urzustand als ersten Commit im Verlauf des Repositorys auf."
#. type: Title =
#: en/git-instaweb.txt:2
@@ -42903,7 +43214,7 @@ msgstr ""
#, priority:280
msgid "See \"Reset, restore and revert\" in linkgit:git[1] for the differences between the three commands."
msgstr ""
-"Siehe \"Reset, restore and revert\" in linkgit:git[1] f체r die "
+"Siehe �얬eset, restore und revert�� in linkgit:git[1] f체r die "
"unterschiedlichen Eigenschaften der drei Befehle."
#. type: Labeled list
@@ -43528,57 +43839,77 @@ msgstr ""
#, priority:100
msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
msgstr ""
+"Stellt spezifizierte Pfade im Arbeitsbereich mit Inhalt aus einer "
+"Wiederherstellungsquelle wieder her. Wenn ein Pfad 체berwacht wird, aber in "
+"der Wiederherstellungsquelle nicht vorhanden ist, wird er entfernt, damit er "
+"mit der Quelle 체bereinstimmt."
#. type: Plain text
#: en/git-restore.txt:24
#, priority:100
msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
msgstr ""
+"Der Befehl kann auch verwendet werden, um den Inhalt im Index mit `--staged` "
+"wiederherzustellen oder um sowohl den Arbeitsbereich (working tree) als auch "
+"den Index mit `--staged --worktree` wiederherzustellen."
#. type: Plain text
#: en/git-restore.txt:28
#, priority:100
msgid "By default, the restore sources for working tree and the index are the index and `HEAD` respectively. `--source` could be used to specify a commit as the restore source."
msgstr ""
+"Die Wiederherstellungsquellen f체r den Arbeitsbereich und den Index (Staging "
+"Area) sind normalerweise der Index bzw. `HEAD`. `--source` k철nnte benutzt "
+"werden, um einen bestimmten Commit als Wiederherstellungsquelle anzugeben."
#. type: Plain text
#: en/git-restore.txt:33 en/git-switch.txt:33
#, priority:100
msgid "THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE."
msgstr ""
+"DIESER BEFEHL IST EXPERIMENTELL. M횜GLICHERWEISE KANN SICH DAS VERHALTEN "
+"횆NDERN."
#. type: Labeled list
#: en/git-restore.txt:36
-#, fuzzy, no-wrap, priority:100
-#| msgid "<tree>"
+#, no-wrap, priority:100
msgid "-s <tree>"
-msgstr "<Tree>"
+msgstr "-s <Tree>"
#. type: Labeled list
#: en/git-restore.txt:37
-#, fuzzy, no-wrap, priority:100
-#| msgid "--source"
+#, no-wrap, priority:100
msgid "--source=<tree>"
-msgstr "--source"
+msgstr "--source=<Tree>"
#. 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 ""
+"Wiederherstellen der Dateien des Arbeitsbereichs mit dem Inhalt aus dem "
+"angegebenen Daten-Baum. Es ist 체blich, den Quellbaum durch Angabe eines "
+"assoziierten Commit-, Branch- oder Tag-Namens zu bestimmen."
#. 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 ""
+"Wenn nichts angegeben ist, ist der Index die vorgegebene "
+"Wiederherstellungsquelle f체r den Arbeitsbereich und die standardm채횩ige "
+"Wiederherstellungsquelle f체r den Index ist `HEAD`. Wenn sowohl `--staged` "
+"als auch `--worktree` angegeben werden, *muss* auch `--source` angegeben "
+"werden."
#. type: Plain text
#: en/git-restore.txt:53
-#, fuzzy, priority:100
-#| msgid "by using the --interactive switch with the 'commit' command to decide one by one which files should be part of the commit, before finalizing the operation. Currently, this is done by invoking 'git-add --interactive'."
+#, 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 "Durch Verwendung des --interactive Schalters des 'git commit' Befehls, um zuvor f체r jede Datei einzeln zu entscheiden ob diese Teil der Eintragung (commit) sein soll. Dies wird derzeit durch 'git-add --interactive' bewerkstelligt."
+msgstr ""
+"W채hlt interaktiv abweichende Abschnitte in der Wiederherstellungsquelle und "
+"dem Wiederherstellungsort aus. Siehe den Abschnitt \"Interaktiver Modus\" in "
+"linkgit:git-add[1], um zu erfahren, wie der `--patch`-Modus anzuwenden ist."
#. type: Plain text
#: en/git-restore.txt:56
@@ -43591,7 +43922,7 @@ msgstr ""
#, fuzzy, no-wrap, priority:100
#| msgid "-n"
msgid "-S"
-msgstr "-n"
+msgstr "-S"
#. type: Labeled list
#: en/git-restore.txt:60
@@ -43604,6 +43935,10 @@ 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 ""
+"Bestimmt den Wiederherstellungsort. Wenn keine der beiden Optionen angegeben "
+"wurde, stellt das System standardm채횩ig den Arbeitsbereich wieder her. Mit "
+"der Angabe von `--staged` wird nur den Index wieder hergestellt. Die Angabe "
+"beider Optionen stellt beides wieder her."
#. type: Plain text
#: en/git-restore.txt:68
@@ -43617,18 +43952,26 @@ msgstr "Leise, unterdr체cke Hinweisnachrichten."
#, priority:100
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
msgstr ""
+"Wenn Dateien im Arbeitsbereich aus dem Index wiederhergestellt werden, "
+"verwendet man Stufe #2 ('ours') oder #3 ('theirs') f체r nicht gemergte Pfade."
#. type: Plain text
#: en/git-restore.txt:84
#, 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 ""
+"Hinweis: W채hrend eines `git rebase` und eines `git pull --rebase` k철nnen "
+"'ours' und 'theirs' vertauscht erscheinen. Siehe die Beschreibung der "
+"gleichen Optionen in linkgit:git-checkout[1] f체r weitere Details."
#. type: Plain text
#: en/git-restore.txt:89
#, priority:100
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
msgstr ""
+"Wenn Dateien im Arbeitsbereich aus dem Index wiederhergestellt werden, muss "
+"der konfliktbehaftete Merge in den nicht zusammengef체hrten Pfaden neu "
+"erstellt werden."
#. type: Labeled list
#: en/git-restore.txt:97
@@ -43641,84 +43984,97 @@ 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 ""
+"Wenn Dateien im Arbeitsbereich aus dem Index wiederhergestellt werden, "
+"sollte diese Operation nicht abgebrochen werden, wenn es nicht gemergte "
+"Eintr채ge gibt und weder `--ours`, `--theirs`, `--merge` noch `--conflict` "
+"angegeben ist. Nicht verschmolzene Pfade auf dem Arbeitsbereich werden "
+"ignoriert."
#. type: Plain text
#: en/git-restore.txt:109
#, priority:100
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
msgstr ""
+"Im Sparse-Checkout-Modus werden standardm채횩ig nur Eintr채ge aktualisiert, die "
+"mit `<pathspec>` und einzelnen Pattern in $GIT_DIR/info/sparse-checkout "
+"체bereinstimmen. Diese Option ignoriert die einzelnen Pattern und stellt alle "
+"Dateien in `<pathspec>` vorbehaltlos wieder her."
#. type: Plain text
#: en/git-restore.txt:116
#, 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 ""
+"Im Overlay-Modus werden mit diesem Befehl niemals Dateien beim "
+"Wiederherstellen entfernt. Im No-Overlay-Modus werden getrackte Dateien, die "
+"nicht im `--source`-Tree vorkommen, entfernt, damit sie genau mit `<Tree>` "
+"체bereinstimmen. Die Standardeinstellung ist der No-Overlay-Modus."
#. type: Plain text
#: en/git-restore.txt:144
-#, fuzzy, priority:100
-#| msgid "The following sequence checks out the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
+#, 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 "The following sequence checks out the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
+msgstr ""
+"Das folgende Listing wechselt in den Branch `master`, setzt das `Makefile` "
+"um zwei Revisionsst채nde zur체ck, dann wird hello.c irrt체mlich gel철scht, um "
+"danach wieder aus dem Index zur체ckgeholt zu werden."
#. type: delimited block -
#: en/git-restore.txt:150
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "$ git checkout master <1>\n"
-#| "$ git checkout master~2 Makefile <2>\n"
-#| "$ rm -f hello.c\n"
-#| "$ git checkout hello.c <3>\n"
+#, no-wrap, priority:100
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
"$ rm -f hello.c\n"
"$ git restore hello.c <2>\n"
msgstr ""
-"$ git checkout master <1>\n"
-"$ git checkout master~2 Makefile <2>\n"
+"$ git switch master\n"
+"$ git restore --source master~2 Makefile <1>\n"
"$ rm -f hello.c\n"
-"$ git checkout hello.c <3>\n"
+"$ git restore hello.c <2>\n"
#. type: Plain text
#: en/git-restore.txt:154
-#, fuzzy, priority:100
-#| msgid "restore hello.c from HEAD of current branch"
+#, priority:100
msgid "restore hello.c from the index"
-msgstr "restore hello.c from HEAD of current branch"
+msgstr "Wiederherstellen von hello.c aus dem Index"
#. type: Plain text
#: en/git-restore.txt:157
#, priority:100
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
msgstr ""
+"Falls _alle_ C-Quelldateien wieder hergestellt werden sollen, damit sie mit "
+"der Version im Index 체bereinstimmen, kann man folgendes eingeben"
#. type: delimited block -
#: en/git-restore.txt:160
#, fuzzy, no-wrap, priority:100
#| msgid "$ git checkout -- '*.c'\n"
msgid "$ git restore '*.c'\n"
-msgstr "$ git checkout -- '*.c'\n"
+msgstr "$ git restore '*.c'\n"
#. type: Plain text
#: en/git-restore.txt:166
#, priority:100
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
+"Beachten Sie die Anf체hrungszeichen bei `*.c`. Die Datei `hello.c` wird auch "
+"wieder hergestellt, obwohl sie sich nicht mehr im Arbeitsbereich befindet, "
+"weil das Wildcard-Zeichen (*) verwendet wird, um damit Eintr채ge im Index ("
+"nicht im Arbeitsbereich der Shell) zu finden."
#. type: Plain text
#: en/git-restore.txt:168
-#, fuzzy, priority:100
-#| msgid "If you leave out the commit name, 'git-grep' will search any of the files it manages in your current directory. So"
+#, priority:100
msgid "To restore all files in the current directory"
-msgstr "Falls Sie den Namen des Commits nicht angeben sucht 'git-grep' in den Dateien in ihrem aktuellen Arbeitsverzeichnis."
+msgstr "So kann man alle Dateien im aktuellen Verzeichnis wieder herstellen"
#. type: delimited block -
#: en/git-restore.txt:171
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git branch\n"
+#, no-wrap, priority:100
msgid "$ git restore .\n"
-msgstr "$ git branch\n"
+msgstr "$ git restore .\n"
#. type: Plain text
#: en/git-restore.txt:175
@@ -43728,48 +44084,50 @@ msgstr ""
#. type: delimited block -
#: en/git-restore.txt:178
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git branch\n"
+#, no-wrap, priority:100
msgid "$ git restore :/\n"
-msgstr "$ git branch\n"
+msgstr "$ git restore :/\n"
#. type: Plain text
#: en/git-restore.txt:182
#, 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 ""
+"Eine Datei im Index so wiederherstellen, dass sie mit der Version in `HEAD` "
+"체bereinstimmt (das entspricht dem Vorgehen wie mit linkgit:git-reset[1])"
#. type: delimited block -
#: en/git-restore.txt:185
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git checkout -- hello.c\n"
+#, no-wrap, priority:100
msgid "$ git restore --staged hello.c\n"
-msgstr "$ git checkout -- hello.c\n"
+msgstr "$ git restore --staged hello.c\n"
#. type: Plain text
#: en/git-restore.txt:189
#, priority:100
msgid "or you can restore both the index and the working tree (this the same as using linkgit:git-checkout[1])"
msgstr ""
+"oder sowohl Index als auch den Arbeitsbereich zur체ckerhalten (das ist das "
+"gleiche wie mit linkgit:git-checkout[1])"
#. type: delimited block -
#: en/git-restore.txt:192
-#, no-wrap, priority:100
+#, fuzzy, 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 "die Kurzform ist praktischer aber nicht so gut lesbar:"
#. type: delimited block -
#: en/git-restore.txt:198
#, fuzzy, no-wrap, priority:100
#| msgid "$ git checkout -- hello.c\n"
msgid "$ git restore -s@ -SW hello.c\n"
-msgstr "$ git checkout -- hello.c\n"
+msgstr "$ git restore -s@ -SW hello.c\n"
#. type: Plain text
#: en/git-restore.txt:204
@@ -52887,7 +53245,7 @@ msgstr "Diese Befehle dienen zum Interagieren mit fremden Versionsverwalungen od
#: en/git.txt:230
#, no-wrap, priority:100
msgid "Reset, restore and revert"
-msgstr ""
+msgstr "Reset, restore und revert"
#. type: Plain text
#: en/git.txt:233
@@ -62999,150 +63357,191 @@ msgstr "GIT URLS[[URLS]]"
#, priority:300
msgid "In general, URLs contain information about the transport protocol, the address of the remote server, and the path to the repository. Depending on the transport protocol, some of this information may be absent."
msgstr ""
+"Im Allgemeinen enthalten URLs Informationen 체ber das Transportprotokoll, die "
+"Adresse des Remote-Servers und den Pfad zum Repository. Je nach "
+"Transportprotokoll k철nnen einzelne dieser Informationen fehlen."
#. type: Plain text
#: en/urls.txt:12
#, priority:300
msgid "Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps can be used for fetching, but this is inefficient and deprecated; do not use it)."
msgstr ""
+"Git unterst체tzt die Protokolle SSH, GIT, HTTP und HTTPS (zus채tzlich k철nnte "
+"FTP und FTPS zum Abrufen verwendet werden, aber die sind ineffizient und "
+"veraltet; bitte *nicht* verwenden)."
#. type: Plain text
#: en/urls.txt:15
#, priority:300
msgid "The native transport (i.e. git:// URL) does no authentication and should be used with caution on unsecured networks."
msgstr ""
+"Der native Transport (d.h. git:// URL) f체hrt keine Authentifizierung durch "
+"und sollte in ungesicherten Netzwerken mit Vorsicht verwendet werden."
#. type: Plain text
#: en/urls.txt:17
#, priority:300
msgid "The following syntaxes may be used with them:"
-msgstr ""
+msgstr "Folgende Syntaxen k철nnen damit verwendet werden:"
#. type: Plain text
#: en/urls.txt:19
#, priority:300
msgid "ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/"
msgstr ""
+"ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/Pfad/zum/Repo.git/"
#. type: Plain text
#: en/urls.txt:20
#, priority:300
msgid "git://host.xz{startsb}:port{endsb}/path/to/repo.git/"
-msgstr ""
+msgstr "git://host.xz{startsb}:port{endsb}/Pfad/zum/Repo.git/"
#. type: Plain text
#: en/urls.txt:21
#, priority:300
msgid "http{startsb}s{endsb}://host.xz{startsb}:port{endsb}/path/to/repo.git/"
-msgstr ""
+msgstr "http{startsb}s{endsb}://host.xz{startsb}:port{endsb}/Pfad/zum/Repo.git/"
#. type: Plain text
#: en/urls.txt:22
#, priority:300
msgid "ftp{startsb}s{endsb}://host.xz{startsb}:port{endsb}/path/to/repo.git/"
-msgstr ""
+msgstr "ftp{startsb}s{endsb}://host.xz{startsb}:port{endsb}/Pfad/zum/Repo.git/"
#. type: Plain text
#: en/urls.txt:24
#, priority:300
msgid "An alternative scp-like syntax may also be used with the ssh protocol:"
msgstr ""
+"Eine alternative, scp-채hnliche Syntax kann auch mit dem Protokoll SSH "
+"verwendet werden:"
#. type: Plain text
#: en/urls.txt:26
#, priority:300
msgid "{startsb}user@{endsb}host.xz:path/to/repo.git/"
-msgstr ""
+msgstr "{startsb}user@{endsb}host.xz:Pfad/zum/Repo.git/"
#. type: Plain text
#: en/urls.txt:32
#, priority:300
msgid "This syntax is only recognized if there are no slashes before the first colon. This helps differentiate a local path that contains a colon. For example the local path `foo:bar` could be specified as an absolute path or `./foo:bar` to avoid being misinterpreted as an ssh url."
msgstr ""
+"Diese Syntax wird nur erkannt, wenn vor dem ersten Doppelpunkt keine "
+"Schr채gstriche stehen. Dadurch kann ein lokaler Pfad, der einen Doppelpunkt "
+"enth채lt, besser erkannt werden. Zum Beispiel k철nnte der lokale Pfad `foo:bar`"
+" als absoluter Pfad oder `./foo:bar` angegeben werden, um zu vermeiden, dass "
+"er als SSH-URL fehlinterpretiert wird."
#. type: Plain text
#: en/urls.txt:34
#, priority:300
msgid "The ssh and git protocols additionally support ~username expansion:"
msgstr ""
+"Die Protokolle SSH und GIT unterst체tzen zus채tzlich die Erweiterung ~username:"
#. type: Plain text
#: en/urls.txt:36
#, priority:300
msgid "ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
msgstr ""
+"ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}user{endsb}"
+"/Pfad/zum/Repo.git/"
#. type: Plain text
#: en/urls.txt:37
#, priority:300
msgid "git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
msgstr ""
+"git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/Pfad/zum/Repo.git/"
#. type: Plain text
#: en/urls.txt:38
#, priority:300
msgid "{startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/"
-msgstr ""
+msgstr "{startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/Pfad/zum/Repo.git/"
#. type: Plain text
#: en/urls.txt:41
#, priority:300
msgid "For local repositories, also supported by Git natively, the following syntaxes may be used:"
msgstr ""
+"F체r lokale Repositorys, die von Git ebenfalls nativ unterst체tzt werden, "
+"k철nnen die folgenden Syntaxen verwendet werden:"
#. type: Plain text
#: en/urls.txt:43
#, priority:300
msgid "/path/to/repo.git/"
-msgstr ""
+msgstr "/Pfad/zum/Repo.git/"
#. type: Plain text
#: en/urls.txt:44
#, priority:300
msgid "\\file:///path/to/repo.git/"
-msgstr ""
+msgstr "\\file:///Pfad/zum/Repo.git/"
#. type: Plain text
#: en/urls.txt:49
#, priority:300
msgid "These two syntaxes are mostly equivalent, except when cloning, when the former implies --local option. See linkgit:git-clone[1] for details."
msgstr ""
+"Diese beiden Syntaxen sind gr철횩tenteils gleichwertig, au횩er beim Klonen, wo "
+"die erstere die Option --local beinhaltet. Siehe linkgit:git-clone[1] f체r "
+"weitere Details."
#. type: Plain text
#: en/urls.txt:54
#, priority:300
msgid "These two syntaxes are mostly equivalent, except the former implies --local option."
msgstr ""
+"Diese beiden Syntaxen sind gr철횩tenteils 채quivalent, au횩er dass die "
+"erstgenannte die Option --local beinhaltet."
#. type: Plain text
#: en/urls.txt:58
#, 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' und 'git pull', aber nicht 'git push', akzeptieren "
+"auch eine geeignete Bundle-Datei. Siehe linkgit:git-bundle[1]."
#. type: Plain text
#: en/urls.txt:63
#, priority:300
msgid "When Git doesn't know how to handle a certain transport protocol, it attempts to use the 'remote-<transport>' remote helper, if one exists. To explicitly request a remote helper, the following syntax may be used:"
msgstr ""
+"Wenn Git nicht versteht, wie ein bestimmtes Transportprotokoll zu verwenden "
+"ist, versucht es, das �숽emote-<Transport>��-Hilfsprogramm zu benutzen, falls "
+"es eines gibt. Um ein Remote-Hilfsprogramm explizit anzufordern, kann die "
+"folgende Syntax verwendet werden:"
#. type: Plain text
#: en/urls.txt:65
#, priority:300
msgid "<transport>::<address>"
-msgstr ""
+msgstr "<Transport>::<Adresse>"
#. type: Plain text
#: en/urls.txt:69
#, 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 ""
+"wobei <Adresse> ein Pfad, ein Server und Pfad oder eine beliebige URL-"
+"채hnliche Zeichenfolge sein kann, die von dem aufgerufenen, spezifischen "
+"Remote-Hilfsprogramm erkannt wird. Siehe linkgit:gitremote-helpers[7] f체r "
+"weitere Details."
#. type: Plain text
#: en/urls.txt:74
#, priority:300
msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
msgstr ""
+"Wenn es eine gro횩e Anzahl 채hnlich benannter Remote-Repositorys gibt und Sie "
+"f체r diese ein anderes Format verwenden m철chten (sodass die von Ihnen "
+"verwendeten URLs in funktionierende URLs umgeschrieben werden), kann ein "
+"Konfigurations-Abschnitt in dieser Form erstellt werden:"
#. type: delimited block -
#: en/urls.txt:78
@@ -63151,12 +63550,14 @@ msgid ""
"\t[url \"<actual url base>\"]\n"
"\t\tinsteadOf = <other url base>\n"
msgstr ""
+"\t[url \"<aktuelle URL-Basis>\"]\n"
+"\t\tinsteadOf = <andere URL-Basis>\n"
#. type: Plain text
#: en/urls.txt:81 en/urls.txt:100
#, priority:300
msgid "For example, with this:"
-msgstr ""
+msgstr "Beispielsweise mit folgendem:"
#. type: delimited block -
#: en/urls.txt:86
@@ -63166,18 +63567,26 @@ msgid ""
"\t\tinsteadOf = host.xz:/path/to/\n"
"\t\tinsteadOf = work:\n"
msgstr ""
+"\t[url \"git://git.host.xz/\"]\n"
+"\t\tinsteadOf = host.xz:/Pfad/zu/\n"
+"\t\tinsteadOf = work:\n"
#. type: Plain text
#: en/urls.txt:90
#, priority:300
msgid "a URL like \"work:repo.git\" or like \"host.xz:/path/to/repo.git\" will be rewritten in any context that takes a URL to be \"git://git.host.xz/repo.git\"."
msgstr ""
+"eine URL wie \"work:Repo.git\" oder wie \"host.xz:/fad/zu/Repo.git\" wird in "
+"jedem Kontext umgeschrieben, der eine URL zu \"git://git.host.xz/Repo.git\" "
+"umwandelt."
#. type: Plain text
#: en/urls.txt:93
#, priority:300
msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
msgstr ""
+"Wenn Sie URLs nur zum Pushen neu schreiben m철chten, k철nnen Sie einen "
+"Konfiguration-Abschnitt in der folgenden Form erstellen:"
#. type: delimited block -
#: en/urls.txt:97
@@ -63186,6 +63595,8 @@ msgid ""
"\t[url \"<actual url base>\"]\n"
"\t\tpushInsteadOf = <other url base>\n"
msgstr ""
+"\t[url \"<aktuelle URL-Basis>\"]\n"
+"\t\tpushInsteadOf = <andere URL-Basis>\n"
#. type: delimited block -
#: en/urls.txt:104
@@ -63194,12 +63605,17 @@ msgid ""
"\t[url \"ssh://example.org/\"]\n"
"\t\tpushInsteadOf = git://example.org/\n"
msgstr ""
+"\t[url \"ssh://example.org/\"]\n"
+"\t\tpushInsteadOf = git://example.org/\n"
#. type: Plain text
#: en/urls.txt:108
#, priority:300
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+"eine URL wie �엃it://example.org/path/to/repo.git�� wird f체r Pushs in "
+"�엜sh://example.org/path/to/repo.git�� umgeschrieben, aber Pulls verwenden "
+"weiterhin die Original-URL."
#. type: Title =
#: en/git-bisect-lk2009.txt:2
@@ -64778,10 +65194,11 @@ msgstr ""
#. type: Plain text
#: en/git-bisect-lk2009.txt:1020
-#, fuzzy, priority:100
-#| msgid "Use binary search to find the commit that introduced a bug."
+#, priority:100
msgid "use \"git bisect run\" to find the commit that introduced it"
-msgstr "Bin채rsuche verwenden, um den Commit zu finden, der einen Fehler verursacht hat."
+msgstr ""
+"Bin채rsuche verwenden, um den Commit zu finden, der einen Fehler verursacht "
+"hat"
#. type: Plain text
#: en/git-bisect-lk2009.txt:1021
diff --git a/po/documentation.es.po b/po/documentation.es.po
index b0546e920c9472f0fc8228b379516bbde611f03f..fcb0c59fb6c53ea5be6c290d9e32cec9c24e5207 100644
--- a/po/documentation.es.po
+++ b/po/documentation.es.po
@@ -3,18 +3,20 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
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-04 19:04+0200\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2020-04-23 20:25+0000\n"
+"Last-Translator: Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.0.2-dev\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
@@ -3659,9 +3661,9 @@ msgstr "--raw"
#. type: Plain text
#: en/diff-options.txt:58
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "\tGenerate the diff in raw format.\n"
-msgstr "genera el diff en formato raw"
+msgstr "\tGenerar las diferencias en formato bruto.\n"
#. type: Plain text
#: en/diff-options.txt:68
@@ -3682,9 +3684,9 @@ msgstr "--patch-with-raw"
#. type: Plain text
#: en/diff-options.txt:74
-#, fuzzy, priority:280
+#, priority:280
msgid "Synonym for `-p --raw`."
-msgstr "sin처nimo para '-p --stat'"
+msgstr "Sin처nimo de `-p --raw`."
#. type: Labeled list
#: en/diff-options.txt:76
@@ -3730,9 +3732,9 @@ msgstr "--patience"
#. type: Plain text
#: en/diff-options.txt:89
-#, fuzzy, priority:280
+#, priority:280
msgid "Generate a diff using the \"patience diff\" algorithm."
-msgstr "genera un diff usando algoritmo \"patience diff\""
+msgstr "Generar diferencias mediante el algoritmo 짬patience diff쨩."
#. type: Labeled list
#: en/diff-options.txt:90
@@ -3742,9 +3744,9 @@ msgstr "--histogram"
#. type: Plain text
#: en/diff-options.txt:92
-#, fuzzy, priority:280
+#, priority:280
msgid "Generate a diff using the \"histogram diff\" algorithm."
-msgstr "genera un diff usando algoritmo \"histogram diff\""
+msgstr "Generar diferencias mediante el algoritmo 짬histogram diff쨩."
#. type: Labeled list
#: en/diff-options.txt:93
@@ -3754,9 +3756,9 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:95
-#, fuzzy, priority:280
+#, priority:280
msgid "Generate a diff using the \"anchored diff\" algorithm."
-msgstr "genera un diff usando algoritmo \"anchored diff\""
+msgstr "Generar diferencias mediante el algoritmo 짬anchored diff쨩."
#. type: Plain text
#: en/diff-options.txt:97
@@ -3772,9 +3774,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:103
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "--diff-algorithm={patience|minimal|histogram|myers}"
-msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
+msgstr "--diff-algorithm={patience|minimal|histogram|myers}"
#. type: Plain text
#: en/diff-options.txt:105
@@ -3832,9 +3834,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:123
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "--stat[=<width>[,<name-width>[,<count>]]]"
-msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"
+msgstr "--stat[=<anchura>[,<anchura-nombre>[,<recuento>]]]"
#. type: Plain text
#: en/diff-options.txt:137
@@ -3976,9 +3978,9 @@ msgstr "--cumulative"
#. type: Plain text
#: en/diff-options.txt:208
-#, fuzzy, priority:280
+#, priority:280
msgid "Synonym for --dirstat=cumulative"
-msgstr "sin처nimo para --dirstat=cumulative"
+msgstr "Sin처nimo de --dirstat=cumulative"
#. type: Labeled list
#: en/diff-options.txt:209
@@ -3988,9 +3990,9 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:211
-#, fuzzy, ignore-ellipsis, priority:280
+#, ignore-ellipsis, priority:280
msgid "Synonym for --dirstat=files,param1,param2..."
-msgstr "sinonimo para --dirstat=archivos,param1,param2..."
+msgstr "Sin처nimo de --dirstat=archivos,par찼m1,par찼m2..."
#. type: Labeled list
#: en/diff-options.txt:212 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:137
@@ -4012,9 +4014,9 @@ msgstr "--patch-with-stat"
#. type: Plain text
#: en/diff-options.txt:219
-#, fuzzy, priority:280
+#, priority:280
msgid "Synonym for `-p --stat`."
-msgstr "sin처nimo para '-p --stat'"
+msgstr "Sin처nimo de `-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
@@ -4056,9 +4058,9 @@ msgstr "--name-only"
#. type: Plain text
#: en/diff-options.txt:241
-#, fuzzy, priority:280
+#, priority:280
msgid "Show only names of changed files."
-msgstr "mostrar solo nombres de archivos cambiados"
+msgstr "Mostrar solo nombres de archivos cambiados."
#. type: Labeled list
#: en/diff-options.txt:242 en/git-ls-tree.txt:60
@@ -4136,9 +4138,9 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:276
-#, fuzzy, priority:280
+#, priority:280
msgid "Moved lines of code are colored differently."
-msgstr "l챠neas movidas de c처digo est찼n coloreadas diferente"
+msgstr "Los renglones de c처digo trasladados se se챰alan con un color distinto."
#. type: Plain text
#: en/diff-options.txt:278
@@ -4277,9 +4279,9 @@ msgstr "ignore-space-at-eol"
#. type: Plain text
#: en/diff-options.txt:330 en/diff-options.txt:665
-#, fuzzy, priority:280
+#, priority:280
msgid "Ignore changes in whitespace at EOL."
-msgstr "ignorar cambios en espacios en blanco en EOL"
+msgstr "Ignorar cambios de espacios en blanco al finalizar rengl처n."
#. type: Labeled list
#: en/diff-options.txt:330 en/merge-strategies.txt:59
@@ -4553,9 +4555,9 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:476
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "\tDetect renames.\n"
-msgstr "detectar renombrados"
+msgstr "\tDetectar cambios de nombre.\n"
#. type: Plain text
#: en/diff-options.txt:481
@@ -4673,9 +4675,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:548
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "-S<string>"
-msgstr "<string>"
+msgstr "-S<cadena>"
#. type: Plain text
#: en/diff-options.txt:552
@@ -4697,9 +4699,9 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:561
-#, fuzzy, no-wrap, priority:280
+#, no-wrap, priority:280
msgid "-G<regex>"
-msgstr "<regex>"
+msgstr "-G<expresi처n regular>"
#. type: Plain text
#: en/diff-options.txt:564
@@ -4868,9 +4870,9 @@ msgstr "--text"
#. type: Plain text
#: en/diff-options.txt:659
-#, fuzzy, priority:280
+#, priority:280
msgid "Treat all files as text."
-msgstr "tratar todos los archivos como texto"
+msgstr "Tratar todos los archivos como si fueran de texto."
#. type: Labeled list
#: en/diff-options.txt:660
@@ -4922,9 +4924,9 @@ msgstr "--ignore-blank-lines"
#. type: Plain text
#: en/diff-options.txt:680
-#, fuzzy, priority:280
+#, priority:280
msgid "Ignore changes whose lines are all blank."
-msgstr "ignora cambios cuyas l챠neas son todas en blanco"
+msgstr "Ignorar cambios cuyos renglones est찼n todos vac챠os."
#. type: Labeled list
#: en/diff-options.txt:681
@@ -5042,9 +5044,9 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:737
-#, fuzzy, priority:280
+#, priority:280
msgid "Show the given source prefix instead of \"a/\"."
-msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
+msgstr "Mostrar el prefijo de origen indicado en lugar de 짬a/쨩."
#. type: Labeled list
#: en/diff-options.txt:738
@@ -5054,9 +5056,9 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:740
-#, fuzzy, priority:280
+#, priority:280
msgid "Show the given destination prefix instead of \"b/\"."
-msgstr "mostrar el prefijo de destino en lugar de \"b/\""
+msgstr "Mostrar el prefijo de destino indicado en lugar de 짬b/쨩."
#. type: Labeled list
#: en/diff-options.txt:741
@@ -5066,9 +5068,9 @@ msgstr "--no-prefix"
#. type: Plain text
#: en/diff-options.txt:743
-#, fuzzy, priority:280
+#, priority:280
msgid "Do not show any source or destination prefix."
-msgstr "no mostrar ning첬n prefijo de fuente o destino"
+msgstr "No mostrar ning첬n prefijo de origen o de destino."
#. type: Labeled list
#: en/diff-options.txt:744
@@ -5152,7 +5154,7 @@ msgstr ""
#: en/fetch-options.txt:22 en/git-clone.txt:221 en/git-fetch-pack.txt:90
#, no-wrap, priority:300
msgid "--shallow-since=<date>"
-msgstr ""
+msgstr "--shallow-since=<fecha>"
#. type: Plain text
#: en/fetch-options.txt:25 en/git-fetch-pack.txt:93
@@ -5164,7 +5166,7 @@ msgstr ""
#: en/fetch-options.txt:26 en/git-clone.txt:224 en/git-fetch-pack.txt:94
#, no-wrap, priority:300
msgid "--shallow-exclude=<revision>"
-msgstr ""
+msgstr "--shallow-exclude=<revisi처n>"
#. type: Plain text
#: en/fetch-options.txt:30 en/git-fetch-pack.txt:98
@@ -5554,9 +5556,9 @@ msgstr "--verbose"
#. type: Plain text
#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
-#, fuzzy, priority:300
+#, priority:300
msgid "Be verbose."
-msgstr "ser verboso"
+msgstr "Mostrar m찼s detalles."
#. type: Labeled list
#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
@@ -5580,7 +5582,7 @@ msgstr ""
#: 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 ""
+msgstr "--server-option=<opci처n>"
#. type: Plain text
#: en/fetch-options.txt:246 en/git-clone.txt:142
@@ -5662,9 +5664,9 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:7
-#, fuzzy, priority:300
+#, priority:300
msgid "git-add - Add file contents to the index"
-msgstr "Agrega contenido de carpetas al 챠ndice"
+msgstr "git add: a챰adir contenido de un archivo al 챠ndice"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
@@ -5757,9 +5759,9 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:81
-#, fuzzy, priority:300
+#, priority:300
msgid "Allow adding otherwise ignored files."
-msgstr "permitir agregar caso contrario ignorar archivos"
+msgstr "Permitir a챰adir archivos que normalmente se ignoran."
#. type: Labeled list
#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:446 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
@@ -6091,9 +6093,9 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:257
-#, fuzzy, no-wrap, priority:300
+#, no-wrap, priority:300
msgid "status"
-msgstr "--status"
+msgstr "status"
#. type: Plain text
#: en/git-add.txt:264
@@ -6175,9 +6177,9 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:316
-#, fuzzy, no-wrap, priority:300
+#, no-wrap, priority:300
msgid "add untracked"
-msgstr "Agregar no rastreados"
+msgstr "a챰adir no rastreados"
#. type: Plain text
#: en/git-add.txt:320
@@ -6187,9 +6189,9 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:321
-#, fuzzy, no-wrap, priority:300
+#, no-wrap, priority:300
msgid "patch"
-msgstr "ruta"
+msgstr "parche"
#. type: Plain text
#: en/git-add.txt:328
@@ -6279,9 +6281,9 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:379
-#, fuzzy, no-wrap, priority:300
+#, no-wrap, priority:300
msgid "modified content"
-msgstr "contenido modificado, "
+msgstr "contenido modificado"
#. type: Plain text
#: en/git-add.txt:386
@@ -13290,9 +13292,9 @@ msgstr "git-clone(1)"
#. type: Plain text
#: en/git-clone.txt:7
-#, fuzzy, priority:300
+#, priority:300
msgid "git-clone - Clone a repository into a new directory"
-msgstr "Clona un repositorio dentro de un nuevo directorio"
+msgstr "git-clone: clonar un repositorio en un directorio nuevo"
#. type: Plain text
#: en/git-clone.txt:20
@@ -13319,6 +13321,10 @@ msgstr ""
#, priority:300
msgid "After the clone, a plain `git fetch` without arguments will update all the remote-tracking branches, and a `git pull` without arguments will in addition merge the remote master branch into the current master branch, if any (this is untrue when \"--single-branch\" is given; see below)."
msgstr ""
+"Despu챕s de clonar, ejecutar `git fetch` sin argumentos actualizar찼 todas las "
+"ramas con rastreo remoto, y `git pull` sin argumentos adem찼s fusionar찼 la "
+"rama 짬master쨩 remota en la rama 짬master쨩 actual, si la hay (esto no ocurre "
+"cuando se a챰ade 짬--single-branch쨩; lea m찼s abajo)."
#. type: Plain text
#: en/git-clone.txt:40
@@ -13612,6 +13618,11 @@ msgstr ""
#, priority:300
msgid "Don't clone any tags, and set `remote.<remote>.tagOpt=--no-tags` in the config, ensuring that future `git pull` and `git fetch` operations won't follow any tags. Subsequent explicit tag fetches will still work, (see linkgit:git-fetch[1])."
msgstr ""
+"No clona ninguna etiqueta y define `remote.<remote>.tagOpt=--no-tags` en la "
+"configuraci처n, lo que garantiza que futuras ejecuciones de `git pull` y `git "
+"fetch` no seguir찼n ninguna etiqueta. A첬n funcionar찼n las capturas de "
+"etiquetas expl챠citas que se realicen en el futuro (consulte linkgit:git-"
+"fetch[1])."
#. type: Plain text
#: en/git-clone.txt:250
@@ -13693,9 +13704,9 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
-#, fuzzy, no-wrap, priority:300
+#, no-wrap, priority:300
msgid "<repository>"
-msgstr "repositorio"
+msgstr "<repositorio>"
#. type: Plain text
#: en/git-clone.txt:292
@@ -28827,9 +28838,10 @@ msgstr "git-init(1)"
#. type: Plain text
#: en/git-init.txt:7
-#, fuzzy, priority:300
+#, priority:300
msgid "git-init - Create an empty Git repository or reinitialize an existing one"
-msgstr "Crea un repositorio de Git vac챠o o reinicia el que ya existe"
+msgstr ""
+"git-init: crear un repositorio de Git vac챠o o reinicializar uno ya existente"
#. type: Plain text
#: en/git-init.txt:15
@@ -58418,7 +58430,7 @@ msgstr ""
#: en/pretty-formats.txt:122
#, priority:260
msgid "Placeholders that affect formatting of later placeholders:"
-msgstr ""
+msgstr "Sustitutos que afectan el formato de sustitutos posteriores:"
#. type: Labeled list
#: en/pretty-formats.txt:122
@@ -58430,7 +58442,7 @@ msgstr "'%Cred'"
#: en/pretty-formats.txt:123
#, priority:260
msgid "switch color to red"
-msgstr ""
+msgstr "cambia el color a rojo"
#. type: Labeled list
#: en/pretty-formats.txt:123
@@ -58442,7 +58454,7 @@ msgstr "'%Cgreen'"
#: en/pretty-formats.txt:124
#, priority:260
msgid "switch color to green"
-msgstr ""
+msgstr "cambia el color a verde"
#. type: Labeled list
#: en/pretty-formats.txt:124
@@ -58454,7 +58466,7 @@ msgstr "'%Cblue'"
#: en/pretty-formats.txt:125
#, priority:260
msgid "switch color to blue"
-msgstr ""
+msgstr "cambia el color a azul"
#. type: Labeled list
#: en/pretty-formats.txt:125
@@ -58466,7 +58478,7 @@ msgstr "'%Creset'"
#: en/pretty-formats.txt:126
#, priority:260
msgid "reset color"
-msgstr ""
+msgstr "restablece el color"
#. type: Labeled list
#: en/pretty-formats.txt:126
@@ -62321,13 +62333,17 @@ msgstr ""
#: en/urls.txt:65
#, priority:300
msgid "<transport>::<address>"
-msgstr ""
+msgstr "<transporte>::<direcci처n>"
#. type: Plain text
#: en/urls.txt:69
#, 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 ""
+"donde <direcci처n> puede ser una ruta de acceso, un servidor y una ruta "
+"combinados, o bien una cadena semejante a un URL reconocible por el auxiliar "
+"remoto concreto que se invoque. Consulte linkgit:gitremote-helpers[7] para "
+"obtener detalles."
#. type: Plain text
#: en/urls.txt:74
@@ -62347,7 +62363,7 @@ msgstr ""
#: en/urls.txt:81 en/urls.txt:100
#, priority:300
msgid "For example, with this:"
-msgstr ""
+msgstr "Por ejemplo, con esto:"
#. type: delimited block -
#: en/urls.txt:86
@@ -62391,6 +62407,9 @@ msgstr ""
#, priority:300
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+"un URL como 짬git://ejemplo.org/ruta/al/repositorio.git쨩 se convertir찼 en "
+"짬ssh://ejemplo.org/ruta/al/repositorio.git쨩 para los env챠os, pero las "
+"incorporaciones segur찼n utilizando el URL original."
#. type: Title =
#: en/git-bisect-lk2009.txt:2
@@ -64399,10 +64418,9 @@ msgstr ""
#. type: Title -
#: en/git-bisect-lk2009.txt:1348
-#, fuzzy, no-wrap, priority:100
-#| msgid "--dereference"
+#, no-wrap, priority:100
msgid "References"
-msgstr "--dereference"
+msgstr "Referencias"
#. type: Plain text
#: en/git-bisect-lk2009.txt:1351
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index d68b17cf568ee403dbbecdbee3c85246f9c4d20a..5a0e17c80744c4b37a09f3b4be723ee2258ad555 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-10 21:38+0000\n"
+"PO-Revision-Date: 2020-04-25 12:25+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-dev\n"
+"X-Generator: Weblate 4.0.2-dev\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
@@ -5203,7 +5203,7 @@ msgstr "--all"
#: en/fetch-options.txt:3
#, priority:220
msgid "Fetch all remotes."
-msgstr ""
+msgstr "R챕cup챕rer tous les distants."
#. type: Labeled list
#: en/fetch-options.txt:5
@@ -5216,6 +5216,9 @@ msgstr "--append"
#, priority:220
msgid "Append ref names and object names of fetched refs to the existing contents of `.git/FETCH_HEAD`. Without this option old data in `.git/FETCH_HEAD` will be overwritten."
msgstr ""
+"Ajouter les noms de r챕f챕rences et les noms d'objets des r챕f챕rences "
+"r챕cup챕r챕es au contenu existant de `.git/FETCH_HEAD`. Sans cette option, les "
+"anciennes donn챕es dans `.git/FETCH_HEAD` seront 챕cras챕es."
#. type: Labeled list
#: en/fetch-options.txt:10
@@ -5228,6 +5231,12 @@ msgstr "--depth=<profondeur>"
#, priority:220
msgid "Limit fetching to the specified number of commits from the tip of each remote branch history. If fetching to a 'shallow' repository created by `git clone` with `--depth=<depth>` option (see linkgit:git-clone[1]), deepen or shorten the history to the specified number of commits. Tags for the deepened commits are not fetched."
msgstr ""
+"Limiter la r챕cup챕ration au nombre sp챕cifi챕 de commits 횪 partir du sommet de "
+"l'historique de chaque branche distante. Si vous allez chercher dans un "
+"d챕p척t \"superficiel\" cr챕챕 par `git clone` avec l'option "
+"`--depth=<profondeur>` (voir linkgit:git-clone[1]), approfondir ou "
+"raccourcir l'historique jusqu'au nombre sp챕cifi챕 de validations. Les "
+"챕tiquettes pour les commits approfondis ne sont pas r챕cup챕r챕es."
#. type: Labeled list
#: en/fetch-options.txt:17
@@ -5240,6 +5249,9 @@ msgstr "--deepen=<profondeur>"
#, priority:220
msgid "Similar to --depth, except it specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history."
msgstr ""
+"Semblable 횪 --depth, sauf que cela pr챕cise le nombre de commits 횪 partir de "
+"la limite actuelle superficielle au lieu du sommet de l'historique de chaque "
+"branche distante."
#. type: Labeled list
#: en/fetch-options.txt:22 en/git-clone.txt:221 en/git-fetch-pack.txt:90
@@ -5252,6 +5264,8 @@ msgstr "--shallow-since=<date>"
#, priority:220
msgid "Deepen or shorten the history of a shallow repository to include all reachable commits after <date>."
msgstr ""
+"Approfondir ou raccourcir l'historique d'un d챕p척t superficiel pour inclure "
+"tous les commits accessibles apr챔s <date>."
#. type: Labeled list
#: en/fetch-options.txt:26 en/git-clone.txt:224 en/git-fetch-pack.txt:94
@@ -5264,6 +5278,9 @@ msgstr "--shallow-exclude=<r챕vision>"
#, priority:220
msgid "Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag. This option can be specified multiple times."
msgstr ""
+"Approfondir ou raccourcir l'historique d'un d챕p척t superficiel afin d'exclure "
+"les commits accessibles depuis une branche ou une 챕tiquette distante "
+"sp챕cifi챕e. Cette option peut 챗tre sp챕cifi챕e plusieurs fois."
#. type: Labeled list
#: en/fetch-options.txt:31
@@ -5276,12 +5293,17 @@ msgstr "--unshallow"
#, priority:220
msgid "If the source repository is complete, convert a shallow repository to a complete one, removing all the limitations imposed by shallow repositories."
msgstr ""
+"Si le d챕p척t de sources est complet, convertir un d챕p척t superficiel en un "
+"d챕p척t complet, en supprimant toutes les limitations impos챕es par les d챕p척ts "
+"superficiels."
#. type: Plain text
#: en/fetch-options.txt:38
#, priority:220
msgid "If the source repository is shallow, fetch as much as possible so that the current repository has the same history as the source repository."
msgstr ""
+"Si le d챕p척t source est superficiel, il faut en extraire le plus possible "
+"afin que le d챕p척t actuel ait le m챗me historique que le d챕p척t source."
#. type: Labeled list
#: en/fetch-options.txt:39
@@ -5294,36 +5316,54 @@ msgstr "--update-shallow"
#, priority:220
msgid "By default when fetching from a shallow repository, `git fetch` refuses refs that require updating .git/shallow. This option updates .git/shallow and accept such refs."
msgstr ""
+"Par d챕faut, lors de la r챕cup챕ration d'un d챕p척t superficiel, `git fetch` "
+"refuse les r챕f챕rences qui n챕cessitent une mise 횪 jour de .git/shallow. Cette "
+"option met 횪 jour le fichier .git/shallow et accepte de telles r챕f챕rences."
#. type: Labeled list
#: en/fetch-options.txt:45
#, no-wrap, priority:220
msgid "--negotiation-tip=<commit|glob>"
-msgstr ""
+msgstr "--negotiation-tip=<commit|glob>"
#. type: Plain text
#: en/fetch-options.txt:53
#, priority:220
msgid "By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile. If specified, Git will only report commits reachable from the given tips. This is useful to speed up fetches when the user knows which local ref is likely to have commits in common with the upstream ref being fetched."
msgstr ""
+"Par d챕faut, Git signalera au serveur les commits accessibles 횪 partir de "
+"toutes les r챕f챕rences locales pour trouver les commits communs afin de "
+"r챕duire la taille du fichier de paquet 횪 recevoir. Si ceci est sp챕cifi챕, Git "
+"ne signalera que les commits accessibles 횪 partir des sommets donn챕s. Ceci "
+"est utile pour acc챕l챕rer les recherches lorsque l'utilisateur sait quelle "
+"r챕f locale est susceptible d'avoir des commits en commun avec la r챕f amont "
+"qui est recherch챕e."
#. type: Plain text
#: en/fetch-options.txt:56
#, priority:220
msgid "This option may be specified more than once; if so, Git will report commits reachable from any of the given commits."
msgstr ""
+"Cette option peut 챗tre sp챕cifi챕e plus d'une fois ; si c'est le cas, Git "
+"signalera les commits accessibles 횪 partir de l'un des commits donn챕s."
#. type: Plain text
#: en/fetch-options.txt:60
#, priority:220
msgid "The argument to this option may be a glob on ref names, a ref, or the (possibly abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying this option multiple times, one for each matching ref name."
msgstr ""
+"L'argument de cette option peut 챗tre un glob sur les noms de r챕f챕rence, une "
+"r챕f챕rence ou le SHA-1 (챕ventuellement abr챕g챕) d'un commit. La sp챕cification "
+"d'un glob 챕quivaut 횪 sp챕cifier cette option plusieurs fois, une pour chaque "
+"nom de r챕f챕rence correspondant."
#. type: Plain text
#: en/fetch-options.txt:63
#, priority:220
msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
msgstr ""
+"Voir aussi la variable de configuration `fetch.negotiationAlgorithm` "
+"document챕e dans linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:65 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
@@ -5335,7 +5375,7 @@ msgstr "--dry-run"
#: en/fetch-options.txt:67
#, priority:220
msgid "Show what would be done, without making any changes."
-msgstr ""
+msgstr "Montrer ce qui serait fait, sans faire de changements."
#. type: Labeled list
#: en/fetch-options.txt:69 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:394 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79 en/git-worktree.txt:119
@@ -5354,6 +5394,9 @@ msgstr "--force"
#, priority:220
msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
msgstr ""
+"Lorsque 'git fetch' est utilis챕 avec la sp챕cification de r챕f챕rence "
+"`<src>:<dst>`, il peut refuser de mettre 횪 jour la branche locale comme cela "
+"a 챕t챕 discut챕"
#. type: Plain text
#: en/fetch-options.txt:76
@@ -5362,18 +5405,20 @@ msgid ""
"\tin the `<refspec>` part of the linkgit:git-fetch[1]\n"
"\tdocumentation.\n"
msgstr ""
+"\tdans la partie `<sp챕cificateur-de-r챕f챕rence>` de la documentation\n"
+"\tlinkgit:git-fetch[1].\n"
#. type: Plain text
#: en/fetch-options.txt:79
#, no-wrap, priority:220
msgid "\tin the `<refspec>` part below.\n"
-msgstr ""
+msgstr "\tdans la partie `<sp챕cificateur-de-r챕f챕rence>` ci-dessous.\n"
#. type: Plain text
#: en/fetch-options.txt:81
#, no-wrap, priority:220
msgid "\tThis option overrides that check.\n"
-msgstr ""
+msgstr "\tCette option permet de passer outre 횪 ce contr척le.\n"
#. type: Labeled list
#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:114 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
@@ -5404,6 +5449,8 @@ msgstr "--multiple"
#, priority:220
msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
msgstr ""
+"Permettre de sp챕cifier plusieurs arguments <d챕p척t> et <groupe>. Aucun "
+"<sp챕cificateur-de-r챕f챕rence> ne peut 챗tre sp챕cifi챕."
#. type: Labeled list
#: en/fetch-options.txt:91
@@ -5416,6 +5463,8 @@ msgstr "--[no-]auto-gc"
#, priority:220
msgid "Run `git gc --auto` at the end to perform garbage collection if needed. This is enabled by default."
msgstr ""
+"Ex챕cuter `git gc --auto` 횪 la fin pour effectuer le ramassage des ordures si "
+"n챕cessaire. Ceci est activ챕 par d챕faut."
#. type: Labeled list
#: en/fetch-options.txt:95
@@ -5428,6 +5477,8 @@ msgstr "--[no-]write-commit-graph"
#, priority:220
msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
msgstr ""
+"횋crire un graphe de commit apr챔s avoir r챕cup챕r챕. Ceci remplace le param챔tre "
+"de configuration `fetch.writeCommitGraph`."
#. type: Labeled list
#: en/fetch-options.txt:100 en/git-push.txt:153
@@ -5440,12 +5491,22 @@ msgstr "--prune"
#, priority:220
msgid "Before fetching, remove any remote-tracking references that no longer exist on the remote. Tags are not subject to pruning if they are fetched only because of the default tag auto-following or due to a --tags option. However, if tags are fetched due to an explicit refspec (either on the command line or in the remote configuration, for example if the remote was cloned with the --mirror option), then they are also subject to pruning. Supplying `--prune-tags` is a shorthand for providing the tag refspec."
msgstr ""
+"Avant de r챕cup챕rer, supprimer toutes les r챕f챕rences de suivi 횪 distance qui "
+"n'existent plus sur le d챕p척t distant. Les 챕tiquettes ne sont pas sujettes 횪 "
+"l'챕lagage si elles ne sont r챕cup챕r챕es qu'en raison du suivi automatique de "
+"l'챕tiquette par d챕faut ou en raison d'une option --tags. Cependant, si les "
+"챕tiquettes sont r챕cup챕r챕es en raison d'un sp챕cificateur de r챕f챕rence "
+"explicite (soit en ligne de commande, soit dans la configuration distante, "
+"par exemple si le d챕p척t distant a 챕t챕 clon챕 avec l'option --mirror), alors "
+"elles sont 챕galement sujettes 횪 l'챕lagage. La fourniture de `--prune-tags` "
+"est une abr챕viation pour la fourniture du sp챕cificateur de r챕f챕rence "
+"d'챕tiquette."
#. type: Plain text
#: en/fetch-options.txt:112 en/fetch-options.txt:123
#, priority:220
msgid "See the PRUNING section below for more details."
-msgstr ""
+msgstr "Voir la section 횋LAGAGE ci-dessous pour plus de d챕tails."
#. type: Labeled list
#: en/fetch-options.txt:113 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
@@ -5464,6 +5525,13 @@ msgstr "--prune-tags"
#, priority:220
msgid "Before fetching, remove any local tags that no longer exist on the remote if `--prune` is enabled. This option should be used more carefully, unlike `--prune` it will remove any local references (local tags) that have been created. This option is a shorthand for providing the explicit tag refspec along with `--prune`, see the discussion about that in its documentation."
msgstr ""
+"Avant de r챕cup챕rer, supprimer toutes les 챕tiquettes locales qui n'existent "
+"plus sur le distant si `--prune` est activ챕. Cette option doit 챗tre utilis챕e "
+"avec plus de pr챕caution, car contrairement 횪 `--prune`, elle supprime toutes "
+"les r챕f챕rences locales (챕tiquettes locales) qui ont 챕t챕 cr챕챕es. Cette option "
+"est un raccourci pour la fourniture du sp챕cificateur de r챕f챕rence "
+"d'챕tiquette explicite avec `--prune`, voir la discussion 횪 ce sujet dans sa "
+"documentation."
#. type: Labeled list
#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:143 en/git-commit.txt:175 en/git-format-patch.txt:99 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:373 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:89
@@ -5482,18 +5550,32 @@ msgstr "--no-tags"
#, priority:220
msgid "By default, tags that point at objects that are downloaded from the remote repository are fetched and stored locally. This option disables this automatic tag following. The default behavior for a remote may be specified with the remote.<name>.tagOpt setting. See linkgit:git-config[1]."
msgstr ""
+"Par d챕faut, les 챕tiquettes qui pointent sur des objets t챕l챕charg챕s 횪 partir "
+"du d챕p척t distant sont r챕cup챕r챕es et stock챕es localement. Cette option "
+"d챕sactive le suivi automatique des 챕tiquettes. Le comportement par d챕faut "
+"d'un distant peut 챗tre sp챕cifi챕 avec le param챔tre remote.<nom>.tagOpt. Voir "
+"linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:137
#, no-wrap, priority:220
msgid "--refmap=<refspec>"
-msgstr ""
+msgstr "--refmap=<sp챕cificateur-de-r챕f챕rence>"
#. type: Plain text
#: en/fetch-options.txt:147
#, priority:220
msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
msgstr ""
+"Lors de la r챕cup챕ration des r챕f챕rences list챕es en ligne de commande, "
+"utiliser la sp챕cification de r챕f챕rence (qui peut 챗tre donn챕e plusieurs fois) "
+"pour mapper les r챕f챕rences sur les branches de suivi 횪 distance, au lieu des "
+"valeurs des variables de configuration `remote.*.fetch` pour le d챕p척t "
+"distant. Fournir un `<sp챕cificateur-de-r챕f챕rence>` vide 횪 l'option "
+"`--refmap` fait que Git ignore les sp챕cification de r챕f챕rence configur챕es et "
+"se fie enti챔rement aux sp챕cifications de r챕f챕rence fournies comme arguments "
+"de la ligne de commande. Voir la section sur les \"Branches de suivi 횪 "
+"distance configur챕es\" pour plus de d챕tails."
#. type: Labeled list
#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
@@ -5506,18 +5588,35 @@ msgstr "--tags"
#, priority:220
msgid "Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into local tags with the same name), in addition to whatever else would otherwise be fetched. Using this option alone does not subject tags to pruning, even if --prune is used (though tags may be pruned anyway if they are also the destination of an explicit refspec; see `--prune`)."
msgstr ""
+"R챕cup챕rer toutes les 챕tiquettes 횪 distance (c'est-횪-dire, r챕cup챕rer les "
+"챕tiquettes `refs/tags/*` dans les 챕tiquettes locales avec le m챗me nom), en "
+"plus de tout ce qui serait r챕cup챕r챕 autrement. L'utilisation de cette seule "
+"option ne soumet pas les 챕tiquettes 횪 un 챕lagage, m챗me si --prune est "
+"utilis챕 (bien que les 챕tiquettes puissent 챗tre 챕lagu챕es de toute fa챌on si "
+"elles sont aussi la destination d'une sp챕cification de r챕f챕rence explicite ; "
+"voir `--prune`)."
#. type: Labeled list
#: en/fetch-options.txt:157
#, no-wrap, priority:220
msgid "--recurse-submodules[=yes|on-demand|no]"
-msgstr ""
+msgstr "--recurse-submodules[=yes|on-demand|no]"
#. type: Plain text
#: en/fetch-options.txt:167
#, priority:220
msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone."
msgstr ""
+"Cette option permet de contr척ler si et dans quelles conditions les nouveaux "
+"engagements de sous-modules peupl챕s doivent 챕galement 챗tre r챕cup챕r챕s. Elle "
+"peut 챗tre utilis챕e comme une option bool챕enne pour d챕sactiver compl챔tement "
+"la r챕cursivit챕 lorsqu'elle est d챕finie sur 'no' ou pour visiter "
+"r챕cursivement sans condition tous les sous-modules peupl챕s lorsqu'elle est "
+"d챕finie sur 'yes', qui est la valeur par d챕faut lorsque cette option est "
+"utilis챕e sans aucune valeur. Utiliser 'on-demand' pour ne visiter "
+"r챕cursivement un sous-module peupl챕 que lorsque le superprojet r챕cup챔re un "
+"commit qui met 횪 jour la r챕f챕rence du sous-module 횪 un commit qui n'est pas "
+"d챕j횪 dans le clone local du sous-module."
#. type: Labeled list
#: en/fetch-options.txt:168
@@ -5536,18 +5635,27 @@ msgstr "--jobs=<n>"
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
msgstr ""
+"Nombre d'enfants parall챔les 횪 utiliser pour toutes les formes d'extraction."
#. type: Plain text
#: en/fetch-options.txt:176
#, 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 ""
+"Si l'option `--multiple` a 챕t챕 sp챕cifi챕e, les diff챕rents distants seront "
+"r챕cup챕r챕s en parall챔le. Si plusieurs sous-modules sont r챕cup챕r챕s, ils seront "
+"r챕cup챕r챕s en parall챔le. Pour les contr척ler ind챕pendamment, utilisez les "
+"param챔tres de configuration `fetch.parallel` et `submodule.fetchJobs` (voir "
+"linkgit:git-config[1])."
#. type: Plain text
#: en/fetch-options.txt:179
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
msgstr ""
+"G챕n챕ralement, les recherches r챕cursives parall챔les et sur des distants "
+"multiples seront plus rapides. Par d챕faut, les recherches sont effectu챕es de "
+"mani챔re s챕quentielle, et non en parall챔le."
#. type: Labeled list
#: en/fetch-options.txt:180 en/git-checkout.txt:294 en/git-push.txt:377 en/git-switch.txt:182
@@ -5560,6 +5668,8 @@ msgstr "--no-recurse-submodules"
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
msgstr ""
+"D챕sactiver la r챕cup챕ration r챕cursive des sous-modules (cela a le m챗me effet "
+"que d'utiliser l'option `--recurse-submodules=no`)."
#. type: Labeled list
#: en/fetch-options.txt:184 en/git-branch.txt:225 en/git-push.txt:349
@@ -5572,6 +5682,10 @@ 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 ""
+"Si le distant est r챕cup챕r챕 avec succ챔s, tirer et ajouter la r챕f챕rence (de "
+"suivi) amont , utilis챕e par les commandes sans argument linkgit:git-pull[1] "
+"et autres. Pour plus d'informations, voir `branch.<nom>.merge` et "
+"`branch.<nom>.remote` dans linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:191
@@ -5584,18 +5698,27 @@ msgstr "--submodule-prefix=<chemin>"
#, 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 ""
+"Pr챕fixer <chemin> aux chemins affich챕s dans les messages informatifs tels "
+"que \"R챕cup챕ration du sous-module foo\". Cette option est utilis챕e en "
+"interne lors de la r챕cursion sur les sous-modules."
#. type: Labeled list
#: en/fetch-options.txt:196
#, no-wrap, priority:220
msgid "--recurse-submodules-default=[yes|on-demand]"
-msgstr ""
+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 ""
+"Cette option est utilis챕e en interne pour fournir temporairement une valeur "
+"par d챕faut non n챕gative pour l'option --recurse-submodules. Toutes les "
+"autres m챕thodes de configuration de la r챕cup챕ration r챕cursive des sous-"
+"module (comme les param챔tres de linkgit:gitmodules[5] et linkgit:git-"
+"config[1]) remplacent cette option, tout comme le fait de sp챕cifier "
+"directement --[no-]recurse-submodules."
#. type: Labeled list
#: en/fetch-options.txt:206
@@ -5608,6 +5731,11 @@ msgstr "--update-head-ok"
#, priority:220
msgid "By default 'git fetch' refuses to update the head which corresponds to the current branch. This flag disables the check. This is purely for the internal use for 'git pull' to communicate with 'git fetch', and unless you are implementing your own Porcelain you are not supposed to use it."
msgstr ""
+"Par d챕faut, 'git fetch' refuse de mettre 횪 jour la t챗te qui correspond 횪 la "
+"branche en cours. Ce drapeau d챕sactive la v챕rification. C'est purement "
+"pour l'usage interne de 'git pull' pour communiquer avec 'git fetch', et 횪 "
+"moins que vous n'impl챕mentiez votre propre Porcelaine, vous n'챗tes pas cens챕 "
+"l'utiliser."
#. type: Labeled list
#: en/fetch-options.txt:214 en/git-clone.txt:188
@@ -5620,6 +5748,9 @@ msgstr "--upload-pack <upload-pack>"
#, priority:220
msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
msgstr ""
+"Lorsqu'il est donn챕, et que le d챕p척t 횪 r챕cup챕rer est g챕r챕 par 'git fetch-"
+"pack', `--exec=<upload-pack>` est pass챕 횪 la commande pour sp챕cifier le "
+"chemin par d챕faut pour la commande ex챕cut챕e 횪 l'autre bout."
#. type: Labeled list
#: en/fetch-options.txt:221 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:119 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:322 en/git-grep.txt:313 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:361 en/git-repack.txt:78 en/git-reset.txt:99 en/git-restore.txt:65 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:143
@@ -5632,6 +5763,9 @@ msgstr "-q"
#, priority:220
msgid "Pass --quiet to git-fetch-pack and silence any other internally used git commands. Progress is not reported to the standard error stream."
msgstr ""
+"Passer -- quiet pour git-fetch-pack et faire taire toute autre commande git "
+"utilis챕e en interne. La progression n'est pas signal챕e dans le flux "
+"d'erreurs standard."
#. type: Labeled list
#: en/fetch-options.txt:227 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:124 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:365 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:147
@@ -5692,6 +5826,10 @@ msgstr "--show-forced-updates"
#, 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 ""
+"Par d챕faut, git v챕rifie si une branche est mise 횪 jour de force pendant la "
+"r챕cup챕ration. Cela peut 챗tre d챕sactiv챕 via fetch.showForcedUpdates, mais "
+"l'option --show-forced-updates garantit que cette v챕rification a lieu. Voir "
+"linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:253
@@ -5704,6 +5842,12 @@ msgstr "--no-show-forced-updates"
#, 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 ""
+"Par d챕faut, git v챕rifie si une branche est mise 횪 jour de force pendant la "
+"r챕cup챕ration. Passer --no-show-forced-updates ou r챕gler "
+"fetch.showForcedUpdates 횪 false pour sauter cette v챕rification pour des "
+"raisons de performance. Si elle est utilis챕e pendant 'git-pull', l'option "
+"--ff-only v챕rifiera toujours les mises 횪 jour forc챕es avant de tenter une "
+"mise 횪 jour rapide. Voir linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:260 en/git-push.txt:398
@@ -5721,7 +5865,7 @@ msgstr "--ipv4"
#: en/fetch-options.txt:263 en/git-push.txt:401
#, priority:220
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
-msgstr ""
+msgstr "Utiliser uniquement les adresses IPv4, en ignorant les adresses IPv6."
#. type: Labeled list
#: en/fetch-options.txt:264 en/git-push.txt:402
@@ -5739,7 +5883,7 @@ msgstr "--ipv6"
#: en/fetch-options.txt:266 en/git-push.txt:405
#, priority:220
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
-msgstr ""
+msgstr "Utiliser uniquement les adresses IPv6, en ignorant les adresses IPv4."
#. type: Title =
#: en/git-add.txt:2
@@ -9767,7 +9911,7 @@ msgstr ""
#: en/git-branch.txt:310
#, no-wrap, priority:240
msgid "Start development from a known tag"
-msgstr "D챕marrer le d챕veloppement 횪 partir d'une balise connue"
+msgstr "D챕marrer le d챕veloppement 횪 partir d'une 챕tiquette connue"
#. type: delimited block -
#: en/git-branch.txt:317
@@ -18848,7 +18992,11 @@ msgstr "Au lieu de trouver l'챕tiquette ant챕rieure au commit, trouver l'챕tique
#: en/git-describe.txt:70
#, priority:260
msgid "Instead of using the default 7 hexadecimal digits as the abbreviated object name, use <n> digits, or as many digits as needed to form a unique object name. An <n> of 0 will suppress long format, only showing the closest tag."
-msgstr "Au lieu d'utiliser les 7 chiffres hexad챕cimaux par d챕faut comme nom d'objet abr챕g챕, utiliser <n> chiffres, ou autant de chiffres que n챕cessaire pour former un nom unique. Un <n> de 0 supprimera le format long, n'affichant que la balise la plus proche."
+msgstr ""
+"Au lieu d'utiliser les 7 chiffres hexad챕cimaux par d챕faut comme nom d'objet "
+"abr챕g챕, utiliser <n> chiffres, ou autant de chiffres que n챕cessaire pour "
+"former un nom unique. Un <n> de 0 supprimera le format long, n'affichant "
+"que l'챕tiquette la plus proche."
#. type: Labeled list
#: en/git-describe.txt:71
@@ -18914,7 +19062,18 @@ msgstr "--exclude <motif>"
#: en/git-describe.txt:117
#, priority:260
msgid "Do not consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also does not consider local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated and tags matching any of the patterns will be excluded. When combined with --match a tag will be considered when it matches at least one --match pattern and does not match any of the --exclude patterns. Use `--no-exclude` to clear and reset the list of patterns."
-msgstr "Ne pas consid챕rer les 챕tiquettes qui correspondent au mod챔le `glob(7)' donn챕, 횪 l'exclusion du pr챕fixe \"refs/tags/\". Si utilis챕 avec `--all', ne pas tenir compte non plus des branches locales et des r챕f챕rences de suivi 횪 distance correspondant au motif, 횪 l'exclusion respectivement des pr챕fixes \"refs/heads/\" et \"refs/remotes/\" ; les r챕f챕rences d'autres types ne sont jamais consid챕r챕es. Si donn챕 plusieurs fois, une liste de motifs sera accumul챕e et les balises correspondant 횪 l'un ou l'autre de ces motifs seront exclues. Si combin챕 avec --match, une 챕tiquette sera prise en compte si elle correspond 횪 au moins un motif --match et ne correspond 횪 aucun des motifs --exclude. Utilisez `--no-exclude' pour effacer et r챕initialiser la liste des motifs."
+msgstr ""
+"Ne pas consid챕rer les 챕tiquettes qui correspondent au mod챔le `glob(7)' "
+"donn챕, 횪 l'exclusion du pr챕fixe \"refs/tags/\". Si utilis챕 avec `--all', ne "
+"pas tenir compte non plus des branches locales et des r챕f챕rences de suivi 횪 "
+"distance correspondant au motif, 횪 l'exclusion respectivement des pr챕fixes \""
+"refs/heads/\" et \"refs/remotes/\" ; les r챕f챕rences d'autres types ne sont "
+"jamais consid챕r챕es. Si donn챕 plusieurs fois, une liste de motifs sera "
+"accumul챕e et les 챕tiquettes correspondant 횪 l'un ou l'autre de ces motifs "
+"seront exclues. Si combin챕 avec --match, une 챕tiquette sera prise en compte "
+"si elle correspond 횪 au moins un motif --match et ne correspond 횪 aucun des "
+"motifs --exclude. Utilisez `--no-exclude' pour effacer et r챕initialiser la "
+"liste des motifs."
#. type: Labeled list
#: en/git-describe.txt:118 en/git-diff-tree.txt:115 en/git-name-rev.txt:61
@@ -22997,54 +23156,85 @@ msgid ""
"'git fetch' --multiple [<options>] [(<repository> | <group>)...]\n"
"'git fetch' --all [<options>]\n"
msgstr ""
+"'git fetch' [<options>] [<d챕p척t> [<sp챕c-de-r챕f>...]]\n"
+"'git fetch' [<options>] <groupe>\n"
+"'git fetch' --multiple [<options>] [(<d챕p척t> | <groupe>)...]\n"
+"'git fetch' --all [<options>]\n"
#. type: Plain text
#: en/git-fetch.txt:24
#, priority:220
msgid "Fetch branches and/or tags (collectively, \"refs\") from one or more other repositories, along with the objects necessary to complete their histories. Remote-tracking branches are updated (see the description of <refspec> below for ways to control this behavior)."
msgstr ""
+"R챕cup챕rer des branches et/ou des 챕tiquettes (collectivement, \"r챕fs\") "
+"depuis un ou plusieurs autres d챕p척ts, ainsi que les objets n챕cessaires pour "
+"compl챕ter leur historique. Les branches de suivi 횪 distance sont mises 횪 "
+"jour (voir la description de <sp챕c-de-r챕f> ci-dessous pour les moyens de "
+"contr척ler ce comportement)."
#. type: Plain text
#: en/git-fetch.txt:32
#, priority:220
msgid "By default, any tag that points into the histories being fetched is also fetched; the effect is to fetch tags that point at branches that you are interested in. This default behavior can be changed by using the --tags or --no-tags options or by configuring remote.<name>.tagOpt. By using a refspec that fetches tags explicitly, you can fetch tags that do not point into branches you are interested in as well."
msgstr ""
+"Par d챕faut, toute 챕tiquette qui pointe vers les historiques recherch챕s est "
+"챕galement recherch챕e ; l'effet est de rechercher les 챕tiquettes qui pointent "
+"vers les branches qui vous int챕ressent. Ce comportement par d챕faut peut "
+"챗tre modifi챕 en utilisant les options --tags ou --no-tags ou en configurant "
+"remote.<nom>.tagOpt. En utilisant une sp챕cification de r챕f챕rence qui "
+"r챕cup챔re les 챕tiquettes explicitement, vous pouvez 챕galement r챕cup챕rer les "
+"챕tiquettes qui ne pointent pas sur les branches qui vous int챕ressent."
#. type: Plain text
#: en/git-fetch.txt:37
#, 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' peut aller chercher 횪 partir d'un seul d챕p척t nomm챕 ou d'une "
+"seule URL, ou 횪 partir de plusieurs d챕p척ts 횪 la fois si <groupe> est donn챕 "
+"et qu'il y a une entr챕e remotes.<groupe> dans le fichier de configuration. ("
+"Voir linkgit:git-config[1])."
#. type: Plain text
#: en/git-fetch.txt:40
#, priority:220
msgid "When no remote is specified, by default the `origin` remote will be used, unless there's an upstream branch configured for the current branch."
msgstr ""
+"Lorsqu'aucun distant n'est sp챕cifi챕, par d챕faut le distant `origin` sera "
+"utilis챕, 횪 moins qu'il n'y ait une branche amont configur챕e pour la branche "
+"courante."
#. type: Plain text
#: en/git-fetch.txt:44
#, priority:220
msgid "The names of refs that are fetched, together with the object names they point at, are written to `.git/FETCH_HEAD`. This information may be used by scripts or other git commands, such as linkgit:git-pull[1]."
msgstr ""
+"Les noms des refs qui sont r챕cup챕r챕s, ainsi que les noms des objets qu'ils "
+"pointent, sont 챕crits dans `.git/FETCH_HEAD`. Ces informations peuvent 챗tre "
+"utilis챕es par des scripts ou d'autres commandes git, telles que linkgit:git-"
+"pull[1]."
#. type: Title -
#: en/git-fetch.txt:55
#, no-wrap, priority:220
msgid "CONFIGURED REMOTE-TRACKING BRANCHES[[CRTB]]"
-msgstr ""
+msgstr "LES BRANCHES DE SUIVI � DISTANCE CONFIGUR횋ES [[CRTB]]"
#. type: Plain text
#: en/git-fetch.txt:61
#, priority:220
msgid "You often interact with the same remote repository by regularly and repeatedly fetching from it. In order to keep track of the progress of such a remote repository, `git fetch` allows you to configure `remote.<repository>.fetch` configuration variables."
msgstr ""
+"Vous interagissez souvent avec le m챗me d챕p척t distant en y allant "
+"r챕guli챔rement et de mani챔re r챕p챕t챕e. Afin de suivre la progression d'un tel "
+"d챕p척t distant, `git fetch` vous permet de configurer les variables de "
+"configuration `remote.<d챕p척t>.fetch`."
#. type: Plain text
#: en/git-fetch.txt:63
#, priority:220
msgid "Typically such a variable may look like this:"
-msgstr ""
+msgstr "En g챕n챕ral, une telle variable peut ressembler 횪 ceci :"
#. type: delimited block -
#: en/git-fetch.txt:67
@@ -23053,54 +23243,92 @@ msgid ""
"[remote \"origin\"]\n"
"\tfetch = +refs/heads/*:refs/remotes/origin/*\n"
msgstr ""
+"[remote \"origin\"]\n"
+"\tfetch = +refs/heads/*:refs/remotes/origin/*\n"
#. type: Plain text
#: en/git-fetch.txt:70
#, priority:220
msgid "This configuration is used in two ways:"
-msgstr ""
+msgstr "Cette configuration est utilis챕e de deux fa챌ons :"
#. type: Plain text
#: en/git-fetch.txt:80
#, priority:220
msgid "When `git fetch` is run without specifying what branches and/or tags to fetch on the command line, e.g. `git fetch origin` or `git fetch`, `remote.<repository>.fetch` values are used as the refspecs--they specify which refs to fetch and which local refs to update. The example above will fetch all branches that exist in the `origin` (i.e. any ref that matches the left-hand side of the value, `refs/heads/*`) and update the corresponding remote-tracking branches in the `refs/remotes/origin/*` hierarchy."
msgstr ""
+"Lorsque `git fetch` est lanc챕 sans sp챕cifier les branches et/ou les "
+"챕tiquettes 횪 r챕cup챕rer en ligne de commande, par exemple `git fetch origin` "
+"ou `git fetch`, les valeurs `remote.<d챕p척t>.fetch` sont utilis챕es comme sp챕c-"
+"de-r챕f --elles sp챕cifient quelles r챕fs 횪 r챕cup챕rer et quelles r챕fs locales 횪 "
+"mettre 횪 jour. L'exemple ci-dessus va chercher toutes les branches qui "
+"existent dans `origin` (c'est-횪-dire toute r챕f qui correspond au c척t챕 gauche "
+"de la valeur, \"refs/heads/*\") et mettre 횪 jour les branches de suivi 횪 "
+"distance correspondantes dans la hi챕rarchie `refs/remotes/origin/*`."
#. type: Plain text
#: en/git-fetch.txt:97
#, priority:220
msgid "When `git fetch` is run with explicit branches and/or tags to fetch on the command line, e.g. `git fetch origin master`, the <refspec>s given on the command line determine what are to be fetched (e.g. `master` in the example, which is a short-hand for `master:`, which in turn means \"fetch the 'master' branch but I do not explicitly say what remote-tracking branch to update with it from the command line\"), and the example command will fetch _only_ the 'master' branch. The `remote.<repository>.fetch` values determine which remote-tracking branch, if any, is updated. When used in this way, the `remote.<repository>.fetch` values do not have any effect in deciding _what_ gets fetched (i.e. the values are not used as refspecs when the command-line lists refspecs); they are only used to decide _where_ the refs that are fetched are stored by acting as a mapping."
msgstr ""
+"Lorsque `git fetch` est lanc챕 avec des branches et/ou des 챕tiquettes "
+"explicites 횪 r챕cup챕rer en ligne de commande, par exemple `git fetch origin "
+"master`, les <sp챕c-de-r챕f>s donn챕es en ligne de commande d챕terminent ce qui "
+"doit 챗tre r챕cup챕r챕 (par exemple `master` dans l'exemple, qui est un "
+"raccourci pour `master:`, ce qui signifie \"chercher la branche 'master' "
+"mais je ne dis pas explicitement quelle branche de suivi 횪 distance mettre 횪 "
+"jour avec elle depuis la ligne de commande\"), et la commande de l'exemple "
+"ne cherchera _que_ la branche 'master'. Les valeurs de "
+"`remote.<d챕p척t>.fetch` d챕terminent quelle branche de suivi 횪 distance, s'il "
+"y en a une, est mise 횪 jour. Lorsqu'elles sont utilis챕es de cette fa챌on, "
+"les valeurs de `remote.<d챕p척t>.fetch` n'ont aucun effet sur la d챕cision de "
+"ce qui est r챕cup챕r챕 (c'est-횪-dire que les valeurs ne sont pas utilis챕es "
+"comme sp챕c-de-r챕f lorsque la ligne de commande liste les sp챕c-de-r챕fs) ; "
+"elles ne sont utilis챕es que pour d챕cider de l'endroit o첫 les r챕fs qui sont "
+"r챕cup챕r챕es sont stock챕es en agissant comme une table de correspondance."
#. type: Plain text
#: en/git-fetch.txt:101
#, priority:220
msgid "The latter use of the `remote.<repository>.fetch` values can be overridden by giving the `--refmap=<refspec>` parameter(s) on the command line."
msgstr ""
+"Cette derni챔re utilisation des valeurs de `remote.<d챕p척t>.fetch` peut 챗tre "
+"챕cras챕e en donnant le(s) param챔tre(s) `--refmap=<sp챕c-de-r챕f>` sur la ligne "
+"de commande."
#. type: Title -
#: en/git-fetch.txt:103
#, no-wrap, priority:220
msgid "PRUNING"
-msgstr ""
+msgstr "횋LAGAGE"
#. type: Plain text
#: en/git-fetch.txt:108
#, priority:220
msgid "Git has a default disposition of keeping data unless it's explicitly thrown away; this extends to holding onto local references to branches on remotes that have themselves deleted those branches."
msgstr ""
+"Par d챕faut, Git conserve les donn챕es 횪 moins qu'elles ne soient "
+"explicitement jet챕es ; cela s'챕tend 횪 la conservation des r챕f챕rences locales "
+"aux branches des distants qui ont eux-m챗mes supprim챕 ces branches."
#. type: Plain text
#: en/git-fetch.txt:114
#, priority:220
msgid "If left to accumulate, these stale references might make performance worse on big and busy repos that have a lot of branch churn, and e.g. make the output of commands like `git branch -a --contains <commit>` needlessly verbose, as well as impacting anything else that'll work with the complete set of known references."
msgstr ""
+"Si on les laisse s'accumuler, ces r챕f챕rences p챕rim챕es pourraient rendre les "
+"performances mauvaises sur les gros d챕p척t qui ont beaucoup de branches, et "
+"par exemple rendre la sortie de commandes comme `git branch -a --contains "
+"<commit>` inutilement verbeuse, ainsi qu'avoir un impact sur tout ce qui "
+"travaillera avec l'ensemble des r챕f챕rences connues."
#. type: Plain text
#: en/git-fetch.txt:117
#, priority:220
msgid "These remote-tracking references can be deleted as a one-off with either of:"
msgstr ""
+"Ces r챕f챕rences de suivi 횪 distance peuvent 챗tre supprim챕es une seule fois "
+"avec l'une ou l'autre des commandes suivantes :"
#. type: delimited block -
#: en/git-fetch.txt:121
@@ -23109,6 +23337,8 @@ msgid ""
"# While fetching\n"
"$ git fetch --prune <name>\n"
msgstr ""
+"# Pendant la r챕cup챕ration\n"
+"$ git fetch --prune <nom>\n"
#. type: delimited block -
#: en/git-fetch.txt:124
@@ -23117,48 +23347,83 @@ msgid ""
"# Only prune, don't fetch\n"
"$ git remote prune <name>\n"
msgstr ""
+"# 횋laguer seulement, ne pas r챕cup챕re\n"
+"$ git remote prune <nom>\n"
#. type: Plain text
#: en/git-fetch.txt:130
#, priority:220
msgid "To prune references as part of your normal workflow without needing to remember to run that, set `fetch.prune` globally, or `remote.<name>.prune` per-remote in the config. See linkgit:git-config[1]."
msgstr ""
+"Pour 챕laguer les r챕f챕rences dans le cadre de votre flux de travail normal "
+"sans avoir besoin de vous rappeler de l'ex챕cuter, d챕finissez `fetch.prune` "
+"globalement, ou `remote.<nom>.prune` pour chaque d챕p척t distant dans la "
+"configuration. Voir linkgit:git-config[1]."
#. type: Plain text
#: en/git-fetch.txt:135
#, priority:220
msgid "Here's where things get tricky and more specific. The pruning feature doesn't actually care about branches, instead it'll prune local <-> remote-references as a function of the refspec of the remote (see `<refspec>` and <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> above)."
msgstr ""
+"C'est l횪 que les choses deviennent d챕licates et plus sp챕cifiques. La "
+"fonction d'챕lagage ne se pr챕occupe pas vraiment des branches, elle va plut척t "
+"챕laguer les r챕f챕rences locales <-> 횪 distance en fonction du sp챕cificateur "
+"de r챕f챕rence du d챕p척t distant (voir `<sp챕c-de-r챕f>` et <<CRTB, BRANCHES DE "
+"SUIVI � DISTANCE CONFIGUR횋ES>> ci-dessus)."
#. type: Plain text
#: en/git-fetch.txt:141
#, priority:220
msgid "Therefore if the refspec for the remote includes e.g. `refs/tags/*:refs/tags/*`, or you manually run e.g. `git fetch --prune <name> \"refs/tags/*:refs/tags/*\"` it won't be stale remote tracking branches that are deleted, but any local tag that doesn't exist on the remote."
msgstr ""
+"Par cons챕quent, si le sp챕cificateur de r챕f챕rence du serveur distant inclut "
+"par exemple `refs/tags/*:refs/tags/*`, ou si vous lancez manuellement par "
+"exemple `git fetch --prune <nom> \"refs/tags/*:refs/tags/*\"`, ce ne seront "
+"pas les branches de suivi 횪 distance qui seront supprim챕es, mais toute "
+"챕tiquette locale qui n'existe pas sur le serveur distant."
#. type: Plain text
#: en/git-fetch.txt:146
#, priority:220
msgid "This might not be what you expect, i.e. you want to prune remote `<name>`, but also explicitly fetch tags from it, so when you fetch from it you delete all your local tags, most of which may not have come from the `<name>` remote in the first place."
msgstr ""
+"Ce n'est peut-챗tre pas ce 횪 quoi vous vous attendez, c'est-횪-dire que vous "
+"voulez 챕laguer le server distant `<nom>`, mais aussi y r챕cup챕rer "
+"explicitement des 챕tiquettes, de sorte que lorsque vous le r챕cup챕rez, vous "
+"supprimez toutes vos 챕tiquettes locales, dont la plupart ne proviennent pas "
+"du d챕p척t distant `<nom>` au d챕part."
#. type: Plain text
#: en/git-fetch.txt:150
#, priority:220
msgid "So be careful when using this with a refspec like `refs/tags/*:refs/tags/*`, or any other refspec which might map references from multiple remotes to the same local namespace."
msgstr ""
+"Soyez donc prudent lorsque vous utilisez un sp챕cificateur de r챕f챕rence comme "
+"`refs/tags/*:refs/tags/*`, ou toute autre sp챕cificateur de r챕f챕rence qui "
+"pourrait faire correspondre des r챕f챕rences de plusieurs d챕p척ts distants au "
+"m챗me espace de noms local."
#. type: Plain text
#: en/git-fetch.txt:157
#, priority:220
msgid "Since keeping up-to-date with both branches and tags on the remote is a common use-case the `--prune-tags` option can be supplied along with `--prune` to prune local tags that don't exist on the remote, and force-update those tags that differ. Tag pruning can also be enabled with `fetch.pruneTags` or `remote.<name>.pruneTags` in the config. See linkgit:git-config[1]."
msgstr ""
+"횋tant donn챕 que la mise 횪 jour des branches et des 챕tiquettes sur le d챕p척t "
+"distant est un cas d'utilisation courant, l'option `--prune-tags` peut 챗tre "
+"fournie avec `--prune` pour 챕laguer les 챕tiquettes locales qui n'existent "
+"pas sur le d챕p척t distant, et forcer la mise 횪 jour des 챕tiquettes qui "
+"diff챔rent. L'챕lagage des 챕tiquettes peut 챕galement 챗tre activ챕 avec "
+"`fetch.pruneTags` ou `remote.<nom>.pruneTags` dans la configuration. Voir "
+"linkgit:git-config[1]."
#. type: Plain text
#: en/git-fetch.txt:161
#, priority:220
msgid "The `--prune-tags` option is equivalent to having `refs/tags/*:refs/tags/*` declared in the refspecs of the remote. This can lead to some seemingly strange interactions:"
msgstr ""
+"L'option `--prune-tags` est 챕quivalente 횪 avoir `refs/tags/*:refs/tags/*` "
+"d챕clar챕 dans les sp챕cificateurs de r챕f챕rence du d챕p척t distant. Cela peut "
+"conduire 횪 des interactions apparemment 챕tranges :"
#. type: delimited block -
#: en/git-fetch.txt:166
@@ -23168,24 +23433,39 @@ msgid ""
"$ git fetch --no-tags origin 'refs/tags/*:refs/tags/*'\n"
"$ git fetch --no-tags --prune-tags origin\n"
msgstr ""
+"# Ces deux ligne vont chercher les 챕tiquettes\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
#, priority:220
msgid "The reason it doesn't error out when provided without `--prune` or its config versions is for flexibility of the configured versions, and to maintain a 1=1 mapping between what the command line flags do, and what the configuration versions do."
msgstr ""
+"La raison pour laquelle il ne g챕n챔re pas d'erreur lorsqu'il est fourni sans "
+"`--prune` ou ses pendants en configuration est pour la flexibilit챕 des "
+"versions configur챕es et pour maintenir un mappage 1 = 1 entre ce que font "
+"les drapeaux de ligne de commande et ce que font les versions de "
+"configuration."
#. type: Plain text
#: en/git-fetch.txt:177
#, priority:220
msgid "It's reasonable to e.g. configure `fetch.pruneTags=true` in `~/.gitconfig` to have tags pruned whenever `git fetch --prune` is run, without making every invocation of `git fetch` without `--prune` an error."
msgstr ""
+"Il est raisonnable, par exemple de configurer `fetch.pruneTags = true` dans` "
+"~ / .gitconfig` pour que les 챕tiquettes soient 챕lagu챕es chaque fois que `git "
+"fetch --prune` est ex챕cut챕, sans que chaque appel de `git fetch` sans "
+"`--prune` soit une erreur."
#. type: Plain text
#: en/git-fetch.txt:181
#, priority:220
msgid "Pruning tags with `--prune-tags` also works when fetching a URL instead of a named remote. These will all prune tags not found on origin:"
msgstr ""
+"L'챕lagage des 챕tiquettes avec `--prune-tags` fonctionne 챕galement lors de la "
+"r챕cup챕ration d'une URL au lieu d'un d챕p척t distant nomm챕. Toutes ces lignes "
+"챕lagueront les 챕tiquettes non trouv챕es sur origin :"
#. type: delimited block -
#: en/git-fetch.txt:187
@@ -23196,36 +23476,51 @@ 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 de origin> --prune --prune-tags\n"
+"$ git fetch <url de origin> --prune 'refs/tags/*:refs/tags/*\n"
#. type: Plain text
#: en/git-fetch.txt:195
#, priority:220
msgid "The output of \"git fetch\" depends on the transport method used; this section describes the output when fetching over the Git protocol (either locally or via ssh) and Smart HTTP protocol."
msgstr ""
+"La sortie de \"git fetch\" d챕pend de la m챕thode de transport utilis챕e ; "
+"cette section d챕crit la sortie lors de la r챕cup챕ration sur le protocole Git ("
+"soit localement soit via ssh) et le protocole Smart HTTP."
#. type: Plain text
#: en/git-fetch.txt:198
#, priority:220
msgid "The status of the fetch is output in tabular form, with each line representing the status of a single ref. Each line is of the form:"
msgstr ""
+"L'챕tat de la r챕cup챕ration est affich챕 sous forme de tableau, chaque ligne "
+"repr챕sentant l'챕tat d'une seule r챕f챕rence. Chaque ligne est de la forme :"
#. type: delimited block -
#: en/git-fetch.txt:201
#, no-wrap, priority:220
msgid " <flag> <summary> <from> -> <to> [<reason>]\n"
-msgstr ""
+msgstr " <drapeau> <r챕sum챕> <de> -> <횪> [<raison>]\n"
#. type: Plain text
#: en/git-fetch.txt:205
#, priority:220
msgid "The status of up-to-date refs is shown only if the --verbose option is used."
msgstr ""
+"L'챕tat des r챕f챕rences 횪 jour n'est affich챕 que si l'option --verbose est "
+"utilis챕e."
#. type: Plain text
#: en/git-fetch.txt:210
#, priority:220
msgid "In compact output mode, specified with configuration variable fetch.output, if either entire `<from>` or `<to>` is found in the other string, it will be substituted with `*` in the other string. For example, `master -> origin/master` becomes `master -> origin/*`."
msgstr ""
+"En mode de sortie compact, sp챕cifi챕 avec la variable de configuration "
+"fetch.output, si l'un des deux `<de>` ou `<횪>` est trouv챕 dans l'autre "
+"cha챤ne, il sera substitu챕 par `*` dans l'autre cha챤ne. Par exemple, `master "
+"-> origin/master` devient `master -> origin/*`."
#. type: Labeled list
#: en/git-fetch.txt:211 en/git-push.txt:431
@@ -23237,7 +23532,7 @@ msgstr "drapeau"
#: en/git-fetch.txt:213 en/git-push.txt:433
#, priority:220
msgid "A single character indicating the status of the ref:"
-msgstr ""
+msgstr "Un seul caract챔re indiquant le statut de la r챕f챕rence :"
#. type: Labeled list
#: en/git-fetch.txt:213 en/git-push.txt:433
@@ -23249,7 +23544,7 @@ msgstr "(espace)"
#: en/git-fetch.txt:214
#, priority:220
msgid "for a successfully fetched fast-forward;"
-msgstr ""
+msgstr "pour une r챕cup챕ration en avance rapide r챕ussie ;"
#. type: Labeled list
#: en/git-fetch.txt:214 en/git-push.txt:434
@@ -23273,7 +23568,7 @@ msgstr "`-`"
#: en/git-fetch.txt:216
#, priority:220
msgid "for a successfully pruned ref;"
-msgstr ""
+msgstr "pour une ref. 챕lagu챕e avec succ챔s;"
#. type: Labeled list
#: en/git-fetch.txt:216
@@ -23297,7 +23592,7 @@ msgstr "`*`"
#: en/git-fetch.txt:218
#, priority:220
msgid "for a successfully fetched new ref;"
-msgstr ""
+msgstr "pour la r챕cup챕ration r챕ussie d'une nouvelle r챕f. ;"
#. type: Labeled list
#: en/git-fetch.txt:218 en/git-push.txt:437
@@ -23310,6 +23605,7 @@ msgstr "`!`"
#, priority:220
msgid "for a ref that was rejected or failed to update; and"
msgstr ""
+"pour une r챕f챕rence qui a 챕t챕 rejet챕e ou qui n'a pas pu 챗tre mise 횪 jour ; et"
#. type: Labeled list
#: en/git-fetch.txt:219 en/git-push.txt:438
@@ -23322,6 +23618,7 @@ msgstr "`=`"
#, priority:220
msgid "for a ref that was up to date and did not need fetching."
msgstr ""
+"pour une r챕f챕rence qui 챕tait 횪 jour et n'avait pas besoin d'챗tre r챕cup챕r챕e."
#. type: Labeled list
#: en/git-fetch.txt:221 en/git-push.txt:440
@@ -23334,30 +23631,39 @@ msgstr "r챕sum챕"
#, ignore-ellipsis, priority:220
msgid "For a successfully fetched ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
msgstr ""
+"Pour une r챕f r챕cup챕r챕e avec succ챔s, le r챕sum챕 montre les anciennes et les "
+"nouvelles valeurs de la r챕f sous une forme qui peut 챗tre utilis챕e comme "
+"argument pour `git log` (c'est `<ancien>..<nouveau>` dans la plupart des "
+"cas, et `<ancien>...<nouveau>` pour les mises 횪 jour forc챕es pas en avance "
+"rapide)."
#. type: Labeled list
#: en/git-fetch.txt:227 en/git-push.txt:468
#, no-wrap, priority:220
msgid "from"
-msgstr ""
+msgstr "de"
#. type: Plain text
#: en/git-fetch.txt:231
#, priority:220
msgid "The name of the remote ref being fetched from, minus its `refs/<type>/` prefix. In the case of deletion, the name of the remote ref is \"(none)\"."
msgstr ""
+"Le nom de la r챕f챕rence distante r챕cup챕r챕e, moins son pr챕fixe \"refs/<type>/\""
+". En cas de suppression, le nom de la r챕f챕rence distante est \"(none)\"."
#. type: Plain text
#: en/git-fetch.txt:232 en/git-push.txt:473 en/git-rebase.txt:1200
#, no-wrap, priority:220
msgid "to"
-msgstr ""
+msgstr "횪"
#. type: Plain text
#: en/git-fetch.txt:235
#, priority:220
msgid "The name of the local ref being updated, minus its `refs/<type>/` prefix."
msgstr ""
+"Le nom de la r챕f챕rence locale en cours de mise 횪 jour, moins son pr챕fixe `"
+"refs/<type>/`."
#. type: Labeled list
#: en/git-fetch.txt:236 en/git-push.txt:477
@@ -23370,6 +23676,9 @@ msgstr "raison"
#, priority:220
msgid "A human-readable explanation. In the case of successfully fetched refs, no explanation is needed. For a failed ref, the reason for failure is described."
msgstr ""
+"Une explication compr챕hensible. Dans le cas des r챕f챕rences qui ont 챕t챕 "
+"r챕cup챕r챕es avec succ챔s, aucune explication n'est n챕cessaire. Dans le cas "
+"d'une r챕f챕rence en 챕chec, la raison de l'챕chec est d챕crite."
#. type: Plain text
#: en/git-fetch.txt:245
@@ -23388,12 +23697,16 @@ msgstr "$ git fetch origin\n"
#, priority:220
msgid "The above command copies all branches from the remote refs/heads/ namespace and stores them to the local refs/remotes/origin/ namespace, unless the branch.<name>.fetch option is used to specify a non-default refspec."
msgstr ""
+"La commande ci-dessus copie toutes les branches de l'espace de nom distant "
+"refs/heads/ et les stocke dans l'espace de noms local refs/remotes/origin/, "
+"sauf si l'option branch. <nom> .fetch est utilis챕e pour sp챕cifier un "
+"sp챕cificateur de r챕f챕rence non par d챕faut."
#. type: Plain text
#: en/git-fetch.txt:256
#, priority:220
msgid "Using refspecs explicitly:"
-msgstr ""
+msgstr "En utilisant explicitement les sp챕cificateurs de r챕f챕rence :"
#. type: delimited block -
#: en/git-fetch.txt:259
@@ -23406,18 +23719,25 @@ msgstr "$ git fetch origin +pu:pu maint:tmp\n"
#, priority:220
msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively) `pu` and `maint` from the remote repository."
msgstr ""
+"Cela met 횪 jour (ou cr챕e, si n챕cessaire) les branches `pu` et `tmp` dans le "
+"d챕p척t local en r챕cup챕rant (respectivement) les branches `pu` et `maint` dans "
+"le d챕p척t distant."
#. type: Plain text
#: en/git-fetch.txt:267
#, priority:220
msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
msgstr ""
+"La branche `pu` sera mise 횪 jour m챗me si ce n'est pas en avance rapide, car "
+"elle est pr챕fix챕e par un signe plus ; `tmp` ne le sera pas."
#. type: Plain text
#: en/git-fetch.txt:270
#, priority:220
msgid "Peek at a remote's branch, without configuring the remote in your local repository:"
msgstr ""
+"Jette un coup d'흹il 횪 la branche d'un d챕p척t distant, sans configurer le "
+"distant dans votre d챕p척t local :"
#. type: delimited block -
#: en/git-fetch.txt:274
@@ -23426,18 +23746,32 @@ msgid ""
"$ git fetch git://git.kernel.org/pub/scm/git/git.git maint\n"
"$ git log FETCH_HEAD\n"
msgstr ""
+"$ git fetch git://git.kernel.org/pub/scm/git/git.git maint\n"
+"$ git log FETCH_HEAD\n"
#. type: Plain text
#: en/git-fetch.txt:281
#, priority:220
msgid "The first command fetches the `maint` branch from the repository at `git://git.kernel.org/pub/scm/git/git.git` and the second command uses `FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched objects will eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1])."
msgstr ""
+"La premi챔re commande r챕cup챔re la branche `maint` dans le d챕p척t 횪 "
+"`git://git.kernel.org/pub/scm/git/git.git` et la seconde commande utilise "
+"`FETCH_HEAD` pour examiner la branche avec linkgit:git-log[1]. Les objets "
+"r챕cup챕r챕s seront 챕ventuellement supprim챕s par le service d'entretien int챕gr챕 "
+"de git (voir linkgit:git-gc[1])."
#. type: Plain text
#: en/git-fetch.txt:292 en/git-pull.txt:256
#, priority:220
msgid "Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the just fetched commits of the superproject the submodule itself cannot be fetched, making it impossible to check out that submodule later without having to do a fetch again. This is expected to be fixed in a future Git version."
msgstr ""
+"L'utilisation de --recurse-submodules ne permet actuellement d'obtenir de "
+"nouveaux commits que dans les sous-modules d챕j횪 v챕rifi챕s . Lorsque, par "
+"exemple, un nouveau sous-module est ajout챕 dans les commit en amont qui "
+"viennent d'챗tre r챕cup챕r챕s du superprojet, le sous-module lui-m챗me ne peut "
+"pas 챗tre r챕cup챕r챕, ce qui rend impossible de v챕rifier ce sous-module plus "
+"tard sans avoir 횪 le r챕cup챕rer 횪 nouveau. Ce probl챔me devrait 챗tre corrig챕 "
+"dans une prochaine version de Git."
#. type: Title =
#: en/git-filter-branch.txt:2
@@ -28773,7 +29107,7 @@ msgstr ""
#: en/git-http-push.txt:39 en/git-push.txt:175 en/git-send-pack.txt:53
#, priority:220
msgid "Do everything except actually send the updates."
-msgstr ""
+msgstr "Fait tout sauf envoyer les mises 횪 jour."
#. type: Plain text
#: en/git-http-push.txt:43
@@ -32547,48 +32881,88 @@ msgstr "'git mergetool' [--tool=<outil>] [-y | --[no-]prompt] [<fichier>...]\n"
#, priority:240
msgid "Use `git mergetool` to run one of several merge utilities to resolve merge conflicts. It is typically run after 'git merge'."
msgstr ""
+"Utilisez `git mergetool` pour lancer l'un des nombreux utilitaires de fusion "
+"afin de r챕soudre les conflits de fusion. Il est g챕n챕ralement lanc챕 apr챔s "
+"'git merge'."
#. type: Plain text
#: en/git-mergetool.txt:24
#, priority:240
msgid "If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without conflicts). Specifying a directory will include all unresolved files in that path. If no <file> names are specified, 'git mergetool' will run the merge tool program on every file with merge conflicts."
msgstr ""
+"Si un ou plusieurs param챔tres <fichier> sont donn챕s, le programme outil de "
+"fusion sera ex챕cut챕 pour r챕soudre les diff챕rences sur chaque fichier (en "
+"sautant ceux qui n'ont pas de conflit). La sp챕cification d'un r챕pertoire "
+"inclura tous les fichiers non r챕solus dans ce chemin. Si aucun <fichier> "
+"nom n'est sp챕cifi챕, 'git mergetool' lancera le programme de fusion sur "
+"chaque fichier ayant des conflits de fusion."
#. type: Plain text
#: en/git-mergetool.txt:33
#, priority:240
msgid "Use the merge resolution program specified by <tool>. Valid values include emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge. Run `git mergetool --tool-help` for the list of valid <tool> settings."
msgstr ""
+"Utiliser le programme de r챕solution de fusion sp챕cifi챕 par <outil>. Les "
+"valeurs valides comprennent emerge, gvimdiff, kdiff3, meld, vimdiff et "
+"tortoisemerge. Lancez `git mergetool --tool-help` pour obtenir la liste des "
+"param챔tres <outil> valides."
#. type: Plain text
#: en/git-mergetool.txt:38
#, priority:240
msgid "If a merge resolution program is not specified, 'git mergetool' will use the configuration variable `merge.tool`. If the configuration variable `merge.tool` is not set, 'git mergetool' will pick a suitable default."
msgstr ""
+"Si un programme de r챕solution de fusion n'est pas sp챕cifi챕, 'git mergetool' "
+"utilisera la variable de configuration `merge.tool`. Si la variable de "
+"configuration `merge.tool` n'est pas d챕finie, 'git mergetool' choisira une "
+"valeur par d챕faut appropri챕e."
#. type: Plain text
#: en/git-mergetool.txt:44
#, priority:240
msgid "You can explicitly provide a full path to the tool by setting the configuration variable `mergetool.<tool>.path`. For example, you can configure the absolute path to kdiff3 by setting `mergetool.kdiff3.path`. Otherwise, 'git mergetool' assumes the tool is available in PATH."
msgstr ""
+"Vous pouvez explicitement fournir un chemin complet vers l'outil en "
+"d챕finissant la variable de configuration `mergetool.<outil>.path`. Par "
+"exemple, vous pouvez configurer le chemin absolu vers kdiff3 en d챕finissant "
+"`mergetool.kdiff3.path`. Sinon, 'git mergetool' suppose que l'outil est "
+"disponible dans PATH."
#. type: Plain text
#: en/git-mergetool.txt:49
#, priority:240
msgid "Instead of running one of the known merge tool programs, 'git mergetool' can be customized to run an alternative program by specifying the command line to invoke in a configuration variable `mergetool.<tool>.cmd`."
msgstr ""
+"Au lieu d'ex챕cuter un des programmes connus de l'outil de fusion, 'git "
+"mergetool' peut 챗tre personnalis챕 pour ex챕cuter un programme alternatif en "
+"sp챕cifiant la ligne de commande 횪 invoquer dans une variable de "
+"configuration `mergetool.<outil>.cmd`."
#. type: Plain text
#: en/git-mergetool.txt:60
#, priority:240
msgid "When 'git mergetool' is invoked with this tool (either through the `-t` or `--tool` option or the `merge.tool` configuration variable) the configured command line will be invoked with `$BASE` set to the name of a temporary file containing the common base for the merge, if available; `$LOCAL` set to the name of a temporary file containing the contents of the file on the current branch; `$REMOTE` set to the name of a temporary file containing the contents of the file to be merged, and `$MERGED` set to the name of the file to which the merge tool should write the result of the merge resolution."
msgstr ""
+"Lorsque 'git mergetool' est invoqu챕 avec cet outil (soit par l'option `-t` "
+"ou `--tool` ou par la variable de configuration `merge.tool`) la ligne de "
+"commande configur챕e sera invoqu챕e avec `$BASE` d챕fini au nom d'un fichier "
+"temporaire contenant la base commune pour la fusion, si disponible ; `$LOCAL`"
+" d챕fini au nom d'un fichier temporaire contenant le contenu du fichier sur "
+"la branche courante ; `$REMOTE` d챕fini au nom d'un fichier temporaire "
+"contenant le contenu du fichier 횪 fusionner, et `$MERGED` d챕fini au nom du "
+"fichier dans lequel l'outil de fusion doit 챕crire le r챕sultat de la "
+"r챕solution de la fusion."
#. type: Plain text
#: en/git-mergetool.txt:66
#, priority:240
msgid "If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable `mergetool.<tool>.trustExitCode` can be set to `true`. Otherwise, 'git mergetool' will prompt the user to indicate the success of the resolution after the custom tool has exited."
msgstr ""
+"Si l'outil de fusion personnalis챕 indique correctement le succ챔s d'une "
+"r챕solution de fusion dans son code de sortie, alors la variable de "
+"configuration `mergetool.<outil>.trustExitCode` peut 챗tre d챕finie 횪 `true`. "
+"Sinon, 'git mergetool' demandera 횪 l'utilisateur d'indiquer le succ챔s de la "
+"r챕solution apr챔s que l'outil personnalis챕 soit sorti."
#. type: Plain text
#: en/git-mergetool.txt:69
@@ -32601,12 +32975,18 @@ msgstr "Afficher une liste des outils de fusion utilisables avec `--tool`."
#, priority:240
msgid "Don't prompt before each invocation of the merge resolution program. This is the default if the merge resolution program is explicitly specified with the `--tool` option or with the `merge.tool` configuration variable."
msgstr ""
+"Ne pas demander avant chaque invocation du programme de r챕solution de "
+"fusion. C'est la valeur par d챕faut si le programme de r챕solution de fusion "
+"est explicitement sp챕cifi챕 avec l'option `--tool` ou avec la variable de "
+"configuration `merge.tool`."
#. type: Plain text
#: en/git-mergetool.txt:81
#, priority:240
msgid "Prompt before each invocation of the merge resolution program to give the user a chance to skip the path."
msgstr ""
+"Demander avant chaque invocation du programme de r챕solution de fusion pour "
+"donner 횪 l'utilisateur une chance de sauter le chemin."
#. type: Labeled list
#: en/git-mergetool.txt:83
@@ -32619,6 +32999,10 @@ msgstr "--gui"
#, priority:240
msgid "When 'git-mergetool' is invoked with the `-g` or `--gui` option the default merge tool will be read from the configured `merge.guitool` variable instead of `merge.tool`. If `merge.guitool` is not set, we will fallback to the tool configured under `merge.tool`."
msgstr ""
+"Lorsque 'git-mergetool' est invoqu챕 avec l'option `-g` ou `--gui`, l'outil "
+"de fusion par d챕faut sera lu 횪 partir de la variable `merge.guitool` "
+"configur챕e au lieu de `merge.tool`. Si `merge.guitool` n'est pas d챕fini, "
+"nous reviendrons 횪 l'outil configur챕 sous `merge.tool`."
#. type: Labeled list
#: en/git-mergetool.txt:90
@@ -32631,30 +33015,43 @@ msgstr "--no-gui"
#, priority:240
msgid "This overrides a previous `-g` or `--gui` setting and reads the default merge tool will be read from the configured `merge.tool` variable."
msgstr ""
+"Ceci prend le pas sur un r챕glage pr챕c챕dent de `-g` ou `--gui` et lit que "
+"l'outil de fusion par d챕faut 횪 partir de la variable `merge.tool` configur챕e."
#. type: Plain text
#: en/git-mergetool.txt:101
#, priority:240
msgid "Process files in the order specified in the <orderfile>, which has one shell glob pattern per line. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`."
msgstr ""
+"Traiter les fichiers dans l'ordre sp챕cifi챕 dans le <fichier d'ordre>, qui a "
+"un motif glob shell par ligne. Ceci remplace la variable de configuration "
+"`diff.orderFile` (voir linkgit:git-config[1]). Pour annuler `diff.orderFile`"
+", utilisez `-O/dev/null`."
#. type: Title -
#: en/git-mergetool.txt:103
#, no-wrap, priority:240
msgid "TEMPORARY FILES"
-msgstr ""
+msgstr "FICHIERS TEMPORAIRES"
#. type: Plain text
#: en/git-mergetool.txt:107
#, priority:240
msgid "`git mergetool` creates `*.orig` backup files while resolving merges. These are safe to remove once a file has been merged and its `git mergetool` session has completed."
msgstr ""
+"`git mergetool` cr챕e des fichiers de sauvegarde `*.orig` lors de la "
+"r챕solution des fusions. Il est possible de les supprimer en toute s챕curit챕 "
+"une fois qu'un fichier a 챕t챕 fusionn챕 et que sa session `git mergetool` est "
+"termin챕e."
#. type: Plain text
#: en/git-mergetool.txt:111
#, priority:240
msgid "Setting the `mergetool.keepBackup` configuration variable to `false` causes `git mergetool` to automatically remove the backup as files are successfully merged."
msgstr ""
+"D챕finir la variable de configuration `mergetool.keepBackup` sur` false` fait "
+"que `git mergetool` supprime automatiquement la sauvegarde lorsque les "
+"fichiers sont correctement fusionn챕s."
#. type: Title =
#: en/git-merge-tree.txt:2
@@ -32708,18 +33105,30 @@ 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 <strategie>] [-X <option-de-strategie>] [-S[<id-cl챕>]]\n"
+"\t[--[no-]allow-unrelated-histories]\n"
+"\t[--[no-]rerere-autoupdate] [-m <msg>] [-F <fichier>] [<commit>...]\n"
+"'git merge' (--continue | --abort | --quit)\n"
#. type: Plain text
#: en/git-merge.txt:25
#, priority:240
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."
#. 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 "
+"`master` :"
#. type: delimited block -
#: en/git-merge.txt:33
@@ -32729,12 +33138,20 @@ msgid ""
"\t /\n"
" D---E---F---G master\n"
msgstr ""
+"\t A---B---C theme\n"
+"\t /\n"
+" D---E---F---G master\n"
#. type: Plain text
#: en/git-merge.txt:40
#, priority:240
msgid "Then \"`git merge topic`\" will replay the changes made on the `topic` branch since it diverged from `master` (i.e., `E`) until its current commit (`C`) on top of `master`, and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes."
msgstr ""
+"Alors, \"`git merge theme`\" rejouera les modifications apport챕es 횪 la "
+"branche \"theme\" puisqu�셞lle s�셞st 챕cart챕e de `master` (c�셞st-횪-dire `E`) "
+"jusqu�쇒� son commit actuel (`C`) par dessus `master`, et enregistrera le "
+"r챕sultat dans un nouveau commit comprenant les noms des deux parents et un "
+"message de validation de l�셵tilisateur d챕crivant les modifications."
#. type: delimited block -
#: en/git-merge.txt:45
@@ -32744,12 +33161,22 @@ msgid ""
"\t / \\\n"
" D---E---F---G---H master\n"
msgstr ""
+"\t A---B---C theme\n"
+"\t / \\\n"
+" D---E---F---G---H master\n"
#. type: Plain text
#: en/git-merge.txt:54
#, priority:240
msgid "The second syntax (\"`git merge --abort`\") can only be run after the merge has resulted in conflicts. 'git merge --abort' will abort the merge process and try to reconstruct the pre-merge state. However, if there were uncommitted changes when the merge started (and especially if those changes were further modified after the merge was started), 'git merge --abort' will in some cases be unable to reconstruct the original (pre-merge) changes. Therefore:"
msgstr ""
+"La seconde syntaxe (\"`git merge --abort`\") ne peut 챗tre ex챕cut챕e qu'apr챔s "
+"que la fusion ait entra챤n챕 des conflits. 'git merge --abort' annulera le "
+"processus de fusion et tentera de reconstruire l'챕tat ant챕rieur 횪 la fusion. "
+"Cependant, s'il y a eu des changements non valid챕s au d챕but de la fusion (et "
+"surtout si ces changements ont 챕t챕 modifi챕s apr챔s le d챕but de la fusion), "
+"'git merge --abort' sera dans certains cas incapable de reconstruire les "
+"modifications originales (avant la fusion). Par cons챕quent :"
#. type: Plain text
#: en/git-merge.txt:58
@@ -32759,60 +33186,86 @@ msgid ""
"discouraged: while possible, it may leave you in a state that is hard to\n"
"back out of in the case of a conflict.\n"
msgstr ""
+"*Attention* : l'ex챕cution de 'git merge' avec des modifications non "
+"triviales non valid챕es est\n"
+"d챕courag챕e : bien que possible, elle peut vous laisser dans un 챕tat duquel "
+"il est difficile de revenir en arri챔re\n"
+"en cas de conflit.\n"
#. type: Plain text
#: en/git-merge.txt:61
#, priority:240
msgid "The third syntax (\"`git merge --continue`\") can only be run after the merge has resulted in conflicts."
msgstr ""
+"La troisi챔me syntaxe (\"`git merge --continue`\") ne peut 챗tre ex챕cut챕e "
+"qu'apr챔s que la fusion ait entra챤n챕 des conflits."
#. type: Plain text
#: en/git-merge.txt:69
#, priority:240
msgid "Set the commit message to be used for the merge commit (in case one is created)."
msgstr ""
+"D챕finir le message de commit 횪 utiliser pour le commit de fusion (dans le "
+"cas o첫 un commit est cr챕챕)."
#. type: Plain text
#: en/git-merge.txt:72 en/git-merge.txt:84
#, priority:240
msgid "If `--log` is specified, a shortlog of the commits being merged will be appended to the specified message."
msgstr ""
+"Si `--log` est sp챕cifi챕, un journal court des commits en cours de fusion "
+"sera ajout챕 au message sp챕cifi챕."
#. type: Plain text
#: en/git-merge.txt:76
#, priority:240
msgid "The 'git fmt-merge-msg' command can be used to give a good default for automated 'git merge' invocations. The automated message can include the branch description."
msgstr ""
+"La commande 'git fmt-merge-msg' peut 챗tre utilis챕e pour donner une bonne "
+"valeur par d챕faut pour les invocations automatis챕es de 'git merge'. Le "
+"message automatis챕 peut inclure la description de la branche."
#. type: Plain text
#: en/git-merge.txt:81
#, priority:240
msgid "Read the commit message to be used for the merge commit (in case one is created)."
msgstr ""
+"Lire le message de commit 횪 utiliser pour le commit de fusion (dans le cas "
+"o첫 un commit est cr챕챕)."
#. type: Plain text
#: en/git-merge.txt:94
#, priority:240
msgid "Silently overwrite ignored files from the merge result. This is the default behavior. Use `--no-overwrite-ignore` to abort."
msgstr ""
+"횋craser silencieusement les fichiers ignor챕s du r챕sultat de la fusion. C'est "
+"le comportement par d챕faut. Utilisez `--no overwrite-ignore` pour abandonner."
#. type: Plain text
#: en/git-merge.txt:98
#, priority:240
msgid "Abort the current conflict resolution process, and try to reconstruct the pre-merge state."
msgstr ""
+"Abandonner le processus actuel de r챕solution des conflits, et essayer de "
+"reconstruire l'챕tat ant챕rieur 횪 la fusion."
#. type: Plain text
#: en/git-merge.txt:103
#, priority:240
msgid "If there were uncommitted worktree changes present when the merge started, 'git merge --abort' will in some cases be unable to reconstruct these changes. It is therefore recommended to always commit or stash your changes before running 'git merge'."
msgstr ""
+"S'il y avait des modifications non valid챕es dans l'arbre de travail lorsque "
+"la fusion a commenc챕, `git merge --abort` sera dans certains cas incapable "
+"de reconstruire ces changements. Il est donc recommand챕 de toujours valider "
+"ou remiser vos modifications avant de lancer 'git merge'."
#. type: Plain text
#: en/git-merge.txt:106
#, priority:240
msgid "'git merge --abort' is equivalent to 'git reset --merge' when `MERGE_HEAD` is present."
msgstr ""
+"'git merge --abort' est 챕quivalent 횪 'git reset --merge' quand `MERGE_HEAD` "
+"est pr챕sent."
#. type: Plain text
#: en/git-merge.txt:110
@@ -32825,150 +33278,224 @@ msgstr "Oublier la fusion en cours. Laisser l'index et l'arbre de travail en l'
#, priority:240
msgid "After a 'git merge' stops due to conflicts you can conclude the merge by running 'git merge --continue' (see \"HOW TO RESOLVE CONFLICTS\" section below)."
msgstr ""
+"Apr챔s l'arr챗t d'un 'git merge' en raison de conflits, vous pouvez conclure "
+"la fusion en lan챌ant 'git merge --continue' (voir la section \"COMMENT "
+"R횋SOUDRE LES CONFLITS\" ci-dessous)."
#. type: Plain text
#: en/git-merge.txt:120
#, priority:240
msgid "Commits, usually other branch heads, to merge into our branch. Specifying more than one commit will create a merge with more than two parents (affectionately called an Octopus merge)."
msgstr ""
+"Les commits, g챕n챕ralement les sommets des autres branches, 횪 fusionner avec "
+"notre branche. En sp챕cifiant plus d'un commit, on cr챕e une fusion avec plus "
+"de deux parents (affectueusement appel챕e fusion Octopus)."
#. type: Plain text
#: en/git-merge.txt:124
#, priority:240
msgid "If no commit is given from the command line, merge the remote-tracking branches that the current branch is configured to use as its upstream. See also the configuration section of this manual page."
msgstr ""
+"Si aucun commit n'est donn챕 sur la ligne de commande, fusionner les branches "
+"de suivi 횪 distance que la branche actuelle est configur챕e pour utiliser "
+"comme sa branche amont. Voir aussi la section configuration de cette page "
+"de manuel."
#. type: Plain text
#: en/git-merge.txt:128
#, priority:240
msgid "When `FETCH_HEAD` (and no other commit) is specified, the branches recorded in the `.git/FETCH_HEAD` file by the previous invocation of `git fetch` for merging are merged to the current branch."
msgstr ""
+"Lorsque `FETCH_HEAD` (et aucun autre commit) est sp챕cifi챕, les branches "
+"enregistr챕es dans le fichier `.git/FETCH_HEAD` par l'invocation pr챕c챕dente "
+"de `git fetch` pour la fusion sont fusionn챕es 횪 la branche courante."
#. type: Title -
#: en/git-merge.txt:131
#, no-wrap, priority:240
msgid "PRE-MERGE CHECKS"
-msgstr ""
+msgstr "V횋RIFICATIONS AVANT LA FUSION"
#. type: Plain text
#: en/git-merge.txt:139
#, priority:240
msgid "Before applying outside changes, you should get your own work in good shape and committed locally, so it will not be clobbered if there are conflicts. See also linkgit:git-stash[1]. 'git pull' and 'git merge' will stop without doing anything when local uncommitted changes overlap with files that 'git pull'/'git merge' may need to update."
msgstr ""
+"Avant d'appliquer des modifications ext챕rieures, vous devez faire en sorte "
+"que votre propre travail soit en bon 챕tat et valid챕 localement, afin qu'il "
+"ne soit pas 챕cras챕 en cas de conflits. Voir aussi linkgit:git-stash[1]. "
+"'git pull' et 'git merge' s'arr챗teront sans rien faire lorsque des "
+"modifications locales non valid챕es chevaucheront des fichiers que 'git pull'/"
+"'git merge' devront mettre 횪 jour."
#. type: Plain text
#: en/git-merge.txt:145
#, priority:240
msgid "To avoid recording unrelated changes in the merge commit, 'git pull' and 'git merge' will also abort if there are any changes registered in the index relative to the `HEAD` commit. (Special narrow exceptions to this rule may exist depending on which merge strategy is in use, but generally, the index must match HEAD.)"
msgstr ""
+"Pour 챕viter d'enregistrer des modifications sans rapport dans le commit de "
+"fusion, 'git pull' et 'git merge' seront 챕galement annul챕s s'il y a des "
+"modifications enregistr챕es dans l'index par rapport au commit `HEAD`. (Des "
+"exceptions rares 횪 cette r챔gle peuvent exister selon la strat챕gie de fusion "
+"utilis챕e, mais en g챕n챕ral, l'index doit correspondre 횪 HEAD)."
#. type: Plain text
#: en/git-merge.txt:148
#, priority:240
msgid "If all named commits are already ancestors of `HEAD`, 'git merge' will exit early with the message \"Already up to date.\""
msgstr ""
+"Si tous les commit nomm챕s sont d챕j횪 des anc챗tres de `HEAD`, 'git merge' "
+"sortira plus t척t avec le message 짬혻D챕j횪 횪 jour 쨩."
#. type: Title -
#: en/git-merge.txt:150
#, no-wrap, priority:240
msgid "FAST-FORWARD MERGE"
-msgstr ""
+msgstr "FUSION EN AVANCE RAPIDE"
#. type: Plain text
#: en/git-merge.txt:160
#, priority:240
msgid "Often the current branch head is an ancestor of the named commit. This is the most common case especially when invoked from 'git pull': you are tracking an upstream repository, you have committed no local changes, and now you want to update to a newer upstream revision. In this case, a new commit is not needed to store the combined history; instead, the `HEAD` (along with the index) is updated to point at the named commit, without creating an extra merge commit."
msgstr ""
+"Souvent, le sommet de la branche actuelle est un anc챗tre du commit nomm챕. "
+"C'est le cas le plus courant, surtout lorsqu'il est invoqu챕 depuis 'git "
+"pull' : vous suivez un d챕p척t amont, vous n'avez pas valid챕 de modifications "
+"locales, et vous voulez maintenant mettre 횪 jour vers une r챕vision amont "
+"plus r챕cente. Dans ce cas, un nouveau commit n'est pas n챕cessaire pour "
+"stocker l'historique combin챕 ; 횪 la place, la `HEAD` (avec l'index) est mise "
+"횪 jour pour pointer vers le commit nomm챕, sans cr챕er un commit de fusion "
+"suppl챕mentaire."
#. type: Plain text
#: en/git-merge.txt:162
#, priority:240
msgid "This behavior can be suppressed with the `--no-ff` option."
-msgstr ""
+msgstr "Ce comportement peut 챗tre supprim챕 avec l'option `--no-off`."
#. type: Title -
#: en/git-merge.txt:164
#, no-wrap, priority:240
msgid "TRUE MERGE"
-msgstr ""
+msgstr "V횋RITABLE FUSION"
#. type: Plain text
#: en/git-merge.txt:169
#, priority:240
msgid "Except in a fast-forward merge (see above), the branches to be merged must be tied together by a merge commit that has both of them as its parents."
msgstr ""
+"Sauf dans le cas d'une fusion en avance rapide (voir ci-dessus), les "
+"branches 횪 fusionner doivent 챗tre li챕es par un commit de fusion qui a pour "
+"parents les deux branches."
#. type: Plain text
#: en/git-merge.txt:174
#, priority:240
msgid "A merged version reconciling the changes from all branches to be merged is committed, and your `HEAD`, index, and working tree are updated to it. It is possible to have modifications in the working tree as long as they do not overlap; the update will preserve them."
msgstr ""
+"Une version fusionn챕e r챕conciliant les changements de toutes les branches 횪 "
+"fusionner est valid챕es, et votre `HEAD`, votre index et votre arbre de "
+"travail sont mis 횪 jour en cons챕quence. Il est possible d'avoir des "
+"modifications dans l'arbre de travail tant qu'elles ne se chevauchent pas ; "
+"la mise 횪 jour les pr챕servera."
#. type: Plain text
#: en/git-merge.txt:177
#, priority:240
msgid "When it is not obvious how to reconcile the changes, the following happens:"
msgstr ""
+"Lorsqu'il n'est pas 챕vident de r챕concilier les modifications, voici ce qui "
+"se passe :"
#. type: Plain text
#: en/git-merge.txt:179
#, priority:240
msgid "The `HEAD` pointer stays the same."
-msgstr ""
+msgstr "Le pointeur `HEAD` reste le m챗me."
#. type: Plain text
#: en/git-merge.txt:180
#, priority:240
msgid "The `MERGE_HEAD` ref is set to point to the other branch head."
msgstr ""
+"La r챕f챕rence `MERGE_HEAD` est d챕finie pour pointer vers l'autre t챗te de "
+"branche."
#. type: Plain text
#: en/git-merge.txt:182
#, priority:240
msgid "Paths that merged cleanly are updated both in the index file and in your working tree."
msgstr ""
+"Les chemins qui ont 챕t챕 fusionn챕s proprement sont mis 횪 jour 횪 la fois dans "
+"le fichier d'index et dans votre arbre de travail."
#. type: Plain text
#: en/git-merge.txt:188
#, priority:240
msgid "For conflicting paths, the index file records up to three versions: stage 1 stores the version from the common ancestor, stage 2 from `HEAD`, and stage 3 from `MERGE_HEAD` (you can inspect the stages with `git ls-files -u`). The working tree files contain the result of the \"merge\" program; i.e. 3-way merge results with familiar conflict markers `<<<` `===` `>>>`."
msgstr ""
+"En cas de conflit de chemins, le fichier d'index enregistre jusqu'횪 trois "
+"versions : l'챕tape 1 stocke la version de l'anc챗tre commun, l'챕tape 2 de "
+"`HEAD`, et l'챕tape 3 de `MERGE_HEAD` (vous pouvez inspecter les 챕tapes avec `"
+"git ls-files -u`). Les fichiers de l'arbre de travail contiennent le "
+"r챕sultat du programme \"merge\", c'est-횪-dire les r챕sultats de la fusion 횪 3 "
+"points avec les marqueurs de conflit familiers `<<<` `===` `>>>`."
#. type: Plain text
#: en/git-merge.txt:192
#, priority:240
msgid "No other changes are made. In particular, the local modifications you had before you started merge will stay the same and the index entries for them stay as they were, i.e. matching `HEAD`."
msgstr ""
+"Aucune autre modification n'est apport챕e. En particulier, les modifications "
+"locales que vous aviez avant de commencer la fusion resteront les m챗mes et "
+"les entr챕es de l'index qui les concernent resteront telles quelles, c'est-횪-"
+"dire correspondant 횪 `HEAD`."
#. type: Plain text
#: en/git-merge.txt:195
#, priority:240
msgid "If you tried a merge which resulted in complex conflicts and want to start over, you can recover with `git merge --abort`."
msgstr ""
+"Si vous avez essay챕 une fusion qui a donn챕 lieu 횪 des conflits complexes et "
+"que vous voulez recommencer, vous pouvez vous remettre 횪 z챕ro avec `git "
+"merge --abort`."
#. type: Title -
#: en/git-merge.txt:197
#, no-wrap, priority:240
msgid "MERGING TAG"
-msgstr ""
+msgstr "LA FUSION D'횋TIQUETTE"
#. type: Plain text
#: en/git-merge.txt:204
#, priority:240
msgid "When merging an annotated (and possibly signed) tag, Git always creates a merge commit even if a fast-forward merge is possible, and the commit message template is prepared with the tag message. Additionally, if the tag is signed, the signature check is reported as a comment in the message template. See also linkgit:git-tag[1]."
msgstr ""
+"Lors de la fusion d'une 챕tiquette annot챕e (et 챕ventuellement sign챕e), Git "
+"cr챕e toujours un commit de fusion m챗me si une fusion en avance rapide est "
+"possible, et le mod챔le de message de validation est pr챕par챕 avec le message "
+"de l'챕tiquette. De plus, si l'챕tiquette est sign챕e, la v챕rification de la "
+"signature est signal챕e sous forme de commentaire dans le mod챔le de message. "
+"Voir aussi linkgit:git-tag[1]."
#. type: Plain text
#: en/git-merge.txt:208
#, priority:240
msgid "When you want to just integrate with the work leading to the commit that happens to be tagged, e.g. synchronizing with an upstream release point, you may not want to make an unnecessary merge commit."
msgstr ""
+"Lorsque vous souhaitez simplement int챕grer le travail menant au commit qui "
+"se trouve 챗tre 챕tiquet챕, par exemple lors de la synchronisation avec un "
+"point de publication en amont, vous ne voudrez peut-챗tre pas faire un commit "
+"de fusion inutile."
#. type: Plain text
#: en/git-merge.txt:212
#, priority:240
msgid "In such a case, you can \"unwrap\" the tag yourself before feeding it to `git merge`, or pass `--ff-only` when you do not have any work on your own. e.g."
msgstr ""
+"Dans ce cas, vous pouvez \"d챕baller\" l'챕tiquette vous-m챗me avant de la "
+"donner 횪 `git merge`, ou passer `--ff only` lorsque vous n'avez pas de "
+"travail 횪 faire vous-m챗me par exemple"
#. type: delimited block -
#: en/git-merge.txt:217
@@ -32978,24 +33505,39 @@ 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
#, no-wrap, priority:240
msgid "HOW CONFLICTS ARE PRESENTED"
-msgstr ""
+msgstr "COMMENT LES CONFLITS SONT PR횋SENT횋S"
#. type: Plain text
#: en/git-merge.txt:230
#, priority:240
msgid "During a merge, the working tree files are updated to reflect the result of the merge. Among the changes made to the common ancestor's version, non-overlapping ones (that is, you changed an area of the file while the other side left that area intact, or vice versa) are incorporated in the final result verbatim. When both sides made changes to the same area, however, Git cannot randomly pick one side over the other, and asks you to resolve it by leaving what both sides did to that area."
msgstr ""
+"Lors d'une fusion, les fichiers de l'arbre de travail sont mis 횪 jour pour "
+"refl챕ter le r챕sultat de la fusion. Parmi les modifications apport챕es 횪 la "
+"version de l'anc챗tre commun, celles qui ne se chevauchent pas (c'est-횪-dire "
+"que vous avez modifi챕 une zone du fichier alors que l'autre c척t챕 a laiss챕 "
+"cette zone intacte, ou vice versa) sont incorpor챕es directement dans le "
+"r챕sultat final. Cependant, lorsque les deux c척t챕s ont apport챕 des "
+"modifications 횪 la m챗me zone, Git ne peut pas choisir au hasard un c척t챕 par "
+"rapport 횪 l'autre, et vous demande de r챕soudre le probl챔me en laissant ce "
+"que les deux c척t챕s ont fait 횪 cette zone."
#. type: Plain text
#: en/git-merge.txt:233
#, priority:240
msgid "By default, Git uses the same style as the one used by the \"merge\" program from the RCS suite to present such a conflicted hunk, like this:"
msgstr ""
+"Par d챕faut, Git utilise le m챗me style que celui utilis챕 par le programme \""
+"merge\" de la suite RCS pour pr챕senter une telle section conflictuelle, "
+"comme ceci :"
#. type: delimited block -
#: en/git-merge.txt:244
@@ -33011,24 +33553,46 @@ msgid ""
">>>>>>> theirs:sample.txt\n"
"And here is another line that is cleanly resolved or unmodified.\n"
msgstr ""
+"Voici des lignes qui sont soit inchang챕es par rapport 횪 l'anc챗tre\n"
+"commun, ou r챕solues proprement car un seul c척t챕 a chang챕.\n"
+"<<<<<<< yours��: exemple.txt\n"
+"La r챕solution des conflits est difficile��;\n"
+"allons faire du shopping.\n"
+"=======\n"
+"Git facilite la r챕solution des conflits.\n"
+">>>>>>> theirs��: exemple.txt\n"
+"Et voici une autre ligne qui est r챕solue proprement ou non modifi챕e.\n"
#. type: Plain text
#: en/git-merge.txt:249
#, priority:240
msgid "The area where a pair of conflicting changes happened is marked with markers `<<<<<<<`, `=======`, and `>>>>>>>`. The part before the `=======` is typically your side, and the part afterwards is typically their side."
msgstr ""
+"La zone o첫 une paire de modifications contradictoires s'est produite est "
+"marqu챕e par les marqueurs `<<<<<<<`, `========`, et `>>>>>>>>>>``. La "
+"partie qui pr챕c챔de le `=======` est g챕n챕ralement votre c척t챕, et la partie "
+"qui suit est g챕n챕ralement leur c척t챕."
#. type: Plain text
#: en/git-merge.txt:255
#, priority:240
msgid "The default format does not show what the original said in the conflicting area. You cannot tell how many lines are deleted and replaced with Barbie's remark on your side. The only thing you can tell is that your side wants to say it is hard and you'd prefer to go shopping, while the other side wants to claim it is easy."
msgstr ""
+"Le format par d챕faut ne montre pas ce que l'original a dit dans la zone de "
+"conflit. Vous ne pouvez pas savoir combien de lignes sont supprim챕es et "
+"remplac챕es par la remarque de Barbie 횪 votre c척t챕. La seule chose que vous "
+"pouvez dire, c'est que votre c척t챕 veut dire que c'est difficile et que vous "
+"pr챕f챕rez faire du shopping, alors que l'autre c척t챕 veut pr챕tendre que c'est "
+"facile."
#. type: Plain text
#: en/git-merge.txt:259
#, priority:240
msgid "An alternative style can be used by setting the \"merge.conflictStyle\" configuration variable to \"diff3\". In \"diff3\" style, the above conflict may look like this:"
msgstr ""
+"Un autre style peut 챗tre utilis챕 en r챕glant la variable de configuration \""
+"merge.conflictStyle\" sur \"diff3\". Dans le style \"diff3\", le conflit ci-"
+"dessus peut ressembler 횪 ceci :"
#. type: delimited block -
#: en/git-merge.txt:272
@@ -33046,96 +33610,139 @@ msgid ""
">>>>>>> theirs:sample.txt\n"
"And here is another line that is cleanly resolved or unmodified.\n"
msgstr ""
+"Voici les lignes qui sont soit inchang챕es par rapport 횪 l'anc챗tre\n"
+"commun, ou proprement r챕solu parce qu'un seul c척t챕 a chang챕.\n"
+"<<<<<<<< yours:exemple.txt\n"
+"La r챕solution des conflits est difficile ;\n"
+"Allons faire du shopping.\n"
+"|||||||\n"
+"La r챕solution des conflits est difficile.\n"
+"=======\n"
+"Git facilite la r챕solution des conflits.\n"
+">>>>>>> theirs:exemple.txt\n"
+"Et voici une autre ligne qui est proprement r챕solue ou non modifi챕e.\n"
#. type: Plain text
#: en/git-merge.txt:280
#, priority:240
msgid "In addition to the `<<<<<<<`, `=======`, and `>>>>>>>` markers, it uses another `|||||||` marker that is followed by the original text. You can tell that the original just stated a fact, and your side simply gave in to that statement and gave up, while the other side tried to have a more positive attitude. You can sometimes come up with a better resolution by viewing the original."
msgstr ""
+"En plus des marqueurs `<<<<<<<<`, `=======`, et `>>>>>>>>>>>, il utilise un "
+"autre marqueur `||||||||` qui est suivi par le texte original. Vous pouvez "
+"voir que l'original ne faisait qu'챕noncer un fait, et que votre camp a "
+"simplement c챕d챕 횪 cette d챕claration et a abandonn챕, tandis que l'autre camp "
+"a essay챕 d'avoir une attitude plus positive. Vous pouvez parfois aboutir 횪 "
+"une meilleure r챕solution en regardant l'original."
#. type: Title -
#: en/git-merge.txt:283
#, no-wrap, priority:240
msgid "HOW TO RESOLVE CONFLICTS"
-msgstr ""
+msgstr "COMMENT R횋SOUDRE LES CONFLITS"
#. type: Plain text
#: en/git-merge.txt:286
#, priority:240
msgid "After seeing a conflict, you can do two things:"
-msgstr ""
+msgstr "Apr챔s avoir vu un conflit, vous pouvez faire deux choses��:"
#. type: Plain text
#: en/git-merge.txt:291
#, priority:240
msgid "Decide not to merge. The only clean-ups you need are to reset the index file to the `HEAD` commit to reverse 2. and to clean up working tree changes made by 2. and 3.; `git merge --abort` can be used for this."
msgstr ""
+"D챕cider de ne pas fusionner. Les seuls nettoyages dont vous avez besoin "
+"sont de r챕initialiser le fichier index au commit `HEAD` 횪 inverser 2. et "
+"pour nettoyer les modification d�셙rbre de travail effectu챕es par 2. et 3.혻��; "
+"`git merge --abort` peut 챗tre utilis챕 pour cela."
#. type: Plain text
#: en/git-merge.txt:298
#, priority:240
msgid "Resolve the conflicts. Git will mark the conflicts in the working tree. Edit the files into shape and 'git add' them to the index. Use 'git commit' or 'git merge --continue' to seal the deal. The latter command checks whether there is a (interrupted) merge in progress before calling 'git commit'."
msgstr ""
+"R챕soudre les conflits. Git marquera les conflits dans l�셙rbre de travail. "
+"Modifier les fichiers en forme et les 짬git add쨩 횪 l�셢ndex. Utiliser 'git "
+"commit' ou 'git merge --continue' pour sceller l�셙ffaire. Cette derni챔re "
+"commande v챕rifie s�셢l y a une fusion (interrompue) en cours avant d�셙ppeler "
+"'git commit'."
#. type: Plain text
#: en/git-merge.txt:300
#, priority:240
msgid "You can work through the conflict with a number of tools:"
-msgstr ""
+msgstr "Vous pouvez r챕soudre le conflit 횪 l'aide d'un certain nombre d'outils :"
#. type: Plain text
#: en/git-merge.txt:303
#, priority:240
msgid "Use a mergetool. `git mergetool` to launch a graphical mergetool which will work you through the merge."
msgstr ""
+"Utiliser un mergetool. `git mergetool` pour lancer un outil de fusion "
+"graphique qui vous permettra de travailler sur la fusion."
#. type: Plain text
#: en/git-merge.txt:307
#, priority:240
msgid "Look at the diffs. `git diff` will show a three-way diff, highlighting changes from both the `HEAD` and `MERGE_HEAD` versions."
msgstr ""
+"Regarder les diff챕rences. ` git diff` affichera une diff챕rence 횪 trois "
+"points, en mettant en 챕vidence les modifications apport챕es par les versions "
+"`HEAD` et `MERGE_HEAD`."
#. type: Plain text
#: en/git-merge.txt:311
#, priority:240
msgid "Look at the diffs from each branch. `git log --merge -p <path>` will show diffs first for the `HEAD` version and then the `MERGE_HEAD` version."
msgstr ""
+"Regarder les diff챕rences de chaque branche. `git log --merge -p <chemin>` "
+"montrera les diff챕rences d'abord pour la version `HEAD` et ensuite pour la "
+"version `MERGE_HEAD`."
#. type: Plain text
#: en/git-merge.txt:316
#, priority:240
msgid "Look at the originals. `git show :1:filename` shows the common ancestor, `git show :2:filename` shows the `HEAD` version, and `git show :3:filename` shows the `MERGE_HEAD` version."
msgstr ""
+"Regarder les originaux. `git show :1:nom-de-fichier` montre l'anc챗tre "
+"commun, `git show :2:nom-de-fichier` montre la version `HEAD`, et `git show "
+":3:nom-de-fichier` montre la version `MERGE_HEAD`."
#. type: Plain text
#: en/git-merge.txt:323
#, priority:240
msgid "Merge branches `fixes` and `enhancements` on top of the current branch, making an octopus merge:"
msgstr ""
+"Fusionner les branches `corrections` et \"am챕liorations` par dessus la "
+"branche actuelle, en faisant une fusion octopus :"
#. type: delimited block -
#: en/git-merge.txt:326
#, no-wrap, priority:240
msgid "$ git merge fixes enhancements\n"
-msgstr ""
+msgstr "$ git merge corrections am챕liorations\n"
#. type: Plain text
#: en/git-merge.txt:330
#, priority:240
msgid "Merge branch `obsolete` into the current branch, using `ours` merge strategy:"
msgstr ""
+"Fusionner la branche `obsol챔te` dans la branche actuelle, en utilisant la "
+"strat챕gie de fusion `ours` :"
#. type: delimited block -
#: en/git-merge.txt:333
#, no-wrap, priority:240
msgid "$ git merge -s ours obsolete\n"
-msgstr ""
+msgstr "$ git merge -s ours obsol챔te\n"
#. type: Plain text
#: en/git-merge.txt:337
#, priority:240
msgid "Merge branch `maint` into the current branch, but do not make a new commit automatically:"
msgstr ""
+"Fusionner la branche `maint` dans la branche actuelle, mais ne pas faire un "
+"nouveau commit automatiquement :"
#. type: delimited block -
#: en/git-merge.txt:340
@@ -33148,24 +33755,35 @@ msgstr "$ git merge --no-commit maint\n"
#, priority:240
msgid "This can be used when you want to include further changes to the merge, or want to write your own merge commit message."
msgstr ""
+"Ceci peut 챗tre utilis챕 lorsque vous souhaitez inclure d'autres modifications "
+"횪 la fusion ou lorsque vous souhaitez r챕diger votre propre message de "
+"validation de la fusion."
#. type: Plain text
#: en/git-merge.txt:348
#, priority:240
msgid "You should refrain from abusing this option to sneak substantial changes into a merge commit. Small fixups like bumping release/version name would be acceptable."
msgstr ""
+"Vous devriez vous abstenir d'abuser de cette possibilit챕 pour introduire en "
+"douce des modifications substantielles dans un commit de fusion. De petites "
+"corrections comme le remplacement du nom de la version ou de la livraison "
+"seraient acceptables."
#. type: Labeled list
#: en/git-merge.txt:356
#, no-wrap, priority:240
msgid "branch.<name>.mergeOptions"
-msgstr ""
+msgstr "branch.<nom>.mergeOptions"
#. type: Plain text
#: en/git-merge.txt:360
#, priority:240
msgid "Sets default options for merging into branch <name>. The syntax and supported options are the same as those of 'git merge', but option values containing whitespace characters are currently not supported."
msgstr ""
+"D챕finir les options par d챕faut pour la fusion dans la branche <nom>. La "
+"syntaxe et les options prises en charge sont les m챗mes que celles de 'git "
+"merge', mais les valeurs d'options contenant des espaces ne sont "
+"actuellement pas prises en charge."
#. type: Plain text
#: en/git-merge.txt:369
@@ -33789,7 +34407,7 @@ msgstr ""
#: en/git-notes.txt:183 en/git-rebase.txt:328 en/merge-options.txt:116
#, no-wrap, priority:240
msgid "-s <strategy>"
-msgstr ""
+msgstr "-s <strat챕gie>"
#. type: Plain text
#: en/git-notes.txt:191
@@ -36428,7 +37046,7 @@ msgstr "Afficher l'avancement."
#: en/git-prune.txt:48 en/git-worktree.txt:192
#, no-wrap, priority:240
msgid "--expire <time>"
-msgstr ""
+msgstr "--expire <date>"
#. type: Plain text
#: en/git-prune.txt:50
@@ -36501,24 +37119,40 @@ msgstr "'git pull' [<options>] [<d챕p척t> [<sp챕cification-de-r챕f챕rence>...]]\
#, priority:220
msgid "Incorporates changes from a remote repository into the current branch. In its default mode, `git pull` is shorthand for `git fetch` followed by `git merge FETCH_HEAD`."
msgstr ""
+"Int챔gre les modifications d'un d챕p척t distant dans la branche actuelle. Dans "
+"son mode par d챕faut, `git pull` est l'abr챕viation de `git fetch` suivi de `"
+"git merge FETCH_HEAD`."
#. type: Plain text
#: en/git-pull.txt:26
#, priority:220
msgid "More precisely, 'git pull' runs 'git fetch' with the given parameters and calls 'git merge' to merge the retrieved branch heads into the current branch. With `--rebase`, it runs 'git rebase' instead of 'git merge'."
msgstr ""
+"Plus pr챕cis챕ment, 'git pull' lance 'git fetch' avec les param챔tres donn챕s et "
+"appelle 'git merge' pour fusionner les t챗tes de branche r챕cup챕r챕es dans la "
+"branche courante. Avec `--rebase`, il lance 'git rebase' au lieu de 'git "
+"merge'."
#. type: Plain text
#: en/git-pull.txt:33
#, priority:220
msgid "<repository> should be the name of a remote repository as passed to linkgit:git-fetch[1]. <refspec> can name an arbitrary remote ref (for example, the name of a tag) or even a collection of refs with corresponding remote-tracking branches (e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}), but usually it is the name of a branch in the remote repository."
msgstr ""
+"<d챕p척t> doit 챗tre le nom d'un d챕p척t distant tel que pass챕 횪 linkgit:git-"
+"fetch[1]. <sp챕c-de-r챕f> peut nommer une r챕f distante arbitraire (par "
+"exemple, le nom d'une 챕tiquette) ou m챗me une collection de r챕fs avec les "
+"branches de suivi 횪 distance correspondantes (par exemple, refs/heads/"
+"{asterisk}:refs/remotes/origin/{asterisk}), mais c'est g챕n챕ralement le nom "
+"d'une branche du d챕p척t distant."
#. type: Plain text
#: en/git-pull.txt:37
#, priority:220
msgid "Default values for <repository> and <branch> are read from the \"remote\" and \"merge\" configuration for the current branch as set by linkgit:git-branch[1] `--track`."
msgstr ""
+"Les valeurs par d챕faut pour <d챕p척t> et <branche> sont lues 횪 partir de la "
+"configuration \"remote\" et \"merge\" pour la branche actuelle comme d챕fini "
+"par linkgit:git-branch[1] `--track`."
#. type: delimited block -
#: en/git-pull.txt:47
@@ -36530,12 +37164,22 @@ msgid ""
"\t^\n"
"\torigin/master in your repository\n"
msgstr ""
+"\t A---B---C master sur origin\n"
+"\t /\n"
+" D---E---F---G master\n"
+"\t^\n"
+"\torigin/master dans votre d챕p척t\n"
#. type: Plain text
#: en/git-pull.txt:54
#, priority:220
msgid "Then \"`git pull`\" will fetch and replay the changes from the remote `master` branch since it diverged from the local `master` (i.e., `E`) until its current commit (`C`) on top of `master` and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes."
msgstr ""
+"Ensuite, \"`git pull`\" r챕cup챔re et rejoue les modifications de la branche "
+"`master` distante, puisqu'elle a diverg챕 du `master` local (c'est-횪-dire `E`)"
+" jusqu'횪 son commit actuel (`C`) en plus de `master` et enregistre le "
+"r챕sultat dans un nouveau commit avec les noms des deux commits parents et un "
+"message de journal de l'utilisateur d챕crivant les modifications."
#. type: delimited block -
#: en/git-pull.txt:59
@@ -36545,60 +37189,85 @@ 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
#, priority:220
msgid "See linkgit:git-merge[1] for details, including how conflicts are presented and handled."
msgstr ""
+"Voir linkgit:git-merge[1] pour plus de d챕tails, notamment sur la mani챔re "
+"dont les conflits sont pr챕sent챕s et trait챕s."
#. type: Plain text
#: en/git-pull.txt:68
#, priority:220
msgid "In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset --merge`. *Warning*: In older versions of Git, running 'git pull' with uncommitted changes is discouraged: while possible, it leaves you in a state that may be hard to back out of in the case of a conflict."
msgstr ""
+"Dans Git 1.7.0 ou une version ult챕rieure, pour annuler une fusion "
+"conflictuelle, utilisez `git reset --merge`. *Avertissement* : dans les "
+"anciennes versions de Git, il est d챕conseill챕 d'ex챕cuter 'git pull' avec des "
+"modifications non valid챕es : bien que cela soit possible, cela vous laisse "
+"dans un 챕tat dont il peut 챗tre difficile de se d챕faire en cas de conflit."
#. type: Plain text
#: en/git-pull.txt:73
#, priority:220
msgid "If any of the remote changes overlap with local uncommitted changes, the merge will be automatically canceled and the work tree untouched. It is generally best to get any local changes in working order before pulling or stash them away with linkgit:git-stash[1]."
msgstr ""
+"Si l'une des modifications sur le distant chevauche des modifications "
+"locales non valid챕es, la fusion sera automatiquement annul챕e et l'arbre de "
+"travail sera conserv챕. Il est g챕n챕ralement pr챕f챕rable de mettre les "
+"modifications locales en ordre de marche ou de les remiser avec linkgit:git-"
+"stash[1] avant de tirer."
#. type: Plain text
#: en/git-pull.txt:82
#, priority:220
msgid "This is passed to both underlying git-fetch to squelch reporting of during transfer, and underlying git-merge to squelch output during merging."
msgstr ""
+"Ceci est transmis 횪 la fois au git-fetch sous-jacent pour 챕liminer les "
+"rapports lors du transfert et au git-merge sous-jacent pour 챕liminer les "
+"rapports lors de la fusion."
#. type: Plain text
#: en/git-pull.txt:86
#, priority:220
msgid "Pass --verbose to git-fetch and git-merge."
-msgstr ""
+msgstr "Passer --verbose 횪 git-fetch et git-merge."
#. type: Labeled list
#: en/git-pull.txt:87
#, no-wrap, priority:220
msgid "--[no-]recurse-submodules[=yes|on-demand|no]"
-msgstr ""
+msgstr "--[no-]recurse-submodules[=yes|on-demand|no]"
#. type: Plain text
#: en/git-pull.txt:91
#, priority:220
msgid "This option controls if new commits of all populated submodules should be fetched and updated, too (see linkgit:git-config[1] and linkgit:gitmodules[5])."
msgstr ""
+"Cette option contr척le si les nouveaux commits de tous les sous-modules "
+"peupl챕s doivent 챗tre r챕cup챕r챕s et mis 횪 jour 챕galement (voir linkgit:git-"
+"config[1] et linkgit:gitmodules[5])."
#. type: Plain text
#: en/git-pull.txt:93
#, priority:220
msgid "If the checkout is done via rebase, local submodule commits are rebased as well."
msgstr ""
+"Si l'extraction est effectu챕e via un rebasage, les commits des sous-module "
+"locaux sont 챕galement rebas챕s."
#. type: Plain text
#: en/git-pull.txt:95
#, priority:220
msgid "If the update is done via merge, the submodule conflicts are resolved and checked out."
msgstr ""
+"Si la mise 횪 jour est effectu챕e par fusion, les conflits de sous-module sont "
+"r챕solus et extraits."
#. type: Title ~
#: en/git-pull.txt:97
@@ -36610,49 +37279,70 @@ msgstr "Options relatives 횪 la fusion"
#: en/git-pull.txt:104
#, no-wrap, priority:220
msgid "--rebase[=false|true|merges|preserve|interactive]"
-msgstr ""
+msgstr "--rebase[=false|true|merges|preserve|interactive]"
#. type: Plain text
#: en/git-pull.txt:110
#, priority:220
msgid "When true, rebase the current branch on top of the upstream branch after fetching. If there is a remote-tracking branch corresponding to the upstream branch and the upstream branch was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes."
msgstr ""
+"Lorsque c'est le cas, rebaser la branche actuelle sur la branche amont apr챔s "
+"l'avoir r챕cup챕r챕e. S'il existe une branche de suivi 횪 distance correspondant "
+"횪 la branche en amont et que la branche en amont a 챕t챕 rebas챕e depuis la "
+"derni챔re extraction, le rebasage utilise cette information pour 챕viter de "
+"rebaser des modifications non locales."
#. type: Plain text
#: en/git-pull.txt:114
#, priority:220
msgid "When set to `merges`, rebase using `git rebase --rebase-merges` so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details)."
msgstr ""
+"Lorsqu'il est d챕fini sur `merges`, rebaser en utilisant `git rebase --rebase-"
+"merges` de sorte que les commits de fusion locaux soient inclus dans le "
+"rebasage (voir linkgit:git-rebase[1] pour plus de d챕tails)."
#. type: Plain text
#: en/git-pull.txt:118
#, priority:220
msgid "When set to `preserve` (deprecated in favor of `merges`), rebase with the `--preserve-merges` option passed to `git rebase` so that locally created merge commits will not be flattened."
msgstr ""
+"Lorsqu'il est d챕fini sur `preserve` (d챕conseill챕 en faveur de `merges`), "
+"rebaser avec l'option `--preserve-merges` pass챕e 횪 `git rebase` afin que les "
+"commits de fusion cr챕챕s localement ne soient pas aplaties."
#. type: Plain text
#: en/git-pull.txt:120
#, priority:220
msgid "When false, merge the current branch into the upstream branch."
msgstr ""
+"Lorsqu'elle est fausse, fusionner la branche actuelle dans la branche amont."
#. type: Plain text
#: en/git-pull.txt:122
#, priority:220
msgid "When `interactive`, enable the interactive mode of rebase."
msgstr ""
+"Lorsque vous 챗tes en mode `interactive`, activer le mode interactif de "
+"rebase."
#. type: Plain text
#: en/git-pull.txt:126
#, priority:220
msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
msgstr ""
+"Voir `pull.rebase`, `branch. <nom> .rebase` et `branch.autoSetupRebase` dans "
+"linkgit:git-config[1] si vous voulez que `git pull` utilise toujours "
+"`--rebase` au lieu de fusionner ."
#. type: Plain text
#: en/git-pull.txt:132
#, priority:220
msgid "This is a potentially _dangerous_ mode of operation. It rewrites history, which does not bode well when you published that history already. Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
msgstr ""
+"C'est un mode de fonctionnement potentiellement _dangereux_. Il r챕챕crit "
+"l'historique, ce qui n'est pas de bon augure lorsque vous avez d챕j횪 publi챕 "
+"cette historique. N'utilisez *pas* cette option 횪 moins d'avoir lu "
+"attentivement linkgit:git-rebase[1]."
#. type: Labeled list
#: en/git-pull.txt:133 en/git-svn.txt:261
@@ -36664,7 +37354,7 @@ msgstr "--no-rebase"
#: en/git-pull.txt:135
#, priority:220
msgid "Override earlier --rebase."
-msgstr ""
+msgstr "횋craser le --rebase pr챕c챕dent."
#. type: Labeled list
#: en/git-pull.txt:136 en/git-rebase.txt:554
@@ -36683,12 +37373,16 @@ msgstr "--no-autostash"
#, priority:220
msgid "Before starting rebase, stash local modifications away (see linkgit:git-stash[1]) if needed, and apply the stash entry when done. `--no-autostash` is useful to override the `rebase.autoStash` configuration variable (see linkgit:git-config[1])."
msgstr ""
+"Avant de commencer 횪 rebaser, remiser les modifications locales (voir linkgit"
+":git-stash[1]) si n챕cessaire, et appliquer l'entr챕e de remisage une fois "
+"termin챕. `--no-autostash` est utile pour remplacer la variable de "
+"configuration `rebase.autoStash` (voir linkgit:git-config[1])."
#. type: Plain text
#: en/git-pull.txt:144
#, priority:220
msgid "This option is only valid when \"--rebase\" is used."
-msgstr ""
+msgstr "Cette option n'est valable que si l'option \"--rebase\" est utilis챕e."
#. type: Title ~
#: en/git-pull.txt:146
@@ -36700,79 +37394,118 @@ msgstr "Options relatives au rapatriement"
#: en/git-pull.txt:157
#, no-wrap, priority:220
msgid "DEFAULT BEHAVIOUR"
-msgstr ""
+msgstr "COMPORTEMENT PAR D횋FAUT"
#. type: Plain text
#: en/git-pull.txt:164
#, priority:220
msgid "Often people use `git pull` without giving any parameter. Traditionally, this has been equivalent to saying `git pull origin`. However, when configuration `branch.<name>.remote` is present while on branch `<name>`, that value is used instead of `origin`."
msgstr ""
+"Souvent, les gens utilisent `git pull` sans donner aucun param챔tre. "
+"Traditionnellement, cela 챕quivaut 횪 dire `git pull origin`. Cependant, "
+"lorsque la configuration `branch.<nom>.remote` est pr챕sente alors que sur la "
+"branche `<nom>`, cette valeur est utilis챕e 횪 la place de `origin`."
#. type: Plain text
#: en/git-pull.txt:169
#, priority:220
msgid "In order to determine what URL to use to fetch from, the value of the configuration `remote.<origin>.url` is consulted and if there is not any such variable, the value on the `URL:` line in `$GIT_DIR/remotes/<origin>` is used."
msgstr ""
+"Afin de d챕terminer l'URL 횪 utiliser pour r챕cup챕rer, la valeur de la "
+"configuration `remote. <origine> .url` est consult챕e et s'il n'y a pas une "
+"telle variable, la valeur sur la ligne `URL:` dans `$GIT_DIR/remotes/"
+"<origine>` est utilis챕e."
#. type: Plain text
#: en/git-pull.txt:178
#, priority:220
msgid "In order to determine what remote branches to fetch (and optionally store in the remote-tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable `remote.<origin>.fetch` are consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>` is consulted and its `Pull:` lines are used. In addition to the refspec formats described in the OPTIONS section, you can have a globbing refspec that looks like this:"
msgstr ""
+"Afin de d챕terminer les branches distantes 횪 r챕cup챕rer (et 챕ventuellement "
+"stocker dans les branches de suivi 횪 distance) lorsque la commande est "
+"ex챕cut챕e sans aucun param챔tre sp챕c-de-r챕f sur la ligne de commande, les "
+"valeurs de la variable de configuration `remote. <origine> .fetch` sont "
+"consult챕es , et s'il n'y en a pas, `$GIT_DIR/remotes/<origine>` est consult챕 "
+"et ses lignes `Pull:` sont utilis챕es. En plus des formats sp챕c-de-r챕f "
+"d챕crits dans la section OPTIONS, vous pouvez avoir un motif de sp챕cificateur "
+"de r챕f챕rence qui ressemble 횪 ceci:"
#. type: delimited block -
#: en/git-pull.txt:181
#, no-wrap, priority:220
msgid "refs/heads/*:refs/remotes/origin/*\n"
-msgstr ""
+msgstr "refs/heads/*:refs/remotes/origin/*\n"
#. type: Plain text
#: en/git-pull.txt:188
#, priority:220
msgid "A globbing refspec must have a non-empty RHS (i.e. must store what were fetched in remote-tracking branches), and its LHS and RHS must end with `/*`. The above specifies that all remote branches are tracked using remote-tracking branches in `refs/remotes/origin/` hierarchy under the same name."
msgstr ""
+"Un motif de sp챕cificateur de r챕f챕rence doit avoir un partie droite non vide "
+"(c'est-횪-dire qu'elle doit stocker ce qui a 챕t챕 r챕cup챕r챕 dans des branches "
+"de suivi 횪 distance), et ses parties gauches et parties droites doivent se "
+"terminer par `/*`. Ce qui pr챕c챔de pr챕cise que toutes les branches distantes "
+"sont suivies en utilisant les branches de suivi 횪 distance dans la "
+"hi챕rarchie `refs/remotes/origin/` sous le m챗me nom."
#. type: Plain text
#: en/git-pull.txt:192
#, priority:220
msgid "The rule to determine which remote branch to merge after fetching is a bit involved, in order not to break backward compatibility."
msgstr ""
+"La r챔gle qui consiste 횪 d챕terminer quelle branche distante doit 챗tre "
+"fusionn챕e apr챔s avoir 챕t챕 r챕cup챕r챕e est un peu compliqu챕e, afin de ne pas "
+"rompre la r챕trocompatibilit챕."
#. type: Plain text
#: en/git-pull.txt:195
#, priority:220
msgid "If explicit refspecs were given on the command line of `git pull`, they are all merged."
msgstr ""
+"Si des sp챕cificateurs de r챕f챕rence explicites ont 챕t챕 donn챕s sur la ligne de "
+"commande de `git pull`, elles sont toutes fusionn챕es."
#. type: Plain text
#: en/git-pull.txt:200
#, priority:220
msgid "When no refspec was given on the command line, then `git pull` uses the refspec from the configuration or `$GIT_DIR/remotes/<origin>`. In such cases, the following rules apply:"
msgstr ""
+"Lorsqu'aucun sp챕cificateur de r챕f챕rence n'a 챕t챕 donn챕 sur la ligne de "
+"commande, alors `git pull` utilise le sp챕cificateur de r챕f챕rence de la "
+"configuration ou `$GIT_DIR/remotes/<origine>`. Dans de tels cas, les r챔gles "
+"suivantes s'appliquent��:"
#. type: Plain text
#: en/git-pull.txt:204
#, priority:220
msgid "If `branch.<name>.merge` configuration for the current branch `<name>` exists, that is the name of the branch at the remote site that is merged."
msgstr ""
+"Si la configuration `branch.<nom>.merge` pour la branche actuelle `<nom>` "
+"existe, c'est le nom de la branche du site distant en cours de fusion."
#. type: Plain text
#: en/git-pull.txt:206
#, priority:220
msgid "If the refspec is a globbing one, nothing is merged."
msgstr ""
+"Si le sp챕cificateur de r챕f챕rence est un sp챕cificateur motif, rien n'est "
+"fusionn챕."
#. type: Plain text
#: en/git-pull.txt:208
#, priority:220
msgid "Otherwise the remote branch of the first refspec is merged."
msgstr ""
+"Sinon, la branche distante du premier sp챕cificateur de r챕f챕rence est "
+"fusionn챕e."
#. type: Plain text
#: en/git-pull.txt:216
#, priority:220
msgid "Update the remote-tracking branches for the repository you cloned from, then merge one of them into your current branch:"
msgstr ""
+"Mettre 횪 jour les branches de suivi 횪 distance pour le d챕p척t d'o첫 vous avez "
+"clon챕, puis fusionner l'une d'entre elles dans votre branche actuelle :"
#. type: delimited block -
#: en/git-pull.txt:220
@@ -36789,24 +37522,30 @@ msgstr ""
#, priority:220
msgid "Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch.<name>.remote and branch.<name>.merge options; see linkgit:git-config[1] for details."
msgstr ""
+"Normalement, la branche fusionn챕e est la HEAD du d챕p척t distant, mais le "
+"choix est d챕termin챕 par les options branch. <nom> .remote et branch. <nom> "
+".merge ; voir linkgit:git-config[1] pour plus de d챕tails."
#. type: Plain text
#: en/git-pull.txt:227
#, priority:220
msgid "Merge into the current branch the remote branch `next`:"
-msgstr ""
+msgstr "Fusionner dans la branche actuelle la branche distante `next` :"
#. type: delimited block -
#: en/git-pull.txt:230
#, no-wrap, priority:220
msgid "$ git pull origin next\n"
-msgstr ""
+msgstr "$ git pull origin next\n"
#. type: Plain text
#: en/git-pull.txt:235
#, priority:220
msgid "This leaves a copy of `next` temporarily in FETCH_HEAD, but does not update any remote-tracking branches. Using remote-tracking branches, the same can be done by invoking fetch and merge:"
msgstr ""
+"Cela laisse une copie de `next` temporairement dans FETCH_HEAD, mais ne met "
+"pas 횪 jour les branches de suivi 횪 distance. En utilisant les branches de "
+"suivi 횪 distance, la m챗me chose peut 챗tre faite en invoquant fetch et merge :"
#. type: delimited block -
#: en/git-pull.txt:239
@@ -36815,12 +37554,17 @@ msgid ""
"$ git fetch origin\n"
"$ git merge origin/next\n"
msgstr ""
+"$ git fetch origin\n"
+"$ git merge origin/next\n"
#. type: Plain text
#: en/git-pull.txt:244
#, priority:220
msgid "If you tried a pull which resulted in complex conflicts and would want to start over, you can recover with 'git reset'."
msgstr ""
+"Si vous avez tent챕 un tirage qui a entra챤n챕 des conflits complexes et que "
+"vous souhaitez recommencer 횪 z챕ro, vous pouvez vous rembobiner gr창ce 횪 'git "
+"reset'."
#. type: Plain text
#: en/git-pull.txt:260
@@ -36851,96 +37595,156 @@ 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=<d챕p척t>] [-f | --force] [-d | --delete] [--prune] [-v | "
+"--verbose]\n"
+"\t [-u | --set-upstream] [-o <cha챤ne> | --push-option=<cha챤ne>]\n"
+"\t [--[no-]signed|--signed=(true|false|if-asked)]\n"
+"\t [--force-with-lease[=<nom-de-r챕f>[:<attendu>]]]\n"
+"\t [--no-verify] [<d챕p척t> [<sp챕c-de-r챕f>...]]\n"
#. type: Plain text
#: en/git-push.txt:24
#, priority:220
msgid "Updates remote refs using local refs, while sending objects necessary to complete the given refs."
msgstr ""
+"Met 횪 jour les r챕f챕rences distantes 횪 l'aide des r챕f챕rences locales, tout en "
+"envoyant les objets n챕cessaires pour compl챕ter les r챕f챕rences donn챕es."
#. type: Plain text
#: en/git-push.txt:28
#, priority:220
msgid "You can make interesting things happen to a repository every time you push into it, by setting up 'hooks' there. See documentation for linkgit:git-receive-pack[1]."
msgstr ""
+"Vous pouvez faire arriver des choses int챕ressantes 횪 un d챕p척t chaque fois "
+"que vous poussez vers lui, en y mettant en place des 짬혻crochets혻쨩. Voir la "
+"documentation pour linkgit:git-receive-pack[1]."
#. type: Plain text
#: en/git-push.txt:33
#, priority:220
msgid "When the command line does not specify where to push with the `<repository>` argument, `branch.*.remote` configuration for the current branch is consulted to determine where to push. If the configuration is missing, it defaults to 'origin'."
msgstr ""
+"Lorsque la ligne de commande ne sp챕cifie pas o첫 pousser avec l'argument "
+"`<d챕p척t>`, la configuration `branch. *. remote` de la branche actuelle est "
+"consult챕e pour d챕terminer o첫 pousser. Si la configuration est manquante, "
+"elle est par d챕faut 'origin'."
#. type: Plain text
#: en/git-push.txt:39
#, ignore-ellipsis, priority:220
msgid "When the command line does not specify what to push with `<refspec>...` arguments or `--all`, `--mirror`, `--tags` options, the command finds the default `<refspec>` by consulting `remote.*.push` configuration, and if it is not found, honors `push.default` configuration to decide what to push (See linkgit:git-config[1] for the meaning of `push.default`)."
msgstr ""
+"Lorsque la ligne de commande ne sp챕cifie pas quoi pousser avec les arguments "
+"`<sp챕c-de-r챕f> ...` ou les options `--all`,` --mirror` ou `--tags`, la "
+"commande trouve la valeur par d챕faut` <sp챕c-de-r챕f> ` en consultant la "
+"configuration `remote. *. push`, et si elle n'est pas trouv챕e, honore la "
+"configuration` push.default` pour d챕cider quoi pousser (Voir linkgit:git-"
+"config[1] pour la signification de `push.default`) ."
#. type: Plain text
#: en/git-push.txt:46
#, priority:220
msgid "When neither the command-line nor the configuration specify what to push, the default behavior is used, which corresponds to the `simple` value for `push.default`: the current branch is pushed to the corresponding upstream branch, but as a safety measure, the push is aborted if the upstream branch does not have the same name as the local one."
msgstr ""
+"Lorsque ni la ligne de commande ni la configuration ne sp챕cifient quoi "
+"pousser, le comportement par d챕faut est utilis챕, ce qui correspond 횪 la "
+"valeur `simple` pour` push.default`��: la branche actuelle est pouss챕e vers "
+"la branche amont correspondante, mais par mesure de s챕curit챕, la pouss챕e est "
+"abandonn챕e si la branche amont n'a pas le m챗me nom que la branche locale."
#. type: Title -
#: en/git-push.txt:49
#, no-wrap, priority:220
msgid "OPTIONS[[OPTIONS]]"
-msgstr ""
+msgstr "OPTIONS[[OPTIONS]]"
#. type: Plain text
#: en/git-push.txt:55
#, priority:220
msgid "The \"remote\" repository that is destination of a push 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 destination d'une op챕ration de pouss챕e. Ce "
+"param챔tre peut 챗tre soit une URL (voir la section << URLS, URLS GIT >> ci-"
+"dessous) ou le nom d'un d챕p척t distant (voir la section << REMOTES, DISTANTS "
+">> ci-dessous)."
#. type: Labeled list
#: en/git-push.txt:56
#, ignore-ellipsis, no-wrap, priority:220
msgid "<refspec>..."
-msgstr ""
+msgstr "<r챕f-de-sp챕c>..."
#. type: Plain text
#: en/git-push.txt:61
#, priority:220
msgid "Specify what destination ref to update with what source object. The format of a <refspec> parameter is an optional plus `+`, followed by the source object <src>, followed by a colon `:`, followed by the destination ref <dst>."
msgstr ""
+"Sp챕cifier quelle r챕f챕rence de destination mettre 횪 jour avec quel objet "
+"source. Le format d'un param챔tre <r챕f-de-sp챕c> est un plus facultatif `+`, "
+"suivi de l'objet source <src>, suivi de deux points `:`, suivi de la "
+"r챕f챕rence ref <dst> de destination."
#. type: Plain text
#: en/git-push.txt:65
#, priority:220
msgid "The <src> is often the name of the branch you would want to push, but it can be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see linkgit:gitrevisions[7])."
msgstr ""
+"Le <src> est souvent le nom de la branche que vous voudriez pousser, mais il "
+"peut s'agir de n'importe quelle \"expression SHA-1\" arbitraire, comme `"
+"master ~ 4` ou` HEAD` (voir linkgit:gitrevisions[7]) ."
#. type: Plain text
#: en/git-push.txt:75
#, priority:220
msgid "The <dst> tells which ref on the remote side is updated with this push. Arbitrary expressions cannot be used here, an actual ref must be named. If `git push [<repository>]` without any `<refspec>` argument is set to update some ref at the destination with `<src>` with `remote.<repository>.push` configuration variable, `:<dst>` part can be omitted--such a push will update a ref that `<src>` normally updates without any `<refspec>` on the command line. Otherwise, missing `:<dst>` means to update the same ref as the `<src>`."
msgstr ""
+"Le <dst> indique quelle r챕f챕rence du c척t챕 distant est mise 횪 jour avec cette "
+"pouss챕e. Des expressions arbitraires ne peuvent pas 챗tre utilis챕es ici, une "
+"r챕f챕rence r챕elle doit 챗tre nomm챕e. Si `git push [<d챕p척t>]` sans aucun "
+"argument `<sp챕c-de-r챕f>` est d챕fini pour mettre 횪 jour une r챕f챕rence 횪 la "
+"destination avec `<src>` avec la variable de configuration `remote. <d챕p척t> "
+".push`, la partie `��:<dst > ` peut 챗tre omise - une telle pouss챕e mettra 횪 "
+"jour une r챕f챕rence que` <src> `met normalement 횪 jour sans aucun` <sp챕c-de-"
+"r챕f> `sur la ligne de commande. Sinon, un `��:<dst>` manquant signifie mettre "
+"횪 jour la m챗me r챕f챕rence que le `<src>`."
#. type: Plain text
#: en/git-push.txt:80
#, priority:220
msgid "If <dst> doesn't start with `refs/` (e.g. `refs/heads/master`) we will try to infer where in `refs/*` on the destination <repository> it belongs based on the type of <src> being pushed and whether <dst> is ambiguous."
msgstr ""
+"Si <dst> ne commence pas par `refs/` (par exemple `refs/heads/master`), nous "
+"essaierons de d챕duire o첫 dans `refs/*` sur le <d챕p척t> de destination il "
+"appartient en fonction du type de <src> pouss챕 et si <dst> est ambigu."
#. type: Plain text
#: en/git-push.txt:84
#, priority:220
msgid "If <dst> unambiguously refers to a ref on the <repository> remote, then push to that ref."
msgstr ""
+"Si <dst> fait r챕f챕rence sans ambigu챦t챕 횪 une r챕f챕rence sur le <d챕p척t> "
+"distant, alors pousser sur cette r챕f챕rence."
#. type: Plain text
#: en/git-push.txt:87
#, priority:220
msgid "If <src> resolves to a ref starting with refs/heads/ or refs/tags/, then prepend that to <dst>."
msgstr ""
+"Si <src> se r챕sout en une r챕f commen챌ant par refs/heads/ ou refs/tags/, "
+"alors pr챕fixer ceci 횪 <dst>."
#. type: Plain text
#: en/git-push.txt:93
#, priority:220
msgid "Other ambiguity resolutions might be added in the future, but for now any other cases will error out with an error indicating what we tried, and depending on the `advice.pushUnqualifiedRefname` configuration (see linkgit:git-config[1]) suggest what refs/ namespace you may have wanted to push to."
msgstr ""
+"D'autres r챕solutions d'ambigu챦t챕 pourraient 챗tre ajout챕es dans le futur, "
+"mais pour l'instant, tout autre cas se soldera par une erreur indiquant ce "
+"que nous avons essay챕, et en fonction de la configuration "
+"`advice.pushUnqualifiedRefname` (voir linkgit:git-config[1]) sugg챕rer vers "
+"quel espace de nom refs/ vous avez pu vouloir pousser."
#. type: Plain text
#: en/git-push.txt:101
@@ -47592,66 +48396,121 @@ msgid ""
"'git stash' create [<message>]\n"
"'git stash' store [-m|--message <message>] [-q|--quiet] <commit>\n"
msgstr ""
+"'git stash' list [<options>]\n"
+"'git stash' show [<options>] [<remisage>]\n"
+"'git stash' drop [-q|--quiet] [<remisage>]\n"
+"'git stash' ( pop | apply ) [--index] [-q|--quiet] [<remisage>]\n"
+"'git stash' branch <nom-de-branche> [<remisage>]\n"
+"'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"\t [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"\t [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
+"\t [--] [<sp챕c-de-chemin>...]]\n"
+"'git stash' clear\n"
+"'git stash' create [<message>]\n"
+"'git stash' store [-m|--message <message>] [-q|--quiet] <commit>\n"
#. type: Plain text
#: en/git-stash.txt:31
#, priority:240
msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory. The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
msgstr ""
+"Utilisez `git stash` lorsque vous voulez enregistrer l'챕tat actuel du "
+"r챕pertoire de travail et de l'index, mais que vous voulez revenir 횪 un "
+"r챕pertoire de travail propre. La commande enregistre vos modifications "
+"locales et r챕tablit le r챕pertoire de travail pour qu'il corresponde au "
+"commit `HEAD`."
#. type: Plain text
#: en/git-stash.txt:39
#, ignore-ellipsis, priority:240
msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`. Calling `git stash` without any arguments is equivalent to `git stash push`. A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
msgstr ""
+"Les modifications remis챕es par cette commande peuvent 챗tre list챕es avec `git "
+"stash list`, inspect챕es avec `git stash show`, et restaur챕es ("
+"potentiellement au dessus d'un commit diff챕rent) avec `git stash apply`. "
+"Appeler `git stash` sans aucun argument est 챕quivalent 횪 `git stash push`. "
+"Un remisage est par d챕faut list챕 comme \"WIP sur 'nom-de-branche' ...\", "
+"mais vous pouvez donner un message plus descriptif sur la ligne de commande "
+"lorsque vous en cr챕ez un."
#. type: Plain text
#: en/git-stash.txt:46
#, priority:240
msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
msgstr ""
+"Le dernier remisage que vous avez cr챕챕 est stock챕 dans `refs/stash` ; les "
+"anciens remisages se trouvent dans le reflog de cette r챕f챕rence et peuvent "
+"챗tre nomm챕s en utilisant la syntaxe habituelle du reflog (par exemple "
+"`stash@{0}` est le dernier remisage cr챕챕, `stash@{1}` est celui qui le "
+"pr챕c챔de, `stash@{2.hours.ago}` est 챕galement possible). On peut 챕galement "
+"r챕f챕rencer les remisages en sp챕cifiant uniquement l'index du remisage (par "
+"exemple, l'entier `n` est 챕quivalent 횪 `stash@{n}`)."
#. type: Labeled list
#: en/git-stash.txt:50
#, 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 <message>] [--pathspec-from-file=<fichier> "
+"[--pathspec-file-nul]] [--] [<sp챕c-de-chemin>...]"
#. type: Plain text
#: en/git-stash.txt:56
#, priority:240
msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state."
msgstr ""
+"Enregistre vos modifications locales dans une nouvelle \"entr챕e de remisage\""
+" et les ram챔ne dans HEAD (dans l'arbre de travail et dans l'index). La "
+"partie <message> est facultative et donne la description ainsi que l'챕tat du "
+"remisage."
#. type: Plain text
#: en/git-stash.txt:62
#, priority:240
msgid "For quickly making a snapshot, you can omit \"push\". In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry. The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
msgstr ""
+"Pour faire rapidement un instantan챕, vous pouvez omettre \"push\". Dans ce "
+"mode, les arguments de non-optionnels ne sont pas autoris챕s pour emp챗cher "
+"une sous-commande mal orthographi챕e de faire une entr챕e ind챕sirable dans le "
+"remisage. Les deux exceptions sont `stash -p` qui agit comme alias pour `"
+"push -p` et les 챕l챕ments sp챕c-de-chemin, qui sont autoris챕s apr챔s un double "
+"trait d'union `--` pour la d챕sambigu챦sation."
#. type: Labeled list
#: en/git-stash.txt:63
#, 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] [<message>]"
#. type: Plain text
#: en/git-stash.txt:69
#, priority:240
msgid "This option is deprecated in favour of 'git stash push'. It differs from \"stash push\" in that it cannot take pathspec. Instead, all non-option arguments are concatenated to form the stash message."
msgstr ""
+"Cette option est d챕conseill챕e au profit de l'option 'git stash push\". Elle "
+"diff챔re de \"stash push\" en ce qu'elle ne peut pas prendre de sp챕c-de-"
+"chemin. Au lieu de cela, tous les arguments non li챕s 횪 une option sont "
+"concat챕n챕s pour former le message de remisage."
#. type: Labeled list
#: en/git-stash.txt:70
#, no-wrap, priority:240
msgid "list [<options>]"
-msgstr ""
+msgstr "list [<options>]"
#. type: Plain text
#: en/git-stash.txt:77
#, priority:240
msgid "List the stash entries that you currently have. Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
msgstr ""
+"Dresser la liste des entr챕es de remisage que vous avez actuellement. Chaque "
+"'entr챕e de remisage' est list챕e avec son nom (par exemple, `stash@{0}` est "
+"la derni챔re entr챕e, `stash@{1}` est l'entr챕e pr챕c챕dente, etc.), le nom de la "
+"branche en cours au moment o첫 l'entr챕e a 챕t챕 faite, et une courte "
+"description du commit sur lequel l'entr챕e est bas챕e."
#. type: delimited block -
#: en/git-stash.txt:81
@@ -47660,12 +48519,16 @@ msgid ""
"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
"stash@{1}: On master: 9cc0589... Add git-stash\n"
msgstr ""
+"stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation\n"
+"stash@{1}: On master: 9cc0589... Add git-stash\n"
#. type: Plain text
#: en/git-stash.txt:85
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
+"La commande prend les options applicables 횪 la commande 'git log' pour "
+"contr척ler ce qui est affich챕 et comment. Voir linkgit:git-log[1]."
#. type: Labeled list
#: en/git-stash.txt:86
@@ -47678,6 +48541,14 @@ msgstr "show [<options>] [<remisage>]"
#, priority:240
msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created. By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form). You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
msgstr ""
+"Afficher les modifications enregistr챕es dans l'entr챕e de remisage comme une "
+"diff챕rence entre le contenu du remisage et le commit tel qu'il 챕tait quand "
+"l'entr챕e de remisag a 챕t챕 cr챕챕e pour la premi챔re fois. Par d챕faut, la "
+"commande affiche le diffstat, mais elle accepte tout format connu de 'git "
+"diff' (par exemple, `git stash show -p stash@{1}` pour afficher la deuxi챔me "
+"entr챕e la plus r챕cente sous forme de rustine). Vous pouvez utiliser les "
+"variables de configuration stash.showStat et/ou stash.showPatch pour "
+"modifier le comportement par d챕faut."
#. type: Labeled list
#: en/git-stash.txt:97
@@ -47690,12 +48561,19 @@ msgstr "pop [--index] [-q|--quiet] [<remise>]"
#, priority:240
msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
msgstr ""
+"Supprimer un seul remisage de la liste des remisages et l'appliquer par "
+"dessus l'챕tat de l'arbre de travail actuel, c'est-횪-dire faire l'op챕ration "
+"inverse de `git stash push`. Le r챕pertoire de travail doit correspondre 횪 "
+"l'index."
#. type: Plain text
#: en/git-stash.txt:107
#, priority:240
msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
msgstr ""
+"L'application de l'챕tat peut 챕chouer en cas de conflit ; dans ce cas, il "
+"n'est pas retir챕 de la liste de remisages. Vous devez r챕soudre les conflits "
+"횪 la main et appeler ensuite `git stash drop` manuellement."
#. type: Labeled list
#: en/git-stash.txt:108
@@ -47708,48 +48586,64 @@ msgstr "apply [--index] [-q|--quiet] [<remise>]"
#, priority:240
msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
msgstr ""
+"Comme `pop`, mais ne pas supprimer l'챕tat de la liste de remisages. "
+"Contrairement 횪 `pop`, `<stash>` peut 챗tre n'importe quel commit qui "
+"ressemble 횪 un commit cr챕챕 par `stash push` ou `stash create`."
#. type: Labeled list
#: en/git-stash.txt:114
#, no-wrap, priority:240
msgid "branch <branchname> [<stash>]"
-msgstr ""
+msgstr "branch <nom-de-branche> [<remisage>]"
#. type: Plain text
#: en/git-stash.txt:121
#, priority:240
msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index. If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
msgstr ""
+"Cr챕er et extraire une nouvelle branche nomm챕e `<nom-de-branche>` 횪 partir du "
+"commit o첫 le `<remisage>` a 챕t챕 cr챕챕 횪 l'origine, appliquer les "
+"modifications enregistr챕es dans le `<remisage>` au nouvel arbre de travail "
+"et 횪 l'index. Si cela r챕ussit, et que le `<remisage>` est une r챕f챕rence de "
+"la forme `stash@{<r챕vision>}`, abandonner alors le `<remisage>`."
#. type: Plain text
#: en/git-stash.txt:127
#, priority:240
msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
msgstr ""
+"Ceci est utile si la branche sur laquelle vous avez lanc챕 `git stash push` a "
+"suffisamment chang챕 pour que `git stash apply` 챕choue 횪 cause de conflits. "
+"Puisque l'entr챕e de remisage est appliqu챕e sur le commit qui 챕tait HEAD au "
+"moment o첫 `git stash` a 챕t챕 lanc챕, elle restaure l'챕tat d'origine remis챕 "
+"sans conflit."
#. type: Labeled list
#: en/git-stash.txt:128
#, no-wrap, priority:240
msgid "clear"
-msgstr ""
+msgstr "clear"
#. type: Plain text
#: en/git-stash.txt:132
#, priority:240
msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
msgstr ""
+"Supprimer toutes les entr챕es de remisage. Notez que ces entr챕es seront alors "
+"soumises 횪 un 챕lagage et pourraient 챗tre impossibles 횪 r챕cup챕rer (voir \""
+"Exemples\" ci-dessous pour une strat챕gie possible)."
#. type: Labeled list
#: en/git-stash.txt:133
#, no-wrap, priority:240
msgid "drop [-q|--quiet] [<stash>]"
-msgstr ""
+msgstr "drop [-q|--quiet] [<remisage>]"
#. type: Plain text
#: en/git-stash.txt:136
#, priority:240
msgid "Remove a single stash entry from the list of stash entries."
-msgstr ""
+msgstr "Supprimer une seule entr챕e de la liste des entr챕es de remisage."
#. type: Labeled list
#: en/git-stash.txt:137 en/git-update-ref.txt:100
@@ -47762,6 +48656,11 @@ msgstr "create"
#, priority:240
msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
+"Cr챕er une entr챕e de remisage (qui est un objet commit r챕gulier) et renvoyer "
+"son nom d'objet, sans le stocker nulle part dans l'espace de noms de "
+"r챕f챕rences. Ceci est destin챕 횪 챗tre utilis챕 par les scripts. Ce n'est "
+"probablement pas la commande que vous voulez utiliser ; voir \"push\" ci-"
+"dessus."
#. type: Labeled list
#: en/git-stash.txt:145
@@ -47774,18 +48673,25 @@ msgstr "store"
#, priority:240
msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog. This is intended to be useful for scripts. It is probably not the command you want to use; see \"push\" above."
msgstr ""
+"Stocker un remisage donn챕 cr챕챕 via 'git stash create' (qui est un commit de "
+"fusion en cours) dans la r챕f챕rence de remisage, en mettant 횪 jour le reflog "
+"de remisage. Ceci est destin챕 횪 챗tre utilis챕 par des scripts. Ce n'est "
+"probablement pas la commande que vous souhaitez utiliser ; voir \"push\" ci-"
+"dessus."
#. type: Plain text
#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
#, priority:240
msgid "This option is only valid for `push` and `save` commands."
-msgstr ""
+msgstr "Cette option n'est valable que pour les commandes `push` et `save`."
#. type: Plain text
#: en/git-stash.txt:160
#, priority:240
msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
msgstr ""
+"Tous les fichiers ignor챕s et non trac챕s sont 챕galement remis챕s puis nettoy챕s "
+"avec `git clean`."
#. type: Labeled list
#: en/git-stash.txt:162
@@ -47798,18 +48704,24 @@ msgstr "--include-untracked"
#, priority:240
msgid "All untracked files are also stashed and then cleaned up with `git clean`."
msgstr ""
+"Tous les fichiers non suivis sont 챕galement remis챕 puis nettoy챕s avec `git "
+"clean`."
#. type: Plain text
#: en/git-stash.txt:170
#, priority:240
msgid "This option is only valid for `pop` and `apply` commands."
-msgstr ""
+msgstr "Cette option n'est valable que pour les commandes `pop` et `apply`."
#. type: Plain text
#: en/git-stash.txt:175
#, priority:240
msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
msgstr ""
+"Tenter de r챕tablir non seulement les modifications de l'arbre de travail, "
+"mais aussi celles de l'index. Cependant, cela peut 챕chouer, lorsque vous "
+"avez des conflits (qui sont stock챕s dans l'index, o첫 vous ne pouvez donc "
+"plus appliquer les modifications telles qu'elles 챕taient 횪 l'origine)."
#. type: Labeled list
#: en/git-stash.txt:177
@@ -47827,19 +48739,29 @@ msgstr "--no-keep-index"
#: en/git-stash.txt:182
#, priority:240
msgid "All changes already added to the index are left intact."
-msgstr ""
+msgstr "Tous les changements d챕j횪 ajout챕s 횪 l'index sont laiss챕s intacts."
#. type: Plain text
#: en/git-stash.txt:194
#, priority:240
msgid "Interactively select hunks from the diff between HEAD and the working tree to be stashed. The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
msgstr ""
+"S챕lectionner interactivement les section 횪 remiser 횪 partir de la diff챕rence "
+"entre HEAD et l'arbre de travail. L'entr챕e de remisage est construite de "
+"mani챔re 횪 ce que son 챕tat d'index soit le m챗me que celui de votre d챕p척t, et "
+"son arbre de travail ne contient que les modifications que vous avez "
+"s챕lectionn챕es de mani챔re interactive. Les modifications s챕lectionn챕es sont "
+"ensuite invers챕es 횪 partir de votre arbre de travail. Voir la section \"Mode "
+"interactif\" de linkgit:git-add[1] pour savoir comment utiliser le mode "
+"`--patch`."
#. type: Plain text
#: en/git-stash.txt:197
#, priority:240
msgid "The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this."
msgstr ""
+"L'option `--patch` implique `--keep-index`. Vous pouvez utiliser l'option "
+"`--no keep-index` pour passer outre."
#. type: Plain text
#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
@@ -47852,42 +48774,60 @@ msgstr "Cette option n'est valide que pour la commande `push`."
#, priority:240
msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
msgstr ""
+"Cette option n'est valable que pour les commandes `apply`, `drop`, `pop`, "
+"`push`, `save`, `store`."
#. type: Plain text
#: en/git-stash.txt:226
#, priority:240
msgid "Separates pathspec from options for disambiguation purposes."
msgstr ""
+"S챕pare le sp챕cificateur de chemin et les options 횪 des fins de "
+"d챕sambigu챦sation."
#. type: Plain text
#: en/git-stash.txt:234
#, priority:240
msgid "The new stash entry records the modified states only for the files that match the pathspec. The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
msgstr ""
+"La nouvelle entr챕e de remisage enregistre les 챕tats modifi챕s uniquement pour "
+"les fichiers qui correspondent au sp챕cificateur de chemin. Les entr챕es "
+"d'index et les fichiers de l'arbre de travail sont ensuite ramen챕es 횪 l'챕tat "
+"de HEAD uniquement pour ces fichiers, 챕galement, laissant intacts les "
+"fichiers qui ne correspondent pas 횪 la sp챕cification du chemin."
#. type: Labeled list
#: en/git-stash.txt:237
#, no-wrap, priority:240
msgid "<stash>"
-msgstr ""
+msgstr "<remisage>"
#. type: Plain text
#: en/git-stash.txt:240
#, priority:240
msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
msgstr ""
+"Cette option n'est valable que pour les commandes `apply`, `branch`, `drop`, "
+"`pop`, `show`."
#. type: Plain text
#: en/git-stash.txt:243
#, priority:240
msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
msgstr ""
+"Une r챕f챕rence de la forme `stash@{<r챕vision>}`. Lorsqu'aucun `<remisage>` "
+"n'est donn챕, le dernier remisage est suppos챕 (c'est-횪-dire, `stash@{0}`)."
#. type: Plain text
#: en/git-stash.txt:252
#, priority:240
msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created. The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit. The ancestry graph looks like this:"
msgstr ""
+"Une entr챕e de remisage est repr챕sent챕e par un commit dont l'arbre enregistre "
+"l'챕tat du r챕pertoire de travail, et son premier parent est le commit 횪 `HEAD`"
+" lorsque l'entr챕e a 챕t챕 cr챕챕e. L'arborescence du second parent enregistre "
+"l'챕tat de l'index lorsque l'entr챕e est cr챕챕e, et il est consid챕r챕 comme un "
+"enfant du commit `HEAD`. Le graphique d'ascendance ressemble 횪 ceci :"
#. type: Plain text
#: en/git-stash.txt:256
@@ -47897,30 +48837,43 @@ msgid ""
" / /\n"
" -----H----I\n"
msgstr ""
+" .----W\n"
+" / /\n"
+" -----H----I\n"
#. type: Plain text
#: en/git-stash.txt:260
#, priority:240
msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
msgstr ""
+"o첫 `H` est le commit `HEAD`, `I` est un commit qui enregistre l'챕tat de "
+"l'index, et `W` est un commit qui enregistre l'챕tat de l'arbre de travail."
#. type: Labeled list
#: en/git-stash.txt:265
#, no-wrap, priority:240
msgid "Pulling into a dirty tree"
-msgstr ""
+msgstr "Tirer dans un arbre sale"
#. type: Plain text
#: en/git-stash.txt:271
#, priority:240
msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing. When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
msgstr ""
+"Lorsque vous 챗tes au milieu de quelque chose, vous apprenez qu'il y a des "
+"changements en amont qui peuvent avoir un rapport avec ce que vous faites. "
+"Lorsque vos changements locaux n'entrent pas en conflit avec les changements "
+"en amont, un simple `git pull` vous permettra d'aller de l'avant."
#. type: Plain text
#: en/git-stash.txt:276
#, priority:240
msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes. In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
msgstr ""
+"Cependant, il y a des cas o첫 vos modifications locales entrent en conflit "
+"avec les changements en amont, et `git pull` refuse d'챕craser vos "
+"modifications. Dans ce cas, vous pouvez remiser vos modifications, "
+"effectuer un tirage, puis les d챕stocker, comme ceci :"
#. type: delimited block -
#: en/git-stash.txt:284
@@ -47933,12 +48886,23 @@ msgid ""
"$ git pull\n"
"$ git stash pop\n"
msgstr ""
+"$ git pull\n"
+" ...\n"
+"fichier foobar pas 횪 jour, fusion impossible.\n"
+"$ git stash\n"
+"$ git pull\n"
+"$ git stash pop\n"
#. type: Plain text
#: en/git-stash.txt:292
#, priority:240
msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately. Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
msgstr ""
+"Lorsque vous 챗tes au milieu de quelque chose, votre patron arrive et vous "
+"demande de r챕parer quelque chose imm챕diatement. Traditionnellement, vous "
+"fa챤tes un commit dans une branche temporaire pour stocker vos modifications "
+"et vous retournez dans votre branche d'origine pour effectuer la r챕paration "
+"d'urgence, comme ceci :"
#. type: delimited block -
#: en/git-stash.txt:303
@@ -47954,12 +48918,22 @@ msgid ""
"$ git reset --soft HEAD^\n"
"# ... continue hacking ...\n"
msgstr ""
+"# ... travail, travail, travail ...\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 \"Correction rapide\"\n"
+"$ git switch my_wip\n"
+"$ git reset --soft HEAD^\n"
+"# ... continue le travail ...\n"
#. type: Plain text
#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
msgstr ""
+"Vous pouvez utiliser 'git stash' pour simplifier ce qui pr챕c챔de, comme ceci :"
#. type: delimited block -
#: en/git-stash.txt:314
@@ -47972,18 +48946,28 @@ msgid ""
"$ git stash pop\n"
"# ... continue hacking ...\n"
msgstr ""
+"# ... travail, travail, travail ...\n"
+"$ git stash\n"
+"$ 챕dition de la correction rapide\n"
+"$ git commit -a -m \"Correction en catastrophe\"\n"
+"$ git stash pop\n"
+"# ... continue le travail ...\n"
#. type: Labeled list
#: en/git-stash.txt:316
#, no-wrap, priority:240
msgid "Testing partial commits"
-msgstr ""
+msgstr "Test des commits partiels"
#. type: Plain text
#: en/git-stash.txt:321
#, priority:240
msgid "You can use `git stash push --keep-index` when you want to make two or more commits out of the changes in the work tree, and you want to test each change before committing:"
msgstr ""
+"Vous pouvez utiliser `git stash push --keep-index` lorsque vous voulez faire "
+"deux ou plusieurs commits 횪 partir des modifications dans l'arbre de "
+"travail, et que vous voulez tester chaque modification avant de faire un "
+"commit :"
#. type: delimited block -
#: en/git-stash.txt:332
@@ -47999,18 +48983,38 @@ msgid ""
"$ edit/build/test remaining parts\n"
"$ git commit foo -m 'Remaining parts'\n"
msgstr ""
+"# ... travail, travail, travail ...\n"
+"$ git add --patch foo # ajouter seulement la premi챔re partie de l'"
+"index\n"
+"$ git stash push --keep-index # remiser toutes les autres modifications\n"
+"$ 챕diter/construire/tester la premi챔re partie\n"
+"$ git commit -m 'Premi챔re partie' # valider une modification "
+"compl챔tement test챕e\n"
+"$ git stash pop # pr챕parer 횪 travailler sur les autres "
+"modifications\n"
+"# ... r챕p챕ter les cinq t창ches ci-dessus jusqu'횪 ce qu'il ne reste qu'un "
+"commit ...\n"
+"$ 챕diter/construire/tester le restant\n"
+"$ git commit foo -m 'Partie restante'\n"
#. type: Labeled list
#: en/git-stash.txt:334
#, no-wrap, priority:240
msgid "Recovering stash entries that were cleared/dropped erroneously"
msgstr ""
+"R챕cup챕ration des entr챕es de remisage qui ont 챕t챕 effac챕es/abandonn챕es par "
+"erreur"
#. type: Plain text
#: en/git-stash.txt:340
#, priority:240
msgid "If you mistakenly drop or clear stash entries, they cannot be recovered through the normal safety mechanisms. However, you can try the following incantation to get a list of stash entries that are still in your repository, but not reachable any more:"
msgstr ""
+"Si vous laissez tomber ou videz par erreur les entr챕es de remisage, elles ne "
+"peuvent pas 챗tre r챕cup챕r챕es par les m챕canismes de s챕curit챕 habituels. "
+"Cependant, vous pouvez essayer l'incantation suivante pour obtenir une liste "
+"des entr챕es de remisage qui sont toujours dans votre d챕p척t, mais qui ne sont "
+"plus accessibles :"
#. type: delimited block -
#: en/git-stash.txt:345
@@ -48020,6 +49024,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
@@ -48127,7 +49134,23 @@ msgstr "Quand l'option `-u` n'est pas utilis챕e, les fichiers non-suivis et les
#: en/git-status.txt:101
#, priority:280
msgid "Ignore changes to submodules when looking for changes. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
-msgstr "Ignorer les modifications apport챕es aux sous-modules lors de la recherche de modifications. <quand> peut 챗tre \"none\", \"untracked\", \"dirty\" ou \"all\", qui est la valeur par d챕faut. Utiliser \"none\" consid챕rera le sous-module comme modifi챕 lorsqu'il contient des fichiers non suivis ou modifi챕s ou que sa HEAD diff챔re de la validation enregistr챕e dans le super-projet et peut 챗tre utilis챕 pour remplacer les param챔tres de l'option 'ignore' dans linkgit: git-config[1] ou linkgit: gitmodules[5]. Lorsque \"untracked\" est utilis챕, les sous-modules ne sont pas consid챕r챕s comme sales lorsqu'ils contiennent uniquement du contenu non suivi (mais ils sont toujours analys챕s pour rechercher le contenu modifi챕). L'utilisation de \"dirty\" ignore toutes les modifications apport챕es 횪 l'arborescence de travail des sous-modules혻; seules les modifications des validations stock챕es dans le super-projet sont affich챕es (il s'agissait du comportement avant la version 1.7.0). L'utilisation de \"all\" masque toutes les modifications apport챕es aux sous-modules (et supprime la sortie des r챕sum챕s de sous-modules lorsque l'option de configuration `status.submoduleSummary` est d챕finie)."
+msgstr ""
+"Ignorer les modifications apport챕es aux sous-modules lors de la recherche de "
+"modifications. <quand> peut 챗tre \"none\", \"untracked\", \"dirty\" ou \""
+"all\", qui est la valeur par d챕faut. Utiliser \"none\" consid챕rera le sous-"
+"module comme modifi챕 lorsqu'il contient des fichiers non suivis ou modifi챕s "
+"ou que sa HEAD diff챔re de la validation enregistr챕e dans le super-projet et "
+"peut 챗tre utilis챕 pour remplacer les param챔tres de l'option 'ignore' dans "
+"linkgit:git-config[1] ou linkgit:gitmodules[5]. Lorsque \"untracked\" est "
+"utilis챕, les sous-modules ne sont pas consid챕r챕s comme sales lorsqu'ils "
+"contiennent uniquement du contenu non suivi (mais ils sont toujours analys챕s "
+"pour rechercher le contenu modifi챕). L'utilisation de \"dirty\" ignore "
+"toutes les modifications apport챕es 횪 l'arborescence de travail des sous-"
+"modules혻; seules les modifications des validations stock챕es dans le super-"
+"projet sont affich챕es (il s'agissait du comportement avant la version 1.7.0)"
+". L'utilisation de \"all\" masque toutes les modifications apport챕es aux "
+"sous-modules (et supprime la sortie des r챕sum챕s de sous-modules lorsque "
+"l'option de configuration `status.submoduleSummary` est d챕finie)."
#. type: Labeled list
#: en/git-status.txt:102
@@ -51940,60 +52963,94 @@ msgid ""
"\t[--[no-]merged [<commit>]] [<pattern>...]\n"
"'git tag' -v [--format=<format>] <tagname>...\n"
msgstr ""
+"'git tag' [-a | -s | -u <id-cl챕>] [-f] [-m <msg> | -F <fichier>] [-e]\n"
+"\t<nom-d-챕tiquette> [<commit> | <objet>]\n"
+"'git tag' -d <nom-d-챕tiquette>...\n"
+"'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n"
+"\t[--points-at <objet>] [--column [=<options>] | --no-column]\n"
+"\t[--create-reflog] [--sort=<cl챕>] [--format=<format>]\n"
+"\t[--[no-]merged [<commit>]] [<motif>...]\n"
+"'git tag' -v [--format=<format>] <nom-d-챕tiquette>...\n"
#. type: Plain text
#: en/git-tag.txt:26
#, priority:240
msgid "Add a tag reference in `refs/tags/`, unless `-d/-l/-v` is given to delete, list or verify tags."
msgstr ""
+"Ajouter une r챕f챕rence d'챕tiquette dans `refs/tags/`, 횪 moins que `-d/-l/-v` "
+"ne soit donn챕 pour supprimer, lister ou v챕rifier des 챕tiquettes."
#. type: Plain text
#: en/git-tag.txt:28
#, priority:240
msgid "Unless `-f` is given, the named tag must not yet exist."
msgstr ""
+"A moins que le `-f` ne soit donn챕, l'챕tiquette indiqu챕e ne doit pas encore "
+"exister."
#. type: Plain text
#: en/git-tag.txt:33
#, priority:240
msgid "If one of `-a`, `-s`, or `-u <keyid>` is passed, the command creates a 'tag' object, and requires a tag message. Unless `-m <msg>` or `-F <file>` is given, an editor is started for the user to type in the tag message."
msgstr ""
+"Si l'un des drapeaux `-a `, `-s` ou `-u<id-cl챕>` est pass챕, la commande cr챕e "
+"un objet 짬 챕tiquette 쨩 et n챕cessite un message d'챕tiquetage. � moins que `-"
+"m <msg>` ou `-F <fichier>` ne soit donn챕, un 챕diteur est lanc챕 pour que "
+"l'utilisateur puisse taper le message de l'챕tiquette."
#. type: Plain text
#: en/git-tag.txt:36
#, priority:240
msgid "If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <keyid>` are absent, `-a` is implied."
msgstr ""
+"Si `-m <msg>` ou `-F <fichier>` est donn챕 et que `-a`, `-s`, et `-u <id-cl챕>`"
+" sont absents, `-a` est implicite."
#. type: Plain text
#: en/git-tag.txt:39
#, priority:240
msgid "Otherwise, a tag reference that points directly at the given object (i.e., a lightweight tag) is created."
msgstr ""
+"Sinon, une r챕f챕rence d'챕tiquette qui pointe directement sur l'objet donn챕 "
+"(c'est-횪-dire une 챕tiquette l챕g챔re) est cr챕챕e."
#. type: Plain text
#: en/git-tag.txt:45
#, priority:240
msgid "A GnuPG signed tag object will be created when `-s` or `-u <keyid>` is used. When `-u <keyid>` is not used, the committer identity for the current user is used to find the GnuPG key for signing. \tThe configuration variable `gpg.program` is used to specify custom GnuPG binary."
msgstr ""
+"Un objet 챕tiquette sign챕 avec GnuPG sera cr챕챕 lorsque `-s` ou `-u <id-cl챕>` "
+"est utilis챕. Lorsque `-u <id-cl챕>` n'est pas utilis챕, l'identit챕 du "
+"validateur pour l'utilisateur actuel est utilis챕e pour trouver la cl챕 GnuPG "
+"pour signer. La variable de configuration `gpg.program` est utilis챕e pour "
+"sp챕cifier un binaire GnuPG personnalis챕."
#. type: Plain text
#: en/git-tag.txt:51
#, priority:240
msgid "Tag objects (created with `-a`, `-s`, or `-u`) are called \"annotated\" tags; they contain a creation date, the tagger name and e-mail, a tagging message, and an optional GnuPG signature. Whereas a \"lightweight\" tag is simply a name for an object (usually a commit object)."
msgstr ""
+"Les objets 챕tiquette (cr챕챕s avec `-a`, `-s`, ou `-u`) sont appel챕s "
+"챕tiquettes 짬혻annot챕es혻쨩 ; ils contiennent une date de cr챕ation, le nom et "
+"l'e-mail de l'챕tiqueteur, un message d'챕tiquetage, et une signature GnuPG "
+"optionnelle. Alors qu'une 챕tiquette 짬혻l챕g챔re혻쨩 est simplement un nom pour un "
+"objet (g챕n챕ralement un objet commit)."
#. type: Plain text
#: en/git-tag.txt:56
#, priority:240
msgid "Annotated tags are meant for release while lightweight tags are meant for private or temporary object labels. For this reason, some git commands for naming objects (like `git describe`) will ignore lightweight tags by default."
msgstr ""
+"Les 챕tiquettes annot챕es sont destin챕es 횪 챗tre diffus챕es, tandis que les "
+"챕tiquettes l챕g챔res sont destin챕es 횪 l'챕tiquetage d'objets priv챕s ou "
+"temporaires. Pour cette raison, certaines commandes git pour nommer les "
+"objets (comme `git describe`) ignorent par d챕faut les 챕tiquettes l챕g챔res."
#. type: Plain text
#: en/git-tag.txt:63
#, priority:240
msgid "Make an unsigned, annotated tag object"
-msgstr ""
+msgstr "Faire un objet 챕tiquette non sign챕 et annot챕"
#. type: Labeled list
#: en/git-tag.txt:65
@@ -52006,6 +53063,10 @@ msgstr "--sign"
#, priority:240
msgid "Make a GPG-signed tag, using the default e-mail address's key. The default behavior of tag GPG-signing is controlled by `tag.gpgSign` configuration variable if it exists, or disabled otherwise. See linkgit:git-config[1]."
msgstr ""
+"Faites une 챕tiquette sign챕e GPG, en utilisant la cl챕 de l'adresse "
+"챕lectronique par d챕faut. Le comportement par d챕faut de signature GPG "
+"d'챕tiquette GPG est contr척l챕 par la variable de configuration `tag.gpgSign` "
+"si elle existe, ou d챕sactiv챕 sinon. Voir linkgit:git-config[1]."
#. type: Labeled list
#: en/git-tag.txt:71
@@ -52023,37 +53084,37 @@ msgstr "Surcharge `tag.gpgSign` qui force toutes les 챕tiquettes 횪 챗tre sign챕
#: en/git-tag.txt:75
#, no-wrap, priority:240
msgid "-u <keyid>"
-msgstr ""
+msgstr "-u <id-cl챕>"
#. type: Labeled list
#: en/git-tag.txt:76
#, no-wrap, priority:240
msgid "--local-user=<keyid>"
-msgstr ""
+msgstr "--local-user=<id-cl챕>"
#. type: Plain text
#: en/git-tag.txt:78
#, priority:240
msgid "Make a GPG-signed tag, using the given key."
-msgstr ""
+msgstr "Faire une 챕tiquette sign챕e par GPG, en utilisant la cl챕 donn챕e."
#. type: Plain text
#: en/git-tag.txt:82
#, priority:240
msgid "Replace an existing tag with the given name (instead of failing)"
-msgstr ""
+msgstr "Remplacer une 챕tiquette existante par le nom fourni (au lieu d'챕chouer)"
#. type: Plain text
#: en/git-tag.txt:86
#, priority:240
msgid "Delete existing tags with the given names."
-msgstr ""
+msgstr "Supprimer les 챕tiquettes existantes avec les noms fournis."
#. type: Plain text
#: en/git-tag.txt:90
#, priority:240
msgid "Verify the GPG signature of the given tag names."
-msgstr ""
+msgstr "V챕rifier la signature GPG des noms d'챕tiquette donn챕s."
#. type: Labeled list
#: en/git-tag.txt:91
@@ -52066,36 +53127,60 @@ msgstr "-n<num>"
#, priority:240
msgid "<num> specifies how many lines from the annotation, if any, are printed when using -l. Implies `--list`."
msgstr ""
+"<num> indique combien de lignes de l'annotation, le cas 챕ch챕ant, sont "
+"imprim챕es lorsque l'on utilise -l. Implique `--list`."
#. type: Plain text
#: en/git-tag.txt:98
#, priority:240
msgid "The default is not to print any annotation lines. If no number is given to `-n`, only the first line is printed. If the tag is not annotated, the commit message is displayed instead."
msgstr ""
+"Par d챕faut, aucune ligne d'annotation n'est imprim챕e. Si aucun nombre n'est "
+"donn챕 횪 \"n\", seule la premi챔re ligne est imprim챕e. Si l'챕tiquette n'est "
+"pas annot챕e, le message de commit est affich챕 횪 la place."
#. type: Plain text
#: en/git-tag.txt:103
#, ignore-ellipsis, priority:240
msgid "List tags. With optional `<pattern>...`, e.g. `git tag --list 'v-*'`, list only the tags that match the pattern(s)."
msgstr ""
+"Lister les 챕tiquettes. Avec l'option `<motif>...`, par exemple `git tag --"
+"list 'v-*' `, ne lister que les 챕tiquettes qui correspondent au(x) motif(s)."
#. type: Plain text
#: en/git-tag.txt:107
#, priority:240
msgid "Running \"git tag\" without arguments also lists all tags. The pattern is a shell wildcard (i.e., matched using fnmatch(3)). Multiple patterns may be given; if any of them matches, the tag is shown."
msgstr ""
+"L'ex챕cution de \"git tag\" sans arguments permet 챕galement de lister toutes "
+"les 챕tiquettes. Le motif est un joker shell (c'est-횪-dire que la "
+"correspondance est effectu챕e avec fnmatch(3)). Plusieurs motifs peuvent 챗tre "
+"donn챕s ; si l'un d'eux correspond, l'챕tiquette est affich챕e."
#. type: Plain text
#: en/git-tag.txt:111
#, priority:240
msgid "This option is implicitly supplied if any other list-like option such as `--contains` is provided. See the documentation for each of those options for details."
msgstr ""
+"Cette option est implicitement fournie si une autre option de type liste "
+"telle que `--contains` est fournie. Pour plus de d챕tails, voir la "
+"documentation relative 횪 chacune de ces options."
#. type: Plain text
#: en/git-tag.txt:124
#, priority:240
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. Also supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `tag.sort` variable if it exists, or lexicographic order otherwise. See linkgit:git-config[1]."
msgstr ""
+"Trier en fonction de la cl챕 donn챕e. Pr챕fixer par `-` pour trier par ordre "
+"d챕croissant de la valeur. Vous pouvez utiliser l'option --sort=<cl챕> "
+"plusieurs fois, auquel cas la derni챔re cl챕 devient la cl챕 primaire. Prend "
+"챕galement en charge \"version:nom-de-r챕f\" ou \"v:nom-de-r챕f\" (les noms "
+"d'챕tiquettes sont trait챕s comme des versions). L'ordre de tri de \"version"
+":nom-de-r챕f\" peut 챕galement 챗tre affect챕 par la variable de configuration \""
+"versionsort.suffixe\". Les cl챕s support챕es sont les m챗mes que celles de `"
+"git for-each-ref`. L'ordre de tri est par d챕faut la valeur configur챕e pour "
+"la variable `tag.sort` si elle existe, ou l'ordre lexicographique sinon. "
+"Voir linkgit:git-config[1]."
#. type: Plain text
#: en/git-tag.txt:133
@@ -52114,36 +53199,49 @@ msgstr "Afficher les 챕tiquettes en colonnes. Voir la variable de configuration
#, priority:240
msgid "This option is only applicable when listing tags without annotation lines."
msgstr ""
+"Cette option n'est applicable que pour les listes d'챕tiquettes sans lignes "
+"d'annotation."
#. type: Plain text
#: en/git-tag.txt:145
#, priority:240
msgid "Only list tags which contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
+"Ne r챕pertorier que les 챕tiquettes qui contiennent le commit sp챕cifi챕 (HEAD "
+"si non sp챕cifi챕). Implique `--list`."
#. type: Plain text
#: en/git-tag.txt:149
#, priority:240
msgid "Only list tags which don't contain the specified commit (HEAD if not specified). Implies `--list`."
msgstr ""
+"Ne r챕pertorier que les 챕tiquettes qui contiennent le commit sp챕cifi챕 (HEAD "
+"si non sp챕cifi챕). Implique `--list`."
#. type: Plain text
#: en/git-tag.txt:153
#, priority:240
msgid "Only list tags whose commits are reachable from the specified commit (`HEAD` if not specified), incompatible with `--no-merged`."
msgstr ""
+"Ne lister que les 챕tiquettes dont les commits sont accessibles 횪 partir du "
+"commit sp챕cifi챕 (`HEAD` si non sp챕cifi챕), incompatible avec `--no-merged`."
#. type: Plain text
#: en/git-tag.txt:157
#, priority:240
msgid "Only list tags whose commits are not reachable from the specified commit (`HEAD` if not specified), incompatible with `--merged`."
msgstr ""
+"Ne lister que les 챕tiquettes dont les commits ne sont pas accessibles 횪 "
+"partir du commit sp챕cifi챕 (`HEAD` si non sp챕cifi챕), incompatible avec "
+"`--merged`."
#. type: Plain text
#: en/git-tag.txt:161
#, priority:240
msgid "Only list tags of the given object (HEAD if not specified). Implies `--list`."
msgstr ""
+"Ne r챕pertorier que les 챕tiquettes de l'objet donn챕 (HEAD si non sp챕cifi챕). "
+"Implique `--list`."
#. type: Plain text
#: en/git-tag.txt:169
@@ -52168,30 +53266,48 @@ msgstr "Le message tir챕 d'un fichier avec `-F`, ou de la ligne de commande avec
#, priority:240
msgid "This option sets how the tag message is cleaned up. The '<mode>' can be one of 'verbatim', 'whitespace' and 'strip'. The 'strip' mode is default. The 'verbatim' mode does not change message at all, 'whitespace' removes just leading/trailing whitespace lines and 'strip' removes both whitespace and commentary."
msgstr ""
+"Cette option d챕finit la mani챔re dont le message de l'챕tiquette est nettoy챕. "
+"Le '<mode>' peut 챗tre un 'verbatim', 'whitespace' ou 'strip'. Le mode "
+"'strip' est le mode par d챕faut. Le mode 'verbatim' ne modifie pas du tout le "
+"message, 'whitespace' supprime uniquement les lignes vides de d챕but et de "
+"fin et 'strip' supprime 횪 la fois les espaces et les commentaires."
#. type: Plain text
#: en/git-tag.txt:196
#, priority:240
msgid "Create a reflog for the tag. To globally enable reflogs for tags, see `core.logAllRefUpdates` in linkgit:git-config[1]. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
msgstr ""
+"Cr챕er un reflog pour l'챕tiquette. Pour activer globalement les reflogs pour "
+"les 챕tiquettes, voir `core.logAllRefUpdates` dans linkgit:git-config[1]. La "
+"forme invers챕e `--no-create-reflog` ne fait que remplacer une pr챕c챕dente "
+"`--create-reflog`, mais n'annule pas actuellement le param챔tre de "
+"`core.logAllRefUpdates`."
#. type: Plain text
#: en/git-tag.txt:202
#, priority:240
msgid "A string that interpolates `%(fieldname)` from a tag ref being shown and the object it points at. The format is the same as that of linkgit:git-for-each-ref[1]. When unspecified, defaults to `%(refname:strip=2)`."
msgstr ""
+"Une cha챤ne qui interpole `%(fieldname)` 횪 partir d'une r챕f챕rence d'챕tiquette "
+"affich챕e et de l'objet qu'il pointe. Le format est le m챗me que celui de "
+"linkgit:git-for-each-ref[1]. Lorsqu'elle n'est pas sp챕cifi챕e, la valeur par "
+"d챕faut est `%(refname:strip=2)`."
#. type: Labeled list
#: en/git-tag.txt:203
#, no-wrap, priority:240
msgid "<tagname>"
-msgstr ""
+msgstr "<nom-d-챕tiquette>"
#. type: Plain text
#: en/git-tag.txt:208
#, priority:240
msgid "The name of the tag to create, delete, or describe. The new tag name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a tag name."
msgstr ""
+"Le nom de l'챕tiquette 횪 cr챕er, supprimer ou d챕crire. Le nouveau nom de "
+"l'챕tiquette doit passer tous les contr척les d챕finis par linkgit:git-check-ref-"
+"format[1]. Certains de ces contr척les peuvent restreindre les caract챔res "
+"autoris챕s dans un nom d'챕tiquette."
#. type: Labeled list
#: en/git-tag.txt:209 en/git.txt:348
@@ -52204,12 +53320,18 @@ msgstr "<commit>"
#, priority:240
msgid "The object that the new tag will refer to, usually a commit. Defaults to HEAD."
msgstr ""
+"L'objet auquel la nouvelle 챕tiquette fera r챕f챕rence, g챕n챕ralement un "
+"commit. La valeur par d챕faut est HEAD."
#. type: Plain text
#: en/git-tag.txt:220
#, priority:240
msgid "By default, 'git tag' in sign-with-default mode (-s) will use your committer identity (of the form `Your Name <your@email.address>`) to find a key. If you want to use a different default key, you can specify it in the repository configuration as follows:"
msgstr ""
+"Par d챕faut, 'git tag' en mode signer-par-d챕faut (-s) utilisera votre "
+"identit챕 de validateur (de la forme `Votre Nom <votre@adresse.email>`) pour "
+"trouver une cl챕. Si vous souhaitez utiliser une cl챕 par d챕faut diff챕rente, "
+"vous pouvez la sp챕cifier dans la configuration du d챕p척t comme suit :"
#. type: delimited block -
#: en/git-tag.txt:224
@@ -52218,60 +53340,93 @@ msgid ""
"[user]\n"
" signingKey = <gpg-keyid>\n"
msgstr ""
+"[user]\n"
+" signingKey = <id-cl챕-gpg>\n"
#. type: Plain text
#: en/git-tag.txt:229
#, priority:240
msgid "`pager.tag` is only respected when listing tags, i.e., when `-l` is used or implied. The default is to use a pager. See linkgit:git-config[1]."
msgstr ""
+"`pager.tag` n'est respect챕 que lors de l'챕num챕ration des 챕tiquettes, c'est-횪-"
+"dire lorsque le `-l` est utilis챕 ou sous-entendu. La valeur par d챕faut est "
+"l'utilisation d'un pager. Voir linkgit:git-config[1]."
#. type: Title ~
#: en/git-tag.txt:234
#, no-wrap, priority:240
msgid "On Re-tagging"
-msgstr ""
+msgstr "� propos du r챕-챕tiquetage"
#. type: Plain text
#: en/git-tag.txt:238
#, priority:240
msgid "What should you do when you tag a wrong commit and you would want to re-tag?"
msgstr ""
+"Que devez-vous faire lorsque vous marquez un mauvais commit et que vous "
+"souhaitez r챕-챕tiqueter ?"
#. type: Plain text
#: en/git-tag.txt:241
#, priority:240
msgid "If you never pushed anything out, just re-tag it. Use \"-f\" to replace the old one. And you're done."
msgstr ""
+"Si vous n'avez jamais rien pousser 횪 l'ext챕rieur, il suffit de le re-"
+"챕tiqueter. Utilisez \"-f\" pour remplacer l'ancienne 챕tiquette. Et c'est "
+"fini."
#. type: Plain text
#: en/git-tag.txt:245
#, priority:240
msgid "But if you have pushed things out (or others could just read your repository directly), then others will have already seen the old tag. In that case you can do one of two things:"
msgstr ""
+"Mais si vous avez pouss챕 des choses (ou si d'autres ont pu lire directement "
+"votre d챕p척t), alors d'autres auront d챕j횪 vu l'ancienne 챕tiquette. Dans ce "
+"cas, vous pouvez faire l'une des deux choses suivantes :"
#. type: Plain text
#: en/git-tag.txt:252
#, priority:240
msgid "The sane thing. Just admit you screwed up, and use a different name. Others have already seen one tag-name, and if you keep the same name, you may be in the situation that two people both have \"version X\", but they actually have 'different' \"X\"'s. So just call it \"X.1\" and be done with it."
msgstr ""
+"Le bon comportement. Admettez juste que vous avez foir챕, et utilisez un "
+"autre nom. D'autres ont d챕j횪 vu un nom d'챕tiquette, et si vous gardez le "
+"m챗me nom, vous pouvez vous retrouver dans la situation o첫 deux personnes ont "
+"toutes deux une \"version X\", mais en fait elles ont des \"X\" diff챕rents. "
+"Il suffit donc de baptiser le bon commit \"X.1\" et cela r챔gle l'affaire."
#. type: Plain text
#: en/git-tag.txt:257
#, priority:240
msgid "The insane thing. You really want to call the new version \"X\" too, 'even though' others have already seen the old one. So just use 'git tag -f' again, as if you hadn't already published the old one."
msgstr ""
+"Le comportement d챕bile. Vous voulez vraiment appeler la nouvelle version \""
+"X\" aussi, \"m챗me si\" d'autres ont d챕j횪 vu l'ancienne. Alors utilisez 횪 "
+"nouveau l'챕tiquette \"git tag -f\", comme si vous n'aviez pas d챕j횪 publi챕 "
+"l'ancienne version."
#. type: Plain text
#: en/git-tag.txt:262
#, priority:240
msgid "However, Git does *not* (and it should not) change tags behind users back. So if somebody already got the old tag, doing a 'git pull' on your tree shouldn't just make them overwrite the old one."
msgstr ""
+"Cependant, Git ne change *pas* (et ne devrait pas changer) les 챕tiquettes "
+"dans le dos les utilisateurs. Ainsi, si quelqu'un a d챕j횪 l'ancienne "
+"챕tiquette, le fait de faire un 'git pull' sur votre arbre ne devrait "
+"simplement pas l'obliger 횪 챕craser l'ancienne."
#. type: Plain text
#: en/git-tag.txt:269
#, priority:240
msgid "If somebody got a release tag from you, you cannot just change the tag for them by updating your own one. This is a big security issue, in that people MUST be able to trust their tag-names. If you really want to do the insane thing, you need to just fess up to it, and tell people that you messed up. You can do that by making a very public announcement saying:"
msgstr ""
+"Si quelqu'un a re챌u de vous une 챕tiquette de publication, vous ne pouvez "
+"simplement pas la changer chez lui en mettant 횪 jour votre propre 챕tiquette. "
+"Il s'agit d'un probl챔me de s챕curit챕 important, car les gens DOIVENT pouvoir "
+"faire confiance en leur nom d'챕tiquette. Si vous voulez vraiment faire une "
+"folie, vous devez simplement le reconna챤tre et dire aux gens que vous avez "
+"fait une erreur. Vous pouvez le faire en faisant une annonce tr챔s publique "
+"disant혻:"
#. type: delimited block -
#: en/git-tag.txt:273
@@ -52280,6 +53435,10 @@ msgid ""
"Ok, I messed up, and I pushed out an earlier version tagged as X. I\n"
"then fixed something, and retagged the *fixed* tree as X again.\n"
msgstr ""
+"Ok, je me suis tromp챕, et j'ai sorti une version ant챕rieure 챕tiquet챕e X. J'"
+"ai\n"
+"depuis corrig챕 quelque chose, et j'ai 횪 nouveau marqu챕 l'arbre *corrig챕* "
+"comme X.\n"
#. type: delimited block -
#: en/git-tag.txt:276
@@ -52288,6 +53447,9 @@ msgid ""
"If you got the wrong tag, and want the new one, please delete\n"
"the old one and fetch the new one by doing:\n"
msgstr ""
+"Si vous vous 챗tes tromp챕 d'챕tiquette et que vous voulez la nouvelle, "
+"veuillez supprimer\n"
+"l'ancienne et aller chercher la nouvelle en faisant :\n"
#. type: delimited block -
#: en/git-tag.txt:279
@@ -52303,13 +53465,13 @@ msgstr ""
#: en/git-tag.txt:281
#, no-wrap, priority:240
msgid "to get my updated tag.\n"
-msgstr ""
+msgstr "pour obtenir mon 챕tiquette mise 횪 jour.\n"
#. type: delimited block -
#: en/git-tag.txt:283
#, no-wrap, priority:240
msgid "You can test which tag you have by doing\n"
-msgstr ""
+msgstr "Vous pouvez v챕rifier quelle 챕tiquette vous avez en faisant\n"
#. type: delimited block -
#: en/git-tag.txt:285
@@ -52322,54 +53484,72 @@ msgstr "\tgit rev-parse X\n"
#, no-wrap, priority:240
msgid "which should return 0123456789abcdef.. if you have the new version.\n"
msgstr ""
+"qui devrait renvoyer 0123456789abcdef... si vous avez la nouvelle version.\n"
#. type: delimited block -
#: en/git-tag.txt:289
#, no-wrap, priority:240
msgid "Sorry for the inconvenience.\n"
-msgstr ""
+msgstr "D챕sol챕 pour le d챕sagr챕ment.\n"
#. type: Plain text
#: en/git-tag.txt:294
#, priority:240
msgid "Does this seem a bit complicated? It *should* be. There is no way that it would be correct to just \"fix\" it automatically. People need to know that their tags might have been changed."
msgstr ""
+"Cela vous semble-t-il un peu compliqu챕 ? 횉a *devrait* l'챗tre. Il n'y a aucun "
+"moyen qui soit correct pour simplement \"r챕parer\" cela automatiquement. "
+"Les gens doivent savoir que leurs 챕tiquettes ont peut-챗tre 챕t챕 modifi챕es."
#. type: Title ~
#: en/git-tag.txt:297
#, no-wrap, priority:240
msgid "On Automatic following"
-msgstr ""
+msgstr "Sur le suivi automatique"
#. type: Plain text
#: en/git-tag.txt:302
#, priority:240
msgid "If you are following somebody else's tree, you are most likely using remote-tracking branches (eg. `refs/remotes/origin/master`). You usually want the tags from the other end."
msgstr ""
+"Si vous suivez l'arbre de quelqu'un d'autre, vous utilisez tr챔s probablement "
+"des branches de suivi 횪 distance (par exemple, `refs/remotes/origin/master`)"
+". Vous voulez g챕n챕ralement les 챕tiquettes de l'autre d챕p척t."
#. type: Plain text
#: en/git-tag.txt:309
#, priority:240
msgid "On the other hand, if you are fetching because you would want a one-shot merge from somebody else, you typically do not want to get tags from there. This happens more often for people near the toplevel but not limited to them. Mere mortals when pulling from each other do not necessarily want to automatically get private anchor point tags from the other person."
msgstr ""
+"D'autre part, si vous r챕cup챕rez parce que vous voudriez une seule fois une "
+"fusion de quelqu'un d'autre, vous ne voulez g챕n챕ralement pas obtenir "
+"d'챕tiquettes 횪 partir de l횪. Cela se produit plus souvent pour les "
+"personnes proches du niveau sup챕rieur, mais pas seulement pour elles. Les "
+"simples mortels qui se tirent les uns des autres ne veulent pas "
+"n챕cessairement obtenir automatiquement des 챕tiquettes de point d'ancrage "
+"priv챕s de l'autre personne."
#. type: Plain text
#: en/git-tag.txt:314
#, priority:240
msgid "Often, \"please pull\" messages on the mailing list just provide two pieces of information: a repo URL and a branch name; this is designed to be easily cut&pasted at the end of a 'git fetch' command line:"
msgstr ""
+"Souvent, les messages \"veuillez tirer\" sur la liste de diffusion ne "
+"fournissent que deux informations : une URL de d챕p척t et un nom de branche ; "
+"ils sont con챌us pour 챗tre facilement coup챕s-coll챕s 횪 la fin d'une ligne de "
+"commande \"git fetch\" :"
#. type: delimited block -
#: en/git-tag.txt:317
#, no-wrap, priority:240
msgid "Linus, please pull from\n"
-msgstr ""
+msgstr "Linus, veuillez tirer de\n"
#. type: delimited block -
#: en/git-tag.txt:319
#, ignore-ellipsis, no-wrap, priority:240
msgid "\tgit://git..../proj.git master\n"
-msgstr ""
+msgstr "\tgit://git..../proj.git master\n"
#. type: delimited block -
#: en/git-tag.txt:321
@@ -52381,61 +53561,95 @@ msgstr "pour r챕cup챕rer les mises 횪 jour suivantes��\n"
#: en/git-tag.txt:324
#, priority:240
msgid "becomes:"
-msgstr ""
+msgstr "devient :"
#. type: delimited block -
#: en/git-tag.txt:327
#, ignore-ellipsis, no-wrap, priority:240
msgid "$ git pull git://git..../proj.git master\n"
-msgstr ""
+msgstr "$ git pull git://git..../proj.git master\n"
#. type: Plain text
#: en/git-tag.txt:331
#, priority:240
msgid "In such a case, you do not want to automatically follow the other person's tags."
msgstr ""
+"Dans un tel cas, vous ne voulez pas suivre automatiquement les 챕tiquettes de "
+"l'autre personne."
#. type: Plain text
#: en/git-tag.txt:339
#, priority:240
msgid "One important aspect of Git is its distributed nature, which largely means there is no inherent \"upstream\" or \"downstream\" in the system. On the face of it, the above example might seem to indicate that the tag namespace is owned by the upper echelon of people and that tags only flow downwards, but that is not the case. It only shows that the usage pattern determines who are interested in whose tags."
msgstr ""
+"Un aspect important de Git est sa nature distribu챕e, ce qui signifie en "
+"grande partie qu'il n'y a pas de mani챔re inh챕rente d'\"amont\" ou d'\"aval\" "
+"dans le syst챔me. � premi챔re vue, l'exemple ci-dessus pourrait sembler "
+"indiquer que l'espace de noms des 챕tiquettes appartient 횪 l'챕chelon "
+"sup챕rieur des personnes et que les 챕tiquettes ne circulent que vers le bas, "
+"mais ce n'est pas le cas. Il montre seulement que le sch챕ma d'utilisation "
+"d챕termine qui s'int챕resse 횪 quelles 챕tiquettes."
#. type: Plain text
#: en/git-tag.txt:351
#, priority:240
msgid "A one-shot pull is a sign that a commit history is now crossing the boundary between one circle of people (e.g. \"people who are primarily interested in the networking part of the kernel\") who may have their own set of tags (e.g. \"this is the third release candidate from the networking group to be proposed for general consumption with 2.6.21 release\") to another circle of people (e.g. \"people who integrate various subsystem improvements\"). The latter are usually not interested in the detailed tags used internally in the former group (that is what \"internal\" means). That is why it is desirable not to follow tags automatically in this case."
msgstr ""
+"Un tirage pour une fois est le signe qu'un historique de commit franchit "
+"maintenant la fronti챔re entre un cercle de personnes (par exemple 짬 les "
+"personnes qui sont principalement int챕ress챕es par la partie r챕seau du noyau "
+"쨩) qui peuvent avoir leur propre ensemble d'챕tiquettes (par exemple \"c'est "
+"la troisi챔me version candidate du groupe r챕seau 횪 챗tre propos챕e pour la "
+"consommation g챕n챕rale avec la version 2.6.21\") et un autre cercle de "
+"personnes (par exemple \"les personnes qui int챔grent diverses am챕liorations "
+"du sous-syst챔me\"). Ces derniers ne sont g챕n챕ralement pas int챕ress챕s par "
+"les 챕tiquettes d챕taill챕es utilis챕es en interne dans le premier groupe (c'est "
+"ce que signifie \"interne\"). C'est pourquoi il est souhaitable de ne pas "
+"suivre automatiquement les 챕tiquettes dans ce cas."
#. type: Plain text
#: en/git-tag.txt:357
#, priority:240
msgid "It may well be that among networking people, they may want to exchange the tags internal to their group, but in that workflow they are most likely tracking each other's progress by having remote-tracking branches. Again, the heuristic to automatically follow such tags is a good thing."
msgstr ""
+"Il se peut tr챔s bien que les personnes travaillant sur le r챕seau veuillent "
+"챕changer les 챕tiquettes internes 횪 leur groupe, mais dans ce flux de "
+"travail, elles suivent tr챔s probablement les progr챔s des autres en ayant des "
+"branches de suivi 횪 distance. L횪 encore, l'heuristique consistant 횪 suivre "
+"automatiquement ces 챕tiquettes est une bonne chose."
#. type: Title ~
#: en/git-tag.txt:360
#, no-wrap, priority:240
msgid "On Backdating Tags"
-msgstr ""
+msgstr "Sur l'antidatage d'챕tiquettes"
#. type: Plain text
#: en/git-tag.txt:367
#, priority:240
msgid "If you have imported some changes from another VCS and would like to add tags for major releases of your work, it is useful to be able to specify the date to embed inside of the tag object; such data in the tag object affects, for example, the ordering of tags in the gitweb interface."
msgstr ""
+"Si vous avez import챕 des modifications d'un autre VCS et que vous souhaitez "
+"ajouter des 챕tiquettes pour les versions majeures de votre travail, il est "
+"utile de pouvoir sp챕cifier la date 횪 int챕grer dans l'objet 챕tiquette ; ces "
+"donn챕es dans l'objet 챕tiquette affectent, par exemple, l'ordre des "
+"챕tiquettes dans l'interface gitweb."
#. type: Plain text
#: en/git-tag.txt:371
#, priority:240
msgid "To set the date used in future tag objects, set the environment variable GIT_COMMITTER_DATE (see the later discussion of possible values; the most common form is \"YYYY-MM-DD HH:MM\")."
msgstr ""
+"Pour d챕finir la date utilis챕e dans les futurs objets 챕tiquette, d챕finissez "
+"la variable d'environnement GIT_COMMITTER_DATE (voir la discussion "
+"ult챕rieure des valeurs possibles ; la forme la plus courante est \"YYYY-MM-"
+"DD HH:MM\")."
#. type: delimited block -
#: en/git-tag.txt:376
#, no-wrap, priority:240
msgid "$ GIT_COMMITTER_DATE=\"2006-10-02 10:31\" git tag -s v1.0.1\n"
-msgstr ""
+msgstr "$ GIT_COMMITTER_DATE=\"2006-10-02 10:31\" git tag -s v1.0.1\n"
#. type: Plain text
#: en/git-tag.txt:384
@@ -56231,7 +57445,7 @@ msgstr "git-worktree(1)"
#: en/git-worktree.txt:7
#, priority:240
msgid "git-worktree - Manage multiple working trees"
-msgstr ""
+msgstr "git-worktree - G챕rer plusieurs arbres de travail"
#. type: Plain text
#: en/git-worktree.txt:19
@@ -56245,30 +57459,57 @@ msgid ""
"'git worktree remove' [-f] <worktree>\n"
"'git worktree unlock' <worktree>\n"
msgstr ""
+"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <nouvelle-"
+"branche>] <chemin> [<commit-esque>]\n"
+"'git worktree list' [--porcelain]\n"
+"'git worktree lock' [--reason <cha챤ne>] <arbre-de-travail>\n"
+"'git worktree move' <arbre-de-travail> <nouveau-chemin>\n"
+"'git worktree prune' [-n] [-v] [--expire <expire>]\n"
+"'git worktree remove' [-f] <arbre-de-travail>\n"
+"'git worktree unlock' <arbre-de-travail>\n"
#. type: Plain text
#: en/git-worktree.txt:24
#, priority:240
msgid "Manage multiple working trees attached to the same repository."
-msgstr ""
+msgstr "G챔re plusieurs arbres de travail rattach챕s au m챗me d챕p척t."
#. type: Plain text
#: en/git-worktree.txt:32
#, priority:240
msgid "A git repository can support multiple working trees, allowing you to check out more than one branch at a time. With `git worktree add` a new working tree is associated with the repository. This new working tree is called a \"linked working tree\" as opposed to the \"main working tree\" prepared by \"git init\" or \"git clone\". A repository has one main working tree (if it's not a bare repository) and zero or more linked working trees. When you are done with a linked working tree, remove it with `git worktree remove`."
msgstr ""
+"Un d챕p척t git peut prendre en charge plusieurs arbres de travail, ce qui vous "
+"permet de consulter plus d'une branche 횪 la fois. Avec `git worktree add`, "
+"un nouvel arbre de travail est associ챕 au d챕p척t. Ce nouvel arbre de travail "
+"est appel챕 \"arbre de travail li챕\" par opposition 횪 l'\"arbre de travail "
+"principal\" pr챕par챕 par \"git init\" ou \"git clone\". Un d챕p척t a un arbre "
+"de travail principal (s'il ne s'agit pas d'un d챕p척t nu) et z챕ro ou plusieurs "
+"arbres de travail li챕s. Lorsque vous avez termin챕 avec un arbre de travail "
+"li챕, supprimez-le avec `git worktree remove`."
#. type: Plain text
#: en/git-worktree.txt:39
#, priority:240
msgid "If a working tree is deleted without using `git worktree remove`, then its associated administrative files, which reside in the repository (see \"DETAILS\" below), will eventually be removed automatically (see `gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run `git worktree prune` in the main or any linked working tree to clean up any stale administrative files."
msgstr ""
+"Si un arbre de travail est supprim챕 sans utiliser `git worktree remove`, "
+"alors les fichiers administratifs associ챕s, qui r챕sident dans le d챕p척t (voir "
+"\"D횋TAILS\" ci-dessous), seront 챕ventuellement supprim챕s automatiquement ("
+"voir `gc.worktreePruneExpire` dans linkgit:git-config[1]), ou vous pouvez "
+"ex챕cuter `git worktree prune` dans l'arbre de travail principal ou dans tout "
+"autre arbre de travail li챕 pour nettoyer les fichiers administratifs p챕rim챕s."
#. type: Plain text
#: en/git-worktree.txt:44
#, priority:240
msgid "If a linked working tree is stored on a portable device or network share which is not always mounted, you can prevent its administrative files from being pruned by issuing the `git worktree lock` command, optionally specifying `--reason` to explain why the working tree is locked."
msgstr ""
+"Si un arbre de travail li챕 est stock챕 sur un support mobile ou un partage "
+"r챕seau qui n'est pas toujours mont챕, vous pouvez emp챗cher l'챕lagage de ses "
+"fichiers administratifs en lan챌ant la commande `git worktree lock`, en "
+"sp챕cifiant 챕ventuellement `--reason` pour expliquer pourquoi l'arbre de "
+"travail est verrouill챕."
#. type: Labeled list
#: en/git-worktree.txt:47
@@ -56281,6 +57522,10 @@ msgstr "ajouter <chemin> [<commit-esque>]"
#, priority:240
msgid "Create `<path>` and checkout `<commit-ish>` into it. The new working directory is linked to the current repository, sharing everything except working directory specific files such as HEAD, index, etc. `-` may also be specified as `<commit-ish>`; it is synonymous with `@{-1}`."
msgstr ""
+"Cr챕er `<chemin>` et valider `<commit-esque>` dans celui-ci. Le nouveau "
+"r챕pertoire de travail est li챕 au d챕p척t actuel, partageant tout sauf les "
+"fichiers sp챕cifiques au r챕pertoire de travail tels que HEAD, index, etc. `-` "
+"peut aussi 챗tre sp챕cifi챕 comme `<commit-esque>` ; il est synonyme de `@{-1}`."
#. type: Plain text
#: en/git-worktree.txt:58
@@ -56299,12 +57544,24 @@ msgstr "$ git worktree add --track -b <branche> <chemin> <distant>/<branche>\n"
#, priority:240
msgid "If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used, then, as a convenience, the new worktree is associated with a branch (call it `<branch>`) named after `$(basename <path>)`. If `<branch>` doesn't exist, a new branch based on HEAD is automatically created as if `-b <branch>` was given. If `<branch>` does exist, it will be checked out in the new worktree, if it's not checked out anywhere else, otherwise the command will refuse to create the worktree (unless `--force` is used)."
msgstr ""
+"Si `<commit-esque>` est omis et que ni `-b` ni `-B` ni `--detach` ne sont "
+"utilis챕s, alors, par commodit챕, le nouvel arbre de travail est associ챕 횪 une "
+"branche (appelez-la `<branche>`) nomm챕e d'apr챔s `$(basename <chemin>)`. Si "
+"`<branche>` n'existe pas, une nouvelle branche bas챕e sur HEAD est "
+"automatiquement cr챕챕e comme si `-b <branche>` 챕tait donn챕. Si `<branche>` "
+"existe, elle sera extraite dans le nouvel arbre de travail, si elle n'est "
+"pas extraite ailleurs, sinon la commande refusera de cr챕er l'arbre de "
+"travail (횪 moins que `--force` soit utilis챕)."
#. type: Plain text
#: en/git-worktree.txt:87
#, priority:240
msgid "List details of each worktree. The main worktree is listed first, followed by each of the linked worktrees. The output details include if the worktree is bare, the revision currently checked out, and the branch currently checked out (or 'detached HEAD' if none)."
msgstr ""
+"Lister les d챕tails de chaque arbre de travail. L'arbre de travail principal "
+"est list챕 en premier, suivi de chacun des arbres de travail li챕s. Les "
+"d챕tails de sortie comprennent si l'arbre de travail est vide, la r챕vision en "
+"cours et la branche en cours (ou \"HEAD d챕tach챕e\" s'il n'y en a pas)."
#. type: Labeled list
#: en/git-worktree.txt:88
@@ -56317,6 +57574,11 @@ msgstr "lock"
#, priority:240
msgid "If a working tree is on a portable device or network share which is not always mounted, lock it to prevent its administrative files from being pruned automatically. This also prevents it from being moved or deleted. Optionally, specify a reason for the lock with `--reason`."
msgstr ""
+"Si un arbre de travail se trouve sur un support amovible ou un partage "
+"r챕seau qui n'est pas toujours mont챕, le verrouiller pour 챕viter que ses "
+"fichiers administratifs ne soient 챕lagu챕s automatiquement. Cela permet "
+"챕galement d'챕viter qu'il soit d챕plac챕 ou supprim챕. Si vous le souhaitez, "
+"vous pouvez sp챕cifier une raison pour le verrouillage avec \"--reason\"."
#. type: Labeled list
#: en/git-worktree.txt:96
@@ -56329,18 +57591,26 @@ msgstr "move"
#, priority:240
msgid "Move a working tree to a new location. Note that the main working tree or linked working trees containing submodules cannot be moved."
msgstr ""
+"D챕placer un arbre de travail vers une nouvelle place. Notez que l'arbre de "
+"travail principal ou les arbres de travail li챕s contenant des sous-modules "
+"ne peuvent pas 챗tre d챕plac챕s."
#. type: Plain text
#: en/git-worktree.txt:104
#, priority:240
msgid "Prune working tree information in $GIT_DIR/worktrees."
-msgstr ""
+msgstr "횋laguer les informations de l'arbre de travail dans $GIT_DIR/worktrees."
#. type: Plain text
#: en/git-worktree.txt:111
#, priority:240
msgid "Remove a working tree. Only clean working trees (no untracked files and no modification in tracked files) can be removed. Unclean working trees or ones with submodules can be removed with `--force`. The main working tree cannot be removed."
msgstr ""
+"Supprimer un arbre en 챕tat de marche. Seules les arbres de travail propres ("
+"pas de fichiers non suivis et pas de modification dans les fichiers suivis) "
+"peuvent 챗tre supprim챕s. Les arbres de travail non propres ou ceux qui "
+"comportent des sous-modules peuvent 챗tre supprim챕s avec `---force`. L'arbre "
+"de travail principal ne peut pas 챗tre supprim챕."
#. type: Labeled list
#: en/git-worktree.txt:112
@@ -56353,24 +57623,37 @@ msgstr "unlock"
#, priority:240
msgid "Unlock a working tree, allowing it to be pruned, moved or deleted."
msgstr ""
+"D챕verrouiller un arbre de travail, ce qui permet de l'챕laguer, de le "
+"d챕placer ou de le supprimer."
#. type: Plain text
#: en/git-worktree.txt:127
#, priority:240
msgid "By default, `add` refuses to create a new working tree when `<commit-ish>` is a branch name and is already checked out by another working tree, or if `<path>` is already assigned to some working tree but is missing (for instance, if `<path>` was deleted manually). This option overrides these safeguards. To add a missing but locked working tree path, specify `--force` twice."
msgstr ""
+"Par d챕faut, `add` refuse de cr챕er un nouvel arbre de travail lorsque "
+"`<commit-esque>` est un nom de branche et est d챕j횪 extrait par un autre "
+"arbre de travail, ou si `<chemin>` est d챕j횪 assign챕 횪 un arbre de travail "
+"mais est manquant (par exemple, si `<chemin>` a 챕t챕 supprim챕 manuellement). "
+"Cette option annule ces protections. Pour ajouter un chemin d'arbre de "
+"travail manquant mais verrouill챕, sp챕cifiez `--force` deux fois."
#. type: Plain text
#: en/git-worktree.txt:130
#, priority:240
msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
msgstr ""
+"`move` refuse de d챕placer un arbre de travail verrouill챕 횪 moins que "
+"`--force` ne soit sp챕cifi챕 deux fois."
#. type: Plain text
#: en/git-worktree.txt:133
#, priority:240
msgid "`remove` refuses to remove an unclean working tree unless `--force` is used. To remove a locked working tree, specify `--force` twice."
msgstr ""
+"`remove` refuse de supprimer un arbre de travail sale 횪 moins que `--force` "
+"ne soit utilis챕. Pour supprimer un arbre de travail verrouill챕, il faut "
+"sp챕cifier deux fois `-- force`."
#. type: Labeled list
#: en/git-worktree.txt:134
@@ -56389,12 +57672,20 @@ msgstr "-B <nouvelle-branche>"
#, priority:240
msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree. If `<commit-ish>` is omitted, it defaults to HEAD. By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
msgstr ""
+"Avec `add`, cr챕er une nouvelle branche nomm챕e `<nouvelle-branche>` "
+"commen챌ant 횪 `<commit-esque>`, et extraire `<nouvelle-branche>` dans le "
+"nouvel arbre de travail. Si `<commit-esque>` est omis, la valeur par d챕faut "
+"est HEAD. Par d챕faut, `-b` refuse de cr챕er une nouvelle branche si elle "
+"existe d챕j횪. `-B` annule cette protection, en remettant `<nouvelle-branche>` "
+"횪 `<commit-esque>`."
#. type: Plain text
#: en/git-worktree.txt:146
#, priority:240
msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
msgstr ""
+"Avec `add`, d챕tacher HEAD dans le nouvel arbre de travail. Voir \"HEAD "
+"D횋TACH횋E\" dans linkgit:git-checkout[1]."
#. type: Labeled list
#: en/git-worktree.txt:147
@@ -56407,6 +57698,10 @@ msgstr "--[no-]checkout"
#, priority:240
msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
msgstr ""
+"Par d챕faut, `add`extrait `<commit-esque>`, cependant, `--no-checkout` peut "
+"챗tre utilis챕 pour annuler l'extraction afin de permettre des "
+"personnalisations, telles que la configuration de l'extraction partielle. "
+"Voir \"Extraction partielle\" dans linkgit:git-read-tree[1]."
#. type: Labeled list
#: en/git-worktree.txt:153
@@ -56419,12 +57714,19 @@ msgstr "--[no-]guess-remote"
#, priority:240
msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
msgstr ""
+"Avec `worktree add <chemin>`, sans `<commit-esque>`, au lieu de cr챕er une "
+"nouvelle branche 횪 partir de HEAD, s'il existe une branche de suivi "
+"d'exactement un distant correspondant au basename de `<chemin>`, baser la "
+"nouvelle branche sur la branche de suivi 횪 distance, et marquer la branche "
+"de suivi 횪 distance comme 챕tant \"amont\" de la nouvelle branche."
#. type: Plain text
#: en/git-worktree.txt:162
#, priority:240
msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
msgstr ""
+"Cela peut 챕galement 챗tre configur챕 comme le comportement par d챕faut en "
+"utilisant l'option de configuration `worktree.guessRemote`."
#. type: Labeled list
#: en/git-worktree.txt:163
@@ -56449,6 +57751,9 @@ msgstr "--lock"
#, priority:240
msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
msgstr ""
+"Garder l'arbre de travail verrouill챕 apr챔s la cr챕ation. C'est l'챕quivalent "
+"de `git worktree lock` apr챔s `git worktree add`, mais sans condition de "
+"comp챕tition."
#. type: Plain text
#: en/git-worktree.txt:178
@@ -56472,13 +57777,15 @@ msgstr "Avec 'add', supprimer les messages d'챕tat."
#: en/git-worktree.txt:191
#, priority:240
msgid "With `prune`, report all removals."
-msgstr ""
+msgstr "Avec `prune`, signaler toutes les suppressions."
#. type: Plain text
#: en/git-worktree.txt:194
#, priority:240
msgid "With `prune`, only expire unused working trees older than <time>."
msgstr ""
+"Avec `prune`, n'expirer que les arbres de travail inutilis챕s plus vieux que "
+"<temps>."
#. type: Labeled list
#: en/git-worktree.txt:195
@@ -56491,6 +57798,8 @@ msgstr "--reason <cha챤ne>"
#, priority:240
msgid "With `lock`, an explanation why the working tree is locked."
msgstr ""
+"Avec `lock`, une explication de la raison pour laquelle l'arbre de travail "
+"est verrouill챕."
#. type: Labeled list
#: en/git-worktree.txt:198
@@ -56503,150 +57812,247 @@ msgstr "<arbre-de-travail>"
#, priority:240
msgid "Working trees can be identified by path, either relative or absolute."
msgstr ""
+"Les arbres de travail peuvent 챗tre identifi챕s par leur chemin, qu'il soit "
+"relatif ou absolu."
#. type: Plain text
#: en/git-worktree.txt:206
#, priority:240
msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
msgstr ""
+"Si le dernier 챕l챕ment du chemin de l'arbre de travail est unique parmi les "
+"arbres de travail, il peut 챗tre utilis챕 pour identifier les arbres de "
+"travail. Par exemple, si vous n'avez que deux arbres de travail, 횪 \"/abc/"
+"def/ghi\" et \"/abc/def/ggg\", alors \"ghi\" ou \"def/ghi\" suffit 횪 "
+"indiquer le premier arbre de travail."
#. type: Title -
#: en/git-worktree.txt:208
#, no-wrap, priority:240
msgid "REFS"
-msgstr ""
+msgstr "R횋FS"
#. type: Plain text
#: en/git-worktree.txt:213
#, priority:240
msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
msgstr ""
+"Dans le cas de plusieurs arbres de travail, certaines r챕fs peuvent 챗tre "
+"partag챕es entre tous les arbres de travail, certaines r챕fs sont locales. Par "
+"exemple, HEAD est diff챕rente pour tous les arbres de travail. Cette section "
+"concerne les r챔gles de partage et la mani챔re d'acc챕der aux r챕f챕rences d'un "
+"arbre de travail 횪 partir d'un autre."
#. type: Plain text
#: en/git-worktree.txt:219
#, priority:240
msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
msgstr ""
+"En g챕n챕ral, toutes les pseudo r챕fs sont par arbre de travail et toutes les "
+"r챕fs commen챌ant par \"refs/\" sont partag챕es. Les pseudo r챕fs sont celles "
+"comme HEAD qui sont directement sous GIT_DIR au lieu d'챗tre 횪 l'int챕rieur de "
+"GIT_DIR/refs. Il y a une exception 횪 cela : les r챕fs 횪 l'int챕rieur de refs/"
+"bisect et refs/worktree ne sont pas partag챕es."
#. type: Plain text
#: en/git-worktree.txt:224
#, priority:240
msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
msgstr ""
+"Les r챕f챕rences par arbre de travail sont toujours accessibles 횪 partir d'un "
+"autre arbre de travail via deux chemins sp챕ciaux, l'arbre principal et les "
+"arbres de travail. Le premier donne acc챔s aux r챕f챕rences par arbre de "
+"travail de l'arbre de travail principal, tandis que le second donne acc챔s 횪 "
+"tous les arbres de travail li챕s."
#. type: Plain text
#: en/git-worktree.txt:231
#, priority:240
msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
msgstr ""
+"Par exemple, arbre-de-travail-principal/HEAD ou arbre-de-travail-principal/"
+"refs/bisect/good ont la m챗me valeur que la HEAD de l'arbre de travail "
+"principal et refs/bisect/good respectivement. De m챗me, worktrees/foo/HEAD ou "
+"worktrees/bar/refs/bisect/bad sont les m챗mes que GIT_COMMON_DIR/worktrees/"
+"foo/HEAD et GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
#. type: Plain text
#: en/git-worktree.txt:235
#, priority:240
msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
msgstr ""
+"Pour acc챕der aux r챕fs, il est pr챕f챕rable de ne pas regarder directement dans "
+"GIT_DIR. Utilisez plut척t des commandes telles que linkgit:git-rev-parse[1] "
+"ou linkgit:git-update-ref[1] qui g챔reront les r챕fs correctement."
#. type: Plain text
#: en/git-worktree.txt:242
#, priority:240
msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
msgstr ""
+"Par d챕faut, le fichier \"config\" du d챕p척t est partag챕 entre tous les arbres "
+"de travail. Si les variables de configuration `core.bare` ou `core.worktree` "
+"sont d챕j횪 pr챕sentes dans le fichier de configuration, elles ne seront "
+"appliqu챕es qu'aux arbres de travail principaux."
#. type: Plain text
#: en/git-worktree.txt:245
#, priority:240
msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
msgstr ""
+"Afin d'avoir une configuration sp챕cifique aux arbres de travail, vous pouvez "
+"activer l'extension \"worktreeConfig\", par exemple :"
#. type: delimited block -
#: en/git-worktree.txt:248
#, no-wrap, priority:240
msgid "$ git config extensions.worktreeConfig true\n"
-msgstr ""
+msgstr "$ git config extensions.worktreeConfig true\n"
#. type: Plain text
#: en/git-worktree.txt:254
#, priority:240
msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
msgstr ""
+"Dans ce mode, la configuration sp챕cifique reste dans le chemin indiqu챕 par `"
+"git rev-parse --git-path config.worktree`. Vous pouvez ajouter ou mettre 횪 "
+"jour la configuration dans ce fichier avec `git config --worktree`. Les "
+"anciennes versions de Git refuseront l'acc챔s aux d챕p척ts avec cette extension."
#. type: Plain text
#: en/git-worktree.txt:260
#, priority:240
msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
msgstr ""
+"Notez que dans ce fichier, l'exception pour `core.bare` et `core.worktree` a "
+"disparu. Si vous les avez dans $GIT_DIR/config avant, vous devez les "
+"d챕placer vers `config.worktree` de l'arbre de travail principal. Vous pouvez "
+"챕galement profiter de cette occasion pour revoir et d챕placer d'autres "
+"configurations que vous ne voulez pas partager dans tous les arbres de "
+"travail :"
#. type: Plain text
#: en/git-worktree.txt:262
#, priority:240
msgid "`core.worktree` and `core.bare` should never be shared"
-msgstr ""
+msgstr "`core.worktree` et `core.bare` ne devraient jamais 챗tre partag챕s"
#. type: Plain text
#: en/git-worktree.txt:265
#, priority:240
msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
msgstr ""
+"Il est recommand챕 de param챕trer `core.sparseCheckout` par arbre de travail, "
+"횪 moins que vous ne soyez s청r de toujours utiliser des extractions "
+"partielles pour tous les arbres de travail."
#. type: Title -
#: en/git-worktree.txt:267
#, no-wrap, priority:240
msgid "DETAILS"
-msgstr ""
+msgstr "D횋TAILS"
#. type: Plain text
#: en/git-worktree.txt:276
#, priority:240
msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory. The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
msgstr ""
+"Chaque arbre de travail li챕 poss챔de un sous-r챕pertoire priv챕 dans le "
+"r챕pertoire $ GIT_DIR / worktrees du d챕p척t. Le nom du sous-r챕pertoire priv챕 "
+"est g챕n챕ralement le nom de base du chemin de l'arbre de travail li챕, "
+"챕ventuellement accompagn챕 d'un num챕ro pour le rendre unique. Par exemple, "
+"lorsque `$GIT_DIR=/chemin/principal/ .git`, la commande`git worktree add /"
+"chemin/autre/test-prochain prochain` cr챕e l'arbre de travail li챕 dans `/path/"
+"autre/test-prochain` et aussi cr챕e un r챕pertoire `$GIT_DIR/worktrees/test-"
+"prochain` (ou`$GIT_DIR/worktrees/test-prochain1` si `test-prochain` est d챕j횪 "
+"pris)."
#. type: Plain text
#: en/git-worktree.txt:282
#, priority:240
msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
msgstr ""
+"Dans un arbre de travail li챕, $GIT_DIR est d챕fini pour pointer vers ce "
+"r챕pertoire priv챕 (par exemple, `/chemin/principal/.git/worktrees/test-"
+"prochain` dans l'exemple) et $GIT_COMMON_DIR est d챕fini pour pointer vers "
+"l'arbre de travail principal. $GIT_DIR (par exemple `/chemin/principal/.git`)"
+". Ces param챔tres sont d챕finis dans un fichier `.git` situ챕 dans le "
+"r챕pertoire sup챕rieur de l'arbre de travail li챕."
#. type: Plain text
#: en/git-worktree.txt:292
#, priority:240
msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
msgstr ""
+"La r챕solution du chemin via `git rev-parse --git-path` utilise soit $GIT_DIR "
+"soit $GIT_COMMON_DIR selon le chemin. Par exemple, dans l'arbre de travail "
+"li챕 `git rev-parse --git-path HEAD` renvoie `/chemin/principal/.git/"
+"worktrees/test-prochain/HEAD` (pas `/chemin/autre/test-prochain/.git/HEAD` "
+"ou `/chemin/principal/.git/HEAD`) tandis que `git rev-parse --git-path refs/"
+"heads/master` utilise $GIT_COMMON_DIR et retourne `/chemin/principal/.git/"
+"refs/heads/master`, puisque les r챕fs sont partag챕es sur tous les arbres de "
+"travail, sauf refs/bisect et refs/worktree."
#. type: Plain text
#: en/git-worktree.txt:297
#, priority:240
msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
msgstr ""
+"Voir linkgit:gitrepository-layout[5] pour plus d'informations. La r챔gle de "
+"base est de ne pas faire d'hypoth챔se sur l'appartenance d'un chemin 횪 $"
+"GIT_DIR ou $GIT_COMMON_DIR lorsque vous devez acc챕der directement 횪 quelque "
+"chose 횪 l'int챕rieur de $GIT_DIR. Utilisez `git rev-parse --git-path` pour "
+"obtenir le chemin final."
#. type: Plain text
#: en/git-worktree.txt:304
#, priority:240
msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
msgstr ""
+"Si vous d챕placez manuellement un arbre de travail li챕, vous devez mettre 횪 "
+"jour le fichier 'gitdir' dans le r챕pertoire de l'entr챕e. Par exemple, si un "
+"arbre de travail li챕 est d챕plac챕 vers `/nouveau-chemin/test-prochain` et que "
+"son fichier` .git` pointe vers `/chemin/principal/.git /worktrees/test-"
+"prochain`, puis mettez 횪 jour`/chemin/principal/.git/worktrees/test-prochain/"
+"gitdir` pour r챕f챕rencer `/nouveau-chemin/test-prochain` 횪 la place."
#. type: Plain text
#: en/git-worktree.txt:315
#, 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 ""
+"Pour 챕viter qu'une entr챕e $GIT_DIR/worktrees ne soit 챕lagu챕e (ce qui peut "
+"챗tre utile dans certaines situations, comme lorsque l'arbre de travail de "
+"l'entr챕e est stock챕 sur un support amovible), utilisez la commande `git "
+"worktree lock`, qui ajoute un fichier nomm챕 'locked' au r챕pertoire de "
+"l'entr챕e. Le fichier contient le motif en texte clair. Par exemple, si le "
+"fichier `.git` d'un arbre de travail li챕 pointe vers `/chemin/principal/.git/"
+"worktrees/test-prochain`, alors un fichier nomm챕 `/chemin/principal/.git/"
+"worktrees/test-prochain/locked` emp챗chera l'챕lagage de l'entr챕e `test-"
+"prochain`. Voir linkgit:gitrepository-layout[5] pour plus de d챕tails."
#. type: Plain text
#: en/git-worktree.txt:318
#, priority:240
msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
msgstr ""
+"Lorsque extensions.worktreeConfig est activ챕, le fichier de configuration `."
+"git/worktrees/<id>/config.worktree` est lu apr챔s `.git/config`."
#. type: Title -
#: en/git-worktree.txt:320
#, no-wrap, priority:240
msgid "LIST OUTPUT FORMAT"
-msgstr ""
+msgstr "FORMAT DE SORTIE DE LA LISTE"
#. type: Plain text
#: en/git-worktree.txt:323
#, priority:240
msgid "The worktree list command has two output formats. The default format shows the details on a single line with columns. For example:"
msgstr ""
+"La commande de liste d'arbres de travail a deux formats de sortie. Le "
+"format par d챕faut affiche les d챕tails sur une seule ligne avec des "
+"colonnes. Par exemple :"
#. type: delimited block -
#: en/git-worktree.txt:329
@@ -56657,18 +58063,28 @@ msgid ""
"/path/to/linked-worktree abcd1234 [master]\n"
"/path/to/other-linked-worktree 1234abc (detached HEAD)\n"
msgstr ""
+"$ git worktree list\n"
+"/chemin/vers/source-nu (bare)\n"
+"/chemin/vers/arbre-de-travail-li챕 abcd1234 [master]\n"
+"/chemin/vers/autre-arbre-de-travail-li챕 1234abc (detached HEAD)\n"
#. type: Title ~
#: en/git-worktree.txt:332
#, no-wrap, priority:240
msgid "Porcelain Format"
-msgstr ""
+msgstr "Format de la porcelaine"
#. type: Plain text
#: en/git-worktree.txt:338
#, priority:240
msgid "The porcelain format has a line per attribute. Attributes are listed with a label and value separated by a single space. Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true. The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record. For example:"
msgstr ""
+"Le format de porcelaine comporte une ligne par attribut. Les attributs sont "
+"챕num챕r챕s avec une 챕tiquette et une valeur s챕par챕es par un seul espace. Les "
+"attributs bool챕ens (comme 'bare' et 'detached') sont 챕num챕r챕s sous forme "
+"d'챕tiquette uniquement, et ne sont pr챕sents que si et seulement si la valeur "
+"est vraie. Le premier attribut d'un arbre de travail est toujours `worktree`"
+", une ligne vide indique la fin de l'enregistrement. Par exemple :"
#. type: delimited block -
#: en/git-worktree.txt:343
@@ -56678,6 +58094,9 @@ msgid ""
"worktree /path/to/bare-source\n"
"bare\n"
msgstr ""
+"$ git worktree list --porcelain\n"
+"worktree /chemin/vers/source-nu\n"
+"bare\n"
#. type: delimited block -
#: en/git-worktree.txt:347
@@ -56687,6 +58106,9 @@ msgid ""
"HEAD abcd1234abcd1234abcd1234abcd1234abcd1234\n"
"branch refs/heads/master\n"
msgstr ""
+"worktree /chemin/vers/arbre-de-travail-li챕\n"
+"HEAD abcd1234abcd1234abcd1234abcd1234abcd1234\n"
+"branch refs/heads/master\n"
#. type: delimited block -
#: en/git-worktree.txt:351
@@ -56696,12 +58118,24 @@ msgid ""
"HEAD 1234abc1234abc1234abc1234abc1234abc1234a\n"
"detached\n"
msgstr ""
+"worktree /chemin/vers/autre-arbre-de-travail-li챕\n"
+"HEAD 1234abc1234abc1234abc1234abc1234abc1234a\n"
+"detached\n"
#. type: Plain text
#: en/git-worktree.txt:364
#, priority:240
msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
msgstr ""
+"Vous 챗tes au milieu d'une s챕ance de refactorisation et votre patron arrive "
+"et exige que vous r챕pariez quelque chose imm챕diatement. Vous pouvez "
+"g챕n챕ralement utiliser linkgit:git-stash[1] pour stocker temporairement vos "
+"modifications, cependant, votre arbre de travail est dans un tel 챕tat de "
+"d챕sordre (avec des fichiers nouveaux, d챕plac챕s et supprim챕s, et d'autres "
+"챕l챕ments 챕parpill챕s) que vous ne voulez pas risquer d'en d챕ranger quoi que "
+"ce soit. Au lieu de cela, vous cr챕ez une arborescence de travail li챕e "
+"temporaire pour effectuer le correctif d'urgence, le supprimez lorsque vous "
+"avez termin챕, puis reprenez votre session de refactoring pr챕c챕dente."
#. type: delimited block -
#: en/git-worktree.txt:372
@@ -56714,12 +58148,21 @@ msgid ""
"$ popd\n"
"$ git worktree remove ../temp\n"
msgstr ""
+"$ git worktree add -b correctif-d-urgence ../temp master\n"
+"$ pushd ../temp\n"
+"# ... travail travail travail ...\n"
+"$ git commit -a -m 'correction en urgence pour le patron'\n"
+"$ popd\n"
+"$ git worktree remove ../temp\n"
#. type: Plain text
#: en/git-worktree.txt:379
#, priority:240
msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
msgstr ""
+"L'extraction multiple en g챕n챕ral est encore exp챕rimentale, et le support des "
+"sous-modules est incomplet. Il n'est PAS recommand챕 d'effectuer des "
+"extractions multiples d'un superprojet."
#. type: Title =
#: en/git-write-tree.txt:2
@@ -58318,42 +59761,70 @@ msgstr "Utilisez un di챔se '#' pour les commentaires qui sont soit sur leur prop
#, priority:240
msgid "Perform the merge and commit the result. This option can be used to override --no-commit."
msgstr ""
+"Effectuer la fusion et valider le r챕sultat. Cette option peut 챗tre utilis챕e "
+"pour passer outre --no-commit."
#. type: Plain text
#: en/merge-options.txt:9
#, priority:240
msgid "With --no-commit perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing."
msgstr ""
+"Avec --no-commit, effectuer la fusion et s'arr챗ter juste avant de cr챕er un "
+"commit de fusion, pour donner 횪 l'utilisateur une chance d'inspecter et de "
+"peaufiner le r챕sultat de la fusion avant de valider."
#. type: Plain text
#: en/merge-options.txt:14
#, priority:240
msgid "Note that fast-forward updates do not create a merge commit and therefore there is no way to stop those merges with --no-commit. Thus, if you want to ensure your branch is not changed or updated by the merge command, use --no-ff with --no-commit."
msgstr ""
+"Notez que les mises 횪 jour en avance rapide ne cr챕ent pas de commit de "
+"fusion et qu'il n'y a donc aucun moyen d'arr챗ter ces fusions avec --no-"
+"commit. Ainsi, si vous voulez vous assurer que votre branche n'est pas "
+"modifi챕e ou mise 횪 jour par la commande de fusion, utilisez --no-ff avec "
+"--no-commit."
#. type: Plain text
#: en/merge-options.txt:23
#, priority:240
msgid "Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge. The `--no-edit` option can be used to accept the auto-generated message (this is generally discouraged)."
msgstr ""
+"Avant de proc챕der 횪 une fusion automatis챕e r챕ussie, lancer un 챕diteur pour "
+"modifier le message de fusion g챕n챕r챕 automatiquement, afin que l'utilisateur "
+"puisse expliquer et justifier la fusion. L'option `--no-edit` peut 챗tre "
+"utilis챕e pour accepter le message g챕n챕r챕 automatiquement (ce qui est "
+"g챕n챕ralement d챕conseill챕)."
#. type: Plain text
#: en/merge-options.txt:27
#, priority:240
msgid "The `--edit` (or `-e`) option is still useful if you are giving a draft message with the `-m` option from the command line and want to edit it in the editor."
msgstr ""
+"L'option `--edit` (ou `-e`) est toujours utile si vous donnez un brouillon "
+"de message avec l'option `-m` de la ligne de commande et que vous voulez "
+"l'챕diter dans l'챕diteur."
#. type: Plain text
#: en/merge-options.txt:34
#, priority:240
msgid "Older scripts may depend on the historical behaviour of not allowing the user to edit the merge log message. They will see an editor opened when they run `git merge`. To make it easier to adjust such scripts to the updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be set to `no` at the beginning of them."
msgstr ""
+"Les scripts plus anciens peuvent d챕pendre du comportement historique de ne "
+"pas autoriser l'utilisateur 횪 modifier le message du journal de fusion. Ils "
+"verront un 챕diteur ouvert lorsqu'ils ex챕cuteront `git merge`. Pour faciliter "
+"l'ajustement de ces scripts au comportement mis 횪 jour, la variable "
+"d'environnement `GIT_MERGE_AUTOEDIT` peut 챗tre d챕finie sur `no` 횪 leur d챕but."
#. type: Plain text
#: en/merge-options.txt:41
#, 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 ""
+"Cette option d챕termine comment le message de fusion sera nettoy챕 avant "
+"d'챗tre envoy챕. Voir linkgit:git-commit[1] pour plus de d챕tails. De plus, si "
+"le '<mode>' a la valeur `scissors`, les ciseaux seront ajout챕s 횪 'MERGE_MSG' "
+"avant d'챗tre transmis 횪 la machinerie de commit dans le cas d'un conflit de "
+"fusion."
#. type: Labeled list
#: en/merge-options.txt:44
@@ -58366,24 +59837,39 @@ msgstr "--ff-only"
#, priority:240
msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history. `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
msgstr ""
+"Pr챕cise comment une fusion est trait챕e lorsque l'historique fusionn챕 est "
+"d챕j횪 un descendant de l'historique actuel. `--ff` est la valeur par d챕faut, "
+"sauf si l'on fusionne une 챕tiquette annot챕e (et 챕ventuellement sign챕e) qui "
+"n'est pas stock챕e 횪 sa place naturelle dans la hi챕rarchie `refs/tags/`, "
+"auquel cas `--no-ff` est suppos챕."
#. type: Plain text
#: en/merge-options.txt:55
#, priority:240
msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
msgstr ""
+"Avec `--ff`, lorsque c'est possible, r챕soudre la fusion comme une avance "
+"rapide (ne mettre 횪 jour le pointeur de branche que pour qu'il corresponde 횪 "
+"la branche fusionn챕e ; ne pas cr챕er de commit de fusion). Lorsque ce n'est "
+"pas possible (lorsque l'historique fusionn챕 n'est pas un descendant de "
+"l'historique actuel), cr챕er un commit de fusion."
#. type: Plain text
#: en/merge-options.txt:58
#, priority:240
msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
msgstr ""
+"Avec `--no-ff`, cr챕er un commit de fusion dans tous les cas, m챗me si la "
+"fusion peut 챗tre r챕solue en avance rapide."
#. type: Plain text
#: en/merge-options.txt:61
#, priority:240
msgid "With `--ff-only`, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status."
msgstr ""
+"Dans le cas `--ff-only`, il faut r챕soudre la fusion en avance rapide lorsque "
+"c'est possible. Lorsque ce n'est pas possible, refuser de fusionner et "
+"sortir avec un statut non nul."
#. type: Plain text
#: en/merge-options.txt:67
@@ -58396,12 +59882,17 @@ msgstr "Signer le commit r챕sultant de la fusion avec GPG. L'argument `idcl챕` e
#, priority:240
msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
msgstr ""
+"En plus des noms de branches, remplir le message du journal avec les "
+"descriptions d'une ligne depuis au maximum <n> commits r챕els qui sont en "
+"train d'챗tre fusionn챕s. Voir aussi linkgit:git-fmt-merge-msg[1]."
#. type: Plain text
#: en/merge-options.txt:76
#, priority:240
msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
msgstr ""
+"Avec --no-log, ne pas indiquer les descriptions d'une ligne des commits "
+"r챕els qui sont fusionn챕s."
#. type: Labeled list
#: en/merge-options.txt:78
@@ -58413,19 +59904,22 @@ msgstr "--no-signoff"
#: en/merge-options.txt:87
#, priority:240
msgid "With --no-signoff do not add a Signed-off-by line."
-msgstr ""
+msgstr "Avec --no-signoff ne pas ajouter de ligne Signed-off-by."
#. type: Plain text
#: en/merge-options.txt:93
#, priority:240
msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
msgstr ""
+"Afficher un diffstat 횪 la fin de la fusion. Le diffstat est 챕galement "
+"contr척l챕 par l'option de configuration merge.stat."
#. type: Plain text
#: en/merge-options.txt:96
#, priority:240
msgid "With -n or --no-stat do not show a diffstat at the end of the merge."
msgstr ""
+"Avec -n ou --no-stat, ne pas afficher de diffstat 횪 la fin de la fusion."
#. type: Labeled list
#: en/merge-options.txt:97
@@ -58444,18 +59938,27 @@ msgstr "--no-squash"
#, priority:240
msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit). This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
msgstr ""
+"Produire l'arbre de travail et l'챕tat d'index comme si une fusion r챕elle "
+"s'챕tait produite (sauf pour les informations de fusion), mais ne pas faire "
+"de commit, d챕placer la `HEAD`, ou enregistrer `$GIT_DIR/MERGE_HEAD` (pour "
+"forcer le prochain `git commit` 횪 cr챕er un commit de fusion). Cela vous "
+"permet de cr챕er un seul commit au-dessus de la branche actuelle dont l'effet "
+"est identique 횪 la fusion d'une autre branche (ou plus dans le cas d'une "
+"fusion pieuvre)."
#. type: Plain text
#: en/merge-options.txt:109
#, priority:240
msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
msgstr ""
+"Avec --no-squash, effectuer la fusion et valider le r챕sultat. Cette option "
+"peut 챗tre utilis챕e pour passer outre --squash."
#. type: Plain text
#: en/merge-options.txt:111
#, priority:240
msgid "With --squash, --commit is not allowed, and will fail."
-msgstr ""
+msgstr "Avec --squash, --commit n'est pas permis, et 챕chouera."
#. type: Plain text
#: en/merge-options.txt:115
@@ -58468,6 +59971,11 @@ msgstr "Cette option court-circuite les crochets pre-merge et commit-msg. Voir a
#, priority:240
msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried. If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
msgstr ""
+"Utiliser la strat챕gie de fusion donn챕e ; peut 챗tre fourni plus d'une fois "
+"pour sp챕cifier l'ordre dans lequel elles doivent 챗tre essay챕es. S'il n'y a "
+"pas d'option `-s`, une liste int챕gr챕e de strat챕gies est utilis챕e 횪 la place ("
+"'git merge-recursive' lors de la fusion d'une seule t챗te, 'git merge-"
+"octopus' sinon)."
#. type: Labeled list
#: en/merge-options.txt:124
@@ -58480,6 +59988,8 @@ msgstr "-X <option>"
#, priority:240
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
+"Faire passer l'option sp챕cifique de la strat챕gie de fusion 횪 la strat챕gie de "
+"fusion."
#. type: Labeled list
#: en/merge-options.txt:129
@@ -58498,6 +60008,11 @@ msgstr "--no-verify-signatures"
#, priority:240
msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key. If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
+"V챕rifier que le commit sommet de la branche lat챕rale 횪 fusionner est sign챕 "
+"avec une cl챕 valide, c'est-횪-dire une cl챕 qui a un uid valide : dans le "
+"mod챔le de confiance par d챕faut, cela signifie que la cl챕 de signature a 챕t챕 "
+"sign챕e par une cl챕 de confiance. Si le commit sommet de la branche lat챕rale "
+"n'est pas sign챕 avec une cl챕 valide, la fusion est annul챕e."
#. type: Labeled list
#: en/merge-options.txt:138
@@ -58510,6 +60025,8 @@ msgstr "--no-summary"
#, priority:240
msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
msgstr ""
+"Synonymes de --stat et --no-stat ; ils sont d챕conseill챕s et seront supprim챕s "
+"횪 l'avenir."
#. type: Plain text
#: en/merge-options.txt:146
@@ -58522,6 +60039,10 @@ msgstr "Mode Silencieux. Implique --no-progress."
#, priority:240
msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal. Note that not all merge strategies may support progress reporting."
msgstr ""
+"Activer/d챕sactiver explicitement l'affichage du progr챔s. Si aucun des deux "
+"n'est sp챕cifi챕, la progression est indiqu챕e si l'erreur standard est "
+"connect챕e 횪 un terminal. Notez que toutes les strat챕gies de fusion peuvent "
+"ne pas prendre en charge le rapport d'avancement."
#. type: Labeled list
#: en/merge-options.txt:160
@@ -58534,18 +60055,28 @@ msgstr "--allow-unrelated-histories"
#, priority:240
msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
msgstr ""
+"Par d챕faut, la commande `git merge` refuse de fusionner les historiques qui "
+"ne partagent pas un anc챗tre commun. Cette option peut 챗tre utilis챕e pour "
+"passer outre cette s챕curit챕 lors de la fusion des historiques de deux "
+"projets qui ont commenc챕 leur vie ind챕pendamment l'un de l'autre. Comme "
+"c'est une occasion tr챔s rare, il n'existe pas de variable de configuration "
+"pour activer cette option par d챕faut et elle ne sera pas ajout챕e."
#. type: Title -
#: en/merge-strategies.txt:2
#, no-wrap, priority:240
msgid "MERGE STRATEGIES"
-msgstr ""
+msgstr "LES STRAT횋GIES DE FUSION"
#. type: Plain text
#: en/merge-strategies.txt:8
#, priority:240
msgid "The merge mechanism (`git merge` and `git pull` commands) allows the backend 'merge strategies' to be chosen with `-s` option. Some strategies can also take their own options, which can be passed by giving `-X<option>` arguments to `git merge` and/or `git pull`."
msgstr ""
+"Le m챕canisme de fusion (commandes `git merge` et `git pull`) permet de "
+"choisir les 'strat챕gies de fusion' du backend avec l'option `-s`. Certaines "
+"strat챕gies peuvent 챕galement prendre leurs propres options, qui peuvent 챗tre "
+"pass챕es en donnant des arguments `-X<option>` 횪 `git merge` et/ou `git pull`."
#. type: Labeled list
#: en/merge-strategies.txt:9
@@ -58558,6 +60089,10 @@ msgstr "resolve"
#, priority:240
msgid "This can only resolve two heads (i.e. the current branch and another branch you pulled from) using a 3-way merge algorithm. It tries to carefully detect criss-cross merge ambiguities and is considered generally safe and fast."
msgstr ""
+"Cela ne peut r챕soudre que deux t챗tes (c'est-횪-dire la branche actuelle et "
+"une autre branche dont vous avez tir챕) en utilisant un algorithme de fusion "
+"횪 trois points. Cela essaie de d챕tecter avec soin les ambigu챦t챕s de la "
+"fusion crois챕e et est consid챕r챕 comme g챕n챕ralement s청r et rapide."
#. type: Labeled list
#: en/merge-strategies.txt:16
@@ -58570,12 +60105,23 @@ msgstr "recursive"
#, priority:240
msgid "This can only resolve two heads using a 3-way merge algorithm. When there is more than one common ancestor that can be used for 3-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3-way merge. This has been reported to result in fewer merge conflicts without causing mismerges by tests done on actual merge commits taken from Linux 2.6 kernel development history. Additionally this can detect and handle merges involving renames, but currently cannot make use of detected copies. This is the default merge strategy when pulling or merging one branch."
msgstr ""
+"Cela ne peut r챕soudre que deux t챗tes en utilisant un algorithme de fusion 횪 "
+"trois voies. Lorsqu'il y a plus d'un anc챗tre commun qui peut 챗tre utilis챕 "
+"pour la fusion 횪 trois, il cr챕e un arbre fusionn챕 des anc챗tres communs et "
+"l'utilise comme arbre de r챕f챕rence pour la fusion 횪 trois. Il a 챕t챕 "
+"rapport챕 que cela permettait de r챕duire les conflits de fusion sans "
+"provoquer de fausses fusions, gr창ce 횪 des tests effectu챕s sur de vraies "
+"fusions tir챕es de l'historique de d챕veloppement du noyau Linux 2.6. En "
+"outre, cela permet de d챕tecter et de g챕rer les fusions impliquant des "
+"renommages, mais ne peut actuellement pas utiliser les copies d챕tect챕es. "
+"C'est la strat챕gie de fusion par d챕faut lors de l'extraction ou de la fusion "
+"d'une branche."
#. type: Plain text
#: en/merge-strategies.txt:31
#, priority:240
msgid "The 'recursive' strategy can take the following options:"
-msgstr ""
+msgstr "La strat챕gie 'recursive' peut prendre les options suivantes :"
#. type: Labeled list
#: en/merge-strategies.txt:32 en/merge-strategies.txt:115
@@ -58588,12 +60134,21 @@ msgstr "ours"
#, priority:240
msgid "This option forces conflicting hunks to be auto-resolved cleanly by favoring 'our' version. Changes from the other tree that do not conflict with our side are reflected in the merge result. For a binary file, the entire contents are taken from our side."
msgstr ""
+"Cette option oblige 횪 r챕soudre les sections en conflit de mani챔re autonome "
+"et propre en favorisant notre version ('our'). Les modifications par "
+"rapport 횪 l'autre arbre qui n'entrent pas en conflit avec notre version se "
+"refl챔tent dans le r챕sultat de la fusion. Pour un fichier binaire, tout le "
+"contenu est pris de notre c척t챕."
#. type: Plain text
#: en/merge-strategies.txt:41
#, priority:240
msgid "This should not be confused with the 'ours' merge strategy, which does not even look at what the other tree contains at all. It discards everything the other tree did, declaring 'our' history contains all that happened in it."
msgstr ""
+"Il ne faut pas la confondre avec la strat챕gie de fusion 'ours', qui ne tient "
+"m챗me pas compte de ce que contient l'autre arbre. Elle rejette tout ce que "
+"l'autre arbre a fait, d챕clarant que \"notre\" historique ('our') contient "
+"tout ce qui s'y est pass챕."
#. type: Labeled list
#: en/merge-strategies.txt:42
@@ -58606,6 +60161,9 @@ msgstr "theirs"
#, priority:240
msgid "This is the opposite of 'ours'; note that, unlike 'ours', there is no 'theirs' merge strategy to confuse this merge option with."
msgstr ""
+"C'est le contraire de 'ours' ; notez que, contrairement 횪 'ours', il n'y a "
+"pas de strat챕gie de fusion 'theirs' avec laquelle confondre cette option de "
+"fusion."
#. type: Labeled list
#: en/merge-strategies.txt:46
@@ -58618,6 +60176,11 @@ msgstr "patience"
#, priority:240
msgid "With this option, 'merge-recursive' spends a little extra time to avoid mismerges that sometimes occur due to unimportant matching lines (e.g., braces from distinct functions). Use this when the branches to be merged have diverged wildly. See also linkgit:git-diff[1] `--patience`."
msgstr ""
+"Avec cette option, la 'merge-recursive' prend un peu plus de temps pour "
+"챕viter les erreurs de fusion qui se produisent parfois en raison de lignes "
+"de correspondance sans importance (par exemple, des accolades de fonctions "
+"distinctes). Utilisez cette option lorsque les branches 횪 fusionner ont "
+"diverg챕 de mani챔re importante. Voir aussi linkgit:git-diff[1] `--patience`."
#. type: Labeled list
#: en/merge-strategies.txt:53
@@ -58630,6 +60193,10 @@ msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
#, priority:240
msgid "Tells 'merge-recursive' to use a different diff algorithm, which can help avoid mismerges that occur due to unimportant matching lines (such as braces from distinct functions). See also linkgit:git-diff[1] `--diff-algorithm`."
msgstr ""
+"Indiquer 횪 la fonction 'merge-recursive' d'utiliser un algorithme de diff "
+"diff챕rent, ce qui peut aider 횪 챕viter les erreurs de fusion dues 횪 des "
+"lignes de correspondance sans importance (comme des accolades de fonctions "
+"distinctes). Voir aussi linkgit:git-diff[1] `--diff-algorithm`."
#. type: Labeled list
#: en/merge-strategies.txt:62
@@ -58642,24 +60209,34 @@ msgstr "ignore-cr-at-eol"
#, priority:240
msgid "Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge. Whitespace changes mixed with other changes to a line are not ignored. See also linkgit:git-diff[1] `-b`, `-w`, `--ignore-space-at-eol`, and `--ignore-cr-at-eol`."
msgstr ""
+"Traiter les lignes avec le type de changement d'espace indiqu챕 comme "
+"inchang챕es dans l'int챕r챗t d'une fusion 횪 trois points. Les changements "
+"d'espacement m챕lang챕s 횪 d'autres changements de ligne ne sont pas ignor챕s. "
+"Voir aussi linkgit:git-diff[1] `-b`, `-w`, `--ignore-space-at-eol`, et "
+"`--ignore-cr-at-eol`."
#. type: Plain text
#: en/merge-strategies.txt:71
#, priority:240
msgid "If 'their' version only introduces whitespace changes to a line, 'our' version is used;"
msgstr ""
+"Si \"leur\" version ('theirs') n'introduit que des changements d'espacement "
+"sur une ligne, \"notre\" version ('our') est utilis챕e ;"
#. type: Plain text
#: en/merge-strategies.txt:73
#, priority:240
msgid "If 'our' version introduces whitespace changes but 'their' version includes a substantial change, 'their' version is used;"
msgstr ""
+"Si \"notre\" version introduit des modifications dans l'espace blanc mais "
+"que \"leur\" version inclut un changement substantiel, \"leur\" version est "
+"utilis챕e ;"
#. type: Plain text
#: en/merge-strategies.txt:74
#, priority:240
msgid "Otherwise, the merge proceeds in the usual way."
-msgstr ""
+msgstr "Dans le cas contraire, la fusion se d챕roule de la mani챔re habituelle."
#. type: Labeled list
#: en/merge-strategies.txt:75
@@ -58672,6 +60249,12 @@ msgstr "renormalize"
#, priority:240
msgid "This runs a virtual check-out and check-in of all three stages of a file when resolving a three-way merge. This option is meant to be used when merging branches with different clean filters or end-of-line normalization rules. See \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5] for details."
msgstr ""
+"Il s'agit d'une extraction et d'un validation virtuelle des trois 챕tapes "
+"d'un fichier lors de la r챕solution d'une fusion 횪 trois points. Cette "
+"option est destin챕e 횪 챗tre utilis챕e lors de la fusion de branches avec "
+"diff챕rents filtres clean ou r챔gles de normalisation de fin de ligne. Voir \""
+"Fusion de branches avec diff챕rents attributs de validation/extraction\" dans "
+"linkgit:gitattributes[5] pour plus de d챕tails."
#. type: Labeled list
#: en/merge-strategies.txt:83
@@ -58684,6 +60267,8 @@ msgstr "no-renormalize"
#, priority:240
msgid "Disables the `renormalize` option. This overrides the `merge.renormalize` configuration variable."
msgstr ""
+"D챕sactiver l'option `renormalize`. Cela surcharge la variable de "
+"configuration `merge.renormalize` ."
#. type: Labeled list
#: en/merge-strategies.txt:87
@@ -58696,6 +60281,9 @@ msgstr "no-renames"
#, priority:240
msgid "Turn off rename detection. This overrides the `merge.renames` configuration variable. See also linkgit:git-diff[1] `--no-renames`."
msgstr ""
+"D챕sactiver la d챕tection de renommage. Ceci annule la variable de "
+"configuration `merge.renames`. Voir aussi linkgit:git-diff[1] `--no-"
+"renames`."
#. type: Labeled list
#: en/merge-strategies.txt:92
@@ -58708,30 +60296,39 @@ msgstr "find-renames[=<n>]"
#, 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 ""
+"Activer la d챕tection de renommage, en fixant 챕ventuellement le seuil de "
+"similarit챕. C'est la valeur par d챕faut. Cela surcharge la variable de "
+"configuration `merge.renames`. Voir aussi linkgit:git-diff[1] `--find-"
+"renames`."
#. type: Labeled list
#: en/merge-strategies.txt:98
#, no-wrap, priority:240
msgid "rename-threshold=<n>"
-msgstr ""
+msgstr "rename-threshold=<n>"
#. type: Plain text
#: en/merge-strategies.txt:100
#, priority:240
msgid "Deprecated synonym for `find-renames=<n>`."
-msgstr ""
+msgstr "Synonyme obsol챔te pour `find-renames=<n>`."
#. type: Labeled list
#: en/merge-strategies.txt:101
#, no-wrap, priority:240
msgid "subtree[=<path>]"
-msgstr ""
+msgstr "subtree[=<chemin>]"
#. type: Plain text
#: en/merge-strategies.txt:107
#, priority:240
msgid "This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be shifted to match with each other when merging. Instead, the specified path is prefixed (or stripped from the beginning) to make the shape of two trees to match."
msgstr ""
+"Cette option est une forme plus avanc챕e de strat챕gie 'subtree', o첫 la "
+"strat챕gie fait une estimation de la fa챌on dont deux arbres doivent 챗tre "
+"d챕plac챕s pour correspondre l'un 횪 l'autre lors de la fusion. Au lieu de "
+"cela, le chemin sp챕cifi챕 est pr챕fix챕 (ou tronqu챕 au debut) pour faire "
+"correspondre la forme de deux arbres."
#. type: Labeled list
#: en/merge-strategies.txt:108
@@ -58744,12 +60341,23 @@ msgstr "octopus"
#, priority:240
msgid "This resolves cases with more than two heads, but refuses to do a complex merge that needs manual resolution. It is primarily meant to be used for bundling topic branch heads together. This is the default merge strategy when pulling or merging more than one branch."
msgstr ""
+"Cela permet de r챕soudre les cas 횪 plus de deux t챗tes, mais refuse de faire "
+"une fusion complexe qui n챕cessite une r챕solution manuelle. C'est "
+"principalement destin챕 횪 챗tre utilis챕 pour regrouper les t챗tes de branches "
+"th챕matiques. C'est la strat챕gie de fusion par d챕faut lorsque l'on tire ou "
+"fusionne plusieurs branches."
#. type: Plain text
#: en/merge-strategies.txt:122
#, priority:240
msgid "This resolves any number of heads, but the resulting tree of the merge is always that of the current branch head, effectively ignoring all changes from all other branches. It is meant to be used to supersede old development history of side branches. Note that this is different from the -Xours option to the 'recursive' merge strategy."
msgstr ""
+"Cela r챕sout un nombre quelconque de t챗tes, mais l'arbre r챕sultant de la "
+"fusion est toujours celui de la t챗te de la branche actuelle, ignorant "
+"effectivement toutes les modifications provenant de toutes les autres "
+"branches. C'est cens챕 챗tre utilis챕 pour remplacer l'ancienne historique du "
+"d챕veloppement des branches lat챕rales. Notez que cette strat챕gie est "
+"diff챕rente de l'option -Xours de la strat챕gie de fusion 'recursive'."
#. type: Labeled list
#: en/merge-strategies.txt:123
@@ -58762,12 +60370,26 @@ msgstr "subtree"
#, priority:240
msgid "This is a modified recursive strategy. When merging trees A and B, if B corresponds to a subtree of A, B is first adjusted to match the tree structure of A, instead of reading the trees at the same level. This adjustment is also done to the common ancestor tree."
msgstr ""
+"Il s'agit d'une strat챕gie r챕cursive modifi챕e. Lors de la fusion des arbres A "
+"et B, si B correspond 횪 un sous-arbre de A, B est d'abord ajust챕 pour "
+"correspondre 횪 la structure arborescente de A, au lieu de lire les arbres au "
+"m챗me niveau. Cet ajustement est 챕galement effectu챕 sur l'arbre de l'anc챗tre "
+"commun."
#. type: Plain text
#: en/merge-strategies.txt:136
#, priority:240
msgid "With the strategies that use 3-way merge (including the default, 'recursive'), if a change is made on both branches, but later reverted on one of the branches, that change will be present in the merged result; some people find this behavior confusing. It occurs because only the heads and the merge base are considered when performing a merge, not the individual commits. The merge algorithm therefore considers the reverted change as no change at all, and substitutes the changed version instead."
msgstr ""
+"Avec les strat챕gies qui utilisent la fusion 횪 trois points (y compris la "
+"fusion par d챕faut, 'recursive'), si une modification est effectu챕e sur les "
+"deux branches, mais qu'elle est ensuite invers챕e sur l'une des branches, ce "
+"changement sera pr챕sent dans le r챕sultat de la fusion ; certaines personnes "
+"trouvent ce comportement d챕routant. Cela se produit parce que seules les "
+"t챗tes et la base de la fusion sont prises en compte lors d'une fusion, et "
+"non le commit individuel. L'algorithme de fusion consid챔re donc le "
+"changement invers챕 comme n'챕tant pas un changement du tout, et substitue la "
+"version modifi챕e 횪 la place."
#. type: Plain text
#: en/mergetools-merge.txt:2
@@ -59041,7 +60663,7 @@ msgid ""
"Commit: <committer>\n"
"CommitDate: <committer date>\n"
msgstr ""
-"commit <epreinte>\n"
+"commit <empreinte>\n"
"Author: <auteur>\n"
"AuthorDate: <date d'auteur>\n"
"Commit: <validateur>\n"
diff --git a/po/documentation.pl.po b/po/documentation.pl.po
index 19ec4b29fb31631ceb00390267d0270682b6c110..e57c9f308f8ba05bd637782a545447d5c3946242 100644
--- a/po/documentation.pl.po
+++ b/po/documentation.pl.po
@@ -7,15 +7,16 @@ 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-03 02:31+0000\n"
+"PO-Revision-Date: 2020-04-23 20:24+0000\n"
"Last-Translator: Michal Biesiada <blade-14@o2.pl>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.0-dev\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.0.2-dev\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
@@ -5153,7 +5154,7 @@ msgstr ""
#: en/fetch-options.txt:22 en/git-clone.txt:221 en/git-fetch-pack.txt:90
#, no-wrap, priority:300
msgid "--shallow-since=<date>"
-msgstr ""
+msgstr "--shallow-since=<data>"
#. type: Plain text
#: en/fetch-options.txt:25 en/git-fetch-pack.txt:93
@@ -5557,7 +5558,7 @@ msgstr "--verbose"
#: en/fetch-options.txt:230 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:150
#, priority:300
msgid "Be verbose."
-msgstr ""
+msgstr "B훳d탄 gadatliwy."
#. type: Labeled list
#: en/fetch-options.txt:232 en/git-bundle.txt:83 en/git-checkout.txt:111 en/git-clone.txt:129 en/git-format-patch.txt:350 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:69 en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:151
@@ -5581,13 +5582,18 @@ msgstr ""
#: 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 ""
+msgstr "--server-option=<parametr>"
#. type: Plain text
#: en/fetch-options.txt:246 en/git-clone.txt:142
#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
msgstr ""
+"Przeka탉 podany ci훳g do serwera podczas komunikacji przy u탉yciu protoko흢u w "
+"wersji 2. Podany ci훳g nie mo탉e zawiera훶 znaku NUL lub LF. Serwer obs흢uguje "
+"parametry serwera, w tym nieznane opcje, specyficzne dla niego. Po podaniu "
+"wielu opcji `--server-option = <option>`, wszystkie s훳 wysy흢ane na drug훳 "
+"stron휌 w kolejno힄ci podanej w wierszu polece흦."
#. type: Labeled list
#: en/fetch-options.txt:247
@@ -5665,7 +5671,7 @@ msgstr "NAZWA"
#: en/git-add.txt:7
#, priority:300
msgid "git-add - Add file contents to the index"
-msgstr ""
+msgstr "git-add - Dodaj zawarto힄훶 pliku do indeksu"
#. type: Title -
#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
@@ -5683,6 +5689,13 @@ msgid ""
"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n"
msgstr ""
+"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | "
+"-i] [--patch | -p]\n"
+"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
+"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] "
+"[--renormalize]\n"
+"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
@@ -5695,12 +5708,23 @@ msgstr "OPIS"
#, priority:300
msgid "This command updates the index using the current content found in the working tree, to prepare the content staged for the next commit. It typically adds the current content of existing paths as a whole, but with some options it can also be used to add content with only part of the changes made to the working tree files applied, or remove paths that do not exist in the working tree anymore."
msgstr ""
+"To polecenie aktualizuje indeks przy u탉yciu bie탉훳cej zawarto힄ci znalezionej "
+"w drzewie roboczym, aby przygotowa훶 zawarto힄훶 przygotowan훳 dla nast휌pnego "
+"zatwierdzenia. Zazwyczaj dodaje ca흢훳 bie탉훳c훳 zawarto힄훶 istniej훳cych "
+"힄cie탉ek, ale z niekt처rymi opcjami mo탉e by훶 r처wnie탉 u탉ywany do dodawania "
+"tylko cz휌힄ci zawarto힄ci, wprowadzonych do plik처w dzia흢aj훳cych drzew lub "
+"usuwa훶 힄cie탉ki, kt처re nie istniej훳 w dzia흢aj훳cym ju탉 drzewie."
#. type: Plain text
#: en/git-add.txt:31
#, priority:300
msgid "The \"index\" holds a snapshot of the content of the working tree, and it is this snapshot that is taken as the contents of the next commit. Thus after making any changes to the working tree, and before running the commit command, you must use the `add` command to add any new or modified files to the index."
msgstr ""
+"\"Indeks\" zawiera migawk휌 zawarto힄ci drzewa roboczego i jest to migawka, "
+"kt처ra jest pobierana jako zawarto힄훶 nast휌pnego zatwierdzenia. Tak wi휌c po "
+"dokonaniu jakichkolwiek zmian w drzewie roboczym i przed uruchomieniem "
+"polecenia commit nale탉y u탉y훶 polecenia \"add\", aby doda훶 nowe lub "
+"zmodyfikowane pliki do indeksu."
#. type: Plain text
#: en/git-add.txt:36
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 796ab4462f835470ea795639806a9d63e2080dc7..540dadf3164b2eda9b762f4fa1b840100be590b3 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -6,15 +6,15 @@ 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-01-02 15:21+0000\n"
-"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
+"PO-Revision-Date: 2020-04-25 12:25+0000\n"
+"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
"Language-Team: none\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.10\n"
+"X-Generator: Weblate 4.0.2-dev\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
@@ -110,7 +110,8 @@ msgstr "-S <arquivo-revs>"
#: en/blame-options.txt:30
#, priority:100
msgid "Use revisions from revs-file instead of calling linkgit:git-rev-list[1]."
-msgstr "Use revis천es do arquivo-revs no lugar de chamar linkgit:git-rev-list[1]."
+msgstr ""
+"Use revis천es do arquivo-revs no lugar de chamar linkgit:git-rev-list[1]."
#. type: Labeled list
#: en/blame-options.txt:31
@@ -176,7 +177,11 @@ msgstr "--encoding=<codifica챌찾o>"
#: en/blame-options.txt:58
#, priority:100
msgid "Specifies the encoding used to output author names and commit summaries. Setting it to `none` makes blame output unconverted data. For more information see the discussion about encoding in the linkgit:git-log[1] manual page."
-msgstr "Especifica o encoding usado para a sa챠da dos nomes dos autores e sum찼rios de commit. Setando isso para `none` faz com que a sa챠da do blame (culpa) n찾o seja convertida. Para maior informa챌찾o, veja a discuss찾o sobre encoding na p찼gina de manual linkgit:git-log[1]."
+msgstr ""
+"Especifica o encoding usado para a sa챠da dos nomes dos autores e sum찼rios de "
+"commit. Setando isso para `none` faz com que a sa챠da do blame (culpa) n찾o "
+"seja convertida. Para maior informa챌찾o, veja a discuss찾o sobre encoding na "
+"p찼gina de manual linkgit:git-log[1]."
#. type: Labeled list
#: en/blame-options.txt:59
@@ -200,7 +205,11 @@ msgstr "--date <formato>"
#: en/blame-options.txt:72
#, priority:100
msgid "Specifies the format used to output dates. If --date is not provided, the value of the blame.date config variable is used. If the blame.date config variable is also not set, the iso format is used. For supported values, see the discussion of the --date option at linkgit:git-log[1]."
-msgstr "Especifica o formato usado por datas de sa챠da. Se --date n찾o 챕 dado, o valor da vari찼vel de configura챌찾o blame.date 챕 usado. Se a vari찼vel blame.date n찾o est찼 setada, o formato iso 챕 usado. Para valores suportados, veja a discuss찾o da op챌찾o --date em linkgit:git-log[1]."
+msgstr ""
+"Especifica o formato usado por datas de sa챠da. Se --date n찾o 챕 dado, o valor "
+"da vari찼vel de configura챌찾o blame.date 챕 usado. Se a vari찼vel blame.date n찾o "
+"est찼 setada, o formato iso 챕 usado. Para valores suportados, veja a "
+"discuss찾o da op챌찾o --date em linkgit:git-log[1]."
#. type: Labeled list
#: en/blame-options.txt:73 en/git-fsck.txt:100
@@ -212,7 +221,11 @@ msgstr "--[no-]progress"
#: en/blame-options.txt:79
#, priority:100
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal. This flag enables progress reporting even if not attached to a terminal. Can't use `--progress` together with `--porcelain` or `--incremental`."
-msgstr "O status de progresso 챕 reportado na sa챠da padr찾o de erro por padr찾o quando est찼 anexado a um terminal. Esta flag habilita o relat처rio de progresso caso n찾o esteja anexado a um terminal. N찾o use `--progress` junto com `--porcelain` ou `--incremental`."
+msgstr ""
+"O status de progresso 챕 reportado na sa챠da padr찾o de erro por padr찾o quando "
+"est찼 anexado a um terminal. Esta flag habilita o relat처rio de progresso caso "
+"n찾o esteja anexado a um terminal. N찾o use `--progress` junto com "
+"`--porcelain` ou `--incremental`."
#. type: Labeled list
#: en/blame-options.txt:80
@@ -252,10 +265,9 @@ msgstr "<num> 챕 opcional mas ele 챕 o limite inferior no n첬mero de caracteres
#. type: Labeled list
#: en/blame-options.txt:113
-#, fuzzy, no-wrap, priority:100
-#| msgid "--ignore-removal"
+#, no-wrap, priority:100
msgid "--ignore-rev <rev>"
-msgstr "--ignore-removal"
+msgstr "--ignore-rev <rev>"
#. type: Plain text
#: en/blame-options.txt:124
@@ -265,10 +277,9 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:125
-#, fuzzy, no-wrap, priority:100
-#| msgid "--ignore-removal"
+#, no-wrap, priority:100
msgid "--ignore-revs-file <file>"
-msgstr "--ignore-removal"
+msgstr "--ignore-revs-file <arquivo>"
#. type: Plain text
#: en/blame-options.txt:131
@@ -370,7 +381,7 @@ msgstr "linkgit:git-instaweb[1]"
#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Instantly browse your working repository in gitweb."
-msgstr "Procura instantaneamente em seu reposit처rio de trabalho na gitweb."
+msgstr "Navegue instantaneamente no seu reposit처rio de trabalho com o gitweb."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
@@ -382,7 +393,7 @@ msgstr "linkgit:git-merge-tree[1]"
#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Show three-way merge without touching index."
-msgstr "Mostra as tr챗s vias de merge sem mexer no index."
+msgstr "exibe as tr챗s maneira de mesclagem sem mexer no 챠ndice."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
@@ -514,7 +525,9 @@ msgstr "linkgit:git-mergetool[1]"
#: en/cmds-ancillarymanipulators.txt:15
#, priority:100
msgid "Run merge conflict resolution tools to resolve merge conflicts."
-msgstr "Executa as ferramentas de resolu챌찾o de conflito de merge para resolver conflitos de merge."
+msgstr ""
+"Executa as ferramentas de resolu챌찾o de conflito de merge para resolver "
+"conflitos de merge."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
@@ -1064,10 +1077,9 @@ msgstr "linkgit:git-restore[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:90
-#, fuzzy, priority:100
-#| msgid "Switch branches or restore working tree files."
+#, priority:100
msgid "Restore working tree files."
-msgstr "Move branches ou restaura arquivos de 찼rvores de trabalho."
+msgstr "Restaura as 찼rvores de trabalho."
#. type: Plain text
#: en/cmds-mainporcelain.txt:91 en/git-cherry-pick.txt:240
@@ -1161,10 +1173,9 @@ msgstr "linkgit:git-switch[1]"
#. type: Plain text
#: en/cmds-mainporcelain.txt:114
-#, fuzzy, priority:100
-#| msgid "switch branch"
+#, priority:100
msgid "Switch branches."
-msgstr "comuta챌찾o de branch"
+msgstr "Altern창ncia entre ramos."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:115
@@ -1392,7 +1403,7 @@ msgstr "linkgit:git-show-index[1]"
#: en/cmds-plumbinginterrogators.txt:48
#, priority:100
msgid "Show packed archive index."
-msgstr "Mostra o index hist처rico compactado."
+msgstr "Mostra o index hist처rico compactado."
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:391
@@ -1786,8 +1797,7 @@ msgstr "linkgit:git-interpret-trailers[1]"
#. type: Plain text
#: en/cmds-purehelpers.txt:30
-#, fuzzy, priority:100
-#| msgid "add or parse structured information in commit messages."
+#, priority:100
msgid "Add or parse structured information in commit messages."
msgstr "Adiciona ou analisa informa챌찾o estruturada em mensagens de commit."
@@ -1813,7 +1823,7 @@ msgstr "linkgit:git-mailsplit[1]"
#: en/cmds-purehelpers.txt:36
#, priority:100
msgid "Simple UNIX mbox splitter program."
-msgstr "Programa simples do divisor UNIX mbox."
+msgstr "Programa simples do divisor UNIX mbox."
#. type: Labeled list
#: en/cmds-purehelpers.txt:37
@@ -1933,7 +1943,7 @@ msgstr "linkgit:git-shell[1]"
#: en/cmds-synchelpers.txt:15
#, priority:100
msgid "Restricted login shell for Git-only SSH access."
-msgstr "Shell de login restrito para acesso somente por SSH do Git."
+msgstr "Shell de login restrito para acesso somente por SSH do Git."
#. type: Labeled list
#: en/cmds-synchelpers.txt:16
@@ -2095,7 +2105,9 @@ msgstr "Uma linha que define um valor pode ser continuada na pr처xima linha fina
#: en/config.txt:75
#, priority:100
msgid "Inside double quotes, double quote `\"` and backslash `\\` characters must be escaped: use `\\\"` for `\"` and `\\\\` for `\\`."
-msgstr "Dentro de quotes duplos `\"`e barra invertida '\\' os caracteres podem ser usados literalmente: use `\\\"` para `\"` e `\\\\` para `\\`."
+msgstr ""
+"Dentro de quotes duplos `\"`e barra invertida '\\' os caracteres podem ser "
+"usados literalmente: use `\\\"` para `\"` e `\\\\` para `\\`."
#. type: Plain text
#: en/config.txt:80
@@ -2119,7 +2131,11 @@ msgstr "As se챌천es `include` e `includeIf` permitem incluir diretivas de config
#: en/config.txt:95
#, priority:100
msgid "You can include a config file from another by setting the special `include.path` (or `includeIf.*.path`) variable to the name of the file to be included. The variable takes a pathname as its value, and is subject to tilde expansion. These variables can be given multiple times."
-msgstr "Voc챗 pode incluir um arquivo de configura챌찾o de outro, definindo a vari찼vel especial `include.path` (ou `includeIf.*.path`) para o nome do arquivo a ser inclu챠do. A vari찼vel usa um nome-path como seu valor e est찼 sujeita 횪 expans찾o de til. essas vari찼veis podem ser dadas v찼rias vezes."
+msgstr ""
+"Voc챗 pode incluir um arquivo de configura챌찾o de outro, definindo a vari찼vel "
+"especial `include.path` (ou `includeIf.*.path`) para o nome do arquivo a ser "
+"inclu챠do. A vari찼vel usa um nome-path como seu valor e est찼 sujeita 횪 "
+"expans찾o de til. essas vari찼veis podem ser dadas v찼rias vezes."
#. type: Plain text
#: en/config.txt:101
@@ -2173,7 +2189,10 @@ msgstr "o arquivo git 챕."
#: en/config.txt:128
#, 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:"
-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 ""
+"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:"
#. type: Plain text
#: en/config.txt:131
@@ -2191,13 +2210,19 @@ msgstr "Se o padr찾o come챌a com `./`, ent찾o ele 챕 substitu챠do com o diret처r
#: en/config.txt:138
#, priority:100
msgid "If the pattern does not start with either `~/`, `./` or `/`, `**/` will be automatically prepended. For example, the pattern `foo/bar` becomes `**/foo/bar` and would match `/any/path/to/foo/bar`."
-msgstr "Se o padr찾o n찾o come챌a com `~/`, `./` ou `/`, `**/` ele ser찼 pr챕-anexado automaticamente. Por exemplo, o padr찾o `foo/bar` se torna `**/foo/bar` e pode casar com `/any/path/to/foo/bar`."
+msgstr ""
+"Se o padr찾o n찾o come챌a com `~/`, `./` ou `/`, `**/` ele ser찼 pr챕-anexado "
+"automaticamente. Por exemplo, o padr찾o `foo/bar` se torna `**/foo/bar` e "
+"pode casar com `/any/path/to/foo/bar`."
#. type: Plain text
#: en/config.txt:142
#, 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."
-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 casa \""
+"foo\" e tudo o que estiver dentro, recursivamente."
#. type: Labeled list
#: en/config.txt:143
@@ -2207,10 +2232,11 @@ msgstr "'gitdir/i'"
#. type: Plain text
#: en/config.txt:146
-#, fuzzy, priority:100
-#| msgid "This is the same as `gitdir` except that matching is done case-insensitively (e.g. on case-insensitive file sytems)"
+#, priority:100
msgid "This is the same as `gitdir` except that matching is done case-insensitively (e.g. on case-insensitive file systems)"
-msgstr "Isto 챕 o mesmo que `gitdir`exceto que casa ignorando mudan챌a de caixa (e.x. em sistemas de arquivo que ignoram mudan챌a de caixa)"
+msgstr ""
+"Isto 챕 o mesmo que `gitdir`exceto que casa ignorando mudan챌a de caixa (e.x. "
+"em sistemas de arquivo que ignoram mudan챌a de caixa)"
#. type: Labeled list
#: en/config.txt:147
@@ -2270,153 +2296,111 @@ msgstr "Exemplo"
#. type: delimited block -
#: en/config.txt:186
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "\t# Core variables\n"
-#| "\t[core]\n"
-#| "\t\t; Don't trust file modes\n"
-#| "\t\tfilemode = false\n"
+#, no-wrap, priority:100
msgid ""
"# Core variables\n"
"[core]\n"
"\t; Don't trust file modes\n"
"\tfilemode = false\n"
msgstr ""
-"\t# Principais vari찼veis\n"
-"\t[core]\n"
-"\t\t; N찾o confie nos modos de arquivo\n"
-"\t\tfilemode = false\n"
+"# Principais vari찼veis\n"
+"[core]\n"
+"\t; N찾o confie nos modos de arquivo\n"
+"\tfilemode = false\n"
#. type: delimited block -
#: en/config.txt:191
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "\t# Our diff algorithm\n"
-#| "\t[diff]\n"
-#| "\t\texternal = /usr/local/bin/diff-wrapper\n"
-#| "\t\trenames = true\n"
+#, no-wrap, priority:100
msgid ""
"# Our diff algorithm\n"
"[diff]\n"
"\texternal = /usr/local/bin/diff-wrapper\n"
"\trenames = true\n"
msgstr ""
-"\t# Nosso algoritmo de diff\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"# Nosso algoritmo diff\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
#. type: delimited block -
#: en/config.txt:195
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "\t[branch \"devel\"]\n"
-#| "\t\tremote = origin\n"
-#| "\t\tmerge = refs/heads/devel\n"
+#, no-wrap, priority:100
msgid ""
"[branch \"devel\"]\n"
"\tremote = origin\n"
"\tmerge = refs/heads/devel\n"
msgstr ""
-"\t[branch \"devel\"]\n"
-"\t\tremoto = origem\n"
-"\t\tmerge = refs/heads/devel\n"
+"[ramo \"devel\"]\n"
+"\tremote = origin\n"
+"\tmerge = refs/heads/devel\n"
#. type: delimited block -
#: en/config.txt:200
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "\t# Proxy settings\n"
-#| "\t[core]\n"
-#| "\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-#| "\t\tgitProxy=default-proxy ; for the rest\n"
+#, no-wrap, priority:100
msgid ""
"# Proxy settings\n"
"[core]\n"
"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
"\tgitProxy=default-proxy ; for the rest\n"
msgstr ""
-"\t# Configura챌천es de proxy\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" para \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy; para o resto\n"
+"# Configura챌천es de proxy\n"
+"[core]\n"
+"\tgitProxy=\"ssh\" for \"kernel.org\"\n"
+"\tgitProxy=default-proxy ; for the rest\n"
#. type: delimited block -
#: en/config.txt:205
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "\t[include]\n"
-#| "\t\tpath = /path/to/foo.inc ; include by absolute path\n"
-#| "\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
-#| "\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
+#, no-wrap, priority:100
msgid ""
"[include]\n"
"\tpath = /path/to/foo.inc ; include by absolute path\n"
"\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
"\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
msgstr ""
-"\t[include]\n"
-"\t\tpath = /path/to/foo.inc; incluir absolutamente pelo path\n"
-"\t\tpath = foo.inc; encontrar \"foo.inc\" em rela챌찾o ao arquivo atual\n"
-"\t\tpath = ~/foo.inc; encontre \"foo.inc\" no diret처rio `$HOME`\n"
+"[include]\n"
+"\tpath = /path/to/foo.inc ; inclu챠do atrav챕s de um caminho absoluto\n"
+"\tpath = foo.inc ; find \"foo.inc\" relativo ao arquivo atual\n"
+"\tpath = ~/foo.inc ; find \"foo.inc\" no seu diret처rio `$HOME`\n"
#. type: delimited block -
#: en/config.txt:209
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "\t; include if $GIT_DIR is /path/to/foo/.git\n"
-#| "\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-#| "\t\tpath = /path/to/foo.inc\n"
+#, no-wrap, priority:100
msgid ""
"; include if $GIT_DIR is /path/to/foo/.git\n"
"[includeIf \"gitdir:/path/to/foo/.git\"]\n"
"\tpath = /path/to/foo.inc\n"
msgstr ""
-"\t;inclua se $GIT_DIR for /path/to/foo/.git\n"
-"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; inclua caso $GIT_DIR seja /path/to/foo/.git\n"
+"[includeIf \"gitdir:/path/to/foo/.git\"]\n"
+"\tpath = /path/to/foo.inc\n"
#. type: delimited block -
#: en/config.txt:213
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "\t; include for all repositories inside /path/to/group\n"
-#| "\t[includeIf \"gitdir:/path/to/group/\"]\n"
-#| "\t\tpath = /path/to/foo.inc\n"
+#, no-wrap, priority:100
msgid ""
"; include for all repositories inside /path/to/group\n"
"[includeIf \"gitdir:/path/to/group/\"]\n"
"\tpath = /path/to/foo.inc\n"
msgstr ""
-"\t;incluir para todos os reposit처rios dentro de /path/to/group\n"
-"\t\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\t\tpath = /path/to/foo.inc\n"
+"; incluir para todos os reposit처rios dentro de /path/to/group\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
#. type: delimited block -
#: en/config.txt:217
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "\t; include for all repositories inside $HOME/to/group\n"
-#| "\t[includeIf \"gitdir:~/to/group/\"]\n"
-#| "\t\tpath = /path/to/foo.inc\n"
+#, no-wrap, priority:100
msgid ""
"; include for all repositories inside $HOME/to/group\n"
"[includeIf \"gitdir:~/to/group/\"]\n"
"\tpath = /path/to/foo.inc\n"
msgstr ""
-"\t; incluir para todos os reposit처rios dentro de $HOME/to/group\n"
-"\t[includeIf \"gitdir:~/to/group/\"]\n"
-"\t\tpath = /path/to/foo.inc\n"
+"; incluir para todos os reposit처rios dentro de $HOME/to/group\n"
+"[includeIf \"gitdir:~/to/group/\"]\n"
+"\tpath = /path/to/foo.inc\n"
#. type: delimited block -
#: en/config.txt:223
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "\t; relative paths are always relative to the including\n"
-#| "\t; file (if the condition is true); their location is not\n"
-#| "\t; affected by the condition\n"
-#| "\t[includeIf \"gitdir:/path/to/group/\"]\n"
-#| "\t\tpath = foo.inc\n"
+#, no-wrap, priority:100
msgid ""
"; relative paths are always relative to the including\n"
"; file (if the condition is true); their location is not\n"
@@ -2424,11 +2408,11 @@ msgid ""
"[includeIf \"gitdir:/path/to/group/\"]\n"
"\tpath = foo.inc\n"
msgstr ""
-"\t; paths relativos s찾o sempre relativos 횪 inclus찾o\n"
-"\t; arquivo (se a condi챌찾o inicial for verdadeira); sua localiza챌찾o n찾o 챕\n"
-"\t; afetada pela condi챌찾o\n"
-"\t[includeIf \"gitdir:/path/to/group/\"]\n"
-"\t\tpath = foo.inc\n"
+"; caminhos relativos s찾o sempre relativos 횪 inclus찾o\n"
+"; arquivo (se a condi챌찾o inicial for verdadeira); a sua localiza챌찾o n찾o 챕\n"
+"; afetada pela condi챌찾o\n"
+"[includeIf \"gitdir:/path/to/group/\"]\n"
+"\tpath = foo.inc\n"
#. type: Plain text
#: en/config.txt:229
@@ -2536,10 +2520,15 @@ msgstr "O valor de uma vari찼vel que pega uma cor de uma lista de cores (ao meno
#. type: Plain text
#: en/config.txt:269
-#, fuzzy, priority:100
-#| msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background."
+#, priority:100
msgid "The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and `white`. The first color given is the foreground; the second is the background. All the basic colors except `normal` have a bright variant that can be speficied by prefixing the color with `bright`, like `brightred`."
-msgstr "As cores b찼sicas aceitas s찾o `black` (preto) , `red` (vermelho) , `green` (verde), `yellow` (amarelo) , `blue` (azul), `magenta` (magenta), `cyan` (ciano) and `white` (branco) para o primeiro plano; o segundo 챕 o segundo plano."
+msgstr ""
+"As cores b찼sicas aceitas s찾o `normal` (normal), `black` (preto) , `red` "
+"(vermelho) , `green` (verde), `yellow` (amarelo) , `blue` (azul), `magenta` "
+"(magenta), `cyan` (ciano) and `white` (branco). A primeira cor 챕 o primeiro "
+"plano; a segundo 챕 o plano de fundo. Todas as cores b찼sicas exceto `normal` "
+"possuem uma variante brilhante que pode ser especificada prefixando a cor "
+"com `bright`, like `brightred`."
#. type: Plain text
#: en/config.txt:274
@@ -2575,7 +2564,11 @@ msgstr "caminho do diret처rio"
#: en/config.txt:300
#, priority:100
msgid "A variable that takes a pathname value can be given a string that begins with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the specified user's home directory."
-msgstr "Uma vari찼vel que recebe um valor de nome de caminho pode receber uma string que come챌a com \"`~/`\" ou \"`~user/`\", e a expans찾o usual do til acontece com essa string: `~/` 챕 expandida para o valor de `$HOME`, e `~user/` para o diret처rio inicial do usu찼rio especificado."
+msgstr ""
+"Uma vari찼vel que recebe um valor de nome de caminho pode receber uma string "
+"que come챌a com \"`~/`\" ou \"`~user/`\", e a expans찾o usual do til acontece "
+"com essa string: `~/` 챕 expandida para o valor de `$HOME`, e `~user/` para o "
+"diret처rio inicial do usu찼rio especificado."
#. type: Title ~
#: en/config.txt:303 en/git-imap-send.txt:58
@@ -2642,6 +2635,8 @@ msgstr "merge.verifySignatures"
#, priority:240
msgid "If true, this is equivalent to the --verify-signatures command line option. See linkgit:git-merge[1] for details."
msgstr ""
+"Se verdadeiro, isso 챕 equivalente 횪 op챌찾o de linha de comando --verify-"
+"signatures. Para mais detalhes consulte linkgit: git-merge [1]."
#. type: Labeled list
#: en/config/merge.txt:35
@@ -2750,6 +2745,8 @@ msgstr ""
#, priority:240
msgid "Defines a human-readable name for a custom low-level merge driver. See linkgit:gitattributes[5] for details."
msgstr ""
+"Define um nome leg챠vel para um driver de mesclagem personalizado de baixo "
+"n챠vel. Para obter mais detalhes consulte linkgit:gitattributes[5]."
#. type: Labeled list
#: en/config/merge.txt:99
@@ -2762,6 +2759,8 @@ msgstr ""
#, priority:240
msgid "Defines the command that implements a custom low-level merge driver. See linkgit:gitattributes[5] for details."
msgstr ""
+"Define o comando que implementa um driver de mesclagem personalizado de "
+"baixo n챠vel. Para mais detalhes consulte linkgit:gitattributes[5]."
#. type: Labeled list
#: en/config/merge.txt:103
@@ -2771,10 +2770,12 @@ msgstr ""
#. type: Plain text
#: en/config/merge.txt:106
-#, fuzzy, priority:240
-#| msgid "Files and directories with the attribute export-ignore won't be added to archive files. See linkgit:gitattributes[5] for details."
+#, priority:240
msgid "Names a low-level merge driver to be used when performing an internal merge between common ancestors. See linkgit:gitattributes[5] for details."
-msgstr "Arquivos e diret처rios com o atributo export-ignore n찾o ser찾o adicionados aos arquivos archive. Veja linkgit:gitattributes[5] para detalhes."
+msgstr ""
+"Nomeia um driver de mesclagem de baixo n챠vel que ser찼 usado durante uma "
+"fus찾o interna entre os ancestrais comuns. Para mais detalhes consulte "
+"linkgit:gitattributes[5]."
#. type: Labeled list
#: en/config/fmt-merge-msg.txt:1
@@ -3104,7 +3105,9 @@ msgstr "As letras de status C e R s찾o sempre seguidas por uma pontua챌찾o (indi
#: en/diff-format.txt:74
#, priority:280
msgid "<sha1> is shown as all 0's if a file is new on the filesystem and it is out of sync with the index."
-msgstr "<sha1> 챕 mostrado como todos os 0s se um arquivo for novo no sistema de arquivos e estiver fora de sincronia com o 챠ndice."
+msgstr ""
+"<sha1> 챕 mostrado como todos os 0s se um arquivo for novo no sistema de "
+"arquivos e estiver fora de sincronia com o 챠ndice."
#. type: Labeled list
#: en/diff-format.txt:76 en/git-svn.txt:499 en/git-svn.txt:539
@@ -3338,17 +3341,20 @@ msgstr "O extra `NUL` antes do caminho de pr챕-imagem no caso renomeado 챕 permi
#. type: Title -
#: en/diff-generate-patch.txt:2
-#, fuzzy, no-wrap, priority:260
-#| msgid "Generating patches with -p"
+#, no-wrap, priority:260
msgid "Generating patch text with -p"
-msgstr "Gerando patches com -p"
+msgstr "Gerando patches em texto com -p"
#. type: Plain text
#: en/diff-generate-patch.txt:14
-#, fuzzy, priority:260
-#| msgid "When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" with the \"-p\" option, they do not produce the output described above; instead they produce a patch file. You can customize the creation of such patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
+#, priority:260
msgid "Running linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], or linkgit:git-diff-files[1] with the `-p` option produces patch text. You can customize the creation of patch text via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables."
-msgstr "Quando \"git-diff-index\", \"git-diff-tree\", ou \"git-diff-files\" s찾o executados com a op챌찾o -p, git diff sem a op챌찾o `--raw`, ou git log \"com a op챌찾o\" -p, eles n찾o produzem a sa챠da descrita acima; em vez disso, eles produzem um arquivo de corre챌찾o. Voc챗 pode personalizar a cria챌찾o de tais corre챌천es atrav챕s das vari찼veis de ambiente `GIT_EXTERNAL_DIFF` e `GIT_DIFF_OPTS`."
+msgstr ""
+"Quando linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit"
+":git-diff-index[1], linkgit:git-diff-tree[1] ou linkgit:git-diff-files[1] "
+"s찾o executados com `-p`, a op챌찾o produz um patch em formato texto. Voc챗 pode "
+"personalizar a cria챌찾o de tais corre챌천es atrav챕s das vari찼veis de ambiente "
+"`GIT_EXTERNAL_DIFF` e `GIT_DIFF_OPTS`."
#. type: Plain text
#: en/diff-generate-patch.txt:17
@@ -3434,10 +3440,12 @@ msgstr "O 챠ndice de similaridade 챕 a porcentagem de linhas inalteradas e o 챠n
#. type: Plain text
#: en/diff-generate-patch.txt:59
-#, fuzzy, priority:260
-#| msgid "The index line includes the SHA-1 checksum before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
+#, priority:260
msgid "The index line includes the blob object names before and after the change. The <mode> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode."
-msgstr "A linha de 챠ndice inclui a soma de verifica챌찾o SHA-1 antes e depois da altera챌찾o. O <mode> 챕 inclu챠do se o modo de arquivo n찾o mudar; caso contr찼rio, linhas separadas indicam o modo antigo e o novo."
+msgstr ""
+"A linha do 챠ndice inclui a soma da verifica챌찾o SHA-1 antes e depois da "
+"altera챌찾o. O <mode> 챕 incluso caso o modo de arquivo n찾o mude; caso "
+"contr찼rio, linhas separadoras indicam o modo antigo e o novo."
#. type: Plain text
#: en/diff-generate-patch.txt:63
@@ -3471,10 +3479,9 @@ msgstr ""
#. type: Title -
#: en/diff-generate-patch.txt:78
-#, fuzzy, no-wrap, priority:260
-#| msgid "combined diff format"
+#, no-wrap, priority:260
msgid "Combined diff format"
-msgstr "formato diff combinado"
+msgstr "Formato diff combinado"
#. type: Plain text
#: en/diff-generate-patch.txt:86
@@ -3484,8 +3491,7 @@ msgstr "Qualquer comando gerador de diff pode pegar a op챌찾o `-c` ou `--cc` par
#. type: Plain text
#: en/diff-generate-patch.txt:88
-#, fuzzy, priority:260
-#| msgid "A 'combined diff' format looks like this:"
+#, priority:260
msgid "A \"combined diff\" format looks like this:"
msgstr "Um formato 'diff combinado' 챕 assim:"
@@ -3559,10 +3565,11 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:121
-#, fuzzy, priority:260
-#| msgid "It is preceded with a \"git diff\" header, that looks like this (when `-c` option is used):"
+#, priority:260
msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
-msgstr "Ele 챕 percebido por um cabe챌alho \"git diff\", que se parece com isso (quando a op챌찾o `-c` 챕 usada):"
+msgstr ""
+"Ele 챕 percebido por um cabe챌alho \"git diff\" que se parece com isso (quando "
+"a op챌찾o `-c` 챕 usada):"
#. type: Plain text
#: en/diff-generate-patch.txt:123
@@ -3572,8 +3579,7 @@ msgstr "diff --arquivo combinado\n"
#. type: Plain text
#: en/diff-generate-patch.txt:125
-#, fuzzy, priority:260
-#| msgid "or like this (when `--cc` option is used):"
+#, priority:260
msgid "or like this (when the `--cc` option is used):"
msgstr "ou assim (quando a op챌찾o `--cc` 챕 usada):"
@@ -3647,10 +3653,14 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:169
-#, fuzzy, priority:260
-#| msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant for apply. The change is similar to the change in the extended 'index' header:"
+#, priority:260
msgid "Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format was created for review of merge commit changes, and was not meant to be applied. The change is similar to the change in the extended 'index' header:"
-msgstr "O formato do cabe챌alho do peda챌o 챕 modificado para evitar que as pessoas o carreguem acidentalmente para `patch -p1`. O formato diff combinado foi criado para revisar as altera챌천es de consolida챌찾o de mesclagem, e n찾o foi feito para ser aplicado. A mudan챌a 챕 semelhante 횪 altera챌찾o no cabe챌alho 'index' estendido:"
+msgstr ""
+"O formato do cabe챌alho do peda챌o 챕 modificado para evitar que as pessoas o "
+"carreguem acidentalmente para `patch -p1`. O formato diff combinado foi "
+"criado para revisar as altera챌천es de consolida챌찾o de mesclagem e n찾o foi "
+"feito para ser aplicado. A mudan챌a 챕 semelhante 횪 altera챌찾o no cabe챌alho "
+"'index' estendido:"
#. type: Plain text
#: en/diff-generate-patch.txt:171
@@ -3756,10 +3766,11 @@ msgstr "--unified=<n>"
#. type: Plain text
#: en/diff-options.txt:40
-#, fuzzy, priority:280
-#| msgid "Generate diffs with <n> lines of context instead of the usual three."
+#, priority:280
msgid "Generate diffs with <n> lines of context instead of the usual three. Implies `--patch`."
-msgstr "Gere diffs com <n> linhas de contexto em vez das tr챗s usuais."
+msgstr ""
+"Gere diffs com <n> linhas de contexto em vez das tr챗s usuais. Implica no uso "
+"da op챌찾o `--patch`."
#. type: Plain text
#: en/diff-options.txt:42
@@ -3775,8 +3786,7 @@ msgstr "--sa챠da=<arquivo>"
#. type: Plain text
#: en/diff-options.txt:46
-#, fuzzy, priority:280
-#| msgid "Write the archive to <file> instead of stdout."
+#, priority:280
msgid "Output to a specific file instead of stdout."
msgstr "Escreva o arquivo para <arquivo> em vez de stdout."
@@ -4044,10 +4054,9 @@ msgstr "Sa챠da apenas a 첬ltima linha do formato `--stat` contendo o n첬mero tot
#. type: Labeled list
#: en/diff-options.txt:161
-#, fuzzy, ignore-ellipsis, no-wrap, priority:280
-#| msgid "--dirstat[=<param1,param2,...>]"
+#, ignore-ellipsis, no-wrap, priority:280
msgid "-X[<param1,param2,...>]"
-msgstr "--dirstat[=<param1,param2,...>]"
+msgstr "-X[<param1,param2,...>]"
#. type: Labeled list
#: en/diff-options.txt:162
@@ -4135,24 +4144,21 @@ msgstr "--cumulative"
#. type: Plain text
#: en/diff-options.txt:208
-#, fuzzy, priority:280
-#| msgid "Synonym for `-p --stat`."
+#, priority:280
msgid "Synonym for --dirstat=cumulative"
-msgstr "Sin척nimo para `-p --stat`."
+msgstr "Sin척nimo para --dirstat=cumulative"
#. type: Labeled list
#: en/diff-options.txt:209
-#, fuzzy, ignore-ellipsis, no-wrap, priority:280
-#| msgid "--dirstat[=<param1,param2,...>]"
+#, ignore-ellipsis, no-wrap, priority:280
msgid "--dirstat-by-file[=<param1,param2>...]"
-msgstr "--dirstat[=<param1,param2,...>]"
+msgstr "--dirstat-by-file[=<param1,param2>...]"
#. type: Plain text
#: en/diff-options.txt:211
-#, fuzzy, ignore-ellipsis, priority:280
-#| msgid "--dirstat[=<param1,param2,...>]"
+#, ignore-ellipsis, priority:280
msgid "Synonym for --dirstat=files,param1,param2..."
-msgstr "--dirstat[=<param1,param2,...>]"
+msgstr "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
@@ -4292,7 +4298,7 @@ msgstr "\tIsso pode ser usado para substituir as configura챌천es.\n"
#: en/diff-options.txt:273
#, no-wrap, priority:280
msgid "\tIt is the same as `--color=never`.\n"
-msgstr "\t횋 o mesmo que `--color=never`.\n"
+msgstr "\t횋 o mesmo que `--color=never`.\n"
#. type: Labeled list
#: en/diff-options.txt:274
@@ -4616,7 +4622,7 @@ msgstr "--[no-]rename-empty"
#: en/diff-options.txt:408
#, priority:280
msgid "Whether to use empty blobs as rename source."
-msgstr ""
+msgstr "Se usa ou n찾o gotas vazias como origem do nome."
#. type: Labeled list
#: en/diff-options.txt:410 en/git-apply.txt:58
@@ -4652,7 +4658,10 @@ msgstr "--full-index"
#: en/diff-options.txt:436
#, priority:280
msgid "Instead of the first handful of characters, show the full pre- and post-image blob object names on the \"index\" line when generating patch format output."
-msgstr "Em vez do primeiro punhado de caracteres, mostre os nomes completos dos objetos blob de pr챕 e p처s-imagem na linha \"index\" ao gerar a sa챠da do formato patch."
+msgstr ""
+"Em vez de um primeiro punhado de caracteres, exiba os nomes completos antes "
+"e depois dos objetos gota na linha \"index\" ao gerar um formato patch na "
+"sa챠da."
#. type: Labeled list
#: en/diff-options.txt:437 en/git-apply.txt:160
@@ -4662,10 +4671,11 @@ msgstr "--binary"
#. type: Plain text
#: en/diff-options.txt:440
-#, fuzzy, priority:280
-#| msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`."
+#, priority:280
msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`. Implies `--patch`."
-msgstr "Al챕m de `--full-index`, gera um diff bin찼rio que pode ser aplicado com` git-apply`."
+msgstr ""
+"Al챕m de `--full-index`, gera um diff bin찼rio que pode ser aplicado com `git-"
+"apply`. Implica no uso da op챌찾o `--patch`."
#. type: Labeled list
#: en/diff-options.txt:441 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
@@ -4699,10 +4709,18 @@ msgstr "Pausa completa reescreve as altera챌천es em pares de excluir e criar. Is
#. type: Plain text
#: en/diff-options.txt:463
-#, fuzzy, priority:280
-#| msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
+#, priority:280
msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
-msgstr "Ela afeta a forma como uma mudan챌a que equivale a uma reescrita total de um arquivo n찾o como uma s챕rie de exclus찾o e inser챌찾o misturadas com poucas linhas que correspondem textualmente ao contexto, mas como uma 첬nica exclus찾o de tudo o que 챕 antigo seguido por uma inser챌찾o 첬nica de tudo novo, e o n첬mero `m` controla este aspecto da op챌찾o -B (o padr찾o 챕 60%). \"-B / 70%\" especifica que menos de 30% do original deve permanecer no resultado para o Git consider찼-lo uma reescrita total (isto 챕, o patch resultante ser찼 uma s챕rie de dele챌찾o e inser챌찾o misturadas com linhas de contexto)."
+msgstr ""
+"Ela afeta a forma como uma mudan챌a que equivale a uma reescrita total de um "
+"arquivo e n찾o como uma s챕rie de exclus찾o e inser챌찾o misturadas com poucas "
+"linhas que correspondem textualmente ao conte첬do, e sim como uma 첬nica "
+"exclus찾o de tudo o que 챕 antigo seguido por uma inser챌찾o 첬nica de tudo que "
+"for novo, o n첬mero `m` controla este aspecto da op챌찾o -B (o padr찾o 챕 60%). `-"
+"B / 70%` determina que menos que 30% do original deve permanecer no "
+"resultado para que o Git considere uma reescrita total (isto 챕, o patch "
+"resultante ser찼 uma s챕rie de dele챌찾o e inser챌찾o misturadas com linhas de "
+"contexto)."
#. type: Plain text
#: en/diff-options.txt:471
@@ -4899,26 +4917,24 @@ msgstr "Para ilustrar a diferen챌a entre `-S <regex> --pickaxe-regex` e` -G <reg
#. type: delimited block -
#: en/diff-options.txt:573
-#, fuzzy, ignore-ellipsis, no-wrap, priority:280
-#| msgid ""
-#| "+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
-#| "...\n"
-#| "- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+#, ignore-ellipsis, no-wrap, priority:280
msgid ""
"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
msgstr ""
-"+�� return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
+"+ return frotz(nitfol, two->ptr, 1, 0);\n"
"...\n"
-"-...hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
+"- hit = frotz(nitfol, mf2.ptr, 1, 0);\n"
#. type: Plain text
#: en/diff-options.txt:578
-#, fuzzy, priority:280
-#| msgid "While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
+#, priority:280
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\" regexec\\(regexp\"` mostrar찼 este commit, `git log -S\" regexec\\(regexp\"--pickaxe-regex` n찾o ser찼 (porque o n첬mero de ocorr챗ncias dessa string n찾o foi alterado) ."
+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) ."
#. type: Plain text
#: en/diff-options.txt:581
@@ -4948,7 +4964,9 @@ msgstr "Procure por diferen챌as que alterem o n첬mero de ocorr챗ncias do objeto
#: en/diff-options.txt:593
#, priority:280
msgid "The object can be a blob or a submodule commit. It implies the `-t` option in `git-log` to also find trees."
-msgstr "O objeto pode ser um blob ou um subm처dulo commit. Isso implica que a op챌찾o `-t` em` git-log` tamb챕m encontre 찼rvores."
+msgstr ""
+"O objeto pode ser uma gota ou um commit do subm처dulo. Para tamb챕m encontrar "
+"찼rvores, fa챌a uso da op챌찾o `-t` tamb챕m no `git-log`."
#. type: Labeled list
#: en/diff-options.txt:594
@@ -5592,10 +5610,14 @@ msgstr "--refmap=<refspec>"
#. type: Plain text
#: en/fetch-options.txt:147
-#, fuzzy, priority:220
-#| msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. See section on \"Configured Remote-tracking Branches\" for details."
+#, priority:220
msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository. Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
-msgstr "Ao buscar refs listadas na linha de comando, use o refspec especificado (pode ser fornecido mais de uma vez) para mapear os refs para filiais de rastreamento remoto, em vez dos valores das vari찼veis de configura챌찾o `remote.*.Fetch` para o reposit처rio remoto. Consulte a se챌찾o \"Ramifica챌천es de rastreamento remoto configuradas\" para detalhes."
+msgstr ""
+"Ao buscar refs listadas na linha de comando, use o refspec especificado ("
+"pode ser fornecido mais de uma vez) para mapear os refs para filiais de "
+"rastreamento remoto, em vez dos valores das vari찼veis de configura챌찾o "
+"`remote.*.Fetch` para o reposit처rio remoto. Consulte a se챌찾o \"Ramifica챌천es "
+"de rastreamento remoto configuradas\" para detalhes."
#. type: Labeled list
#: en/fetch-options.txt:149 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
@@ -5641,9 +5663,14 @@ msgstr ""
#. type: Plain text
#: en/fetch-options.txt:176
-#, priority:220
+#, fuzzy, 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"
+":git-config[1])."
#. type: Plain text
#: en/fetch-options.txt:179
@@ -5779,10 +5806,15 @@ msgstr "--servidor-op챌찾o=<option>"
#. type: Plain text
#: en/fetch-options.txt:246 en/git-clone.txt:142
-#, fuzzy, priority:300
-#| msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
+#, priority:300
msgid "Transmit the given string to the server when communicating using protocol version 2. The given string must not contain a NUL or LF character. The server's handling of server options, including unknown ones, is server-specific. When multiple `--server-option=<option>` are given, they are all sent to the other side in the order listed on the command line."
-msgstr "Transmita a string fornecida para o servidor ao se comunicar usando o protocolo vers찾o 2. A string fornecida n찾o deve conter um caractere NUL ou LF. Quando m첬ltiplos `--server-option=<option>` s찾o fornecidos, todos eles s찾o enviados para o outro lado na ordem listada na linha de comando."
+msgstr ""
+"Transmita a string fornecida para o servidor ao se comunicar usando o "
+"protocolo vers찾o 2. A string fornecida n찾o deve conter um caractere NUL ou "
+"LF. A maneira que o servidor lida com as op챌천es do servidor espec챠ficas para "
+"ele, incluindo as op챌천es desconhecidas. Quando m첬ltiplos `--server-"
+"option=<option>` s찾o fornecidos, todos eles s찾o enviados para o outro lado "
+"na ordem listada na linha de comando."
#. type: Labeled list
#: en/fetch-options.txt:247
@@ -5792,9 +5824,12 @@ msgstr "--show-forced-updates"
#. type: Plain text
#: en/fetch-options.txt:252
-#, priority:220
+#, fuzzy, 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]."
#. type: Labeled list
#: en/fetch-options.txt:253
@@ -5804,9 +5839,14 @@ msgstr "--no-show-forced-updates"
#. type: Plain text
#: en/fetch-options.txt:259
-#, priority:220
+#, fuzzy, 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]."
#. type: Labeled list
#: en/fetch-options.txt:260 en/git-push.txt:398
@@ -5870,12 +5910,7 @@ msgstr "SINOPSE"
#. type: Plain text
#: en/git-add.txt:16
-#, fuzzy, ignore-ellipsis, no-wrap, priority:300
-#| msgid ""
-#| "'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
-#| "\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
-#| "\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
-#| "\t [--chmod=(+|-)x] [--] [<pathspec>...]\n"
+#, ignore-ellipsis, no-wrap, priority:300
msgid ""
"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
@@ -5883,10 +5918,13 @@ msgid ""
"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n"
msgstr ""
-"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interativo | -i] [--patch | -p]\n"
-"\t [--edit | -e] [- [no-]todos | - [no-]ignorar-remo챌찾o| [--update | -u]]\n"
-"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
-"\t [--chmod = (+ | -) x] [-] [<pathspec> ...]\n"
+"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | "
+"-i] [--patch | -p]\n"
+"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
+"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] "
+"[--renormalize]\n"
+"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"\t [--] [<pathspec>...]\n"
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
@@ -6178,16 +6216,21 @@ msgstr "Substituir o bit execut찼vel dos arquivos adicionados. O bit execut찼vel
#. type: Labeled list
#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:106 en/git-restore.txt:117 en/git-rm.txt:78 en/git-stash.txt:198
-#, fuzzy, no-wrap, priority:300
-#| msgid "--ignore-removal"
+#, no-wrap, priority:300
msgid "--pathspec-from-file=<file>"
-msgstr "--ignore-removal"
+msgstr "--pathspec-from-file=<file>"
#. type: Plain text
#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
msgstr ""
+"Pathspec 챕 passado em `<file>` em vez de argumentos da linha de comando. "
+"Caso `<file>` seja exatamente `-` ent찾o a entrada padr찾o 챕 usada. Os "
+"elementos pathspec s찾o separados por LF ou CR/LF. Os elementos pathspec "
+"podem ser citados conforme explicado na configura챌찾o da vari찼vel "
+"'core.quotePath' (consulte linkgit:git-config[1]). Consulte tamb챕m "
+"`-pathspec-file-nul` e global `-literal-pathspecs`."
#. type: Labeled list
#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
@@ -6200,6 +6243,10 @@ msgstr "--pathspec-file-nul"
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
msgstr ""
+"S처 faz algum sentido se for usado junto com `--pathspec-from-file`. Os "
+"elementos \"pathspec\" s찾o separados com caracteres NUL e todos os outros "
+"caracteres s찾o considerados de forma literal (incluindo novas linhas e "
+"cita챌천es)."
#. type: Labeled list
#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
@@ -6319,6 +6366,9 @@ msgid ""
" 1: binary nothing foo.png\n"
" 2: +403/-35 +1/-1 git-add--interactive.perl\n"
msgstr ""
+" staged unstaged path\n"
+" 1: binary nothing foo.png\n"
+" 2: +403/-35 +1/-1 git-add--interactive.perl\n"
#. type: Plain text
#: en/git-add.txt:280
@@ -6352,6 +6402,9 @@ msgid ""
" 1: binary nothing foo.png\n"
"* 2: +403/-35 +1/-1 git-add--interactive.perl\n"
msgstr ""
+" staged unstaged path\n"
+" 1: binary nothing foo.png\n"
+"* 2: +403/-35 +1/-1 git-add--interactive.perl\n"
#. type: Plain text
#: en/git-add.txt:302
@@ -6622,16 +6675,7 @@ msgstr "git-am - Aplica uma s챕rie de patches de uma caixa de correio"
#. type: Plain text
#: en/git-am.txt:20
-#, fuzzy, ignore-ellipsis, no-wrap, priority:100
-#| msgid ""
-#| "'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
-#| "\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
-#| "\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n"
-#| "\t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]\n"
-#| "\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
-#| "\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
-#| "\t [(<mbox> | <Maildir>)...]\n"
-#| "'git am' (--continue | --skip | --abort | --quit | --show-current-patch)\n"
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
@@ -6642,14 +6686,15 @@ msgid ""
"\t [(<mbox> | <Maildir>)...]\n"
"'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])\n"
msgstr ""
-"'git am' [--signoff] [--manter] [--[n찾o-]manter-cr] [--[n찾o-]utf8]\n"
-"\t[--[n찾o-]3caminho] [--interativo] [--committer-data-챕-autor-data]\n"
-"\t[--ignorar-data] [--ignorar-mudan챌a-de-espa챌o | --ignorar-espa챌o-em-branco]\n"
-"\t[--espa챌o-em-branco=<op챌찾o>] [-C<n>] [-p<n>] [--diret처rio=<dir>]\n"
-"\t[--excluir=<path>] [--incluir=<path>] [--rejeitar] [-q | --quieto]\n"
-"\t[--[n찾o-]tesouras] [-S[<keyid>]] [--patch-formato=<formato>]\n"
-"\t[(<mbox> | <Maildir>)...]\n"
-"'git am' (--continuar | --skip | --abortar | --quieto | --mostrar-atual-patch)\n"
+"'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]\n"
+"\t [--[no-]3way] [--interactive] [--committer-date-is-author-date]\n"
+"\t [--ignore-date] [--ignore-space-change | --ignore-whitespace]\n"
+"\t [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]\n"
+"\t [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]\n"
+"\t [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]\n"
+"\t [(<mbox> | <Maildir>)...]\n"
+"'git am' (--continue | --skip | --abort | --quit | --show-current-"
+"patch[=(diff|raw)])\n"
#. type: Plain text
#: en/git-am.txt:26
@@ -7041,10 +7086,9 @@ msgstr "Anule a opera챌찾o de corre챌찾o, mas mantenha HEAD e o 챠ndice inaltera
#. type: Labeled list
#: en/git-am.txt:179
-#, fuzzy, no-wrap, priority:100
-#| msgid "--show-current-patch"
+#, no-wrap, priority:100
msgid "--show-current-patch[=(diff|raw)]"
-msgstr "--show-current-patch"
+msgstr "--show-current-patch[=(diff|raw)]"
#. type: Plain text
#: en/git-am.txt:184
@@ -7066,10 +7110,12 @@ msgstr "O nome do autor de confirma챌찾o 챕 retirado da linha \"De:\" da mensage
#. type: Plain text
#: en/git-am.txt:197
-#, fuzzy, priority:100
-#| msgid "\"From: \" and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
+#, priority:100
msgid "\"From: \", \"Date: \", and \"Subject: \" lines starting the body override the respective commit author name and title values taken from the headers."
-msgstr "As linhas \"De:\" e \"Assunto:\" iniciando o corpo substituem os respectivos valores de nome e t챠tulo do autor de confirma챌찾o retirados dos cabe챌alhos."
+msgstr ""
+"As linhas \"De:\", \"Dia:\" e \"Assunto:\" iniciando o corpo substituem os "
+"respectivos valores de nome e t챠tulo do autor de confirma챌찾o retirados dos "
+"cabe챌alhos."
#. type: Plain text
#: en/git-am.txt:202
@@ -7658,6 +7704,8 @@ msgid ""
"'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]\n"
" <archive/branch>[:<git-branch>] ...\n"
msgstr ""
+"'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]\n"
+" <archive/branch>[:<git-branch>] ...\n"
#. type: Plain text
#: en/git-archimport.txt:23
@@ -7826,6 +7874,10 @@ msgid ""
"\t [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>\n"
"\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"
#. type: Plain text
#: en/git-archive.txt:23
@@ -8269,6 +8321,9 @@ msgid ""
"$ git bisect bad # Current version is bad\n"
"$ git bisect good v2.6.13-rc2 # v2.6.13-rc2 is known to be good\n"
msgstr ""
+"$ git bisect start\n"
+"$ git bisect bad # A vers찾o atual est찼 ruim\n"
+"$ git bisect good v2.6.13-rc2 # v2.6.13-rc2 챕 conhecido por estar bom\n"
#. type: Plain text
#: en/git-bisect.txt:64
@@ -8578,6 +8633,11 @@ 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 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"
#. type: Plain text
#: en/git-bisect.txt:256
@@ -8602,6 +8662,7 @@ msgstr "Em vez de escolher um commit pr처ximo, voc챗 pode pedir ao Git para faze
#, no-wrap, priority:100
msgid "$ git bisect skip # Current version cannot be tested\n"
msgstr ""
+"$ git bisect skip # A vers찾o atual n찾o pode ser testada\n"
#. type: Plain text
#: en/git-bisect.txt:270
@@ -8677,6 +8738,9 @@ msgid ""
" # v2.6.20-rc6 is bad\n"
" # v2.6.20-rc4 and v2.6.20-rc1 are good\n"
msgstr ""
+"$ git bisect start v2.6.20-rc6 v2.6.20-rc4 v2.6.20-rc1 --\n"
+" # v2.6.20-rc6 est찼 ruim\n"
+" # v2.6.20-rc4 and v2.6.20-rc1 est찼 boa\n"
#. type: Title ~
#: en/git-bisect.txt:314
@@ -8764,6 +8828,9 @@ msgid ""
"$ git bisect run make # \"make\" builds the app\n"
"$ 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 reset # encerra a se챌찾o bisect\n"
#. type: Plain text
#: en/git-bisect.txt:380
@@ -8779,6 +8846,9 @@ msgid ""
"$ git bisect run make test # \"make test\" builds and tests\n"
"$ 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 reset # encerra a se챌찾o bisect\n"
#. type: Plain text
#: en/git-bisect.txt:388 en/git-bisect.txt:442
@@ -8798,6 +8868,14 @@ msgid ""
"$ git bisect run ~/test.sh\n"
"$ git bisect reset # quit the bisect session\n"
msgstr ""
+"$ cat ~/test.sh\n"
+"#!/bin/sh\n"
+"make || exit 125 # isso pula as constru챌천es que "
+"estiverem quebradas\n"
+"~/check_test_case.sh # ser찼 que o caso de teste passa?\n"
+"$ git bisect start HEAD HEAD~10 -- # o culpado est찼 entre os 첬ltimos 10\n"
+"$ git bisect run ~/test.sh\n"
+"$ git bisect reset # encerra a se챌찾o bisect\n"
#. type: Plain text
#: en/git-bisect.txt:403
@@ -8879,6 +8957,9 @@ msgid ""
"$ git bisect run sh -c \"make || exit 125; ~/check_test_case.sh\"\n"
"$ git bisect reset # quit the bisect session\n"
msgstr ""
+"$ git bisect start HEAD HEAD~10 -- # o culpado est찼 entre os 첬ltimos 10\n"
+"$ git bisect run sh -c \"make || exit 125; ~/check_test_case.sh\"\n"
+"$ git bisect reset # encerra a se챌찾o bisect\n"
#. type: Plain text
#: en/git-bisect.txt:451
@@ -8905,12 +8986,21 @@ msgid ""
"\trm -f tmp.$$\n"
"\ttest $rc = 0'\n"
msgstr ""
+"$ git bisect start HEAD <known-good-commit> [ <boundary-commit> ... ] --no-"
+"checkout\n"
+"$ git bisect run sh -c '\n"
+"\tGOOD=$(git for-each-ref \"--format=%(objectname)\" refs/bisect/good-*) &&\n"
+"\tgit rev-list --objects BISECT_HEAD --not $GOOD >tmp.$$ &&\n"
+"\tgit pack-objects --stdout >/dev/null <tmp.$$\n"
+"\trc=$?\n"
+"\trm -f tmp.$$\n"
+"\ttest $rc = 0'\n"
#. type: delimited block -
#: en/git-bisect.txt:465
#, no-wrap, priority:100
msgid "$ git bisect reset # quit the bisect session\n"
-msgstr ""
+msgstr "$ git bisect reset # encerra a se챌찾o bisect\n"
#. type: Plain text
#: en/git-bisect.txt:470
@@ -9229,7 +9319,7 @@ msgid ""
"\tgit blame -L 40,+21 foo\n"
msgstr ""
"\tgit responsabilidade -L 40,60 foo\n"
-"\tgit responsabilidade -L 40,+21 foo\n"
+"\tgit responsabilidade -L 40,+21 foo\n"
#. type: Plain text
#: en/git-blame.txt:151
@@ -9426,17 +9516,24 @@ msgstr "Com `--contains`, mostra apenas as ramifica챌천es que cont챗m o commit n
#. type: Plain text
#: en/git-branch.txt:61
-#, fuzzy, ignore-ellipsis, priority:240
-#| msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
+#, ignore-ellipsis, priority:240
msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
-msgstr "Como um caso especial, voc챗 pode usar `\"A ... B\"` como um atalho para a base de mesclagem de `A` e` B` se houver exatamente uma base de merge. Voc챗 pode deixar de fora, no m찼ximo, um de `A` e` B`, caso em que o padr찾o 챕 `HEAD`."
+msgstr ""
+"A segunda forma do comando cria um nov \"branch head\" chamado <branchname> "
+"que aponta para o 'HEAD' atual ou <start-point> caso seja oferecido. Como um "
+"caso especial, para <start-point>, voc챗 pode usar `\"A...B\"` como um atalho "
+"para a base de mesclagem de `A` e` B` caso haja exatamente uma base de "
+"mesclagem. Voc챗 pode deixar de fora, no m찼ximo, um de `A` e` B`, caso em que "
+"o padr찾o 챕 `HEAD`."
#. type: Plain text
#: en/git-branch.txt:65
-#, fuzzy, priority:240
-#| msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git checkout <newbranch>\" to switch to the new branch."
+#, priority:240
msgid "Note that this will create the new branch, but it will not switch the working tree to it; use \"git switch <newbranch>\" to switch to the new branch."
-msgstr "Observe que isso criar찼 a nova ramifica챌찾o, mas n찾o mudar찼 a 찼rvore de trabalho para ela; use \"git checkout <newbranch>\" para mudar para o novo branch."
+msgstr ""
+"Observe que isso criar찼 a nova ramifica챌찾o, mas n찾o mudar찼 a 찼rvore de "
+"trabalho para ela; para alternar para a nova ramifica챌찾o use \"git switch "
+"<newbranch>\"."
#. type: Plain text
#: en/git-branch.txt:73
@@ -9614,17 +9711,19 @@ msgstr "--remotes"
#. type: Plain text
#: en/git-branch.txt:165
-#, fuzzy, priority:240
-#| msgid "List or delete (if used with -d) the remote-tracking branches."
+#, priority:240
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
-msgstr "Listar ou excluir (se usado com -d) os ramos de rastreamento remoto."
+msgstr ""
+"Listar ou excluir (se usado com -d) os ramos de rastreamento remoto. "
+"Combine com `--list` para coincidir com os padr천es opcionais."
#. type: Plain text
#: en/git-branch.txt:170
-#, fuzzy, priority:240
-#| msgid "List both remote-tracking branches and local branches."
+#, priority:240
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
-msgstr "Listar filiais de rastreamento remoto e filiais locais."
+msgstr ""
+"Fa챌a uma lista tanto das filiais de rastreamento remoto como das filiais "
+"locais. Combine com `--list' para coincidir com os padr천es opcionais."
#. type: Plain text
#: en/git-branch.txt:176
@@ -9652,10 +9751,15 @@ msgstr "-vv"
#. type: Plain text
#: en/git-branch.txt:191
-#, fuzzy, priority:240
-#| msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the name of the upstream branch, as well (see also `git remote show <remote>`)."
+#, priority:240
msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`). Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
-msgstr "Quando estiver no modo de lista, mostre sha1 e submeta a linha de assunto para cada cabe챌alho, junto com o relacionamento com a ramifica챌찾o upstream (se houver). Se dado duas vezes, imprima o nome da ramifica챌찾o upstream, tamb챕m (veja tamb챕m `git remote show <remote>`)."
+msgstr ""
+"Quando estiver no modo de lista, exiba sha1 e fa챌a o commit da linha de "
+"assunto para cada cabe챌alho junto com a ramifica챌찾o relacionada ao upstream ("
+"caso exista). Se dado duas vezes, imprima o nome da ramifica챌찾o upstream "
+"tamb챕m (veja tamb챕m `git remote show <remote>`). Observe que o HEAD da "
+"찼rvore de trabalho atual n찾o ter찼 o seu caminho impresso (ele sempre ser찼 "
+"seu diret처rio atual)."
#. type: Plain text
#: en/git-branch.txt:196
@@ -9701,10 +9805,15 @@ msgstr "Ao criar uma nova ramifica챌찾o, configure as entradas de configura챌찾o
#. type: Plain text
#: en/git-branch.txt:220
-#, fuzzy, priority:240
-#| msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
+#, priority:240
msgid "This behavior is the default when the start point is a remote-tracking branch. Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
-msgstr "Esse comportamento 챕 o padr찾o quando o ponto inicial 챕 um ramo de rastreamento remoto. Configure a vari찼vel de configura챌찾o branch.autoSetupMerge para `false` se voc챗 quiser que` git checkout` e `git branch` sempre se comporte como se` --no-track` fosse dado. Defina-o como `sempre` se voc챗 quiser esse comportamento quando o ponto de partida for um ramo local ou de rastreamento remoto."
+msgstr ""
+"Esse 챕 o comportamento quando o ponto inicial for um ramo de rastreamento "
+"remoto. Configure a vari찼vel de configura챌찾o branch.autoSetupMerge para "
+"`false` caso queira que `git switch`, `git checkout` e `git branch` sempre "
+"se comportem como se` --no-track` fosse usado. Defina-o como `always` caso "
+"queira este comportamento quando o ponto de partida for um ramo local ou de "
+"rastreamento remoto."
#. type: Labeled list
#: en/git-branch.txt:221 en/git-checkout.txt:172 en/git-switch.txt:167
@@ -9734,7 +9843,7 @@ msgstr "-u <upstream>"
#: en/git-branch.txt:230
#, no-wrap, priority:240
msgid "--set-upstream-to=<upstream>"
-msgstr ""
+msgstr "--set-upstream-to=<upstream>"
#. type: Plain text
#: en/git-branch.txt:234
@@ -9794,7 +9903,7 @@ msgstr "Apenas listar ramifica챌천es que n찾o contenham o commit especificado (H
#: en/git-branch.txt:253 en/git-tag.txt:150
#, no-wrap, priority:240
msgid "--merged [<commit>]"
-msgstr ""
+msgstr "--merged [<commit>]"
#. type: Plain text
#: en/git-branch.txt:257
@@ -9878,25 +9987,28 @@ msgstr "Classifique com base na chave fornecida. Prefixo `-` para classificar em
#: en/git-branch.txt:293 en/git-tag.txt:158
#, no-wrap, priority:240
msgid "--points-at <object>"
-msgstr "--pontos-em <objeto>"
+msgstr "--points-at <objeto>"
#. type: Plain text
#: en/git-branch.txt:295
#, priority:240
msgid "Only list branches of the given object."
-msgstr "Apenas lista ramos do objeto dado."
+msgstr "Apenas lista os ramos de determinado objeto."
#. type: Labeled list
#: en/git-branch.txt:296
#, no-wrap, priority:240
msgid "--format <format>"
-msgstr "--formato <formato>"
+msgstr "--format <formato>"
#. type: Plain text
#: en/git-branch.txt:300
#, priority:240
msgid "A string that interpolates `%(fieldname)` from a branch ref being shown and the object it points at. The format is the same as that of linkgit:git-for-each-ref[1]."
-msgstr "Uma string que interpola `%(fieldnome)` de uma ref de branch sendo mostrada e o objeto para o qual ela aponta. O formato 챕 o mesmo do linkgit:git-para-cada-ref[1]."
+msgstr ""
+"Uma string que interpola `%(fieldname)` de uma tag ref sendo exibida e o "
+"objeto para o qual ela aponta. O formato 챕 o mesmo do linkgit:git-for-each-"
+"ref[1]."
#. type: Plain text
#: en/git-branch.txt:306
@@ -9919,6 +10031,10 @@ msgid ""
"$ git branch my2.6.14 v2.6.14 <1>\n"
"$ git switch my2.6.14\n"
msgstr ""
+"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
+"$ cd my2.6\n"
+"$ git branch my2.6.14 v2.6.14 <1>\n"
+"$ git switch my2.6.14\n"
#. type: Plain text
#: en/git-branch.txt:321
@@ -9941,6 +10057,10 @@ msgid ""
"$ git branch -d -r origin/todo origin/html origin/man <1>\n"
"$ git branch -D test <2>\n"
msgstr ""
+"$ git clone git://git.kernel.org/.../git.git my.git\n"
+"$ cd my.git\n"
+"$ git branch -d -r origin/todo origin/html origin/man <1>\n"
+"$ git branch -D test <2>\n"
#. type: Plain text
#: en/git-branch.txt:334
@@ -9958,7 +10078,7 @@ msgstr "Exclua a ramifica챌찾o \"teste\", mesmo que a ramifica챌찾o \"principal\
#: en/git-branch.txt:337
#, no-wrap, priority:240
msgid "Listing branches from a specific remote"
-msgstr ""
+msgstr "Lista os ramos de um determinado ponto remoto"
#. type: delimited block -
#: en/git-branch.txt:342
@@ -9967,73 +10087,97 @@ msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
msgstr ""
+"$ git branch -r -l '<remote>/<pattern>' <1>\n"
+"$ git for-each-ref 'refs/remotes/<remote>/<pattern>' <2>\n"
#. type: Plain text
#: en/git-branch.txt:346
#, priority:240
msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
msgstr ""
+"Usar `-a` entraria em conflito com `<remote>` em quaisquer ramifica챌천es "
+"locais que foram prefixadas com o mesmo padr찾o `<remote>`."
#. type: Plain text
#: en/git-branch.txt:347
#, priority:240
msgid "`for-each-ref` can take a wide range of options. See linkgit:git-for-each-ref[1]"
msgstr ""
+"'for-each-ref' pode ter uma ampla gama de op챌천es. Consulte linkgit:git-for-"
+"each-ref[1]"
#. type: Plain text
#: en/git-branch.txt:349
#, priority:240
msgid "Patterns will normally need quoting."
-msgstr ""
+msgstr "Os padr천es normalmente precisam ser citados."
#. type: Title -
#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
#, no-wrap, priority:240
msgid "NOTES"
-msgstr "NOTAS"
+msgstr "OBSERVA횉횛ES"
#. type: Plain text
#: en/git-branch.txt:356
-#, fuzzy, priority:240
-#| msgid "If you are creating a branch that you want to checkout immediately, it is easier to use the git checkout command with its `-b` option to create a branch and check it out with a single command."
+#, priority:240
msgid "If you are creating a branch that you want to switch to immediately, it is easier to use the \"git switch\" command with its `-c` option to do the same thing with a single command."
-msgstr "Se voc챗 est찼 criando uma ramifica챌찾o que deseja obter imediatamente, 챕 mais f찼cil usar o comando git checkout com sua op챌찾o `-b` para criar uma ramifica챌찾o e verificar com um 첬nico comando."
+msgstr ""
+"Caso esteja criando uma nova ramifica챌찾o para o qual deseja alternar "
+"imediatamente 챕 mais f찼cil usar o comando \"git switch\" com sua op챌찾o `-c` "
+"para fazer a mesma coisa usando apenas um 첬nico comando."
#. type: Plain text
#: en/git-branch.txt:359
#, priority:240
msgid "The options `--contains`, `--no-contains`, `--merged` and `--no-merged` serve four related but different purposes:"
-msgstr "As op챌천es `--contains`,` --n찾o-contains`, `--merged` e` --n찾o-merged` servem quatro finalidades relacionadas, mas diferentes:"
+msgstr ""
+"As op챌천es `--contains`, `--no-contains`, `--merged` e `--no-merged` servem "
+"para quatro finalidades relacionadas, por챕m diferentes:"
#. type: Plain text
#: en/git-branch.txt:363
#, priority:240
msgid "`--contains <commit>` is used to find all branches which will need special attention if <commit> were to be rebased or amended, since those branches contain the specified <commit>."
-msgstr "`--contains <commit>` 챕 usado para encontrar todas as ramifica챌천es que precisar찾o de aten챌찾o especial se <commit> precisar ser rebaseado ou corrigido, uma vez que essas ramifica챌천es cont챗m o <commit> especificado."
+msgstr ""
+"`--contains <commit>` 챕 usado para encontrar todas as ramifica챌천es que "
+"precisar찾o de aten챌찾o especial caso <commit> precise de um novo \"rebase\" "
+"ou corrigido, uma vez que essas ramifica챌천es cont챗m o <commit> especificado."
#. type: Plain text
#: en/git-branch.txt:366
#, priority:240
msgid "`--no-contains <commit>` is the inverse of that, i.e. branches that don't contain the specified <commit>."
-msgstr "`--n찾o-contains <commit>` 챕 o inverso disso, isto 챕, ramifica챌천es que n찾o cont챗m o <commit> especificado."
+msgstr ""
+"`--no-contains <commit>` 챕 o inverso, isto 챕, as ramifica챌천es que n찾o cont챗m "
+"o <commit> especificado."
#. type: Plain text
#: en/git-branch.txt:369
#, priority:240
msgid "`--merged` is used to find all branches which can be safely deleted, since those branches are fully contained by HEAD."
-msgstr "`--merged` 챕 usado para encontrar todas as ramifica챌천es que podem ser exclu챠das com seguran챌a, uma vez que essas ramifica챌천es s찾o totalmente contidas pelo HEAD."
+msgstr ""
+"`--merged` 챕 usado para encontrar todas as ramifica챌천es que podem ser "
+"exclu챠das com seguran챌a, uma vez que essas ramifica챌천es s찾o totalmente "
+"contidas pelo `HEAD`."
#. type: Plain text
#: en/git-branch.txt:372
#, priority:240
msgid "`--no-merged` is used to find branches which are candidates for merging into HEAD, since those branches are not fully contained by HEAD."
-msgstr "`--n찾o-merged` 챕 usado para encontrar ramifica챌천es candidatas a serem mescladas no HEAD, uma vez que essas ramifica챌천es n찾o s찾o totalmente contidas pelo HEAD."
+msgstr ""
+"`--no-merged` 챕 usado para encontrar as ramifica챌천es candidatas a serem "
+"mescladas no `HEAD`, uma vez que essas ramifica챌천es n찾o s찾o totalmente "
+"contidas pelo `HEAD`."
#. type: Plain text
#: en/git-branch.txt:380
#, priority:240
msgid "linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: What is a branch?''] in the Git User's Manual."
-msgstr "linkgit:git-check-ref-formato[1], linkgit:git-busca[1], linkgit:git-remoto[1], link: usu찼rio-manual.html#que-챕-uma-branch[`` Compreens찾o hist처ria: O que 챕 um branch? ''] no Manual do Usu찼rio do Git."
+msgstr ""
+"linkgit:git-check-ref-format[1], linkgit:git-fetch[1], linkgit:git-remote[1]"
+", link:user-manual.html#what-is-a-branch[``Compreendendo a hist처ria: O que 챕 "
+"um ramo?''] no Manual do Usu찼rio do Git."
#. type: Title =
#: en/git-bundle.txt:2
@@ -10049,22 +10193,18 @@ msgstr "git-bundle - Mover objetos e refs por arquivo"
#. type: Plain text
#: en/git-bundle.txt:16
-#, fuzzy, ignore-ellipsis, no-wrap, priority:100
-#| msgid ""
-#| "'git bundle' create <file> <git-rev-list-args>\n"
-#| "'git bundle' verify <file>\n"
-#| "'git bundle' list-heads <file> [<refname>...]\n"
-#| "'git bundle' unbundle <file> [<refname>...]\n"
+#, ignore-ellipsis, no-wrap, priority:100
msgid ""
"'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied] <file> <git-rev-list-args>\n"
"'git bundle' verify [-q | --quiet] <file>\n"
"'git bundle' list-heads <file> [<refname>...]\n"
"'git bundle' unbundle <file> [<refname>...]\n"
msgstr ""
-"'git pacote' criar <arquivo><git-rev-list-args>\n"
-"'git pacote' verificar <arquivo>\n"
-"'git pacote' list-cabe챌as <arquivo>[<refnome>...]\n"
-"'git pacote' unbundle <arquivo>[<refnome>...]\n"
+"'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-"
+"progress-implied] <file> <git-rev-list-args>\n"
+"'git bundle' verify [-q | --quiet] <file>\n"
+"'git bundle' list-heads <file> [<refname>...]\n"
+"'git bundle' unbundle <file> [<refname>...]\n"
#. type: Plain text
#: en/git-bundle.txt:24
@@ -10086,17 +10226,18 @@ msgstr ""
#. type: Labeled list
#: en/git-bundle.txt:39
-#, fuzzy, no-wrap, priority:100
-#| msgid "'git annotate' [<options>] <file> [<revision>]\n"
+#, no-wrap, priority:100
msgid "create [options] <file> <git-rev-list-args>"
-msgstr "'anotar git' [<op챌천es>] <arquivo> [<revis찾o>]\n"
+msgstr "create [options] <file> <git-rev-list-args>"
#. type: Plain text
#: en/git-bundle.txt:44
-#, fuzzy, priority:100
-#| msgid "Used to create a bundle named 'file'. This requires the 'git-rev-list-args' arguments to define the bundle contents."
+#, priority:100
msgid "Used to create a bundle named 'file'. This requires the '<git-rev-list-args>' arguments to define the bundle contents. 'options' contains the options specific to the 'git bundle create' subcommand."
-msgstr "Usado para criar um pacote denominado 'file'. Isso requer argumentos 'git-rev-list-args' para definir o conte첬do do pacote."
+msgstr ""
+"Usado para criar um pacote chamado 'file'. Isso requer os argumentos '<git-"
+"rev-list-args>' para definir o conte첬do do pacote. 'options' cont챕m as "
+"op챌천es espec챠ficas para o subcomando 'git bundle create'."
#. type: Labeled list
#: en/git-bundle.txt:45
@@ -10138,7 +10279,7 @@ msgstr "Passa os objetos no pacote para 'git index-pack' para armazenamento no r
#: en/git-bundle.txt:65
#, no-wrap, priority:100
msgid "<git-rev-list-args>"
-msgstr ""
+msgstr "<git-rev-list-args>"
#. type: Plain text
#: en/git-bundle.txt:74
@@ -10262,6 +10403,9 @@ msgid ""
" url = /home/me/tmp/file.bundle\n"
" fetch = refs/heads/*:refs/remotes/origin/*\n"
msgstr ""
+"[remote \"origin\"]\n"
+" url = /home/me/tmp/file.bundle\n"
+" fetch = refs/heads/*:refs/remotes/origin/*\n"
#. type: Plain text
#: en/git-bundle.txt:176
@@ -10406,6 +10550,10 @@ msgid ""
"'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
"'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"
+"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] "
+"[--follow-symlinks]\n"
#. type: Plain text
#: en/git-cat-file.txt:21
@@ -10489,7 +10637,7 @@ msgstr "Mostrar o conte첬do como convertido pelos filtros configurados na 찼rvor
#: en/git-cat-file.txt:72
#, no-wrap, priority:100
msgid "--path=<path>"
-msgstr ""
+msgstr "--path=<path>"
#. type: Plain text
#: en/git-cat-file.txt:76
@@ -10623,6 +10771,12 @@ msgid ""
"\tplink: a symlink to ../f\n"
"\talink: a symlink to /etc/passwd\n"
msgstr ""
+"\tf: um arquivo que contenha \"hello\\n"
+"\"\n"
+"\tlink: um link simb처lico para f\n"
+"\tdir/link: um link simb처lico para ../f\n"
+"\tplink: um link simb처lico para ../f\n"
+"\talink: um link simb처lico para /etc/passwd\n"
#. type: Plain text
#: en/git-cat-file.txt:148
@@ -10634,7 +10788,7 @@ msgstr "Para um arquivo normal `f`,` echo HEAD:f | git cat-file --batch` imprimi
#: en/git-cat-file.txt:151
#, no-wrap, priority:100
msgid "\tce013625030ba8dba906f756967f9e9ca394464a blob 6\n"
-msgstr ""
+msgstr "\tce013625030ba8dba906f756967f9e9ca394464a blob 6\n"
#. type: Plain text
#: en/git-cat-file.txt:156
@@ -10652,7 +10806,7 @@ msgstr "Sem `- siga-links-simb처licos`, estes iriam imprimir dados sobre o link
#: en/git-cat-file.txt:162
#, no-wrap, priority:100
msgid "\t4d1ae35ba2c8ec712fa2a379db44ad639ca277bd blob 1\n"
-msgstr ""
+msgstr "\t4d1ae35ba2c8ec712fa2a379db44ad639ca277bd blob 1\n"
#. type: Plain text
#: en/git-cat-file.txt:166
@@ -10989,6 +11143,8 @@ msgid ""
"'git check-attr' [-a | --all | <attr>...] [--] <pathname>...\n"
"'git check-attr' --stdin [-z] [-a | --all | <attr>...]\n"
msgstr ""
+"'git check-attr' [-a | --all | <attr>...] [--] <pathname>...\n"
+"'git check-attr' --stdin [-z] [-a | --all | <attr>...]\n"
#. type: Plain text
#: en/git-check-attr.txt:19
@@ -11028,10 +11184,12 @@ msgstr "Leia os nomes de caminho da entrada padr찾o, um por linha, em vez da lin
#. type: Plain text
#: en/git-check-attr.txt:38
-#, fuzzy, priority:100
-#| msgid "The output format is modified to be machine-parseable. If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
+#, priority:100
msgid "The output format is modified to be machine-parsable. If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
-msgstr "O formato de sa챠da 챕 modificado para ser analis찼vel por m찼quina. Se `--stdin` tamb챕m 챕 fornecido, os caminhos de entrada s찾o separados por um caractere NUL em vez de um caractere de alimenta챌찾o de linha."
+msgstr ""
+"O formato de sa챠da 챕 modificado para ser analis찼vel por m찼quina. Caso "
+"`--stdin` tamb챕m seja fornecido, os caminhos de entrada ser찾o separados por "
+"um caractere NUL em vez de um caractere de avan챌o de linha."
#. type: Plain text
#: en/git-check-attr.txt:42
@@ -11131,6 +11289,9 @@ msgid ""
"NoMyAttr.java !myAttr\n"
"README caveat=unspecified\n"
msgstr ""
+"*.java diff=java -crlf myAttr\n"
+"NoMyAttr.java !myAttr\n"
+"README caveat=unspecified\n"
#. type: Plain text
#: en/git-check-attr.txt:81
@@ -11145,6 +11306,8 @@ msgid ""
"$ git check-attr diff org/example/MyClass.java\n"
"org/example/MyClass.java: diff: java\n"
msgstr ""
+"$ git check-attr diff org/example/MyClass.java\n"
+"org/example/MyClass.java: diff: java\n"
#. type: Plain text
#: en/git-check-attr.txt:87
@@ -11161,6 +11324,10 @@ msgid ""
"org/example/MyClass.java: diff: java\n"
"org/example/MyClass.java: myAttr: set\n"
msgstr ""
+"$ git check-attr crlf diff myAttr -- org/example/MyClass.java\n"
+"org/example/MyClass.java: crlf: unset\n"
+"org/example/MyClass.java: diff: java\n"
+"org/example/MyClass.java: myAttr: set\n"
#. type: Plain text
#: en/git-check-attr.txt:95
@@ -11176,6 +11343,9 @@ msgid ""
"org/example/MyClass.java: diff: java\n"
"org/example/MyClass.java: myAttr: set\n"
msgstr ""
+"$ git check-attr --all -- org/example/MyClass.java\n"
+"org/example/MyClass.java: diff: java\n"
+"org/example/MyClass.java: myAttr: set\n"
#. type: Plain text
#: en/git-check-attr.txt:102
@@ -11191,6 +11361,10 @@ msgid ""
"org/example/MyClass.java: myAttr: set\n"
"org/example/NoMyAttr.java: myAttr: unspecified\n"
msgstr ""
+"$ git check-attr myAttr -- org/example/MyClass.java org/example/NoMyAttr."
+"java\n"
+"org/example/MyClass.java: myAttr: set\n"
+"org/example/NoMyAttr.java: myAttr: unspecified\n"
#. type: Plain text
#: en/git-check-attr.txt:109
@@ -11205,6 +11379,8 @@ msgid ""
"$ git check-attr caveat README\n"
"README: caveat: unspecified\n"
msgstr ""
+"$ git check-attr caveat README\n"
+"README: caveat: n찾o especificado\n"
#. type: Plain text
#: en/git-check-attr.txt:117
@@ -11262,7 +11438,7 @@ msgstr "N찾o produza nada, apenas configure o status de sa챠da. Isso 챕 v찼lido
#: en/git-check-ignore.txt:32
#, no-wrap, priority:100
msgid "-v, --verbose"
-msgstr ""
+msgstr "-v, --verbose"
#. type: Plain text
#: en/git-check-ignore.txt:39
@@ -11272,17 +11448,20 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:42
-#, fuzzy, priority:100
-#| msgid "Also output details about the matching pattern (if any) for each given pathname. For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
+#, priority:100
msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
-msgstr "Tamb챕m detalhes de sa챠da sobre o padr찾o correspondente (se houver) para cada nome de caminho fornecido. Para regras de preced챗ncia dentro e entre as fontes exclude, veja linkgit:gitignorar[5]."
+msgstr ""
+"Para regras de preced챗ncia dentro e entre as fontes exclude, veja "
+"linkgit:gitignorar[5]."
#. type: Plain text
#: en/git-check-ignore.txt:51
-#, fuzzy, priority:100
-#| msgid "The output format is modified to be machine-parseable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
+#, priority:100
msgid "The output format is modified to be machine-parsable (see below). If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
-msgstr "O formato de sa챠da 챕 modificado para ser analis찼vel por m찼quina (veja abaixo). Se `--stdin` tamb챕m 챕 fornecido, os caminhos de entrada s찾o separados por um caractere NUL em vez de um caractere de alimenta챌찾o de linha."
+msgstr ""
+"O formato de sa챠da 챕 modificado para ser analis찼vel por m찼quina. (veja "
+"abaixo). Caso `--stdin` tamb챕m seja fornecido, os caminhos de entrada ser찾o "
+"separados por um caractere NUL em vez de um caractere de avan챌o de linha."
#. type: Labeled list
#: en/git-check-ignore.txt:52
@@ -11360,7 +11539,7 @@ msgstr "ESTADO DE SA횒DA"
#: en/git-check-ignore.txt:109
#, no-wrap, priority:100
msgid "0"
-msgstr ""
+msgstr "0"
#. type: Plain text
#: en/git-check-ignore.txt:111
@@ -11372,7 +11551,7 @@ msgstr "Um ou mais dos caminhos fornecidos s찾o ignorados."
#: en/git-check-ignore.txt:112
#, no-wrap, priority:100
msgid "1"
-msgstr ""
+msgstr "1"
#. type: Plain text
#: en/git-check-ignore.txt:114
@@ -11384,7 +11563,7 @@ msgstr "Nenhum dos caminhos fornecidos 챕 ignorado."
#: en/git-check-ignore.txt:115
#, no-wrap, priority:100
msgid "128"
-msgstr ""
+msgstr "128"
#. type: Plain text
#: en/git-check-ignore.txt:117
@@ -11456,6 +11635,11 @@ msgid ""
"\t\t [-z] [--stdin]\n"
"\t\t [--] [<file>...]\n"
msgstr ""
+"'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]\n"
+"\t\t [--stage=<number>|all]\n"
+"\t\t [--temp]\n"
+"\t\t [-z] [--stdin]\n"
+"\t\t [--] [<file>...]\n"
#. type: Plain text
#: en/git-checkout-index.txt:22
@@ -11575,31 +11759,38 @@ msgstr "A intui챌찾o n찾o 챕 o objetivo aqui. Repetibilidade 챕. A raz찾o para o
#: en/git-checkout-index.txt:86
#, no-wrap, priority:100
msgid "$ find . -name '*.h' -print0 | xargs -0 git checkout-index -f --\n"
-msgstr ""
+msgstr "$ find . -name '*.h' -print0 | xargs -0 git checkout-index -f --\n"
#. type: Plain text
#: en/git-checkout-index.txt:92
#, priority:100
msgid "which will force all existing `*.h` files to be replaced with their cached copies. If an empty command line implied \"all\", then this would force-refresh everything in the index, which was not the point. But since 'git checkout-index' accepts --stdin it would be faster to use:"
msgstr ""
+"o que for챌ar찼 a substitui챌찾o de todos os arquivos `* .h` por suas c처pias em "
+"cache. Caso uma linha de comando vazia implique \"tudo\", isso for챌aria a "
+"atualiza챌찾o de tudo no 챠ndice o que n찾o era o ponto. Mas como 'git checkout-"
+"index' aceita --stdin seria mais r찼pido usar:"
#. type: delimited block -
#: en/git-checkout-index.txt:95
#, no-wrap, priority:100
msgid "$ find . -name '*.h' -print0 | git checkout-index -f -z --stdin\n"
-msgstr ""
+msgstr "$ find . -name '*.h' -print0 | git checkout-index -f -z --stdin\n"
#. type: Plain text
#: en/git-checkout-index.txt:100
#, priority:100
msgid "The `--` is just a good idea when you know the rest will be filenames; it will prevent problems with a filename of, for example, `-a`. Using `--` is probably a good policy in scripts."
msgstr ""
+"O `--` 챕 apenas uma boa ideia quando voc챗 sabe que o restante ser찼 o nome "
+"dos arquivos; isso evitar찼 problemas com um nome de arquivo de, por exemplo, "
+"`-a`. Usar `--` 챕 provavelmente uma boa pol챠tica em scripts."
#. type: Title -
#: en/git-checkout-index.txt:103
#, no-wrap, priority:100
msgid "Using --temp or --stage=all"
-msgstr ""
+msgstr "Usando --temp ou --stage=all"
#. type: Plain text
#: en/git-checkout-index.txt:110
@@ -11721,7 +11912,9 @@ msgstr "git-checkout(1)"
#: en/git-checkout.txt:7
#, priority:240
msgid "git-checkout - Switch branches or restore working tree files"
-msgstr "git-checkout - Alterne filiais ou restaure arquivos da 찼rvore de trabalho"
+msgstr ""
+"git-checkout - Alterne entre ramos ou restaure os arquivos da 찼rvore de "
+"trabalho"
#. type: Plain text
#: en/git-checkout.txt:18
@@ -11735,47 +11928,68 @@ 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] [--detach] <commit>\n"
+"'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]"
+"\n"
+"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] "
+"<pathspec>...\n"
+"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] "
+"--pathspec-from-file=<file> [--pathspec-file-nul]\n"
+"'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]\n"
#. type: Plain text
#: en/git-checkout.txt:25
-#, fuzzy, priority:240
-#| msgid "Updates files in the working tree to match the version in the index or the specified tree. If no paths are given, 'git checkout' will also update `HEAD` to set the specified branch as the current branch."
+#, priority:240
msgid "Updates files in the working tree to match the version in the index or the specified tree. If no pathspec was given, 'git checkout' will also update `HEAD` to set the specified branch as the current branch."
-msgstr "Atualiza arquivos na 찼rvore de trabalho para corresponder 횪 vers찾o no 챠ndice ou na 찼rvore especificada. Se nenhum caminho for fornecido, 'git checkout' tamb챕m atualizar찼 `HEAD` para definir o ramo especificado como o ramo atual."
+msgstr ""
+"Atualiza arquivos na 찼rvore de trabalho para corresponder 횪 vers찾o no 챠ndice "
+"ou na 찼rvore especificada. Caso nenhum caminho \"pathspec\" seja fornecido "
+"o 'git checkout' tamb챕m atualizar찼 `HEAD` definindo o ramo especificado como "
+"o ramo atual."
#. type: Labeled list
#: en/git-checkout.txt:26
-#, fuzzy, no-wrap, priority:240
-#| msgid "'git checkout' <branch>"
+#, no-wrap, priority:240
msgid "'git checkout' [<branch>]"
-msgstr "'git confira' <branch>"
+msgstr "'git checkout' [<branch>]"
#. type: Plain text
#: en/git-checkout.txt:32
-#, fuzzy, priority:240
-#| msgid "To prepare for working on <branch>, switch to it by updating the index and the files in the working tree, and by pointing HEAD at the branch. Local modifications to the files in the working tree are kept, so that they can be committed to the <branch>."
+#, priority:240
msgid "To prepare for working on `<branch>`, switch to it by updating the index and the files in the working tree, and by pointing `HEAD` at the branch. Local modifications to the files in the working tree are kept, so that they can be committed to the `<branch>`."
-msgstr "Para se preparar para trabalhar em <branch>, alterne para ele atualizando o 챠ndice e os arquivos na 찼rvore de trabalho e apontando HEAD na ramifica챌찾o. As modifica챌천es locais nos arquivos na 찼rvore de trabalho s찾o mantidas, para que possam ser confirmadas no <branch>."
+msgstr ""
+"Para se preparar para trabalhar em `<branch>`, alterne para ele atualizando "
+"o 챠ndice e os arquivos na 찼rvore de trabalho ao apontar para HEAD na "
+"ramifica챌찾o. As modifica챌천es locais nos arquivos na 찼rvore de trabalho s찾o "
+"mantidas para que commits possam ser feitas no `<branch>`."
#. type: Plain text
#: en/git-checkout.txt:36
-#, fuzzy, priority:240
-#| msgid "If <branch> is not found but there does exist a tracking branch in exactly one remote (call it <remote>) with a matching name, treat as equivalent to"
+#, priority:240
msgid "If `<branch>` is not found but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name and `--no-guess` is not specified, treat as equivalent to"
-msgstr "Se <branch> n찾o for encontrado, mas existir uma ramifica챌찾o de rastreamento em exatamente um controle remoto (cham찼-lo <remoto>) com um nome correspondente, trate como equivalente a"
+msgstr ""
+"Caso o `<branch>` n찾o seja encontrado mas existir uma ramifica챌찾o de "
+"rastreamento em um ponto remoto (chame-o de `<remoto>`) com um nome "
+"correspondente e quando `--no-guess` n찾o for especificado, trate-o como um "
+"equivalente a"
#. type: delimited block -
#: en/git-checkout.txt:39 en/git-checkout.txt:184
#, no-wrap, priority:240
msgid "$ git checkout -b <branch> --track <remote>/<branch>\n"
-msgstr "$ git verificar -b <branch> --rastrear <remoto>/<branch>\n"
+msgstr "$ git checkout -b <branch> --track <remote>/<branch>\n"
#. type: Plain text
#: en/git-checkout.txt:45
-#, fuzzy, priority:240
-#| msgid "You could omit <branch>, in which case the command degenerates to \"check out the current branch\", which is a glorified no-op with rather expensive side-effects to show only the tracking information, if exists, for the current branch."
+#, priority:240
msgid "You could omit `<branch>`, in which case the command degenerates to \"check out the current branch\", which is a glorified no-op with rather expensive side-effects to show only the tracking information, if exists, for the current branch."
-msgstr "Voc챗 pode omitir <branch>, caso em que o comando se degenera para \"verificar o branch atual\", que 챕 um glorificado n찾o-op com efeitos colaterais bastante caros para mostrar apenas as informa챌천es de rastreamento, se existir, para o branch atual."
+msgstr ""
+"Voc챗 pode omitir o `<branch>` no caso em que o comando se degenera para \""
+"verificar o branch atual\", que 챕 um glorificado n찾o-op com efeitos "
+"colaterais bastante caros para mostrar apenas as informa챌천es de "
+"rastreamento, caso exista, para o branch atual."
#. type: Labeled list
#: en/git-checkout.txt:46
@@ -11791,10 +12005,11 @@ msgstr "Especificar `-b` faz com que uma nova ramifica챌찾o seja criada como se
#. type: Plain text
#: en/git-checkout.txt:57
-#, fuzzy, priority:240
-#| msgid "If `-B` is given, <new_branch> is created if it doesn't exist; otherwise, it is reset. This is the transactional equivalent of"
+#, priority:240
msgid "If `-B` is given, `<new_branch>` is created if it doesn't exist; otherwise, it is reset. This is the transactional equivalent of"
-msgstr "Se `-B` 챕 dado, <novo_branch> 챕 criado se n찾o existir; caso contr찼rio, 챕 redefinido. Este 챕 o equivalente transacional de"
+msgstr ""
+"Caso `-B` seja dado, o `<novo_branch>` 챕 criado se ainda n찾o existir; caso "
+"contr찼rio, 챕 redefinido. Este 챕 o equivalente transacional de"
#. type: delimited block -
#: en/git-checkout.txt:61
@@ -11826,31 +12041,37 @@ msgstr "'git verificar' [--desanexar] <commit>"
#. type: Plain text
#: en/git-checkout.txt:75
-#, fuzzy, priority:240
-#| msgid "Prepare to work on top of <commit>, by detaching HEAD at it (see \"DETACHED HEAD\" section), and updating the index and the files in the working tree. Local modifications to the files in the working tree are kept, so that the resulting working tree will be the state recorded in the commit plus the local modifications."
+#, priority:240
msgid "Prepare to work on top of `<commit>`, by detaching `HEAD` at it (see \"DETACHED HEAD\" section), and updating the index and the files in the working tree. Local modifications to the files in the working tree are kept, so that the resulting working tree will be the state recorded in the commit plus the local modifications."
-msgstr "Prepare-se para trabalhar em cima de <commit>, desanexando HEAD nele (consulte a se챌찾o \"DESTACADO HEAD\") e atualizando o 챠ndice e os arquivos na 찼rvore de trabalho. As modifica챌천es locais nos arquivos na 찼rvore de trabalho s찾o mantidas, de forma que a 찼rvore de trabalho resultante seja o estado registrado no commit mais as modifica챌천es locais."
+msgstr ""
+"Prepare-se para trabalhar em cima de `<commit>`, desanexando o `HEAD` nele ("
+"consulte a se챌찾o \"DESTACADO HEAD\") e atualizando o 챠ndice e os arquivos na "
+"찼rvore de trabalho. As modifica챌천es locais nos arquivos na 찼rvore de "
+"trabalho s찾o mantidas de forma que a 찼rvore de trabalho resultante seja o "
+"estado registrado no commit, mais as modifica챌천es locais."
#. type: Plain text
#: en/git-checkout.txt:79
-#, fuzzy, priority:240
-#| msgid "When the <commit> argument is a branch name, the `--detach` option can be used to detach HEAD at the tip of the branch (`git checkout <branch>` would check out that branch without detaching HEAD)."
+#, priority:240
msgid "When the `<commit>` argument is a branch name, the `--detach` option can be used to detach `HEAD` at the tip of the branch (`git checkout <branch>` would check out that branch without detaching `HEAD`)."
-msgstr "Quando o argumento <commit> 챕 um nome de ramifica챌찾o, a op챌찾o `--desanexar` pode ser usada para desanexar HEAD na ponta da ramifica챌찾o (` git verificar <branch> `veria aquela ramifica챌찾o sem desanexar HEAD)."
+msgstr ""
+"Quando o argumento `<commit>` 챕 um nome de ramifica챌찾o a op챌찾o `--detach` "
+"pode ser usada para desanexar o `HEAD` na ponta da ramifica챌찾o (` git "
+"checkout <branch>` verificaria aquela ramifica챌찾o sem desanexar o `HEAD`)."
#. type: Plain text
#: en/git-checkout.txt:81
-#, fuzzy, priority:240
-#| msgid "Omitting <branch> detaches HEAD at the tip of the current branch."
+#, priority:240
msgid "Omitting `<branch>` detaches `HEAD` at the tip of the current branch."
-msgstr "Omitir <branch> desanexa o HEAD na ponta do ramo atual."
+msgstr "Ao omitir o `<branch>` isso desanexa o `HEAD` na ponta do ramo atual."
#. type: Labeled list
#: en/git-checkout.txt:82
-#, fuzzy, ignore-ellipsis, no-wrap, priority:240
-#| msgid "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
+#, ignore-ellipsis, no-wrap, priority:240
msgid "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>..."
-msgstr "'git verificar' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
+msgstr ""
+"'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] "
+"<pathspec>..."
#. type: Labeled list
#: en/git-checkout.txt:83
@@ -11878,10 +12099,12 @@ msgstr "'git verificar' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
#. type: Plain text
#: en/git-checkout.txt:104
-#, fuzzy, priority:240
-#| msgid "This is similar to the \"check out paths to the working tree from either the index or from a tree-ish\" mode described above, but lets you use the interactive interface to show the \"diff\" output and choose which hunks to use in the result. See below for the description of `--patch` option."
+#, priority:240
msgid "This is similar to the previous mode, but lets you use the interactive interface to show the \"diff\" output and choose which hunks to use in the result. See below for the description of `--patch` option."
-msgstr "Isso 챕 semelhante ao \"verificar paths para a 찼rvore de trabalho do modo de 챠ndice ou de 찼rvore-ish\" descrito acima, mas permite usar a interface interativa para mostrar a sa챠da \"diff\" e escolher quais blocos usar no resultado. Veja abaixo a descri챌찾o da op챌찾o `--patch`."
+msgstr ""
+"Isso 챕 semelhante ao modo anterior, por챕m permite usar a interface "
+"interativa para mostrar a sa챠da \"diff\" e escolher quais blocos usar no "
+"resultado. Veja abaixo a descri챌찾o da op챌찾o `--patch`."
#. type: Plain text
#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
@@ -11903,10 +12126,12 @@ msgstr "O status de progresso 챕 relatado no fluxo de erro padr찾o por padr찾o q
#. type: Plain text
#: en/git-checkout.txt:123
-#, fuzzy, priority:240
-#| msgid "When switching branches, proceed even if the index or the working tree differs from HEAD. This is used to throw away local changes."
+#, priority:240
msgid "When switching branches, proceed even if the index or the working tree differs from `HEAD`. This is used to throw away local changes."
-msgstr "Ao alternar as ramifica챌천es, continue mesmo se o 챠ndice ou a 찼rvore de trabalho diferirem de HEAD. Isso 챕 usado para jogar fora as altera챌천es locais."
+msgstr ""
+"Ao alternar as ramifica챌천es, continue mesmo se o 챠ndice ou a 찼rvore de "
+"trabalho forem diferentes do `HEAD`. Isto 챕 usado para descartar as "
+"altera챌천es locais."
#. type: Plain text
#: en/git-checkout.txt:126
@@ -11954,10 +12179,11 @@ msgstr "-b <novo_branch>"
#. type: Plain text
#: en/git-checkout.txt:150
-#, fuzzy, priority:240
-#| msgid "Create a new branch named <new_branch> and start it at <start_point>; see linkgit:git-branch[1] for details."
+#, priority:240
msgid "Create a new branch named `<new_branch>` and start it at `<start_point>`; see linkgit:git-branch[1] for details."
-msgstr "Crie uma nova ramifica챌찾o chamada <novo_branch> e inicie-a em <ponto_de_partida>; veja linkgit:git-branch[1] para detalhes."
+msgstr ""
+"Crie uma nova ramifica챌찾o chamada `<new_branch>` e inicie-a em "
+"`<start_point>`; para mais detalhes consulte linkgit:git-branch[1]."
#. type: Labeled list
#: en/git-checkout.txt:151
@@ -11967,10 +12193,12 @@ msgstr "-B <novo_branch>"
#. type: Plain text
#: en/git-checkout.txt:156
-#, fuzzy, priority:240
-#| msgid "Creates the branch <new_branch> and start it at <start_point>; if it already exists, then reset it to <start_point>. This is equivalent to running \"git branch\" with \"-f\"; see linkgit:git-branch[1] for details."
+#, priority:240
msgid "Creates the branch `<new_branch>` and start it at `<start_point>`; if it already exists, then reset it to `<start_point>`. This is equivalent to running \"git branch\" with \"-f\"; see linkgit:git-branch[1] for details."
-msgstr "Cria o ramo <novo_branch> e inicia em <ponto_de_partida>; se j찼 existir, redefina-o para <ponto_de_partida>. Isso 챕 equivalente a executar \"git branch\" com \"-f\"; veja linkgit:git-branch[1] para detalhes."
+msgstr ""
+"Cria uma nova ramifica챌찾o `<new_branch>` e a inicia em `<start_point>`; caso "
+"j찼 exista, ent찾o reinicia em `<start_point>`. Isso 챕 o equivalente que rodar "
+"\"git branch\" com \"-f\"; para mais detalhes consulte linkgit:git-branch[1]."
#. type: Plain text
#: en/git-checkout.txt:161
@@ -11980,17 +12208,25 @@ msgstr "Ao criar um novo branch, configure \"upstream\". Veja \"--track\" em lin
#. type: Plain text
#: en/git-checkout.txt:171
-#, fuzzy, priority:240
-#| msgid "If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use \"hack\" as the local branch when branching off of \"origin/hack\" (or \"remotes/origin/hack\", or even \"refs/remotes/origin/hack\"). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-b` in such a case."
+#, priority:240
msgid "If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-b` in such a case."
-msgstr "Se nenhuma op챌찾o `-b` for fornecida, o nome da nova ramifica챌찾o ser찼 derivado da ramifica챌찾o de controle remoto, observando a parte local da refspec configurada para o controle remoto correspondente e, em seguida, removendo a parte inicial para o \"*\". Isso nos diria para usar \"hack\" como a ramifica챌찾o local ao se ramificar de \"origin/hack\" (ou \"remotos/origem/ hack\", ou mesmo \"refs/remotos/ origem/ hack\"). Se o nome dado n찾o tiver barra, ou se a suposi챌찾o acima resultar em um nome vazio, a adivinha챌찾o ser찼 abortada. Voc챗 pode dar explicitamente um nome com `-b` em tal caso."
+msgstr ""
+"Se nenhuma op챌찾o `-b` for dada o nome da nova ramifica챌찾o ser찼 derivada da "
+"ramifica챌찾o remota, observando-se a parte local do \"refspec\" configurada "
+"para a sua correspondente remota, em seguida, removendo a parte inicial para "
+"o \"*\". Isto nos mostra para usar `hack` como uma ramifica챌찾o local ao se "
+"ramificar de `remotes/origin/hack` ou at챕 mesmo `refs/remotes/origin/hack`)"
+". Caso o nome dado n찾o tenha barra ou se a suposi챌찾o acima resultar em um "
+"nome vazio, a adivinha챌찾o ser찼 abortada. Voc챗 pode dar explicitamente em tal "
+"caso um nome com a op챌찾o `-b`."
#. type: Plain text
#: en/git-checkout.txt:175 en/git-switch.txt:170
-#, fuzzy, priority:240
-#| msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
+#, priority:240
msgid "Do not set up \"upstream\" configuration, even if the `branch.autoSetupMerge` configuration variable is true."
-msgstr "N찾o configure \"upstream\", mesmo que a vari찼vel de configura챌찾o branch.autoSetupMerge seja verdadeira."
+msgstr ""
+"N찾o configure \"upstream\" mesmo que a vari찼vel de configura챌찾o "
+"`branch.autoSetupMerge` seja verdadeira."
#. type: Labeled list
#: en/git-checkout.txt:176 en/git-switch.txt:87
@@ -12006,10 +12242,12 @@ msgstr "--no-guess"
#. type: Plain text
#: en/git-checkout.txt:181 en/git-switch.txt:92
-#, fuzzy, priority:240
-#| msgid "If <branch> is not found but there does exist a tracking branch in exactly one remote (call it <remote>) with a matching name, treat as equivalent to"
+#, priority:240
msgid "If `<branch>` is not found but there does exist a tracking branch in exactly one remote (call it `<remote>`) with a matching name, treat as equivalent to"
-msgstr "Se <branch> n찾o for encontrado, mas existir uma ramifica챌찾o de rastreamento em exatamente um controle remoto (cham찼-lo <remoto>) com um nome correspondente, trate como equivalente a"
+msgstr ""
+"Caso `<branch>` n찾o seja encontrado mas existir uma ramifica챌찾o de "
+"rastreamento em exatamente uma localidade remota (chame-o <remoto>) com um "
+"nome correspondente, trate como equivalente a"
#. type: Plain text
#: en/git-checkout.txt:194 en/git-switch.txt:104 en/git-worktree.txt:71
@@ -12037,10 +12275,13 @@ msgstr "--detach"
#. type: Plain text
#: en/git-checkout.txt:207
-#, fuzzy, priority:240
-#| msgid "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of \"git checkout <commit>\" when <commit> is not a branch name. See the \"DETACHED HEAD\" section below for details."
+#, priority:240
msgid "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. This is the default behavior of `git checkout <commit>` when `<commit>` is not a branch name. See the \"DETACHED HEAD\" section below for details."
-msgstr "Em vez de verificar um ramo para trabalhar nele, confira um commit para inspe챌천es e experi챗ncias descart찼veis. Este 챕 o comportamento padr찾o de \"git checkout <commit>\" quando <commit> n찾o 챕 um nome de ramifica챌찾o. Veja a se챌찾o \"DESTACADO CABE횉A\" abaixo para detalhes."
+msgstr ""
+"Em vez de verificar um ramo para trabalhar nele, confira um commit para "
+"inspe챌천es e experi챗ncias descart찼veis. Este 챕 o comportamento padr찾o de `"
+"git checkout <commit>` quando `<commit>` n찾o for um nome de ramifica챌찾o. "
+"Veja a se챌찾o \"DESASSOCIANDO O HEAD\" abaixo para detalhes."
#. type: Labeled list
#: en/git-checkout.txt:208
@@ -12050,17 +12291,24 @@ msgstr "--orf찾o <novo_branch>"
#. type: Plain text
#: en/git-checkout.txt:214
-#, fuzzy, priority:240
-#| msgid "Create a new 'orphan' branch, named <new_branch>, started from <start_point> and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits."
+#, priority:240
msgid "Create a new 'orphan' branch, named `<new_branch>`, started from `<start_point>` and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits."
-msgstr "Crie uma nova ramifica챌찾o '처rf찾', denominada <novo_branch>, iniciada a partir de <ponto_de_partida> e mude para ela. O primeiro commit feito nesta nova branch n찾o ter찼 pais e ser찼 a raiz de uma nova hist처ria totalmente desconectada de todas as outras ramifica챌천es e commits."
+msgstr ""
+"Crie uma nova ramifica챌찾o 'orphan' denominada `<new_branch>` iniciada a "
+"partir do <start_point> e mude para ela. O primeiro commit feito nesta nova "
+"ramifica챌찾o n찾o ter찼 matrizes e ser찼 a raiz de uma nova hist처ria totalmente "
+"desconectada de todas as outras ramifica챌천es e commits."
#. type: Plain text
#: en/git-checkout.txt:219
-#, fuzzy, priority:240
-#| msgid "The index and the working tree are adjusted as if you had previously run \"git checkout <start_point>\". This allows you to start a new history that records a set of paths similar to <start_point> by easily running \"git commit -a\" to make the root commit."
+#, priority:240
msgid "The index and the working tree are adjusted as if you had previously run `git checkout <start_point>`. This allows you to start a new history that records a set of paths similar to `<start_point>` by easily running `git commit -a` to make the root commit."
-msgstr "O 챠ndice e a 찼rvore de trabalho s찾o ajustados como se voc챗 tivesse executado anteriormente \"git checkout <ponto_de_partida>\". Isso permite que voc챗 inicie um novo hist처rico que registra um conjunto de paths semelhante ao <ponto_de_partida> executando facilmente \"git commit -a\" para fazer o commit raiz."
+msgstr ""
+"O 챠ndice e a 찼rvore de trabalho s찾o ajustadas como se voc챗 tivesse executado "
+"`git checkout <start_point>` anteriormente. Isso permite que voc챗 inicie um "
+"novo hist처rico que registra um conjunto de \"paths\" semelhante ao "
+"`<start_point>` sendo executado facilmente com `git commit -a` para fazer o "
+"commit principal."
#. type: Plain text
#: en/git-checkout.txt:225
@@ -12070,10 +12318,15 @@ msgstr "Isso pode ser 첬til quando voc챗 deseja publicar a 찼rvore de um commit
#. type: Plain text
#: en/git-checkout.txt:232
-#, fuzzy, priority:240
-#| msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of <start_point>, then you should clear the index and the working tree right after creating the orphan branch by running \"git rm -rf .\" from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc."
+#, priority:240
msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of `<start_point>`, then you should clear the index and the working tree right after creating the orphan branch by running `git rm -rf .` from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc."
-msgstr "Se voc챗 quiser iniciar um hist처rico desconectado que registra um conjunto de caminhos totalmente diferente do <start_point>, ent찾o voc챗 deve limpar o 챠ndice e a 찼rvore de trabalho logo ap처s criar o branch 처rf찾o executando \"git rm -rf. \" do n챠vel superior da 찼rvore de trabalho. Depois disso, voc챗 estar찼 pronto para preparar seus novos arquivos, preenchendo a 찼rvore de trabalho, copiando-os de outro lugar, extraindo um tarball, etc."
+msgstr ""
+"Caso queira iniciar um hist처rico desconectado que registra um conjunto de "
+"caminhos totalmente diferente do `<start_point>`, ent찾o voc챗 deve limpar o "
+"챠ndice e a 찼rvore de trabalho logo ap처s criar a ramifica챌찾o 처rf찾 executando `"
+"git rm -rf.` do topo da 찼rvore de trabalho. Depois disso, voc챗 estar찼 pronto "
+"para preparar os seus novos arquivos, preenchendo a 찼rvore de trabalho, "
+"copiando-os de outro lugar, extraindo um tarball, etc."
#. type: Labeled list
#: en/git-checkout.txt:233 en/git-restore.txt:103
@@ -12083,10 +12336,13 @@ msgstr "--ignore-skip-worktree-bits"
#. type: Plain text
#: en/git-checkout.txt:238
-#, fuzzy, priority:240
-#| msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entries matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and adds back any files in <paths>."
+#, priority:240
msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entries matched by `<paths>` and sparse patterns in `$GIT_DIR/info/sparse-checkout`. This option ignores the sparse patterns and adds back any files in `<paths>`."
-msgstr "No modo de checkout esparso, `git checkout - <paths>` atualizaria apenas entradas correspondidas por <paths> e padr천es esparsos em $GIT_DIR/info/sparse-checkout. Esta op챌찾o ignora os padr천es esparsos e adiciona de volta os arquivos em <paths>."
+msgstr ""
+"No modo de checkout esparso, o comando `git checkout -- <paths>` atualizaria "
+"apenas as entradas correspondidas por `<paths>` e os padr천es esparsos em `$"
+"GIT_DIR/info/sparse-checkout`. Esta op챌찾o ignora os padr천es esparsos e "
+"adiciona de volta os arquivos em `<paths>`."
#. type: Labeled list
#: en/git-checkout.txt:240 en/git-rebase.txt:315 en/git-rebase.txt:582 en/git-reset.txt:74 en/git-restore.txt:86 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
@@ -12126,17 +12382,24 @@ msgstr "--conflito=<estilo>"
#. type: Plain text
#: en/git-checkout.txt:266 en/git-restore.txt:96 en/git-switch.txt:139
-#, fuzzy, priority:240
-#| msgid "The same as --merge option above, but changes the way the conflicting hunks are presented, overriding the merge.conflictStyle configuration variable. Possible values are \"merge\" (default) and \"diff3\" (in addition to what is shown by \"merge\" style, shows the original contents)."
+#, priority:240
msgid "The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable. Possible values are \"merge\" (default) and \"diff3\" (in addition to what is shown by \"merge\" style, shows the original contents)."
-msgstr "O mesmo que a op챌찾o --merge acima, mas altera a forma como os blocos conflitantes s찾o apresentados, substituindo a vari찼vel de configura챌찾o merge.conflictStyle. Os valores poss챠veis s찾o \"merge\" (padr찾o) e \"diff3\" (al챕m do que 챕 mostrado pelo estilo \"merge\", mostra o conte첬do original)."
+msgstr ""
+"O mesmo que a op챌찾o `--merge acima` por챕m altera a forma como os blocos "
+"conflitantes s찾o apresentados, substituindo a vari찼vel de configura챌찾o "
+"`merge.conflictStyle`. Os valores poss챠veis s찾o \"merge\" (padr찾o) e \""
+"diff3\" (al챕m do que 챕 mostrado pelo estilo \"merge\", exibe o conte첬do "
+"original)."
#. type: Plain text
#: en/git-checkout.txt:273
-#, fuzzy, priority:240
-#| msgid "Interactively select hunks in the difference between the <tree-ish> (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the working tree (and if a <tree-ish> was specified, the index)."
+#, priority:240
msgid "Interactively select hunks in the difference between the `<tree-ish>` (or the index, if unspecified) and the working tree. The chosen hunks are then applied in reverse to the working tree (and if a `<tree-ish>` was specified, the index)."
-msgstr "Selecione interativamente os peda챌os na diferen챌a entre o <tree-ish> (ou o 챠ndice, se n찾o especificado) e a 찼rvore de trabalho. Os peda챌os escolhidos s찾o ent찾o aplicados em reverso 횪 찼rvore de trabalho (e se um <tree-ish> for especificado, o 챠ndice)."
+msgstr ""
+"Selecione interativamente os peda챌os na diferen챌a entre o `<tree-ish>` (ou o "
+"챠ndice, se n찾o for especificado) e a 찼rvore de trabalho. Os peda챌os "
+"escolhidos s찾o ent찾o aplicados em reverso 횪 찼rvore de trabalho (e caso um "
+"`<tree-ish>` for especificado, o 챠ndice)."
#. type: Plain text
#: en/git-checkout.txt:277
@@ -12188,10 +12451,16 @@ msgstr "--recurse-submodules"
#. type: Plain text
#: en/git-checkout.txt:302
-#, fuzzy, priority:240
-#| msgid "Using --recurse-submodules will update the content of all initialized submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or --no-recurse-submodules) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach the submodules HEAD."
+#, priority:240
msgid "Using `--recurse-submodules` will update the content of all initialized submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule."
-msgstr "Usando --recurso-subm처dulos ir찼 atualizar o conte첬do de todos os subm처dulos inicializados de acordo com o commit registrado no superprojeto. Se modifica챌천es locais em um subm처dulo forem sobrescritas, o check-out falhar찼, a menos que `-f` seja usado. Se nada (ou --n찾o-recurso-subm처dulos) for usado, as 찼rvores de trabalho dos subm처dulos n찾o ser찾o atualizadas. Assim como o linkgit:git-submodule[1], isso desanexar찼 os subm처dulos HEAD."
+msgstr ""
+"Usando `--recurse-submodules` ir찼 atualizar o conte첬do de todos os "
+"subm처dulos inicializados de acordo com o commit registrado no \""
+"superproject\". Caso as modifica챌천es locais em um subm처dulo sejam "
+"sobrescritas, o check-out falhar찼, a menos que `-f` seja usado. Caso nada ("
+"ou `--no-recurse-submodules`) seja usado, as 찼rvores de trabalho dos "
+"subm처dulos n찾o ser찾o atualizadas. Assim como o linkgit:git-submodule[1], "
+"isso desanexar찼 os subm처dulos do `HEAD`."
#. type: Labeled list
#: en/git-checkout.txt:303 en/git-restore.txt:110
@@ -12219,24 +12488,33 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:330
-#, fuzzy, priority:240
-#| msgid "Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with \"refs/heads/\", is a valid ref), then that branch is checked out. Otherwise, if it refers to a valid commit, your HEAD becomes \"detached\" and you are no longer on any branch (see below for details)."
+#, priority:240
msgid "Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with \"refs/heads/\", is a valid ref), then that branch is checked out. Otherwise, if it refers to a valid commit, your `HEAD` becomes \"detached\" and you are no longer on any branch (see below for details)."
-msgstr "Filial para check-out; se refere-se a um ramo (isto 챕, um nome que, quando prefixado com \"refs/heads/\", 챕 um ref v찼lido), ent찾o esse ramo 챕 retirado. Caso contr찼rio, se se referir a um commit v찼lido, seu HEAD se torna \"separado\" e voc챗 n찾o est찼 mais em nenhum branch (veja abaixo para detalhes)."
+msgstr ""
+"Ramifica챌찾o que ser찼 extra챠da; se refere a um ramo (ou seja, um nome que "
+"quando preparado com \"refs/heads/\", for um \"ref\" v찼lido) ent찾o este ramo "
+"챕 extra챠do. Caso contr찼rio, caso se referira a um commit v찼lido, seu `HEAD` "
+"se torna \"desanexado\" e voc챗 n찾o est찼 mais em nenhuma ramifica챌찾o (veja "
+"abaixo para detalhes)."
#. type: Plain text
#: en/git-checkout.txt:334
-#, fuzzy, priority:240
-#| msgid "You can use the `\"@{-N}\"` syntax to refer to the N-th last branch/commit checked out using \"git checkout\" operation. You may also specify `-` which is synonymous to `\"@{-1}`."
+#, priority:240
msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit checked out using \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`."
-msgstr "Voc챗 pode usar a sintaxe `\" @{- N}\"` para se referir 횪 첬ltima branch/commit finalizada usando a opera챌찾o \"git checkout\". Voc챗 tamb챕m pode especificar `-` que 챕 sin척nimo de` \"@{- 1}`."
+msgstr ""
+"Voc챗 pode usar a sintaxe `@{- N}` para se referir ao 첬ltimo ramo/commit "
+"finalizado usando a opera챌찾o \"git checkout\". Voc챗 tamb챕m pode especificar "
+"`-` que 챕 um sin척nimo de`@{-1}`."
#. type: Plain text
#: en/git-checkout.txt:338 en/git-switch.txt:58
-#, fuzzy, ignore-ellipsis, priority:240
-#| msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
+#, ignore-ellipsis, priority:240
msgid "As a special case, you may use `A...B` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
-msgstr "Como um caso especial, voc챗 pode usar `\"A ... B\"` como um atalho para a base de mesclagem de `A` e` B` se houver exatamente uma base de merge. Voc챗 pode deixar de fora, no m찼ximo, um de `A` e` B`, caso em que o padr찾o 챕 `HEAD`."
+msgstr ""
+"Como um caso especial, voc챗 pode usar `A...B` como um atalho para a "
+"mesclagem na base de `A` e` B` se houver exatamente uma base a ser mesclada. "
+"Voc챗 pode deixar de fora, no m찼ximo, um de `A` e` B`, neste caso ele 챕 o "
+"padr찾o para `HEAD`."
#. type: Labeled list
#: en/git-checkout.txt:339
@@ -12258,10 +12536,11 @@ msgstr "<ponto_de_partida>"
#. type: Plain text
#: en/git-checkout.txt:345
-#, fuzzy, priority:240
-#| msgid "The name of a commit at which to start the new branch; see linkgit:git-branch[1] for details. Defaults to HEAD."
+#, priority:240
msgid "The name of a commit at which to start the new branch; see linkgit:git-branch[1] for details. Defaults to `HEAD`."
-msgstr "O nome de um commit no qual iniciar o novo branch; veja linkgit:git-branch[1] para detalhes. Padr찾o para HEAD."
+msgstr ""
+"O nome do commit na qual deve se iniciar uma nova ramifica챌찾o; para mais "
+"detalhes consulte linkgit:git-branch[1]. Padr찾o para `HEAD`."
#. type: Plain text
#: en/git-checkout.txt:349
@@ -12283,10 +12562,11 @@ msgstr ""
#. 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
-#, fuzzy, priority:280
-#| msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
+#, priority:280
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
-msgstr "Para mais detalhes sobre a sintaxe <pathspec>, veja a entrada 'pathspec' em linkgit:gitglossary[7]."
+msgstr ""
+"Para mais detalhes sobre a sintaxe <pathspec>, veja a entrada 'pathspec' em "
+"linkgit:gitglossary[7]."
#. type: Title -
#: en/git-checkout.txt:363
@@ -12296,10 +12576,13 @@ msgstr "CABE횉A DESTACADA"
#. type: Plain text
#: en/git-checkout.txt:367
-#, fuzzy, 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:"
+#, 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 uma ramifica챌찾o nomeada (por exemplo, 'mestre'). Enquanto isso, cada ramo se refere a um commit espec챠fico. Vamos olhar para um reposit처rio com tr챗s commits, um deles marcado, e com branch 'master' check 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 "
+"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`:"
#. type: delimited block -
#: en/git-checkout.txt:376
@@ -12316,10 +12599,14 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:383
-#, fuzzy, priority:240
-#| msgid "When a commit is created in this state, the branch is updated to refer to the new commit. Specifically, 'git commit' creates a new commit 'd', whose parent is commit 'c', and then updates branch 'master' to refer to new commit 'd'. HEAD still refers to branch 'master' and so indirectly now refers to commit 'd':"
+#, priority:240
msgid "When a commit is created in this state, the branch is updated to refer to the new commit. Specifically, 'git commit' creates a new commit `d`, whose parent is commit `c`, and then updates branch `master` to refer to new commit `d`. `HEAD` still refers to branch `master` and so indirectly now refers to commit `d`:"
-msgstr "Quando uma confirma챌찾o 챕 criada nesse estado, a ramifica챌찾o 챕 atualizada para se referir 횪 nova confirma챌찾o. Especificamente, 'git commit' cria um novo commit 'd', cujo pai 챕 commit 'c', e ent찾o atualiza o branch 'master' para se referir ao novo commit 'd'. HEAD ainda se refere 횪 ramifica챌찾o 'master' e ent찾o indiretamente agora se refere a commit 'd':"
+msgstr ""
+"Quando uma confirma챌찾o 챕 criada nesta condi챌찾o a ramifica챌찾o 챕 atualizada "
+"com refer챗ncia ao novo commit. Especificamente, o comando 'git commit' cria "
+"um novo commit `d`, cuja matriz 챕 o commit 'c' e ent찾o atualiza o ramo "
+"`master` para se referir ao novo commit `d`. `HEAD` ainda se refere 횪 "
+"ramifica챌찾o `master` e ent찾o indiretamente agora se refere ao commit `d`:"
#. type: delimited block -
#: en/git-checkout.txt:386 en/git-checkout.txt:421 en/git-checkout.txt:438
@@ -12342,10 +12629,14 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:400
-#, fuzzy, priority:240
-#| msgid "It is sometimes useful to be able to checkout a commit that is not at the tip of any named branch, or even to create a new commit that is not referenced by a named branch. Let's look at what happens when we checkout commit 'b' (here we show two ways this may be done):"
+#, priority:240
msgid "It is sometimes useful to be able to checkout a commit that is not at the tip of any named branch, or even to create a new commit that is not referenced by a named branch. Let's look at what happens when we checkout commit `b` (here we show two ways this may be done):"
-msgstr "�s vezes, 챕 첬til poder fazer o checkout de uma confirma챌찾o que n찾o esteja na ponta de qualquer ramifica챌찾o nomeada, ou mesmo criar uma nova confirma챌찾o que n찾o seja referenciada por uma ramifica챌찾o nomeada. Vejamos o que acontece quando fazemos o checkout commit 'b' (aqui mostramos duas maneiras pelas quais isso pode ser feito):"
+msgstr ""
+"�s vezes 챕 첬til poder fazer o checkout do nome de um commit que n찾o esteja "
+"no topo de qualquer ramifica챌찾o ou mesmo criar um novo commit que n찾o tenha "
+"refer챗ncia em uma ramifica챌찾o conhecida por nome. Vejamos o que acontece "
+"quando fazemos o checkout commit `b` (aqui demostramos duas maneiras de como "
+"isso pode ser feito):"
#. type: delimited block -
#: en/git-checkout.txt:404
@@ -12372,10 +12663,14 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:418
-#, fuzzy, priority:240
-#| msgid "Notice that regardless of which checkout command we use, HEAD now refers directly to commit 'b'. This is known as being in detached HEAD state. It means simply that HEAD refers to a specific commit, as opposed to referring to a named branch. Let's see what happens when we create a commit:"
+#, priority:240
msgid "Notice that regardless of which checkout command we use, `HEAD` now refers directly to commit `b`. This is known as being in detached `HEAD` state. It means simply that `HEAD` refers to a specific commit, as opposed to referring to a named branch. Let's see what happens when we create a commit:"
-msgstr "Observe que, independentemente do comando de checkout usado, o HEAD agora se refere diretamente ao commit 'b'. Isso 챕 conhecido como estando no estado HEAD separado. Significa simplesmente que HEAD se refere a um commit espec챠fico, ao inv챕s de se referir a um branch nomeado. Vamos ver o que acontece quando criamos um commit:"
+msgstr ""
+"Observe que, independente do comando checkout usado o `HEAD` agora se refere "
+"diretamente ao commit `b`. Isso 챕 conhecido como condi챌찾o em desanexo do "
+"HEAD. Simplesmente significa que `HEAD` tem refer챗ncia a um commit em "
+"espec챠fico em vez de se referir ao nome de um ramo. Vejamos o que acontece "
+"quando criamos um commit:"
#. type: delimited block -
#: en/git-checkout.txt:431
@@ -12394,10 +12689,11 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:435
-#, fuzzy, priority:240
-#| msgid "There is now a new commit 'e', but it is referenced only by HEAD. We can of course add yet another commit in this state:"
+#, priority:240
msgid "There is now a new commit `e`, but it is referenced only by `HEAD`. We can of course add yet another commit in this state:"
-msgstr "Existe agora um novo commit 'e', mas 챕 referenciado apenas pelo HEAD. Podemos, claro, adicionar mais um commit nesse estado:"
+msgstr ""
+"Agora existe um novo commit `e`, com refer챗ncia apenas em` HEAD`. Nessa "
+"condi챌찾o fica claro que podemos adicionar mais um commit:"
#. type: delimited block -
#: en/git-checkout.txt:448
@@ -12416,10 +12712,11 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:452
-#, fuzzy, priority:240
-#| msgid "In fact, we can perform all the normal Git operations. But, let's look at what happens when we then checkout master:"
+#, priority:240
msgid "In fact, we can perform all the normal Git operations. But, let's look at what happens when we then checkout `master`:"
-msgstr "Na verdade, podemos executar todas as opera챌천es normais do Git. Mas, vamos ver o que acontece quando, ent찾o, fazemos o checkout master:"
+msgstr ""
+"De fato, podemos executar todas as opera챌천es normais do Git. Por챕m vejamos o "
+"que acontece quando fazemos um checkout do `master`:"
#. type: delimited block -
#: en/git-checkout.txt:455
@@ -12442,10 +12739,14 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:470
-#, fuzzy, priority:240
-#| msgid "It is important to realize that at this point nothing refers to commit 'f'. Eventually commit 'f' (and by extension commit 'e') will be deleted by the routine Git garbage collection process, unless we create a reference before that happens. If we have not yet moved away from commit 'f', any of these will create a reference to it:"
+#, priority:240
msgid "It is important to realize that at this point nothing refers to commit `f`. Eventually commit `f` (and by extension commit `e`) will be deleted by the routine Git garbage collection process, unless we create a reference before that happens. If we have not yet moved away from commit `f`, any of these will create a reference to it:"
-msgstr "횋 importante perceber que neste ponto nada se refere ao commit 'f'. Eventualmente, o commit 'f' (e por extens찾o commit 'e') ser찼 deletado pelo processo de coleta de lixo do Git, a n찾o ser que criemos uma refer챗ncia antes que isso aconte챌a. Se ainda n찾o tivermos mudado do commit 'f', qualquer um deles criar찼 uma refer챗ncia a ele:"
+msgstr ""
+"횋 importante perceber que neste momento nada se refere ao commit `f`. "
+"Eventualmente o commit `f` (e de tabela o commit `e`) ser찼 exclu챠do pelo "
+"processo rotineiro da coleta de lixo do Git, antes que isso aconte챌a 챕 "
+"preciso criar uma refer챗ncia. Se ainda n찾o nos afastamos do commit `f`, "
+"qualquer um deles criar찼 uma refer챗ncia a ele:"
#. type: delimited block -
#: en/git-checkout.txt:475
@@ -12461,31 +12762,37 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:480
-#, fuzzy, priority:240
-#| msgid "creates a new branch 'foo', which refers to commit 'f', and then updates HEAD to refer to branch 'foo'. In other words, we'll no longer be in detached HEAD state after this command."
+#, priority:240
msgid "creates a new branch `foo`, which refers to commit `f`, and then updates `HEAD` to refer to branch `foo`. In other words, we'll no longer be in detached `HEAD` state after this command."
-msgstr "cria um novo branch 'foo', que se refere a commit 'f', e ent찾o atualiza HEAD para se referir a branch 'foo'. Em outras palavras, n찾o estaremos mais no estado HEAD separado ap처s este comando."
+msgstr ""
+"cria uma nova ramifica챌찾o `foo` com refer챗ncia ao commit `f`, atualiza HEAD "
+"com refer챗ncia ao ramo `foo`. Isso significa que agora n찾o estamos mais "
+"desanexados do `HEAD` ap처s este comando."
#. type: Plain text
#: en/git-checkout.txt:483
-#, fuzzy, priority:240
-#| msgid "similarly creates a new branch 'foo', which refers to commit 'f', but leaves HEAD detached."
+#, priority:240
msgid "similarly creates a new branch `foo`, which refers to commit `f`, but leaves `HEAD` detached."
-msgstr "similarmente cria uma nova ramifica챌찾o 'foo', que se refere ao commit 'f', mas deixa o HEAD desanexado."
+msgstr ""
+"similarmente cria um novo ramo `foo` com refer챗ncia ao commit `f` deixando "
+"`HEAD` desanexado."
#. type: Plain text
#: en/git-checkout.txt:486
-#, fuzzy, priority:240
-#| msgid "creates a new tag 'foo', which refers to commit 'f', leaving HEAD detached."
+#, priority:240
msgid "creates a new tag `foo`, which refers to commit `f`, leaving `HEAD` detached."
-msgstr "cria uma nova tag 'foo', que se refere ao commit 'f', deixando o HEAD desanexado."
+msgstr ""
+"cria uma nova tag `foo`com refer챗ncia ao commit `f` deixando HEAD desanexado."
#. type: Plain text
#: en/git-checkout.txt:491
-#, fuzzy, priority:240
-#| msgid "If we have moved away from commit 'f', then we must first recover its object name (typically by using git reflog), and then we can create a reference to it. For example, to see the last two commits to which HEAD referred, we can use either of these commands:"
+#, priority:240
msgid "If we have moved away from commit `f`, then we must first recover its object name (typically by using git reflog), and then we can create a reference to it. For example, to see the last two commits to which `HEAD` referred, we can use either of these commands:"
-msgstr "Se nos afastamos do commit 'f', devemos primeiro recuperar o nome do objeto (geralmente usando o git reflog), e ent찾o podemos criar uma refer챗ncia para ele. Por exemplo, para ver os dois 첬ltimos commits aos quais o HEAD se referiu, podemos usar um destes comandos:"
+msgstr ""
+"Se nos afastamos do commit `f`, primeiro precisamos recuperar o nome do "
+"objeto (normalmente usando git reflog) e em seguida, podemos criar uma "
+"refer챗ncia para ele. Para ver os dois 첬ltimos commits aos quais o `HEAD` se "
+"refere, podemos usar um destes comandos, por exemplo:"
#. type: delimited block -
#: en/git-checkout.txt:495
@@ -12503,17 +12810,26 @@ msgstr "DISAMBIGUA횉횄O DE ARGUMENTOS"
#. type: Plain text
#: en/git-checkout.txt:508
-#, fuzzy, priority:240
-#| msgid "When there is only one argument given and it is not `--` (e.g. \"git checkout abc\"), and when the argument is both a valid `<tree-ish>` (e.g. a branch \"abc\" exists) and a valid `<pathspec>` (e.g. a file or a directory whose name is \"abc\" exists), Git would usually ask you to disambiguate. Because checking out a branch is so common an operation, however, \"git checkout abc\" takes \"abc\" as a `<tree-ish>` in such a situation. Use `git checkout -- <pathspec>` if you want to checkout these paths out of the index."
+#, priority:240
msgid "When there is only one argument given and it is not `--` (e.g. `git checkout abc`), and when the argument is both a valid `<tree-ish>` (e.g. a branch `abc` exists) and a valid `<pathspec>` (e.g. a file or a directory whose name is \"abc\" exists), Git would usually ask you to disambiguate. Because checking out a branch is so common an operation, however, `git checkout abc` takes \"abc\" as a `<tree-ish>` in such a situation. Use `git checkout -- <pathspec>` if you want to checkout these paths out of the index."
-msgstr "Quando h찼 apenas um argumento dado e n찾o 챕 `--` (eg\" git checkout abc\"), e quando o argumento 챕 ambos um` <tree-ish> `v찼lido (ex. Um ramo\" abc \"existe) e um v찼lido `<pathspec>` (por exemplo, um arquivo ou diret처rio cujo nome 챕 \"abc\" existe), o Git normalmente pede para voc챗 desambiguar. Como o check-out de uma ramifica챌찾o 챕 uma opera챌찾o t찾o comum, no entanto, \"git checkout abc\" toma \"abc\" como um `<tree-ish>` em tal situa챌찾o. Use `git checkout - <pathspec>` se voc챗 quiser fazer o checkout desses caminhos fora do 챠ndice."
+msgstr ""
+"Quando h찼 apenas um argumento que n찾o seja `--` (como `git checkout abc`) e "
+"quando ambos os argumento `<tree-ish>` s찾o v찼lidos (como a exist챗ncia do "
+"ramo `abc`) e `<pathspec>` tamb챕m for v찼lido (caso um arquivo ou diret처rio "
+"exista e cujo nome seja \"abc\" por exemplo), o Git normalmente solicita que "
+"voc챗 desambigue. Contudo, como fazer o checkout de uma ramifica챌찾o 챕 uma "
+"opera챌찾o t찾o comum, o comando `git checkout abc` considera \"abc\" nessa "
+"situa챌찾o como `<tree-ish>`. Use `git checkout -- <pathspec>` caso queira "
+"eliminar estes caminhos de dentro do 챠ndice."
#. type: Plain text
#: en/git-checkout.txt:515
-#, fuzzy, priority:240
-#| msgid "The following sequence checks out the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
+#, priority:240
msgid "The following sequence checks out 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 faz o checkout do branch `master`, reverte o` Makefile` para duas revis천es, apaga hello.c por engano e o recupera do 챠ndice."
+msgstr ""
+"A sequ챗ncia a seguir exclui o ramo `master`, reverte o` Makefile` para duas "
+"revis천es anteriores, exclui o arquivo hello.c \"por engano\" e faz a "
+"recupera챌찾o do 챠ndice."
#. type: delimited block -
#: en/git-checkout.txt:521
@@ -12543,10 +12859,9 @@ msgstr "tirar um arquivo de outro commit"
#. type: Plain text
#: en/git-checkout.txt:526
-#, fuzzy, priority:240
-#| msgid "restore hello.c from the index"
+#, priority:240
msgid "restore `hello.c` from the index"
-msgstr "restaurar o hello.c do 챠ndice"
+msgstr "restaura do 챠ndice o arquivo `hello.c`"
#. type: Plain text
#: en/git-checkout.txt:529
@@ -12592,10 +12907,12 @@ msgstr "$ git checkout meu t처pico\n"
#. type: Plain text
#: en/git-checkout.txt:557
-#, fuzzy, priority:240
-#| msgid "However, your \"wrong\" branch and correct \"mytopic\" branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
+#, priority:240
msgid "However, your \"wrong\" branch and correct `mytopic` branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
-msgstr "No entanto, sua ramifica챌찾o \"errada\" e a ramifica챌찾o \"meu t처pico\" correta podem diferir nos arquivos que voc챗 modificou localmente. Nesse caso, a verifica챌찾o acima falharia assim:"
+msgstr ""
+"No entanto o seu ramo \"errado\" e o `mytopic` do ramo correto podem diferir "
+"nos arquivos que voc챗 modificou localmente. Que dessa maneira, a verifica챌찾o "
+"acima falhar찼 assim:"
#. type: delimited block -
#: en/git-checkout.txt:561
@@ -12785,7 +13102,10 @@ msgstr "Estas regras facilitam para ferramentas baseadas em script de shell anal
#: en/git-check-ref-format.txt:69
#, priority:100
msgid "A double-dot `..` is often used as in `ref1..ref2`, and in some contexts this notation means `^ref1 ref2` (i.e. not in `ref1` and in `ref2`)."
-msgstr "Um ponto duplo `..` 챕 freq체entemente usado como em` ref1..ref2` e, em alguns contextos, essa nota챌찾o significa `^ref1 ref2` (isto 챕, n찾o em` ref1` e em `ref2`)."
+msgstr ""
+"Um ponto duplo `..` 챕 freq체entemente usado como em` ref1..ref2` e, em alguns "
+"contextos, essa nota챌찾o significa `^ref1 ref2` (isto 챕, n찾o em` ref1` e em "
+"`ref2`)."
#. type: Plain text
#: en/git-check-ref-format.txt:72
@@ -12807,10 +13127,25 @@ msgstr "at-open-brace `@{` 챕 usado como uma nota챌찾o para acessar uma entrada
#. type: Plain text
#: en/git-check-ref-format.txt:98
-#, fuzzy, priority:100
-#| msgid "With the `--branch` option, the command takes a name and checks if it can be used as a valid branch name (e.g. when creating a new branch). But be cautious when using the previous checkout syntax that may refer to a detached HEAD state. The rule `git check-ref-format --branch $name` implements may be stricter than what `git check-ref-format refs/heads/$name` says (e.g. a dash may appear at the beginning of a ref component, but it is explicitly forbidden at the beginning of a branch name). When run with `--branch` option in a repository, the input is first expanded for the ``previous checkout syntax'' `@{-n}`. For example, `@{-1}` is a way to refer the last thing that was checked out using \"git checkout\" operation. This option should be used by porcelains to accept this syntax anywhere a branch name is expected, so they can act as if you typed the branch name. As an exception note that, the ``previous checkout operation'' might result in a commit object name when the N-th last thing checked out was not a branch."
+#, priority:100
msgid "With the `--branch` option, the command takes a name and checks if it can be used as a valid branch name (e.g. when creating a new branch). But be cautious when using the previous checkout syntax that may refer to a detached HEAD state. The rule `git check-ref-format --branch $name` implements may be stricter than what `git check-ref-format refs/heads/$name` says (e.g. a dash may appear at the beginning of a ref component, but it is explicitly forbidden at the beginning of a branch name). When run with `--branch` option in a repository, the input is first expanded for the ``previous checkout syntax'' `@{-n}`. For example, `@{-1}` is a way to refer the last thing that was checked out using \"git switch\" or \"git checkout\" operation. This option should be used by porcelains to accept this syntax anywhere a branch name is expected, so they can act as if you typed the branch name. As an exception note that, the ``previous checkout operation'' might result in a commit object name when the N-th last thing checked out was not a branch."
-msgstr "Com a op챌찾o `--branch`, o comando obt챕m um nome e verifica se ele pode ser usado como um nome de ramifica챌찾o v찼lido (por exemplo, ao criar uma nova ramifica챌찾o). Mas seja cauteloso ao usar a sintaxe de verificar anterior que pode se referir a um estado HEAD separado. A regra `git verifique-o-formato-ref --branch $nome` implementa pode ser mais restrita do que o que diz o` git check-ref-format refs/heads/$nome` (por exemplo, um tra챌o pode aparecer no in챠cio de um componente de refer챗ncia, mas 챕 explicitamente proibido no in챠cio de um nome de ramifica챌찾o). Quando executado com a op챌찾o `--branch` em um reposit처rio, a entrada 챕 primeiramente expandida para a` `sintaxe de verifica챌찾o pr챕via ''`@{- n}`. Por exemplo, `@{- 1}` 챕 uma maneira de referenciar a 첬ltima coisa que foi registrada usando a opera챌찾o \"git verificar\". Essa op챌찾o deve ser usada por porcelanas para aceitar essa sintaxe em qualquer lugar em que um nome de ramifica챌찾o 챕 esperado, para que eles possam agir como se voc챗 tivesse digitado o nome da ramifica챌찾o. Como uma exce챌찾o, note que a opera챌찾o de verificar anterior pode resultar em um nome de objeto commit quando a 첬ltima coisa que foi registrada n찾o 챕 uma ramifica챌찾o."
+msgstr ""
+"Com a op챌찾o `--branch`, o comando pega um nome e verifica se ele pode ser "
+"usado como o nome de um ramo v찼lido (por exemplo, ao criar uma nova "
+"ramifica챌찾o). Mas tenha cuidado ao usar a sintaxe de checkout anterior que "
+"pode se referir a um estado `HEAD` desanexado. A regra que o `git check-ref-"
+"format --branch $name` implementa pode ser mais rigorosa do que `git check-"
+"ref-format refs/heads/$name` diz (por exemplo, um tra챌o pode aparecer no "
+"in챠cio de um componente \"ref\" por챕m 챕 explicitamente proibido no in챠cio do "
+"nome de um ramo). Quando executada com a op챌찾o `--branch` em um reposit처rio "
+"a entrada 챕 expandida primeiro para ``previous checkout syntax'' `@{-n}`. "
+"Por exemplo, `@{-1}` 챕 uma maneira de consultar a 첬ltima coisa que foi "
+"retirada usando a opera챌찾o \"git switch\" ou \"git checkout\". Essa op챌찾o "
+"deve ser usada pelas porcelanas para aceitar essa sintaxe em qualquer lugar "
+"em que um nome do ramo seja esperado para que eles possam agir como se voc챗 "
+"digitasse o nome do ramo. Como uma exce챌찾o observe que a ``opera챌찾o de "
+"checkout anterior\" pode resultar em um nome do objeto de commit quando a "
+"en챕sima 첬ltima coisa verificada n찾o for um ramo."
#. type: Labeled list
#: en/git-check-ref-format.txt:101
@@ -12974,6 +13309,11 @@ msgstr ""
#, priority:100
msgid "This option determines how the commit message will be cleaned up before being passed on to the commit machinery. See linkgit:git-commit[1] for more details. In particular, if the '<mode>' is given a value of `scissors`, scissors will be appended to `MERGE_MSG` before being passed on in the case of a conflict."
msgstr ""
+"Essa op챌찾o define como a mensagem de commit sera limpa antes de ser "
+"encaminhada para o maquin찼rio de commit. Para mais detalhes consulte linkgit"
+":git-commit[1]. Em particular, caso o valor '<mode>' tenha um valor de "
+"tesoura `scissors`, a tesoura ser찼 anexada a `MERGE_MSG` antes de ser "
+"repassada no caso de um conflito."
#. type: Labeled list
#: en/git-cherry-pick.txt:65 en/git-clean.txt:63
@@ -13550,10 +13890,14 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:43
-#, fuzzy, priority:100
-#| msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f, -n or -i. Git will refuse to delete directories with .git sub directory or file unless a second -f is given."
+#, priority:100
msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i. Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory) unless a second -f is given."
-msgstr "Se a vari찼vel de configura챌찾o do Git, clean.requireForce, n찾o estiver definida como false, o 'git clean' recusar찼 a exclus찾o de arquivos ou diret처rios, a menos que seja dado -f, -n ou -i. O Git se recusar찼 a deletar diret처rios com o subdiret처rio ou arquivo .git, a menos que seja dado um segundo -f."
+msgstr ""
+"Se a vari찼vel de configura챌찾o do Git `clean.requireForce` n찾o estiver "
+"definida como \"false\", o `git clean` recusar찼 a exclus찾o de arquivos ou "
+"diret처rios a menos que seja usado a op챌찾o `-f` ou `-i`. O Git se recusar찼 a "
+"modificar reposit처rios git aninhados e sem lastro (diret처rios sem um "
+"subdiret처rio .git) a menos que seja dado um segundo `-f`."
#. type: Plain text
#: en/git-clean.txt:48
@@ -13590,13 +13934,20 @@ msgstr "--excluir=<pattern>"
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
msgstr ""
+"Use o padr찾o de exclus찾o fornecido al챕m das regras de exclus찾o predefinidas ("
+"consulte linkgit:gitignore[5])."
#. type: Plain text
#: en/git-clean.txt:70
-#, fuzzy, priority:100
-#| msgid "Don't use the standard ignore rules read from .gitignore (per directory) and $GIT_DIR/info/exclude, but do still use the ignore rules given with `-e` options. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git reset') to create a pristine working directory to test a clean build."
+#, priority:100
msgid "Don't use the standard ignore rules (see linkgit:gitignore[5]), but still use the ignore rules given with `-e` options from the command line. This allows removing all untracked files, including build products. This can be used (possibly in conjunction with 'git restore' or 'git reset') to create a pristine working directory to test a clean build."
-msgstr "N찾o use as regras padr찾o de ignorar lidas de .gitignore (por diret처rio) e $GIT_DIR/info/excluir, mas ainda use as regras de ignorar dadas com as op챌천es `-e`. Isso permite remover todos os arquivos n찾o acompanhados, incluindo produtos de cria챌찾o. Isso pode ser usado (possivelmente em conjunto com 'git reset') para criar um diret처rio de trabalho primitivo para testar uma compila챌찾o limpa."
+msgstr ""
+"N찾o use as regras de exclus찾o predefinidas (see linkgit:gitignore[5]), por챕m "
+"continue a usar as regras de exclus찾o fornecidas com a op챌찾o `-e` na linha "
+"de comando. Isso permite remover todos os arquivos n찾o rastreados, "
+"incluindo produtos de compila챌찾o. Isso pode ser usado (possivelmente em "
+"conjunto com 'git restore' ou 'git reset') para criar um novo diret처rio de "
+"trabalho para testar uma compila챌찾o limpa."
#. type: Labeled list
#: en/git-clean.txt:71
@@ -13747,13 +14098,24 @@ msgid ""
"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--] <repository>\n"
"\t [<directory>]\n"
msgstr ""
+"'git clone' [--template=<template_directory>]\n"
+"\t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n"
+"\t [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]\n"
+"\t [--dissociate] [--separate-git-dir <git dir>]\n"
+"\t [--depth <depth>] [--[no-]single-branch] [--no-tags]\n"
+"\t [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]\n"
+"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--] <repository>\n"
+"\t [<directory>]\n"
#. type: Plain text
#: en/git-clone.txt:29
-#, fuzzy, priority:300
-#| msgid "Clones a repository into a newly created directory, creates remote-tracking branches for each branch in the cloned repository (visible using `git branch -r`), and creates and checks out an initial branch that is forked from the cloned repository's currently active branch."
+#, priority:300
msgid "Clones a repository into a newly created directory, creates remote-tracking branches for each branch in the cloned repository (visible using `git branch --remotes`), and creates and checks out an initial branch that is forked from the cloned repository's currently active branch."
-msgstr "Clona um reposit처rio em um diret처rio rec챕m-criado, cria ramifica챌천es de rastreamento remoto para cada ramifica챌찾o no reposit처rio clonado (vis챠vel usando `git branch -r`) e cria e faz check-out de uma ramifica챌찾o inicial que 챕 bifurcada da ramifica챌찾o atualmente ativa do reposit처rio clonado ."
+msgstr ""
+"Clona um reposit처rio em um diret처rio rec챕m-criado, cria ramifica챌천es de "
+"rastreamento remoto para cada ramifica챌찾o no reposit처rio clonado (vis챠vel "
+"usando `git branch --remotes`), cria e verifica uma ramifica챌찾o inicial que "
+"챕 bifurcada da ramifica챌찾o atualmente ativa do reposit처rio clonado ."
#. type: Plain text
#: en/git-clone.txt:35
@@ -13825,20 +14187,41 @@ msgid ""
"If these objects are removed and were referenced by the cloned repository,\n"
"then the cloned repository will become corrupt.\n"
msgstr ""
+"*NOTA*: esta 챕 uma opera챌찾o possivelmente perigosa de se fazer; *n찾o* use\n"
+"a menos que voc챗 entenda o que ele faz. Se voc챗 clonar o seu\n"
+"reposit처rio usando esta op챌찾o e em seguida excluir os ramos branches (ou "
+"usar qualquer\n"
+"outro comando Git que faz qualquer compromisso existente n찾o referenciado) "
+"no\n"
+"reposit처rio de origem, alguns objetos podem perder a refer챗ncia (ou ficarem "
+"pendurados).\n"
+"Esses objetos podem ser removidos por opera챌천es normais do Git (como 'git "
+"commit')\n"
+"que automaticamente chamam de `git gc --auto`. (Veja linkgit:git-gc[1].)\n"
+"Caso esses objetos sejam removidos e forem referenciados pelo reposit처rio "
+"clonado,\n"
+"ent찾o o reposit처rio clonado se tornar찼 corrupto.\n"
#. type: Plain text
#: en/git-clone.txt:89
-#, fuzzy, priority:300
-#| msgid "Note that running `git repack` without the `-l` option in a repository cloned with `-s` will copy objects from the source repository into a pack in the cloned repository, removing the disk space savings of `clone -s`. It is safe, however, to run `git gc`, which uses the `-l` option by default."
+#, priority:300
msgid "Note that running `git repack` without the `--local` option in a repository cloned with `--shared` will copy objects from the source repository into a pack in the cloned repository, removing the disk space savings of `clone --shared`. It is safe, however, to run `git gc`, which uses the `--local` option by default."
-msgstr "Note que executar o `git reempacotamento` sem a op챌찾o `-l` em um reposit처rio clonado com `-s` copiar찼 objetos do reposit처rio de origem em um pacote no reposit처rio clonado, removendo a economia de espa챌o em disco do `clone -s`. 횋 seguro, no entanto, rodar o `git gc`, que usa a op챌찾o `-l` por padr찾o."
+msgstr ""
+"Note que executar o `git repack` sem a op챌찾o `--local` em um reposit처rio "
+"clonado com `--shared` copiar찼 os objetos do reposit처rio de origem em um "
+"pacote dentro do reposit처rio clonado removendo a economia de espa챌o em disco "
+"do `clone --shared`. 횋 seguro, no entanto, rodar o `git gc`, que usa a "
+"op챌찾o `--local` por padr찾o."
#. type: Plain text
#: en/git-clone.txt:93
-#, fuzzy, priority:300
-#| msgid "If you want to break the dependency of a repository cloned with `-s` on its source repository, you can simply run `git repack -a` to copy all objects from the source repository into a pack in the cloned repository."
+#, priority:300
msgid "If you want to break the dependency of a repository cloned with `--shared` on its source repository, you can simply run `git repack -a` to copy all objects from the source repository into a pack in the cloned repository."
-msgstr "Se voc챗 quiser quebrar a depend챗ncia de um reposit처rio clonado com `-s` em seu reposit처rio de origem, voc챗 pode simplesmente executar o comando` git repack -a` para copiar todos os objetos do reposit처rio de origem em um pacote no reposit처rio clonado."
+msgstr ""
+"Caso queira quebrar a depend챗ncia de um reposit처rio clonado com `--shared` "
+"no seu reposit처rio de origem, voc챗 pode simplesmente executar o comando `git "
+"repack -a` para copiar todos os objetos do reposit처rio de origem em um "
+"pacote dentro do reposit처rio clonado."
#. type: Labeled list
#: en/git-clone.txt:94
@@ -13885,13 +14268,18 @@ msgstr "Opere em sil챗ncio. O progresso n찾o 챕 relatado para o fluxo de erros
#, priority:300
msgid "Run verbosely. Does not affect the reporting of progress status to the standard error stream."
msgstr ""
+"Executa em modo louquaz. N찾o afera o relat처rio da condi챌찾o de progresso para "
+"o fluxo de erro padr찾o."
#. type: Plain text
#: en/git-clone.txt:134
-#, fuzzy, priority:300
-#| msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
+#, priority:300
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
-msgstr "O status de progresso 챕 relatado no fluxo de erro padr찾o por padr찾o quando ele 챕 anexado a um terminal, a menos que -q seja especificado. Esse sinalizador for챌a o status de progresso mesmo se o fluxo de erro padr찾o n찾o for direcionado para um terminal."
+msgstr ""
+"A condi챌찾o do progresso 챕 relatado no padr찾o do fluxo de erro por padr찾o "
+"quando ele 챕 anexado em um terminal, a menos que `--quiet` seja "
+"especificado. Esta sinaliza챌찾o imp천e o status de progresso mesmo que o fluxo "
+"de erro padr찾o n찾o seja direcionado para um terminal."
#. type: Plain text
#: en/git-clone.txt:146
@@ -13907,10 +14295,18 @@ msgstr "--bare"
#. type: Plain text
#: en/git-clone.txt:158
-#, fuzzy, priority:300
-#| msgid "Make a 'bare' Git repository. That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `-n` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created."
+#, priority:300
msgid "Make a 'bare' Git repository. That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `--no-checkout` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created."
-msgstr "Fa챌a um reposit처rio 'bare' Git. Isto 챕, ao inv챕s de criar o `<directory>` e colocar os arquivos administrativos em `<directory>/.git`, fa챌a o pr처prio` <directory> `o` $GIT_DIR`. Isto obviamente implica o `-n` porque n찾o h찼 nenhum lugar para verificar a 찼rvore de trabalho. Al챕m disso, as cabe챌as de ramifica챌찾o no controle remoto s찾o copiadas diretamente para as cabe챌as de ramifica챌찾o locais correspondentes, sem mape찼-las para `refs/remotes/origin/`. Quando essa op챌찾o 챕 usada, nem as ramifica챌천es de rastreamento remoto nem as vari찼veis de configura챌찾o relacionadas s찾o criadas."
+msgstr ""
+"Fa챌a um reposit처rio 'bare' Git. Isto 챕, ao inv챕s de criar o `<directory>` e "
+"colocar os arquivos administrativos em `<directory>/.git`, fa챌a o pr처prio "
+"`<directory>` ser o `$GIT_DIR`. Isto obviamente implica a op챌찾o `--no-"
+"checkout` pois n찾o h찼 nenhum lugar para verificar a 찼rvore de trabalho. "
+"Al챕m disso os \"heads\" da ramifica챌찾o remota s찾o copiadas diretamente para "
+"os \"heads\" de ramifica챌찾o locais correspondentes sem mape찼-las para `refs/"
+"remotes/origin/`. Quando essa op챌찾o 챕 usada, nem as ramifica챌천es de "
+"rastreamento remoto nem as vari찼veis de configura챌찾o relacionadas s찾o "
+"criadas."
#. type: Labeled list
#: en/git-clone.txt:159 en/git-pack-objects.txt:199 en/git-show-branch.txt:67 en/rev-list-options.txt:352 en/rev-list-options.txt:485
@@ -13923,6 +14319,10 @@ msgstr "--sparse"
#, priority:300
msgid "Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed."
msgstr ""
+"Inicialize o \"checkout esparso\" para que o diret처rio de trabalho comece "
+"apenas com os arquivos na raiz do reposit처rio. O arquivo \"checkout esparso\""
+" pode ser modificado para aumentar o diret처rio de trabalho conforme a "
+"necessidade."
#. type: Labeled list
#: en/git-clone.txt:165 en/git-push.txt:161
@@ -13978,73 +14378,97 @@ msgstr "Em vez de apontar o HEAD rec챕m-criado para a ramifica챌찾o apontada pel
#: en/git-clone.txt:187
#, no-wrap, priority:300
msgid "-u <upload-pack>"
-msgstr ""
+msgstr "-u <upload-pack>"
#. type: Plain text
#: en/git-clone.txt:192
#, priority:300
msgid "When given, and the repository to clone from is accessed via ssh, this specifies a non-default path for the command run on the other end."
msgstr ""
+"Quando informado e o reposit처rio a ser clonado for acess챠vel atrav챕s do ssh, "
+"determina que seja executado um caminho fora do padr찾o na outra extremidade."
#. type: Labeled list
#: en/git-clone.txt:193 en/git-init.txt:51 en/git-svn.txt:578
#, no-wrap, priority:300
msgid "--template=<template_directory>"
-msgstr ""
+msgstr "--template=<template_directory>"
#. type: Plain text
#: en/git-clone.txt:196
#, priority:300
msgid "Specify the directory from which templates will be used; (See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)"
msgstr ""
+"Informe o diret처rio de onde os modelos ser찾o usados; (Consulte a se챌찾o \""
+"DIRET횙RIO MODELO\" do linkgit:git-init[1].)"
#. type: Labeled list
#: en/git-clone.txt:197
#, no-wrap, priority:300
msgid "-c <key>=<value>"
-msgstr ""
+msgstr "-c <key>=<value>"
#. type: Labeled list
#: en/git-clone.txt:198
#, no-wrap, priority:300
msgid "--config <key>=<value>"
-msgstr ""
+msgstr "--config <key>=<value>"
#. type: Plain text
#: en/git-clone.txt:207
#, priority:300
msgid "Set a configuration variable in the newly-created repository; this takes effect immediately after the repository is initialized, but before the remote history is fetched or any files checked out. The key is in the same format as expected by linkgit:git-config[1] (e.g., `core.eol=true`). If multiple values are given for the same key, each value will be written to the config file. This makes it safe, for example, to add additional fetch refspecs to the origin remote."
msgstr ""
+"Define uma vari찼vel de configura챌찾o no reposit처rio rec챕m-criado; isso entra "
+"em vigor imediatamente ap처s a inicializa챌찾o do reposit처rio, por챕m antes da "
+"busca remota do hist처rico ou do checkout de quaisquer arquivos. Como 챕 "
+"esperado, a chave est찼 no mesmo formato de linkgit:git-config[1] (ou seja, "
+"`core.eol=true`). Caso v찼rios valores sejam fornecidos para a mesma chave, "
+"cada valor ser찼 gravado no arquivo de configura챌찾o. Isso o torna mais seguro "
+"para incluir \"fetch refspecs\" adicionais ao \"origin\" remoto por exemplo."
#. type: Plain text
#: en/git-clone.txt:213
#, priority:300
msgid "Due to limitations of the current implementation, some configuration variables do not take effect until after the initial fetch and checkout. Configuration variables known to not take effect are: `remote.<name>.mirror` and `remote.<name>.tagOpt`. Use the corresponding `--mirror` and `--no-tags` options instead."
msgstr ""
+"Devido as limita챌천es da implementa챌찾o atual, algumas vari찼veis de "
+"configura챌찾o n찾o entram em vigor at챕 o pr처ximo \"fetch\" e \"checkout\". As "
+"vari찼veis de configura챌찾o que s찾o conhecidas por n찾o terem efeito s찾o: "
+"`remote.<name>.mirror` and `remote.<name>.tagOpt`. Em vez disso, use as "
+"op챌천es correspondentes `--mirror` e `--no-tags`."
#. type: Labeled list
#: en/git-clone.txt:214
#, no-wrap, priority:300
msgid "--depth <depth>"
-msgstr ""
+msgstr "--depth <depth>"
#. type: Plain text
#: en/git-clone.txt:220
#, priority:300
msgid "Create a 'shallow' clone with a history truncated to the specified number of commits. Implies `--single-branch` unless `--no-single-branch` is given to fetch the histories near the tips of all branches. If you want to clone submodules shallowly, also pass `--shallow-submodules`."
msgstr ""
+"Crie um clone 'raso' com um hist처rico truncado para uma quantidade "
+"determinada de revis천es. Implica no uso da op챌찾o `--single-branch` a menos "
+"que `--no-single-branch` seja usado para resgatar os hist처ricos pr처ximos 횪s "
+"pontas de todos os ramos, caso queira clonar os subm처dulos superficialmente, "
+"use tamb챕m `--shallow-submodules`."
#. type: Plain text
#: en/git-clone.txt:223
#, priority:300
msgid "Create a shallow clone with a history after the specified time."
-msgstr ""
+msgstr "Crie um clone superficial com um hist처rico ap처s o tempo determinado."
#. type: Plain text
#: en/git-clone.txt:228
#, priority:300
msgid "Create a shallow clone with a history, excluding commits reachable from a specified remote branch or tag. This option can be specified multiple times."
msgstr ""
+"Crie um clone superficial com um hist처rico, excluindo os commits dispon챠veis "
+"a partir de uma ramifica챌찾o remota ou tag espec챠fica. Esta op챌찾o pode ser "
+"usada mais de uma vez."
#. type: Labeled list
#: en/git-clone.txt:229 en/git-submodule.txt:433
@@ -14063,6 +14487,10 @@ msgstr ""
#, priority:300
msgid "Don't clone any tags, and set `remote.<remote>.tagOpt=--no-tags` in the config, ensuring that future `git pull` and `git fetch` operations won't follow any tags. Subsequent explicit tag fetches will still work, (see linkgit:git-fetch[1])."
msgstr ""
+"N찾o clone quaisquer tags e defina `remote.<remote>.tagOpt=--no-tags` nas "
+"configura챌천es, garantindo que as futuras opera챌천es `git pull` e `git fetch` "
+"n찾o sigam qualquer tag. As buscas expl챠citas subsequentes das tags ainda "
+"funcionar찾o (consulte linkgit:git-fetch[1])."
#. type: Plain text
#: en/git-clone.txt:250
@@ -14074,7 +14502,7 @@ msgstr ""
#: en/git-clone.txt:251
#, no-wrap, priority:300
msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+msgstr "--recurse-submodules[=<pathspec]"
#. type: Plain text
#: en/git-clone.txt:259
@@ -14111,66 +14539,84 @@ msgstr "--[no-]remote-submodules"
#, priority:300
msgid "All submodules which are cloned will use the status of the submodule's remote-tracking branch to update the submodule, rather than the superproject's recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
msgstr ""
+"Todos os subm처dulos que forem clonados, para realizar a atualiza챌찾o os "
+"subm처dulos usar찾o a condi챌찾o remota do ramo do subm처dulo de rastreamento em "
+"vez do SHA-1 registrado no superprojeto. Equivale encaminhar `--remote` para "
+"`git submodule update`."
#. type: Labeled list
#: en/git-clone.txt:276 en/git-init.txt:56
#, no-wrap, priority:300
msgid "--separate-git-dir=<git dir>"
-msgstr ""
+msgstr "--separate-git-dir=<git dir>"
#. type: Plain text
#: en/git-clone.txt:282
#, priority:300
msgid "Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, then make a filesystem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree."
msgstr ""
+"Em vez de colocar o reposit처rio clonado onde deveria estar, coloque o "
+"reposit처rio clonado no diret처rio especificado e em seguida, fa챌a um link "
+"simb처lico Git independente do sistema de arquivos para l찼. O resultado 챕 "
+"que o reposit처rio Git pode ser separado da 찼rvore de trabalho."
#. type: Labeled list
#: en/git-clone.txt:283 en/git-submodule.txt:427
#, no-wrap, priority:300
msgid "-j <n>"
-msgstr ""
+msgstr "-j <n>"
#. type: Labeled list
#: en/git-clone.txt:284 en/git-submodule.txt:428
#, no-wrap, priority:300
msgid "--jobs <n>"
-msgstr ""
+msgstr "--jobs <n>"
#. type: Plain text
#: en/git-clone.txt:287
#, priority:300
msgid "The number of submodules fetched at the same time. Defaults to the `submodule.fetchJobs` option."
msgstr ""
+"A quantidade de subm처dulos que foram recuperados ao mesmo tempo. 횋 "
+"predefinido na op챌찾o `submodule.fetchJobs`."
#. type: Labeled list
#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
-msgstr ""
+msgstr "<reposit처rio>"
#. type: Plain text
#: en/git-clone.txt:292
#, priority:300
msgid "The (possibly remote) repository to clone from. See the <<URLS,GIT URLS>> section below for more information on specifying repositories."
msgstr ""
+"Os reposit처rios que ser찾o clonados (possivelmente remotos). Consulte a "
+"se챌찾o <<URLS,GIT URLS>> abaixo para mais informa챌천es sobre as "
+"especificidades dos reposit처rios."
#. type: Labeled list
#: en/git-clone.txt:293 en/git-cvsserver.txt:53 en/git-daemon.txt:220 en/git-receive-pack.txt:41 en/git-send-pack.txt:95 en/git-upload-archive.txt:57 en/git-upload-pack.txt:44
#, no-wrap, priority:300
msgid "<directory>"
-msgstr ""
+msgstr "<diret처rio>"
#. type: Plain text
#: en/git-clone.txt:299
#, priority:300
msgid "The name of a new directory to clone into. The \"humanish\" part of the source repository is used if no directory is explicitly given (`repo` for `/path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an existing directory is only allowed if the directory is empty."
msgstr ""
+"O nome de um novo diret처rio que ser찼 clonado. A parte \"human챠stica\" do "
+"reposit처rio de origem 챕 usada caso nenhum diret처rio seja explicitamente "
+"informado (`repo` para `/path/to/repo.git` e `foo` para `host.xz:foo/.git`)"
+". A clonagem em um diret처rio existente 챕 permitida apenas caso o diret처rio "
+"esteja vazio."
#. type: Plain text
#: en/git-clone.txt:307
#, priority:300
msgid "Clone from upstream:"
-msgstr ""
+msgstr "Clonando de um upstream:"
#. type: delimited block -
#: en/git-clone.txt:312
@@ -14180,12 +14626,17 @@ msgid ""
"$ cd my-linux\n"
"$ make\n"
msgstr ""
+"$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n"
+"$ cd my-linux\n"
+"$ make\n"
#. type: Plain text
#: en/git-clone.txt:316
#, priority:300
msgid "Make a local clone that borrows from the current directory, without checking things out:"
msgstr ""
+"Fa챌a uma clonagem local que pegue emprestado do diret처rio atual sem "
+"verifica챌찾o:"
#. type: delimited block -
#: en/git-clone.txt:321
@@ -14195,12 +14646,17 @@ msgid ""
"$ cd ../copy\n"
"$ git show-branch\n"
msgstr ""
+"$ git clone -l -s -n . ../copy\n"
+"$ cd ../copy\n"
+"$ git show-branch\n"
#. type: Plain text
#: en/git-clone.txt:325
#, priority:300
msgid "Clone from upstream while borrowing from an existing local directory:"
msgstr ""
+"Clone do upstream enquanto pega emprestado de um diret처rio local j찼 "
+"existente:"
#. type: delimited block -
#: en/git-clone.txt:331
@@ -14211,18 +14667,22 @@ msgid ""
"\tmy-linux\n"
"$ cd my-linux\n"
msgstr ""
+"$ git clone --reference /git/linux.git \\\n"
+"\tgit://git.kernel.org/pub/scm/.../linux.git \\\n"
+"\tmy-linux\n"
+"$ cd my-linux\n"
#. type: Plain text
#: en/git-clone.txt:335
#, priority:300
msgid "Create a bare repository to publish your changes to the public:"
-msgstr ""
+msgstr "Crie um reposit처rio simples para publicar suas altera챌천es ao p첬blico:"
#. type: delimited block -
#: en/git-clone.txt:338
#, no-wrap, priority:300
msgid "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
-msgstr ""
+msgstr "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
#. type: Title =
#: en/git-column.txt:2
@@ -14409,12 +14869,17 @@ msgstr ""
#, priority:100
msgid "This is usually not what an end user wants to run directly. See linkgit:git-commit[1] instead."
msgstr ""
+"Normalmente n찾o 챕 o que um usu찼rio final gostaria de usar diretamente. Em "
+"vez disso consulte linkgit:git-commit[1]."
#. type: Plain text
#: en/git-commit-tree.txt:25
#, priority:100
msgid "Creates a new commit object based on the provided tree object and emits the new commit object id on stdout. The log message is read from the standard input, unless `-m` or `-F` options are given."
msgstr ""
+"Cria um novo objeto commit com base no objeto da 찼rvore fornecida e emite o "
+"novo id do objeto de commit no stdout. A mensagem do registro log 챕 lido na "
+"entrada padr찾o, a n찾o ser que sejam fornecidas as op챌천es `-m` ou` -F`."
#. type: Plain text
#: en/git-commit-tree.txt:29
@@ -14427,24 +14892,35 @@ msgstr ""
#, priority:100
msgid "A commit object may have any number of parents. With exactly one parent, it is an ordinary commit. Having more than one parent makes the commit a merge between several lines of history. Initial (root) commits have no parents."
msgstr ""
+"Um objeto commit pode ter qualquer quantidade matrizes. Um commit comum 챕 "
+"aquele tem exatamente uma matriz. Ter mais de uma matriz faz com que o "
+"commit seja mesclado entre as v찼rias linhas da hist처ria. Os commits iniciais "
+"(root) n찾o possuem matrizes."
#. type: Plain text
#: en/git-commit-tree.txt:38
#, priority:100
msgid "While a tree represents a particular directory state of a working directory, a commit represents that state in \"time\", and explains how to get there."
msgstr ""
+"Enquanto uma 찼rvore representa a condi챌찾o de um diret처rio de trabalho em "
+"espec챠fico, um commit representa esta condi챌찾o em \"hora\" e explica como "
+"chegar at챕 l찼."
#. type: Plain text
#: en/git-commit-tree.txt:44
#, priority:100
msgid "Normally a commit would identify a new \"HEAD\" state, and while Git doesn't care where you save the note about that state, in practice we tend to just write the result to the file that is pointed at by `.git/HEAD`, so that we can always see what the last committed state was."
msgstr ""
+"Normalmente, um commit identifica uma nova condi챌찾o \"HEAD\" e embora o Git "
+"n찾o se importe onde voc챗 salva a nota sobre esse estado, na pr찼tica, "
+"tendemos apenas a escrever o resultado no arquivo apontado por `.git / HEAD` "
+"para que possamos sempre ver como estava a 첬ltima condi챌찾o do commit."
#. type: Labeled list
#: en/git-commit-tree.txt:47 en/git.txt:345
#, no-wrap, priority:100
msgid "<tree>"
-msgstr ""
+msgstr "<tree>"
#. type: Plain text
#: en/git-commit-tree.txt:49
@@ -14456,31 +14932,34 @@ msgstr ""
#: en/git-commit-tree.txt:50
#, no-wrap, priority:100
msgid "-p <parent>"
-msgstr ""
+msgstr "-p <parent>"
#. type: Plain text
#: en/git-commit-tree.txt:52
#, priority:100
msgid "Each `-p` indicates the id of a parent commit object."
-msgstr ""
+msgstr "Cada `-p` indica o id de uma matriz do objeto commit."
#. type: Labeled list
#: en/git-commit-tree.txt:53 en/git-fmt-merge-msg.txt:42
#, no-wrap, priority:100
msgid "-m <message>"
-msgstr ""
+msgstr "-m <message>"
#. type: Plain text
#: en/git-commit-tree.txt:56
#, priority:100
msgid "A paragraph in the commit log message. This can be given more than once and each <message> becomes its own paragraph."
msgstr ""
+"Um par찼grafo no registro log da mensagem de commit. O comando pode ser "
+"repetido mais de uma vez fazendo com que cada <mensagem> se torne um "
+"par찼grafo individual."
#. type: Labeled list
#: en/git-commit-tree.txt:57 en/git-commit.txt:132 en/git-fmt-merge-msg.txt:47 en/git-merge.txt:77 en/git-notes.txt:140 en/git-tag.txt:170
#, no-wrap, priority:280
msgid "-F <file>"
-msgstr ""
+msgstr "-F <file>"
#. type: Plain text
#: en/git-commit-tree.txt:61
@@ -14499,60 +14978,67 @@ msgstr "--no-gpg-sign"
#, priority:100
msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlier on the command line."
msgstr ""
+"N찾o assine o commit com GPG-sign que contrarie a op챌찾o na linha de comando "
+"`--gpg-sign` dada em momento anterior."
#. type: Title -
#: en/git-commit-tree.txt:73
#, no-wrap, priority:100
msgid "Commit Information"
-msgstr ""
+msgstr "Informa챌찾o do Commit"
#. type: Plain text
#: en/git-commit-tree.txt:76
#, priority:100
msgid "A commit encapsulates:"
-msgstr ""
+msgstr "Os encapsulamentos de um commit:"
#. type: Plain text
#: en/git-commit-tree.txt:78
#, priority:100
msgid "all parent object ids"
-msgstr ""
+msgstr "ids de todos os objetos matriz"
#. type: Plain text
#: en/git-commit-tree.txt:79
#, priority:100
msgid "author name, email and date"
-msgstr ""
+msgstr "nome do autor, email e data"
#. type: Plain text
#: en/git-commit-tree.txt:80
#, priority:100
msgid "committer name and email and the commit time."
msgstr ""
+"nome e o endere챌o de email da pessoa que faz o commit e o momento em que foi "
+"feito."
#. type: Plain text
#: en/git-commit-tree.txt:84
#, priority:100
msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
msgstr ""
+"O coment찼rio de um commit 챕 lido a partir do \"stdin\". Caso a entrada do \""
+"changelog\" n찾o seja provida de um redirecionamento \"<\" o 'git commit-"
+"tree' ir찼 aguardar que um seja inserido e finalizado com ^D."
#. type: Title -
#: en/git-commit-tree.txt:88
#, no-wrap, priority:100
msgid "Discussion"
-msgstr ""
+msgstr "Discuss찾o"
#. type: Title -
#: en/git-commit-tree.txt:93 en/git-commit.txt:528 en/git-config.txt:275 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap, priority:280
msgid "FILES"
-msgstr ""
+msgstr "ARQUIVOS"
#. type: Plain text
#: en/git-commit-tree.txt:95
#, priority:100
msgid "/etc/mailname"
-msgstr ""
+msgstr "/etc/mailname"
#. type: Plain text
#: en/git-commit-tree.txt:100
@@ -14570,7 +15056,7 @@ msgstr "git-commit(1)"
#: en/git-commit.txt:7
#, priority:280
msgid "git-commit - Record changes to the repository"
-msgstr ""
+msgstr "git-commit - Grava mudan챌as feitas no reposit처rio"
#. type: Plain text
#: en/git-commit.txt:18
@@ -14590,66 +15076,102 @@ msgstr ""
#, priority:280
msgid "Create a new commit containing the current contents of the index and the given log message describing the changes. The new commit is a direct child of HEAD, usually the tip of the current branch, and the branch is updated to point to it (unless no branch is associated with the working tree, in which case HEAD is \"detached\" as described in linkgit:git-checkout[1])."
msgstr ""
+"Cria um novo commit contendo os conte첬dos atuais do 챠ndice e a mensagem "
+"informada no registro log descrevendo as mudan챌as. Um novo commit 챕 um "
+"herdeiro direto do HEAD que em geral 챕 o topo do ramo atual e o ramo 챕 "
+"atualizado para apontar para ele (a menos que nenhum ramo seja associado com "
+"a 찼rvore de trabalho onde no caso o HEAD esteja \"desassociado\" como "
+"descrito em linkgit:git-checkout[1])."
#. type: Plain text
#: en/git-commit.txt:29
#, priority:280
msgid "The content to be committed can be specified in several ways:"
msgstr ""
+"O conte첬do a ser feito o commit pode ser definido de diferente maneiras:"
#. type: Plain text
#: en/git-commit.txt:33
#, priority:280
msgid "by using linkgit:git-add[1] to incrementally \"add\" changes to the index before using the 'commit' command (Note: even modified files must be \"added\");"
msgstr ""
+"ao usar linkgit:git-add[1] para ir incrementando mudan챌as com \"add\" para o "
+"챠ndice antes de usar o comando (Nota: devem ser \"adicionados\" at챕 mesmo os "
+"arquivos modificados);"
#. type: Plain text
#: en/git-commit.txt:36
#, priority:280
msgid "by using linkgit:git-rm[1] to remove files from the working tree and the index, again before using the 'commit' command;"
msgstr ""
+"ao usar linkgit:git-rm[1] para remover os arquivos da 찼rvore de trabalho em "
+"do 챠ndice, novamente, antes de usar o comando 'commit';"
#. type: Plain text
#: en/git-commit.txt:42
#, priority:280
msgid "by listing files as arguments to the 'commit' command (without --interactive or --patch switch), in which case the commit will ignore changes staged in the index, and instead record the current content of the listed files (which must already be known to Git);"
msgstr ""
+"ao listar os arquivos como argumentos para o comando 'commit' (sem usar as "
+"op챌천es --interactive ou --patch), nesse caso, o commit ignorar찼 as "
+"altera챌천es organizadas no 챠ndice e em vez disso registrar찼 o conte첬do atual "
+"dos arquivos listados (que j찼 devem ser conhecidos pelo Git );"
#. type: Plain text
#: en/git-commit.txt:48
#, priority:280
msgid "by using the -a switch with the 'commit' command to automatically \"add\" changes from all known files (i.e. all files that are already listed in the index) and to automatically \"rm\" files in the index that have been removed from the working tree, and then perform the actual commit;"
msgstr ""
+"ao usar a op챌찾o -a com o comando 'commit' para \"adicionar\" automaticamente "
+"as altera챌천es de todos os arquivos conhecidos (ou seja, todos os arquivos "
+"que j찼 est찾o listados no 챠ndice) e \"rm\" para remover os arquivos "
+"automaticamente da 찼rvore de trabalho e assim executar o commit de fato;"
#. type: Plain text
#: en/git-commit.txt:54
#, priority:280
msgid "by using the --interactive or --patch switches with the 'commit' command to decide one by one which files or hunks should be part of the commit in addition to contents in the index, before finalizing the operation. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate these modes."
msgstr ""
+"ao usar as op챌천es --interactive ou --patch com o comando 'commit' para "
+"decidir um a um quais arquivos ou blocos devem fazer parte do commit al챕m do "
+"conte첬do j찼 existente do 챠ndice antes de finalizar a opera챌찾o. Consulte a "
+"se챌찾o ``Interactive Mode'' do linkgit:git-add[1] para aprender como esses "
+"modos funcionam."
#. type: Plain text
#: en/git-commit.txt:58
#, priority:280
msgid "The `--dry-run` option can be used to obtain a summary of what is included by any of the above for the next commit by giving the same set of parameters (options and paths)."
msgstr ""
+"A op챌찾o `--dry-run` pode ser usada para obter um resumo do que est찼 inclu챠do "
+"em qualquer uma das op챌천es acima para o pr처ximo commit, fornecendo o mesmo "
+"conjunto de par창metros (op챌천es e caminhos)."
#. type: Plain text
#: en/git-commit.txt:61
#, priority:280
msgid "If you make a commit and then find a mistake immediately after that, you can recover from it with 'git reset'."
msgstr ""
+"Caso fa챌a um commit e imediatamente encontre um erro logo em seguida, 챕 "
+"poss챠vel recuper찼-lo com o comando 'git reset'."
#. type: Plain text
#: en/git-commit.txt:70
#, priority:280
msgid "Tell the command to automatically stage files that have been modified and deleted, but new files you have not told Git about are not affected."
msgstr ""
+"Diz ao comando para preparar automaticamente os arquivos que foram "
+"modificados e exclu챠dos, por챕m os novos arquivos que voc챗 n찾o informou ao "
+"Git n찾o s찾o afetados."
#. type: Plain text
#: en/git-commit.txt:76
#, priority:280
msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
msgstr ""
+"Utilize a interface de sele챌찾o do patch interativo para escolher quais "
+"modifica챌천es (commit) ser찾o aplicados. Para mais detalhes consulte linkgit"
+":git-add[1]."
#. type: Labeled list
#: en/git-commit.txt:77
@@ -14698,18 +15220,26 @@ msgstr ""
#, priority:280
msgid "Construct a commit message for use with `rebase --autosquash`. The commit message will be the subject line from the specified commit with a prefix of \"fixup! \". See linkgit:git-rebase[1] for details."
msgstr ""
+"Constr처i uma mensagem de commit para usar com `rebase --autosquash`. A "
+"linha de assunto da mensagem de commit 챕 retirada do commit determinado com "
+"um prefixo \"fixup! \". Para mais detalhes consulte linkgit:git-rebase[1]."
#. type: Labeled list
#: en/git-commit.txt:94
#, no-wrap, priority:280
msgid "--squash=<commit>"
-msgstr ""
+msgstr "--squash=<commit>"
#. type: Plain text
#: en/git-commit.txt:100
#, priority:280
msgid "Construct a commit message for use with `rebase --autosquash`. The commit message subject line is taken from the specified commit with a prefix of \"squash! \". Can be used with additional commit message options (`-m`/`-c`/`-C`/`-F`). See linkgit:git-rebase[1] for details."
msgstr ""
+"Constr처i uma mensagem de commit para usar com `rebase --autosquash`. A "
+"linha de assunto da mensagem de commit 챕 retirada do commit determinado com "
+"um prefixo \"squash! \". Pode ser usado com uma mensagem de commit "
+"adicional usando as op챌천es (`-m`/`-c`/`-C`/`-F`). Para mais detalhes "
+"consulte linkgit:git-rebase[1]."
#. type: Labeled list
#: en/git-commit.txt:101
@@ -14722,6 +15252,9 @@ msgstr "--reset-author"
#, priority:280
msgid "When used with -C/-c/--amend options, or when committing after a conflicting cherry-pick, declare that the authorship of the resulting commit now belongs to the committer. This also renews the author timestamp."
msgstr ""
+"Quando usado com op챌천es de emendas -C/-c/-- ou quando fizer um commit ap처s "
+"uma sele챌찾o conflitante, declare que a autoria do resultado agora pertence "
+"ao autor do commit. Isso tamb챕m renova o registro de data e hora do autor."
#. type: Labeled list
#: en/git-commit.txt:107 en/git-status.txt:28 en/git-symbolic-ref.txt:45
@@ -14734,6 +15267,8 @@ msgstr "--short"
#, priority:280
msgid "When doing a dry-run, give the output in the short-format. See linkgit:git-status[1] for details. Implies `--dry-run`."
msgstr ""
+"Ao fazer um \"dry-run\", d챗 a sa챠da um formato curto. Para mais detalhes "
+"consulte linkgit:git-status[1] Implica em `--dry-run`."
#. type: Labeled list
#: en/git-commit.txt:111 en/git-status.txt:32
@@ -14752,6 +15287,8 @@ msgstr ""
#, priority:280
msgid "When doing a dry-run, give the output in a porcelain-ready format. See linkgit:git-status[1] for details. Implies `--dry-run`."
msgstr ""
+"Ao fazer um \"dry-run\", d챗 a sa챠da um formato \"porcelain-ready\". Para "
+"mais detalhes consulte linkgit:git-status[1] Implica em `--dry-run`."
#. type: Labeled list
#: en/git-commit.txt:119 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
@@ -14764,6 +15301,8 @@ msgstr "--long"
#, priority:280
msgid "When doing a dry-run, give the output in the long-format. Implies `--dry-run`."
msgstr ""
+"Ao fazer um \"dry-run\", d챗 a sa챠da um formato longo. Implica em `--dry-"
+"run`."
#. type: Labeled list
#: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
@@ -14776,6 +15315,12 @@ msgstr "--null"
#, priority:280
msgid "When showing `short` or `porcelain` status output, print the filename verbatim and terminate the entries with NUL, instead of LF. If no format is given, implies the `--porcelain` output format. Without the `-z` option, filenames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
+"Ao exibir a condi챌찾o da sa챠da `short` ou `porcelain`, imprima o nome do "
+"arquivo literalmente e termine as entradas com NUL, em vez de LF. Caso "
+"nenhum formato seja dado, implica no uso da op챌찾o `--porcelain` como formato "
+"de sa챠da. Sem a op챌찾o `-z`, os nomes dos arquivos com caracteres \""
+"incomuns\" ser찾o citados conforme explicado nas vari찼veis de configura챌찾o "
+"`core.quotePath` (consulte linkgit:git-config[1])."
#. type: Labeled list
#: en/git-commit.txt:133 en/git-merge.txt:78 en/git-notes.txt:141 en/git-tag.txt:171
@@ -14800,6 +15345,11 @@ msgstr ""
#, priority:280
msgid "Override the commit author. Specify an explicit author using the standard `A U Thor <author@example.com>` format. Otherwise <author> is assumed to be a pattern and is used to search for an existing commit by that author (i.e. rev-list --all -i --author=<author>); the commit author is then copied from the first such commit found."
msgstr ""
+"Sobrescrever o commit do autor. Determina o autor de forma explicita usando "
+"o formato padr찾o `A U Thor <author@example.com>`. Caso contr찼rio assume-se "
+"<author> como padr찾o e ser찼 utilizado na pesquisa de um commit existente "
+"feito por este autor (ouseja, rev-list --all -i --author=<author>); o commit "
+"do autor 챕 ent찾o copiado do primeiro commit que for encontrado."
#. type: Labeled list
#: en/git-commit.txt:144
@@ -14830,6 +15380,8 @@ msgstr ""
#, priority:280
msgid "Use the given <msg> as the commit message. If multiple `-m` options are given, their values are concatenated as separate paragraphs."
msgstr ""
+"Usa a <msg> como a mensagem de commit. Caso m첬ltiplas op챌천es `-m` sejam "
+"usadas, o seu conte첬do ser찼 disposto em par찼grafos separados."
#. type: Plain text
#: en/git-commit.txt:154
@@ -14956,6 +15508,8 @@ msgstr ""
#, priority:280
msgid "The default can be changed by the `commit.cleanup` configuration variable (see linkgit:git-config[1])."
msgstr ""
+"A predefini챌찾o pode ser alterada atrav챕s da vari찼vel de configura챌찾o "
+"`commit.cleanup` (consulte linkgit:git-config[1])."
#. type: Plain text
#: en/git-commit.txt:226
@@ -15265,10 +15819,9 @@ msgstr ""
#. type: Title -
#: en/git-commit.txt:464
-#, fuzzy, no-wrap, priority:280
-#| msgid "CONFIGURATION"
+#, no-wrap, priority:280
msgid "COMMIT INFORMATION"
-msgstr "CONFIGURA횉횄O"
+msgstr "INFORMA횉횄O DO COMMIT"
#. type: Plain text
#: en/git-commit.txt:468
@@ -15287,12 +15840,20 @@ msgid ""
"\tGIT_COMMITTER_EMAIL\n"
"\tGIT_COMMITTER_DATE\n"
msgstr ""
+"\tGIT_AUTHOR_NAME\n"
+"\tGIT_AUTHOR_EMAIL\n"
+"\tGIT_AUTHOR_DATE\n"
+"\tGIT_COMMITTER_NAME\n"
+"\tGIT_COMMITTER_EMAIL\n"
+"\tGIT_COMMITTER_DATE\n"
#. type: Plain text
#: en/git-commit.txt:477
#, priority:280
msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
msgstr ""
+"(nb \"<\", \">\" e \"\\n"
+"\"s ser찾o removidos)"
#. type: Plain text
#: en/git-commit.txt:483
@@ -15335,12 +15896,19 @@ msgstr ""
#, priority:280
msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order). See linkgit:git-var[1] for details."
msgstr ""
+"O editor usado para editar a mensagem de registro log ser찼 escolhido a "
+"partir da vari찼vel de ambiente `GIT_EDITOR`, a vari찼vel de configura챌찾o "
+"core.editor, a vari찼vel de ambiente `VISUAL` ou a vari찼vel de ambiente "
+"`EDITOR` (nesta ordem). Para mais detalhes consulte linkgit:git-var[1]."
#. type: Plain text
#: en/git-commit.txt:526
#, priority:280
msgid "This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more information."
msgstr ""
+"Este comando pode executar os ganchos `commit-msg`, `prepare-commit-msg`, "
+"`pre-commit`, `post-commit` e `post-rewrite`. Para mais informa챌천es "
+"consulte linkgit:githooks[5]."
#. type: Labeled list
#: en/git-commit.txt:530
@@ -15567,7 +16135,9 @@ msgstr "Para escrever op챌천es: escreva para o arquivo global `~/.gitconfig` em
#: en/git-config.txt:114
#, priority:100
msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
-msgstr "Para op챌천es de leitura: leia somente do global `~/.gitconfig` e de` $XDG_CONFIG_HOME/git/config` ao inv챕s de todos os arquivos dispon챠veis."
+msgstr ""
+"Para op챌천es de leitura: leia somente do global `~/.gitconfig` e de` $"
+"XDG_CONFIG_HOME/git/config` ao inv챕s de todos os arquivos dispon챠veis."
#. type: Plain text
#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
@@ -15595,16 +16165,19 @@ msgstr "Para op챌천es de leitura: leia somente do `$(prefixo)/etc/gitconfig` em
#. type: Plain text
#: en/git-config.txt:130
-#, fuzzy, priority:100
-#| msgid "For writing options: write to the repository `.git/config` file. This is\tthe default behavior."
+#, priority:100
msgid "For writing options: write to the repository `.git/config` file. This is the default behavior."
-msgstr "Para op챌천es de escrita: escreva para o arquivo de reposit처rio `.git/config`. Este 챕\to comportamento padr찾o."
+msgstr ""
+"Para op챌천es de escrita: escreva para o arquivo de reposit처rio `.git/config`"
+". Este 챕 o comportamento padr찾o."
#. type: Plain text
#: en/git-config.txt:133
#, priority:100
msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
-msgstr "Para op챌천es de leitura: leia somente no reposit처rio `.git/config` em vez de em todos os arquivos dispon챠veis."
+msgstr ""
+"Para op챌천es de leitura: leia somente no reposit처rio `.git/config` em vez de "
+"em todos os arquivos dispon챠veis."
#. type: Labeled list
#: en/git-config.txt:136 en/git-restore.txt:58
@@ -15868,10 +16441,12 @@ msgstr "Encontre a cor configurada para `nome` (por exemplo,` color.diff.new`) e
#. type: Plain text
#: en/git-config.txt:251
-#, fuzzy, priority:100
-#| msgid "`--type=color [--default=<default>]` is preferred over `--get-color`."
+#, priority:100
msgid "`--type=color [--default=<default>]` is preferred over `--get-color` (but note that `--get-color` will omit the trailing newline printed by `--type=color`)."
-msgstr "`--tipo=color [--padr찾o=<padr찾o>]` 챕 prefer챠vel `--get-color`."
+msgstr ""
+"`--type=color [--default=<default>]` 챕 prefer챠vel em vez de `--get-color` ("
+"por챕m repare que a op챌찾o `--get-color` omitir찼 a nova linha impressa por "
+"`--type=color`)."
#. type: Plain text
#: en/git-config.txt:256
@@ -16064,41 +16639,31 @@ msgstr ""
#. type: delimited block -
#: en/git-config.txt:363
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "\t# Our diff algorithm\n"
-#| "\t[diff]\n"
-#| "\t\texternal = /usr/local/bin/diff-wrapper\n"
-#| "\t\trenames = true\n"
+#, no-wrap, priority:100
msgid ""
"; Our diff algorithm\n"
"[diff]\n"
"\texternal = /usr/local/bin/diff-wrapper\n"
"\trenames = true\n"
msgstr ""
-"\t# Nosso algoritmo de diff\n"
-"\t[diff]\n"
-"\t\texternal = /usr/local/bin/diff-wrapper\n"
-"\t\trenames = true\n"
+"; Nosso pr처prio algor챠timo diff\n"
+"[diff]\n"
+"\texternal = /usr/local/bin/diff-wrapper\n"
+"\trenames = true\n"
#. type: delimited block -
#: en/git-config.txt:368
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "\t# Proxy settings\n"
-#| "\t[core]\n"
-#| "\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
-#| "\t\tgitProxy=default-proxy ; for the rest\n"
+#, no-wrap, priority:100
msgid ""
"; Proxy settings\n"
"[core]\n"
"\tgitproxy=proxy-command for kernel.org\n"
"\tgitproxy=default-proxy ; for all the rest\n"
msgstr ""
-"\t# Configura챌천es de proxy\n"
-"\t[core]\n"
-"\t\tgitProxy=\"ssh\" para \"kernel.org\"\n"
-"\t\tgitProxy=default-proxy; para o resto\n"
+"; Configura챌천es de proxy\n"
+"[core]\n"
+"\tgitproxy=proxy-command for kernel.org\n"
+"\tgitproxy=default-proxy ; for all the rest\n"
#. type: delimited block -
#: en/git-config.txt:375
@@ -16176,7 +16741,7 @@ msgstr ""
#: en/git-config.txt:409 en/git-merge-index.txt:66
#, priority:100
msgid "or"
-msgstr ""
+msgstr "ou"
#. type: delimited block -
#: en/git-config.txt:412
@@ -16487,6 +17052,9 @@ msgstr ""
#, priority:100
msgid "You probably don't want to invoke this command directly; it is meant to be used as a credential helper by other parts of Git. See linkgit:gitcredentials[7] or `EXAMPLES` below."
msgstr ""
+"Provavelmente voc챗 n찾o vai querer invocar este comando diretamente; Ele deve "
+"ser usado pelas outras partes como um auxiliar da credencial do Git. "
+"Consulte linkgit:gitcredentials[7] ou o cap챠tulo `EXEMPLOS` abaixo."
#. type: Labeled list
#: en/git-credential-cache.txt:29
@@ -16602,6 +17170,9 @@ msgstr ""
#, priority:100
msgid "You probably don't want to invoke this command directly; it is meant to be used as a credential helper by other parts of git. See linkgit:gitcredentials[7] or `EXAMPLES` below."
msgstr ""
+"Provavelmente voc챗 n찾o vai querer invocar este comando diretamente; Ele deve "
+"ser usado pelas outras partes como um auxiliar da credencial do git. "
+"Consulte linkgit:gitcredentials[7] ou o cap챠tulo `EXEMPLOS` abaixo."
#. type: Labeled list
#: en/git-credential-store.txt:32
@@ -17165,6 +17736,11 @@ msgstr ""
#, priority:100
msgid "If you intend to set up a shared public repository that all developers can read/write, or if you want to use linkgit:git-cvsserver[1], then you probably want to make a bare clone of the imported repository, and use the clone as the shared repository. See linkgit:gitcvs-migration[7]."
msgstr ""
+"Caso a sua inten챌찾o seja configurar um reposit처rio p첬blico compartilhado "
+"para que todos os desenvolvedores tenham permiss찾o de leitura e escrita ou "
+"caso queiram usar o linkgit:git-cvsserver[1], ent찾o 챕 prefer챠vel que voc챗 "
+"crie um clone simples do seu reposit처rio importado para que seja usado como "
+"um reposit처rio compartilhado. Consulte linkgit:gitcvs-migration[7]."
#. type: Plain text
#: en/git-cvsimport.txt:54
@@ -17837,6 +18413,9 @@ msgstr ""
#, priority:100
msgid "You also need to ensure that each repository is \"bare\" (without a Git index file) for `cvs commit` to work. See linkgit:gitcvs-migration[7]."
msgstr ""
+"Voc챗 tamb챕m precisa garantir que cada reposit처rio esteja \"nu\" (sem um "
+"arquivo de 챠ndice Git) para que o comando `cvs commit' funcione. Consulte "
+"linkgit:gitcvs-migration[7]."
#. type: Plain text
#: en/git-cvsserver.txt:173
@@ -18239,6 +18818,10 @@ msgstr ""
#, priority:100
msgid "You can make the server use the end-of-line conversion attributes to set the `-k` modes for files by setting the `gitcvs.usecrlfattr` config variable. See linkgit:gitattributes[5] for more information about end-of-line conversion."
msgstr ""
+"Voc챗 pode fazer com que o servidor use os atributos de convers찾o do final de "
+"linha nos arquivos usando o modos `-k` ou definindo a vari찼vel de "
+"configura챌찾o` gitcvs.usecrlfattr`. Consulte linkgit:gitattributes[5] para "
+"mais informa챌천es sobre a convers찾o do final de linha de um arquivo."
#. type: Plain text
#: en/git-cvsserver.txt:422
@@ -18850,6 +19433,11 @@ msgid ""
"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]\n"
"'git describe' <blob>\n"
msgstr ""
+"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]"
+"\n"
+"'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]"
+"\n"
+"'git describe' <blob>\n"
#. type: Plain text
#: en/git-describe.txt:24
@@ -18868,6 +19456,10 @@ msgstr ""
#, priority:260
msgid "If the given object refers to a blob, it will be described as `<commit-ish>:<path>`, such that the blob can be found at `<path>` in the `<commit-ish>`, which itself describes the first commit in which this blob occurs in a reverse revision walk from HEAD."
msgstr ""
+"Caso o objeto especificado se refera a uma bolha, este ser찼 descrito como "
+"`<commit-ish>:<path>`, de modo que a gota possa ser encontrada em `<path>` "
+"que em si descreve o primeiro commit no qual essa gota ocorre em uma revis찾o "
+"reversa do `HEAD`."
#. type: Labeled list
#: en/git-describe.txt:37
@@ -19130,6 +19722,10 @@ msgstr ""
#, priority:260
msgid "Tree objects as well as tag objects not pointing at commits, cannot be described. When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
msgstr ""
+"Os objetos 찼rvore assim como os objetos tag que n찾o apontem para um commit "
+"n찾o podem ser descritos. Ao descrever as gotas, as tags mais leves que "
+"apontam para as gotas s찾o ignoradas, por챕m a gota ainda 챕 descrita como "
+"<committ-ish>:<path> apesar da tag mais leve ser favor찼vel."
#. type: Title =
#: en/git-diff-files.txt:2
@@ -19403,6 +19999,10 @@ msgstr ""
#, priority:100
msgid "'git difftool' is a Git command that allows you to compare and edit files between revisions using common diff tools. 'git difftool' is a frontend to 'git diff' and accepts the same options and arguments. See linkgit:git-diff[1]."
msgstr ""
+"O 'git difftool' 챕 um comando Git que permite comparar e editar os arquivos "
+"entre revis천es usando ferramentas \"diff\" comuns. O 'git difftool' 챕 um "
+"frontend para o comando 'git diff' e aceita as mesmas op챌천es e argumentos. "
+"Consulte linkgit:git-diff[1]."
#. type: Labeled list
#: en/git-difftool.txt:23
@@ -19445,6 +20045,8 @@ msgstr "--prompt"
#, priority:100
msgid "Prompt before each invocation of the diff tool. This is the default behaviour; the option is provided to override any configuration settings."
msgstr ""
+"Alerta antes de cada invoca챌찾o da ferramenta diff. Este 챕 o comportamento "
+"padr찾o; a op챌찾o 챕 fornecida para substituir quaisquer configura챌천es."
#. type: Labeled list
#: en/git-difftool.txt:37 en/git-mergetool.txt:27
@@ -19577,6 +20179,8 @@ msgstr ""
#, priority:100
msgid "See linkgit:git-diff[1] for the full list of supported options."
msgstr ""
+"Para ver a lista completa das op챌천es compat챠veis consulte linkgit:git-"
+"diff[1]."
#. type: Title -
#: en/git-difftool.txt:109
@@ -19873,12 +20477,21 @@ msgid ""
"'git diff' [<options>] <blob> <blob>\n"
"'git diff' [<options>] --no-index [--] <path> <path>\n"
msgstr ""
+"'git diff' [<options>] [<commit>] [--] [<path>...]\n"
+"'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
+"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <blob> <blob>\n"
+"'git diff' [<options>] --no-index [--] <path> <path>\n"
#. type: Plain text
#: en/git-diff.txt:23
#, priority:280
msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
msgstr ""
+"Exibe as altera챌천es entre a 찼rvore de trabalho, o 챠ndice ou uma 찼rvore, as "
+"altera챌천es entre o 챠ndice e uma 찼rvore, as altera챌천es entre as duas 찼rvores, "
+"altera챌천es entre dois objetos gota ou altera챌천es entre dois arquivos no "
+"disco."
#. type: Labeled list
#: en/git-diff.txt:24
@@ -19980,19 +20593,26 @@ msgstr ""
#: en/git-diff.txt:90
#, no-wrap, priority:280
msgid "'git diff' [<options>] <blob> <blob>"
-msgstr ""
+msgstr "'git diff' [<options>] <blob> <blob>"
#. type: Plain text
#: en/git-diff.txt:94
#, priority:280
msgid "This form is to view the differences between the raw contents of two blob objects."
msgstr ""
+"Este formul찼rio serve para exibir as altera챌천es feitas entre o conte첬do "
+"bruto de dois objetos gota."
#. type: Plain text
#: en/git-diff.txt:108
#, priority:280
msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3). The index contains these stages only for unmerged entries i.e. while resolving conflicts. See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
msgstr ""
+"Compare a 찼rvore de trabalho com a vers찾o \"base\" (stage #1), \"o nosso "
+"ramo( branch)\" (stage #2) \"o ramo deles\" (stage #3). O 챠ndice cont챕m "
+"estas etapas apenas para entradas n찾o mescladas (unmerged) enquanto estiver "
+"resolvendo conflitos. Consulte a se챌찾o \"3-Way Merge\" linkgit:git-read-"
+"tree[1] para obter informa챌천es com mais detalhes."
#. type: Plain text
#: en/git-diff.txt:113
@@ -20199,6 +20819,10 @@ msgstr ""
#, priority:100
msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
msgstr ""
+"Voc챗 pode us찼-lo como uma substitui챌찾o leg챠vel do pacote (consulte linkgit"
+":git-bundle[1]) ou como um formato que pode ser editado antes que possa ser "
+"enviado ao 'git fast import' para fazer a reescrita no hist처rico (uma "
+"habilidade dependente das ferramentas como 'git filter-repo')."
#. type: Labeled list
#: en/git-fast-export.txt:26
@@ -20247,6 +20871,11 @@ msgstr ""
#, priority:100
msgid "When asking to 'abort' (which is the default), this program will die when encountering such a tag. With 'drop' it will omit such tags from the output. With 'rewrite', if the tagged object is a commit, it will rewrite the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-list[1])"
msgstr ""
+"Ao pedir para abortar 'abort' (que 챕 o padr찾o), este programa ser찼 terminado "
+"ao encontrar uma tag assinada. Com 'drop' estas tags ser찾o omitidas da "
+"sa챠da. Com 'rewrite', caso o objeto marcado seja um commit, a tag ser찼 "
+"reescrita para marcar a tag de um commit anterior (atrav챕s da reescrita da "
+"matriz; consulte linkgit:git-rev-list[1])"
#. type: Plain text
#: en/git-fast-export.txt:58
@@ -20769,7 +21398,7 @@ msgstr "fastimport.unpackLimit"
#: en/git-fast-import.txt:157
#, priority:100
msgid "See linkgit:git-config[1]"
-msgstr ""
+msgstr "Consulte linkgit:git-config[1]"
#. type: Title -
#: en/git-fast-import.txt:159 en/git-filter-branch.txt:463 en/git-p4.txt:507
@@ -20997,7 +21626,7 @@ msgstr ""
#: en/git-fast-import.txt:329
#, no-wrap, priority:100
msgid "Commands"
-msgstr ""
+msgstr "Comandos"
#. type: Plain text
#: en/git-fast-import.txt:333
@@ -21064,6 +21693,11 @@ msgstr "`alias`"
#, priority:100
msgid "Record that a mark refers to a given object without first creating any new object. Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
msgstr ""
+"Registre que uma marca se refere a um determinado objeto sem antes criar "
+"qualquer objeto novo. O uso de --import-marks e referindo-se a marcas "
+"ausentes far찼 com que a importa챌찾o r찼pida falhe de modo que os pseud척nimos "
+"possam fornecer uma maneira de definir os compromissos podados de outra "
+"forma a um valor v찼lido (por exemplo, o ancestral n찾o podado mais pr처ximo)."
#. type: Title ~
#: en/git-fast-import.txt:362 en/git-fast-import.txt:955
@@ -21213,6 +21847,12 @@ msgstr ""
#, priority:100
msgid "The `LF` after the command is optional (it used to be required). Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
msgstr ""
+"O 'LF' ap처s o comando 챕 opcional (costumava ser obrigat처rio). Observe que "
+"por raz천es de compatibilidade retr처grada, caso o commit termine com um "
+"comando `data` (ou seja, n찾o tiver nenhum comando `from`, `merge`, "
+"`filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` ou "
+"`notemodify`) ent찾o dois comandos 'LF' podem aparecer no final do comando em "
+"vez de apenas um."
#. type: Title ^
#: en/git-fast-import.txt:456
@@ -21551,6 +22191,9 @@ msgstr ""
#, priority:100
msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch. See `filemodify` above for a detailed description of `<path>`."
msgstr ""
+"aqui '<path>' 챕 o caminho completo do arquivo ou subdiret처rio a ser removido "
+"do ramo. Consulte `filemodify` acima para obter uma descri챌찾o detalhada de "
+"`<path>`."
#. type: Title ^
#: en/git-fast-import.txt:646
@@ -22869,6 +23512,7 @@ msgstr ""
#, priority:100
msgid "Usually you would want to use 'git fetch', which is a higher level wrapper of this command, instead."
msgstr ""
+"No lugar use 'git fetch' que 챕 um wrapper de maior hierarquia deste comando."
#. type: Plain text
#: en/git-fetch-pack.txt:27
@@ -23062,9 +23706,13 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:37
-#, priority:220
+#, fuzzy, 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])."
#. type: Plain text
#: en/git-fetch.txt:40
@@ -23203,6 +23851,12 @@ msgstr ""
#, priority:220
msgid "Since keeping up-to-date with both branches and tags on the remote is a common use-case the `--prune-tags` option can be supplied along with `--prune` to prune local tags that don't exist on the remote, and force-update those tags that differ. Tag pruning can also be enabled with `fetch.pruneTags` or `remote.<name>.pruneTags` in the config. See linkgit:git-config[1]."
msgstr ""
+"Como manter-se atualizado com as ramifica챌천es e as tags no ponto remoto 챕 um "
+"caso de uso comum, a op챌찾o `--prune-tags` pode ser fornecida junto com o "
+"`--prune` para remover as tags locais que n찾o existam no ponto remoto e "
+"impor a atualiza챌찾o dessas tags que estiverem diferentes. A remo챌찾o de tags "
+"tamb챕m podem ser ativadas com `fetch.pruneTags` ou `remote.<name>.pruneTags` "
+"nas configura챌천es. Consulte linkgit:git-config[1]."
#. type: Plain text
#: en/git-fetch.txt:161
@@ -23482,6 +24136,11 @@ msgstr ""
#, priority:220
msgid "The first command fetches the `maint` branch from the repository at `git://git.kernel.org/pub/scm/git/git.git` and the second command uses `FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched objects will eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1])."
msgstr ""
+"O primeiro comando busca a ramifica챌찾o `maint` do reposit처rio em "
+"`git://git.kernel.org/pub/scm/git/git.git` e o segundo comando usa "
+"`FETCH_HEAD` para examinar a ramifica챌찾o com linkgit:git-log[1]. Os objetos "
+"buscados ser찾o eventualmente removidos pelo servi챌o de limpeza interno do "
+"git (consulte linkgit:git-gc[1])."
#. type: Plain text
#: en/git-fetch.txt:292 en/git-pull.txt:256
@@ -23499,7 +24158,7 @@ msgstr "git-filter-branch(1)"
#: en/git-filter-branch.txt:7
#, priority:100
msgid "git-filter-branch - Rewrite branches"
-msgstr ""
+msgstr "git-filter-branch - Reescreve os ramos"
#. type: Plain text
#: en/git-filter-branch.txt:18
@@ -23513,30 +24172,60 @@ msgid ""
"\t[--original <namespace>] [-d <directory>] [-f | --force]\n"
"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
msgstr ""
+"'git filter-branch' [--setup <command>] [--subdirectory-filter <directory>]\n"
+"\t[--env-filter <command>] [--tree-filter <command>]\n"
+"\t[--index-filter <command>] [--parent-filter <command>]\n"
+"\t[--msg-filter <command>] [--commit-filter <command>]\n"
+"\t[--tag-name-filter <command>] [--prune-empty]\n"
+"\t[--original <namespace>] [-d <directory>] [-f | --force]\n"
+"\t[--state-branch <branch>] [--] [<rev-list options>...]\n"
#. type: Title -
#: en/git-filter-branch.txt:20
#, no-wrap, priority:100
msgid "WARNING"
-msgstr ""
+msgstr "ATEN횉횄O"
#. type: Plain text
#: en/git-filter-branch.txt:31
#, priority:100
msgid "'git filter-branch' has a plethora of pitfalls that can produce non-obvious manglings of the intended history rewrite (and can leave you with little time to investigate such problems since it has such abysmal performance). These safety and performance issues cannot be backward compatibly fixed and as such, its use is not recommended. Please use an alternative history filtering tool such as https://github.com/newren/git-filter-repo/[git filter-repo]. If you still need to use 'git filter-branch', please carefully read <<SAFETY>> (and <<PERFORMANCE>>) to learn about the land mines of filter-branch, and then vigilantly avoid as many of the hazards listed there as reasonably possible."
msgstr ""
+"O 'git filter-branch' possui uma infinidade de armadilhas que podem produzir "
+"n찾o t찾o 처bvios da reescrita pretendida no hist처rico (e podem deixar pouco "
+"tempo para investigar esses problemas j찼 que o desemprenho 챕 terr챠vel). "
+"Esses problemas de seguran챌a e desempenho n찾o podem ser corrigidos de forma "
+"compat챠vel com as vers천es anteriores e como tal o seu uso n찾o 챕 "
+"recomendado. Use uma ferramenta alternativa de filtragem de hist처rico como "
+"https://github.com/newren/git-filter-repo/[git filter-repo]. Caso ainda "
+"precise usar o 'git filter-branch' leia com cuidado <<SEGURAN횉A>> (e "
+"<<DESEMPENHO>>) para aprender os perigos do \"filter-branch\" e em seguida, "
+"com muita aten챌찾o evite o maior n첬mero poss챠vel de perigos listados l찼."
#. type: Plain text
#: en/git-filter-branch.txt:40
#, priority:100
msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge information) will be preserved."
msgstr ""
+"Permite reescrever o hist처rico de revis천es do Git, reescrevendo as "
+"ramifica챌천es mencionadas em `<rev-list options>` aplicando os filtros "
+"personalizados em cada revis찾o. Esses filtros podem modificar cada 찼rvore ("
+"por exemplo, remover um arquivo ou executar uma reescrita perl em todos os "
+"arquivos) ou informa챌천es sobre cada commit. Caso contr찼rio, todas as "
+"informa챌천es (incluindo a quantidade de commits originais ou as informa챌천es "
+"de mesclagem) ser찾o preservadas."
#. type: Plain text
#: en/git-filter-branch.txt:47
#, priority:100
msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
+"O comando reescrever찼 apenas os _positive_ refs mencionados na linha de "
+"comando (por exemplo, se voc챗 passar 'a..b', apenas 'b' ser찼 reescrito). "
+"Caso voc챗 n찾o especifique nenhum filtro, as confirma챌천es ser찾o confirmadas "
+"sem nenhuma altera챌찾o, o que normalmente n찾o teria nenhum efeito. No "
+"entanto, isso pode ser 첬til no futuro para compensar alguns bugs do Git ou "
+"algo assim, portanto, este uso 챕 permitido."
#. type: Plain text
#: en/git-filter-branch.txt:52
@@ -23547,6 +24236,12 @@ msgid ""
"If you have any grafts or replacement refs defined, running this command\n"
"will make them permanent.\n"
msgstr ""
+"*OBSERVA횉횄O*: Este comando honra o arquivo `.git/info/grafts` e os \"refs\" "
+"no\n"
+"`refs/replace/` namespace.\n"
+"Caso voc챗 tenha quaisquer enxertos ou refer챗ncias de substitui챌찾o definidos, "
+"executando\n"
+"este comando os far찼 permanente.\n"
#. type: Plain text
#: en/git-filter-branch.txt:61
@@ -23561,24 +24256,43 @@ msgid ""
"REBASE\" section in linkgit:git-rebase[1] for further information about\n"
"rewriting published history.)\n"
msgstr ""
+"*ATEN횉횄O*! O hist처rico de reescrita ter찼 nomes de objetos diferentes\n"
+"para todos os objetos e n찾o convergir찼 com a ramifica챌찾o original. Voc챗 "
+"n찾o\n"
+"poder찼 poder enviar e distribuir a ramifica챌찾o facilmente a ramifica챌찾o "
+"reescrita\n"
+"em cima da ramifica챌찾o original. N찾o use este comando se voc챗 n찾o souber\n"
+"todas as implica챌천es do seu uso e ainda assim evite us찼-lo, caso um 첬nico "
+"commit\n"
+"simples seja suficiente para resolver o seu problema. (Consulte a se챌찾o \""
+"RECUPERANDO\n"
+"DO UPSTREAM REBASE\" na se챌찾o em linkgit:git-rebase[1] para obter mais\n"
+"informa챌천es sobre reescrever no hist처rico de publicado.)\n"
#. type: Plain text
#: en/git-filter-branch.txt:65
#, priority:100
msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
msgstr ""
+"Sempre verifique se a vers찾o reescrita est찼 correta: Os \"refs\" originais, "
+"se diferentes das reescritas, ser찾o armazenadas no espa챌o de nomes `refs/"
+"original/`."
#. type: Plain text
#: en/git-filter-branch.txt:69
#, priority:100
msgid "Note that since this operation is very I/O expensive, it might be a good idea to redirect the temporary directory off-disk with the `-d` option, e.g. on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
+"Observe que como essa opera챌찾o 챕 muito intenso logicamente, pode ser uma boa "
+"id챕ia redirecionar o diret처rio tempor찼rio para fora do disco com a op챌찾o `-d`"
+" no tmpfs por exemplo. Alegadamente, a melhora de desempenho 챕 muito "
+"percept챠vel."
#. type: Title ~
#: en/git-filter-branch.txt:72
#, no-wrap, priority:100
msgid "Filters"
-msgstr ""
+msgstr "Filtros"
#. type: Plain text
#: en/git-filter-branch.txt:84
@@ -23633,6 +24347,10 @@ msgstr ""
#, priority:100
msgid "This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment variables (see linkgit:git-commit-tree[1] for details)."
msgstr ""
+"Este filtro apenas pode ser usado quando precisar o ambiente onde o commit "
+"foi realizado. Especificamente, voc챗 pode reescrever as vari찼veis de "
+"ambiente do autor/nome respons찼vel pelo commit/email/vari찼veis de tempo do "
+"ambiente (para mais detalhes consulte linkgit:git-commit-tree[1]."
#. type: Labeled list
#: en/git-filter-branch.txt:116
@@ -23657,6 +24375,11 @@ msgstr ""
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the index. It is similar to the tree filter but does not check out the tree, which makes it much faster. Frequently used with `git rm --cached --ignore-unmatch ...`, see EXAMPLES below. For hairy cases, see linkgit:git-update-index[1]."
msgstr ""
+"Este 챕 o filtro usado para reescrever o 챠ndice. 횋 semelhante ao filtro da "
+"찼rvore, no entanto n찾o realiza o check out da 찼rvore, o que a torna muito "
+"mais r찼pida. 횋 Frequentemente utilizado com `git rm --cached --ignore-"
+"unmatch ...`, consulte os EXEMPLOS abaixo. Para os casos mais cabeludos "
+"consulte linkgit:git-update-index[1]."
#. type: Labeled list
#: en/git-filter-branch.txt:131
@@ -24123,6 +24846,10 @@ msgstr ""
#, priority:100
msgid "Clone it with `git clone file:///path/to/repo`. The clone will not have the removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain path just hardlinks everything!)"
msgstr ""
+"Clone-o com o comando `git clone file:///path/to/repo`. O clone n찾o ter찼 os "
+"objetos que foram removidos. Consulte linkgit:git-clone[1]. (Observe que "
+"ao realizar a clonagem com um caminho simples, isso faz com que tudo seja "
+"vinculado!)"
#. type: Plain text
#: en/git-filter-branch.txt:450
@@ -24831,10 +25558,9 @@ msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:217
-#, fuzzy, no-wrap, priority:100
-#| msgid "--worktree"
+#, no-wrap, priority:100
msgid "worktreepath"
-msgstr "--worktree"
+msgstr "worktreepath"
#. type: Plain text
#: en/git-for-each-ref.txt:221
@@ -25337,10 +26063,9 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:164
-#, fuzzy, no-wrap, priority:100
-#| msgid "--no-message-id"
+#, no-wrap, priority:100
msgid "--in-reply-to=<message id>"
-msgstr "--no-message-id"
+msgstr "--in-reply-to=<message id>"
#. type: Plain text
#: en/git-format-patch.txt:168
@@ -25362,10 +26087,9 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:176
-#, fuzzy, no-wrap, priority:100
-#| msgid "--edit-description"
+#, no-wrap, priority:100
msgid "--cover-from-description=<mode>"
-msgstr "--edit-description"
+msgstr "--cover-from-description=<mode>"
#. type: Plain text
#: en/git-format-patch.txt:179
@@ -25399,10 +26123,9 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:196
-#, fuzzy, no-wrap, priority:100
-#| msgid "--dst-prefix=<prefix>"
+#, no-wrap, priority:100
msgid "--subject-prefix=<subject prefix>"
-msgstr "--dst-prefixo=<prefix>"
+msgstr "--subject-prefix=<subject prefix>"
#. type: Plain text
#: en/git-format-patch.txt:201
@@ -25535,6 +26258,16 @@ msgstr ""
#, priority:100
msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
+"Como um assistente revisor, insira um \"range-diff\" (consulte linkgit:git-"
+"range-diff[1]) na capa da carta ou apenas como um coment찼rio do patch da "
+"s챕rie de 1-patch, mostrando as diferen챌as entre a vers찾o anterior da s챕rie "
+"de patchs e a s챕rie atualmente sendo formatada. `previous` pode ser a 첬nica "
+"revis찾o nomeando o topo da s챕rie anterior caso compartilhem da mesma base em "
+"compara챌찾o com a s챕rie que est찼 sendo formatada (como `git format-patch "
+"--cover-letter --range-diff=feature/v1 -3 feature/v2` por exemplo) ou um "
+"intervalo de revis찾o caso ambas as revis천es das s챕ries estejam em desacordo ("
+"como `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -"
+"3 feature/v2` por exemplo)."
#. type: Plain text
#: en/git-format-patch.txt:281
@@ -25553,6 +26286,10 @@ msgstr ""
#, priority:100
msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
+"Ao ser usado com `--range-diff`, ajuste a heur챠stica que corresponde 횪s "
+"confirma챌천es entre as s챕ries de patches anteriores e atuais ajustando o "
+"custo do fator de corre챌찾o entre cria챌찾o/exclus찾o. Para mais detalhes "
+"consulte linkgit:git-range-diff[1])."
#. type: Labeled list
#: en/git-format-patch.txt:288 en/pretty-options.txt:60
@@ -25571,6 +26308,8 @@ msgstr "--no-notes"
#, priority:100
msgid "Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line."
msgstr ""
+"Adiciona as anota챌천es (consulte linkgit:git-notes[1]) para o commit depois "
+"da linha com tr챗s tra챌os."
#. type: Plain text
#: en/git-format-patch.txt:300
@@ -25658,10 +26397,9 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:336
-#, fuzzy, no-wrap, priority:100
-#| msgid "--no-contains [<commit>]"
+#, no-wrap, priority:100
msgid "--[no-]base[=<commit>]"
-msgstr "--n찾o-cont챕m [<commit>]"
+msgstr "--[no-]base[=<commit>]"
#. type: Plain text
#: en/git-format-patch.txt:342
@@ -26462,6 +27200,9 @@ msgstr ""
#, priority:100
msgid "If core.commitGraph is true, the commit-graph file will also be inspected using 'git commit-graph verify'. See linkgit:git-commit-graph[1]."
msgstr ""
+"Caso core.commitGraph seja verdadeiro, o arquivo commit-graph tamb챕m ser찼 "
+"inspecionado usando 'git commit-graph verify'. Consulte linkgit:git-commit-"
+"graph[1]."
#. type: Title -
#: en/git-fsck.txt:130
@@ -26545,7 +27286,7 @@ msgstr ""
#: en/git-fsck.txt:162 en/git.txt:408
#, no-wrap, priority:100
msgid "Environment Variables"
-msgstr ""
+msgstr "Vari찼veis do Ambiente"
#. type: Labeled list
#: en/git-fsck.txt:164
@@ -26558,6 +27299,8 @@ msgstr "GIT_OBJECT_DIRECTORY"
#, priority:100
msgid "used to specify the object database root (usually $GIT_DIR/objects)"
msgstr ""
+"use para especificar a raiz do banco de dados do objeto (usually $GIT_DIR/"
+"objects)"
#. type: Labeled list
#: en/git-fsck.txt:167
@@ -26593,19 +27336,26 @@ msgstr "git-gc(1)"
#: en/git-gc.txt:7
#, priority:100
msgid "git-gc - Cleanup unnecessary files and optimize the local repository"
-msgstr ""
+msgstr "git-gc - Limpa os arquivos desnecess찼rios e otimiza o reposit처rio local"
#. type: Plain text
#: en/git-gc.txt:13
#, no-wrap, priority:100
msgid "'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
msgstr ""
+"'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] "
+"[--force] [--keep-largest-pack]\n"
#. type: Plain text
#: en/git-gc.txt:22
#, priority:100
msgid "Runs a number of housekeeping tasks within the current repository, such as compressing file revisions (to reduce disk space and increase performance), removing unreachable objects which may have been created from prior invocations of 'git add', packing refs, pruning reflog, rerere metadata or stale working trees. May also update ancillary indexes such as the commit-graph."
msgstr ""
+"Executa v찼rias tarefas de limpeza no reposit처rio atual, como a compacta챌찾o "
+"dos arquivos das revis천es (para reduzir o espa챌o em disco e aumentar o "
+"desempenho), a remo챌찾o dos objetos inacess챠veis que podem ter sido criados a "
+"partir de invoca챌천es anteriores ao 'git add', pacotes \"refs\", a remo챌찾o do "
+"\"reflog\", metadados reerere ou 찼rvores de trabalho obsoletas."
#. type: Plain text
#: en/git-gc.txt:27
@@ -26654,12 +27404,16 @@ msgstr ""
#, ignore-ellipsis, priority:100
msgid "Once housekeeping is triggered by exceeding the limits of configuration options such as `gc.auto` and `gc.autoPackLimit`, all other housekeeping tasks (e.g. rerere, working trees, reflog...) will be performed as well."
msgstr ""
+"Caso seja excedido os limites definidos nas op챌천es de configura챌찾o como "
+"`gc.auto` e `gc.autoPackLimit` o processo de limpeza 챕 acionado, todas as "
+"outras tarefas de limpeza (como rerere, 찼rvores de trabalho, reflog..., etc) "
+"tamb챕m ser찾o executados."
#. type: Labeled list
#: en/git-gc.txt:57
#, no-wrap, priority:100
msgid "--prune=<date>"
-msgstr ""
+msgstr "--prune=<date>"
#. type: Plain text
#: en/git-gc.txt:64
@@ -26774,6 +27528,8 @@ msgstr ""
#, priority:100
msgid "The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:githooks[5] for more information."
msgstr ""
+"O comando 'git gc --auto' executar찼 o gancho 'pre-auto-gc'. Para mais "
+"informa챌천es consulte linkgit:githooks[5]."
#. type: Plain text
#: en/git-gc.txt:158
@@ -27009,7 +27765,7 @@ msgstr ""
#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
-msgstr ""
+msgstr "N찾o honre as configura챌천es do filtro textconv. Este 챕 o padr찾o."
#. type: Plain text
#: en/git-grep.txt:117
@@ -27968,6 +28724,8 @@ msgstr ""
#, priority:100
msgid "When used with `--all` print description for all recognized commands. This is the default."
msgstr ""
+"Quando usado com `--all` imprima as descri챌천es para todos os comandos "
+"reconhecidos. Este 챕 o padr찾o."
#. type: Labeled list
#: en/git-help.txt:55
@@ -28040,6 +28798,12 @@ msgstr ""
#, priority:100
msgid "The web browser can be specified using the configuration variable `help.browser`, or `web.browser` if the former is not set. If none of these config variables is set, the 'git web{litdd}browse' helper script (called by 'git help') will pick a suitable default. See linkgit:git-web{litdd}browse[1] for more information about this."
msgstr ""
+"O navegador da web pode ser definido usando a vari찼vel de configura챌찾o "
+"`help.browser` ou` web.browser` caso o primeiro n찾o esteja definido. Caso "
+"nenhuma destas configura챌천es sejam definidas, o script de ajuda 'git "
+"web{litdd}browse' (invocado atrav챕s do comando 'git help') escolher찼 a "
+"melhor op챌찾o por padr찾o. Para obter mais informa챌천es sobre isso consulte "
+"linkgit:git-web{litdd}browse[1]."
#. type: Title -
#: en/git-help.txt:91 en/git-interpret-trailers.txt:135 en/git-p4.txt:515 en/git-web--browse.txt:59
@@ -28247,6 +29011,8 @@ msgstr ""
#, priority:100
msgid "as they are probably more user specific than repository specific. See linkgit:git-config[1] for more information about this."
msgstr ""
+"como provavelmente s찾o mais espec챠ficos do usu찼rio do que do reposit처rio. "
+"Para obter mais informa챌천es sobre isso consulte linkgit:git-config[1]."
#. type: Title =
#: en/git-http-backend.txt:2
@@ -29179,6 +29945,10 @@ msgstr "--fix-thin"
#, priority:100
msgid "Fix a \"thin\" pack produced by `git pack-objects --thin` (see linkgit:git-pack-objects[1] for details) by adding the excluded objects the deltified objects are based on to the pack. This option only makes sense in conjunction with --stdin."
msgstr ""
+"Corrija um pacote \"thin\" produzido por `git pack-objects --thin` (para "
+"mais detalhes consulte linkgit:git-pack-objects[1]) ao adicionar os objetos "
+"exclu챠dos os objetos deltificados tem base no pacote. Esta op챌찾o s처 faz "
+"sentido em conjunto com a op챌찾o --stdin."
#. type: Plain text
#: en/git-index-pack.txt:61
@@ -29286,19 +30056,23 @@ msgstr "git-init-db(1)"
#: en/git-init-db.txt:7
#, priority:100
msgid "git-init-db - Creates an empty Git repository"
-msgstr ""
+msgstr "git-init-db - Cria um reposit처rio Git vazio"
#. type: Plain text
#: en/git-init-db.txt:13
#, no-wrap, priority:100
msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]\n"
msgstr ""
+"'git init-db' [-q | --quiet] [--bare] [--template=<diret처rio_modelo>] "
+"[--separate-git-dir <git dir>] [--shared[=<permiss천es>]]\n"
#. type: Plain text
#: en/git-init-db.txt:20
#, priority:100
msgid "This is a synonym for linkgit:git-init[1]. Please refer to the documentation of that command."
msgstr ""
+"Este 챕 um sin척nimo para linkgit:git-init[1]. Para refer챗ncias deste "
+"comando, favor consultar a documenta챌찾o."
#. type: Title =
#: en/git-init.txt:2
@@ -29311,6 +30085,7 @@ msgstr "git-init(1)"
#, priority:300
msgid "git-init - Create an empty Git repository or reinitialize an existing one"
msgstr ""
+"git-init - Cria um reposit처rio Git vazio ou reinicializa um j찼 existente"
#. type: Plain text
#: en/git-init.txt:15
@@ -29320,120 +30095,169 @@ msgid ""
"\t [--separate-git-dir <git dir>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
+"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
+"\t [--separate-git-dir <git dir>]\n"
+"\t [--shared[=<permissions>]] [directory]\n"
#. type: Plain text
#: en/git-init.txt:24
#, priority:300
msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files. An initial `HEAD` file that references the HEAD of the master branch is also created."
msgstr ""
+"Este comando cria um reposit처rio Git vazio, basicamente um diret처rio `.git` "
+"com subdiret처rios para os arquivos `objects`, `refs/heads`, `refs/tags` e "
+"arquivos modelo. Tamb챕m 챕 criado um arquivo inicial `HEAD` que tem como "
+"referencia o `HEAD` da ramifica챌찾o principal."
#. type: Plain text
#: en/git-init.txt:27
#, priority:300
msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
msgstr ""
+"Caso a vari찼vel de ambiente `$ GIT_DIR` esteja configurada, esta "
+"especificar찼 um caminho a ser usado para a base dos reposit처rios em vez de "
+"`./.git`."
#. type: Plain text
#: en/git-init.txt:32
#, priority:300
msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
+"Caso o diret처rio de armazenamento de objetos seja especificado atrav챕s da "
+"vari찼vel de ambiente `$GIT_OBJECT_DIRECTORY`, ent찾o os diret처rios \"sha1\" "
+"ser찾o criados abaixo, caso contr찼rio, ser찼 usado o diret처rio predefinido `$"
+"GIT_DIR/objects`."
#. type: Plain text
#: en/git-init.txt:37
#, priority:300
msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
msgstr ""
+"횋 seguro executar o comando `git init` em um reposit처rio existente. O "
+"comando n찾o substituir찼 as coisas que j찼 estiverem l찼. O principal motivo "
+"para executar novamente o comando `git init` 챕 pegar os modelos adicionados "
+"recentemente (ou mover o reposit처rio para um outro local caso `--separate-"
+"git-dir` seja usado)."
#. type: Plain text
#: en/git-init.txt:45
#, priority:300
msgid "Only print error and warning messages; all other output will be suppressed."
msgstr ""
+"Exiba apenas mensagens de erro e aviso; suprima todas as outras mensagens."
#. type: Plain text
#: en/git-init.txt:50
#, priority:300
msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
msgstr ""
+"Crie um reposit처rio vazio. Caso a vari찼vel de ambiente `GIT_DIR` n찾o esteja "
+"definido, defina diret처rio de trabalho atual."
#. type: Plain text
#: en/git-init.txt:55
#, priority:300
msgid "Specify the directory from which templates will be used. (See the \"TEMPLATE DIRECTORY\" section below.)"
msgstr ""
+"Informe o diret처rio de onde os modelos ser찾o usados. (Consulte a se챌찾o \""
+"DIRET횙RIO MODELO\" abaixo.)"
#. type: Plain text
#: en/git-init.txt:62
#, priority:300
msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository."
msgstr ""
+"Em vez de inicializar o reposit처rio como um diret처rio para `$GIT_DIR` or `./."
+"git/`, crie um arquivo de texto contendo o caminho para o reposit처rio real. "
+"Este arquivo atua como um link simb처lico independente para o reposit처rio do "
+"sistema de arquivos Git."
#. type: Plain text
#: en/git-init.txt:64
#, priority:300
msgid "If this is reinitialization, the repository will be moved to the specified path."
msgstr ""
+"Caso seja reinicializado, o reposit처rio ser찼 movido para um caminho "
+"determinado."
#. type: Labeled list
#: en/git-init.txt:65
#, no-wrap, priority:300
msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
-msgstr ""
+msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
#. type: Plain text
#: en/git-init.txt:73
#, priority:300
msgid "Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository. When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions. When not specified, Git will use permissions reported by umask(2)."
msgstr ""
+"Determina que o reposit처rio Git deve ser compartilhado entre v찼rios "
+"usu찼rios. Isso permite que os usu찼rios pertencentes ao mesmo grupo enviem "
+"para esse reposit처rio. Quando definido, a vari찼vel de configura챌찾o "
+"`core.sharedRepository` 챕 usada para que os arquivos e os diret처rios "
+"definidos pela vari찼vel `$ GIT_DIR` sejam criados com as permiss천es "
+"solicitadas. Quando n찾o definido, o Git usar찼 as permiss천es informadas pelo "
+"umask(2)."
#. type: Plain text
#: en/git-init.txt:76
#, priority:300
msgid "The option can have the following values, defaulting to 'group' if no value is given:"
msgstr ""
+"A op챌찾o pode ter os seguintes valores, predefinido como 'group' caso nenhum "
+"valor seja informado:"
#. type: Labeled list
#: en/git-init.txt:78
#, no-wrap, priority:300
msgid "'umask' (or 'false')"
-msgstr ""
+msgstr "'umask' (ou 'false')"
#. type: Plain text
#: en/git-init.txt:82
#, priority:300
msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
msgstr ""
+"Use as permiss천es informadas por umask(2). 횋 a predefini챌찾o quando `--shared`"
+" n찾o 챕 usado."
#. type: Labeled list
#: en/git-init.txt:83
#, no-wrap, priority:300
msgid "'group' (or 'true')"
-msgstr ""
+msgstr "'group' (ou 'true')"
#. type: Plain text
#: en/git-init.txt:91
#, priority:300
msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
msgstr ""
+"Torne o grupo do reposit처rio com permiss찾o de escrita (g+sx por exemplo, "
+"pois o grupo git pode n찾o ser o grupo principal de todos os usu찼rios). Isso "
+"챕 usado para afrouxar as permiss천es de um valor, a n찾o ser que indique o "
+"contr찼rio, umask(2) seguro. Observe que o umask ainda se aplica aos outros "
+"bits de permiss찾o (por exemplo, caso o umask seja '0022' o uso de 'group' "
+"n찾o remover찼 os privil챕gios de leitura dos outros usu찼rios (sem um grupo). "
+"Consulte '0xxx' para saber como usar exatamente as permiss천es do reposit처rio."
#. type: Labeled list
#: en/git-init.txt:92
#, no-wrap, priority:300
msgid "'all' (or 'world' or 'everybody')"
-msgstr ""
+msgstr "'all' (ou 'world' ou 'everyone')"
#. type: Plain text
#: en/git-init.txt:95
#, priority:300
msgid "Same as 'group', but make the repository readable by all users."
msgstr ""
+"O mesmo que 'group', mas torna o reposit처rio leg챠vel para todos os usu찼rios."
#. type: Labeled list
#: en/git-init.txt:96
#, no-wrap, priority:300
msgid "'0xxx'"
-msgstr ""
+msgstr "'0xxx'"
#. type: Plain text
#: en/git-init.txt:103
@@ -29457,67 +30281,75 @@ msgstr ""
#: en/git-init.txt:113
#, no-wrap, priority:300
msgid "TEMPLATE DIRECTORY"
-msgstr ""
+msgstr "DIRET횙RIO MODELO"
#. type: Plain text
#: en/git-init.txt:117
#, priority:300
msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
msgstr ""
+"Os arquivos e diret처rios no diret처rio modelo cujo nome n찾o come챌a com um "
+"ponto ser찾o copiados para o `$GIT_DIR` ap처s a sua cria챌찾o."
#. type: Plain text
#: en/git-init.txt:119
#, priority:300
msgid "The template directory will be one of the following (in order):"
-msgstr ""
+msgstr "O diret처rio modelo ser찼 um dos seguintes (em ordem):"
#. type: Plain text
#: en/git-init.txt:121
#, priority:300
msgid "the argument given with the `--template` option;"
-msgstr ""
+msgstr "o argumento fornecido com a op챌찾o `--template`;"
#. type: Plain text
#: en/git-init.txt:123
#, priority:300
msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
-msgstr ""
+msgstr "o conte첬do da vari찼vel de ambiente `$GIT_TEMPLATE_DIR`;"
#. type: Plain text
#: en/git-init.txt:125
#, priority:300
msgid "the `init.templateDir` configuration variable; or"
-msgstr ""
+msgstr "a vari찼vel de configura챌찾o `init.templateDir`; ou"
#. type: Plain text
#: en/git-init.txt:127
#, priority:300
msgid "the default template directory: `/usr/share/git-core/templates`."
-msgstr ""
+msgstr "A predefini챌찾o do diret처rio modelo: `/usr/share/git-core/templates`."
#. type: Plain text
#: en/git-init.txt:130
#, priority:300
msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
msgstr ""
+"A predefini챌찾o do diret처rio modelo inclui alguma estrutura de diret처rios, \""
+"padr천es de exclus찾o\" sugeridos (consulte linkgit:gitignore[5]) e os "
+"arquivos gancho de amostra."
#. type: Plain text
#: en/git-init.txt:133
#, priority:300
msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
msgstr ""
+"Por predefini챌찾o os ganchos de amostra est찾o todos desativados. Para ativar "
+"um dos ganchos de amostra, renomeie-o removendo o sufixo `.sample`."
#. type: Plain text
#: en/git-init.txt:135
#, priority:300
msgid "See linkgit:githooks[5] for more general info on hook execution."
msgstr ""
+"Para um apanhado geral sobre execu챌찾o hook consulte linkgit:githooks[5]."
#. type: Labeled list
#: en/git-init.txt:139
#, no-wrap, priority:300
msgid "Start a new Git repository for an existing code base"
-msgstr ""
+msgstr "Inicie um novo reposit처rio Git para uma base de c처digo j찼 existente"
#. type: delimited block -
#: en/git-init.txt:146
@@ -29528,24 +30360,28 @@ msgid ""
"$ git add . <2>\n"
"$ git commit <3>\n"
msgstr ""
+"$ cd /path/to/my/codebase\n"
+"$ git init <1>\n"
+"$ git add . <2>\n"
+"$ git commit <3>\n"
#. type: Plain text
#: en/git-init.txt:149
#, priority:300
msgid "Create a /path/to/my/codebase/.git directory."
-msgstr ""
+msgstr "Cria um diret처rio /path/to/my/codebase/.git."
#. type: Plain text
#: en/git-init.txt:150
#, priority:300
msgid "Add all existing files to the index."
-msgstr ""
+msgstr "Adicione todos os arquivos existentes ao 챠ndice."
#. type: Plain text
#: en/git-init.txt:151
#, priority:300
msgid "Record the pristine state as the first commit in the history."
-msgstr ""
+msgstr "Registre o estado intocado como o primeiro commit no hist처rico."
#. type: Title =
#: en/git-instaweb.txt:2
@@ -29558,6 +30394,8 @@ msgstr "git-instaweb(1)"
#, priority:100
msgid "git-instaweb - Instantly browse your working repository in gitweb"
msgstr ""
+"git-instaweb - Navegue instantaneamente no seu reposit처rio de trabalho com o "
+"gitweb"
#. type: Plain text
#: en/git-instaweb.txt:14
@@ -29567,18 +30405,23 @@ msgid ""
" [--browser=<browser>]\n"
"'git instaweb' [--start] [--stop] [--restart]\n"
msgstr ""
+"'git instaweb' [--local] [--httpd=<httpd>] [--port=<port>]\n"
+" [--browser=<browser>]\n"
+"'git instaweb' [--start] [--stop] [--restart]\n"
#. type: Plain text
#: en/git-instaweb.txt:19
#, priority:100
msgid "A simple script to set up `gitweb` and a web server for browsing the local repository."
msgstr ""
+"Um script simples para configurar o `gitweb` e um servidor da web para "
+"navegar no reposit처rio local."
#. type: Plain text
#: en/git-instaweb.txt:26
#, priority:100
msgid "Only bind the web server to the local IP (127.0.0.1)."
-msgstr ""
+msgstr "Amarre o servidor da web apenas ao endere챌o IP local (127.0.0.1)."
#. type: Labeled list
#: en/git-instaweb.txt:28
@@ -29591,6 +30434,11 @@ msgstr "--httpd"
#, priority:100
msgid "The HTTP daemon command-line that will be executed. Command-line options may be specified here, and the configuration file will be added at the end of the command-line. Currently apache2, lighttpd, mongoose, plackup, python and webrick are supported. (Default: lighttpd)"
msgstr ""
+"A linha de comando do daemon HTTP que ser찼 executado. As op챌천es da linha de "
+"comando podem ser informadas aqui e o arquivo de configura챌찾o ser찼 "
+"adicionado no final da linha de comando. Atualmente s찾o compat챠veis, "
+"apache2, lighttpd, mongoose, plackup, python e webrick. (Predefini챌찾o: "
+"lighttpd)"
#. type: Labeled list
#: en/git-instaweb.txt:37
@@ -29603,6 +30451,8 @@ msgstr "--module-path"
#, priority:100
msgid "The module path (only needed if httpd is Apache). (Default: /usr/lib/apache2/modules)"
msgstr ""
+"O caminho do m처dulo (챕 apenas necess찼rio caso o httpd seja o Apache). "
+"(Predefini챌찾o: /usr/lib/apache2/modules)"
#. type: Labeled list
#: en/git-instaweb.txt:42
@@ -29614,7 +30464,7 @@ msgstr "--port"
#: en/git-instaweb.txt:44
#, priority:100
msgid "The port number to bind the httpd to. (Default: 1234)"
-msgstr ""
+msgstr "O n첬mero da porta que ser찼 associada ao httpd. (Predefini챌찾o: 1234)"
#. type: Labeled list
#: en/git-instaweb.txt:46
@@ -29627,12 +30477,16 @@ msgstr "--browser"
#, priority:100
msgid "The web browser that should be used to view the gitweb page. This will be passed to the 'git web{litdd}browse' helper script along with the URL of the gitweb instance. See linkgit:git-web{litdd}browse[1] for more information about this. If the script fails, the URL will be printed to stdout."
msgstr ""
+"O navegador da web que deve ser usado para exibir a p찼gina gitweb. Isso ser찼 "
+"encaminhado ao script auxiliar 'git web{litdd}browse' junto com a URL da "
+"inst창ncia gitweb. Para obter mais informa챌천es sobre isso consulte linkgit"
+":git-web{litdd}browse[1]. Caso o script falhe, a URL ser찼 exibida no stdout."
#. type: Labeled list
#: en/git-instaweb.txt:53
#, no-wrap, priority:100
msgid "start"
-msgstr ""
+msgstr "start"
#. type: Labeled list
#: en/git-instaweb.txt:54
@@ -29645,12 +30499,14 @@ msgstr "--start"
#, priority:100
msgid "Start the httpd instance and exit. Regenerate configuration files as necessary for spawning a new instance."
msgstr ""
+"Inicie o servidor httpd e encerre. Gere novamente os arquivos de "
+"configura챌찾o para gerar uma nova inst창ncia conforme seja necess찼rio."
#. type: Labeled list
#: en/git-instaweb.txt:58
#, no-wrap, priority:100
msgid "stop"
-msgstr ""
+msgstr "stop"
#. type: Labeled list
#: en/git-instaweb.txt:59
@@ -29663,12 +30519,14 @@ msgstr "--stop"
#, priority:100
msgid "Stop the httpd instance and exit. This does not generate any of the configuration files for spawning a new instance, nor does it close the browser."
msgstr ""
+"Pare o servidor httpd e encerre. Isso n찾o gera nenhum dos arquivos de "
+"configura챌찾o para gerar uma nova inst창ncia, nem fecha o navegador."
#. type: Labeled list
#: en/git-instaweb.txt:64
#, no-wrap, priority:100
msgid "restart"
-msgstr ""
+msgstr "restart"
#. type: Labeled list
#: en/git-instaweb.txt:65
@@ -29681,12 +30539,14 @@ msgstr "--restart"
#, priority:100
msgid "Restart the httpd instance and exit. Regenerate configuration files as necessary for spawning a new instance."
msgstr ""
+"Reinicia o servidor httpd e encerre. Gere novamente os arquivos de "
+"configura챌찾o para gerar uma nova inst창ncia conforme seja necess찼rio."
#. type: Plain text
#: en/git-instaweb.txt:73
#, priority:100
msgid "You may specify configuration in your .git/config"
-msgstr ""
+msgstr "Voc챗 pode definir a sua configura챌찾o em seu `.git/config`"
#. type: delimited block -
#: en/git-instaweb.txt:81
@@ -29699,12 +30559,22 @@ msgid ""
"\tbrowser = konqueror\n"
"\tmodulePath = /usr/lib/apache2/modules\n"
msgstr ""
+"[instaweb]\n"
+"\tlocal = true\n"
+"\thttpd = apache2 -f\n"
+"\tport = 4321\n"
+"\tbrowser = konqueror\n"
+"\tmodulePath = /usr/lib/apache2/modules\n"
#. type: Plain text
#: en/git-instaweb.txt:87
#, priority:100
msgid "If the configuration variable `instaweb.browser` is not set, `web.browser` will be used instead if it is defined. See linkgit:git-web{litdd}browse[1] for more information about this."
msgstr ""
+"Caso a vari찼vel de configura챌찾o `instaweb.browser` n찾o esteja definida, a "
+"vari찼vel ` web.browser` ser찼 usada em seu lugar caso a mesma esteja "
+"definida.. Para obter mais informa챌천es sobre isso consulte linkgit:git-"
+"web{litdd}browse[1]."
#. type: Title =
#: en/git-interpret-trailers.txt:2
@@ -29714,10 +30584,11 @@ msgstr "git-interpret-trailers(1)"
#. type: Plain text
#: en/git-interpret-trailers.txt:7
-#, fuzzy, priority:100
-#| msgid "add or parse structured information in commit messages."
+#, priority:100
msgid "git-interpret-trailers - Add or parse structured information in commit messages"
-msgstr "Adiciona ou analisa informa챌찾o estruturada em mensagens de commit."
+msgstr ""
+"git-interpret-trailers - Adiciona ou analisa informa챌찾o estruturada em "
+"mensagens de commit"
#. type: Plain text
#: en/git-interpret-trailers.txt:13
@@ -29726,72 +30597,117 @@ msgid ""
"'git interpret-trailers' [<options>] [(--trailer <token>[(=|:)<value>])...] [<file>...]\n"
"'git interpret-trailers' [<options>] [--parse] [<file>...]\n"
msgstr ""
+"'git interpret-trailers' [<op챌천es>] [(--trailer <token>[(=|:)<valor>])...] "
+"[<arquivo>...]\n"
+"'git interpret-trailers' [<op챌천es>] [--parse] [<arquivo>...]\n"
#. type: Plain text
#: en/git-interpret-trailers.txt:19
#, priority:100
msgid "Help parsing or adding 'trailers' lines, that look similar to RFC 822 e-mail headers, at the end of the otherwise free-form part of a commit message."
msgstr ""
+"Ajuda a analisar ou adicionar linhas 'trailers' que se parecem com os "
+"cabe챌alhos de e-mail segundo a norma RFC 822 no final ou na parte livre de "
+"uma mensagem de commit."
#. type: Plain text
#: en/git-interpret-trailers.txt:23
#, priority:100
msgid "This command reads some patches or commit messages from either the <file> arguments or the standard input if no <file> is specified. If `--parse` is specified, the output consists of the parsed trailers."
msgstr ""
+"Este comando l챗 alguns patches ou faz o commit das mensagens dos argumentos "
+"<file> ou da entrada predefinida se nenhum <file> seja definido. Caso "
+"`--parse` seja definido a sa챠da consistir찼 nos trailers analisados."
#. type: Plain text
#: en/git-interpret-trailers.txt:27
#, priority:100
msgid "Otherwise, this command applies the arguments passed using the `--trailer` option, if any, to the commit message part of each input file. The result is emitted on the standard output."
msgstr ""
+"Caso contr찼rio, este comando aplica os argumentos passados usando a op챌찾o "
+"`trailer`, caso exista, 횪 parte da mensagem de commit de cada arquivo de "
+"entrada. O resultado 챕 emitido na sa챠da predefinida."
#. type: Plain text
#: en/git-interpret-trailers.txt:32
#, priority:100
msgid "Some configuration variables control the way the `--trailer` arguments are applied to each commit message and the way any existing trailer in the commit message is changed. They also make it possible to automatically add some trailers."
msgstr ""
+"Algumas vari찼veis de configura챌찾o controlam a maneira como os argumentos do "
+"`--trailer` s찾o aplicados a cada mensagem de commit e a maneira como "
+"qualquer `trailer` existente na mensagem de commit 챕 alterado. Eles tamb챕m "
+"possibilitam adicionar automaticamente alguns `trailers`."
#. type: Plain text
#: en/git-interpret-trailers.txt:39
#, priority:100
msgid "By default, a '<token>=<value>' or '<token>:<value>' argument given using `--trailer` will be appended after the existing trailers only if the last trailer has a different (<token>, <value>) pair (or if there is no existing trailer). The <token> and <value> parts will be trimmed to remove starting and trailing whitespace, and the resulting trimmed <token> and <value> will appear in the message like this:"
msgstr ""
+"횋 predefinido que um argumento informado '<token>=<value>' ou "
+"'<token>:<value>' usando `trailer` ser찼 anexado ap처s os trailers existentes "
+"caso o 첬ltimo trailer tenha um par (<token>, <value>), (ou caso n찾o exista "
+"nenhum `trailer`). As partes <token> e <value> ser찾o aparados para remover "
+"os espa챌os em branco iniciais e finais, o aparado resultante aparecer찼 na "
+"mensagem da seguinte maneira:"
#. type: delimited block -
#: en/git-interpret-trailers.txt:42
#, no-wrap, priority:100
msgid "token: value\n"
-msgstr ""
+msgstr "token: value\n"
#. type: Plain text
#: en/git-interpret-trailers.txt:46
#, priority:100
msgid "This means that the trimmed <token> and <value> will be separated by `': '` (one colon followed by one space)."
msgstr ""
+"Significa que o <token> e o <value> aparado e ser찼 separado por `': '` (um "
+"c처lon seguido por um espa챌o)."
#. type: Plain text
#: en/git-interpret-trailers.txt:52
#, priority:100
msgid "By default the new trailer will appear at the end of all the existing trailers. If there is no existing trailer, the new trailer will appear after the commit message part of the output, and, if there is no line with only spaces at the end of the commit message part, one blank line will be added before the new trailer."
msgstr ""
+"횋 predefinido que o novo `trailer` aparecer찼 no final de todos os `trailers` "
+"existentes. Caso n찾o exista, o novo `trailer` aparecer찼 na sa챠da ap처s a "
+"parte da mensagem do commit, caso n찾o haja uma linha com apenas espa챌os no "
+"final da parte da mensagem do commit, uma linha em branco ser찼 adicionada "
+"antes do novo `trailer`."
#. type: Plain text
#: en/git-interpret-trailers.txt:62
#, priority:100
msgid "Existing trailers are extracted from the input message by looking for a group of one or more lines that (i) is all trailers, or (ii) contains at least one Git-generated or user-configured trailer and consists of at least 25% trailers. The group must be preceded by one or more empty (or whitespace-only) lines. The group must either be at the end of the message or be the last non-whitespace lines before a line that starts with '---' (followed by a space or the end of the line). Such three minus signs start the patch part of the message. See also `--no-divider` below."
msgstr ""
+"Os `trailers` existentes s찾o extra챠dos da mensagem de entrada ao procurar um "
+"grupo de uma ou mais linhas que (i) s찾o todos os `trailers` ou (ii) contenha "
+"pelo menos um `trailer` gerado pelo Git ou configurado pelo usu찼rio e "
+"consiste em pelo menos 25% dos `trailers`. O grupo deve ser precedido por "
+"uma ou mais linhas vazias (ou somente com espa챌o em branco). O grupo deve "
+"estar no final da mensagem ou ser as 첬ltimas linhas que n찾o sejam espa챌os em "
+"branco antes de uma linha que come챌a com '---' (seguida por um espa챌o ou o "
+"final da linha). Esses tr챗s sinais de menos iniciam a parte do patch da "
+"mensagem. Consulte tamb챕m a op챌찾o `--no-divider` abaixo."
#. type: Plain text
#: en/git-interpret-trailers.txt:67
#, priority:100
msgid "When reading trailers, there can be whitespaces after the token, the separator and the value. There can also be whitespaces inside the token and the value. The value may be split over multiple lines with each subsequent line starting with whitespace, like the \"folding\" in RFC 822."
msgstr ""
+"Ao ler `trailers` pode haver espa챌os em branco ap처s o token, o separador e o "
+"valor. Tamb챕m pode haver espa챌os em branco no token e no valor. O valor pode "
+"ser dividido em v찼rias linhas, com cada linha subsequente come챌ando com um "
+"espa챌o em branco, como a descri챌찾o \"folding\" (dobra) na norma RFC 822."
#. type: Plain text
#: en/git-interpret-trailers.txt:71
#, priority:100
msgid "Note that 'trailers' do not follow and are not intended to follow many rules for RFC 822 headers. For example they do not follow the encoding rules and probably many other rules."
msgstr ""
+"Observe que 'trailers' n찾o seguem e n찾o se destinam a seguir muitas regras "
+"para os cabe챌alhos da norma RFC 822. Por exemplo, eles n찾o seguem as normas "
+"de codifica챌찾o e muito provavelmente quaisquer outras normas."
#. type: Labeled list
#: en/git-interpret-trailers.txt:74
@@ -29803,7 +30719,7 @@ msgstr "--in-place"
#: en/git-interpret-trailers.txt:76
#, priority:100
msgid "Edit the files in place."
-msgstr ""
+msgstr "Edite os arquivos no local."
#. type: Labeled list
#: en/git-interpret-trailers.txt:77
@@ -29816,24 +30732,29 @@ msgstr "--trim-empty"
#, priority:100
msgid "If the <value> part of any trailer contains only whitespace, the whole trailer will be removed from the resulting message. This applies to existing trailers as well as new trailers."
msgstr ""
+"Caso o <valor> da parte de qualquer `trailer` contenha apenas espa챌os em "
+"branco, o `trailer` inteiro ser찼 removido da mensagem resultante. Isso se "
+"aplica a `trailers` existentes, bem como aos `trailers` novos."
#. type: Labeled list
#: en/git-interpret-trailers.txt:82
#, no-wrap, priority:100
msgid "--trailer <token>[(=|:)<value>]"
-msgstr ""
+msgstr "--trailer <token>[(=|:)<valor>]"
#. type: Plain text
#: en/git-interpret-trailers.txt:86
#, priority:100
msgid "Specify a (<token>, <value>) pair that should be applied as a trailer to the input messages. See the description of this command."
msgstr ""
+"Especifique um par (<token>, <value>) que deve ser aplicado como um `trailer`"
+" nas mensagens de entrada. Veja a descri챌찾o deste comando."
#. type: Labeled list
#: en/git-interpret-trailers.txt:87
#, no-wrap, priority:100
msgid "--where <placement>"
-msgstr ""
+msgstr "--where <placement>"
#. type: Labeled list
#: en/git-interpret-trailers.txt:88
@@ -29846,12 +30767,17 @@ msgstr "--no-where"
#, priority:100
msgid "Specify where all new trailers will be added. A setting provided with '--where' overrides all configuration variables and applies to all '--trailer' options until the next occurrence of '--where' or '--no-where'. Possible values are `after`, `before`, `end` or `start`."
msgstr ""
+"Especifique onde todos os novos `trailers` ser찾o adicionados. Uma "
+"configura챌찾o fornecida com '--where' substitui todas as vari찼veis de "
+"configura챌찾o e se aplica a todas as op챌천es de `--trailer` at챕 a pr처xima "
+"ocorr챗ncia de '--where' ou '--no-where'. Os valores v찼lidos s찾o `after`, "
+"`before`, `end` or `start`."
#. type: Labeled list
#: en/git-interpret-trailers.txt:95
#, no-wrap, priority:100
msgid "--if-exists <action>"
-msgstr ""
+msgstr "--if-exists <action>"
#. type: Labeled list
#: en/git-interpret-trailers.txt:96
@@ -29864,12 +30790,18 @@ msgstr "--no-if-exists"
#, priority:100
msgid "Specify what action will be performed when there is already at least one trailer with the same <token> in the message. A setting provided with '--if-exists' overrides all configuration variables and applies to all '--trailer' options until the next occurrence of '--if-exists' or '--no-if-exists'. Possible actions are `addIfDifferent`, `addIfDifferentNeighbor`, `add`, `replace` and `doNothing`."
msgstr ""
+"Especifique qual a챌찾o ser찼 executada quando j찼 houver pelo menos um `trailer`"
+" com o mesmo <token> na mensagem. Uma configura챌찾o fornecida com '--if-"
+"exists' substitui todas as vari찼veis de configura챌찾o e se aplica a todas as "
+"op챌천es `--trailer` at챕 a pr처xima ocorr챗ncia do '--if-exists' ou '--no-if-"
+"exists'. As poss챠veis a챌천es s찾o `addIfDifferent`, `addIfDifferentNeighbor`, "
+"`add`, `replace` and `doNothing`."
#. type: Labeled list
#: en/git-interpret-trailers.txt:104
#, no-wrap, priority:100
msgid "--if-missing <action>"
-msgstr ""
+msgstr "--if-missing <action>"
#. type: Labeled list
#: en/git-interpret-trailers.txt:105
@@ -29882,6 +30814,11 @@ msgstr "--no-if-missing"
#, priority:100
msgid "Specify what action will be performed when there is no other trailer with the same <token> in the message. A setting provided with '--if-missing' overrides all configuration variables and applies to all '--trailer' options until the next occurrence of '--if-missing' or '--no-if-missing'. Possible actions are `doNothing` or `add`."
msgstr ""
+"Especifique qual a챌찾o ser찼 executada quando n찾o houver outro trailer com o "
+"mesmo <token> na mensagem. Uma configura챌찾o fornecida com `--if-missing` "
+"substitui todas as vari찼veis de configura챌찾o e se aplica a todas as op챌천es "
+"`--trailer` at챕 a pr처xima ocorr챗ncia de `--if-missing` or `--no-if-missing`. "
+"As poss챠veis a챌천es s찾o `doNothing` ou `add`."
#. type: Labeled list
#: en/git-interpret-trailers.txt:113
@@ -29893,7 +30830,7 @@ msgstr "--only-trailers"
#: en/git-interpret-trailers.txt:115
#, priority:100
msgid "Output only the trailers, not any other parts of the input."
-msgstr ""
+msgstr "Exibe apenas os `trailers` e n찾o quaisquer outras partes da entrada."
#. type: Labeled list
#: en/git-interpret-trailers.txt:116
@@ -29906,6 +30843,8 @@ msgstr "--only-input"
#, priority:100
msgid "Output only trailers that exist in the input; do not add any from the command-line or by following configured `trailer.*` rules."
msgstr ""
+"Exibe apenas os `trailers` que existam na entrada; n찾o adicione qualquer "
+"outra linha de comando ou siga as regras `trailer.*` configuradas."
#. type: Labeled list
#: en/git-interpret-trailers.txt:121
@@ -29918,6 +30857,8 @@ msgstr "--unfold"
#, priority:100
msgid "Remove any whitespace-continuation in trailers, so that each trailer appears on a line by itself with its full content."
msgstr ""
+"Remova qualquer continua챌찾o de espa챌o em branco nos `trailers` para que cada "
+"`trailer` apare챌a em uma linha por si s처, com seu conte첬do completo."
#. type: Labeled list
#: en/git-interpret-trailers.txt:125
@@ -29930,6 +30871,8 @@ msgstr "--parse"
#, priority:100
msgid "A convenience alias for `--only-trailers --only-input --unfold`."
msgstr ""
+"횋 um atalho conveniente para os comandos `--only-trailers --only-input "
+"--unfold`."
#. type: Labeled list
#: en/git-interpret-trailers.txt:129
@@ -29942,120 +30885,159 @@ msgstr "--no-divider"
#, priority:100
msgid "Do not treat `---` as the end of the commit message. Use this when you know your input contains just the commit message itself (and not an email or the output of `git format-patch`)."
msgstr ""
+"N찾o trate `---` como o final da mensagem de commit. Use isso quando souber "
+"que a sua entrada contenha apenas a pr처pria mensagem de commit (e n찾o um e-"
+"mail ou sa챠da do `git format-patch`)."
#. type: Labeled list
#: en/git-interpret-trailers.txt:137
#, no-wrap, priority:100
msgid "trailer.separators"
-msgstr ""
+msgstr "trailer.separators"
#. type: Plain text
#: en/git-interpret-trailers.txt:142
#, priority:100
msgid "This option tells which characters are recognized as trailer separators. By default only ':' is recognized as a trailer separator, except that '=' is always accepted on the command line for compatibility with other git commands."
msgstr ""
+"횋 predefinido que apenas `:` seja reconhecido como um separador `trailer`, a "
+"menos que `=` seja sempre aceito na linha de comandos por quest천es de "
+"compatibilidade com os outros comandos git."
#. type: Plain text
#: en/git-interpret-trailers.txt:146
#, priority:100
msgid "The first character given by this option will be the default character used when another separator is not specified in the config for this trailer."
msgstr ""
+"O primeiro caractere fornecido por esta op챌찾o ser찼 o caractere predefinido a "
+"ser usado quando um outro separador n찾o for especificado na configura챌찾o "
+"deste `trailer`."
#. type: Plain text
#: en/git-interpret-trailers.txt:153
#, priority:100
msgid "For example, if the value for this option is \"%=$\", then only lines using the format '<token><sep><value>' with <sep> containing '%', '=' or '$' and then spaces will be considered trailers. And '%' will be the default separator used, so by default trailers will appear like: '<token>% <value>' (one percent sign and one space will appear between the token and the value)."
msgstr ""
+"Por exemplo, caso o valor dessa op챌찾o seja \"%=$\", apenas as linhas que "
+"usam o formato '<token><sep><value>' com <sep> contendo '%', '=' ou '$' e os "
+"espa챌os, ser찾o considerados `trailers`. 횋 predefinido que o sinal '%' ser찼 "
+"usado como um separador; portanto, assim os trailers aparecer찾o como: "
+"'<token>% <value>' (um sinal de porcentagem e um espa챌o aparecer찾o entre "
+"token e o valor)."
#. type: Labeled list
#: en/git-interpret-trailers.txt:154
#, no-wrap, priority:100
msgid "trailer.where"
-msgstr ""
+msgstr "trailer.where"
#. type: Plain text
#: en/git-interpret-trailers.txt:156
#, priority:100
msgid "This option tells where a new trailer will be added."
-msgstr ""
+msgstr "Esta op챌찾o informa onde um novo trailer ser찼 adicionado."
#. type: Plain text
#: en/git-interpret-trailers.txt:158
#, priority:100
msgid "This can be `end`, which is the default, `start`, `after` or `before`."
-msgstr ""
+msgstr "Pode ser `end` (predefinido),` start`, `after` ou` before`."
#. type: Plain text
#: en/git-interpret-trailers.txt:161
#, priority:100
msgid "If it is `end`, then each new trailer will appear at the end of the existing trailers."
msgstr ""
+"Caso seja `end`, ent찾o cada novo trailer aparecer찼 no final dos trailers "
+"existentes."
#. type: Plain text
#: en/git-interpret-trailers.txt:164
#, priority:100
msgid "If it is `start`, then each new trailer will appear at the start, instead of the end, of the existing trailers."
msgstr ""
+"Caso seja `start ', cada novo trailer aparecer찼 no in챠cio, e n찾o no final, "
+"dos trailers existentes."
#. type: Plain text
#: en/git-interpret-trailers.txt:167
#, priority:100
msgid "If it is `after`, then each new trailer will appear just after the last trailer with the same <token>."
msgstr ""
+"Caso seja \"depois\", cada novo trailer aparecer찼 logo ap처s o 첬ltimo trailer "
+"com o mesmo <token>."
#. type: Plain text
#: en/git-interpret-trailers.txt:170
#, priority:100
msgid "If it is `before`, then each new trailer will appear just before the first trailer with the same <token>."
msgstr ""
+"Caso seja \"depois\", ent찾o cada novo trailer aparecer찼 logo no come챌o do "
+"primeiro trailer com o mesmo <token>."
#. type: Labeled list
#: en/git-interpret-trailers.txt:171
#, no-wrap, priority:100
msgid "trailer.ifexists"
-msgstr ""
+msgstr "trailer.ifexists"
#. type: Plain text
#: en/git-interpret-trailers.txt:175
#, priority:100
msgid "This option makes it possible to choose what action will be performed when there is already at least one trailer with the same <token> in the message."
msgstr ""
+"Essa op챌찾o permite escolher qual a챌찾o ser찼 executada quando j찼 houver pelo "
+"menos um trailer com o mesmo <token> na mensagem."
#. type: Plain text
#: en/git-interpret-trailers.txt:178
#, priority:100
msgid "The valid values for this option are: `addIfDifferentNeighbor` (this is the default), `addIfDifferent`, `add`, `replace` or `doNothing`."
msgstr ""
+"Os valores v찼lidos para esta op챌찾o s찾o: `addIfDifferentNeighbor` "
+"(predefinido), `addIfDifferent`, `add`, `replace` ou `doNothing`."
#. type: Plain text
#: en/git-interpret-trailers.txt:182
#, priority:100
msgid "With `addIfDifferentNeighbor`, a new trailer will be added only if no trailer with the same (<token>, <value>) pair is above or below the line where the new trailer will be added."
msgstr ""
+"Com `addIfDifferentNeighbor`, um novo trailer ser찼 adicionado apenas caso "
+"nenhum trailer com o mesmo par (<token>,<value>) esteja acima ou abaixo da "
+"linha em que o novo trailer ser찼 adicionado."
#. type: Plain text
#: en/git-interpret-trailers.txt:185
#, priority:100
msgid "With `addIfDifferent`, a new trailer will be added only if no trailer with the same (<token>, <value>) pair is already in the message."
msgstr ""
+"Com `addIfDifferent`, um novo trailer ser찼 adicionado apenas caso nenhum "
+"trailer com o mesmo par (<token>,<value>) j찼 esteja na mensagem."
#. type: Plain text
#: en/git-interpret-trailers.txt:188
#, priority:100
msgid "With `add`, a new trailer will be added, even if some trailers with the same (<token>, <value>) pair are already in the message."
msgstr ""
+"Com `add`, um novo trailer ser찼 adicionado mesmo que alguns trailers com o "
+"mesmo par (<token>,<value>) j찼 estejam na mensagem."
#. type: Plain text
#: en/git-interpret-trailers.txt:193
#, priority:100
msgid "With `replace`, an existing trailer with the same <token> will be deleted and the new trailer will be added. The deleted trailer will be the closest one (with the same <token>) to the place where the new one will be added."
msgstr ""
+"Com `replace`, um trailer existente com a mesmo <token> ser찼 exclu챠do e o "
+"novo trailer ser찼 adicionado. O trailer exclu챠do ser찼 o mais pr처ximo (com o "
+"mesmo <token>) do local onde o novo ser찼 adicionado."
#. type: Plain text
#: en/git-interpret-trailers.txt:196
#, priority:100
msgid "With `doNothing`, nothing will be done; that is no new trailer will be added if there is already one with the same <token> in the message."
msgstr ""
+"Com `doNothing`, nada ser찼 feito; isso 챕, nenhum novo trailer ser찼 "
+"adicionado caso j찼 haja um com o mesmo <token> na mensagem."
#. type: Labeled list
#: en/git-interpret-trailers.txt:197
@@ -30478,6 +31460,9 @@ msgstr "--[no-]use-mailmap"
#, priority:260
msgid "Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See linkgit:git-shortlog[1]."
msgstr ""
+"Use o arquivo mailmap para mapear os nomes dos autores dos commits e "
+"endere챌os de e-mail para nomes reais can척nicos e endere챌os de e-mail. "
+"Consulte linkgit:git-shortlog[1]."
#. type: Labeled list
#: en/git-log.txt:57
@@ -30688,6 +31673,9 @@ msgstr ""
#, priority:260
msgid "See linkgit:git-config[1] for core variables and linkgit:git-diff[1] for settings related to diff generation."
msgstr ""
+"Para configura챌천es relacionadas com a gera챌찾o de arquivos diferenciais \""
+"diff\" consulte linkgit:git-diff[1], para as vari찼veis principais consulte "
+"linkgit:git-config[1]."
#. type: Labeled list
#: en/git-log.txt:186
@@ -30777,7 +31765,7 @@ msgstr ""
#: en/git-log.txt:222
#, priority:260
msgid "See linkgit:git-shortlog[1]."
-msgstr ""
+msgstr "Consulte linkgit:git-shortlog[1]."
#. type: Labeled list
#: en/git-log.txt:223 en/git-notes.txt:333
@@ -30790,12 +31778,18 @@ msgstr ""
#, priority:260
msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands. See linkgit:git-notes[1]."
msgstr ""
+"Quais refs al챕m do padr찾o definido por `core.notesRef` ou `GIT_NOTES_REF`, "
+"para ler as anota챌천es de quando for exibir as mensagens de commit com a "
+"fam챠lia de comandos `log`. Consulte linkgit:git-notes[1]."
#. type: Plain text
#: en/git-log.txt:232
#, priority:260
msgid "May be an unabbreviated ref name or a glob and may be specified multiple times. A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
msgstr ""
+"Pode ser um nome sem abrevia챌찾o ou um \"glob\" e pode ser especificado "
+"v찼rias vezes. Um aviso ser찼 emitido para \"refs\" que n찾o existem, mas um \""
+"glob\" que n찾o corresponda a nenhum \"ref\" 챕 silenciosamente ignorado."
#. type: Plain text
#: en/git-log.txt:236
@@ -31088,7 +32082,7 @@ msgstr ""
#: en/git-ls-files.txt:128
#, no-wrap, priority:100
msgid "R"
-msgstr ""
+msgstr "R"
#. type: Plain text
#: en/git-ls-files.txt:129
@@ -31137,12 +32131,17 @@ msgstr ""
#, priority:100
msgid "Similar to `-t`, but use lowercase letters for files that are marked as 'assume unchanged' (see linkgit:git-update-index[1])."
msgstr ""
+"Semelhante ao `-t ', por챕m use letras min첬sculas para os arquivos marcados "
+"como 'assume unchanged' ou 'assuma que n찾o foi alterado' (consulte linkgit"
+":git-update-index[1])."
#. type: Plain text
#: en/git-ls-files.txt:143
#, priority:100
msgid "Similar to `-t`, but use lowercase letters for files that are marked as 'fsmonitor valid' (see linkgit:git-update-index[1])."
msgstr ""
+"Semelhante ao `-t ', por챕m use letras min첬sculas para os arquivos marcados "
+"como 'fsmonitor valid' (consulte linkgit:git-update-index[1])."
#. type: Plain text
#: en/git-ls-files.txt:153
@@ -31235,6 +32234,12 @@ msgstr ""
#, priority:100
msgid "For an unmerged path, instead of recording a single mode/SHA-1 pair, the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the path. (see linkgit:git-read-tree[1] for more information on state)"
msgstr ""
+"Para um caminho que n찾o foi mesclado, em vez de gravar um 첬nico modo/par SHA-"
+"1, o 챠ndice registra at챕 tr챗s desses pares; um da 찼rvore O no est찼gio 1, A "
+"no est찼gio 2 e B no est찼gio 3. Esta informa챌찾o pode ser usada pelo usu찼rio ("
+"ou pela porcelana) para ver o qu챗 eventualmente dever찼 ser registrado no "
+"caminho. (para mais informa챌천es sobre estado/condi챌찾o consulte linkgit:git-"
+"read-tree[1])"
#. type: Title -
#: en/git-ls-files.txt:215
@@ -31370,6 +32375,9 @@ msgstr "--get-url"
#, priority:100
msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
msgstr ""
+"Expanda a URL do reposit처rio remoto fornecido, levando em considera챌찾o "
+"qualquer defini챌찾o de configura챌찾o \"url.<base>.insteadOf\" (consulte linkgit"
+":git-config[1]) e encerre sem se comunicar com o reposit처rio remoto."
#. type: Labeled list
#: en/git-ls-remote.txt:59
@@ -31388,6 +32396,15 @@ msgstr ""
#, priority:100
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
msgstr ""
+"Classificado com base na chave fornecida. O prefixo `-` 챕 usado para "
+"classificar em ordem de valor decrescente. 횋 compat챠vle com \"version:"
+"refname\" ou \"v:refname\" (os nomes das tags s찾o tratadas como vers천es). J찼 "
+"a classifica챌찾o da ordem \"version:refname\" pode ser afetada atrav챕s da "
+"configura챌찾o da vari찼vel \"versionsort.suffix\". Para mais op챌천es de "
+"classifica챌찾o consulte linkgit:git-for-each-ref[1], por챕m esteja ciente que "
+"chaves como `committerdate` que requeiram acesso aos objetos em si n찾o "
+"funcionar찾o com \"refs\" cujos objetos ainda n찾o foram buscados remotamente "
+"e exibir찾o um erro `missing object`."
#. type: Plain text
#: en/git-ls-remote.txt:82
@@ -31598,6 +32615,12 @@ msgstr ""
#, priority:100
msgid "Reads a single e-mail message from the standard input, and writes the commit log message in <msg> file, and the patches in <patch> file. The author name, e-mail and e-mail subject are written out to the standard output to be used by 'git am' to create a commit. It is usually not necessary to use this command directly. See linkgit:git-am[1] instead."
msgstr ""
+"L챗 uma 첬nica mensagem de email da entrada padr찾o, registra a mensagem do "
+"commit no log em um arquivo <msg>, e os patches em um arquivo <patch>. O "
+"nome do autor, o assunto da mensagem e o endere챌o do e-mail s찾o gravados na "
+"sa챠da padr찾o para criar um commit que ser찾o usados pelo comando 'git am'. "
+"Na maioria das vezes, n찾o 챕 necess찼rio usar este comando diretamente. Em "
+"vez disso, consulte linkgit:git-am[1]."
#. type: Plain text
#: en/git-mailinfo.txt:32
@@ -31986,6 +33009,9 @@ msgstr ""
#, priority:100
msgid "Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology:"
msgstr ""
+"Dados tr챗s commits 'A', 'B' e 'C', `git merge-base A B C` ir찼 calcular a "
+"base de fus찾o entre 'A' e um hipot챕tico commit 'M', que 챕 uma fus찾o entre "
+"'B' e 'C'. Por exemplo, com esta topologia:"
#. type: delimited block .
#: en/git-merge-base.txt:101
@@ -32032,6 +33058,8 @@ msgstr ""
#, priority:100
msgid "When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology:"
msgstr ""
+"Quando a hist처ria envolve mesclagens cruzadas, pode haver mais de um \""
+"melhor\" ancestral comum para dois commits. Por exemplo, com esta topologia:"
#. type: delimited block .
#: en/git-merge-base.txt:131
@@ -32661,6 +33689,10 @@ msgstr ""
#, priority:240
msgid "Process files in the order specified in the <orderfile>, which has one shell glob pattern per line. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`."
msgstr ""
+"Processe os arquivos na ordem especificada em <orderfile> que tenha um shell "
+"padr찾o \"glob\" por linha. Isso sobrescreve o arquivo de configura챌찾o de "
+"vari찼vel `diff.orderFile` (consulte linkgit:git-config[1]). Para cancelar a "
+"vari찼vel `diff.orderFile`, use `-O/dev/null`."
#. type: Title -
#: en/git-mergetool.txt:103
@@ -32840,10 +33872,11 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:110
-#, fuzzy, priority:240
-#| msgid "Show information about files in the index and the working tree."
+#, priority:240
msgid "Forget about the current merge in progress. Leave the index and the working tree as-is."
-msgstr "Mostra a informa챌찾o sobre arquivos no index e na 찼rvore de trabalho."
+msgstr ""
+"N찾o se preocupa com a mesclagem em andamento. Mantenha o 챠ndice e a 찼rvore "
+"de trabalho como est찾o."
#. type: Plain text
#: en/git-merge.txt:115
@@ -32880,6 +33913,12 @@ msgstr ""
#, priority:240
msgid "Before applying outside changes, you should get your own work in good shape and committed locally, so it will not be clobbered if there are conflicts. See also linkgit:git-stash[1]. 'git pull' and 'git merge' will stop without doing anything when local uncommitted changes overlap with files that 'git pull'/'git merge' may need to update."
msgstr ""
+"Voc챗 deve ter o seu pr처prio trabalho em boas condi챌천es e com o commit feito "
+"localmente antes de aplicar as altera챌천es externas, para evitar que sejam "
+"sobrescritos no caso da exist챗ncia de conflitos. Os comandos 'git pull' e "
+"'git merge' ficar찾o inertes sem fazer nada quando as modifica챌천es dos "
+"commits que n찾o foram aplicados localmente se sobrepuserem aos arquivos que "
+"os comandos 'git pull'/'git merge' talvez precisem atualizar."
#. type: Plain text
#: en/git-merge.txt:145
@@ -33861,6 +34900,13 @@ msgstr ""
#, priority:100
msgid "Every notes change creates a new commit at the specified notes ref. You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`. Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]). These details may change in the future."
msgstr ""
+"Cada modifica챌찾o nas anota챌천es cria um novo commit nas anota챌천es \"ref\" "
+"especificadas. Portanto, voc챗 pode inspecionar o hist처rico das notas "
+"invocando por exemplo o comando `git log -p notes/commits`. Atualmente, a "
+"mensagem de confirma챌찾o registra apenas qual a opera챌찾o que acionou a "
+"atualiza챌찾o, j찼 a autoria da confirma챌찾o 챕 determinada de acordo com as "
+"regras usuais (consulte linkgit:git-commit[1]). Estes detalhes podem mudar "
+"no futuro."
#. type: Plain text
#: en/git-notes.txt:240
@@ -34002,6 +35048,12 @@ msgstr ""
#, priority:100
msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands. This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable. See linkgit:git-log[1]."
msgstr ""
+"Qual ref (ou refs, caso um \"glob\" seja especificado mais de uma vez), al챕m "
+"do padr찾o definido pela vari찼vel `core.notesRef` ou` GIT_NOTES_REF`, para "
+"ler as anota챌천es durante a exibi챌찾o das mensagens de confirma챌찾o junto com a "
+"fam챠lia de comandos 'git log'. Esta configura챌찾o pode ser substitu챠da na "
+"linha de comando ou pela vari찼vel de ambiente `GIT_NOTES_DISPLAY_REF`. "
+"Consulte linkgit:git-log[1]."
#. type: Labeled list
#: en/git-notes.txt:342
@@ -34460,7 +35512,7 @@ msgstr ""
#: en/git-p4.txt:207
#, priority:100
msgid "Set the `GIT_DIR` environment variable. See linkgit:git[1]."
-msgstr ""
+msgstr "Define a vari찼vel de ambiente `GIT_DIR`. Consulte linkgit:git[1]."
#. type: Plain text
#: en/git-p4.txt:211
@@ -34678,7 +35730,7 @@ msgstr ""
#: en/git-p4.txt:307
#, priority:100
msgid "Perform a bare clone. See linkgit:git-clone[1]."
-msgstr ""
+msgstr "Fa챌a um clone vazio. Consulte linkgit:git-clone[1]."
#. type: Title ~
#: en/git-p4.txt:309
@@ -34709,6 +35761,10 @@ msgstr ""
#, priority:100
msgid "Detect renames. See linkgit:git-diff[1]. Renames will be represented in p4 using explicit 'move' operations. There is no corresponding option to detect copies, but there are variables for both moves and copies."
msgstr ""
+"Detecta renomea챌천es. Consulte linkgit:git-diff[1]. As renomea챌천es ser찾o "
+"representadas em p4 utilizando opera챌천es 'move' de forma explicita. N찾o h찼 "
+"op챌찾o correspondente para detectar c처pias, no entanto h찼 vari찼veis tanto "
+"para mover como copiar."
#. type: Labeled list
#: en/git-p4.txt:323
@@ -35383,6 +36439,8 @@ msgstr "git-p4.detectRenames"
#, priority:100
msgid "Detect renames. See linkgit:git-diff[1]. This can be true, false, or a score as expected by 'git diff -M'."
msgstr ""
+"Detecta renomea챌천es. Consulte linkgit:git-diff[1]. Pode ser \"true\", \""
+"false\" ou uma pontua챌찾o conforme 챕 o esperado pelo comando 'git diff -M'."
#. type: Labeled list
#: en/git-p4.txt:651
@@ -35395,6 +36453,8 @@ msgstr "git-p4.detectCopies"
#, priority:100
msgid "Detect copies. See linkgit:git-diff[1]. This can be true, false, or a score as expected by 'git diff -C'."
msgstr ""
+"Detecta c처pias. Consulte linkgit:git-diff[1]. Pode ser \"true\", \"false\" "
+"ou uma pontua챌찾o conforme 챕 o esperado pelo comando 'git diff -C'."
#. type: Labeled list
#: en/git-p4.txt:655
@@ -35407,6 +36467,7 @@ msgstr "git-p4.detectCopiesHarder"
#, priority:100
msgid "Detect copies harder. See linkgit:git-diff[1]. A boolean."
msgstr ""
+"Detecta c처pias com mais esfor챌o. Consulte linkgit:git-diff[1]. Um boleano."
#. type: Labeled list
#: en/git-p4.txt:658
@@ -35827,6 +36888,10 @@ msgstr ""
#, priority:100
msgid "Note: A thin pack violates the packed archive format by omitting required objects and is thus unusable by Git without making it self-contained. Use `git index-pack --fix-thin` (see linkgit:git-index-pack[1]) to restore the self-contained property."
msgstr ""
+"Observa챌찾o: Um pacote leve viola o formato do arquivo compactado por omitir "
+"os objetos necess찼rios e portanto, n찾o pode ser usado pelo Git sem torn찼-lo "
+"independente. Para restaurar as propriedades deste pacote use o comando `git "
+"index-pack --fix-thin` (consulte linkgit:git-index-pack[1])."
#. type: Labeled list
#: en/git-pack-objects.txt:218
@@ -35857,6 +36922,12 @@ msgstr ""
#, priority:100
msgid "Note: Porcelain commands such as `git gc` (see linkgit:git-gc[1]), `git repack` (see linkgit:git-repack[1]) pass this option by default in modern Git when they put objects in your repository into pack files. So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle."
msgstr ""
+"Observa챌찾o: 횋 predefinido que os comandos porcel창nicos como os `git gc` ("
+"consulte linkgit:git-gc[1]), `git repack` (consulte linkgit:git-repack[1]) "
+"encaminhem estas op챌천es nas vers천es mais recentes do Git ao colocar os "
+"objetos em seu reposit처rio dentro dos arquivos de pacotes. O mesmo acontece "
+"com a op챌찾o `git bundle` (consulte linkgit:git-bundle[1]) quando 챕 criado um "
+"pacote."
#. type: Plain text
#: en/git-pack-objects.txt:248
@@ -35887,6 +36958,9 @@ msgstr ""
#, priority:100
msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resulting packfile. See linkgit:git-rev-list[1] for valid `<filter-spec>` forms."
msgstr ""
+"Requer `--stdout`. Omite certos objetos (em geral, bolhas) do pacote "
+"resultante. Para formas v찼lidas de `<filter-spec>` consulte linkgit:git-rev-"
+"list[1]."
#. type: Labeled list
#: en/git-pack-objects.txt:263 en/rev-list-options.txt:782
@@ -36428,6 +37502,8 @@ msgstr ""
#, priority:100
msgid "Note that unreachable, packed objects will remain. If this is not desired, see linkgit:git-repack[1]."
msgstr ""
+"Observe que objetos compactados e inacess챠veis, permanecer찾o. Caso n찾o seja "
+"isso que deseja, consulte linkgit:git-repack[1]."
#. type: Plain text
#: en/git-prune.txt:40
@@ -36574,6 +37650,8 @@ msgstr ""
#, priority:220
msgid "See linkgit:git-merge[1] for details, including how conflicts are presented and handled."
msgstr ""
+"Para mais detalhes incluindo informa챌천es de como os conflitos s찾o "
+"gerenciados e como eles s찾o exibidos, consulte linkgit:git-merge[1]."
#. type: Plain text
#: en/git-pull.txt:68
@@ -36706,6 +37784,10 @@ msgstr "--no-autostash"
#, priority:220
msgid "Before starting rebase, stash local modifications away (see linkgit:git-stash[1]) if needed, and apply the stash entry when done. `--no-autostash` is useful to override the `rebase.autoStash` configuration variable (see linkgit:git-config[1])."
msgstr ""
+"Se necess찼rio antes de iniciar o \"rebase\", armazene as modifica챌천es locais "
+"(consulte linkgit:git-stash[1]) e aplique a entrada \"stash\" quando "
+"terminar. `--no-autostash` 챕 첬til para sobrescrever as configura챌천es da "
+"vari찼vel `rebase.autoStash` (consulte linkgit:git-config[1])."
#. type: Plain text
#: en/git-pull.txt:144
@@ -36810,6 +37892,9 @@ msgstr ""
#, priority:220
msgid "Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch.<name>.remote and branch.<name>.merge options; see linkgit:git-config[1] for details."
msgstr ""
+"Normalmente o ramo mesclado fica no `HEAD` do reposit처rio remoto, por챕m a "
+"escolha 챕 determinada pelas op챌천es `branch.<name>.remote` e "
+"`branch.<name>.merge`; para mais detalhes consulte linkgit:git-config[1]."
#. type: Plain text
#: en/git-pull.txt:227
@@ -36896,6 +37981,12 @@ msgstr ""
#, ignore-ellipsis, priority:220
msgid "When the command line does not specify what to push with `<refspec>...` arguments or `--all`, `--mirror`, `--tags` options, the command finds the default `<refspec>` by consulting `remote.*.push` configuration, and if it is not found, honors `push.default` configuration to decide what to push (See linkgit:git-config[1] for the meaning of `push.default`)."
msgstr ""
+"Quando a linha de comando n찾o especifica o qu챗 enviar (push) com as op챌천es "
+"`<refspec>...` ou as op챌천es `--all`, `--mirror`, `--tags` o comando encontra "
+"a predefini챌찾o `<refspec>` consultando a configura챌찾o `remote.*.push` e se "
+"ainda n찾o for encontrado, honra a configura챌찾o do `push.default` para "
+"decidir o qu챗 enviar (para saber o significado de `push.default` "
+"consultelinkgit:git-config[1]."
#. type: Plain text
#: en/git-push.txt:46
@@ -36932,6 +38023,9 @@ msgstr ""
#, priority:220
msgid "The <src> is often the name of the branch you would want to push, but it can be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see linkgit:gitrevisions[7])."
msgstr ""
+"Geralmente `<src>` 챕 o nome do ramo que voc챗 deseja enviar com \"push\", mas "
+"pode ser qualquer \"express찾o SHA-1\" arbitr찼ria, como `master~4` ou `HEAD` ("
+"consulte linkgit:gitrevisions[7])."
#. type: Plain text
#: en/git-push.txt:75
@@ -36962,6 +38056,10 @@ msgstr ""
#, priority:220
msgid "Other ambiguity resolutions might be added in the future, but for now any other cases will error out with an error indicating what we tried, and depending on the `advice.pushUnqualifiedRefname` configuration (see linkgit:git-config[1]) suggest what refs/ namespace you may have wanted to push to."
msgstr ""
+"Outras resolu챌천es de ambiguidade podem ser adicionadas no futuro, mas, por "
+"enquanto, outros casos apresentar찾o um erro indicando o que tentamos e "
+"dependendo da configura챌찾o `advice.pushUnqualifiedRefname` (consulte linkgit"
+":git-config[1]), sugere qual refs/ namespace voc챗 possa querer enviar."
#. type: Plain text
#: en/git-push.txt:101
@@ -37085,9 +38183,16 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:209 en/git-send-pack.txt:83
-#, priority:220
+#, fuzzy, 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]."
#. type: Labeled list
#: en/git-push.txt:210
@@ -37340,6 +38445,9 @@ msgstr "--[no-]verify"
#, priority:220
msgid "Toggle the pre-push hook (see linkgit:githooks[5]). The default is --verify, giving the hook a chance to prevent the push. With --no-verify, the hook is bypassed completely."
msgstr ""
+"Alterna o gancho \"pre-push\" (consulte linkgit:githooks[5]). A "
+"predefini챌찾o 챕 --verify, dando a chance ao gancho the prevenir o envio. Com "
+"`--no-verify`, o gancho 챕 ignorado por completo."
#. type: Plain text
#: en/git-push.txt:414
@@ -37439,9 +38547,15 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:461
-#, priority:220
+#, fuzzy, 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]."
#. type: Labeled list
#: en/git-push.txt:462
@@ -37505,6 +38619,9 @@ msgid ""
" /\n"
" ---X---A\n"
msgstr ""
+" B\n"
+" /\n"
+" ---X---A\n"
#. type: Plain text
#: en/git-push.txt:509
@@ -38422,6 +39539,10 @@ msgstr ""
#, priority:100
msgid "\"Sparse checkout\" allows populating the working directory sparsely. It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell Git whether a file in the working directory is worth looking at."
msgstr ""
+"O \"checkout esparso\" permite preencher minimamente o diret처rio de "
+"trabalho. Utiliza o bit \"skip-worktree\" (consulte linkgit:git-update-"
+"index[1]) para informar ao Git se vale a pena examinar um arquivo no "
+"diret처rio de trabalho."
#. type: Plain text
#: en/git-read-tree.txt:405
@@ -38507,6 +39628,12 @@ msgstr ""
#, priority:100
msgid "If <upstream> is not specified, the upstream configured in branch.<name>.remote and branch.<name>.merge options will be used (see linkgit:git-config[1] for details) and the `--fork-point` option is assumed. If you are currently not on any branch or if the current branch does not have a configured upstream, the rebase will abort."
msgstr ""
+"Caso o <upstream> n찾o seja definido, as op챌천es \"upstream\" configuradas em "
+"branch.<name>.remote e no branch.<name>.merge ser찾o usadas (para mais "
+"detalhes consulte linkgit:git-config[1]), assim como ser찼 assumida a op챌찾o "
+"`--fork-point`. Caso voc챗 n찾o esteja atualmente em nenhuma ramifica챌찾o ou "
+"se a ramifica챌찾o atual n찾o tiver um \"upstream\" configurado, o \"rebase\" "
+"ser찼 cancelado."
#. type: Plain text
#: en/git-rebase.txt:35
@@ -38911,12 +40038,13 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:300
-#, fuzzy, priority:100
-#| msgid "By default, cherry-picking a commit with an empty message will fail. This option overrides that behavior, allowing commits with empty messages to be cherry picked."
+#, priority:100
msgid "No-op. Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased. Now commits with an empty message do not cause rebasing to halt."
msgstr ""
-"Por padr찾o, escolher um commit com uma mensagem vazia falhar찼. \n"
-" Essa op챌찾o substitui esse comportamento, permitindo que as confirma챌천es de mensagens vazias sejam selecionadas."
+"No-op. Commits \"rebasing\" com uma mensagem vazia tende a falhar e essa "
+"op챌찾o substituiria esse comportamento, permitindo commits \"rebase\" com "
+"mensagens vazias. Agora commits com uma mensagem vazia n찾o faz com que o \""
+"rebase\" pare."
#. type: Plain text
#: en/git-rebase.txt:305
@@ -38953,6 +40081,9 @@ msgstr ""
#, priority:100
msgid "Use merging strategies to rebase. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side. This is the default."
msgstr ""
+"Use estrat챕gias de fus찾o para fazer o rebase. Quando a estrat챕gia de "
+"mesclagem recursiva (padr찾o) 챕 usada, isso permite que o \"rebase\" esteja "
+"ciente de renomes no lado do upstream. Este 챕 o padr찾o."
#. type: Plain text
#: en/git-rebase.txt:325
@@ -38994,7 +40125,7 @@ msgstr ""
#: en/git-rebase.txt:364
#, priority:100
msgid "Be quiet. Implies --no-stat."
-msgstr ""
+msgstr "Fique quieto. Implica --no-stat."
#. type: Plain text
#: en/git-rebase.txt:368
@@ -39034,10 +40165,13 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:389
-#, fuzzy, priority:100
-#| msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored."
+#, priority:100
msgid "Ensure at least <n> lines of surrounding context match before and after each change. When fewer lines of surrounding context exist they all must match. By default no context is ever ignored. Implies --apply."
-msgstr "Assegure pelo menos <n> linhas de correspond챗ncia de contexto ao redor antes e depois de cada altera챌찾o. Quando menos linhas de contexto circundante existem, todas devem corresponder. Por padr찾o, nenhum contexto 챕 ignorado."
+msgstr ""
+"Garanta que pelo menos <n> linhas ao redor do contexto correspondente se "
+"coincidam antes e depois de cada altera챌찾o. Quando h찼 menos linhas de "
+"contexto ao redor, todas elas devem coincidir. Por padr찾o, nenhum contexto "
+"챕 ignorado. Implica no uso da op챌찾o --apply."
#. type: Labeled list
#: en/git-rebase.txt:392 en/merge-options.txt:43
@@ -39080,6 +40214,11 @@ msgstr ""
#, priority:100
msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
msgstr ""
+"Quando \"--fork-point\" est찼 ativo o 'fork_point' ser찼 usado em vez do "
+"<upstream> calcular o conjunto de commits para fazer o \"rebase\" onde "
+"'fork_point' 챕 o resultado do comando `git merge-base --fork-point <upstream>"
+" <branch>` (consulte linkgit:git-merge-base[1]). Caso 'fork_point' termine "
+"vazio, o <upstream> ser찼 usado como substituto."
#. type: Plain text
#: en/git-rebase.txt:419
@@ -39095,16 +40234,19 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:429
-#, fuzzy, priority:100
-#| msgid "These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies the patch."
+#, priority:100
msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
-msgstr "Esses sinalizadores s찾o passados para o programa 'git apply' (ver linkgit:git-apply 1]) que aplica o patch."
+msgstr ""
+"Estes sinalizadores s찾o passados para o programa 'git apply' que aplica o "
+"patch (consulte linkgit:git-apply[1]). Implica no uso da op챌찾o --apply."
#. type: Plain text
#: en/git-rebase.txt:436
#, priority:100
msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
msgstr ""
+"Estes sinalizadores s찾o passados para 'git am' para alterar facilmente as "
+"datas dos commits onde o \"rebase\" foi feito (consulte linkgit:git-am[1])."
#. type: Plain text
#: en/git-rebase.txt:443
@@ -39342,10 +40484,9 @@ msgstr "--exec"
#. type: Plain text
#: en/git-rebase.txt:592
-#, fuzzy, priority:100
-#| msgid "--empty"
+#, priority:100
msgid "--empty="
-msgstr "--empty"
+msgstr "--empty="
#. type: Plain text
#: en/git-rebase.txt:594
@@ -39379,10 +40520,9 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:601
-#, fuzzy, priority:100
-#| msgid "--preserve-merges"
+#, priority:100
msgid "--preserve-merges and --empty="
-msgstr "--preserve-merges"
+msgstr "--preserve-merges and --empty="
#. type: Plain text
#: en/git-rebase.txt:602
@@ -39638,6 +40778,13 @@ msgid ""
" would be overwritten...\") to stdout, while the merge backend writes\n"
" them to stderr.\n"
msgstr ""
+"* Mensagens de progresso, informacionais e de erro: Os dois backends\n"
+" fornece um progresso ligeiramente diferente e as mensagens informantes.\n"
+" Al챕m disso, o backend aplicante grava uma mensagens de erro (como \"Seus "
+"arquivos\n"
+" ser찾o substitu챠dos...\") para o stdout, enquanto a mesclagem do backend "
+"escrevem\n"
+" eles no stderr.\n"
#. type: delimited block -
#: en/git-rebase.txt:731
@@ -40173,6 +41320,9 @@ msgstr ""
#, priority:100
msgid "With the 'subsystem' reflog: after 'git fetch', the old tip of 'subsystem' is at `subsystem@{1}`. Subsequent fetches will increase the number. (See linkgit:git-reflog[1].)"
msgstr ""
+"Com o 'subsistema' reflog: depois de 'git fetch', o antigo topo do "
+"'subsistema' sica em `subsystem@{1}`. As buscas subsequentes aumentar찾o "
+"este n첬mero. (Consulte linkgit:git-reflog[1].)"
#. type: Plain text
#: en/git-rebase.txt:1042
@@ -40446,6 +41596,10 @@ msgstr ""
#, priority:100
msgid "This command is usually not invoked directly by the end user. The UI for the protocol is on the 'git send-pack' side, and the program pair is meant to be used to push updates to remote repository. For pull operations, see linkgit:git-fetch-pack[1]."
msgstr ""
+"Este comando geralmente n찾o 챕 invocado diretamente pelo usu찼rio final. O "
+"protocolo da interface do usu찼rio est찼 no lado 'git send pack', e o par de "
+"programas deve ser usado para enviar atualiza챌천es para o reposit처rio "
+"remoto. Para as opera챌천es \"pull\", veja see linkgit:git-fetch-pack[1]."
#. type: Plain text
#: en/git-receive-pack.txt:28
@@ -40470,6 +41624,8 @@ msgstr ""
#, priority:100
msgid "A number of other receive.* config options are available to tweak its behavior, see linkgit:git-config[1]."
msgstr ""
+"Uma quantidade de outras op챌천es de configura챌천es receive.* est찾o dispon챠veis "
+"para ajustar o seu comportamento, consulte linkgit:git-config[1]."
#. type: Plain text
#: en/git-receive-pack.txt:43
@@ -40506,6 +41662,12 @@ msgstr ""
#, priority:100
msgid "When accepting a signed push (see linkgit:git-push[1]), the signed push certificate is stored in a blob and an environment variable `GIT_PUSH_CERT` can be consulted for its object name. See the description of `post-receive` hook for an example. In addition, the certificate is verified using GPG and the result is exported with the following environment variables:"
msgstr ""
+"Ao aceitar um \"push\" assinado (consulte linkgit:git-push[1]), o "
+"certificado do \"push\" assinado 챕 armazenado em uma bolha e em uma vari찼vel "
+"de ambiente `GIT_PUSH_CERT` onde o seu nome de objeto pode ser consultado. "
+"Um exemplo pode ser visto consultando a descri챌찾o do gancho `post-receive`. "
+"Al챕m disso, o certificado 챕 verificado usando o GPG e seu resultado 챕 "
+"exportado com as seguintes vari찼veis de ambiente:"
#. type: Labeled list
#: en/git-receive-pack.txt:66
@@ -40542,6 +41704,9 @@ msgstr "`GIT_PUSH_CERT_STATUS`"
#, priority:100
msgid "The status of GPG verification of the push certificate, using the same mnemonic as used in `%G?` format of `git log` family of commands (see linkgit:git-log[1])."
msgstr ""
+"A condi챌찾o da verifica챌찾o do certificado \"push\" GPG usa o mesmo processo "
+"mnem척nico de como 챕 usado em `%G?`, formato da fam챠lia de comandos `git log` "
+"(consulte linkgit:git-log[1])."
#. type: Labeled list
#: en/git-receive-pack.txt:78
@@ -40784,12 +41949,13 @@ msgstr ""
#. type: delimited block -
#: en/git-receive-pack.txt:220
-#, fuzzy, no-wrap, priority:100
-#| msgid "git-update-server-info(1)"
+#, no-wrap, priority:100
msgid ""
"#!/bin/sh\n"
"exec git update-server-info\n"
-msgstr "git-update-server-info(1)"
+msgstr ""
+"#!/bin/sh\n"
+"exec git update-server-info\n"
#. type: Title -
#: en/git-receive-pack.txt:224
@@ -40869,6 +42035,14 @@ msgstr ""
#, priority:100
msgid "Reference logs, or \"reflogs\", record when the tips of branches and other references were updated in the local repository. Reflogs are useful in various Git commands, to specify the old value of a reference. For example, `HEAD@{2}` means \"where HEAD used to be two moves ago\", `master@{one.week.ago}` means \"where master used to point to one week ago in this local repository\", and so on. See linkgit:gitrevisions[7] for more details."
msgstr ""
+"Os registros log de refer챗ncia, ou \"reflogs\", registram quando o topo das "
+"ramifica챌천es assim como as outras refer챗ncias foram atualizadas no "
+"reposit처rio local. Os \"reflogs\" s찾o 첬teis para especificar o valor antigo "
+"de uma refer챗ncia em v찼rios comandos Git. Por exemplo, `HEAD@{2}` quer dizer "
+"\"para onde HEAD costumava estar h찼 dois movimentos atr찼s\", "
+"`master@{one.week.ago}` quer dizer \"para onde o \"master\" costumava "
+"apontar uma semana atr찼s neste reposit처rio local\" e assim por diante. Para "
+"mais detalhes consulte linkgit:gitrevisions[7]."
#. type: Plain text
#: en/git-reflog.txt:37
@@ -40881,12 +42055,23 @@ msgstr ""
#, priority:100
msgid "The \"show\" subcommand (which is also the default, in the absence of any subcommands) shows the log of the reference provided in the command-line (or `HEAD`, by default). The reflog covers all recent actions, and in addition the `HEAD` reflog records branch switching. `git reflog show` is an alias for `git log -g --abbrev-commit --pretty=oneline`; see linkgit:git-log[1] for more information."
msgstr ""
+"O subcomando \"show\" (que tamb챕m 챕 o padr찾o, na aus챗ncia de subcomandos) "
+"exibe o registro log da refer챗ncia fornecida atrav챕s da linha de comando (ou "
+"por padr찾o, `HEAD`). O \"reflog\" cobre todas as a챌천es recentes assim como, "
+"o reflog `HEAD` registra a altern창ncia da ramifica챌찾o. O comando `git "
+"reflog show` 챕 um apelido para `git log -g --abbrev-commit --pretty=oneline`;"
+" Para mais informa챌천es consulte linkgit:git-log[1]."
#. type: Plain text
#: en/git-reflog.txt:50
#, priority:100
msgid "The \"expire\" subcommand prunes older reflog entries. Entries older than `expire` time, or entries older than `expire-unreachable` time and not reachable from the current tip, are removed from the reflog. This is typically not used directly by end users -- instead, see linkgit:git-gc[1]."
msgstr ""
+"O subcomando \"expire\" remove as entradas mais antigas do \"reflog\". As "
+"entradas ser찾o removidas do \"reflog\" caso tenham o tempo anterior ao "
+"'expire' ou `expire-unreachable`, assim como aquelas que estiverem "
+"inacess챠veis. Normalmente, isso n찾o 챕 usado diretamente pelos usu찼rios "
+"finais -- em vez disso, consulte linkgit:git-gc[1]."
#. type: Plain text
#: en/git-reflog.txt:55
@@ -41199,6 +42384,9 @@ msgstr ""
#, priority:100
msgid "This remote helper is transparently used by Git when you use commands such as \"git fetch <URL>\", \"git clone <URL>\", , \"git push <URL>\" or \"git remote add <nick> <URL>\", where <URL> begins with `ext::`. Examples:"
msgstr ""
+"Este ajudante remoto 챕 usado de forma transparente pelo Git quando voc챗 usa "
+"comandos como \"git fetch <URL>\", \"git clone <URL>\", \"git push <URL>\" "
+"ou \"git remote add <nick><URL>\", onde <URL>come챌a com `ext::`. Exemplos:"
#. type: Labeled list
#: en/git-remote-ext.txt:83
@@ -41440,6 +42628,8 @@ msgstr ""
#, priority:220
msgid "By default, only tags on fetched branches are imported (see linkgit:git-fetch[1])."
msgstr ""
+"횋 predefinido que apenas as tags recolhidas dos ramos s찾o importadas ("
+"consulte linkgit:git-fetch[1])."
#. type: Plain text
#: en/git-remote.txt:70
@@ -41665,9 +42855,15 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
-#, priority:220
+#, fuzzy, 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])."
#. type: Plain text
#: en/git-remote.txt:197
@@ -41680,6 +42876,9 @@ msgstr ""
#, priority:220
msgid "The remote configuration is achieved using the `remote.origin.url` and `remote.origin.fetch` configuration variables. (See linkgit:git-config[1])."
msgstr ""
+"A configura챌찾o remota 챕 arquivada usando as configura챌천es de vari찼veis "
+"`remote.origin.url` e `remote.origin.fetch`. (Consulte linkgit:git-"
+"config[1])."
#. type: Plain text
#: en/git-remote.txt:210
@@ -41783,9 +42982,16 @@ msgstr ""
#. type: Plain text
#: en/git-repack.txt:59
-#, priority:100
+#, fuzzy, 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]."
#. type: Plain text
#: en/git-repack.txt:65
@@ -41798,30 +43004,42 @@ msgstr ""
#, priority:100
msgid "Pass the `--local` option to 'git pack-objects'. See linkgit:git-pack-objects[1]."
msgstr ""
+"Encaminha a op챌찾o `--local` para 'git pack-objects'. Consulte linkgit:git-"
+"pack-objects[1]."
#. type: Plain text
#: en/git-repack.txt:73
#, priority:100
msgid "Pass the `--no-reuse-delta` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
msgstr ""
+"Encaminhe a op챌찾o `--no-reuse-delta` para `git-pack-objects`, consulte "
+"linkgit:git-pack-objects[1]."
#. type: Plain text
#: en/git-repack.txt:77
#, priority:100
msgid "Pass the `--no-reuse-object` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
msgstr ""
+"Encaminhe a op챌찾o `--no-reuse-object` para `git-pack-objects`, consulte "
+"linkgit:git-pack-objects[1]."
#. type: Plain text
#: en/git-repack.txt:81
#, priority:100
msgid "Pass the `-q` option to 'git pack-objects'. See linkgit:git-pack-objects[1]."
msgstr ""
+"Encaminhe a op챌찾o `-q` para 'git pack-objects'. Consulte linkgit:git-pack-"
+"objects[1]."
#. type: Plain text
#: en/git-repack.txt:88
#, priority:100
msgid "Do not update the server information with 'git update-server-info'. This option skips updating local catalog files needed to publish this repository (or a direct copy of it) over HTTP or FTP. See linkgit:git-update-server-info[1]."
msgstr ""
+"N찾o atualize a informa챌찾o do servidor com 'git update-server-info'. Esta "
+"op챌찾o ignora a atualiza챌찾o dos arquivos de cat찼logo local necess찼rios para "
+"publicar neste reposit처rio (ou uma c처pia direta do mesmo) por HTTP ou FTP. "
+"Consulte linkgit:git-update-server-info[1]."
#. type: Plain text
#: en/git-repack.txt:98
@@ -41900,12 +43118,14 @@ msgstr ""
#, priority:100
msgid "Pass the `--delta-islands` option to `git-pack-objects`, see linkgit:git-pack-objects[1]."
msgstr ""
+"Encaminha a op챌찾o `--delta-islands` para `git-pack-objects`, consulte linkgit"
+":git-pack-objects[1]."
#. type: Title -
#: en/git-repack.txt:169
#, no-wrap, priority:100
msgid "Configuration"
-msgstr ""
+msgstr "Configura챌찾o"
#. type: Plain text
#: en/git-repack.txt:180
@@ -42041,9 +43261,15 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:77
-#, priority:100
+#, fuzzy, 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]."
#. type: Plain text
#: en/git-replace.txt:85
@@ -42179,10 +43405,12 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:158
-#, fuzzy, priority:100
-#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+#, priority:100
msgid "linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit:git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] https://github.com/newren/git-filter-repo[git-filter-repo]"
-msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgstr ""
+"linkgit:git-hash-object[1] linkgit:git-rebase[1] linkgit:git-tag[1] linkgit"
+":git-branch[1] linkgit:git-commit[1] linkgit:git-var[1] linkgit:git[1] "
+"https://github.com/newren/git-filter-repo[git-filter-repo]"
#. type: Title =
#: en/git-request-pull.txt:2
@@ -42635,10 +43863,9 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:23
-#, fuzzy, ignore-ellipsis, no-wrap, priority:280
-#| msgid "'git checkout' [<tree-ish>] [--] <pathspec>..."
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git reset' [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr "'git verificar' [<tree-ish>] [--] <pathspec>..."
+msgstr "'git reset' [-q] [<tree-ish>] [--] <pathspec>..."
#. type: Labeled list
#: en/git-reset.txt:24
@@ -42666,10 +43893,9 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:40
-#, fuzzy, ignore-ellipsis, no-wrap, priority:280
-#| msgid "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
+#, ignore-ellipsis, no-wrap, priority:280
msgid "'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]"
-msgstr "'git verificar' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
+msgstr "'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]"
#. type: Plain text
#: en/git-reset.txt:44
@@ -42724,6 +43950,8 @@ msgstr ""
#, priority:280
msgid "If `-N` is specified, removed paths are marked as intent-to-add (see linkgit:git-add[1])."
msgstr ""
+"Caso `-N` seja especificado, os caminhos removidos ser찾o marcados como uma "
+"inten챌찾o de adicionar (consulte linkgit:git-add[1])."
#. type: Labeled list
#: en/git-reset.txt:70
@@ -42862,19 +44090,15 @@ msgstr ""
#. type: delimited block -
#: en/git-reset.txt:178
-#, fuzzy, no-wrap, priority:280
-#| msgid ""
-#| "$ git checkout -b foo <1>\n"
-#| "$ git branch foo <2>\n"
-#| "$ git tag foo <3>\n"
+#, no-wrap, priority:280
msgid ""
"$ git branch topic/wip <1>\n"
"$ git reset --hard HEAD~3 <2>\n"
"$ git switch topic/wip <3>\n"
msgstr ""
-"$ git verificar -b foo <1>\n"
-"$ git branch foo <2>\n"
-"$ git tag foo <3>\n"
+"$ git branch topic/wip <1>\n"
+"$ git reset --hard HEAD~3 <2>\n"
+"$ git switch topic/wip <3>\n"
#. type: Plain text
#: en/git-reset.txt:184
@@ -42976,6 +44200,12 @@ msgid ""
" ...\n"
"$ git reset --merge ORIG_HEAD <2>\n"
msgstr ""
+"$ git pull <1>\n"
+"Auto-merging nitfol\n"
+"Merge made by recursive.\n"
+" nitfol | 20 +++++----\n"
+" ...\n"
+"$ git reset --merge ORIG_HEAD <2>\n"
#. type: Plain text
#: en/git-reset.txt:243
@@ -43171,6 +44401,13 @@ msgstr ""
#, priority:280
msgid "Next, commit the changes stored in the index. The `-c` option specifies to pre-populate the commit message from the original message that you started with in the first commit. This is helpful to avoid retyping it. The `HEAD@{1}` is a special notation for the commit that `HEAD` used to be at prior to the original reset commit (1 change ago). See linkgit:git-reflog[1] for more details. You may also use any other valid commit reference."
msgstr ""
+"Em seguida, fa챌a o commit das altera챌천es armazenadas no 챠ndice. A op챌찾o `-c` "
+"determina o pr챕-preenchimento da mensagem do commit original com a qual voc챗 "
+"come챌ou no primeiro commit. Isso 챕 첬til para evitar redigit찼-lo. O `HEAD@{1}`"
+" 챕 uma nota especial para o commit onde `HEAD` costumava estar antes do "
+"commit de reset original (1 altera챌찾o atr찼s). Para mais detalhes consulte "
+"linkgit:git-reflog[1]. Voc챗 tamb챕m pode usar qualquer outro commit de "
+"refer챗ncia v찼lido."
#. type: Plain text
#: en/git-reset.txt:362
@@ -43356,10 +44593,9 @@ msgstr "git-restore(1)"
#. type: Plain text
#: en/git-restore.txt:7
-#, fuzzy, priority:100
-#| msgid "Switch branches or restore working tree files."
+#, priority:100
msgid "git-restore - Restore working tree files"
-msgstr "Move branches ou restaura arquivos de 찼rvores de trabalho."
+msgstr "git-restore - Restaura os arquivos das 찼rvores de trabalho"
#. type: Plain text
#: en/git-restore.txt:14
@@ -43396,17 +44632,15 @@ msgstr ""
#. type: Labeled list
#: en/git-restore.txt:36
-#, fuzzy, no-wrap, priority:100
-#| msgid "<tree-ish>"
+#, no-wrap, priority:100
msgid "-s <tree>"
-msgstr "<tree-ish>"
+msgstr "-s <tree>"
#. type: Labeled list
#: en/git-restore.txt:37
-#, fuzzy, no-wrap, priority:100
-#| msgid "--source"
+#, no-wrap, priority:100
msgid "--source=<tree>"
-msgstr "--source"
+msgstr "--source=<tree>"
#. type: Plain text
#: en/git-restore.txt:41
@@ -43422,10 +44656,12 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:53
-#, fuzzy, priority:100
-#| msgid "This means that you can use `git checkout -p` to selectively discard edits from your current working tree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
+#, 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 "Isso significa que voc챗 pode usar o `git checkout -p` para descartar seletivamente as edi챌천es da sua 찼rvore de trabalho atual. Veja a se챌찾o `` Interactive Mode '' do linkgit:git-add[1] para aprender como operar o modo `--patch`."
+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`."
#. type: Plain text
#: en/git-restore.txt:56
@@ -43453,31 +44689,36 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:68
-#, fuzzy, priority:100
-#| msgid "Quiet, suppress feedback messages."
+#, priority:100
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
-msgstr "Silencioso, suprima as mensagens de feedback."
+msgstr ""
+"Silencioso, suprima as mensagens de feedback. Implica no uso da op챌찾o `--no-"
+"progress`."
#. type: Plain text
#: en/git-restore.txt:80
-#, fuzzy, priority:100
-#| msgid "When checking out paths from the index, check out stage #2 ('ours') or #3 ('theirs') for unmerged paths."
+#, priority:100
msgid "When restoring files in the working tree from the index, use stage #2 ('ours') or #3 ('theirs') for unmerged paths."
-msgstr "Ao verificar os caminhos do 챠ndice, confira o est찼gio #2 ('nosso') ou #3 ('deles') para paths n찾o mesclados."
+msgstr ""
+"Ao restaurar os arquivos no 챠ndice da 찼rvore de trabalho, use o est찼gio #2 "
+"('nosso') ou #3 ('deles') para os caminhos que n찾o foram mesclados."
#. type: Plain text
#: en/git-restore.txt:84
-#, fuzzy, priority:100
-#| msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped; `--ours` gives the version from the branch the changes are rebased onto, while `--theirs` gives the version from the branch that holds your work that is being rebased."
+#, 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`, 'ours' e 'theirs' podem aparecer trocados; `--ours` fornece a vers찾o da ramifica챌찾o onde as altera챌천es s찾o feitas, enquanto` --theirs` fornece a vers찾o da ramifica챌찾o que cont챕m o seu trabalho que est찼 sendo rebaixado."
+msgstr ""
+"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]."
#. type: Plain text
#: en/git-restore.txt:89
-#, fuzzy, priority:100
-#| msgid "When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths."
+#, priority:100
msgid "When restoring files on the working tree from the index, recreate the conflicted merge in the unmerged paths."
-msgstr "Ao efetuar o check-out de caminhos do 챠ndice, essa op챌찾o permite recriar a mesclagem conflitante nos caminhos especificados."
+msgstr ""
+"Ao restaurar os arquivos no 챠ndice da 찼rvore de trabalho, recrie a mesclagem "
+"conflitante nos caminhos que ainda n찾o foram mesclados."
#. type: Labeled list
#: en/git-restore.txt:97
@@ -43493,10 +44734,13 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:109
-#, fuzzy, priority:100
-#| msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entries matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and adds back any files in <paths>."
+#, priority:100
msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
-msgstr "No modo de checkout esparso, `git checkout - <paths>` atualizaria apenas entradas correspondidas por <paths> e padr천es esparsos em $GIT_DIR/info/sparse-checkout. Esta op챌찾o ignora os padr천es esparsos e adiciona de volta os arquivos em <paths>."
+msgstr ""
+"횋 predefinido que no modo de checkout esparso apenas as entradas que sejam "
+"coincidentes com `<pathspec>` e com os padr천es esparsos em `$GIT_DIR/info/"
+"sparse-checkout`. Esta op챌찾o ignora os padr천es esparsos e os adiciona de "
+"volta nos arquivos em `<pathspec>`."
#. type: Plain text
#: en/git-restore.txt:116
@@ -43506,29 +44750,25 @@ msgstr ""
#. type: Plain text
#: en/git-restore.txt:144
-#, fuzzy, priority:100
-#| msgid "The following sequence checks out the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
+#, 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 faz o checkout do branch `master`, reverte o` Makefile` para duas revis천es, apaga hello.c por engano e o recupera do 챠ndice."
+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."
#. type: delimited block -
#: en/git-restore.txt:150
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "$ git checkout master <1>\n"
-#| "$ git checkout master~2 Makefile <2>\n"
-#| "$ rm -f hello.c\n"
-#| "$ git checkout hello.c <3>\n"
+#, no-wrap, priority:100
msgid ""
"$ git switch master\n"
"$ git restore --source master~2 Makefile <1>\n"
"$ rm -f hello.c\n"
"$ git restore hello.c <2>\n"
msgstr ""
-"$ git verificar master <1>\n"
-"$ git verificar master~2 Fazer arquivo <2>\n"
+"$ git switch master\n"
+"$ git restore --source master~2 Makefile <1>\n"
"$ rm -f hello.c\n"
-"$ git verificar hello.c <3>\n"
+"$ git restore hello.c <2>\n"
#. type: Plain text
#: en/git-restore.txt:154
@@ -43538,24 +44778,27 @@ msgstr "restaurar o hello.c do 챠ndice"
#. type: Plain text
#: en/git-restore.txt:157
-#, fuzzy, priority:100
-#| msgid "If you want to check out _all_ C source files out of the index, you can say"
+#, priority:100
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
-msgstr "Se voc챗 quiser dar uma olhada nos arquivos de c처digo-fonte, todos fora do 챠ndice, voc챗 pode dizer"
+msgstr ""
+"Caso queira restaurar _TODOS_ os arquivos do c처digo fonte C para que "
+"coincidam com a vers찾o do 챠ndice, voc챗 pode usar o comando"
#. type: delimited block -
#: en/git-restore.txt:160
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git checkout -- '*.c'\n"
+#, no-wrap, priority:100
msgid "$ git restore '*.c'\n"
-msgstr "$ git verificar -- '*.c'\n"
+msgstr "$ git restore '*.c'\n"
#. type: Plain text
#: en/git-restore.txt:166
-#, fuzzy, priority:100
-#| msgid "Note the quotes around `*.c`. The file `hello.c` will also be checked out, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
+#, priority:100
msgid "Note the quotes around `*.c`. The file `hello.c` will also be restored, even though it is no longer in the working tree, because the file globbing is used to match entries in the index (not in the working tree by the shell)."
-msgstr "Observe as aspas em torno de `* .c`. O arquivo `hello.c` tamb챕m ser찼 retirado, mesmo que n찾o esteja mais na 찼rvore de trabalho, porque o agrupamento de arquivos 챕 usado para corresponder entradas no 챠ndice (n찾o na 찼rvore de trabalho pelo shell)."
+msgstr ""
+"Observe as aspas em torno de `* .c`. O arquivo `hello.c` tamb챕m ser찼 "
+"restaurado ainda que n찾o esteja mais na 찼rvore de trabalho, pois o "
+"agrupamento de arquivos 챕 usado para coincidir com as entradas do 챠ndice ("
+"n찾o na 찼rvore de trabalho pelo shell)."
#. type: Plain text
#: en/git-restore.txt:168
@@ -43565,23 +44808,23 @@ msgstr ""
#. type: delimited block -
#: en/git-restore.txt:171
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git bisect reset\n"
+#, no-wrap, priority:100
msgid "$ git restore .\n"
-msgstr "$ git redefini챌찾o de bisseta\n"
+msgstr "$ git restore .\n"
#. type: Plain text
#: en/git-restore.txt:175
#, priority:100
msgid "or to restore all working tree files with 'top' pathspec magic (see linkgit:gitglossary[7])"
msgstr ""
+"ou para restaurar todos os arquivos do topo da 찼rvore de trabalho com a "
+"m찼gica do \"pathspec\" (consulte linkgit:gitglossary[7])"
#. type: delimited block -
#: en/git-restore.txt:178
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git bisect reset\n"
+#, no-wrap, priority:100
msgid "$ git restore :/\n"
-msgstr "$ git redefini챌찾o de bisseta\n"
+msgstr "$ git restore :/\n"
#. type: Plain text
#: en/git-restore.txt:182
@@ -43591,10 +44834,9 @@ msgstr ""
#. type: delimited block -
#: en/git-restore.txt:185
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git checkout -- hello.c\n"
+#, no-wrap, priority:100
msgid "$ git restore --staged hello.c\n"
-msgstr "$ git verificar -- hello.c\n"
+msgstr "$ git restore --staged hello.c\n"
#. type: Plain text
#: en/git-restore.txt:189
@@ -43616,10 +44858,9 @@ msgstr ""
#. type: delimited block -
#: en/git-restore.txt:198
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git checkout -- hello.c\n"
+#, no-wrap, priority:100
msgid "$ git restore -s@ -SW hello.c\n"
-msgstr "$ git verificar -- hello.c\n"
+msgstr "$ git restore -s@ -SW hello.c\n"
#. type: Plain text
#: en/git-restore.txt:204
@@ -43658,12 +44899,26 @@ msgstr ""
#, priority:100
msgid "Note: 'git revert' is used to record some new commits to reverse the effect of some earlier commits (often only a faulty one). If you want to throw away all uncommitted changes in your working directory, you should see linkgit:git-reset[1], particularly the `--hard` option. If you want to extract specific files as they were in another commit, you should see linkgit:git-restore[1], specifically the `--source` option. Take care with these alternatives as both will discard uncommitted changes in your working directory."
msgstr ""
+"Nota: 'git revert' 챕 usado para registrar alguns commits novos para reverter "
+"o efeito de alguns commits anteriores (geralmente apenas um com problema). "
+"Caso queira descartar todos os commits das altera챌천es que n찾o foram "
+"aplicados no seu diret처rio de trabalho, consulte linkgit:git-reset[1], em "
+"particular a op챌찾o `--hard`. Caso queira extrair arquivos espec챠ficos da "
+"maneira que eles estavam em um outro commit, voc챗 deve consultar linkgit:git-"
+"restore[1], principalmente a op챌찾o `--source`. Tenha cuidado com ambas "
+"alternativas pois elas descartam qualquer modifica챌찾o n찾o aplicada no seu "
+"diret처rio de trabalho."
#. type: Plain text
#: en/git-revert.txt:43
#, priority:100
msgid "Commits to revert. For a more complete list of ways to spell commit names, see linkgit:gitrevisions[7]. Sets of commits can also be given but no traversal is done by default, see linkgit:git-rev-list[1] and its `--no-walk` option."
msgstr ""
+"Commits que ser찾o revertidos. Para obter uma lista mais completa das "
+"maneiras de como soletrar os nomes dos commits, consulte "
+"linkgit:gitrevisions[7]. Um conjunto de commits tamb챕m podem ser "
+"fornecidos por챕m nenhuma travessia 챕 feita por padr찾o, consulte linkgit:git-"
+"rev-list[1] e a sua op챌찾o `--no-walk`."
#. type: Plain text
#: en/git-revert.txt:49
@@ -43745,10 +45000,9 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:13
-#, fuzzy, ignore-ellipsis, no-wrap, priority:100
-#| msgid "'git check-mailmap' [<options>] <contact>...\n"
+#, ignore-ellipsis, no-wrap, priority:100
msgid "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
-msgstr "'git verificar-mailmap' [<op챌천es>] <contato>...\n"
+msgstr "'git rev-list' [<options>] <commit>... [[--] <path>...]\n"
#. type: Plain text
#: en/git-rev-list.txt:21
@@ -44057,6 +45311,10 @@ msgstr ""
#, priority:100
msgid "Same as `--verify` but shortens the object name to a unique prefix with at least `length` characters. The minimum length is 4, the default is the effective value of the `core.abbrev` configuration variable (see linkgit:git-config[1])."
msgstr ""
+"O mesmo que `--verify` por챕m encurta o nome do objeto para um prefixo 첬nico "
+"com pelo menos um`comprimento` determinado de caracteres. A quantidade "
+"m챠nima 챕 de 4 caracteres, o valor 챕 predefinido na vari찼vel de configura챌찾o "
+"`core.abbrev` (consulte linkgit:git-config[1])."
#. type: Plain text
#: en/git-rev-parse.txt:139
@@ -44893,7 +46151,7 @@ msgstr ""
#: en/git-rm.txt:132
#, priority:280
msgid "See linkgit:git-add[1]."
-msgstr ""
+msgstr "Consulte linkgit:git-add[1]."
#. type: Title ~
#: en/git-rm.txt:134
@@ -44930,6 +46188,10 @@ msgstr ""
#, priority:280
msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
msgstr ""
+"Caso queira remover apenas o check-out local de um sub-m처dulo da sua 찼rvore "
+"de trabalho sem cometer a remo챌찾o, em vez disso use linkgit:git-submodule[1] "
+"`deinit`. Para obter detalhes sobre a remo챌찾o do sub-m처dulo, consulte tamb챕m "
+"linkgit:gitsubmodules[7]."
#. type: Labeled list
#: en/git-rm.txt:168
@@ -45046,6 +46308,9 @@ msgstr "--annotate"
#, priority:100
msgid "Review and edit each patch you're about to send. Default is the value of `sendemail.annotate`. See the CONFIGURATION section for `sendemail.multiEdit`."
msgstr ""
+"Revise e edite cada patch que voc챗 est찼 prestes a enviar. O padr찾o 챕 o valor "
+"de 'sendemail.annotate'. Consulte a se챌찾o CONFIGURA횉횄O de "
+"'sendemail.multiEdit'."
#. type: Labeled list
#: en/git-send-email.txt:53
@@ -45785,6 +47050,8 @@ msgstr ""
#, priority:100
msgid "Invoke the sendemail-validate hook if present (see linkgit:githooks[5])."
msgstr ""
+"Se presente, chame o gancho de valida챌찾o do sendmail (consulte "
+"linkgit:githooks[5])."
#. type: Plain text
#: en/git-send-email.txt:420
@@ -45983,6 +47250,11 @@ msgstr ""
#, priority:100
msgid "The first time you run it, you will be prompted for your credentials. Enter the app-specific or your regular password as appropriate. If you have credential helper configured (see linkgit:git-credential[1]), the password will be saved in the credential store so you won't have to type it the next time."
msgstr ""
+"As suas credenciais ser찾o solicitadas na primeira vez em que voc챗 execut찼-"
+"lo. Entre com as credenciais espec챠ficas do aplicativo ou a sua senha "
+"normal conforme for o caso. Caso tenha o auxiliar de credencial configurado "
+"(consulte linkgit:git-credential[1]), a senha ser찼 salva no armazenamento de "
+"credenciais para que voc챗 n찾o precise digit찼-la na pr처xima vez."
#. type: Plain text
#: en/git-send-email.txt:518
@@ -46023,6 +47295,8 @@ msgstr ""
#, priority:100
msgid "Usually you would want to use 'git push', which is a higher-level wrapper of this command, instead. See linkgit:git-push[1]."
msgstr ""
+"No lugar use 'git push' que 챕 um wrapper de maior hierarquia deste comando. "
+"Consulte linkgit:git-push[1]."
#. type: Plain text
#: en/git-send-pack.txt:24
@@ -46068,9 +47342,12 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:89
-#, priority:100
+#, fuzzy, 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]."
#. type: Labeled list
#: en/git-send-pack.txt:90
@@ -46116,9 +47393,15 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:128
-#, priority:100
+#, fuzzy, priority:100
msgid "Each pattern pair consists of the source side (before the colon) and the destination side (after the colon). The ref to be pushed is determined by finding a match that matches the source side, and where it is pushed is determined by using the destination side. 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]."
#. type: Plain text
#: en/git-send-pack.txt:133
@@ -46193,7 +47476,7 @@ msgstr ""
#: en/git-shell.txt:37
#, priority:100
msgid "Imitate a CVS server. See linkgit:git-cvsserver[1]."
-msgstr ""
+msgstr "Imite um servidor CVS. Consulte linkgit:git-cvsserver[1]."
#. type: Plain text
#: en/git-shell.txt:42
@@ -46747,6 +48030,12 @@ msgid ""
" ! [mhf] Allow \"+remote:local\" refspec to cause --force when fetching.\n"
"---\n"
msgstr ""
+"$ git show-branch master fixes mhf\n"
+"* [master] Add 'git show-branch'.\n"
+" ! [fixes] Introduz a sinaliza챌찾o \"reset type\" para \"git reset\"\n"
+" ! [mhf] Permite que refspec \"+remote:local\" cause --force when quando "
+"for buscar.\n"
+"---\n"
#. type: delimited block -
#: en/git-show-branch.txt:167
@@ -46764,6 +48053,18 @@ msgid ""
" + [mhf~8] Start adding the $GIT_DIR/remotes/ support.\n"
"*++ [master] Add 'git show-branch'.\n"
msgstr ""
+" + [mhf] Permite que refspec \"+remote:local\" cause --force when quando "
+"for buscar.\n"
+" + [mhf~1] Usa git-octopus quando for puxar mais de um \"heads\".\n"
+" + [fixes] Introduz a sinaliza챌찾o \"reset type\" para \"git reset\"\n"
+" + [mhf~2] \"git fetch --force\".\n"
+" + [mhf~3] Use .git/remote/origin, n찾o .git/branches/origin.\n"
+" + [mhf~4] Faz \"git pull\" e \"git fetch\" por padr찾o no \"origin\"\n"
+" + [mhf~5] Infame 'octopus merge'\n"
+" + [mhf~6] Retira git-parse-remote.\n"
+" + [mhf~7] Multi-head fetch.\n"
+" + [mhf~8] Come챌a a adicionar a compatibilidade com $GIT_DIR/remotes/.\n"
+"*++ [master] Adiciona 'git show-branch'.\n"
#. type: Plain text
#: en/git-show-branch.txt:174
@@ -47158,127 +48459,141 @@ msgstr "git-show(1)"
#: en/git-show.txt:7
#, priority:260
msgid "git-show - Show various types of objects"
-msgstr ""
+msgstr "git-show - Exibe v찼rios tipos de objetos"
#. type: Plain text
#: en/git-show.txt:13
#, ignore-ellipsis, no-wrap, priority:260
msgid "'git show' [<options>] [<object>...]\n"
-msgstr ""
+msgstr "'git show' [<options>] [<object>...]\n"
#. type: Plain text
#: en/git-show.txt:17
#, priority:260
msgid "Shows one or more objects (blobs, trees, tags and commits)."
-msgstr ""
+msgstr "Exibe um ou mais objetos (gotas, 찼rvores, tags e commits)."
#. type: Plain text
#: en/git-show.txt:21
#, priority:260
msgid "For commits it shows the log message and textual diff. It also presents the merge commit in a special format as produced by 'git diff-tree --cc'."
msgstr ""
+"Para commits, exibe a mensagem do registro log e a diferen챌a textual. Ele "
+"tamb챕m apresenta o commit de mesclagem em um formato especial produzido por `"
+"git diff-tree --cc`."
#. type: Plain text
#: en/git-show.txt:23
#, priority:260
msgid "For tags, it shows the tag message and the referenced objects."
-msgstr ""
+msgstr "Para tags, ele exibe a mensagem da tag e os objetos referenciados."
#. type: Plain text
#: en/git-show.txt:26
#, priority:260
msgid "For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
+"Para 찼rvores, ele exibe os nomes (equivalente a `git ls-tree` com `--name-"
+"only`)."
#. type: Plain text
#: en/git-show.txt:28
#, priority:260
msgid "For plain blobs, it shows the plain contents."
-msgstr ""
+msgstr "Para gotas simples, exibe o conte첬do simples."
#. type: Plain text
#: en/git-show.txt:31
#, priority:260
msgid "The command takes options applicable to the 'git diff-tree' command to control how the changes the commit introduces are shown."
msgstr ""
+"O comando aceita as op챌천es aplic찼veis ao comando `git diff-tree` para "
+"controlar como as modifica챌천es feitas pelo commit s찾o exibidas."
#. type: Plain text
#: en/git-show.txt:33
#, priority:260
msgid "This manual page describes only the most frequently used options."
msgstr ""
+"Esta p찼gina do manual descreve apenas as op챌천es usadas com mais frequ챗ncia."
#. type: Labeled list
#: en/git-show.txt:37
#, ignore-ellipsis, no-wrap, priority:260
msgid "<object>..."
-msgstr ""
+msgstr "<object>..."
#. type: Plain text
#: en/git-show.txt:41
#, priority:260
msgid "The names of objects to show (defaults to 'HEAD'). For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
msgstr ""
+"Os nomes dos objetos a serem exibidos (a predefini챌찾o 챕 'HEAD'). Para obter "
+"uma lista mais completa de maneiras de soletrar os nomes dos objetos, "
+"consulte a se챌찾o \"ESPECIFICANDO AS REVIS횛ES\" em linkgit:gitrevisions[7]."
#. type: Labeled list
#: en/git-show.txt:60
#, no-wrap, priority:260
msgid "`git show v1.0.0`"
-msgstr ""
+msgstr "`git show v1.0.0`"
#. type: Plain text
#: en/git-show.txt:63
#, priority:260
msgid "Shows the tag `v1.0.0`, along with the object the tags points at."
-msgstr ""
+msgstr "Exibe a tag `v1.0.0` junto com o objeto que as tags apontarem."
#. type: Labeled list
#: en/git-show.txt:64
#, no-wrap, priority:260
msgid "`git show v1.0.0^{tree}`"
-msgstr ""
+msgstr "`git show v1.0.0^{tree}`"
#. type: Plain text
#: en/git-show.txt:66
#, priority:260
msgid "Shows the tree pointed to by the tag `v1.0.0`."
-msgstr ""
+msgstr "Exibe a 찼rvore apontada pela tag `v1.0.0`."
#. type: Labeled list
#: en/git-show.txt:67
#, no-wrap, priority:260
msgid "`git show -s --format=%s v1.0.0^{commit}`"
-msgstr ""
+msgstr "`git show -s --format=%s v1.0.0^{commit}`"
#. type: Plain text
#: en/git-show.txt:70
#, priority:260
msgid "Shows the subject of the commit pointed to by the tag `v1.0.0`."
-msgstr ""
+msgstr "Mostra o assunto do commit apontado pela tag `v1.0.0`."
#. type: Labeled list
#: en/git-show.txt:71
#, no-wrap, priority:260
msgid "`git show next~10:Documentation/README`"
-msgstr ""
+msgstr "`git show next~10:Documentation/README`"
#. type: Plain text
#: en/git-show.txt:75
#, priority:260
msgid "Shows the contents of the file `Documentation/README` as they were current in the 10th last commit of the branch `next`."
msgstr ""
+"Exibe o conte첬do do arquivo `Documentation/README` como eles estavam "
+"atualmente no d챕cimo 첬ltimo commit do ramo `next`."
#. type: Labeled list
#: en/git-show.txt:76
#, no-wrap, priority:260
msgid "`git show master:Makefile master:t/Makefile`"
-msgstr ""
+msgstr "`git show master:Makefile master:t/Makefile`"
#. type: Plain text
#: en/git-show.txt:79
#, priority:260
msgid "Concatenates the contents of said Makefiles in the head of the branch `master`."
msgstr ""
+"Concatena o conte첬do dos referidos Makefiles no `HEAD` do ramo `master`."
#. type: Title =
#: en/git-sh-setup.txt:2
@@ -47581,6 +48896,8 @@ msgstr ""
#, priority:240
msgid "The command takes options applicable to the 'git log' command to control what is shown and how. See linkgit:git-log[1]."
msgstr ""
+"O comando aceita as op챌천es aplic찼veis ao comando 'git log' para controlar o "
+"que 챕 exibido e como. Consulte linkgit:git-log[1]."
#. type: Labeled list
#: en/git-stash.txt:86
@@ -47694,7 +49011,7 @@ msgstr ""
#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
#, priority:240
msgid "This option is only valid for `push` and `save` commands."
-msgstr ""
+msgstr "Esta op챌찾o s처 챕 v찼lida para os comandos `push` e `save`."
#. type: Plain text
#: en/git-stash.txt:160
@@ -47718,7 +49035,7 @@ msgstr ""
#: en/git-stash.txt:170
#, priority:240
msgid "This option is only valid for `pop` and `apply` commands."
-msgstr ""
+msgstr "Esta op챌찾o s처 챕 v찼lida para os comandos `pop` e `apply`."
#. type: Plain text
#: en/git-stash.txt:175
@@ -47758,16 +49075,17 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
-#, fuzzy, priority:240
-#| msgid "This option is only applicable in non-verbose mode."
+#, priority:240
msgid "This option is only valid for `push` command."
-msgstr "Esta op챌찾o 챕 aplic찼vel apenas no modo n찾o detalhado."
+msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `push`."
#. type: Plain text
#: en/git-stash.txt:219
#, priority:240
msgid "This option is only valid for `apply`, `drop`, `pop`, `push`, `save`, `store` commands."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para os comandos `apply`, `drop`, `pop`, `push`, "
+"`save` e `store`."
#. type: Plain text
#: en/git-stash.txt:226
@@ -47792,6 +49110,8 @@ msgstr ""
#, priority:240
msgid "This option is only valid for `apply`, `branch`, `drop`, `pop`, `show` commands."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para os comandos `apply`, `branch`, `drop`, `pop` e "
+"`show`."
#. type: Plain text
#: en/git-stash.txt:243
@@ -48007,7 +49327,7 @@ msgstr ""
#: en/git-status.txt:49
#, priority:280
msgid "Give the output in the long-format. This is the default."
-msgstr ""
+msgstr "D챗 a sa챠da no formato longo. Este 챕 o padr찾o."
#. type: Plain text
#: en/git-status.txt:57
@@ -48284,6 +49604,31 @@ msgid ""
"! ! ignored\n"
"-------------------------------------------------\n"
msgstr ""
+"X Y Significado\n"
+"-------------------------------------------------\n"
+"\t [AMD] n찾o atualizado\n"
+"M [ MD] atualizado no 챠ndice\n"
+"A [ MD] adicionado ao 챠ndice\n"
+"D exclu챠do do 챠ndice\n"
+"R [ MD] renomeado no 챠ndice\n"
+"C [ MD] copiado para o 챠ndice\n"
+"[MARC] 챠ndice e correspond챗ncias na 찼rvore de trabalho\n"
+"[ MARC] M mudan챌as na 찼rvore de trabalho deste o 챠ndice\n"
+"[ MARC] D exclu챠do da 찼rvore de trabalho\n"
+"[ D] R renomeado na 찼rvore de trabalho\n"
+"[ D] C copiado na 찼rvore de trabalho\n"
+"-------------------------------------------------\n"
+"D D unmerged, ambos exclu챠dos\n"
+"A U unmerged, adicionados por n처s\n"
+"U D unmerged, exclu챠do por eles\n"
+"U A unmerged, adicionado por n처s\n"
+"D U unmerged, exclu챠do por n처s\n"
+"A A unmerged, ambos adicionados\n"
+"U U unmerged, ambos modificados\n"
+"-------------------------------------------------\n"
+"? ? n찾o rastreado\n"
+"! ! ignorado\n"
+"-------------------------------------------------\n"
#. type: Plain text
#: en/git-status.txt:239
@@ -48522,7 +49867,7 @@ msgstr ""
#: en/git-status.txt:384
#, no-wrap, priority:280
msgid " ? <path>\n"
-msgstr ""
+msgstr " ? <path>\n"
#. type: Plain text
#: en/git-status.txt:386
@@ -48583,6 +49928,17 @@ msgstr ""
#, priority:280
msgid "By default, `git status` will automatically refresh the index, updating the cached stat information from the working tree and writing out the result. Writing out the updated index is an optimization that isn't strictly necessary (`status` computes the values for itself, but writing them out is just to save subsequent programs from repeating our computation). When `status` is run in the background, the lock held during the write may conflict with other simultaneous processes, causing them to fail. Scripts running `status` in the background should consider using `git --no-optional-locks status` (see linkgit:git[1] for details)."
msgstr ""
+"횋 predefinido que o 'status git' atualize automaticamente o 챠ndice, que "
+"atualize tamb챕m as estat챠sticas das informa챌천es armazenadas em cache da "
+"찼rvore de trabalho e gravando o resultado. Escrever o 챠ndice atualizado 챕 "
+"uma otimiza챌찾o que n찾o 챕 estritamente necess찼ria (o `status` calcula os "
+"valores por si s처, mas escrev챗-los 챕 apenas para evitar que os programas "
+"subsequentes refa챌am o nosso processamento). Quando o `status` 챕 executado "
+"em segundo plano o bloqueio mantido durante a grava챌찾o pode entrar em "
+"conflito com outros processos que estejam sendo executados simultaneamente, "
+"fazendo com que eles falhem. Os scripts que executam `status` em segundo "
+"plano devem considerar o uso de`git --no-optional-locks status` (para mais "
+"detalhes consulte linkgit:git[1])."
#. type: Title =
#: en/git-stripspace.txt:2
@@ -48782,6 +50138,7 @@ msgstr ""
#, priority:220
msgid "For more information about submodules, see linkgit:gitsubmodules[7]."
msgstr ""
+"Para mais informa챌천es sobre subm처dulos, consulte linkgit:gitsubmodules[7]."
#. type: Plain text
#: en/git-submodule.txt:36
@@ -48914,6 +50271,9 @@ msgstr ""
#, priority:220
msgid "If you really want to remove a submodule from the repository and commit that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal options."
msgstr ""
+"Caso queira realmente remover um subm처dulo do reposit처rio e fazer o commit, "
+"em vez disso use linkgit:git-rm[1]. Para op챌천es de remo챌찾o consulte "
+"linkgit:gitsubmodules[7]."
#. type: Labeled list
#: en/git-submodule.txt:136
@@ -49158,19 +50518,25 @@ msgstr ""
#, priority:220
msgid "This option is only valid for add and update commands. Progress status is reported on the standard error stream by default when it is attached to a terminal, unless -q is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para os comandos `add`, `update`. O status de "
+"progresso 챕 pr챕-definitivamente informado no fluxo de erro quando ele for "
+"anexado a um terminal a menos que a sinaliza챌찾o `-q` for usada. Esta "
+"sinaliza챌찾o imp천em a condi챌찾o geral do progresso mesmo que o fluxo de erro "
+"preestabelecido n찾o seja direcionado para um terminal."
#. type: Plain text
#: en/git-submodule.txt:279
#, priority:220
msgid "This option is only valid for the deinit command. Unregister all submodules in the working tree."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para o comando `deinit`. Cancele o registro de todos "
+"os subm처dulos na 찼rvore de trabalho."
#. type: Labeled list
#: en/git-submodule.txt:280
-#, fuzzy, no-wrap, priority:220
-#| msgid "-b <new_branch>"
+#, no-wrap, priority:220
msgid "-b <branch>"
-msgstr "-b <novo_branch>"
+msgstr "-b <branch>"
#. type: Plain text
#: en/git-submodule.txt:288
@@ -49183,12 +50549,23 @@ msgstr ""
#, priority:220
msgid "This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. When running deinit the submodule working trees will be removed even if they contain local changes. When running update (only effective with the checkout procedure), throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the containing repository matches the commit checked out in the submodule."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para os comandos `add`, `deinit` e `update`. Ao "
+"executar `add`, permita adicionar um caminho ignorado do sub-m처dulo. Ao "
+"executar o `deinit`, as 찼rvores de trabalho do subm처dulo ser찾o removidos "
+"mesmo que contenham altera챌천es locais. Ao executar `update` (efetiva apenas "
+"com o procedimento de checkout), descarte as altera챌천es locais nos "
+"subm처dulos ao alternar para um commit diferente; e sempre execute uma "
+"opera챌찾o de checkout no subm처dulo, mesmo que o commit listado no 챠ndice do "
+"reposit처rio coincida com o commit verificado no subm처dulo."
#. type: Plain text
#: en/git-submodule.txt:306
#, priority:220
msgid "This option is only valid for status and summary commands. These commands typically use the commit found in the submodule HEAD, but with this option, the commit stored in the index is used instead."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para os comandos `status` e `summary`. Esses "
+"comandos normalmente usam o commit encontrado no subm처dulo `HEAD`, por챕m o "
+"commit armazenado no 챠ndice 챕 usado no lugar."
#. type: Labeled list
#: en/git-submodule.txt:307
@@ -49201,6 +50578,9 @@ msgstr "--files"
#, priority:220
msgid "This option is only valid for the summary command. This command compares the commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para o comando `summary`. Quando esta op챌찾o 챕 usada o "
+"comando compara o commit no 챠ndice em conjunto com o que est찼 no subm처dulo "
+"`HEAD`."
#. type: Labeled list
#: en/git-submodule.txt:313
@@ -49213,6 +50593,11 @@ msgstr "--summary-limit"
#, priority:220
msgid "This option is only valid for the summary command. Limit the summary size (number of commits shown in total). Giving 0 will disable the summary; a negative number means unlimited (the default). This limit only applies to modified submodules. The size is always limited to 1 for added/deleted/typechanged submodules."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para o comando `summary`. Limite o tamanho do resumo "
+"(quantidade de commits exibidos no total). Usando 0 desabilita o resumo; um "
+"n첬mero negativo significa ilimitado (j찼 predefinido). Este limite se aplica "
+"apenas aos subm처dulos modificados. O tamanho 챕 sempre limitado a 1 para os "
+"subm처dulos adicionado/exclu챠do/tipo alterado."
#. type: Labeled list
#: en/git-submodule.txt:320
@@ -49225,6 +50610,13 @@ msgstr "--remote"
#, priority:220
msgid "This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para o comando `update`. Em vez de usar o SHA-1 "
+"gravado do superprojeto para atualizar o subm처dulo, use o status do ramo de "
+"rastreamento remoto do subm처dulo. O ramo remoto usado 챕 o ramo "
+"(`branch.<name>.remote`) predefinido para `origin`. O ramo remoto usado "
+"usa a predefini챌찾o `master`, mas o nome da ramifica챌찾o pode ser substitu챠do "
+"ao definir a op챌찾o `submodule.<name>.branch` ou entre `.gitmodules` ou `.git/"
+"config` (onde `.git/config` tem prioridade)."
#. type: Plain text
#: en/git-submodule.txt:335
@@ -49255,6 +50647,8 @@ msgstr "--no-fetch"
#, priority:220
msgid "This option is only valid for the update command. Don't fetch new objects from the remote site."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para o comando `update`. N찾o busca novos objetos no "
+"site remoto."
#. type: Labeled list
#: en/git-submodule.txt:356
@@ -49309,6 +50703,10 @@ msgstr "--name"
#, priority:220
msgid "This option is only valid for the add command. It sets the submodule's name to the given string instead of defaulting to its path. The name must be valid as a directory name and may not end with a '/'."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para o comando `add`. Define o nome do subm처dulo para "
+"a carreira de caracteres determinada em vez de padronizar o seu caminho. O "
+"nome deve ser v찼lido como um nome de diret처rio e n찾o pode terminar com um "
+"'/'."
#. type: Labeled list
#: en/git-submodule.txt:394
@@ -49321,6 +50719,9 @@ msgstr ""
#, priority:220
msgid "This option is only valid for add and update commands. These commands sometimes need to clone a remote repository. In this case, this option will be passed to the linkgit:git-clone[1] command."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para o comando `update`. Estes comandos 횪s vezes "
+"precisam clonar um reposit처rio remoto. Neste caso, esta op챌찾o ser찼 passada "
+"para o comando linkgit:git-clone[1]."
#. type: Plain text
#: en/git-submodule.txt:402
@@ -49354,6 +50755,9 @@ msgstr "--depth"
#, priority:220
msgid "This option is valid for add and update commands. Create a 'shallow' clone with a history truncated to the specified number of revisions. See linkgit:git-clone[1]"
msgstr ""
+"Essa op챌찾o 챕 v찼lida para adicionar e atualizar os comandos. Cria um clone "
+"'raso' com um hist처rico truncado para uma quantidade espec챠fica de "
+"revis천es. Consulte linkgit:git-clone[1]"
#. type: Labeled list
#: en/git-submodule.txt:421
@@ -49372,12 +50776,17 @@ msgstr ""
#, priority:220
msgid "This option is only valid for the update command. Clone new submodules in parallel with as many jobs. Defaults to the `submodule.fetchJobs` option."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para o comando `update`. Clona os novos subm처dulos "
+"em paralelo com tantos outros trabalhos. 횋 a predefini챌찾o da op챌찾o "
+"`submodule.fetchJobs`."
#. type: Plain text
#: en/git-submodule.txt:436
#, priority:220
msgid "This option is only valid for the update command. Clone only one branch during update: HEAD or one specified by --branch."
msgstr ""
+"Esta op챌찾o s처 챕 v찼lida para o comando `update`. Clone apenas um ramo "
+"durante a atualiza챌찾o: HEAD ou um especificado pela op챌찾o `--branch`."
#. type: Plain text
#: en/git-submodule.txt:441
@@ -49387,9 +50796,14 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:449
-#, priority:220
+#, fuzzy, 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]."
#. type: Plain text
#: en/git-submodule.txt:453
@@ -50585,6 +51999,8 @@ msgstr ""
#, priority:100
msgid "They are both passed directly to 'git diff-tree'; see linkgit:git-diff-tree[1] for more information."
msgstr ""
+"Ambos s찾o repassados diretamente para 'git diff-tree'; para mais informa챌천es "
+"consulte linkgit:git-diff-tree[1]."
#. type: Plain text
#: en/git-svn.txt:635
@@ -50668,10 +52084,9 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:681
-#, fuzzy, no-wrap, priority:100
-#| msgid "--preserve-merges"
+#, no-wrap, priority:100
msgid "--preserve-merges (DEPRECATED)"
-msgstr "--preserve-merges"
+msgstr "--preserve-merges (DESCONTINUADO)"
#. type: Plain text
#: en/git-svn.txt:683
@@ -51356,10 +52771,9 @@ msgstr "git-switch(1)"
#. type: Plain text
#: en/git-switch.txt:7
-#, fuzzy, priority:100
-#| msgid "switch branch"
+#, priority:100
msgid "git-switch - Switch branches"
-msgstr "comuta챌찾o de branch"
+msgstr "git-switch - Alterna entre ramos"
#. type: Plain text
#: en/git-switch.txt:15
@@ -51397,10 +52811,9 @@ msgstr ""
#. type: Labeled list
#: en/git-switch.txt:39
-#, fuzzy, no-wrap, priority:100
-#| msgid "<newbranch>"
+#, no-wrap, priority:100
msgid "<new-branch>"
-msgstr "<novobranch>"
+msgstr "<new-branch>"
#. type: Plain text
#: en/git-switch.txt:48
@@ -51410,58 +52823,56 @@ msgstr ""
#. type: Plain text
#: en/git-switch.txt:54
-#, fuzzy, priority:100
-#| msgid "You can use the `\"@{-N}\"` syntax to refer to the N-th last branch/commit checked out using \"git checkout\" operation. You may also specify `-` which is synonymous to `\"@{-1}`."
+#, priority:100
msgid "You can use the `@{-N}` syntax to refer to the N-th last branch/commit switched to using \"git switch\" or \"git checkout\" operation. You may also specify `-` which is synonymous to `@{-1}`. This is often used to switch quickly between two branches, or to undo a branch switch by mistake."
-msgstr "Voc챗 pode usar a sintaxe `\" @{- N}\"` para se referir 횪 첬ltima branch/commit finalizada usando a opera챌찾o \"git checkout\". Voc챗 tamb챕m pode especificar `-` que 챕 sin척nimo de` \"@{- 1}`."
+msgstr ""
+"Voc챗 pode usar a sintaxe `@{-N}` para se referir ao 첬ltimo ramo/commit "
+"alternado usando as opera챌천es \"git switch\" ou \"git checkout\". Voc챗 "
+"tamb챕m pode especificar `-` que 챕 sin척nimo de`@{-1}`. Isso geralmente 챕 "
+"usado para alternar rapidamente entre duas ramifica챌천es ou para desfazer uma "
+"altern창ncia de ramifica챌찾o feita por engano."
#. type: Labeled list
#: en/git-switch.txt:59
-#, fuzzy, no-wrap, priority:100
-#| msgid "-b <new_branch>"
+#, no-wrap, priority:100
msgid "-c <new-branch>"
-msgstr "-b <novo_branch>"
+msgstr "-c <new-branch>"
#. type: Labeled list
#: en/git-switch.txt:60
-#, fuzzy, no-wrap, priority:100
-#| msgid "--orphan <new_branch>"
+#, no-wrap, priority:100
msgid "--create <new-branch>"
-msgstr "--orf찾o <novo_branch>"
+msgstr "--create <new-branch>"
#. type: Plain text
#: en/git-switch.txt:64
-#, fuzzy, priority:100
-#| msgid "Create a new branch named <new_branch> and start it at <start_point>; see linkgit:git-branch[1] for details."
+#, priority:100
msgid "Create a new branch named `<new-branch>` starting at `<start-point>` before switching to the branch. This is a convenient shortcut for:"
-msgstr "Crie uma nova ramifica챌찾o chamada <novo_branch> e inicie-a em <ponto_de_partida>; veja linkgit:git-branch[1] para detalhes."
+msgstr ""
+"Crie um novo ramo chamado `<new-branch>` come챌ando em `<start-point>` antes "
+"de mudar para o ramo. Este 챕 um atalho conveniente para:"
#. type: delimited block -
#: en/git-switch.txt:68
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "$ git branch -f <branch> [<start point>]\n"
-#| "$ git checkout <branch>\n"
+#, no-wrap, priority:100
msgid ""
"$ git branch <new-branch>\n"
"$ git switch <new-branch>\n"
msgstr ""
-"$ git branch -f <branch> [<ponto de partida>]\n"
-"$ git verificar <branch>\n"
+"$ git branch <new-branch>\n"
+"$ git switch <new-branch>\n"
#. type: Labeled list
#: en/git-switch.txt:70
-#, fuzzy, no-wrap, priority:100
-#| msgid "-b <new_branch>"
+#, no-wrap, priority:100
msgid "-C <new-branch>"
-msgstr "-b <novo_branch>"
+msgstr "-C <new-branch>"
#. type: Labeled list
#: en/git-switch.txt:71
-#, fuzzy, no-wrap, priority:100
-#| msgid "--orphan <new_branch>"
+#, no-wrap, priority:100
msgid "--force-create <new-branch>"
-msgstr "--orf찾o <novo_branch>"
+msgstr "--force-create <new-branch>"
#. type: Plain text
#: en/git-switch.txt:75
@@ -51471,16 +52882,13 @@ msgstr ""
#. type: delimited block -
#: en/git-switch.txt:79
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "$ git branch -f <branch> [<start point>]\n"
-#| "$ git checkout <branch>\n"
+#, no-wrap, priority:100
msgid ""
"$ git branch -f <new-branch>\n"
"$ git switch <new-branch>\n"
msgstr ""
-"$ git branch -f <branch> [<ponto de partida>]\n"
-"$ git verificar <branch>\n"
+"$ git branch -f <new-branch>\n"
+"$ git switch <new-branch>\n"
#. type: Plain text
#: en/git-switch.txt:86
@@ -51490,10 +52898,9 @@ msgstr ""
#. type: delimited block -
#: en/git-switch.txt:95
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git checkout -b <branch> --track <remote>/<branch>\n"
+#, no-wrap, priority:100
msgid "$ git switch -c <branch> --track <remote>/<branch>\n"
-msgstr "$ git verificar -b <branch> --rastrear <remoto>/<branch>\n"
+msgstr "$ git switch -c <branch> --track <remote>/<branch>\n"
#. type: Plain text
#: en/git-switch.txt:106
@@ -51521,31 +52928,44 @@ msgstr ""
#. type: Plain text
#: en/git-switch.txt:127
-#, fuzzy, priority:100
-#| msgid "When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
+#, priority:100
msgid "If you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context. However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
-msgstr "Ao alternar ramifica챌천es, se voc챗 tiver modifica챌천es locais em um ou mais arquivos que sejam diferentes entre a ramifica챌찾o atual e a ramifica챌찾o para a qual voc챗 est찼 alternando, o comando se recusar찼 a alternar as ramifica챌천es para preservar suas modifica챌천es no contexto. No entanto, com essa op챌찾o, uma mesclagem de tr챗s vias entre a ramifica챌찾o atual, o conte첬do da 찼rvore de trabalho e a nova ramifica챌찾o 챕 conclu챠da e voc챗 estar찼 na nova ramifica챌찾o."
+msgstr ""
+"Caso tenha modifica챌천es locais em um ou mais arquivos que sejam diferentes "
+"entre a ramifica챌찾o atual e a ramifica챌찾o para a qual voc챗 est찼 alternando, "
+"o comando se recusar찼 a alternar as ramifica챌천es para preservar suas "
+"modifica챌천es no contexto. No entanto, com essa op챌찾o, uma mesclagem de tr챗s "
+"vias entre a ramifica챌찾o atual, o conte첬do da 찼rvore de trabalho e a nova "
+"ramifica챌찾o 챕 conclu챠da e voc챗 estar찼 na nova ramifica챌찾o."
#. type: Plain text
#: en/git-switch.txt:156
-#, fuzzy, priority:100
-#| msgid "When creating a new branch, set up \"upstream\" configuration. See \"--track\" in linkgit:git-branch[1] for details."
+#, priority:100
msgid "When creating a new branch, set up \"upstream\" configuration. `-c` is implied. See `--track` in linkgit:git-branch[1] for details."
-msgstr "Ao criar um novo branch, configure \"upstream\". Veja \"--track\" em linkgit:git-branch[1] para detalhes."
+msgstr ""
+"Ao criar uma nova ramifica챌찾o, defina a configura챌찾o \"upstream\". 횋 "
+"obrigat처rio o uso do `-c`. Para mais detalhes consulte `--track` em linkgit"
+":git-branch[1]."
#. type: Plain text
#: en/git-switch.txt:166
-#, fuzzy, priority:100
-#| msgid "If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use \"hack\" as the local branch when branching off of \"origin/hack\" (or \"remotes/origin/hack\", or even \"refs/remotes/origin/hack\"). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-b` in such a case."
+#, priority:100
msgid "If no `-c` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\". This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-c` in such a case."
-msgstr "Se nenhuma op챌찾o `-b` for fornecida, o nome da nova ramifica챌찾o ser찼 derivado da ramifica챌찾o de controle remoto, observando a parte local da refspec configurada para o controle remoto correspondente e, em seguida, removendo a parte inicial para o \"*\". Isso nos diria para usar \"hack\" como a ramifica챌찾o local ao se ramificar de \"origin/hack\" (ou \"remotos/origem/ hack\", ou mesmo \"refs/remotos/ origem/ hack\"). Se o nome dado n찾o tiver barra, ou se a suposi챌찾o acima resultar em um nome vazio, a adivinha챌찾o ser찼 abortada. Voc챗 pode dar explicitamente um nome com `-b` em tal caso."
+msgstr ""
+"Caso nenhuma op챌찾o `-c` seja fornecida, o nome da nova ramifica챌찾o ser찼 "
+"derivado da ramifica챌찾o remota, observando a parte local da \"refspec\" "
+"configurada para a ramifica챌찾o remota correspondente e removendo a parte "
+"inicial para o \"*\" em seguida. Isso nos diria para usar `hack` como um "
+"ramo local ao se ramificar do `origin/hack` (ou `remotes/origin/hack` ou "
+"mesmo `refs/remotes/origin/hack`). Caso o nome informado n찾o tenha barra ou "
+"se a dedu챌찾o acima resultar em um nome vazio a dedu챌찾o ser찼 abortada. Neste "
+"caso voc챗 pode dar o nome diretamente com `-c`."
#. type: Labeled list
#: en/git-switch.txt:171
-#, fuzzy, no-wrap, priority:100
-#| msgid "--orphan <new_branch>"
+#, no-wrap, priority:100
msgid "--orphan <new-branch>"
-msgstr "--orf찾o <novo_branch>"
+msgstr "--orphan <new-branch>"
#. type: Plain text
#: en/git-switch.txt:174
@@ -51555,17 +52975,24 @@ msgstr ""
#. type: Plain text
#: en/git-switch.txt:180
-#, fuzzy, priority:100
-#| msgid "`git checkout` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
+#, priority:100
msgid "`git switch` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
-msgstr "`git checkout` recusa-se quando a refer챗ncia desejada j찼 foi verificada por outra worktree. Esta op챌찾o faz com que verifique o ref fora de qualquer maneira. Em outras palavras, o ref pode ser mantido por mais de uma 찼rvore de trabalho."
+msgstr ""
+"O `git checkout` recusa quando j찼 foi feito o checkout do \"ref\" desejado "
+"por outra 찼rvore de trabalho. Esta op챌찾o faz com que seja feita a "
+"verifica챌찾o no \"ref\" de qualquer maneira. Significa que a refer챗ncia pode "
+"ser mantida em mais de uma 찼rvore de trabalho."
#. type: Plain text
#: en/git-switch.txt:189
-#, fuzzy, priority:100
-#| msgid "Using --recurse-submodules will update the content of all initialized submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or --no-recurse-submodules) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach the submodules HEAD."
+#, priority:100
msgid "Using `--recurse-submodules` will update the content of all initialized submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is used, the work trees of submodules will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules."
-msgstr "Usando --recurso-subm처dulos ir찼 atualizar o conte첬do de todos os subm처dulos inicializados de acordo com o commit registrado no superprojeto. Se modifica챌천es locais em um subm처dulo forem sobrescritas, o check-out falhar찼, a menos que `-f` seja usado. Se nada (ou --n찾o-recurso-subm처dulos) for usado, as 찼rvores de trabalho dos subm처dulos n찾o ser찾o atualizadas. Assim como o linkgit:git-submodule[1], isso desanexar찼 os subm처dulos HEAD."
+msgstr ""
+"O uso de `--recurse-submodules` atualizar찼 o conte첬do de todos os subm처dulos "
+"inicializados de acordo com o commit registrado no superprojeto. Se nada (ou "
+"`--no-recurse-submodules`) for usado, as 찼rvores de trabalho dos subm처dulos "
+"n찾o ser찾o atualizadas. Assim como em linkgit:git-submodule[1], isso faz com "
+"que `HEAD` seja desanexado do subm처dulo."
#. type: Plain text
#: en/git-switch.txt:194
@@ -51575,49 +53002,43 @@ msgstr ""
#. type: delimited block -
#: en/git-switch.txt:197
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git checkout master\n"
+#, no-wrap, priority:100
msgid "$ git switch master\n"
-msgstr "$ git verificar master\n"
+msgstr "$ git switch master\n"
#. type: delimited block -
#: en/git-switch.txt:204
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git checkout mytopic\n"
+#, no-wrap, priority:100
msgid "$ git switch mytopic\n"
-msgstr "$ git checkout meu t처pico\n"
+msgstr "$ git switch mytopic\n"
#. type: Plain text
#: en/git-switch.txt:209
-#, fuzzy, priority:100
-#| msgid "However, your \"wrong\" branch and correct \"mytopic\" branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
+#, priority:100
msgid "However, your \"wrong\" branch and correct \"mytopic\" branch may differ in files that you have modified locally, in which case the above switch would fail like this:"
-msgstr "No entanto, sua ramifica챌찾o \"errada\" e a ramifica챌찾o \"meu t처pico\" correta podem diferir nos arquivos que voc챗 modificou localmente. Nesse caso, a verifica챌찾o acima falharia assim:"
+msgstr ""
+"No entanto, o seu ramo \"errado\" e o correto \"mytopic\" podem diferir nos "
+"arquivos modificados localmente por voc챗. A mudan챌a entre os ramos acima "
+"falhar찼 assim:"
#. type: delimited block -
#: en/git-switch.txt:213
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "$ git checkout mytopic\n"
-#| "error: You have local changes to 'frotz'; not switching branches.\n"
+#, no-wrap, priority:100
msgid ""
"$ git switch mytopic\n"
"error: You have local changes to 'frotz'; not switching branches.\n"
msgstr ""
-"$ git verificar meu t처pico\n"
-"erro: voc챗 tem altera챌천es locais em 'frotz'; n찾o comuta챌찾o de branches.\n"
+"$ git switch mytopic\n"
+"erro: voc챗 tem altera챌천es locais em 'frotz'; n찾o mudar de ramo.\n"
#. type: delimited block -
#: en/git-switch.txt:221
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "$ git checkout -m mytopic\n"
-#| "Auto-merging frotz\n"
+#, no-wrap, priority:100
msgid ""
"$ git switch -m mytopic\n"
"Auto-merging frotz\n"
msgstr ""
-"$ git verificar -m meu t처pico\n"
+"$ git switch -m mytopic\n"
"Auto-merging frotz\n"
#. type: Plain text
@@ -51628,10 +53049,9 @@ msgstr ""
#. type: delimited block -
#: en/git-switch.txt:232
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git bisect bad\n"
+#, no-wrap, priority:100
msgid "$ git switch -\n"
-msgstr "$ git bisect mau\n"
+msgstr "$ git switch -\n"
#. type: Plain text
#: en/git-switch.txt:236
@@ -51649,10 +53069,10 @@ msgstr ""
#. type: Plain text
#: en/git-switch.txt:244
-#, fuzzy, priority:100
-#| msgid "Do not attempt to create a branch if a remote tracking branch of the same name exists."
+#, priority:100
msgid "If you want to start a new branch from a remote branch of the same name:"
-msgstr "N찾o tente criar uma ramifica챌찾o se existir uma ramifica챌찾o de rastreamento remoto com o mesmo nome."
+msgstr ""
+"Caso queira criar uma nova ramifica챌찾o a partir do ramo remoto de mesmo nome:"
#. type: delimited block -
#: en/git-switch.txt:249
@@ -51807,6 +53227,8 @@ msgstr ""
#, priority:240
msgid "Add a tag reference in `refs/tags/`, unless `-d/-l/-v` is given to delete, list or verify tags."
msgstr ""
+"Adicione uma tag de refer챗ncia em `refs/tags/`, a menos que `-d/-l/-v` seja "
+"fornecida para excluir, listar ou verificar as tags."
#. type: Plain text
#: en/git-tag.txt:28
@@ -51867,6 +53289,10 @@ msgstr "--sign"
#, priority:240
msgid "Make a GPG-signed tag, using the default e-mail address's key. The default behavior of tag GPG-signing is controlled by `tag.gpgSign` configuration variable if it exists, or disabled otherwise. See linkgit:git-config[1]."
msgstr ""
+"Fa챌a uma etiqueta assinada por GPG usando a chave predefinida do endere챌o de "
+"e-mail. O comportamento predefinido da assinatura da tag GPG 챕 controlado "
+"pela vari찼vel de configura챌찾o `tag.gpgSign`, se existir, caso contr찼rio 챕 "
+"desativada. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/git-tag.txt:71
@@ -51939,24 +53365,42 @@ msgstr ""
#, ignore-ellipsis, priority:240
msgid "List tags. With optional `<pattern>...`, e.g. `git tag --list 'v-*'`, list only the tags that match the pattern(s)."
msgstr ""
+"Listar as tags. Com `<pattern>...`, exemplo, `git tag --list 'v-*'` "
+"opcionais, liste apenas as tags que coincidam ao(s) padr천es."
#. type: Plain text
#: en/git-tag.txt:107
#, priority:240
msgid "Running \"git tag\" without arguments also lists all tags. The pattern is a shell wildcard (i.e., matched using fnmatch(3)). Multiple patterns may be given; if any of them matches, the tag is shown."
msgstr ""
+"Executar `tag git` sem argumentos tamb챕m lista todas as tags. O padr찾o 챕 um "
+"curinga do shell (exemplo, quando coincidir ao usar fnmatch(3)). Padr천es "
+"m첬ltiplos podem ser fornecidos; caso haja coincid챗ncia entre alguns deles, a "
+"tag ser찼 exibida."
#. type: Plain text
#: en/git-tag.txt:111
#, priority:240
msgid "This option is implicitly supplied if any other list-like option such as `--contains` is provided. See the documentation for each of those options for details."
msgstr ""
+"Esta op챌찾o 챕 fornecida implicitamente caso qualquer outra lista como a op챌찾o "
+"`--contains` seja fornecida. Para mais detalhes consulte a documenta챌찾o de "
+"cada uma dessas op챌천es."
#. type: Plain text
#: en/git-tag.txt:124
#, priority:240
msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. Also supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `tag.sort` variable if it exists, or lexicographic order otherwise. See linkgit:git-config[1]."
msgstr ""
+"Classifique com base na chave fornecida. O prefixo `-` 챕 usado para "
+"classificar em ordem de valor decrescente. Voc챗 pode usar a op챌찾o "
+"`--sort=<key>` mais de uma vez; nesse caso, a 첬ltima chave se torna a chave "
+"prim찼ria. Tamb챕m 챕 compat챠vel com `vers찾o:refname` ou `v:refname` (nomes das "
+"tags s찾o tratados como vers천es). A ordem de classifica챌찾o `vers찾o:refname` "
+"tamb챕m pode ser afetada pela vari찼vel de configura챌찾o `versionsort.sufix`. "
+"As chaves suportadas s찾o as mesmas do `git for-each-ref`. A classifica챌찾o "
+"da ordem 챕 predefinida pelo valor configurado pela vari찼vel `tag.sort` caso "
+"exista ou ent찾o pela ordem lexicogr찼fica. Consulte linkgit:git-config[1]."
#. type: Plain text
#: en/git-tag.txt:133
@@ -52085,6 +53529,9 @@ msgstr ""
#, priority:240
msgid "`pager.tag` is only respected when listing tags, i.e., when `-l` is used or implied. The default is to use a pager. See linkgit:git-config[1]."
msgstr ""
+"A vari찼vel 'pager.tag' s처 챕 respeitado quando tags de listagem como `-l` for "
+"usada ou subentendido. A predefini챌찾o 챕 usar um pager. Consulte linkgit:git-"
+"config[1]."
#. type: Title ~
#: en/git-tag.txt:234
@@ -52337,6 +53784,9 @@ msgstr ""
#, priority:100
msgid "See linkgit:gittutorial[7] to get started, then see linkgit:giteveryday[7] for a useful minimum set of commands. The link:user-manual.html[Git User's Manual] has a more in-depth introduction."
msgstr ""
+"Consulte linkgit:gittutorial[7] e depois linkgit:giteveryday[7] para "
+"conhecer o m챠nimo de comandos uteis. O link:user-manual.html[Manual do "
+"Usu찼rio Git] tem uma introdu챌찾o bem mais aprofundada."
#. type: Plain text
#: en/git.txt:34
@@ -52367,6 +53817,9 @@ msgstr ""
#, ignore-ellipsis, priority:100
msgid "Other options are available to control how the manual page is displayed. See linkgit:git-help[1] for more information, because `git --help ...` is converted internally into `git help ...`."
msgstr ""
+"Para controlar como a p찼gina manual 챕 exibida, outras op챌천es est찾o "
+"dispon챠veis. Para mais informa챌천es consulte linkgit:git-help[1] pois o "
+"comando `git --help ...` 챕 convertido internamente para `git help ...`."
#. type: Labeled list
#: en/git.txt:56
@@ -52531,6 +53984,9 @@ msgstr ""
#, priority:100
msgid "Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable."
msgstr ""
+"Define o espa챌o de nome no Git. Para mais detalhes consulte "
+"linkgit:gitnamespaces[7]. 횋 o mesmo que configurar a vari찼vel de ambiente "
+"`GIT_NAMESPACE`."
#. type: Labeled list
#: en/git.txt:144
@@ -52561,6 +54017,8 @@ msgstr "--no-replace-objects"
#, priority:100
msgid "Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information."
msgstr ""
+"N찾o utilize substitui챌천es \"ref\" para substituir os objetos Git. Para mais "
+"informa챌천es consulte linkgit:git-replace[1]."
#. type: Labeled list
#: en/git.txt:158
@@ -52832,6 +54290,9 @@ msgstr ""
#, priority:100
msgid "Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a list and more details about the configuration mechanism."
msgstr ""
+"V찼rios comandos s찾o lidos no arquivo de configura챌찾o e ajustam a sua "
+"opera챌찾o de acordo. Para obter uma lista e mais detalhes sobre o mecanismo "
+"de configura챌찾o, consulte linkgit:git-config[1]."
#. type: Title -
#: en/git.txt:338
@@ -52975,7 +54436,7 @@ msgstr ""
#: en/git.txt:405
#, priority:100
msgid "Please see linkgit:gitglossary[7]."
-msgstr ""
+msgstr "Favor consultar linkgit:gitglossary[7]."
#. type: Plain text
#: en/git.txt:410
@@ -53018,6 +54479,10 @@ msgstr "`GIT_INDEX_VERSION`"
#, priority:100
msgid "This environment variable allows the specification of an index version for new repositories. It won't affect existing index files. By default index file version 2 or 3 is used. See linkgit:git-update-index[1] for more information."
msgstr ""
+"Essa vari찼vel de ambiente permite a especifica챌찾o de uma vers찾o de 챠ndice "
+"para os novos reposit처rios. N찾o afetar찼 os arquivos de 챠ndice existentes. "
+"Por predefini챌찾o, a vers찾o 2 ou 3 do arquivo de 챠ndice 챕 usado. Para mais "
+"informa챌천es consulte linkgit:git-update-index[1]."
#. type: Labeled list
#: en/git.txt:428
@@ -53084,6 +54549,9 @@ msgstr "`GIT_NAMESPACE`"
#, priority:100
msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--namespace` command-line option also sets this value."
msgstr ""
+"Define o espa챌o de nome no Git; para mais detalhes consulte "
+"linkgit:gitnamespaces[7]. A op챌찾o da linha de comando `--namespace` tamb챕m "
+"define este valor."
#. type: Labeled list
#: en/git.txt:462
@@ -53120,6 +54588,13 @@ msgstr "`GIT_COMMON_DIR`"
#, ignore-ellipsis, priority:100
msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
msgstr ""
+"Se essa vari찼vel estiver definida para um caminho, os arquivos que n찾o s찾o "
+"da 찼rvore de trabalho, est찾o normalmente est찾o em $ GIT_DIR e ser찾o obtidos "
+"desse caminho. Os arquivos espec챠ficos da 찼rvore de trabalho, como `HEAD` ou "
+"챠ndice ser찾o obtidos de $GIT_DIR. Para mais detalhes consulte linkgit"
+":gitrepository-layout[5] e linkgit:git-worktree[1]. Essa vari찼vel tem "
+"preced챗ncia mais baixa do que outras vari찼veis de caminho como "
+"`GIT_INDEX_FILE`, `GIT_OBJECT_DIRECTORY`..."
#. type: Title ~
#: en/git.txt:497
@@ -53162,6 +54637,9 @@ msgstr "`GIT_AUTHOR_DATE`"
#, priority:100
msgid "The date used for the author identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+"A data usada para a identidade do autor ao criar objetos commit ou tags ou "
+"quando escrever \"reflogs\". Para formatos v찼lidos consulte linkgit:git-"
+"commit[1]."
#. type: Labeled list
#: en/git.txt:512
@@ -53198,6 +54676,9 @@ msgstr "`GIT_COMMITTER_DATE`"
#, priority:100
msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
msgstr ""
+"A data usada para a identidade do autor ao criar objetos commit ou tags ou "
+"quando escrever \"reflogs\". Para formatos v찼lidos consulte linkgit:git-"
+"commit[1]."
#. type: Labeled list
#: en/git.txt:526
@@ -53348,6 +54829,9 @@ msgstr "`GIT_MERGE_VERBOSITY`"
#, priority:100
msgid "A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See linkgit:git-merge[1]"
msgstr ""
+"Um n첬mero que controla a quantidade de sa챠da mostrada pela estrat챕gia de "
+"mesclagem recursiva. Substitui `merge.verbosity`. Consulte linkgit:git-"
+"merge[1]"
#. type: Labeled list
#: en/git.txt:578
@@ -53651,6 +55135,13 @@ msgstr ""
#, priority:100
msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it. If the path already exists and is a directory, the trace messages will be written to files (one per process) in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
msgstr ""
+"Alternativamente, caso a vari찼vel esteja definida como um caminho absoluto ("
+"come챌ando com um caractere '/'), Git interpretar찼 isso como um caminho de "
+"arquivo e tentar찼 anexar as mensagens de rastreamento a ela. Caso o caminho "
+"j찼 exista e for um diret처rio, as mensagens de rastreamento ser찾o gravadas em "
+"arquivos (uma por processo) nesse diret처rio, nomeada de acordo com o 첬ltimo "
+"componente do SID e um contador opcional (para evitar colis천es de nome de "
+"arquivo)."
#. type: Plain text
#: en/git.txt:753
@@ -53792,9 +55283,13 @@ msgstr "`GIT_PROTOCOL_FROM_USER`"
#. type: Plain text
#: en/git.txt:837
-#, priority:100
+#, fuzzy, 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]."
#. type: Labeled list
#: en/git.txt:838
@@ -53945,6 +55440,8 @@ msgstr ""
#, priority:100
msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
msgstr ""
+"Para obter uma vis찾o geral das recomenda챌천es do fluxo de trabalho, consulte "
+"linkgit:gitworkflows[7]."
#. type: Plain text
#: en/git.txt:947
@@ -54074,6 +55571,8 @@ msgstr ""
#, priority:100
msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
msgstr ""
+"Para as op챌천es de gera챌찾o de novos pacotes e substitui챌찾o dos existentes, "
+"consulte linkgit:git-repack[1]."
#. type: Plain text
#: en/git-unpack-objects.txt:32
@@ -54446,6 +55945,11 @@ msgstr ""
#, priority:100
msgid "These options take effect whatever the value of the `core.splitIndex` configuration variable (see linkgit:git-config[1]). But a warning is emitted when the change goes against the configured value, as the configured value will take effect next time the index is read and this will remove the intended effect of the option."
msgstr ""
+"Estas op챌천es entram em vigor independente de qualquer configura챌찾o de "
+"vari찼vel existente no`core.splitIndex` (consulte linkgit:git-config[1]). "
+"Por챕m um aviso 챕 emitido quando a altera챌찾o vai contra o valor configurado "
+"pois o valor configurado apenas entrar찼 em vigor na pr처xima vez que o 챠ndice "
+"for lido e removendo o efeito pretendido da op챌찾o."
#. type: Labeled list
#: en/git-update-index.txt:191
@@ -54470,6 +55974,11 @@ msgstr ""
#, priority:100
msgid "These options take effect whatever the value of the `core.untrackedCache` configuration variable (see linkgit:git-config[1]). But a warning is emitted when the change goes against the configured value, as the configured value will take effect next time the index is read and this will remove the intended effect of the option."
msgstr ""
+"Estas op챌천es entram em vigor independente de qualquer configura챌찾o de "
+"vari찼vel existente no`core.untrackedCache` (consulte linkgit:git-config[1]). "
+"Por챕m um aviso 챕 emitido quando a altera챌찾o vai contra o valor configurado "
+"pois o valor configurado apenas entrar찼 em vigor na pr처xima vez que o 챠ndice "
+"for lido e removendo o efeito pretendido da op챌찾o."
#. type: Labeled list
#: en/git-update-index.txt:202
@@ -54512,6 +56021,12 @@ msgstr "--no-fsmonitor"
#, priority:100
msgid "Enable or disable files system monitor feature. These options take effect whatever the value of the `core.fsmonitor` configuration variable (see linkgit:git-config[1]). But a warning is emitted when the change goes against the configured value, as the configured value will take effect next time the index is read and this will remove the intended effect of the option."
msgstr ""
+"Ativar ou desativar o recurso de monitoramento do sistema de arquivos. Estas "
+"op챌천es entram em vigor independente de qualquer configura챌찾o da vari찼vel "
+"existente no`core.fsmonitor` (consulte linkgit:git-config[1]). Por챕m um "
+"aviso 챕 emitido quando a altera챌찾o vai contra o valor configurado pois o "
+"valor configurado apenas entrar찼 em vigor na pr처xima vez que o 챠ndice for "
+"lido e removendo o efeito pretendido da op챌찾o."
#. type: Plain text
#: en/git-update-index.txt:236
@@ -54686,9 +56201,13 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:344
-#, priority:100
+#, fuzzy, 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."
#. type: Plain text
#: en/git-update-index.txt:354
@@ -54955,12 +56474,27 @@ msgid ""
"executable bit. On such an unfortunate filesystem, you may\n"
"need to use 'git update-index --chmod='.\n"
msgstr ""
+"O comando honra a vari찼vel de configura챌찾o `core.filemode`. Caso\n"
+"o seu reposit처rio esteja em um sistema de arquivos cujos bits execut찼veis\n"
+"n찾o sejam confi찼veis, isso deve ser definido como 'false' (consulte linkgit"
+":git-config[1]).\n"
+"Isso faz com que o comando ignore as diferen챌as nos modos dos arquivos "
+"registrados\n"
+"no 챠ndice e no modo do arquivo no sistema de arquivos caso eles se diferem "
+"apenas no\n"
+"bit execut찼vel. Em um sistema de arquivos t찾o infeliz, voc챗\n"
+"precisa usar 'git update-index --chmod='.\n"
#. type: Plain text
#: en/git-update-index.txt:539
#, priority:100
msgid "Quite similarly, if `core.symlinks` configuration variable is set to 'false' (see linkgit:git-config[1]), symbolic links are checked out as plain files, and this command does not modify a recorded file mode from symbolic link to regular file."
msgstr ""
+"De maneira semelhante, caso a vari찼vel de configura챌찾o `core.symlinks` "
+"esteja definida como 'false' (consulte linkgit:git-config[1]) os links "
+"simb처licos ser찾o verificados como arquivos simples e esse comando n찾o "
+"modificar찼 o modo de grava챌찾o do arquivo vindo de link simb처lico para um "
+"arquivo regular."
#. type: Plain text
#: en/git-update-index.txt:542
@@ -54973,12 +56507,19 @@ msgstr ""
#, priority:100
msgid "The command also looks at `core.trustctime` configuration variable. It can be useful when the inode change time is regularly modified by something outside Git (file system crawlers and backup systems use ctime for marking files processed) (see linkgit:git-config[1])."
msgstr ""
+"Este comando tamb챕m olha a configura챌찾o de vari찼vel em `core.trustctime`. "
+"Pode ser 첬til quando o tempo de mudan챌a do \"inode\" 챕 modificado "
+"regularmente por algo fora do Git (os rastreadores do sistema de arquivos e "
+"os sistemas de backup usam o \"ctime\" para marcar os arquivos processados) ("
+"consulte linkgit:git-config[1])."
#. type: Plain text
#: en/git-update-index.txt:551
#, priority:100
msgid "The untracked cache extension can be enabled by the `core.untrackedCache` configuration variable (see linkgit:git-config[1])."
msgstr ""
+"A extens찾o do cache n찾o rastreado pode ser ativado atrav챕s da configura챌찾o "
+"de vari찼vel `core.untrackedCache` (consulte linkgit:git-config[1])."
#. type: Plain text
#: en/git-update-index.txt:561
@@ -55256,10 +56797,9 @@ msgstr ""
#. type: Plain text
#: en/git-update-server-info.txt:13
-#, fuzzy, no-wrap, priority:100
-#| msgid "git-update-server-info(1)"
+#, no-wrap, priority:100
msgid "'git update-server-info'\n"
-msgstr "git-update-server-info(1)"
+msgstr "'git update-server-info'\n"
#. type: Plain text
#: en/git-update-server-info.txt:21
@@ -55272,6 +56812,8 @@ msgstr ""
#, priority:100
msgid "Currently the command updates the following files. Please see linkgit:gitrepository-layout[5] for description of what they are for:"
msgstr ""
+"Atualmente, o comando atualiza os seguintes arquivos. Para obter um "
+"descritivo da sua utilidade, favor consultar linkgit:gitrepository-layout[5]:"
#. type: Plain text
#: en/git-update-server-info.txt:30
@@ -56360,55 +57902,85 @@ msgstr ""
#: en/git-worktree.txt:208
#, no-wrap, priority:240
msgid "REFS"
-msgstr ""
+msgstr "REFS"
#. type: Plain text
#: en/git-worktree.txt:213
#, priority:240
msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
msgstr ""
+"Em v찼rias 찼rvores de trabalho diferentes, alguns \"refs\" podem ser "
+"compartilhados entre todas as 찼rvores de trabalho, j찼 outros \"refs\" s찾o "
+"locais. Um exemplo 챕 o `HEAD` que 챕 첬nico para cada a 찼rvores de trabalho. "
+"Esta se챌찾o 챕 sobre as regras de compartilhamento e como acessar tais \"refs\""
+" de uma 찼rvore de trabalho para outra."
#. type: Plain text
#: en/git-worktree.txt:219
#, priority:240
msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
msgstr ""
+"Em geral, cada 찼rvore de trabalho possu챠 um \"pseudo ref\" pr처prio e todos "
+"os \"refs\" iniciados com `refs/` podem ser compartilhados. Os pseudo-refs "
+"s찾o aqueles como `HEAD` que est찾o diretamente sob `GIT_DIR` ao inv챕s de "
+"estarem dentro de `GIT_DIR/refs`. H찼 apenas uma exce챌찾o para esta regra: os "
+"refs n찾o ser찾o compartilhados quando estiverem dentro de `refs/bisect` e `"
+"refs/worktree`."
#. type: Plain text
#: en/git-worktree.txt:224
#, priority:240
msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
msgstr ""
+"Os \"refs\" individuais de cada 찼rvore de trabalho ainda podem ser acessados "
+"de outra 찼rvore de trabalho atrav챕s de dois caminhos especiais, `main-"
+"worktree` e `worktrees`. O primeiro fornece acesso ao `ref` por 찼rvore de "
+"trabalho atrav챕s da 찼rvore de trabalho principal, enquanto a 첬ltima a todas "
+"as 찼rvores de trabalho vinculadas 횪 ela."
#. type: Plain text
#: en/git-worktree.txt:231
#, priority:240
msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
msgstr ""
+"Por exemplo, `main-worktree/HEAD` ou `main-worktree/refs/bisect/good` "
+"resolve para o mesmo valor que o `HEAD` das principais 찼rvores assim como `"
+"refs/bisect/good` respectivamente. Da mesma forma, `worktrees/foo/HEAD` e `"
+"worktrees/bar/refs/bisect/bad` s찾o as mesmas que `GIT_COMMON_DIR/worktrees/"
+"foo/HEAD` and `GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`."
#. type: Plain text
#: en/git-worktree.txt:235
#, priority:240
msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
msgstr ""
+"Para acessar as `refs` 챕 melhor n찾o olhar diretamente para dentro do "
+"`GIT_DIR`. Em vez disso, use comandos como linkgit:git-rev-parse[1] ou "
+"linkgit:git-update-ref[1] que manipular찾o as \"refs\" corretamente."
#. type: Plain text
#: en/git-worktree.txt:242
#, priority:240
msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
msgstr ""
+"횋 predefinido que o arquivo \"config\" do reposit처rio seja compartilhado "
+"entre todas as 찼rvores de trabalho. Caso as vari찼veis de configura챌찾o "
+"`core.bare` ou` core.worktree` estejam presentes no arquivo de configura챌찾o "
+"elas ser찾o aplicadas apenas 횪s principais 찼rvores de trabalho."
#. type: Plain text
#: en/git-worktree.txt:245
#, priority:240
msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
msgstr ""
+"Voc챗 pode ativar a extens찾o `worktreeConfig` para ter uma configura챌찾o "
+"espec챠fica para as 찼rvores de trabalho, por exemplo:"
#. type: delimited block -
#: en/git-worktree.txt:248
#, no-wrap, priority:240
msgid "$ git config extensions.worktreeConfig true\n"
-msgstr ""
+msgstr "$ git config extensions.worktreeConfig true\n"
#. type: Plain text
#: en/git-worktree.txt:254
@@ -56463,6 +58035,11 @@ msgstr ""
#, priority:240
msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
msgstr ""
+"Para mais informa챌천es consulte linkgit:gitrepository-layout[5]. A regra "
+"geral 챕 n찾o fazer qualquer suposi챌찾o sobre se um caminho pertence ao "
+"`$GIT_DIR` ou ao `$GIT_COMMON_DIR` quando voc챗 precisar acessar diretamente "
+"algo dentro do `$GIT_DIR`. Para obter o caminho final use o comando `git rev-"
+"parse --git-path`."
#. type: Plain text
#: en/git-worktree.txt:304
@@ -56472,9 +58049,17 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:315
-#, priority:240
+#, fuzzy, 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]."
#. type: Plain text
#: en/git-worktree.txt:318
@@ -56641,10 +58226,11 @@ msgstr ""
#. type: Plain text
#: en/gitglossary.txt:24
-#, fuzzy, priority:100
-#| msgid "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
+#, priority:100
msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
-msgstr "linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-merge[1], linkgit:git-commit-tree[1]"
+msgstr ""
+"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7]"
+", linkgit:giteveryday[7], link:user-manual.html[The Git User's Manual]"
#. type: Labeled list
#: en/glossary-content.txt:1
@@ -56975,6 +58561,10 @@ msgstr ""
#, priority:100
msgid "Note that the grafts mechanism is outdated and can lead to problems transferring objects between repositories; see linkgit:git-replace[1] for a more flexible and robust system to do the same thing."
msgstr ""
+"Observe que o mecanismo de enxertos est찼 desatualizado e pode levar a "
+"problemas na transfer챗ncia dos objetos entre os reposit처rios; para fazer a "
+"mesma coisa consulte linkgit:git-replace[1] para um sistema mais flex챠vel e "
+"robusto."
#. type: Labeled list
#: en/glossary-content.txt:184
@@ -56996,9 +58586,13 @@ msgstr ""
#. type: Plain text
#: en/glossary-content.txt:192
-#, priority:100
+#, fuzzy, 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].)"
#. type: Labeled list
#: en/glossary-content.txt:193
@@ -57272,10 +58866,9 @@ msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:355
-#, fuzzy, no-wrap, priority:100
-#| msgid "--stop"
+#, no-wrap, priority:100
msgid "top"
-msgstr "--stop"
+msgstr "topo"
#. type: Plain text
#: en/glossary-content.txt:359
@@ -57285,10 +58878,9 @@ msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:360
-#, fuzzy, no-wrap, priority:100
-#| msgid "--literally"
+#, no-wrap, priority:100
msgid "literal"
-msgstr "--literally"
+msgstr "literal"
#. type: Plain text
#: en/glossary-content.txt:363
@@ -57310,10 +58902,9 @@ msgstr ""
#. type: Labeled list
#: en/glossary-content.txt:367
-#, fuzzy, no-wrap, priority:100
-#| msgid "--global"
+#, no-wrap, priority:100
msgid "glob"
-msgstr "--global"
+msgstr "glob"
#. type: Plain text
#: en/glossary-content.txt:374
@@ -57365,515 +58956,685 @@ msgstr ""
#. type: Plain text
#: en/glossary-content.txt:402
-#, priority:100
+#, fuzzy, 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]."
#. type: Plain text
#: en/glossary-content.txt:405
#, priority:100
msgid "Each of the attribute requirements for the path takes one of these forms:"
msgstr ""
+"Cada um dos requisitos de atributo para o caminho assume uma destas formas:"
#. type: Plain text
#: en/glossary-content.txt:407
#, priority:100
msgid "\"`ATTR`\" requires that the attribute `ATTR` be set."
-msgstr ""
+msgstr "\"`ATTR`\" requer que o atributo `ATTR` seja definido."
#. type: Plain text
#: en/glossary-content.txt:409
#, priority:100
msgid "\"`-ATTR`\" requires that the attribute `ATTR` be unset."
-msgstr ""
+msgstr "\"`ATTR`\" requer que o atributo `ATTR` n찾o seja definido."
#. type: Plain text
#: en/glossary-content.txt:412
#, priority:100
msgid "\"`ATTR=VALUE`\" requires that the attribute `ATTR` be set to the string `VALUE`."
msgstr ""
+"\"`ATTR=VALUE`\" requer que o atributo `ATTR` seja definido como a string "
+"`VALUE`."
#. type: Plain text
#: en/glossary-content.txt:415
#, priority:100
msgid "\"`!ATTR`\" requires that the attribute `ATTR` be unspecified."
-msgstr ""
+msgstr "\"`!ATTR`\" requer que o atributo `ATTR` n찾o seja especificado."
#. type: Plain text
#: en/glossary-content.txt:418
#, priority:100
msgid "Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object."
msgstr ""
+"Observe que durante a coincid챗ncia com um objeto da 찼rvore, os atributos "
+"ainda ser찾o obtidos da mesma e n찾o do objeto da 찼rvore especificado."
#. type: Labeled list
#: en/glossary-content.txt:419
-#, fuzzy, no-wrap, priority:100
-#| msgid "Includes"
+#, no-wrap, priority:100
msgid "exclude"
-msgstr "Inclui"
+msgstr "exclui"
#. type: Plain text
#: en/glossary-content.txt:425
#, priority:100
msgid "After a path matches any non-exclude pathspec, it will be run through all exclude pathspecs (magic signature: `!` or its synonym `^`). If it matches, the path is ignored. When there is no non-exclude pathspec, the exclusion is applied to the result set as if invoked without any pathspec."
msgstr ""
+"Depois que um caminho coincida com qualquer `pathspec` que n찾o foi exclu챠do "
+"ele ser찼 executado em todos os `pathspecs` que foram exclu챠dos (assinatura "
+"m찼gica: `!` or its synonym `^`). Caso coincida, o caminho 챕 ignorado. "
+"Quando n찾o h찼 um `pathspec` n찾o exclu챠do a exclus찾o 챕 aplicada ao conjunto "
+"de resultados como se fosse invocada sem nenhum `pathspec`."
#. type: Labeled list
#: en/glossary-content.txt:427
#, no-wrap, priority:100
msgid "[[def_parent]]parent"
-msgstr ""
+msgstr "[[def_parent]]parent"
#. type: Plain text
#: en/glossary-content.txt:431
#, priority:100
msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
msgstr ""
+"Um <<def_commit_object,commit object>> cont챕m uma lista (possivelmente vazia)"
+" dos predecessores l처gicos na linha de desenvolvimento, ou seja, as suas "
+"matrizes."
#. type: Labeled list
#: en/glossary-content.txt:432
#, no-wrap, priority:100
msgid "[[def_pickaxe]]pickaxe"
-msgstr ""
+msgstr "[[def_pickaxe]]pickaxe"
#. type: Plain text
#: en/glossary-content.txt:438
#, priority:100
msgid "The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore routines that help select changes that add or delete a given text string. With the `--pickaxe-all` option, it can be used to view the full <<def_changeset,changeset>> that introduced or removed, say, a particular line of text. See linkgit:git-diff[1]."
msgstr ""
+"O termo <<def_pickaxe,pickaxe>> refere-se a uma op챌찾o para as rotinas "
+"`diffcore` que ajudam a selecionar as altera챌천es que adicionam ou excluem "
+"uma determinada string. Com a op챌찾o `--pickaxe-all`, ela pode ser usada para "
+"visualizar completamente o <<def_changeset,changeset>> que introduziu ou "
+"removeu, digamos, uma determinada linha de texto. Consulte linkgit:git-"
+"diff[1]."
#. type: Labeled list
#: en/glossary-content.txt:439
#, no-wrap, priority:100
msgid "[[def_plumbing]]plumbing"
-msgstr ""
+msgstr "[[def_plumbing]]plumbing"
#. type: Plain text
#: en/glossary-content.txt:441
#, priority:100
msgid "Cute name for <<def_core_git,core Git>>."
-msgstr ""
+msgstr "Um nome bonito para <<def_core_git,core Git>>."
#. type: Labeled list
#: en/glossary-content.txt:442
#, no-wrap, priority:100
msgid "[[def_porcelain]]porcelain"
-msgstr ""
+msgstr "[[def_porcelain]]porcelain"
#. type: Plain text
#: en/glossary-content.txt:447
#, priority:100
msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
msgstr ""
+"Nome bonito para programas e conjunto de programas, dependendo do <<"
+"def_core_git,core Git>>, apresentando um acesso de alto n챠vel ao n첬cleo do "
+"Git principal. As porcelanas exp천em mais uma interface <<def_SCM,SCM>> do "
+"que o <<def_plumbing,plumbing>>."
#. type: Labeled list
#: en/glossary-content.txt:448
#, no-wrap, priority:100
msgid "[[def_per_worktree_ref]]per-worktree ref"
-msgstr ""
+msgstr "[[def_per_worktree_ref]]per-worktree ref"
#. type: Plain text
#: en/glossary-content.txt:453
#, priority:100
msgid "Refs that are per-<<def_working_tree,worktree>>, rather than global. This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
msgstr ""
+"Refs que s찾o por-<<def_working_tree,worktree>> em vez de global. Atualmente "
+"isso 챕 aprestado apenas como <<def_HEAD,HEAD>> e qualquer outro `refs` que "
+"inicie com `refs/bisect/`, mas podem posteriormente, incluir outros `refs` "
+"incomuns."
#. type: Labeled list
#: en/glossary-content.txt:454
#, no-wrap, priority:100
msgid "[[def_pseudoref]]pseudoref"
-msgstr ""
+msgstr "[[def_pseudoref]]pseudoref"
#. type: Plain text
#: en/glossary-content.txt:469
#, priority:100
msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git. Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace. So, HEAD is not a pseudoref, because it is sometimes a symbolic ref. They might optionally contain some additional data. `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples. Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs. They also cannot be updated through the normal ref update machinery. Instead, they are updated by directly writing to the files. However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
msgstr ""
+"`Pseudorefs` s찾o uma classe de arquivos em `$GIT_DIR` que se comporta como "
+"`refs` para fins de an찼lise de revis찾o, no entanto, s찾o tratados "
+"especialmente pelo git. Os `pseudorefs` t챗m nomes com mai첬sculas e sempre "
+"come챌am com uma linha que consiste em <<def_SHA1,SHA-1>>, seguido por um "
+"espa챌o em branco. Portanto, `HEAD` n찾o 챕 um `pseudoref` pois 횪s vezes 챕 um "
+"`ref` simb처lico. Opcionalmente eles podem conter alguns dados adicionais "
+"como por exemplo `MERGE_HEAD` e `CHERRY_PICK_HEAD`. Ao contr찼rio do "
+"<<def_per_worktree_ref,per-worktree refs>>, estes arquivos n찾o podem ser "
+"`refs` simb처licos e nunca possuem um `reflogs`. Eles tamb챕m n찾o podem ser "
+"atualizados atrav챕s do mecanismo `ref` normal de atualiza챌찾o. Em vez disso, "
+"eles s찾o atualizados gravando diretamente nos arquivos. No entanto, eles "
+"podem ser lidos como se fossem `refs`, portanto, `git rev-parse MERGE_HEAD` "
+"funcionar찼."
#. type: Labeled list
#: en/glossary-content.txt:470
#, no-wrap, priority:100
msgid "[[def_pull]]pull"
-msgstr ""
+msgstr "[[def_pull]]pull"
#. type: Plain text
#: en/glossary-content.txt:473
#, priority:100
msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it. See also linkgit:git-pull[1]."
msgstr ""
+"Puxar um <<def_branch,branch>> significa <<def_fetch,fetch>> e "
+"<<def_merge,merge>>. Consulte tamb챕m linkgit:git-pull[1]."
#. type: Labeled list
#: en/glossary-content.txt:474
#, no-wrap, priority:100
msgid "[[def_push]]push"
-msgstr ""
+msgstr "[[def_push]]push"
#. type: Plain text
#: en/glossary-content.txt:485
#, priority:100
msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
msgstr ""
+"Faz um `push` ao <<def_branch,branch>> significa pegar a ramifica챌찾o <<"
+"def_head_ref,head ref>> de um <<def_repository,repository>> remoto, "
+"descobrir se 챕 um ancestral da referencia do head local e nesse caso, "
+"colocar todos os objetos que s찾o <<def_reachable,reachable>> com base na "
+"refer챗ncia no head local e que est찾o faltando do reposit처rio <<"
+"def_object_database,object database>> remoto ao mesmo tempo que atualiza a "
+"refer챗ncia do head remoto. Caso o <<def_head,head>> n찾o seja um ancestral do "
+"head local, o `push` falhar찼."
#. type: Labeled list
#: en/glossary-content.txt:486
#, no-wrap, priority:100
msgid "[[def_reachable]]reachable"
-msgstr ""
+msgstr "[[def_reachable]]reachable"
#. type: Plain text
#: en/glossary-content.txt:495
#, priority:100
msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
msgstr ""
+"De um modo mais geral, um <<def_object,object>> 챕 acess챠vel a partir do "
+"outro se pudermos alcan챌찼-lo atrav챕s de um <<def_chain,chain>> seguido de "
+"<<def_tag,tags>> para o que quer que eles marque com uma tag, "
+"<<def_commit_object,commits>> para as suas matrizes ou 찼rvores e "
+"<<def_tree_object,trees>> para as 찼rvores ou <<def_blob_object,blobs>> que "
+"os contiverem."
#. type: Labeled list
#: en/glossary-content.txt:496
#, no-wrap, priority:100
msgid "[[def_rebase]]rebase"
-msgstr ""
+msgstr "[[def_rebase]]rebase"
#. type: Plain text
#: en/glossary-content.txt:500
#, priority:100
msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
msgstr ""
+"Para reaplicar uma s챕rie de altera챌천es de uma <<def_branch,branch>> para uma "
+"base diferente e redefinir o <<def_head,head>> dessa ramifica챌찾o para o "
+"resultado."
#. type: Labeled list
#: en/glossary-content.txt:501
#, no-wrap, priority:100
msgid "[[def_ref]]ref"
-msgstr ""
+msgstr "[[def_ref]]ref"
#. type: Plain text
#: en/glossary-content.txt:509
#, priority:100
msgid "A name that begins with `refs/` (e.g. `refs/heads/master`) that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>). For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details. Refs are stored in the <<def_repository,repository>>."
msgstr ""
+"Um nome que comece com `refs/` (por exemplo, `refs/heads/master`) que aponte "
+"para um <<def_object_name,object name>> ou outro ref (o 첬ltimo 챕 chamado de<<"
+"def_symref,symbolic ref>>). Por conveni챗ncia, um `ref` 횪s vezes pode ser "
+"abreviado quando usado como um argumento em um comando Git; Para mais "
+"detalhes consulte linkgit:gitrevisions[7]. Os `refs` s찾o armazenadas no "
+"<<def_repository,repository>>."
#. type: Plain text
#: en/glossary-content.txt:513
#, priority:100
msgid "The ref namespace is hierarchical. Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
msgstr ""
+"O `namespace` do `ref` 챕 hier찼rquico. Sub-hierarquias diferentes s찾o usadas "
+"para diferentes prop처sitos (por exemplo, a hierarquia `refs/heads/` 챕 usada "
+"para representar as ramifica챌천es locais)."
#. type: Plain text
#: en/glossary-content.txt:516
#, priority:100
msgid "There are a few special-purpose refs that do not begin with `refs/`. The most notable example is `HEAD`."
msgstr ""
+"Existem algumas refer챗ncias especiais que n찾o come챌am com `refs/`. O "
+"exemplo mais not찼vel 챕 `HEAD`."
#. type: Labeled list
#: en/glossary-content.txt:517
#, no-wrap, priority:100
msgid "[[def_reflog]]reflog"
-msgstr ""
+msgstr "[[def_reflog]]reflog"
#. type: Plain text
#: en/glossary-content.txt:522
#, priority:100
msgid "A reflog shows the local \"history\" of a ref. In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm. See linkgit:git-reflog[1] for details."
msgstr ""
+"Um `reflog` exibe o \"hist처rico\" local de um `ref`. Em outras palavras, "
+"ele pode informar qual foi a 3짧 첬ltima revis찾o `_neste_ reposit처rio e qual "
+"era a sua condi챌찾o atual, ontem 횪s 21:14. Para mais detalhes consulte "
+"linkgit:git-reflog[1]."
#. type: Labeled list
#: en/glossary-content.txt:523
#, no-wrap, priority:100
msgid "[[def_refspec]]refspec"
-msgstr ""
+msgstr "[[def_refspec]]refspec"
#. type: Plain text
#: en/glossary-content.txt:527
#, priority:100
msgid "A \"refspec\" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote <<def_ref,ref>> and local ref."
msgstr ""
+"Um `refspec` 챕 utilizado por <<def_fetch,fetch>> e <<def_push,push>> para "
+"descrever o mapeamento entre <<def_ref,ref>> remoto e o `ref` local."
#. type: Labeled list
#: en/glossary-content.txt:528
-#, fuzzy, no-wrap, priority:100
-#| msgid "List references in a remote repository."
+#, no-wrap, priority:100
msgid "[[def_remote]]remote repository"
-msgstr "Lista as refer챗ncias em um reposit처rio remoto."
+msgstr "[[def_remote]]reposit처rio remoto"
#. type: Plain text
#: en/glossary-content.txt:532
#, priority:100
msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
msgstr ""
+"Um <<def_repository,repository>> que 챕 utilizado para rastrear os mesmo "
+"projeto por챕m reside em um outro lugar. Para se comunicar com ramos remotos, "
+"consulte <<def_fetch,fetch>> ou <<def_push,push>>."
#. type: Labeled list
#: en/glossary-content.txt:533
#, no-wrap, priority:100
msgid "[[def_remote_tracking_branch]]remote-tracking branch"
-msgstr ""
+msgstr "[[def_remote_tracking_branch]]rastreando ramos remotamente"
#. type: Plain text
#: en/glossary-content.txt:541
#, priority:100
msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
msgstr ""
+"Um <<def_ref,ref>> que 챕 utilizado para rastrear as modifica챌천es de outro "
+"<<def_repository,repository>>. Normalmente se parece com 'refs/remotes/foo/"
+"bar' (indicando que rastreia um ramo com nome 'bar' e um remoto chamado "
+"'foo'), coincide o lado direito do `fech` configurado <<def_refspec,refspec>>"
+". Uma ramifica챌찾o de rastreamento remoto n찾o deve conter modifica챌천es "
+"diretas t찾o pouco ter commits locais."
#. type: Labeled list
#: en/glossary-content.txt:542
#, no-wrap, priority:100
msgid "[[def_repository]]repository"
-msgstr ""
+msgstr "[[def_repository]]reposit처rio"
#. type: Plain text
#: en/glossary-content.txt:549
#, priority:100
msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
msgstr ""
+"Uma cole챌찾o de <<def_ref,refs>> junto com um <<def_object_database,object "
+"database>> contendo todos os objetos que s찾o <<def_reachable,reachable>> "
+"vindas das `refs`, possivelmente acompanhados por metadados de um ou mais "
+"<<def_porcelain,porcelains>>. Um reposit처rio pode compartilhar um banco de "
+"dados de objetos com outros reposit처rios atrav챕s de <<"
+"def_alternate_object_database,alternates mechanism>>."
#. type: Labeled list
#: en/glossary-content.txt:550
#, no-wrap, priority:100
msgid "[[def_resolve]]resolve"
-msgstr ""
+msgstr "[[def_resolve]]resolve"
#. type: Plain text
#: en/glossary-content.txt:553
#, priority:100
msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
msgstr ""
+"A a챌찾o de corrigir manualmente o que uma falha autom찼tica <<def_merge,merge>>"
+" deixou para tr찼s."
#. type: Labeled list
#: en/glossary-content.txt:554
#, no-wrap, priority:100
msgid "[[def_revision]]revision"
-msgstr ""
+msgstr "[[def_revision]]revis찾o"
#. type: Plain text
#: en/glossary-content.txt:556
#, priority:100
msgid "Synonym for <<def_commit,commit>> (the noun)."
-msgstr ""
+msgstr "Um sin척nimo de <<def_commit,commit>> (o substantivo)."
#. type: Labeled list
#: en/glossary-content.txt:557
#, no-wrap, priority:100
msgid "[[def_rewind]]rewind"
-msgstr ""
+msgstr "[[def_rewind]]rebobinar"
#. type: Plain text
#: en/glossary-content.txt:560
#, priority:100
msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
msgstr ""
+"Para jogar fora parte do desenvolvimento, ou seja, atribuir <<def_head,head>>"
+" a um <<def_revision,revision>> anterior."
#. type: Labeled list
#: en/glossary-content.txt:561
#, no-wrap, priority:100
msgid "[[def_SCM]]SCM"
-msgstr ""
+msgstr "[[def_SCM]]SCM"
#. type: Plain text
#: en/glossary-content.txt:563
#, priority:100
msgid "Source code management (tool)."
-msgstr ""
+msgstr "Gerenciamento do c처digo fonte (ferramenta)."
#. type: Labeled list
#: en/glossary-content.txt:564
#, no-wrap, priority:100
msgid "[[def_SHA1]]SHA-1"
-msgstr ""
+msgstr "[[def_SHA1]]SHA-1"
#. type: Plain text
#: en/glossary-content.txt:567
#, priority:100
msgid "\"Secure Hash Algorithm 1\"; a cryptographic hash function. In the context of Git used as a synonym for <<def_object_name,object name>>."
msgstr ""
+"\"Secure Hash Algorithm 1\"; uma fun챌찾o hash de criptogr찼fica. No contexto "
+"do Git usado como sin척nimo de <<def_object_name,object name>>."
#. type: Labeled list
#: en/glossary-content.txt:568
#, no-wrap, priority:100
msgid "[[def_shallow_clone]]shallow clone"
-msgstr ""
+msgstr "[[def_shallow_clone]]clonagem superficial"
#. type: Plain text
#: en/glossary-content.txt:572
#, ignore-ellipsis, priority:100
msgid "Mostly a synonym to <<def_shallow_repository,shallow repository>> but the phrase makes it more explicit that it was created by running `git clone --depth=...` command."
msgstr ""
+"Em geral um sin척nimo para <<def_shallow_repository,shallow repository>> "
+"por챕m a frase a torna mais explicita criada ao executar o comando `git clone "
+"--depth=...`."
#. type: Labeled list
#: en/glossary-content.txt:573
#, no-wrap, priority:100
msgid "[[def_shallow_repository]]shallow repository"
-msgstr ""
+msgstr "[[def_shallow_repository]]reposit처rio raso"
#. type: Plain text
#: en/glossary-content.txt:583
#, priority:100
msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
msgstr ""
+"Um <<def_repository,repository>> reposit처rio raso possui um hist처rico "
+"incompleto da quais <<def_commit,commits>> possui <<def_parent,parents>> dos "
+"quais cauterizam (em outras palavras, o Git 챕 informado para fingir que "
+"estes commits n찾o possuem matrizes, ainda que esteja cadastrados no <<"
+"def_commit_object,commit object>>). Algumas vezes 챕 첬til quando voc챗 est찼 "
+"interessado apenas no hist처rico recente de um projeto, ainda que o hist처rico "
+"real registrado no upstream seja muito maior. Um reposit처rio raso 챕 criado, "
+"ao usar a op챌찾o `--depth` para linkgit:git-clone[1] e o seu hist처rico pode "
+"ser aprofundado posteriormente com linkgit:git-fetch[1]."
#. type: Labeled list
#: en/glossary-content.txt:584
#, no-wrap, priority:100
msgid "[[def_stash]]stash entry"
-msgstr ""
+msgstr "[[def_stash]]stash entry"
#. type: Plain text
#: en/glossary-content.txt:587
#, priority:100
msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
msgstr ""
+"Um <<def_object,object>> 챕 utilizado para armazenar temporariamente o "
+"conte첬do de um diret처rio de trabalho <<def_dirty,dirty>> e seu 챠ndice para "
+"utiliza챌찾o futura."
#. type: Labeled list
#: en/glossary-content.txt:588
#, no-wrap, priority:100
msgid "[[def_submodule]]submodule"
-msgstr ""
+msgstr "[[def_submodule]]subm처dulo"
#. type: Plain text
#: en/glossary-content.txt:592
#, priority:100
msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
msgstr ""
+"Um <<def_repository,repository>> ret챕m o hist처rico de um projeto separado "
+"dentro de um outro reposit처rio (o 첬ltimo na qual 챕 chamado de <<"
+"def_superproject, superproject>>)."
#. type: Labeled list
#: en/glossary-content.txt:593
#, no-wrap, priority:100
msgid "[[def_superproject]]superproject"
-msgstr ""
+msgstr "[[def_superproject]]superproject"
#. type: Plain text
#: en/glossary-content.txt:598
#, priority:100
msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>. The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
msgstr ""
+"Um <<def_repository,repository>> se refere a reposit처rios de outros projetos "
+"em suas pr처prias 찼rvores de trabalho como <<def_submodule,submodules>>. O "
+"superprojeto conhece os nomes dos (mas n찾o mant챕m c처pias de nenhum deles) "
+"commits dos objetos que contenham os subm처dulos."
#. type: Labeled list
#: en/glossary-content.txt:599
#, no-wrap, priority:100
msgid "[[def_symref]]symref"
-msgstr ""
+msgstr "[[def_symref]]symref"
#. type: Plain text
#: en/glossary-content.txt:606
#, priority:100
msgid "Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic references are manipulated with the linkgit:git-symbolic-ref[1] command."
msgstr ""
+"Uma refer챗ncia simb처lica: em vez de conter o pr처prio id <<def_SHA1,SHA-1>>, "
+"ele tem o formato 'ref: refs/some/thing' e quando 챕 referenciado faz uma "
+"refer챗ncia recursiva a essa refer챗ncia. '<<def_HEAD,HEAD>>' 챕 o exemplo "
+"prim찼rio de um `symref`. As refer챗ncias simb처licas s찾o manipuladas com o "
+"comando linkgit:git-symbolic-ref[1]."
#. type: Labeled list
#: en/glossary-content.txt:607
#, no-wrap, priority:100
msgid "[[def_tag]]tag"
-msgstr ""
+msgstr "[[def_tag]]tag"
#. type: Plain text
#: en/glossary-content.txt:616
#, priority:100
msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
msgstr ""
+"Um <<def_ref,ref>> sob `refs/tags/` no `namespace` que aponte para um objeto "
+"arbitr찼rio (em geral uma tag que aponta seja para <<def_tag_object,tag>> ou "
+"um <<def_commit_object,commit object>>). Em contraste de um "
+"<<def_head,head>>, a tag n찾o 챕 atualizada pelo comando `commit`. Uma tag "
+"Git n찾o tem nada a ver com uma tag `Lisp` (que seria chamada de <<"
+"def_object_type,object type>> dentro do contexto do Git). Uma tag 챕 "
+"normalmente usada para marcar um ponto espec챠fico na ancestralidade de um "
+"commit <<def_chain,chain>>."
#. type: Labeled list
#: en/glossary-content.txt:617
#, no-wrap, priority:100
msgid "[[def_tag_object]]tag object"
-msgstr ""
+msgstr "[[def_tag_object]]objeto tag"
#. type: Plain text
#: en/glossary-content.txt:622
#, priority:100
msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP) signature, in which case it is called a \"signed tag object\"."
msgstr ""
+"Um <<def_object,object>> contendo um <<def_ref,ref>> apontando para outro "
+"objeto que pode conter uma mensagem como um <<def_commit_object,commit "
+"object>>. Tamb챕m pode conter uma assinatura (PGP); nesse caso, 챕 chamado de "
+"\"signed tag object\"."
#. type: Labeled list
#: en/glossary-content.txt:623
#, no-wrap, priority:100
msgid "[[def_topic_branch]]topic branch"
-msgstr ""
+msgstr "[[def_topic_branch]]topic branch"
#. type: Plain text
#: en/glossary-content.txt:629
#, priority:100
msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
msgstr ""
+"Um Git comum <<def_branch,branch>> que 챕 usado por um desenvolvedor para "
+"identificar uma linha conceitual de desenvolvimento. Como as ramifica챌천es "
+"s찾o muito f찼ceis e baratas, muitas vezes 챕 desej찼vel ter v찼rias ramifica챌천es "
+"pequenas, cada uma contendo conceitos muito bem definidos ou pequenas "
+"altera챌천es incrementais, por챕m relacionadas."
#. type: Labeled list
#: en/glossary-content.txt:630
#, no-wrap, priority:100
msgid "[[def_tree]]tree"
-msgstr ""
+msgstr "[[def_tree]]찼rvore"
#. type: Plain text
#: en/glossary-content.txt:634
#, priority:100
msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
msgstr ""
+"Entre um <<def_working_tree,working tree>> ou um <<def_tree_object,tree "
+"object>> junto com os objetos dependentes <<def_blob_object,blob>> e os "
+"objetos das 찼rvores (uma representa챌찾o de uma 찼rvore de trabalho)."
#. type: Labeled list
#: en/glossary-content.txt:635
#, no-wrap, priority:100
msgid "[[def_tree_object]]tree object"
-msgstr ""
+msgstr "[[def_tree_object]]objeto da 찼rvore"
#. type: Plain text
#: en/glossary-content.txt:639
#, priority:100
msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
msgstr ""
+"Um <<def_object,object>> contendo uma lista de nomes e modos em conjunto com "
+"`refs` associados as sua gotas e ou objetos da 찼rvore. Um <<def_tree,tree>> "
+"챕 equivalente a um <<def_directory,directory>>."
#. type: Labeled list
#: en/glossary-content.txt:640
#, no-wrap, priority:100
msgid "[[def_tree-ish]]tree-ish (also treeish)"
-msgstr ""
+msgstr "[[def_tree-ish]]tree-ish (tamb챕m treeish)"
#. type: Plain text
#: en/glossary-content.txt:653
#, priority:100
msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object. Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>. The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
msgstr ""
+"Um <<def_tree_object,tree object>> ou um <<def_object,object>> que pode "
+"perder uma refer챗ncia recursivamente em um objeto da 찼rvore. Perder um <<"
+"def_commit_object,commit object>> retorna o objeto da 찼rvore "
+"<<def_revision,revision>> correspondente ao topo <<def_directory,directory>>"
+". S찾o todos os tree-ishes: um <<def_commit-ish,commit-ish>>, um objeto da "
+"찼rvore, um <<def_tag_object,tag object>> que aponta para o o objeto da "
+"찼rvore, um objeto tag que aponta para o objeto tag que aponta para o objeto "
+"찼rvore, etc."
#. type: Labeled list
#: en/glossary-content.txt:654
#, no-wrap, priority:100
msgid "[[def_unmerged_index]]unmerged index"
-msgstr ""
+msgstr "[[def_unmerged_index]]챠ndices n찾o mesclados"
#. type: Plain text
#: en/glossary-content.txt:657
#, priority:100
msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
msgstr ""
+"Um <<def_index,index>> que contenha 챠ndices n찾o mesclados <<"
+"def_index_entry,index entries>>."
#. type: Labeled list
#: en/glossary-content.txt:658
#, no-wrap, priority:100
msgid "[[def_unreachable_object]]unreachable object"
-msgstr ""
+msgstr "[[def_unreachable_object]]objetos inacess챠veis"
#. type: Plain text
#: en/glossary-content.txt:661
#, priority:100
msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
msgstr ""
+"Um <<def_object,object>> que n찾o 챕 <<def_reachable,reachable>> de um "
+"<<def_branch,branch>>, <<def_tag,tag>>, ou de qualquer outra refer챗ncia."
#. type: Labeled list
#: en/glossary-content.txt:662
#, no-wrap, priority:100
msgid "[[def_upstream_branch]]upstream branch"
-msgstr ""
+msgstr "[[def_upstream_branch]]ramo ascendente"
#. type: Plain text
#: en/glossary-content.txt:667
#, priority:100
msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
msgstr ""
+"횋 predefinido que <<def_branch,branch>> que seja mesclado na 찼rvore em "
+"quest찾o (ou no ramo em quest찾o que seja feito um `rebase` nele). 횋 "
+"configurado atrav챕s do `branch.<name>.remote` e `branch.<name>.merge`. Caso "
+"o ramo ascendente de 'A' seja 'origin/B' algumas vezes n처s dizemos que \"'A' "
+"est찼 rastreando 'origin/B'\"."
#. type: Labeled list
#: en/glossary-content.txt:668
#, no-wrap, priority:100
msgid "[[def_working_tree]]working tree"
-msgstr ""
+msgstr "[[def_working_tree]]찼rvore de trabalho"
#. type: Plain text
#: en/glossary-content.txt:671
#, priority:100
msgid "The tree of actual checked out files. The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
msgstr ""
+"A 찼rvore dos arquivos atualmente verificados. A 찼rvore de trabalho "
+"normalmente cont챕m o conte첬do do `<<def_HEAD,HEAD>>` na 찼rvore do commit, "
+"al챕m de quaisquer altera챌천es locais que voc챗 tenha feito, mas ainda n찾o fez "
+"o commit."
#. type: Plain text
#: en/i18n.txt:2
@@ -57886,6 +59647,8 @@ msgstr ""
#, priority:280
msgid "The contents of the blob objects are uninterpreted sequences of bytes. There is no encoding translation at the core level."
msgstr ""
+"O conte첬do dos objetos gota s찾o sequ챗ncias de bytes n찾o interpretados. N찾o "
+"h찼 tradu챌찾o de codifica챌찾o no n챠vel principal."
#. type: Plain text
#: en/i18n.txt:13
@@ -57961,115 +59724,147 @@ msgstr ""
#: en/line-range-format.txt:2
#, priority:260
msgid "<start> and <end> can take one of these forms:"
-msgstr ""
+msgstr "<start> e <end> podem assumir uma destas formas:"
#. type: Plain text
#: en/line-range-format.txt:4
#, priority:260
msgid "number"
-msgstr ""
+msgstr "n첬mero"
#. type: Plain text
#: en/line-range-format.txt:7
#, priority:260
msgid "If <start> or <end> is a number, it specifies an absolute line number (lines count from 1)."
msgstr ""
+"Caso <start> ou <end> seja um n첬mero, ele especifica um n첬mero de linha "
+"absoluto (as linhas contam a partir do 1)."
#. type: Plain text
#: en/line-range-format.txt:10
#, priority:260
msgid "/regex/"
-msgstr ""
+msgstr "/regex/"
#. type: Plain text
#: en/line-range-format.txt:17
#, priority:260
msgid "This form will use the first line matching the given POSIX regex. If <start> is a regex, it will search from the end of the previous `-L` range, if any, otherwise from the start of file. If <start> is ``^/regex/'', it will search from the start of file. If <end> is a regex, it will search starting at the line given by <start>."
msgstr ""
+"Este formul찼rio usar찼 a primeira linha correspondente ao regex POSIX "
+"informado. Caso <start> seja um regex, ele procurar찼 no final do `L` do "
+"intervalo, se houver, caso contr찼rio, desde o in챠cio do arquivo. Caso <start>"
+" seja ``^/regex/'', ele pesquisar찼 desde o in챠cio do arquivo. Caso <end> "
+"seja um regex, ele pesquisar찼 a partir da linha fornecida por <start>."
#. type: Plain text
#: en/line-range-format.txt:20
#, priority:260
msgid "+offset or -offset"
-msgstr ""
+msgstr "+offset ou -offset"
#. type: Plain text
#: en/line-range-format.txt:23
#, priority:260
msgid "This is only valid for <end> and will specify a number of lines before or after the line given by <start>."
msgstr ""
+"V찼lido apenas para <end> e especificar찼 uma quantidade de linhas antes ou "
+"depois da linha fornecida por <start>."
#. type: Plain text
#: en/line-range-format.txt:30
#, priority:260
msgid "If ``:<funcname>'' is given in place of <start> and <end>, it is a regular expression that denotes the range from the first funcname line that matches <funcname>, up to the next funcname line. ``:<funcname>'' searches from the end of the previous `-L` range, if any, otherwise from the start of file. ``^:<funcname>'' searches from the start of file."
msgstr ""
+"Caso ``:<funcname>'' seja fornecido no lugar de <start> e <end>, 챕 uma "
+"express찾o regular que indica o intervalo da primeira \"funcname\" que "
+"coincide com <funcname> at챕 a pr처xima linha \"funcname\". ``:<funcname>'' "
+"pesquisa no final do intervalo `L` anterior, se houver, caso contr찼rio, a "
+"pesquisa ocorrer찼 desde o in챠cio do arquivo. ``^:<funcname>'' pesquisa desde "
+"o in챠cio do arquivo."
#. type: Plain text
#: en/mailmap.txt:6
#, priority:260
msgid "If the file `.mailmap` exists at the toplevel of the repository, or at the location pointed to by the mailmap.file or mailmap.blob configuration options, it is used to map author and committer names and email addresses to canonical real names and email addresses."
msgstr ""
+"Caso o arquivo `.mailmap` exista no topo do reposit처rio ou no local apontado "
+"pelas op챌천es de configura챌찾o `mailmap.file` ou `mailmap.blob`, ele ser찼 "
+"usado para mapear os nomes dos autores e os endere챌os de email para os seus "
+"respectivos nomes e endere챌os de email verdadeiros."
#. type: Plain text
#: en/mailmap.txt:10
#, priority:260
msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:"
msgstr ""
+"No formato simples, cada linha do arquivo consiste no nome real de um autor, "
+"espa챌o em branco e um endere챌o de email usado no commit (delimitado por '<' "
+"and '>') mapeando para o nome.. Por exemplo:"
#. type: Plain text
#: en/mailmap.txt:12
#, no-wrap, priority:260
msgid "\tProper Name <commit@email.xx>\n"
-msgstr ""
+msgstr "\tNome Pr처prio <commit@email.xx>\n"
#. type: Plain text
#: en/mailmap.txt:15
#, priority:260
msgid "The more complex forms are:"
-msgstr ""
+msgstr "Os formatos mais complexos s찾o:"
#. type: Plain text
#: en/mailmap.txt:17
#, no-wrap, priority:260
msgid "\t<proper@email.xx> <commit@email.xx>\n"
-msgstr ""
+msgstr "\t<proper@email.xx> <commit@email.xx>\n"
#. type: Plain text
#: en/mailmap.txt:19
#, priority:260
msgid "which allows mailmap to replace only the email part of a commit, and:"
msgstr ""
+"o que permite que o mailmap substitua apenas a parte do email de um commit e:"
#. type: Plain text
#: en/mailmap.txt:21
#, no-wrap, priority:260
msgid "\tProper Name <proper@email.xx> <commit@email.xx>\n"
-msgstr ""
+msgstr "\tNome Pr처prio <proper@email.xx> <commit@email.xx>\n"
#. type: Plain text
#: en/mailmap.txt:24
#, priority:260
msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:"
msgstr ""
+"o que permite que o mailmap substitua ambos os nomes e o email de um commit "
+"correspondente ao endere챌o de email de confirma챌찾o especificado, e:"
#. type: Plain text
#: en/mailmap.txt:26
#, no-wrap, priority:260
msgid "\tProper Name <proper@email.xx> Commit Name <commit@email.xx>\n"
msgstr ""
+"\tNome Pr처prio <proper@email.xx> Nome de quem fez o Commit <commit@email.xx>"
+"\n"
#. type: Plain text
#: en/mailmap.txt:29
#, priority:260
msgid "which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address."
msgstr ""
+"o que permite que o mailmap substitua ambos os nomes e o email de um commit "
+"que corresponda a ambos os nomes de quem fez o commit e com o endere챌o de "
+"email."
#. type: Plain text
#: en/mailmap.txt:32
#, priority:260
msgid "Example 1: Your history contains commits by two authors, Jane and Joe, whose names appear in the repository under several forms:"
msgstr ""
+"Exemplo 1: O seu hist처rico cont챕m confirma챌천es de dois autores, Jane e Joe, "
+"cujos nomes aparecem no reposit처rio de diferentes maneiras:"
#. type: delimited block -
#: en/mailmap.txt:39
@@ -58081,12 +59876,20 @@ msgid ""
"Jane Doe <jane@laptop.(none)>\n"
"Jane D. <jane@desktop.(none)>\n"
msgstr ""
+"Joe Developer <joe@example.com>\n"
+"Joe R. Developer <joe@example.com>\n"
+"Jane Doe <jane@example.com>\n"
+"Jane Doe <jane@laptop.(none)>\n"
+"Jane D. <jane@desktop.(none)>\n"
#. type: Plain text
#: en/mailmap.txt:44
#, priority:260
msgid "Now suppose that Joe wants his middle name initial used, and Jane prefers her family name fully spelled out. A proper `.mailmap` file would look like:"
msgstr ""
+"Agora, suponha que Joe queira que seu nome do meio seja usado no come챌o e "
+"Jane prefere que o nome de sua fam챠lia seja escrito por extenso. Um arquivo "
+"`.mailmap` apropriado se pareceria com:"
#. type: delimited block -
#: en/mailmap.txt:48
@@ -58095,18 +59898,22 @@ msgid ""
"Jane Doe <jane@desktop.(none)>\n"
"Joe R. Developer <joe@example.com>\n"
msgstr ""
+"Jane Doe <jane@desktop.(none)>\n"
+"Joe R. Developer <joe@example.com>\n"
#. type: Plain text
#: en/mailmap.txt:52
#, priority:260
msgid "Note how there is no need for an entry for `<jane@laptop.(none)>`, because the real name of that author is already correct."
msgstr ""
+"Observe como n찾o h찼 necessidade de uma entrada para `<jane@laptop.(none)>` "
+"porque o nome real deste autor j찼 est찼 correto."
#. type: Plain text
#: en/mailmap.txt:55
#, priority:260
msgid "Example 2: Your repository contains commits from the following authors:"
-msgstr ""
+msgstr "Exemplo 2: O seu reposit처rio cont챕m commits dos seguintes autores:"
#. type: delimited block -
#: en/mailmap.txt:63
@@ -58119,12 +59926,18 @@ msgid ""
"claus <me@company.xx>\n"
"CTO <cto@coompany.xx>\n"
msgstr ""
+"nick1 <bugs@company.xx>\n"
+"nick2 <bugs@company.xx>\n"
+"nick2 <nick2@company.xx>\n"
+"santa <me@company.xx>\n"
+"claus <me@company.xx>\n"
+"CTO <cto@coompany.xx>\n"
#. type: Plain text
#: en/mailmap.txt:66
#, priority:260
msgid "Then you might want a `.mailmap` file that looks like:"
-msgstr ""
+msgstr "Ent찾o voc챗 pode querer um arquivo `.mailmap` que se pare챌a com:"
#. type: delimited block -
#: en/mailmap.txt:72
@@ -58136,12 +59949,19 @@ msgid ""
"Other Author <other@author.xx> <nick2@company.xx>\n"
"Santa Claus <santa.claus@northpole.xx> <me@company.xx>\n"
msgstr ""
+"<cto@company.xx> <cto@coompany.xx>\n"
+"Some Dude <some@dude.xx> nick1 <bugs@company.xx>\n"
+"Other Author <other@author.xx> nick2 <bugs@company.xx>\n"
+"Other Author <other@author.xx> <nick2@company.xx>\n"
+"Santa Claus <santa.claus@northpole.xx> <me@company.xx>\n"
#. type: Plain text
#: en/mailmap.txt:75
#, priority:260
msgid "Use hash '#' for comments that are either on their own line, or after the email address."
msgstr ""
+"Use o sinal de jogo da velha '#' para coment찼rios que estejam em sua pr처pria "
+"linha ou ap처s o endere챌o de email."
#. type: Plain text
#: en/merge-options.txt:5
@@ -58181,9 +60001,14 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:41
-#, priority:240
+#, fuzzy, 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."
#. type: Labeled list
#: en/merge-options.txt:44
@@ -58535,9 +60360,12 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:97
-#, priority:240
+#, fuzzy, 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`."
#. type: Labeled list
#: en/merge-strategies.txt:98
@@ -58759,19 +60587,30 @@ msgstr "xxdiff"
#: en/pretty-formats.txt:2
#, no-wrap, priority:260
msgid "PRETTY FORMATS"
-msgstr ""
+msgstr "FORMATOS BONITOS"
#. type: Plain text
#: 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 ""
+"Se o commit for uma mesclagem e se o formato bonito n찾o for 'oneline', "
+"'email' ou 'raw', uma linha adicional ser찼 inserida antes da linha 'Author:"
+"'. Esta linha come챌a com \"Mesclar:\" e os hashes dos commits anteriores "
+"s찾o exibidos, separados por espa챌os. Observe que os commits listados podem "
+"n찾o ser necessariamente a lista *direta* dos commits relacionados se voc챗 "
+"limitou sua vis찾o do hist처rico: por exemplo, se voc챗 estiver interessado "
+"apenas em altera챌천es relacionadas a um determinado diret처rio ou arquivo."
#. type: Plain text
#: en/pretty-formats.txt:20
#, priority:260
msgid "There are several built-in formats, and you can define additional formats by setting a pretty.<name> config option to either another format name, or a 'format:' string, as described below (see linkgit:git-config[1]). Here are the details of the built-in formats:"
msgstr ""
+"Existem v찼rios formatos incorporados e voc챗 pode definir formatos adicionais "
+"ao definir uma op챌찾o de configura챌찾o pretty.<name> para um outro nome de "
+"formato ou uma string 'format:', conforme descrito abaixo (consulte linkgit"
+":git-config[1]). Aqui est찾o os detalhes dos formatos incorporados:"
#. type: Plain text
#: en/pretty-formats.txt:22
@@ -58783,13 +60622,13 @@ msgstr "'oneline'"
#: en/pretty-formats.txt:24
#, no-wrap, priority:260
msgid "<hash> <title line>\n"
-msgstr ""
+msgstr "<hash> <title line>\n"
#. type: Plain text
#: en/pretty-formats.txt:26
#, priority:260
msgid "This is designed to be as compact as possible."
-msgstr ""
+msgstr "Isso foi desenvolvido para ser o mais compacto poss챠vel."
#. type: Plain text
#: en/pretty-formats.txt:28
@@ -58804,12 +60643,14 @@ msgid ""
"commit <hash>\n"
"Author: <author>\n"
msgstr ""
+"commit <hash>\n"
+"Author: <author>\n"
#. type: Plain text
#: en/pretty-formats.txt:33 en/pretty-formats.txt:41 en/pretty-formats.txt:51 en/pretty-formats.txt:63
#, no-wrap, priority:260
msgid "<title line>\n"
-msgstr ""
+msgstr "<title line>\n"
#. type: Plain text
#: en/pretty-formats.txt:35
@@ -58825,12 +60666,15 @@ msgid ""
"Author: <author>\n"
"Date: <author date>\n"
msgstr ""
+"commit <hash>\n"
+"Author: <author>\n"
+"Date: <author date>\n"
#. type: Plain text
#: en/pretty-formats.txt:43 en/pretty-formats.txt:53 en/pretty-formats.txt:65 en/pretty-formats.txt:85
#, priority:260
msgid "<full commit message>"
-msgstr ""
+msgstr "<mensagem completa do commit>"
#. type: Plain text
#: en/pretty-formats.txt:45
@@ -58846,6 +60690,9 @@ msgid ""
"Author: <author>\n"
"Commit: <committer>\n"
msgstr ""
+"commit <hash>\n"
+"Author: <author>\n"
+"Commit: <committer>\n"
#. type: Plain text
#: en/pretty-formats.txt:55
@@ -58863,25 +60710,35 @@ msgid ""
"Commit: <committer>\n"
"CommitDate: <committer date>\n"
msgstr ""
+"commit <hash>\n"
+"Author: <author>\n"
+"AuthorDate: <author date>\n"
+"Commit: <committer>\n"
+"CommitDate: <committer date>\n"
#. type: Plain text
#: en/pretty-formats.txt:67
-#, fuzzy, priority:260
-#| msgid "--dereference"
+#, priority:260
msgid "'reference'"
-msgstr "--dereference"
+msgstr "'refer챗ncia'"
#. type: Plain text
#: en/pretty-formats.txt:69
#, no-wrap, priority:260
msgid "<abbrev hash> (<title line>, <short author date>)\n"
-msgstr ""
+msgstr "<abbrev hash> (<title line>, <short author date>)\n"
#. type: Plain text
#: en/pretty-formats.txt:76
#, priority:260
msgid "This format is used to refer to another commit in a commit message and is the same as `--pretty='format:%C(auto)%h (%s, %ad)'`. By default, the date is formatted with `--date=short` unless another `--date` option is explicitly specified. As with any `format:` with format placeholders, its output is not affected by other options like `--decorate` and `--walk-reflogs`."
msgstr ""
+"Este formato 챕 usado para se referir a outro commit em uma mensagem de "
+"commit e 챕 o mesmo que o formato `--pretty='format:%C(auto)%h (%s, %ad)'`. "
+"Por predefini챌찾o a data 챕 formatada com `--date=short`, a menos que outra "
+"op챌찾o `--date` seja usada de forma explicita. Como em qualquer formato "
+"`format:` com marcadores de formato, a sua sa챠da n찾o 챕 afetada por outras "
+"op챌천es como `--decorate` e `--walk-reflogs`."
#. type: Plain text
#: en/pretty-formats.txt:78
@@ -58898,6 +60755,10 @@ msgid ""
"Date: <author date>\n"
"Subject: [PATCH] <title line>\n"
msgstr ""
+"From <hash> <date>\n"
+"From: <author>\n"
+"Date: <author date>\n"
+"Subject: [PATCH] <title line>\n"
#. type: Plain text
#: en/pretty-formats.txt:87
@@ -58910,24 +60771,39 @@ msgstr "'raw'"
#, priority:260
msgid "The 'raw' format shows the entire commit exactly as stored in the commit object. Notably, the hashes are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and 'parents' information show the true parent commits, without taking grafts or history simplification into account. Note that this format affects the way commits are displayed, but not the way the diff is shown e.g. with `git log --raw`. To get full object names in a raw diff format, use `--no-abbrev`."
msgstr ""
+"O formato 'bruto' (raw) exibe todo o commit exatamente da maneira como est찼 "
+"armazenado no objeto de commit. Notavelmente, os hashes s찾o exibidos na "
+"챠ntegra independentemente de se --abbrev ou --no-abbrev foram usados, as "
+"informa챌천es 'parents' mostram os verdadeiros commits da matriz sem levar em "
+"considera챌찾o os enxertos ou a simplifica챌찾o do hist처rico. Observe que este "
+"formato afeta a maneira como os commits s찾o exibidos mas n찾o a maneira como "
+"o \"diff\" 챕 exibido com `git log --raw` por exemplo. Para obter os nomes "
+"completos e sem abrevia챌천es dos objetos em formato diff bruto, use `--no-"
+"abbrev`."
#. type: Plain text
#: en/pretty-formats.txt:99
#, priority:260
msgid "'format:<string>'"
-msgstr ""
+msgstr "'format:<string>'"
#. type: Plain text
#: en/pretty-formats.txt:104
#, priority:260
msgid "The 'format:<string>' format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with '%n' instead of '\\n'."
msgstr ""
+"O formato 'format:<string>' permite especificar quais as informa챌천es que "
+"voc챗 deseja exibir. Funciona um pouco como o formato \"printf\" com a "
+"exce챌찾o not찼vel de que voc챗 obt챕m uma nova linha com '%n' em vez de '\\n"
+"'."
#. type: Plain text
#: en/pretty-formats.txt:107
#, priority:260
msgid "E.g, 'format:\"The author of %h was %an, %ar%nThe title was >>%s<<%n\"' would show something like this:"
msgstr ""
+"Por exemplo,'format:\"O autor do %h foi %an, %ar%nO t챠tulo era >>%s<<%n\"' "
+"exibir찼 algo como isso:"
#. type: delimited block -
#: en/pretty-formats.txt:111
@@ -58936,18 +60812,21 @@ msgid ""
"The author of fe6e0ee was Junio C Hamano, 23 hours ago\n"
"The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<\n"
msgstr ""
+"O autor do fe6e0ee foi Junio C Hamano, 23 houras atr찼s\n"
+"O t챠tulo era >>t4119: test autocomputing -p<n> for traditional diff input.<<"
+"\n"
#. type: Plain text
#: en/pretty-formats.txt:115
#, priority:260
msgid "The placeholders are:"
-msgstr ""
+msgstr "Os espa챌os reservados s찾o:"
#. type: Plain text
#: en/pretty-formats.txt:117
#, priority:260
msgid "Placeholders that expand to a single literal character:"
-msgstr ""
+msgstr "O Espa챌os reservados que se expandem para um 첬nico caractere literal:"
#. type: Labeled list
#: en/pretty-formats.txt:117
@@ -58957,34 +60836,34 @@ msgstr "'%n'"
#. type: Plain text
#: en/pretty-formats.txt:118
-#, fuzzy, priority:260
-#| msgid "a newline."
+#, priority:260
msgid "newline"
-msgstr "uma nova linha."
+msgstr "uma nova linha"
#. type: Plain text
#: en/pretty-formats.txt:119
#, priority:260
msgid "a raw '%'"
-msgstr ""
+msgstr "a raw '%'"
#. type: Labeled list
#: en/pretty-formats.txt:119
#, no-wrap, priority:260
msgid "'%x00'"
-msgstr ""
+msgstr "'%x00'"
#. type: Plain text
#: en/pretty-formats.txt:120
#, priority:260
msgid "print a byte from a hex code"
-msgstr ""
+msgstr "imprime um byte de um c처digo hexadecimal"
#. type: Plain text
#: en/pretty-formats.txt:122
#, priority:260
msgid "Placeholders that affect formatting of later placeholders:"
msgstr ""
+"Espa챌os reservados que afetam a formata챌찾o de espa챌os reservados posteriores:"
#. type: Labeled list
#: en/pretty-formats.txt:122
@@ -58996,7 +60875,7 @@ msgstr "'%Cred'"
#: en/pretty-formats.txt:123
#, priority:260
msgid "switch color to red"
-msgstr ""
+msgstr "muda de cor para o vermelho"
#. type: Labeled list
#: en/pretty-formats.txt:123
@@ -59008,7 +60887,7 @@ msgstr "'%Cgreen'"
#: en/pretty-formats.txt:124
#, priority:260
msgid "switch color to green"
-msgstr ""
+msgstr "muda de cor para o verde"
#. type: Labeled list
#: en/pretty-formats.txt:124
@@ -59020,7 +60899,7 @@ msgstr "'%Cblue'"
#: en/pretty-formats.txt:125
#, priority:260
msgid "switch color to blue"
-msgstr ""
+msgstr "mudar de cor para azul"
#. type: Labeled list
#: en/pretty-formats.txt:125
@@ -59030,28 +60909,37 @@ msgstr "'%Creset'"
#. type: Plain text
#: en/pretty-formats.txt:126
-#, fuzzy, priority:260
-#| msgid "color"
+#, priority:260
msgid "reset color"
-msgstr "cor"
+msgstr "redefine a cor"
#. type: Labeled list
#: en/pretty-formats.txt:126
#, ignore-ellipsis, no-wrap, priority:260
msgid "'%C(...)'"
-msgstr ""
+msgstr "'%C(...)'"
#. type: Plain text
#: en/pretty-formats.txt:127
#, priority:260
msgid "color specification, as described under Values in the"
-msgstr ""
+msgstr "especifica챌찾o de cores conforme descrito em Valores no"
#. type: Plain text
#: en/pretty-formats.txt:140
#, ignore-ellipsis, priority:260
msgid "\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors are shown only when enabled for log output (by `color.diff`, `color.ui`, or `--color`, and respecting the `auto` settings of the former if we are going to a terminal). `%C(auto,...)` is accepted as a historical synonym for the default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the colors even when color is not otherwise enabled (though consider just using `--color=always` to enable color for the whole output, including this format and anything else git might color). `auto` alone (i.e. `%C(auto)`) will turn on auto coloring on the next placeholders until the color is switched again."
msgstr ""
+"\"ARQUIVO DE CONFIGURA횉횄O\" se챌찾o do linkgit:git-config[1]. 횋 predefinido "
+"que as cores sejam exibidas apenas quando ativadas para na sa챠da do registro "
+"log (em `color.diff`,` color.ui` ou `color`, e respeitando as configura챌천es "
+"`auto` da primeira se estivermos indo para um terminal). `%C(auto,...)` 챕 "
+"aceito como um sin척nimo hist처rico do padr찾o (exemplo., `%C(auto,red)`). "
+"Especificar `%C(always,...)` exibir찼 as cores mesmo quando a cor n찾o estiver "
+"ativada (embora considere apenas usar `--color=always` para sempre ativar a "
+"cor na sa챠da incluindo este formato e qualquer outro que o git possa colorir)"
+". `auto` sozinho (ou seja,`%C(auto)`) ativar찼 a colora챌찾o autom찼tica nos "
+"pr처ximos espa챌os reservados at챕 que a cor seja trocada novamente."
#. type: Labeled list
#: en/pretty-formats.txt:140
@@ -59063,19 +60951,19 @@ msgstr "'%m'"
#: en/pretty-formats.txt:141
#, priority:260
msgid "left (`<`), right (`>`) or boundary (`-`) mark"
-msgstr ""
+msgstr "marca esquerda (`<`), direita (`>`) ou limite (`-`)"
#. type: Labeled list
#: en/pretty-formats.txt:141
#, no-wrap, priority:260
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
-msgstr ""
+msgstr "'%w([<w>[,<i1>[,<i2>]]])'"
#. type: Plain text
#: en/pretty-formats.txt:142
#, priority:260
msgid "switch line wrapping, like the -w option of"
-msgstr ""
+msgstr "alterna a quebra de linha, como a op챌찾o `-w` de"
#. type: Plain text
#: en/pretty-formats.txt:143
@@ -59087,97 +60975,106 @@ msgstr "linkgit:git-shortlog[1]."
#: en/pretty-formats.txt:143
#, no-wrap, priority:260
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
-msgstr ""
+msgstr "'%<(<N>[,trunc|ltrunc|mtrunc])'"
#. type: Plain text
#: en/pretty-formats.txt:144
#, priority:260
msgid "make the next placeholder take at"
-msgstr ""
+msgstr "fa챌a com que o pr처ximo espa챌o reservado leve em"
#. type: Plain text
#: en/pretty-formats.txt:151
#, priority:260
msgid "least N columns, padding spaces on the right if necessary. Optionally truncate at the beginning (ltrunc), the middle (mtrunc) or the end (trunc) if the output is longer than N columns. Note that truncating only works correctly with N >= 2."
msgstr ""
+"menos N colunas, preenchendo espa챌os 횪 direita, se necess찼rio. "
+"Opcionalmente, truncar no in챠cio (ltrunc), no meio (mtrunc) ou no final "
+"(trunc) caso a sa챠da seja maior que N colunas. Observe que o truncamento "
+"funciona corretamente com N >= 2."
#. type: Labeled list
#: en/pretty-formats.txt:151
#, no-wrap, priority:260
msgid "'%<|(<N>)'"
-msgstr ""
+msgstr "'%<|(<N>)'"
#. type: Plain text
#: en/pretty-formats.txt:152
#, priority:260
msgid "make the next placeholder take at least until Nth"
-msgstr ""
+msgstr "fa챌a com que o pr처ximo espa챌o reservado leve pelo menos at챕 a en챕sima"
#. type: Plain text
#: en/pretty-formats.txt:153
#, priority:260
msgid "columns, padding spaces on the right if necessary"
-msgstr ""
+msgstr "colunas, preenchimento de espa챌os 횪 direita se necess찼rio"
#. type: Labeled list
#: en/pretty-formats.txt:153
#, no-wrap, priority:260
msgid "'%>(<N>)', '%>|(<N>)'"
-msgstr ""
+msgstr "'%>(<N>)', '%>|(<N>)'"
#. type: Plain text
#: en/pretty-formats.txt:154
#, priority:260
msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
-msgstr ""
+msgstr "semelhante a '%<(<N>)', '%<|(<N>)' respectivamente,"
#. type: Plain text
#: en/pretty-formats.txt:155
#, priority:260
msgid "but padding spaces on the left"
-msgstr ""
+msgstr "mas com espa챌os de preenchimento 횪 esquerda"
#. type: Labeled list
#: en/pretty-formats.txt:155
#, no-wrap, priority:260
msgid "'%>>(<N>)', '%>>|(<N>)'"
-msgstr ""
+msgstr "'%>>(<N>)', '%>>|(<N>)'"
#. type: Plain text
#: en/pretty-formats.txt:156
#, priority:260
msgid "similar to '%>(<N>)', '%>|(<N>)'"
-msgstr ""
+msgstr "semelhante a '%>(<N>)', '%>|(<N>)'"
#. type: Plain text
#: en/pretty-formats.txt:160
#, priority:260
msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
msgstr ""
+"respectivamente, exceto que caso o pr처ximo espa챌o reservado ocupe mais "
+"espa챌os do que o fornecido e houver espa챌os 횪 esquerda, use estes espa챌os"
#. type: Labeled list
#: en/pretty-formats.txt:160
#, no-wrap, priority:260
msgid "'%><(<N>)', '%><|(<N>)'"
-msgstr ""
+msgstr "'%><(<N>)', '%><|(<N>)'"
#. type: Plain text
#: en/pretty-formats.txt:161
#, priority:260
msgid "similar to '%<(<N>)', '%<|(<N>)'"
-msgstr ""
+msgstr "semelhante a '%<(<N>)', '%<|(<N>)'"
#. type: Plain text
#: en/pretty-formats.txt:163
#, priority:260
msgid "respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
+"respectivamente, mas preenchendo os dois lados (ou seja, o texto 챕 "
+"centralizado)"
#. type: Plain text
#: en/pretty-formats.txt:165
#, priority:260
msgid "Placeholders that expand to information extracted from the commit:"
msgstr ""
+"Espa챌os reservados que se expandem para as informa챌천es extra챠das do commit:"
#. type: Labeled list
#: en/pretty-formats.txt:165
@@ -59187,10 +61084,9 @@ msgstr "'%H'"
#. type: Plain text
#: en/pretty-formats.txt:166
-#, fuzzy, priority:260
-#| msgid "`commit`"
+#, priority:260
msgid "commit hash"
-msgstr "`commit`"
+msgstr "hash do commit"
#. type: Labeled list
#: en/pretty-formats.txt:166
@@ -59200,10 +61096,9 @@ msgstr "'%h'"
#. type: Plain text
#: en/pretty-formats.txt:167
-#, fuzzy, priority:260
-#| msgid "--abbrev-commit"
+#, priority:260
msgid "abbreviated commit hash"
-msgstr "--abbrev-commit"
+msgstr "abrevia챌찾o do hash do commit"
#. type: Labeled list
#: en/pretty-formats.txt:167
@@ -59213,10 +61108,9 @@ msgstr "'%T'"
#. type: Plain text
#: en/pretty-formats.txt:168
-#, fuzzy, priority:260
-#| msgid "<tree-ish>"
+#, priority:260
msgid "tree hash"
-msgstr "<tree-ish>"
+msgstr "hash da 찼rvore"
#. type: Labeled list
#: en/pretty-formats.txt:168
@@ -59228,7 +61122,7 @@ msgstr "'%t'"
#: en/pretty-formats.txt:169
#, priority:260
msgid "abbreviated tree hash"
-msgstr ""
+msgstr "hash abreviado da 찼rvore"
#. type: Labeled list
#: en/pretty-formats.txt:169
@@ -59238,10 +61132,9 @@ msgstr "'%P'"
#. type: Plain text
#: en/pretty-formats.txt:170
-#, fuzzy, priority:260
-#| msgid "--parents"
+#, priority:260
msgid "parent hashes"
-msgstr "--parents"
+msgstr "hash das matrizes"
#. type: Labeled list
#: en/pretty-formats.txt:170
@@ -59253,7 +61146,7 @@ msgstr "'%p'"
#: en/pretty-formats.txt:171
#, priority:260
msgid "abbreviated parent hashes"
-msgstr ""
+msgstr "hash abreviado das matrizes"
#. type: Labeled list
#: en/pretty-formats.txt:171
@@ -59263,10 +61156,9 @@ msgstr "'%an'"
#. type: Plain text
#: en/pretty-formats.txt:172
-#, fuzzy, priority:260
-#| msgid "pathname"
+#, priority:260
msgid "author name"
-msgstr "caminho do diret처rio"
+msgstr "nome do autor"
#. type: Labeled list
#: en/pretty-formats.txt:172
@@ -59278,14 +61170,13 @@ msgstr "'%aN'"
#: en/pretty-formats.txt:173
#, priority:260
msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+msgstr "nome do autor (respeitando o .mailmap, consulte linkgit:git-shortlog[1]"
#. type: Plain text
#: en/pretty-formats.txt:174 en/pretty-formats.txt:177
-#, fuzzy, priority:260
-#| msgid "linkgit:git-blame[1]"
+#, priority:260
msgid "or linkgit:git-blame[1])"
-msgstr "linkgit:git-blame[1]"
+msgstr "ou linkgit:git-blame[1]"
#. type: Labeled list
#: en/pretty-formats.txt:174
@@ -59295,10 +61186,9 @@ msgstr "'%ae'"
#. type: Plain text
#: en/pretty-formats.txt:175
-#, fuzzy, priority:260
-#| msgid "`author`"
+#, priority:260
msgid "author email"
-msgstr "`author`"
+msgstr "e-mail do autor"
#. type: Labeled list
#: en/pretty-formats.txt:175
@@ -59310,7 +61200,7 @@ msgstr "'%aE'"
#: en/pretty-formats.txt:176
#, priority:260
msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
-msgstr ""
+msgstr "email do autor (respeitando .mailmap, consulte linkgit:git-shortlog[1]"
#. type: Labeled list
#: en/pretty-formats.txt:177
@@ -59322,7 +61212,7 @@ msgstr "'%al'"
#: en/pretty-formats.txt:178 en/pretty-formats.txt:194
#, priority:260
msgid "author email local-part (the part before the '@' sign)"
-msgstr ""
+msgstr "parte local do e-mail do autor (a parte antes do sinal '@')"
#. type: Labeled list
#: en/pretty-formats.txt:178
@@ -59334,14 +61224,13 @@ msgstr "'%aL'"
#: en/pretty-formats.txt:179
#, priority:260
msgid "author local-part (see '%al') respecting .mailmap, see"
-msgstr ""
+msgstr "parte local do autor (consulte '%al') respeitando .mailmap, consulte"
#. type: Plain text
#: en/pretty-formats.txt:180 en/pretty-formats.txt:190 en/pretty-formats.txt:193 en/pretty-formats.txt:196 en/pretty-formats.txt:241 en/pretty-formats.txt:244
-#, fuzzy, priority:260
-#| msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+#, priority:260
msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
-msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
+msgstr "linkgit:git-shortlog[1] ou linkgit:git-blame[1])"
#. type: Labeled list
#: en/pretty-formats.txt:180
@@ -59353,7 +61242,7 @@ msgstr "'%ad'"
#: en/pretty-formats.txt:181
#, priority:260
msgid "author date (format respects --date= option)"
-msgstr ""
+msgstr "data do autor (o formato respeita a op챌찾o --date=)"
#. type: Labeled list
#: en/pretty-formats.txt:181
@@ -59365,7 +61254,7 @@ msgstr "'%aD'"
#: en/pretty-formats.txt:182
#, priority:260
msgid "author date, RFC2822 style"
-msgstr ""
+msgstr "data do autor, no padr찾o RFC2822"
#. type: Labeled list
#: en/pretty-formats.txt:182
@@ -59375,10 +61264,9 @@ msgstr "'%ar'"
#. type: Plain text
#: en/pretty-formats.txt:183
-#, fuzzy, priority:260
-#| msgid "--author-date-order"
+#, priority:260
msgid "author date, relative"
-msgstr "--author-date-order"
+msgstr "data do autor, relativa"
#. type: Labeled list
#: en/pretty-formats.txt:183
@@ -59390,7 +61278,7 @@ msgstr "'%at'"
#: en/pretty-formats.txt:184
#, priority:260
msgid "author date, UNIX timestamp"
-msgstr ""
+msgstr "data do autor, com registro de data e hora em formato UNIX"
#. type: Labeled list
#: en/pretty-formats.txt:184
@@ -59402,7 +61290,7 @@ msgstr "'%ai'"
#: en/pretty-formats.txt:185
#, priority:260
msgid "author date, ISO 8601-like format"
-msgstr ""
+msgstr "data do autor, formato parecido com ISO 8601"
#. type: Labeled list
#: en/pretty-formats.txt:185
@@ -59414,7 +61302,7 @@ msgstr "'%aI'"
#: en/pretty-formats.txt:186
#, priority:260
msgid "author date, strict ISO 8601 format"
-msgstr ""
+msgstr "data do autor, formato rigoroso ao padr찾o ISO 8601"
#. type: Labeled list
#: en/pretty-formats.txt:186
@@ -59426,7 +61314,7 @@ msgstr "'%as'"
#: en/pretty-formats.txt:187
#, priority:260
msgid "author date, short format (`YYYY-MM-DD`)"
-msgstr ""
+msgstr "data do autor, formato curto (`AAAA-MM-DD`)"
#. type: Labeled list
#: en/pretty-formats.txt:187
@@ -59436,10 +61324,9 @@ msgstr "'%cn'"
#. type: Plain text
#: en/pretty-formats.txt:188
-#, fuzzy, priority:260
-#| msgid "`committer`"
+#, priority:260
msgid "committer name"
-msgstr "`committer`"
+msgstr "nome de quem fez o commit"
#. type: Labeled list
#: en/pretty-formats.txt:188
@@ -59451,7 +61338,7 @@ msgstr "'%cN'"
#: en/pretty-formats.txt:189
#, priority:260
msgid "committer name (respecting .mailmap, see"
-msgstr ""
+msgstr "nome de quem fez o commit (respeitando .mailmap, consulte"
#. type: Labeled list
#: en/pretty-formats.txt:190
@@ -59461,10 +61348,9 @@ msgstr "'%ce'"
#. type: Plain text
#: en/pretty-formats.txt:191
-#, fuzzy, priority:260
-#| msgid "`committer`"
+#, priority:260
msgid "committer email"
-msgstr "`committer`"
+msgstr "endere챌o do e-mail de quem fez o commit"
#. type: Labeled list
#: en/pretty-formats.txt:191
@@ -59476,7 +61362,7 @@ msgstr "'%cE'"
#: en/pretty-formats.txt:192
#, priority:260
msgid "committer email (respecting .mailmap, see"
-msgstr ""
+msgstr "e-mail de quem fez o commit (respeitando .mailmap, consulte"
#. type: Labeled list
#: en/pretty-formats.txt:193
@@ -59494,7 +61380,7 @@ msgstr "'%cL'"
#: en/pretty-formats.txt:195
#, priority:260
msgid "author local-part (see '%cl') respecting .mailmap, see"
-msgstr ""
+msgstr "parte local do autor (consulte '%cl') respeitando .mailmap, consulte"
#. type: Labeled list
#: en/pretty-formats.txt:196
@@ -59506,7 +61392,7 @@ msgstr "'%cd'"
#: en/pretty-formats.txt:197
#, priority:260
msgid "committer date (format respects --date= option)"
-msgstr ""
+msgstr "data do commit (o formato respeita a op챌찾o --date=)"
#. type: Labeled list
#: en/pretty-formats.txt:197
@@ -59518,7 +61404,7 @@ msgstr "'%cD'"
#: en/pretty-formats.txt:198
#, priority:260
msgid "committer date, RFC2822 style"
-msgstr ""
+msgstr "data do commit, no padr찾o RFC2822"
#. type: Labeled list
#: en/pretty-formats.txt:198
@@ -59528,10 +61414,9 @@ msgstr "'%cr'"
#. type: Plain text
#: en/pretty-formats.txt:199
-#, fuzzy, priority:260
-#| msgid "--committer-date-is-author-date"
+#, priority:260
msgid "committer date, relative"
-msgstr "--committer-date-is-author-date"
+msgstr "data do commit, relativa"
#. type: Labeled list
#: en/pretty-formats.txt:199
@@ -59543,7 +61428,7 @@ msgstr "'%ct'"
#: en/pretty-formats.txt:200
#, priority:260
msgid "committer date, UNIX timestamp"
-msgstr ""
+msgstr "data do commit, com registro de data e hora em formato UNIX"
#. type: Labeled list
#: en/pretty-formats.txt:200
@@ -59555,7 +61440,7 @@ msgstr "'%ci'"
#: en/pretty-formats.txt:201
#, priority:260
msgid "committer date, ISO 8601-like format"
-msgstr ""
+msgstr "data do commit, formato parecido com ISO 8601"
#. type: Labeled list
#: en/pretty-formats.txt:201
@@ -59567,7 +61452,7 @@ msgstr "'%cI'"
#: en/pretty-formats.txt:202
#, priority:260
msgid "committer date, strict ISO 8601 format"
-msgstr ""
+msgstr "data do commit, formato rigoroso ao padr찾o ISO 8601"
#. type: Labeled list
#: en/pretty-formats.txt:202
@@ -59579,7 +61464,7 @@ msgstr "'%cs'"
#: en/pretty-formats.txt:203
#, priority:260
msgid "committer date, short format (`YYYY-MM-DD`)"
-msgstr ""
+msgstr "data do commit, formato curto (`AAAA-MM-DD`)"
#. type: Labeled list
#: en/pretty-formats.txt:203
@@ -59592,6 +61477,7 @@ msgstr "'%d'"
#, priority:260
msgid "ref names, like the --decorate option of linkgit:git-log[1]"
msgstr ""
+"nomes de refer챗ncia \"ref\", como a op챌찾o --decorate do linkgit:git-log[1]"
#. type: Labeled list
#: en/pretty-formats.txt:204
@@ -59603,19 +61489,19 @@ msgstr "'%D'"
#: en/pretty-formats.txt:205
#, priority:260
msgid "ref names without the \" (\", \")\" wrapping."
-msgstr ""
+msgstr "nomes de refer챗ncia \"ref\" sem quebra autom찼tica \" (\", \")\"."
#. type: Plain text
#: en/pretty-formats.txt:206
#, priority:260
msgid "ref name given on the command line by which the commit was reached"
-msgstr ""
+msgstr "nomes \"ref\" dado na linha de comando pela qual o commit foi alcan챌ado"
#. type: Plain text
#: en/pretty-formats.txt:207
#, priority:260
msgid "(like `git log --source`), only works with `git log`"
-msgstr ""
+msgstr "(como `git log --source`), s처 funciona com `git log`"
#. type: Labeled list
#: en/pretty-formats.txt:207
@@ -59627,14 +61513,13 @@ msgstr "'%e'"
#: en/pretty-formats.txt:208
#, priority:260
msgid "encoding"
-msgstr ""
+msgstr "codifica챌찾o"
#. type: Plain text
#: en/pretty-formats.txt:209
-#, fuzzy, priority:260
-#| msgid "--keep-subject"
+#, priority:260
msgid "subject"
-msgstr "--keep-subject"
+msgstr "assunto"
#. type: Labeled list
#: en/pretty-formats.txt:209
@@ -59646,7 +61531,7 @@ msgstr "'%f'"
#: en/pretty-formats.txt:210
#, priority:260
msgid "sanitized subject line, suitable for a filename"
-msgstr ""
+msgstr "linha do assunto higienizado, adequado para um nome de arquivo"
#. type: Labeled list
#: en/pretty-formats.txt:210
@@ -59658,7 +61543,7 @@ msgstr "'%b'"
#: en/pretty-formats.txt:211
#, priority:260
msgid "body"
-msgstr ""
+msgstr "corpo"
#. type: Labeled list
#: en/pretty-formats.txt:211
@@ -59670,7 +61555,7 @@ msgstr "'%B'"
#: en/pretty-formats.txt:212
#, priority:260
msgid "raw body (unwrapped subject and body)"
-msgstr ""
+msgstr "corpo bruto (assunto e corpo da mensagem desembrulhados)"
#. type: Labeled list
#: en/pretty-formats.txt:213
@@ -59680,10 +61565,9 @@ msgstr "'%N'"
#. type: Plain text
#: en/pretty-formats.txt:214
-#, fuzzy, priority:260
-#| msgid "`committer`"
+#, priority:260
msgid "commit notes"
-msgstr "`committer`"
+msgstr "anota챌천es de quem fez o commit"
#. type: Labeled list
#: en/pretty-formats.txt:215
@@ -59695,25 +61579,30 @@ msgstr "'%GG'"
#: en/pretty-formats.txt:216
#, priority:260
msgid "raw verification message from GPG for a signed commit"
-msgstr ""
+msgstr "verifica챌찾o bruta da mensagem vinda do GPG para um commit assinado"
#. type: Labeled list
#: en/pretty-formats.txt:216
#, no-wrap, priority:260
msgid "'%G?'"
-msgstr ""
+msgstr "'%G?'"
#. type: Plain text
#: en/pretty-formats.txt:217
#, priority:260
msgid "show \"G\" for a good (valid) signature,"
-msgstr ""
+msgstr "exibe \"G\" para obter uma boa assinatura (v찼lida),"
#. type: Plain text
#: en/pretty-formats.txt:224
#, priority:260
msgid "\"B\" for a bad signature, \"U\" for a good signature with unknown validity, \"X\" for a good signature that has expired, \"Y\" for a good signature made by an expired key, \"R\" for a good signature made by a revoked key, \"E\" if the signature cannot be checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
+"\"B\" para uma assinatura ruim, \"U\" para uma boa assinatura com validade "
+"desconhecida, \"X\" para uma boa assinatura que expirou, \"Y\" para uma boa "
+"assinatura feita por uma chave expirada, \"R\" para uma boa assinatura feita "
+"por uma chave revogada, \"E\" caso a assinatura n찾o possa ser verificada ("
+"por exemplo, uma chave ausente) e \"N\" sem assinatura"
#. type: Labeled list
#: en/pretty-formats.txt:224
@@ -59725,7 +61614,7 @@ msgstr "'%GS'"
#: en/pretty-formats.txt:225
#, priority:260
msgid "show the name of the signer for a signed commit"
-msgstr ""
+msgstr "exibe o nome do assinante de um commit assinado"
#. type: Labeled list
#: en/pretty-formats.txt:225
@@ -59737,7 +61626,7 @@ msgstr "'%GK'"
#: en/pretty-formats.txt:226
#, priority:260
msgid "show the key used to sign a signed commit"
-msgstr ""
+msgstr "exibe a chave usada para assinar um commit assinado"
#. type: Labeled list
#: en/pretty-formats.txt:226
@@ -59750,6 +61639,7 @@ msgstr "'%GF'"
#, priority:260
msgid "show the fingerprint of the key used to sign a signed commit"
msgstr ""
+"mostra a impress찾o digital da chave usada para assinar um commit assinado"
#. type: Labeled list
#: en/pretty-formats.txt:227
@@ -59761,13 +61651,13 @@ msgstr "'%GP'"
#: en/pretty-formats.txt:228
#, priority:260
msgid "show the fingerprint of the primary key whose subkey was used"
-msgstr ""
+msgstr "mostra a impress찾o digital da chave prim찼ria cuja subchave foi usada"
#. type: Plain text
#: en/pretty-formats.txt:229
#, priority:260
msgid "to sign a signed commit"
-msgstr ""
+msgstr "para assinar um commit assinado"
#. type: Labeled list
#: en/pretty-formats.txt:229
@@ -59780,6 +61670,7 @@ msgstr "'%GT'"
#, priority:260
msgid "show the trust level for the key used to sign a signed commit"
msgstr ""
+"exiba o n챠vel de confian챌a da chave usada para assinar um commit assinado"
#. type: Labeled list
#: en/pretty-formats.txt:230
@@ -59791,13 +61682,16 @@ msgstr "'%gD'"
#: en/pretty-formats.txt:231
#, priority:260
msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
-msgstr ""
+msgstr "seletor do \"reflog\", por exemplo, `refs/stash@{1}` ou `refs/stash@{2"
#. type: Plain text
#: en/pretty-formats.txt:235
#, priority:260
msgid "minutes ago}`; the format follows the rules described for the `-g` option. The portion before the `@` is the refname as given on the command line (so `git log -g refs/heads/master` would yield `refs/heads/master@{0}`)."
msgstr ""
+"minutos atr찼s} `; o formato segue as regras descritas para a op챌찾o `-g`. A "
+"parte antes ao `@` 챕 o \"refname\", conforme indicado na linha de comando ("
+"portanto, `git log -g refs/heads/master` produziria `refs/heads/master@{0}`)."
#. type: Labeled list
#: en/pretty-formats.txt:235
@@ -59809,13 +61703,15 @@ msgstr "'%gd'"
#: en/pretty-formats.txt:236
#, priority:260
msgid "shortened reflog selector; same as `%gD`, but the refname"
-msgstr ""
+msgstr "seletor do reflog encurtado; o mesmo que `%gD`, menos o \"refname\""
#. type: Plain text
#: en/pretty-formats.txt:238
#, priority:260
msgid "portion is shortened for human readability (so `refs/heads/master` becomes just `master`)."
msgstr ""
+"a parte 챕 reduzida visando a legibilidade humana (assim, `refs/heads/master` "
+"se torna apenas `master`)."
#. type: Labeled list
#: en/pretty-formats.txt:238
@@ -59827,7 +61723,7 @@ msgstr "'%gn'"
#: en/pretty-formats.txt:239
#, priority:260
msgid "reflog identity name"
-msgstr ""
+msgstr "nome da identidade \"reflog\""
#. type: Labeled list
#: en/pretty-formats.txt:239
@@ -59839,7 +61735,7 @@ msgstr "'%gN'"
#: en/pretty-formats.txt:240
#, priority:260
msgid "reflog identity name (respecting .mailmap, see"
-msgstr ""
+msgstr "nome da identidade \"reflog\" (respeitando .mailmap, consulte"
#. type: Labeled list
#: en/pretty-formats.txt:241
@@ -59851,7 +61747,7 @@ msgstr "'%ge'"
#: en/pretty-formats.txt:242
#, priority:260
msgid "reflog identity email"
-msgstr ""
+msgstr "e-mail da identidade reflog"
#. type: Labeled list
#: en/pretty-formats.txt:242
@@ -59863,7 +61759,7 @@ msgstr "'%gE'"
#: en/pretty-formats.txt:243
#, priority:260
msgid "reflog identity email (respecting .mailmap, see"
-msgstr ""
+msgstr "e-mail da identidade reflog (respeitando .mailmap, consulte"
#. type: Labeled list
#: en/pretty-formats.txt:244
@@ -59881,19 +61777,22 @@ msgstr ""
#: en/pretty-formats.txt:245
#, no-wrap, priority:260
msgid "'%(trailers[:options])'"
-msgstr ""
+msgstr "'%(trailers[:options])'"
#. type: Plain text
#: en/pretty-formats.txt:246
#, priority:260
msgid "display the trailers of the body as"
-msgstr ""
+msgstr "exiba os sinais de resposta no corpo da mensagem como"
#. type: Plain text
#: en/pretty-formats.txt:250
#, priority:260
msgid "interpreted by linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by a colon and zero or more comma-separated options:"
msgstr ""
+"interpretado por linkgit:git-interpret-trailers[1]. A carreira de caracteres "
+"de resposta pode ser seguida por dois pontos e zero ou mais op챌천es separadas "
+"por v챠rgula:"
#. type: Plain text
#: en/pretty-formats.txt:258
@@ -60018,6 +61917,8 @@ msgstr ""
#, priority:260
msgid "Note: you can specify the default pretty format in the repository configuration (see linkgit:git-config[1])."
msgstr ""
+"Nota: voc챗 pode especificar o formato \"pretty\" padr찾o na configura챌찾o do "
+"reposit처rio (consulte linkgit:git-config[1])."
#. type: Labeled list
#: en/pretty-options.txt:17
@@ -60096,12 +61997,19 @@ msgstr ""
#, priority:260
msgid "Show the notes (see linkgit:git-notes[1]) that annotate the commit, when showing the commit log message. This is the default for `git log`, `git show` and `git whatchanged` commands when there is no `--pretty`, `--format`, or `--oneline` option given on the command line."
msgstr ""
+"Exiba as anota챌천es (consulte linkgit:git-notes[1]) que acompanham o commit "
+"durante a exibi챌찾o da mensagem de configura챌찾o do registro log. Este 챕 o "
+"padr찾o para os comandos `git log`, `git show` e `git whatchanged` quando n찾o "
+"houver as op챌천es `--pretty`, `--format`, ou `--oneline` na linha de comando."
#. type: Plain text
#: en/pretty-options.txt:70
#, priority:260
msgid "By default, the notes shown are from the notes refs listed in the `core.notesRef` and `notes.displayRef` variables (or corresponding environment overrides). See linkgit:git-config[1] for more details."
msgstr ""
+"횋 predefinido que as notas exibidas s찾o das notas relocadas nas vari찼veis "
+"'core.notesRef' e 'notes.displayRef' (ou substitui챌천es de ambiente "
+"correspondentes). Consulte linkgit:git-config[1] para obter mais detalhes."
#. type: Plain text
#: en/pretty-options.txt:75
@@ -60123,10 +62031,9 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:88
-#, fuzzy, no-wrap, priority:260
-#| msgid "--shallow-since=<date>"
+#, no-wrap, priority:260
msgid "--show-notes[=<ref>]"
-msgstr "--shallow-since=<data>"
+msgstr "--show-notes[=<ref>]"
#. type: Labeled list
#: en/pretty-options.txt:89
@@ -60169,6 +62076,8 @@ msgstr ""
#, priority:220
msgid "A name referring to a list of repositories as the value of remotes.<group> in the configuration file. (See linkgit:git-config[1])."
msgstr ""
+"Um nome referente para a lista de reposit처rios como o valor no arquivo de "
+"configura챌찾o `remotes.<group>`. (Consulte linkgit:git-config[1])."
#. type: Labeled list
#: en/pull-fetch-param.txt:14
@@ -60192,7 +62101,7 @@ msgstr ""
#: en/pull-fetch-param.txt:23
#, no-wrap, priority:220
msgid "\t(see linkgit:git-fetch[1]).\n"
-msgstr ""
+msgstr "\t(consulte linkgit:git-fetch[1]).\n"
#. type: Plain text
#: en/pull-fetch-param.txt:31
@@ -60258,133 +62167,182 @@ msgstr ""
#: en/revisions.txt:2
#, no-wrap, priority:100
msgid "SPECIFYING REVISIONS"
-msgstr ""
+msgstr "ESPECIFICANDO REVIS횛ES"
#. type: Plain text
#: en/revisions.txt:9
#, priority:100
msgid "A revision parameter '<rev>' typically, but not necessarily, names a commit object. It uses what is called an 'extended SHA-1' syntax. Here are various ways to spell object names. The ones listed near the end of this list name trees and blobs contained in a commit."
msgstr ""
+"Um par창metro de revis찾o '<rev>' normalmente, mas n찾o necessariamente, d찼 "
+"nome a um objeto commit. Utiliza o que 챕 chamado de uma sintaxe 'extended "
+"SHA-1'. Aqui est찾o as v찼rias maneiras de soletrar os nomes dos objetos. Os "
+"listados pr처ximos do final desta lista nomeiam 찼rvores e gotas contidos em "
+"uma confirma챌찾o."
#. type: Plain text
#: en/revisions.txt:13
#, priority:100
msgid "This document shows the \"raw\" syntax as seen by git. The shell and other UIs might require additional quoting to protect special characters and to avoid word splitting."
msgstr ""
+"Este documento demonstra a sintaxe \"bruta\" como vista pelo git. O shell e "
+"outras UIs podem exigir cita챌천es adicionais para proteger os caracteres "
+"especiais e evitar a divis찾o de palavras."
#. type: Labeled list
#: en/revisions.txt:14
#, no-wrap, priority:100
msgid "'<sha1>', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'"
-msgstr ""
+msgstr "'<sha1>', exemplo. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'"
#. type: Plain text
#: en/revisions.txt:20
#, priority:100
msgid "The full SHA-1 object name (40-byte hexadecimal string), or a leading substring that is unique within the repository. E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both name the same commit object if there is no other object in your repository whose object name starts with dae86e."
msgstr ""
+"O nome completo do objeto SHA-1 (a sequ챗ncia hexadecimal com 40-bytes) ou "
+"uma carreira de caracteres que 챕 exclusiva e 첬nica no reposit처rio. Por "
+"exemplo, dae86e1950b1277e545cee180551750029cfe735 e dae86e nomeiam o mesmo "
+"objeto commit caso n찾o haja um outro objeto em seu reposit처rio cujo nome "
+"comece com daee."
#. type: Labeled list
#: en/revisions.txt:21
#, no-wrap, priority:100
msgid "'<describeOutput>', e.g. 'v1.7.4.2-679-g3bee7fb'"
-msgstr ""
+msgstr "'<describeOutput>', exemplo. 'v1.7.4.2-679-g3bee7fb'"
#. type: Plain text
#: en/revisions.txt:25
#, priority:100
msgid "Output from `git describe`; i.e. a closest tag, optionally followed by a dash and a number of commits, followed by a dash, a 'g', and an abbreviated object name."
msgstr ""
+"A sa챠da do `git describe`; ou seja, um tag mais pr처ximo opcionalmente "
+"seguido por um tra챌o e um n첬mero do commit seguido por um tra챌o, um 'g' e um "
+"nome abreviado do objeto."
#. type: Labeled list
#: en/revisions.txt:26
#, no-wrap, priority:100
msgid "'<refname>', e.g. 'master', 'heads/master', 'refs/heads/master'"
-msgstr ""
+msgstr "'<refname>', exemplo. 'master', 'heads/master', 'refs/heads/master'"
#. type: Plain text
#: en/revisions.txt:33
#, priority:100
msgid "A symbolic ref name. E.g. 'master' typically means the commit object referenced by 'refs/heads/master'. If you happen to have both 'heads/master' and 'tags/master', you can explicitly say 'heads/master' to tell Git which one you mean. When ambiguous, a '<refname>' is disambiguated by taking the first match in the following rules:"
msgstr ""
+"Um nome simb처lico `ref`. 'master' por exemplo, significa que o objeto de "
+"commit tem refer챗ncia com 'refs/heads/master'. Caso aconte챌a de haver ambos "
+"os 'heads/master' ou 'tags/master', voc챗 pode explicitamente usar 'heads/"
+"master' para informar o Git qual deles quer. Quando amb챠guo, um '<refname>' "
+"que desperte d첬vidas 챕 interpretado atrav챕s da primeira coincid챗ncia de "
+"acordo com as seguintes regras:"
#. type: Plain text
#: en/revisions.txt:37
#, priority:100
msgid "If '$GIT_DIR/<refname>' exists, that is what you mean (this is usually useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD`, `MERGE_HEAD` and `CHERRY_PICK_HEAD`);"
msgstr ""
+"Caso '$GIT_DIR/<refname>' exista, quando 챕 isso o que voc챗 quer dizer ("
+"geralmente 챕 apenas 첬til para `HEAD`, `FETCH_HEAD`, `ORIG_HEAD`, `MERGE_HEAD`"
+" e `CHERRY_PICK_HEAD`);"
#. type: Plain text
#: en/revisions.txt:39
#, priority:100
msgid "otherwise, 'refs/<refname>' if it exists;"
-msgstr ""
+msgstr "caso contr찼rio, use 'refs/<refname>' caso exista;"
#. type: Plain text
#: en/revisions.txt:41
#, priority:100
msgid "otherwise, 'refs/tags/<refname>' if it exists;"
-msgstr ""
+msgstr "caso contr찼rio, use 'refs/tags/<refname>' caso exista;"
#. type: Plain text
#: en/revisions.txt:43
#, priority:100
msgid "otherwise, 'refs/heads/<refname>' if it exists;"
-msgstr ""
+msgstr "caso contr찼rio, use 'refs/heads/<refname>' caso exista;"
#. type: Plain text
#: en/revisions.txt:45
#, priority:100
msgid "otherwise, 'refs/remotes/<refname>' if it exists;"
-msgstr ""
+msgstr "caso contr찼rio, use 'refs/remotes/<refname>' caso exista;"
#. type: Plain text
#: en/revisions.txt:47
#, priority:100
msgid "otherwise, 'refs/remotes/<refname>/HEAD' if it exists."
-msgstr ""
+msgstr "caso contr찼rio, use 'refs/remotes/<refname>/HEAD' caso exista."
#. type: Plain text
#: en/revisions.txt:59
#, priority:100
msgid "`HEAD` names the commit on which you based the changes in the working tree. `FETCH_HEAD` records the branch which you fetched from a remote repository with your last `git fetch` invocation. `ORIG_HEAD` is created by commands that move your `HEAD` in a drastic way, to record the position of the `HEAD` before their operation, so that you can easily change the tip of the branch back to the state before you ran them. `MERGE_HEAD` records the commit(s) which you are merging into your branch when you run `git merge`. `CHERRY_PICK_HEAD` records the commit which you are cherry-picking when you run `git cherry-pick`."
msgstr ""
+"`HEAD` nomeia o commit no qual voc챗 teve como base as altera챌천es na 찼rvore "
+"de trabalho. `FETCH_HEAD` registra em qual ramo voc챗 buscou no reposit처rio "
+"remoto com a sua 첬ltima invoca챌찾o `git fetch`. `ORIG_HEAD` 챕 criado por "
+"comandos que movem seu` HEAD` de uma maneira dr찼stica, para registrar a "
+"posi챌찾o do `HEAD` antes da sua opera챌찾o, para que voc챗 possa facilmente "
+"mudar a ponta do ramo de volta ao estado anterior a sua execu챌찾o. "
+"`MERGE_HEAD` registra os commits que voc챗 est찼 mesclando no seu ramo quando "
+"voc챗 executa o comando `git merge`. `CHERRY_PICK_HEAD` registra o commit "
+"que voc챗 est찼 escolhendo quando executa o comando `git cherry-pick`."
#. type: Plain text
#: en/revisions.txt:64
#, priority:100
msgid "Note that any of the 'refs/*' cases above may come either from the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file. While the ref name encoding is unspecified, UTF-8 is preferred as some output processing may assume ref names in UTF-8."
msgstr ""
+"Observe que em qualquer um dos casos o 'refs/*' acima pode vir do diret처rio "
+"`$GIT_DIR/refs` ou do arquivo`$ GIT_DIR/packed-refs`. Embora a codifica챌찾o "
+"do nome de refer챗ncia n찾o seja especificado, o UTF-8 챕 o predefinido pois "
+"algum processamento de sa챠da pode assumir nomes `ref` em UTF-8."
#. type: Labeled list
#: en/revisions.txt:65
#, no-wrap, priority:100
msgid "'@'"
-msgstr ""
+msgstr "'@'"
#. type: Plain text
#: en/revisions.txt:67
#, priority:100
msgid "'@' alone is a shortcut for `HEAD`."
-msgstr ""
+msgstr "O '@' sozinho 챕 um atalho para `HEAD`."
#. type: Labeled list
#: en/revisions.txt:68
#, no-wrap, priority:100
msgid "'[<refname>]@{<date>}', e.g. 'master@\\{yesterday\\}', 'HEAD@{5 minutes ago}'"
msgstr ""
+"'[<refname>]@{<date>}', exemplo. 'master@\\{yesterday\\}', 'HEAD@{5 minutos "
+"atr찼s}'"
#. type: Plain text
#: en/revisions.txt:79
#, priority:100
msgid "A ref followed by the suffix '@' with a date specification enclosed in a brace pair (e.g. '\\{yesterday\\}', '{1 month 2 weeks 3 days 1 hour 1 second ago}' or '{1979-02-26 18:30:00}') specifies the value of the ref at a prior point in time. This suffix may only be used immediately following a ref name and the ref must have an existing log ('$GIT_DIR/logs/<ref>'). Note that this looks up the state of your *local* ref at a given time; e.g., what was in your local 'master' branch last week. If you want to look at commits made during certain times, see `--since` and `--until`."
msgstr ""
+"Um `ref` seguido por um sufixo '@' om uma especifica챌찾o ordinal inclu챠da em "
+"um par de chaves (exemplo. '\\{ontem\\}', '{1 m챗s 2 semanas 3 dias 1 hora 1 "
+"segundo atr찼s}' ou '{1979-02-26 18:30:00}') especifica o valor do `ref` em "
+"um momento anterior. Esse sufixo pode ser usado imediatamente ap처s um nome "
+"`ref` e o `ref` deve ter um log que j찼 exista em ('$GIT_DIR/logs/<ref>'). "
+"Observe que isso consulta o estado do seu `ref` *local* em um determinado "
+"momento; por exemplo, o que estava no seu ramo 'master' na semana passada. "
+"Caso queira ver os commits feitos durante determinados per챠odos de tempo, "
+"consulte `--since` and `--until`."
#. type: Labeled list
#: en/revisions.txt:80
#, no-wrap, priority:100
msgid "'<refname>@{<n>}', e.g. 'master@\\{1\\}'"
-msgstr ""
+msgstr "'<refname>@{<n>}', e.g. 'master@\\{1\\}'"
#. type: Plain text
#: en/revisions.txt:88
@@ -61238,12 +63196,21 @@ msgstr "--alternate-refs"
#, priority:260
msgid "Pretend as if all objects mentioned as ref tips of alternate repositories were listed on the command line. An alternate repository is any repository whose object directory is specified in `objects/info/alternates`. The set of included objects may be modified by `core.alternateRefsCommand`, etc. See linkgit:git-config[1]."
msgstr ""
+"Finja como se todos os objetos mencionados como dicas ref dos reposit처rios "
+"alternativos fossem listados na linha de comando. Um reposit처rio alternativo "
+"챕 qualquer reposit처rio cujo diret처rio de objetos 챕 especificado em `objects/"
+"info/alternates`. O conjunto de objetos inclu챠dos podem ser modificados por "
+"'core.alternateRefsCommand', etc. Consulte linkgit:git-config[1]."
#. type: Plain text
#: en/rev-list-options.txt:200
#, priority:260
msgid "By default, all working trees will be examined by the following options when there are more than one (see linkgit:git-worktree[1]): `--all`, `--reflog` and `--indexed-objects`. This option forces them to examine the current working tree only."
msgstr ""
+"횋 predefinido que todas as 찼rvores de trabalho ser찾o examinadas pelas "
+"seguintes op챌천es quando houver mais de um (consulte linkgit:git-worktree[1]):"
+" `--all`, `--reflog` e `--indexed-objects`. Esta op챌찾o imp천em o exame "
+"apenas da 찼rvore de trabalho atual."
#. type: Plain text
#: en/rev-list-options.txt:204
@@ -62536,6 +64503,10 @@ msgstr ""
#, priority:260
msgid "Listed below are options that control the formatting of diff output. Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
msgstr ""
+"Listamos abaixo as op챌천es que controlam a formata챌찾o da sa챠da \"diff\". "
+"Alguns deles s찾o espec챠ficos para linkgit:git-rev-list[1], contudo outras "
+"op챌천es \"diff\" podem ser dadas. Para obter mais op챌천es, consulte linkgit"
+":git-diff-files[1]."
#. type: Plain text
#: en/rev-list-options.txt:1001
@@ -62765,7 +64736,7 @@ msgstr ""
#: en/urls.txt:2
#, no-wrap, priority:300
msgid "GIT URLS[[URLS]]"
-msgstr ""
+msgstr "GIT URLS[[URLS]]"
#. type: Plain text
#: en/urls.txt:8
@@ -62880,6 +64851,9 @@ msgstr ""
#, priority:300
msgid "These two syntaxes are mostly equivalent, except when cloning, when the former implies --local option. See linkgit:git-clone[1] for details."
msgstr ""
+"Estas duas sintaxes s찾o na sua maioria equivalentes, exceto quando a "
+"clonagem, quando a primeira implicar o uso da op챌찾o --local. Para mais "
+"detalhes consulte linkgit:git-clone[1]."
#. type: Plain text
#: en/urls.txt:54
@@ -62892,6 +64866,8 @@ 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 "
+"um arquivo de pacote adequado. Consulte linkgit:git-bundle[1]."
#. type: Plain text
#: en/urls.txt:63
@@ -62910,6 +64886,9 @@ 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 "
+"seq체챗ncia arbitr찼ria semelhante a uma URL reconhecida pelo ajudante remoto "
+"que foi invocado. Para mais detalhes consulte linkgit:gitremote-helpers[7]."
#. type: Plain text
#: en/urls.txt:74
@@ -63192,10 +65171,9 @@ msgstr ""
#. type: Title -
#: en/git-bisect-lk2009.txt:184
-#, fuzzy, no-wrap, priority:100
-#| msgid "git bisect terms\n"
+#, no-wrap, priority:100
msgid "\"git bisect\" overview"
-msgstr "git termos de divis찾o\n"
+msgstr "Vis찾o geral do \"git bisect\""
#. type: Title ~
#: en/git-bisect-lk2009.txt:187
@@ -63223,10 +65201,9 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect-lk2009.txt:203
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git bisect bad\n"
+#, no-wrap, priority:100
msgid "$ git bisect bad [COMMIT]\n"
-msgstr "$ git bisect mau\n"
+msgstr "$ git bisect bad [COMMIT]\n"
#. type: Plain text
#: en/git-bisect-lk2009.txt:206
@@ -63236,10 +65213,9 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect-lk2009.txt:209
-#, fuzzy, ignore-ellipsis, no-wrap, priority:100
-#| msgid "$ git bisect good\n"
+#, ignore-ellipsis, no-wrap, priority:100
msgid "$ git bisect good [COMMIT...]\n"
-msgstr "$ git bisect bom\n"
+msgstr "$ git bisect good [COMMIT...]\n"
#. type: Plain text
#: en/git-bisect-lk2009.txt:213
@@ -63448,10 +65424,9 @@ msgstr ""
#. type: Title ~
#: en/git-bisect-lk2009.txt:355
-#, fuzzy, no-wrap, priority:100
-#| msgid "Avoiding testing a commit"
+#, no-wrap, priority:100
msgid "Avoiding untestable commits"
-msgstr "Evitando testar um commit"
+msgstr "Evitando os commits que n찾o foram testados"
#. type: Plain text
#: en/git-bisect-lk2009.txt:362
@@ -63510,10 +65485,9 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect-lk2009.txt:398
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git bisect log\n"
+#, no-wrap, priority:100
msgid "$ git bisect log > bisect_log.txt\n"
-msgstr "$ git log de divis찾o\n"
+msgstr "$ git bisect log > bisect_log.txt\n"
#. type: Plain text
#: en/git-bisect-lk2009.txt:401
@@ -63523,17 +65497,15 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect-lk2009.txt:404
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git bisect reset\n"
+#, no-wrap, priority:100
msgid "$ git bisect replay bisect_log.txt\n"
-msgstr "$ git redefini챌찾o de bisseta\n"
+msgstr "$ git bisect replay bisect_log.txt\n"
#. type: Title -
#: en/git-bisect-lk2009.txt:408
-#, fuzzy, no-wrap, priority:100
-#| msgid "git bisect terms\n"
+#, no-wrap, priority:100
msgid "\"git bisect\" details"
-msgstr "git termos de divis찾o\n"
+msgstr "Detalhes do \"git bisect\""
#. type: Title ~
#: en/git-bisect-lk2009.txt:411
@@ -64205,10 +66177,9 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect-lk2009.txt:816
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git bisect bad\n"
+#, no-wrap, priority:100
msgid "$ git bisect start dev main\n"
-msgstr "$ git bisect mau\n"
+msgstr "$ git bisect start dev main\n"
#. type: Plain text
#: en/git-bisect-lk2009.txt:823
@@ -64349,16 +66320,13 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect-lk2009.txt:908
-#, fuzzy, no-wrap, priority:100
-#| msgid ""
-#| "$ git bisect reset\n"
-#| "$ git bisect replay that-file\n"
+#, no-wrap, priority:100
msgid ""
"$ git bisect start BAD GOOD\n"
"$ git bisect run make\n"
msgstr ""
-"$ git redefini챌찾o de divis찾o\n"
-"$ git repetir a divis찾o desse arquivo\n"
+"$ git bisect start BAD GOOD\n"
+"$ git bisect run make\n"
#. type: Title ~
#: en/git-bisect-lk2009.txt:911
@@ -64392,10 +66360,11 @@ msgstr ""
#. type: Plain text
#: en/git-bisect-lk2009.txt:930
-#, fuzzy, priority:100
-#| msgid "For example, if you are looking for a commit that introduced a performance regression, you might use"
+#, priority:100
msgid "This script can be passed to \"git bisect run\" to find the commit that introduced a performance regression:"
-msgstr "Por exemplo, se voc챗 estiver procurando por uma confirma챌찾o que introduziu uma regress찾o de desempenho, poder찼 usar"
+msgstr ""
+"Este script pode ser passado atrav챕s de um \"git bisect run\" para localizar "
+"um commit que introduziu uma regress찾o de desempenho:"
#. type: delimited block -
#: en/git-bisect-lk2009.txt:936
@@ -64556,10 +66525,9 @@ msgstr ""
#. type: Plain text
#: en/git-bisect-lk2009.txt:1020
-#, fuzzy, priority:100
-#| msgid "Use binary search to find the commit that introduced a bug."
+#, priority:100
msgid "use \"git bisect run\" to find the commit that introduced it"
-msgstr "Usa uma busca bin찼ria para procurar o commit que introduziu um bug."
+msgstr "Use um \"git bisect run\" para localizar o commit que introduziu um bug"
#. type: Plain text
#: en/git-bisect-lk2009.txt:1021
@@ -64701,10 +66669,9 @@ msgstr ""
#. type: Title ~
#: en/git-bisect-lk2009.txt:1122
-#, fuzzy, no-wrap, priority:100
-#| msgid "git-replace(1)"
+#, no-wrap, priority:100
msgid "\"git replace\""
-msgstr "git-replace(1)"
+msgstr "\"git replace\""
#. type: Plain text
#: en/git-bisect-lk2009.txt:1128
@@ -64759,17 +66726,15 @@ msgstr ""
#. type: Plain text
#: en/git-bisect-lk2009.txt:1164
-#, fuzzy, priority:100
-#| msgid "For example:"
+#, priority:100
msgid "For example using:"
-msgstr "Por exemplo:"
+msgstr "Usando por exemplo:"
#. type: delimited block -
#: en/git-bisect-lk2009.txt:1167
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git bisect reset\n"
+#, no-wrap, priority:100
msgid "$ git rebase -i Y Z\n"
-msgstr "$ git redefini챌찾o de bisseta\n"
+msgstr "$ git rebase -i Y Z\n"
#. type: Plain text
#: en/git-bisect-lk2009.txt:1170
@@ -64785,10 +66750,9 @@ msgstr ""
#. type: delimited block -
#: en/git-bisect-lk2009.txt:1178
-#, fuzzy, no-wrap, priority:100
-#| msgid "$ git bisect reset\n"
+#, no-wrap, priority:100
msgid "$ git bisect start Z' Y\n"
-msgstr "$ git redefini챌찾o de bisseta\n"
+msgstr "$ git bisect start Z' Y\n"
#. type: Plain text
#: en/git-bisect-lk2009.txt:1189
@@ -64999,10 +66963,9 @@ msgstr ""
#. type: Title -
#: en/git-bisect-lk2009.txt:1348
-#, fuzzy, no-wrap, priority:100
-#| msgid "--dereference"
+#, no-wrap, priority:100
msgid "References"
-msgstr "--dereference"
+msgstr "Refer챗ncias"
#. type: Plain text
#: en/git-bisect-lk2009.txt:1351
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 27e60394d47a4bc8a44599fe6f23162786e0452e..9ac28219b89306589ea3df8e88d47d1cf7a820d7 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.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-07 07:14+0000\n"
+"PO-Revision-Date: 2020-04-23 20:25+0000\n"
"Last-Translator: �� <ranto2012@163.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: zh_HANS-CN\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.0-dev\n"
+"X-Generator: Weblate 4.0.2-dev\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
@@ -2719,145 +2719,149 @@ msgstr ""
#: en/date-formats.txt:2
#, no-wrap, priority:280
msgid "DATE FORMATS"
-msgstr ""
+msgstr "�ζ쐿�쇔폀"
#. type: Plain text
#: en/date-formats.txt:5
#, priority:280
msgid "The `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` environment variables"
-msgstr ""
+msgstr "`GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` ��쥊�섌뇧"
#. type: Plain text
#: en/date-formats.txt:7
#, priority:280
msgid "and the `--date` option"
-msgstr ""
+msgstr "�� `--date` �됮」"
#. type: Plain text
#: en/date-formats.txt:9
#, priority:280
msgid "support the following date formats:"
-msgstr ""
+msgstr "��똻餓δ툔�ζ쐿�쇔폀竊�"
#. type: Labeled list
#: en/date-formats.txt:10
#, no-wrap, priority:280
msgid "Git internal format"
-msgstr ""
+msgstr "Git �낂깿�쇔폀"
#. type: Plain text
#: en/date-formats.txt:15
-#, priority:280
+#, fuzzy, priority:280
msgid "It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the number of seconds since the UNIX epoch. `<time zone offset>` is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) is `+0100`."
msgstr ""
+"`<unix �띌뿴��> <�뜹뙷�뤹㎉��>`竊뚦끀訝�<unix �띌뿴��>��눎 UNIX epoch 餓ζ씎�꾤쭜�겹�� `<�뜹뙷�뤹㎉��>` ��쎑野밥틢 UTC "
+"�꾣��뽬킓�뤹㎉�뤵�귚풃倻귨펽CET竊덃캈 UTC �먨뎺1弱뤸뿶竊됦맏 `+0100`��"
#. type: Labeled list
#: en/date-formats.txt:16
#, no-wrap, priority:280
msgid "RFC 2822"
-msgstr ""
+msgstr "RFC 2822"
#. type: Plain text
#: en/date-formats.txt:19
#, priority:280
msgid "The standard email format as described by RFC 2822, for example `Thu, 07 Apr 2005 22:13:13 +0200`."
-msgstr ""
+msgstr "�� RFC 2822 �뤺염�꾣젃�녺뵷耶먬궙餓뜻졏凉륅펽堊뗥쫩 `Thu, 07 Apr 2005 22:13:13 +0200`��"
#. type: Labeled list
#: en/date-formats.txt:20
#, no-wrap, priority:280
msgid "ISO 8601"
-msgstr ""
+msgstr "ISO 8601"
#. type: Plain text
#: en/date-formats.txt:24
#, priority:280
msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well."
-msgstr ""
+msgstr "ISO 8601 �뉐뇛鰲꾢츣�꾣뿶�닷뭽�ζ쐿竊뚥풃倻� `2005-04-07T22:13:13`�귟㎗�먨솳阿잍렏�쀥컛 `T` �욘뜟訝븀㈉�쇈��"
#. type: Plain text
#: en/date-formats.txt:26
#, priority:280
msgid "In addition, the date part is accepted in the following formats: `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
-msgstr ""
+msgstr "閭ㅵ쨼竊뚧뿥�잓깿�녻퓲�ε룛餓δ툔�쇔폀竊�`YYYY.MM.DD`竊�`MM/DD/YYYY` �� `DD.MM.YYYY`��"
#. type: Title -
#: en/diff-format.txt:2
#, no-wrap, priority:280
msgid "Raw output format"
-msgstr ""
+msgstr "�잌쭓渦볟눣�쇔폀"
#. type: Plain text
#: 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 ""
+"\"git-diff-index\"竊�\"git-diff-tree\"竊�\"git-diff-files\" �� \"git diff --raw\" "
+"�꾢렅冶뗨풏�뷸졏凉뤻씆躍며쎑鴉쇈��"
#. type: Plain text
#: en/diff-format.txt:9
#, priority:280
msgid "These commands all compare two sets of things; what is compared differs:"
-msgstr ""
+msgstr "瓦쇾틳�썰빱�썸캈渦껂륵瀯꾡틟�⒲�귚퐜驪붻푵�꾢냵若방쐣��訝띶릪竊�"
#. type: Labeled list
#: en/diff-format.txt:10
-#, no-wrap, priority:280
+#, fuzzy, no-wrap, priority:280
msgid "git-diff-index <tree-ish>"
-msgstr ""
+msgstr "git-diff-index <�뉏뻑��>"
#. type: Plain text
#: en/diff-format.txt:12
#, priority:280
msgid "compares the <tree-ish> and the files on the filesystem."
-msgstr ""
+msgstr "驪붻푵 <�뉏뻑��> �뚧뻼餓띄내瀯잋툓�꾣뻼餓뜰��"
#. type: Labeled list
#: en/diff-format.txt:13
#, no-wrap, priority:280
msgid "git-diff-index --cached <tree-ish>"
-msgstr ""
+msgstr "git-diff-index --cached <�뉏뻑��>"
#. type: Plain text
#: en/diff-format.txt:15
#, priority:280
msgid "compares the <tree-ish> and the index."
-msgstr ""
+msgstr "驪붻푵 <�뉏뻑��> �뚨뇨凉뺛��"
#. type: Labeled list
#: en/diff-format.txt:16
#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]"
-msgstr ""
+msgstr "git-diff-tree [-r] <�뉏뻑��1> <�뉏뻑��2> [<與▼폀>...]"
#. type: Plain text
#: en/diff-format.txt:18
#, priority:280
msgid "compares the trees named by the two arguments."
-msgstr ""
+msgstr "驪붻푵�긴륵訝ゅ뢿�겻폖�믥쉪�뉏뻑�묆��"
#. type: Labeled list
#: en/diff-format.txt:19
#, ignore-ellipsis, no-wrap, priority:280
msgid "git-diff-files [<pattern>...]"
-msgstr ""
+msgstr "git-diff-files [<與▼폀>...]"
#. type: Plain text
#: en/diff-format.txt:21
-#, priority:280
+#, fuzzy, priority:280
msgid "compares the index and the files on the filesystem."
-msgstr ""
+msgstr "驪붻푵榮℡폊�뚧뻼餓띄내瀯잋툓�꾣뻼餓뜰��"
#. type: Plain text
#: en/diff-format.txt:25
#, priority:280
msgid "The \"git-diff-tree\" command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file."
-msgstr ""
+msgstr "\"git-diff-tree\" �썰빱�ⓩ�凉�冶뗨풏�븃˙驪붻푵野배괌�꾢뱢躍뚦�쇈�귚퉳�롳펽���됧뫝餓ㅹ꺗鴉싦맏驪뤶릉�닸뵻�꾣뻼餓뜻돀�겻�訝よ풏�븃죱��"
#. type: Plain text
#: en/diff-format.txt:27
#, priority:280
msgid "An output line is formatted this way:"
-msgstr ""
+msgstr "渦볟눣烏뚨쉪�쇔폀倻귚툔竊�"
#. type: delimited block -
#: en/diff-format.txt:35
@@ -2870,162 +2874,168 @@ msgid ""
"delete :100644 000000 1234567 0000000 D file5\n"
"unmerged :000000 000000 0000000 0000000 U file6\n"
msgstr ""
+"in-place edit :100644 100644 bcd1234 0123456 M file0\n"
+"copy-edit :100644 100644 abcd123 1234567 C68 file1 file2\n"
+"rename-edit :100644 100644 abcd123 1234567 R86 file1 file3\n"
+"create :000000 100644 0000000 1234567 A file4\n"
+"delete :100644 000000 1234567 0000000 D file5\n"
+"unmerged :000000 000000 0000000 0000000 U file6\n"
#. type: Plain text
#: en/diff-format.txt:38
#, priority:280
msgid "That is, from the left to the right:"
-msgstr ""
+msgstr "�ヤ퉱倻귚툔竊뚥퍗藥�댆�념풚轝∽폏"
#. type: Plain text
#: en/diff-format.txt:40
-#, priority:280
+#, fuzzy, priority:280
msgid "a colon."
-msgstr ""
+msgstr "�믣뤇��"
#. type: Plain text
#: en/diff-format.txt:41
#, priority:280
msgid "mode for \"src\"; 000000 if creation or unmerged."
-msgstr ""
+msgstr "\"src\"竊덃틦�뉏뻑竊됬쉪與▼폀竊쎾쫩�쒏삸�겼뻠�뽪삸�ゅ릦亮띄쉪竊뚦닕訝� 000000��"
#. type: Plain text
#: en/diff-format.txt:42 en/diff-format.txt:44 en/diff-format.txt:46 en/diff-format.txt:48
#, priority:280
msgid "a space."
-msgstr ""
+msgstr "令뷸졏��"
#. type: Plain text
#: en/diff-format.txt:43
#, priority:280
msgid "mode for \"dst\"; 000000 if deletion or unmerged."
-msgstr ""
+msgstr "\"dst\"(��젃�뉏뻑竊됬쉪與▼폀竊쎾쫩�쒑˙�좈솮�뽪쑋�덂뭉�쇾맏 000000��"
#. type: Plain text
#: en/diff-format.txt:45
#, priority:280
msgid "sha1 for \"src\"; 0\\{40\\} if creation or unmerged."
-msgstr ""
+msgstr "\"src\"竊덃틦�뉏뻑竊됬쉪 sha1 �쇽폑倻귝옖訝뷸뼭兩뷸닑�ゅ릦亮뜹닕訝� 0\\{40\\}��"
#. type: Plain text
#: en/diff-format.txt:47
-#, priority:280
+#, fuzzy, priority:280
msgid "sha1 for \"dst\"; 0\\{40\\} if creation, unmerged or \"look at work tree\"."
-msgstr ""
+msgstr "\"dst\"竊덄쎅�뉑뻼餓띰펹�� sha1 �쇽폑倻귝옖訝뷸뼭兩뷩�곫쑋�덂뭉�� \"�귟쭅藥δ퐳��\"竊뚦닕訝� 0\\{40\\}��"
#. type: Plain text
#: en/diff-format.txt:49
#, priority:280
msgid "status, followed by optional \"score\" number."
-msgstr ""
+msgstr "�뜻�곻펽�ⓨ룾�됧�� \"score\" 阿뗥릮��"
#. type: Plain text
#: en/diff-format.txt:50
#, priority:280
msgid "a tab or a NUL when `-z` option is used."
-msgstr ""
+msgstr "壤볞슴�� `-z` �됮」�뜸맏�띈〃寧�닑 NUL��"
#. type: Plain text
#: en/diff-format.txt:51
#, priority:280
msgid "path for \"src\""
-msgstr ""
+msgstr "\"src\" �꾥러孃�"
#. type: Plain text
#: en/diff-format.txt:52
#, priority:280
msgid "a tab or a NUL when `-z` option is used; only exists for C or R."
-msgstr ""
+msgstr "鵝욜뵪 `-z` �됮」�뜸맏�띈〃寧�닑 NUL竊쎽퍎壤볡듁�곦맏 C �� R �뜹춼�ⓦ��"
#. type: Plain text
#: en/diff-format.txt:53
#, priority:280
msgid "path for \"dst\"; only exists for C or R."
-msgstr ""
+msgstr "\"dst\" �꾥러孃꾬폑餓끻퐪�뜻�곦맏 C �� R �뜹춼�ⓦ��"
#. type: Plain text
#: en/diff-format.txt:54
#, priority:280
msgid "an LF or a NUL when `-z` option is used, to terminate the record."
-msgstr ""
+msgstr "壤볞슴�� `-z` �됮」�뜸맏 LF �� NUL竊뚨뵪雅롧퍑閭��壤뺛��"
#. type: Plain text
#: en/diff-format.txt:56
#, priority:280
msgid "Possible status letters are:"
-msgstr ""
+msgstr "��꺗�꾤듁�곩춻驪띴맏竊�"
#. type: Plain text
#: en/diff-format.txt:58
#, priority:280
msgid "A: addition of a file"
-msgstr ""
+msgstr "A竊싨뻼餓뜻뼭罌욇깿��"
#. type: Plain text
#: en/diff-format.txt:59
#, priority:280
msgid "C: copy of a file into a new one"
-msgstr ""
+msgstr "C竊싧쨳�뜹댆訝�訝ゆ뼭�뉏뻑"
#. type: Plain text
#: en/diff-format.txt:60
#, priority:280
msgid "D: deletion of a file"
-msgstr ""
+msgstr "D竊싨뻼餓뜹닠�ㅹ깿��"
#. type: Plain text
#: en/diff-format.txt:61
#, priority:280
msgid "M: modification of the contents or mode of a file"
-msgstr ""
+msgstr "M竊싨뻼餓뜹냵若방닑�뉏뻑與▼폀岳�뵻"
#. type: Plain text
#: en/diff-format.txt:62
#, priority:280
msgid "R: renaming of a file"
-msgstr ""
+msgstr "R竊싨뻼餓띌뇥�썲릫"
#. type: Plain text
#: en/diff-format.txt:63
#, priority:280
msgid "T: change in the type of the file"
-msgstr ""
+msgstr "T竊싨뻼餓띄굳�뗦뵻��"
#. type: Plain text
#: en/diff-format.txt:65
#, priority:280
msgid "U: file is unmerged (you must complete the merge before it can be committed)"
-msgstr ""
+msgstr "U竊싨뻼餓뜻쑋�덂뭉竊덁퐷恙낂』�ⓩ룓雅ㅴ퉳�띶츑�먨릦亮띰펹"
#. type: Plain text
#: en/diff-format.txt:66
#, priority:280
msgid "X: \"unknown\" change type (most probably a bug, please report it)"
-msgstr ""
+msgstr "X竊�\"unknown\"竊덃쑋�ο펹�닸뵻映삣엹竊덂룾�썰맏�숃�竊뚩��ε몜竊�"
#. type: Plain text
#: en/diff-format.txt:71
#, priority:280
msgid "Status letters C and R are always followed by a score (denoting the percentage of similarity between the source and target of the move or copy). Status letter M may be followed by a score (denoting the percentage of dissimilarity) for file rewrites."
-msgstr ""
+msgstr "�뜻�곩춻驪� C �� R �롩씊�삥삸訝�訝ゅ늽�곤펷烏①ㅊ燁삣뒯�뽩쨳�띄쉪繹먧툗��젃阿뗩뿴�꾤쎑鴉쇗�㎫쇍�녷캈竊됥�귞듁�곩춻驪뛏�롩씊��꺗�됪뻼餓띌뇥�숂쉪�녷빊竊덅〃鹽븀쎑凉귞쇍�녷캈竊됥��"
#. type: Plain text
#: en/diff-format.txt:74
#, priority:280
msgid "<sha1> is shown as all 0's if a file is new on the filesystem and it is out of sync with the index."
-msgstr ""
+msgstr "倻귝옖�뉏뻑��뻼餓띄내瀯잋툓�꾣뼭�뉏뻑竊뚦뭉訝붶툗榮℡폊訝띶릪閭ο펽�� <sha1> 弱녷샑鹽뷰맏��0��"
#. type: Labeled list
#: en/diff-format.txt:76 en/git-svn.txt:499 en/git-svn.txt:539
-#, no-wrap, priority:280
+#, fuzzy, no-wrap, priority:280
msgid "Example:"
-msgstr ""
+msgstr "堊뗥춴:"
#. type: delimited block -
#: en/diff-format.txt:79
#, no-wrap, priority:280
msgid ":100644 100644 5be4a4a 0000000 M file.c\n"
-msgstr ""
+msgstr ":100644 100644 5be4a4a 0000000 M file.c\n"
#. type: Plain text
#: en/diff-format.txt:85 en/git-ls-files.txt:212 en/git-ls-tree.txt:101
@@ -5684,11 +5694,13 @@ msgid ""
"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n"
msgstr ""
-"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]\n"
+"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | "
+"-i] [--patch | -p]\n"
"\t [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]\n"
-"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
-"\t [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
-"\t [--] [<pathspec>...]\n"
+"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] "
+"[--renormalize]\n"
+"\t [--chmod=(+|-)x] [--pathspec-from-file=<�뉏뻑> [--pathspec-file-nul]]\n"
+"\t [--] [<�뉐츣瓮�푶>...]\n"
#. type: Title -
#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:22 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:35 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
@@ -5748,13 +5760,17 @@ msgstr "<pathspec>..."
#: en/git-add.txt:65
#, priority:300
msgid "Files to add content from. Fileglobs (e.g. `*.c`) can be given to add all matching files. Also a leading directory name (e.g. `dir` to add `dir/file1` and `dir/file2`) can be given to update the index to match the current state of the directory as a whole (e.g. specifying `dir` will record not just a file `dir/file1` modified in the working tree, a file `dir/file2` added to the working tree, but also a file `dir/file3` removed from the working tree). Note that older versions of Git used to ignore removed files; use `--no-all` option if you want to add modified or new files but ignore removed ones."
-msgstr "誤곦퍗訝�렌�졾냵若밭쉪�뉏뻑�괚ileglobs竊덁풃倻�`*.c`竊됧룾餓η뵪�ζ렌�졿��됧뙶�띸쉪�뉏뻑�귝�鸚뽳펽瓦섇룾餓ζ룓堊쎽�訝ゅ뎺野쇘쎅壤뺝릫竊덁풃倻귨펽�뉐츣`dir`餓ζ렌��`dir/file1`��`dir/file2`竊됪씎�닸뼭榮℡폊竊뚥슴�뜸툗�답릉��퐬�꾢퐪�띸듁�곭쎑�백뀓竊덁풃倻귨펽�뉐츣`dir`訝띴퍎鴉싪�壤뺝쑉藥δ퐳�묇릎岳�뵻�꾣뻼餓�`dir/file1`竊뚩퓲鴉싪�壤뺝쑉藥δ퐳�묇릎曆삣뒥�꾣뻼餓�`dir/file2`竊뚩퓲�됦퍗藥δ퐳�묇릎�좈솮�꾣뻼餓�`dir/file3`竊됥�귟�力ⓩ꼷竊뚧뿧�덃쑍�껯it鴉싧옙�ε럴�좈솮�꾣뻼餓띰폑倻귝옖誤곫렌�졾럴岳�뵻�꾣뻼餓뜻닑�경뻼餓띰펽鵝녶옙�ε럴�좈솮�꾣뻼餓띰펽瑥룝슴�ⓥ��--no all�앶�됮」��"
+msgstr ""
+"誤곦퍗訝�렌�졾냵若밭쉪�뉏뻑�괚ileglobs竊덁풃倻� `*.c`竊됧룾餓η뵪�ζ렌�졿��됧뙶�띸쉪�뉏뻑�귝�鸚뽳펽瓦섇룾餓ζ룓堊쎽�訝ゅ뎺野쇘쎅壤뺝릫竊덁풃倻귨펽�뉐츣 `dir` 餓ζ렌�� `"
+"dir/file1` �� `dir/file2`竊됪씎�닸뼭榮℡폊竊뚥슴�뜸툗�답릉��퐬�꾢퐪�띸듁�곭쎑�백뀓竊덁풃倻귨펽�뉐츣 `dir` 訝띴퍎鴉싪�壤뺝쑉藥δ퐳�묇릎岳�뵻�꾣뻼餓� `"
+"dir/file1`竊뚩퓲鴉싪�壤뺝쑉藥δ퐳�묇릎曆삣뒥�꾣뻼餓� `dir/file2`竊뚩퓲�됦퍗藥δ퐳�묇릎�좈솮�꾣뻼餓� `dir/file3`竊됥�귟�力ⓩ꼷竊뚧뿧�덃쑍�� Git "
+"鴉싧옙�ε럴�좈솮�꾣뻼餓띰폑倻귝옖誤곫렌�졾럴岳�뵻�꾣뻼餓뜻닑�경뻼餓띰펽鵝녶옙�ε럴�좈솮�꾣뻼餓띰펽瑥룝슴�� `--no all` �됮」��"
#. type: Plain text
#: en/git-add.txt:68 en/git-grep.txt:332
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
-msgstr "�됧뀽 <pathspec> �쇔폀�꾣쎍鸚싩퍏�귨펽瑥룟뢿�� linkgit:gitglossary[7]��"
+msgstr "�됧뀽 <�뉐츣瓮�푶> �쇔폀�꾣쎍鸚싩퍏�귨펽瑥룟뢿�� linkgit:gitglossary[7]��"
#. type: Plain text
#: en/git-add.txt:73
@@ -5796,7 +5812,9 @@ msgstr "雅ㅴ틨�겼쑉榮℡폊�뚦램鵝쒏젒阿뗩뿴�됪떓烏δ툈�쀥뭉弱녶츆餓ф렌�졾댆
#: en/git-add.txt:99
#, priority:300
msgid "This effectively runs `add --interactive`, but bypasses the initial command menu and directly jumps to the `patch` subcommand. See ``Interactive mode'' for details."
-msgstr "瓦쇿룾餓ζ쐣�덂쑑瓦먫죱`add --interactive`竊뚥퐜��폏瀯뺠퓝�앭쭓�썰빱�쒎뜒竊뚩�뚨쎍�θ럼饔у댆�� patch�앭춴�썰빱�귝쐣�녘�瀯녵에��펽瑥룟뢿鰲�``雅ㅴ틨與▼폀''��"
+msgstr ""
+"瓦쇿룾餓ζ쐣�덂쑑瓦먫죱 `add --interactive`竊뚥퐜��폏瀯뺠퓝�앭쭓�썰빱�쒎뜒竊뚩�뚨쎍�θ럼饔у댆 `patch` "
+"耶먨뫝餓ㅳ�귝쐣�녘�瀯녵에��펽瑥룟뢿鰲�``雅ㅴ틨與▼폀''��"
#. type: Labeled list
#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:220 en/git-config.txt:252 en/git-grep.txt:293 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
@@ -5832,13 +5850,13 @@ msgstr "--update"
#: en/git-add.txt:117
#, priority:300
msgid "Update the index just where it already has an entry matching <pathspec>. This removes as well as modifies index entries to match the working tree, but adds no new files."
-msgstr "�①뇨凉뺝럴瀯뤷끁�됦툗<pathspec>�백뀓窈밭쉪�경뼶�닸뼭榮℡폊�귟퓳鴉싧닠�ㅵ뭽岳�뵻榮℡폊窈밥빳�백뀓藥δ퐳�묕펽鵝녵툖曆삣뒥�경뻼餓뜰��"
+msgstr "�①뇨凉뺝럴瀯뤸쐣訝� <�뉐츣瓮�푶> �백뀓窈밭쉪�경뼶�닸뼭榮℡폊�귟퓳鴉싧닠�ㅵ뭽岳�뵻榮℡폊窈밥빳�백뀓藥δ퐳�묕펽鵝녵툖曆삣뒥�경뻼餓뜰��"
#. type: Plain text
#: en/git-add.txt:122
#, priority:300
msgid "If no <pathspec> is given when `-u` option is used, all tracked files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)."
-msgstr "倻귝옖�ⓧ슴��`-u`�됮」�뜻쑋�뉐츣<pathspec>竊뚦닕�답릉藥δ퐳�묇릎�꾣��됭퇎甕ゆ뻼餓띌꺗弱녷쎍�곤펷�㎫뎵�촅it鴉싮솏�뜻쎍�겼퐪�띸쎅壤뺝룋�뜹춴��퐬竊됥��"
+msgstr "倻귝옖�ⓧ슴�� `-u` �됮」�뜻깹�� <�뉐츣瓮�푶>竊뚦닕�답릉藥δ퐳�묇릎�꾣��됭퇎甕ゆ뻼餓띌꺗弱녷쎍�곤펷�㎫뎵�� Git 鴉싮솏�뜻쎍�겼퐪�띸쎅壤뺝룋�뜹춴��퐬竊됥��"
#. type: Labeled list
#: en/git-add.txt:123 en/git-repack.txt:49 en/git-svn.txt:418
@@ -5856,13 +5874,13 @@ msgstr "--no-ignore-removal"
#: en/git-add.txt:130
#, priority:300
msgid "Update the index not only where the working tree has a file matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to match the working tree."
-msgstr "訝띴퍎�ⓨ램鵝쒏젒訝�쐣訝�<pathspec>�백뀓�꾣뻼餓띄쉪�경뼶�닸뼭榮℡폊竊뚩�뚥툝�①뇨凉뺜릎藥꿰퍘�됦�訝ら」�꾢쑑�방쎍�곁뇨凉뺛�귟퓳弱녷렌�졼�곦엶�밧뭽�좈솮訝롥램鵝쒏젒�백뀓�꾤뇨凉뺡」��"
+msgstr "訝띴퍎�ⓨ램鵝쒏젒訝�쐣訝� <�뉐츣瓮�푶 >�백뀓�꾣뻼餓띄쉪�경뼶�닸뼭榮℡폊竊뚩�뚥툝�①뇨凉뺜릎藥꿰퍘�됦�訝ら」�꾢쑑�방쎍�곁뇨凉뺛�귟퓳弱녷렌�졼�곦엶�밧뭽�좈솮訝롥램鵝쒏젒�백뀓�꾤뇨凉뺡」��"
#. type: Plain text
#: en/git-add.txt:135
#, priority:300
msgid "If no <pathspec> is given when `-A` option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)."
-msgstr "倻귝옖�ⓧ슴��`-A`�됮」�뜻쑋�뉐츣<pathspec>竊뚦닕�답릉藥δ퐳�묇릎�꾣��됪뻼餓띌꺗弱녷쎍�곤펷�㎫뎵�х쉪Git鴉싮솏�뜹퐪�띸쎅壤뺝룋�뜹춴��퐬�꾣쎍�곤펹��"
+msgstr "倻귝옖�ⓧ슴�� `-A` �됮」�뜻깹�� <�뉐츣瓮�푶>竊뚦닕�답릉藥δ퐳�묇릎�꾣��됪뻼餓띌꺗弱녷쎍�곤펷�㎫뎵�х쉪 Git 鴉싮솏�뜹퐪�띸쎅壤뺝룋�뜹춴��퐬�꾣쎍�곤펹��"
#. type: Labeled list
#: en/git-add.txt:136
@@ -5880,13 +5898,15 @@ msgstr "--ignore-removal"
#: en/git-add.txt:142
#, priority:300
msgid "Update the index by adding new files that are unknown to the index and files modified in the working tree, but ignore files that have been removed from the working tree. This option is a no-op when no <pathspec> is used."
-msgstr "�싪퓝曆삣뒥榮℡폊�ょ윥�꾣뼭�뉏뻑�뚦쑉藥δ퐳�묇릎岳�뵻�꾣뻼餓뜸빳�닸뼭榮℡폊竊뚥퐜恙썹븼藥꿜퍗藥δ퐳�묇릎�좈솮�꾣뻼餓뜰�귛퐪訝띴슴��<pathspec>�띰펽閭ㅹ�됮」��퓚窈사쉪��"
+msgstr "�싪퓝曆삣뒥榮℡폊�ょ윥�꾣뼭�뉏뻑�뚦쑉藥δ퐳�묇릎岳�뵻�꾣뻼餓뜸빳�닸뼭榮℡폊竊뚥퐜恙썹븼藥꿜퍗藥δ퐳�묇릎�좈솮�꾣뻼餓뜰�귛퐪訝띴슴�� <�뉐츣瓮�푶> �띰펽閭ㅹ�됮」��퓚窈사쉪��"
#. type: Plain text
#: en/git-add.txt:146
#, ignore-ellipsis, priority:300
msgid "This option is primarily to help users who are used to older versions of Git, whose \"git add <pathspec>...\" was a synonym for \"git add --no-all <pathspec>...\", i.e. ignored removed files."
-msgstr "閭ㅹ�됮」訝삭쫨�ⓧ틢躍�뒰�ｄ틳阿졿꺈雅롨푵�㎫뎵�촅it�꾤뵪�룔�귝뿧�덃쑍訝�쉪\"Git add<pathspec>...\"��\"Git add--no all<pathspec>...\"�꾢릪阿됭칾竊뚦뜵恙썹븼藥꿨닠�ㅷ쉪�뉏뻑��"
+msgstr ""
+"閭ㅹ�됮」訝삭쫨�ⓧ틢躍�뒰�ｄ틳阿졿꺈雅롨푵�㎫뎵�� Git �꾤뵪�룔�귝뿧�덃쑍訝�쉪 \"Git add<�뉐츣瓮�푶>...\" �� \"Git add--no "
+"all<�뉐츣瓮�푶>...\" �꾢릪阿됭칾竊뚦뜵恙썹븼藥꿨닠�ㅷ쉪�뉏뻑��"
#. type: Labeled list
#: en/git-add.txt:147 en/git-format-patch.txt:103 en/git-submodule.txt:351
@@ -5902,9 +5922,11 @@ msgstr "--intent-to-add"
#. type: Plain text
#: en/git-add.txt:154
-#, fuzzy, priority:300
+#, priority:300
msgid "Record only the fact that the path will be added later. An entry for the path is placed in the index with no content. This is useful for, among other things, showing the unstaged content of such files with `git diff` and committing them with `git commit -a`."
-msgstr "�よ�壤뺟쮰�롥컛曆삣뒥瓮�푶�꾡틟若욁�귟러孃꾤쉪窈밥폏熬ユ붂營�쑉榮℡폊訝�펽鵝녵툖�끾떖�밧뒯�꾢냵若밤�귟퓳野밥틢鵝욜뵪`git diff`�양ㅊ�뉏뻑�꾣쑋�귛춼�끻�餓ε룋鵝�`git commit -a`�먧벡瓦쇾틳�뉏뻑�욃만�됬뵪��"
+msgstr ""
+"�よ�壤뺟쮰�롥컛曆삣뒥瓮�푶�꾡틟若욁�귟러孃꾤쉪窈밥폏熬ユ붂營�쑉榮℡폊訝�펽鵝녵툖�끾떖�밧뒯�꾢냵若밤�귟퓳野밥틢鵝욜뵪 `git diff` �양ㅊ�뉏뻑�꾣쑋�귛춼�끻�餓ε룋鵝� `git "
+"commit -a` �먧벡瓦쇾틳�뉏뻑�욃만�됬뵪��"
#. type: Labeled list
#: en/git-add.txt:155 en/git-update-index.txt:55
@@ -5916,7 +5938,7 @@ msgstr "--refresh"
#: en/git-add.txt:158
#, priority:300
msgid "Don't add the file(s), but only refresh their stat() information in the index."
-msgstr "訝띷렌�졿뻼餓띰펽�ゅ댎�곁뇨凉뺜릎�꼜tat()岳→겘��"
+msgstr "訝띷렌�졿뻼餓띰펽�ゅ댎�곁뇨凉뺜릎�� stat() 岳→겘��"
#. type: Labeled list
#: en/git-add.txt:159
@@ -5986,9 +6008,12 @@ msgstr "--pathspec-from-file=<file>"
#. type: Plain text
#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:113 en/git-restore.txt:124 en/git-rm.txt:85 en/git-stash.txt:207
-#, fuzzy, priority:300
+#, priority:300
msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
-msgstr "Pathspec��`<file>`訝�폖�믭펽�뚥툖��쑉�썰빱烏뚦뢿�겻릎鴉좈�믡�귛쫩��`<file>`閭ｅ���`-`竊뚦닕鵝욜뵪�뉐뇛渦볟뀯�괦athspec�껆킔�켏F�뺺R/LF�녽슂�귛룾餓ε폊�③뀓營�룜��`core.quotePath`�껺athspec�껆킔竊덅��귟쭅linkgit:git config[1]竊됥�귛룱瑥룟뢿鰲�`--pathspec-file-nul`�뚦뀲掠�`--literal-pathspecs`��"
+msgstr ""
+"Pathspec��`<file>`訝�폖�믭펽�뚥툖��쑉�썰빱烏뚦뢿�겻릎鴉좈�믡�귛쫩��`<file>`閭ｅ���`-`竊뚦닕鵝욜뵪�뉐뇛渦볟뀯�괦athspec�껆킔�켏F�뺺R/"
+"LF�녽슂�귛룾餓ε폊�③뀓營�룜��`core.quotePath`�껺athspec�껆킔竊덅��귟쭅linkgit:git config[1]竊됥�귛룱瑥룟뢿鰲�"
+"`--pathspec-file-nul`�뚦뀲掠�`--literal-pathspecs`��"
#. type: Labeled list
#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:114 en/git-restore.txt:125 en/git-rm.txt:86 en/git-stash.txt:208
@@ -6000,7 +6025,8 @@ msgstr "--pathspec-file-nul"
#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:118 en/git-restore.txt:129 en/git-rm.txt:90 en/git-stash.txt:214
#, priority:300
msgid "Only meaningful with `--pathspec-from-file`. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)."
-msgstr "�ゆ쐣�ⓧ슴��`--pathspec-from-file�앮뿶�띷쐣�뤶퉱�괦athspec�껆킔�쭼UL耶쀧Е�녽슂竊뚧��됧끀餓뽩춻寧�꺗�됧춻�€꼷�앾펷�끾떖��죱寧�뭽凉뺝뤇竊됭〃鹽뷩��"
+msgstr ""
+"�ゆ쐣�ⓧ슴�� `--pathspec-from-file` �뜻뎺�됪꼷阿됥�귝뙁若싪러孃꾢뀇榮좂뵪 NUL 耶쀧Е�녽슂竊뚧��됧끀餓뽩춻寧�꺗�됧춻�€꼷�앾펷�끾떖��죱寧�뭽凉뺝뤇竊됭〃鹽뷩��"
#. type: Labeled list
#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:354 en/git-commit.txt:359 en/git-grep.txt:322 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:119 en/git-restore.txt:130 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
@@ -6024,7 +6050,7 @@ msgstr "若욂풃"
#: en/git-add.txt:215
#, priority:300
msgid "Adds content from all `*.txt` files under `Documentation` directory and its subdirectories:"
-msgstr "曆삣뒥`Documentation`��퐬�듿끀耶먪쎅壤뺜툔����`*.txt`�뉏뻑�꾢냵若뱄폏"
+msgstr "曆삣뒥 `Documentation` ��퐬�듿끀耶먪쎅壤뺜툔���� `*.txt` �뉏뻑�꾢냵若뱄폏"
#. type: delimited block -
#: en/git-add.txt:218
@@ -6036,13 +6062,13 @@ msgstr "$ git add Documentation/\\*.txt\n"
#: en/git-add.txt:223
#, priority:300
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets the command include the files from subdirectories of `Documentation/` directory."
-msgstr "力ⓩ꼷竊뚦쑉�т풃訝�펽�잌뤇`*`��퍗shell訝�폊�η쉪竊쏂퓳鵝욕뫝餓ㅵ룾餓ε똿��`Documentation/`訝�춴��퐬�꾣뻼餓뜰��"
+msgstr "力ⓩ꼷竊뚦쑉�т풃訝�펽�잌뤇 `*` ��퍗 shell 訝�폊�η쉪竊쏂퓳鵝욕뫝餓ㅵ룾餓ε똿�� `Documentation/` 訝�춴��퐬�꾣뻼餓뜰��"
#. type: Plain text
#: en/git-add.txt:225
-#, fuzzy, priority:300
+#, priority:300
msgid "Considers adding content from all git-*.sh scripts:"
-msgstr "餓롦��뎖it-*.sh�싨쑍訝�렌�졾냵若뱄폏"
+msgstr "餓롦��� git-*.sh �싨쑍訝�렌�졾냵若뱄폏"
#. type: delimited block -
#: en/git-add.txt:228
@@ -6054,7 +6080,7 @@ msgstr "$ git add git-*.sh\n"
#: en/git-add.txt:233
#, priority:300
msgid "Because this example lets the shell expand the asterisk (i.e. you are listing the files explicitly), it does not consider `subdir/git-foo.sh`."
-msgstr "�졽맏瓦쇾릉鹽뷰풃�곮�shell�⒴콝�잌뤇竊덂뜵�얍폀�쀥눣�뉏뻑竊됵펽��餓ε츆訝띶똿��`subdir/git-foo.sh`��"
+msgstr "�졽맏瓦쇾릉鹽뷰풃�곮� shell �⒴콝�잌뤇竊덂뜵�얍폀�쀥눣�뉏뻑竊됵펽��餓ε츆訝띶똿�� `subdir/git-foo.sh`��"
#. type: Title -
#: en/git-add.txt:235 en/git-rebase.txt:749
@@ -6066,13 +6092,14 @@ msgstr "雅ㅴ틨與▼폀"
#: en/git-add.txt:239
#, priority:300
msgid "When the command enters the interactive mode, it shows the output of the 'status' subcommand, and then goes into its interactive command loop."
-msgstr "壤볟뫝餓ㅸ퓵�δ벡雅믤Æ凉뤸뿶竊뚦츆弱녷샑鹽�`status`耶먨뫝餓ㅷ쉪渦볟눣竊뚨꽫�롨퓵�ε끀雅ㅴ틨�썰빱孃ょ렞��"
+msgstr "壤볟뫝餓ㅸ퓵�δ벡雅믤Æ凉뤸뿶竊뚦츆弱녷샑鹽� `status` 耶먨뫝餓ㅷ쉪渦볟눣竊뚨꽫�롨퓵�ε끀雅ㅴ틨�썰빱孃ょ렞��"
#. type: Plain text
#: en/git-add.txt:244 en/git-clean.txt:85
#, priority:300
msgid "The command loop shows the list of subcommands available, and gives a prompt \"What now> \". In general, when the prompt ends with a single '>', you can pick only one of the choices given and type return, like this:"
-msgstr "�썰빱孃ょ렞�양ㅊ��뵪�꾢춴�썰빱�쀨〃竊뚦뭉�먪ㅊ`What now>`�귡�싧만竊뚦퐪�먪ㅊ餓ε뜒訝�`>`瀯볟갼�띰펽�ⓨ룵�썽�됪떓瀯쇿츣�꾡�訝ら�됮」亮띌뵰�쩼eturn竊뚦쫩訝뗦�鹽븝폏"
+msgstr ""
+"�썰빱孃ょ렞�양ㅊ��뵪�꾢춴�썰빱�쀨〃竊뚦뭉�먪ㅊ `What now>`�귡�싧만竊뚦퐪�먪ㅊ餓ε뜒訝� `>` 瀯볟갼�띰펽�ⓨ룵�썽�됪떓瀯쇿츣�꾡�訝ら�됮」亮띌뵰�ε썮饔�펽倻귚툔��鹽븝폏"
#. type: delimited block -
#: en/git-add.txt:250
@@ -6092,7 +6119,7 @@ msgstr ""
#: en/git-add.txt:254
#, priority:300
msgid "You also could say `s` or `sta` or `status` above as long as the choice is unique."
-msgstr "鵝졽튋��빳渦볟뀯`s`��`sta`��`status`竊뚦룵誤곩�숅�됮」��뵱訝��꾠��"
+msgstr "鵝졽튋��빳渦볟뀯 `s`��`sta` �� `status`竊뚦룵誤곩�숅�됮」��뵱訝��꾠��"
#. type: Plain text
#: en/git-add.txt:256
@@ -6102,15 +6129,17 @@ msgstr "訝삣뫝餓ㅵ쑵��쐣6訝ゅ춴�썰빱竊덂똿�у리�⒴뭽���븝펹��"
#. type: Labeled list
#: en/git-add.txt:257
-#, fuzzy, no-wrap, priority:300
+#, no-wrap, priority:300
msgid "status"
-msgstr "--status"
+msgstr "�뜻��"
#. type: Plain text
#: en/git-add.txt:264
#, priority:300
msgid "This shows the change between HEAD and index (i.e. what will be committed if you say `git commit`), and between index and working tree files (i.e. what you could stage further before `git commit` using `git add`) for each path. A sample output looks like this:"
-msgstr "瓦쇿컛�양ㅊ驪뤶릉瓮�푶訝딫EAD�뚨뇨凉뺜퉳�당쉪�닸뵻竊덂뜵竊뚦쫩�쒑풏��`git commit`竊뚦컛�먧벡餓�阿덌펹竊뚥빳�딁뇨凉뺝뭽藥δ퐳�묉뻼餓뜸퉳�당쉪�닸뵻竊덂뜵竊뚦쑉渦볟뀯`git commit`阿뗥뎺竊뚧돢烏�`git add`��빳瓦쎽�閭ζ쉨耶섆�阿덌펹�귞ㅊ堊뗨풏�뷴쫩訝뗰폏"
+msgstr ""
+"瓦쇿컛�양ㅊ驪뤶릉瓮�푶訝� HEAD �뚨뇨凉뺜퉳�당쉪�닸뵻竊덂뜵竊뚦쫩�쒑풏�� `git commit`竊뚦컛�먧벡餓�阿덌펹竊뚥빳�딁뇨凉뺝뭽藥δ퐳�묉뻼餓뜸퉳�당쉪�닸뵻竊덂뜵竊뚦쑉渦볟뀯 `"
+"git commit` 阿뗥뎺竊뚧돢烏� `git add` ��빳瓦쎽�閭ζ쉨耶섆�阿덌펹�귞ㅊ堊뗨풏�뷴쫩訝뗰폏"
#. type: delimited block -
#: en/git-add.txt:269
@@ -6168,7 +6197,7 @@ msgstr "誤곩닠�ㅹ�됧츣�끻�竊뚩��②풏�ε뎺�졽툓`-`竊뚦쫩訝뗦�鹽븝폏"
#. type: delimited block -
#: en/git-add.txt:305
-#, fuzzy, no-wrap, priority:300
+#, no-wrap, priority:300
msgid "Update>> -2\n"
msgstr "Update>> -2\n"
@@ -6180,7 +6209,7 @@ msgstr "瓦쏂죱�됪떓�롳펽渦볟뀯令븃죱竊뚥빳堊요맏榮℡폊訝��됧츣�꾥러孃꾣쉨耶�
#. type: Labeled list
#: en/git-add.txt:310
-#, fuzzy, no-wrap, priority:300
+#, no-wrap, priority:300
msgid "revert"
msgstr "瓦섇렅"
@@ -6188,11 +6217,11 @@ msgstr "瓦섇렅"
#: en/git-add.txt:315
#, priority:300
msgid "This has a very similar UI to 'update', and the staged information for selected paths are reverted to that of the HEAD version. Reverting new paths makes them untracked."
-msgstr "若껅쐣訝�訝や툗s`update`�욃만�멧세�꼀I竊뚧��됭러孃꾤쉪�귛춼岳→겘弱녻퓲�잋맏HEAD�덃쑍�귟퓲�잍뼭瓮�푶弱녵슴若껂뺄訝띹˙瓦썼릉��"
+msgstr "若껅쐣訝�訝や툗 'update' �욃만�멧세�꾡벡雅믦퓝葉뗰펽���됭러孃꾤쉪�귛춼岳→겘弱녻퓲�잋맏 HEAD �덃쑍�귟퓲�잍뼭瓮�푶弱녵슴若껂뺄訝띹˙瓦썼릉��"
#. type: Labeled list
#: en/git-add.txt:316
-#, fuzzy, no-wrap, priority:300
+#, no-wrap, priority:300
msgid "add untracked"
msgstr "曆삣뒥�よ퇎甕ゆ뻼餓�"
@@ -6200,7 +6229,7 @@ msgstr "曆삣뒥�よ퇎甕ゆ뻼餓�"
#: en/git-add.txt:320
#, priority:300
msgid "This has a very similar UI to 'update' and 'revert', and lets you add untracked paths to the index."
-msgstr "若껅쐣訝�訝や툗�쐕pdate�앭뭽�쐒evert�앶씆躍며쎑鴉쇘쉪UI竊뚦뀅溫멩궓�묊뇨凉뺞렌�졿쑋瓮잒릉�꾥러孃꾠��"
+msgstr "若껅쐣訝�訝や툗 'update' �� 'revert' �욃만�멧세�꾡벡雅믦퓝葉뗰펽�곮��ⓨ릲榮℡폊曆삣뒥�よ퇎甕ょ쉪瓮�푶��"
#. type: Labeled list
#: en/git-add.txt:321
@@ -6213,12 +6242,12 @@ msgstr "烏δ툈"
#, priority:300
msgid "This lets you choose one path out of a 'status' like selection. After choosing the path, it presents the diff between the index and the working tree file and asks you if you want to stage the change of each hunk. You can select one of the following options and type return:"
msgstr ""
-"瓦쇿뀅溫멩궓餓롧굳鴉쇄�쐓tatus�앭뫝餓ㅷ쉪�됪떓訝��됪떓訝��↑러孃꾠�귛쑉�됪떓瓮�푶阿뗥릮竊뚦츆弱녷샑鹽븀뇨凉뺝뭽藥δ퐳�묉뻼餓뜸퉳�당쉪藥�펰竊뚦뭉瑥�뿮�ⓩ삸��쫨�귛춼驪뤶릉�쀧쉪�닸뵻�귝궓��빳�됪떓餓δ툔"
-"�됮」阿뗤�亮띈풏�ε썮饔�폏"
+"瓦쇿뀅溫멩궓餓롧굳鴉� \"status\" "
+"�썰빱�꾦�됪떓訝��됪떓訝��↑러孃꾠�귛쑉�됪떓瓮�푶阿뗥릮竊뚦츆弱녷샑鹽븀뇨凉뺝뭽藥δ퐳�묉뻼餓뜸퉳�당쉪藥�펰竊뚦뭉瑥�뿮�ⓩ삸��쫨�귛춼驪뤶릉�쀧쉪�닸뵻�귝궓��빳�됪떓餓δ툔�됮」阿뗤�亮띈풏�ε썮饔�폏"
#. type: Plain text
#: en/git-add.txt:343
-#, fuzzy, no-wrap, priority:300
+#, no-wrap, priority:300
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -6235,32 +6264,32 @@ msgid ""
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
-"y - �귛춼閭ㅵ쓼\n"
-"n - 訝띷쉨耶섉���\n"
-"q - ���븝폑訝띷쉨耶섇똿�ф��쀥쑉�끿쉪�⒳퐰�꾢쓼\n"
-"a - �귛춼閭ㅵ쓼訝롦��뉏뻑�롩씊���됬쉪��\n"
-"d - 訝띷쉨耶섉��쀤툗閭ㅶ뻼餓뜹릮�€��됬쉪��\n"
-"g - �됪떓亮띈럼饔ц눛訝�訝ゅ쓼\n"
-"/ - �쒐뇨訝롧퍢若싨��숃〃渦양ㅊ�백뀓�꾢쓼\n"
-"j - �귚툖�녑츣竊뚩쉬�념툔訝�訝ゆ쑋�녑츣�꾢쓼\n"
-"J - �귚툖�녑츣竊뚩쉬�념�訝ゅ쓼\n"
-"k - �귚툖�녑츣竊뚩쉬�념툓訝�訝ゆ쑋�녑츣�꾢쓼\n"
-"K - �귚툖�녑츣竊뚩쉬�념툔=訝듾�訝ゅ쓼\n"
-"s - 弱녶퐪�띸쉪�쀥늽�꿩닇鸚싦릉渦껃컦�꾢쓼\n"
-"e - �뗥뒯煐뽬풌壤볟뎺�꾢쓼\n"
+"y - �귛춼閭ㅵ뙷��\n"
+"n - 訝띷쉨耶섉��뷴쓼\n"
+"q - ���븝폑訝띷쉨耶섇똿�ф��쀥쑉�끿쉪�⒳퐰�꾢뙷��\n"
+"a - �귛춼閭ㅵ쓼訝롦��뉏뻑�롩씊���됬쉪�뷴쓼\n"
+"d - 訝띷쉨耶섉��쀤툗閭ㅶ뻼餓뜹릮�€��됬쉪 �뷴쓼\n"
+"g - �됪떓亮띈럼饔ц눛訝�訝ゅ뙷��\n"
+"/ - �쒐뇨訝롧퍢若싨��숃〃渦양ㅊ�백뀓�꾢뙷��\n"
+"j - �귚툖�녑츣竊뚩쉬�념툔訝�訝ゆ쑋�녑츣�꾢뙷��\n"
+"J - �귚툖�녑츣竊뚩쉬�념�訝ゅ뙷��\n"
+"k - �귚툖�녑츣竊뚩쉬�념툓訝�訝ゆ쑋�녑츣�꾢뙷��\n"
+"K - �귚툖�녑츣竊뚩쉬�념툓訝�訝ゅ뙷��\n"
+"s - 弱녶퐪�띸쉪�뷴쓼�녶돯�먨쩀訝よ푵弱뤹쉪�뷴쓼\n"
+"e - �뗥뒯煐뽬풌壤볟뎺�꾢뙷��\n"
"? - 渦볟눣躍�뒰\n"
#. type: Plain text
#: en/git-add.txt:346
#, priority:300
msgid "After deciding the fate for all hunks, if there is any hunk that was chosen, the index is updated with the selected hunks."
-msgstr "�ⓨ넶若싦틙���됧쓼�꾣뱧鵝쒎릮竊뚦쫩�쒏쐣�됪떓�꾢쓼竊뚦닕鴉싦슴�ⓨ끀�ζ쎍�곁뇨凉뺛��"
+msgstr "�ⓨ넶若싦틙���됧쓼�꾣뱧鵝쒎릮竊뚦쫩�쒏쐣�됪떓�꾢뙷�쀯펽�쇾폏鵝욜뵪�뜻씎�닸뼭榮℡폊��"
#. type: Plain text
#: en/git-add.txt:349
#, priority:300
msgid "You can omit having to type return here, by setting the configuration variable `interactive.singleKey` to `true`."
-msgstr "�싪퓝弱녽뀓營�룜��`interactive.singleKey`溫양쉰訝�`true`竊뚦쑉閭ㅵ쨪�ⓨ룾餓δ툖恙낂뵰�ε썮饔╉��"
+msgstr "�싪퓝弱녽뀓營�룜�� `interactive.singleKey` 溫양쉰訝� `true`竊뚦쑉閭ㅵ쨪��빳訝띶퓚��뀯�욆쉐��"
#. type: Labeled list
#: en/git-add.txt:350
@@ -6316,9 +6345,9 @@ msgstr "�좈솮�꾢냵若밥빳��-�앭�鸚당쉪烏뚩〃鹽뷩�귝궓��빳�싪퓝弱녳��-��
# 瑥묋�낉폏�ュ갼訝ㅴ릉耶쀨뒄��꺗熬ュ닠�륅펽倻귝옖玲삭캂訝뷰릎�뉑젃�밥폏�븀렟�듾릉黎됧춻
#. type: Labeled list
#: en/git-add.txt:379
-#, fuzzy, no-wrap, priority:300
+#, no-wrap, priority:300
msgid "modified content"
-msgstr ", "
+msgstr "岳�뵻�꾢냵若�"
#. type: Plain text
#: en/git-add.txt:386
@@ -6330,15 +6359,15 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:394
-#, fuzzy, priority:300
+#, 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 ""
-"瓦섇룾餓ζ돢烏뚧쎍鸚띷쓡�꾣뱧鵝쒌�귚퐜���力ⓩ꼷竊뚨뵳雅롨‥訝곦퍎佯붺뵪雅롧뇨凉뺠�뚥툖��램鵝쒏젒竊뚦썱閭ㅵ램鵝쒏젒鴉쇌퉶鴉싢�쒏뮘易댿�앯뇨凉뺜릎�꾣쎍�밤�귚풃倻귨펽�①뇨凉뺜릎曆삣뒥訝�烏뚳펽�뚩�烏뚥툖�쭴EAD�뽩램"
-"鵝쒏젒�귝��뜸폏�귛춼�뜸빳瓦쏂죱�먧벡竊뚥퐜���烏뚥세阿롥쑉鴉싧쑉藥δ퐳�묇릎瓦쏂죱瓦섇렅��"
+"瓦섇룾餓ζ돢烏뚧쎍鸚띷쓡�꾣뱧鵝쒌�귚퐜���力ⓩ꼷竊뚨뵳雅롨‥訝곦퍎佯붺뵪雅롧뇨凉뺠�뚥툖��램鵝쒏젒竊뚦썱閭ㅵ램鵝쒏젒鴉쇌퉶鴉싢�쒏뮘易댿�앯뇨凉뺜릎�꾣쎍�밤�귚풃倻귨펽�①뇨凉뺜릎曆삣뒥訝�烏뚳펽�뚩�烏뚥툖�� HEAD "
+"�뽩램鵝쒏젒�귝��뜸폏�귛춼�뜸빳瓦쏂죱�먧벡竊뚥퐜���烏뚥세阿롥쑉鴉싧쑉藥δ퐳�묇릎瓦쏂죱瓦섇렅��"
#. type: Plain text
#: en/git-add.txt:396
-#, fuzzy, priority:300
+#, priority:300
msgid "Avoid using these constructs, or do so with extreme caution."
msgstr "�욕뀓鵝욜뵪瓦쇾틳�꾦�좑펽�ㅹ씆�쇔쨼弱뤷퓘��"
@@ -6367,8 +6396,8 @@ msgstr "岳�뵻�경쐣�꾢냵若�"
#, 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 ""
-"阿잌룾餓ι�싪퓝�귛춼訝듾툔�뉓죱竊덆�싪퓝弱녳�� �앲쉬�㏘맏��-�앾펹餓θ퓵烏뚦닠�ㅶ씎岳�뵻訝듾툔�뉓죱竊뚦뭉�ⓨ끀訝�렌�졿뼭�끻��꾟�� {plus}�앲죱�귞굳鴉쇔쑑竊뚦룾餓δ엶�밟�� "
-"{plus}�앲죱餓θ퓵烏뚨렟�됧냵若밭쉪曆삣뒥�뽨엶�밤�귛쑉���됪깄�듕툔竊뚧뼭�꾡엶�백꺗弱녶쑉藥δ퐳�묇릎瓦섇렅��"
+"阿잌룾餓ι�싪퓝�귛춼訝듾툔�뉓죱竊덆�싪퓝弱녳�� �앲쉬�㏘맏��-�앾펹餓θ퓵烏뚦닠�ㅶ씎岳�뵻訝듾툔�뉓죱竊뚦뭉�ⓨ끀訝�렌�졿뼭�끻��꾟��{plus}�앲죱�귞굳鴉쇔쑑竊뚦룾餓δ엶�밟��{plus}�앲죱餓θ퓵"
+"烏뚨렟�됧냵若밭쉪曆삣뒥�뽨엶�밤�귛쑉���됪깄�듕툔竊뚧뼭�꾡엶�백꺗弱녶쑉藥δ퐳�묇릎瓦섇렅��"
#. type: Labeled list
#: en/git-add.txt:413
@@ -6380,7 +6409,7 @@ msgstr "�곁쉪�끻�"
#: 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 "�②퓲��빳曆삣뒥烏δ툈訝�툖耶섇쑉�꾣뼭�끻��귛룵��曆삣뒥�계죱竊뚧캀烏뚥빳�� {plus}�앭�鸚담�귝렌�좂쉪�끻�弱녻퓲�잌댆藥δ퐳�묇릎��"
+msgstr "�②퓲��빳曆삣뒥烏δ툈訝�툖耶섇쑉�꾣뼭�끻��귛룵��曆삣뒥�계죱竊뚧캀烏뚥빳��{plus}�앭�鸚담�귝렌�좂쉪�끻�弱녻퓲�잌댆藥δ퐳�묇릎��"
#. type: Plain text
#: en/git-add.txt:422
@@ -13382,8 +13411,8 @@ msgstr ""
#, priority:300
msgid "This default configuration is achieved by creating references to the remote branch heads under `refs/remotes/origin` and by initializing `remote.origin.url` and `remote.origin.fetch` configuration variables."
msgstr ""
-"�싪퓝��`refs / remotes / origin`訝뗥닗兩뷴�瓦쒐쮮�녷뵱鸚당쉪凉뺟뵪竊뚦뭉�싪퓝�앭쭓��`remote.origin.url`��`remote.or"
-"igin.fetch`�띸쉰�섌뇧�ε닗兩뷸�容섋��띸쉰��"
+"�싪퓝�� `refs / remotes / origin` 訝뗥닗兩뷴�瓦쒐쮮�녷뵱鸚당쉪凉뺟뵪竊뚦뭉�싪퓝�앭쭓�� `remote.origin.url` �� "
+"`remote.origin.fetch` �띸쉰�섌뇧�ε닗兩뷸�容섋��띸쉰��"
#. type: Labeled list
#: en/git-clone.txt:45 en/git-config.txt:127 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
@@ -13396,17 +13425,17 @@ msgstr "--local"
#, priority:300
msgid "When the repository to clone from is on a local machine, this flag bypasses the normal \"Git aware\" transport mechanism and clones the repository by making a copy of HEAD and everything under objects and refs directories. The files under `.git/objects/` directory are hardlinked to save space when possible."
msgstr ""
-"壤볢쫨餓롣릎瓦쏂죱�뗩쉮�꾢춼�ⓨ틩鵝띴틢�у쑑溫←츞�뷰툓�띰펽閭ㅶ젃恙쀤폏瀯뺠퓝躍멱쭊�꾟�쏥it�잏윥�앬폖渦볠쑛�띰펽亮띌�싪퓝訝튗EAD餓ε룋野배괌�뚦폊�①쎅壤뺝냵�꾣��됧냵若밧닗兩뷴돬�т빳�뗩쉮耶섇궓佯볝��"
-"弱썲룾�썲컛`.git / objects /`��퐬訝뗧쉪�뉏뻑瓦쏂죱簾ч벦�δ빳�귞쐛令븅뿴��"
+"壤볢쫨餓롣릎瓦쏂죱�뗩쉮�꾢춼�ⓨ틩鵝띴틢�у쑑溫←츞�뷰툓�띰펽閭ㅶ젃恙쀤폏瀯뺠퓝躍멱쭊�꾟�쏥it�잏윥�앬폖渦볠쑛�띰펽亮띌�싪퓝訝� HEAD "
+"餓ε룋野배괌�뚦폊�①쎅壤뺝냵�꾣��됧냵若밧닗兩뷴돬�т빳�뗩쉮耶섇궓佯볝�귛갹��꺗弱� `.git / objects /` ��퐬訝뗧쉪�뉏뻑瓦쏂죱簾ч벦�δ빳�귞쐛令븅뿴��"
#. type: Plain text
#: en/git-clone.txt:59
-#, fuzzy, priority:300
+#, 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 ""
-"倻귝옖弱녶춼�ⓨ틩�뉐츣訝뷸쑍�계러孃꾬펷堊뗥쫩竊�`/path/to/repo`竊됵펽容섋��끻넻訝뗤슴��--"
-"local�귝빊�귛쫩�쒎컛耶섇궓佯볠뙁若싦맏URL竊뚦닕恙썹븼閭ㅶ젃恙쀯펷訝띴슴�ⓩ쑍�겻폍�뽳펹�귝뙁若�`--no-local`弱녶쑉瀯쇿츣`/path/to/"
-"repo`�띈쫮�뽭퍡溫ㅵ�쇽펽�뚥슴�ⓨ만鰲껯it鴉좄풏�밧폀��"
+"倻귝옖弱녶춼�ⓨ틩�뉐츣訝뷸쑍�계러孃꾬펷堊뗥쫩竊�`/path/to/repo`竊됵펽--local �귝빊若욆뇽訝딀삸訝띹돈鵝쒐뵪�꾠�귛쫩�쒎컛耶섇궓佯볠뙁若싦맏 "
+"URL竊뚦닕恙썹븼閭ㅶ젃恙쀯펷訝띴슴�ⓩ쑍�겻폍�뽳펹�귝뙁若� `--no-local` 弱녶쑉瀯쇿츣 `/path/to/repo` �띈쫮�뽭퍡溫ㅵ�쇽펽�뚥슴�ⓨ만鰲� Git "
+"鴉좄풏�밧폀��"
#. type: Labeled list
#: en/git-clone.txt:60
@@ -13419,7 +13448,7 @@ msgstr "--no-hardlinks"
#, priority:300
msgid "Force the cloning process from a repository on a local filesystem to copy the files under the `.git/objects` directory instead of using hardlinks. This may be desirable if you are trying to make a back-up of your repository."
msgstr ""
-"餓롦쑍�경뻼餓띄내瀯잋툓�꾢춼�ⓨ틩瓦쏂죱�뗩쉮�띰펽凉뷴댍鸚띶댍`.git / objects`��퐬訝뗧쉪�뉏뻑竊뚩�뚥툖鵝욜뵪簾ч벦�γ�귛쫩�쒏궓誤곩쨭餓썲춼�ⓨ틩竊뚦닕��꺗��誤곮퓳�룟걳��"
+"餓롦쑍�경뻼餓띄내瀯잋툓�꾢춼�ⓨ틩瓦쏂죱�뗩쉮�띰펽凉뷴댍鸚띶댍 `.git / objects` ��퐬訝뗧쉪�뉏뻑竊뚩�뚥툖鵝욜뵪簾ч벦�γ�귛쫩�쒏궓誤곩쨭餓썲춼�ⓨ틩竊뚦닕��꺗��誤곮퓳�룟걳��"
#. type: Labeled list
#: en/git-clone.txt:67
@@ -13432,8 +13461,8 @@ msgstr "--shared"
#, priority:300
msgid "When the repository to clone is on the local machine, instead of using hard links, automatically setup `.git/objects/info/alternates` to share the objects with the source repository. The resulting repository starts out without any object of its own."
msgstr ""
-"壤볢쫨�뗩쉮�꾢춼�ⓨ틩鵝띴틢�у쑑溫←츞�뷰툓�띰펽訝띴슴�①＼�얏렏竊뚩�뚧삸�ゅ뒯溫양쉰`.git/objects/info/"
-"alternates`訝롦틦耶섇궓佯볟뀻雅ュ�穩▲�귞뵟�먪쉪耶섇궓佯볟�冶뗦뿶亦→쐣�띈눎藥긺쉪餓삡퐬野배괌��"
+"壤볢쫨�뗩쉮�꾢춼�ⓨ틩鵝띴틢�у쑑溫←츞�뷰툓�띰펽訝띴슴�①＼�얏렏竊뚩�뚧삸�ゅ뒯溫양쉰 `.git/objects/info/alternates` "
+"訝롦틦耶섇궓佯볟뀻雅ュ�穩▲�귞뵟�먪쉪耶섇궓佯볟�冶뗦뿶亦→쐣�띈눎藥긺쉪餓삡퐬野배괌��"
#. type: Plain text
#: en/git-clone.txt:83
@@ -13452,10 +13481,10 @@ msgstr ""
"*力ⓩ꼷*竊싪퓳��꺗��뜳�⑴쉪�띴퐳竊�*訝띹쫨*鵝욜뵪�ㅹ씆�ⓧ틙鰲ｅ츆�꾢뒣�썬��\n"
"倻귝옖�ⓨ뀑�녷궓�꾢춼�ⓨ틩�뜸슴�ⓩ��됮」竊�\n"
"�뜹릮�ⓩ틦耶섇궓佯볞릎�좈솮�녷뵱\n"
-"竊덃닑鵝욜뵪餓삡퐬�뜸퍟鵝욜렟�됪룓雅ㅸ㎗�ㅵ폊�①쉪Git�썰빱竊됵펽\n"
+"竊덃닑鵝욜뵪餓삡퐬�뜸퍟鵝욜렟�됪룓雅ㅸ㎗�ㅵ폊�①쉪 Git �썰빱竊됵펽\n"
"�먧틳野배괌��꺗鴉싧룜孃쀦쑋凉뺟뵪竊덃닑�х㈉竊됥��\n"
-"瓦쇾틳野배괌��빳�싪퓝躍멱쭊�껯it�띴퐳竊덁풃倻�`git commit`竊됧닠�ㅳ��\n"
-"若껂폏�ゅ뒯瘟껆뵪`git gc --auto`�귨펷瑥룟뢿�꿯inkgit:git-gc [1]�귨펹\n"
+"瓦쇾틳野배괌��빳�싪퓝躍멱쭊�� Git �띴퐳竊덁풃倻� `git commit`竊됧닠�ㅳ��\n"
+"若껂폏�ゅ뒯瘟껆뵪 `git gc --auto`�귨펷瑥룟뢿�꿯inkgit:git-gc [1]�귨펹\n"
"倻귝옖瓦쇾틳野배괌藥꿨닠�ㅵ뭉熬ュ뀑�녺쉪耶섇궓佯볟폊�⑨펽\n"
"�ｄ퉰�뗩쉮�꾢춼�ⓨ틩弱녷뜜�뤵��\n"
@@ -13464,32 +13493,32 @@ msgstr ""
#, priority:300
msgid "Note that running `git repack` without the `--local` option in a repository cloned with `--shared` will copy objects from the source repository into a pack in the cloned repository, removing the disk space savings of `clone --shared`. It is safe, however, to run `git gc`, which uses the `--local` option by default."
msgstr ""
-"瑥룡낏�륅펽�ⓧ슴��`--shared`�됮」�뗩쉮�꾢춼�ⓨ틩訝�퓧烏뚥툖躍�`--local`�됮」��`git "
-"repack`�썰빱鴉싧컛繹먨춼�ⓨ틩訝�쉪野배괌鸚띶댍�겼뀑�녶춼�ⓨ틩訝�쉪�끺릎竊뚥퍗�뚧텋�ㅴ슴��`clone --shared`�귞쐛�꾤즯�섊㈉�담�귚툖瓦뉛펽瓦먫죱`git-"
-"gc`��츎�①쉪竊뚦츆容섋�鵝욜뵪`--local`�됮」��"
+"瑥룡낏�륅펽�ⓧ슴�� `--shared` �됮」�뗩쉮�꾢춼�ⓨ틩訝�퓧烏뚥툖躍� `--local` �됮」�� `git repack` "
+"�썰빱鴉싧컛繹먨춼�ⓨ틩訝�쉪野배괌鸚띶댍�겼뀑�녶춼�ⓨ틩訝�쉪�끺릎竊뚥퍗�뚧텋�ㅴ슴�� `clone --shared` �귞쐛�꾤즯�섊㈉�담�귚툖瓦뉛펽瓦먫죱 `git-gc` ��츎�①쉪竊�"
+"若껈퍡溫ㅴ슴�� `--local` �됮」��"
#. type: Plain text
#: en/git-clone.txt:93
#, priority:300
msgid "If you want to break the dependency of a repository cloned with `--shared` on its source repository, you can simply run `git repack -a` to copy all objects from the source repository into a pack in the cloned repository."
msgstr ""
-"倻귝옖誤곫뼪凉���`--shared`�뗩쉮�꾢춼�ⓨ틩野밧끀繹먨춼�ⓨ틩�꾡풚壅뽩뀽楹삼펽�ら�瓦먫죱`git repack "
-"-a`�녑룾弱녷틦耶섇궓佯볞릎�꾣��됧�穩▼쨳�뜹댆�뗩쉮耶섇궓佯볞릎�꾡�訝ゅ똿訝���"
+"倻귝옖誤곫뼪凉��� `--shared` �뗩쉮�꾢춼�ⓨ틩野밧끀繹먨춼�ⓨ틩�꾡풚壅뽩뀽楹삼펽�ら�瓦먫죱 `git repack -a` "
+"�녑룾弱녷틦耶섇궓佯볞릎�꾣��됧�穩▼쨳�뜹댆�뗩쉮耶섇궓佯볞릎�꾡�訝ゅ똿訝���"
#. type: Labeled list
#: en/git-clone.txt:94
#, no-wrap, priority:300
msgid "--reference[-if-able] <repository>"
-msgstr "--reference[-if-able] <repository>"
+msgstr "--reference[-if-able] <耶섇궓佯�>"
#. type: Plain text
#: en/git-clone.txt:104
#, priority:300
msgid "If the reference repository is on the local machine, automatically setup `.git/objects/info/alternates` to obtain objects from the reference repository. Using an already existing repository as an alternate will require fewer objects to be copied from the repository being cloned, reducing network and local storage costs. When using the `--reference-if-able`, a non existing directory is skipped with a warning instead of aborting the clone."
msgstr ""
-"倻귝옖�귟�껃춼�ⓨ틩鵝띴틢�у쑑溫←츞�뷰툓竊뚦닕�ゅ뒯溫양쉰`.git / objects / info / alternates`餓δ퍗�귟�껃춼�ⓨ틩�룟룚野배괌�귚슴�①렟�됬쉪耶섇궓佯�"
-"鵝쒍맏鸚뉒뵪耶섇궓佯볩펽�쇿컛��誤곦퍗誤곩뀑�녺쉪耶섇궓佯볞릎鸚띶댍渦껃컩�꾢�穩∽펽餓롨�뚪솉鵝롣틙營묊퍥�뚧쑍�겼춼�ⓩ닇�с�귛퐪鵝욜뵪`--reference-if-"
-"able`�띰펽訝띶춼�①쉪��퐬鴉싪˙鈺�몜瓮녘퓝竊뚩�뚥툖��릎閭℡뀑�녴��"
+"倻귝옖�귟�껃춼�ⓨ틩鵝띴틢�у쑑溫←츞�뷰툓竊뚦닕�ゅ뒯溫양쉰 `.git / objects / info / alternates` "
+"餓δ퍗�귟�껃춼�ⓨ틩�룟룚野배괌�귚슴�①렟�됬쉪耶섇궓佯볞퐳訝뷴쨭�ⓨ춼�ⓨ틩竊뚦닕弱녽�誤곦퍗誤곩뀑�녺쉪耶섇궓佯볞릎鸚띶댍渦껃컩�꾢�穩∽펽餓롨�뚪솉鵝롣틙營묊퍥�뚧쑍�겼춼�ⓩ닇�с�귛퐪鵝욜뵪 "
+"`--reference-if-able` �띰펽訝띶춼�①쉪��퐬鴉싪˙鈺�몜瓮녘퓝竊뚩�뚥툖��릎閭℡뀑�녴��"
#. type: Plain text
#: en/git-clone.txt:107
@@ -13509,11 +13538,11 @@ msgstr "--dissociate"
#. type: Plain text
#: en/git-clone.txt:118
-#, fuzzy, priority:300
+#, priority:300
msgid "Borrow the objects from reference repositories specified with the `--reference` options only to reduce network transfer, and stop borrowing from them after a clone is made by making necessary local copies of borrowed objects. This option can also be used when cloning locally from a repository that already borrows objects from another repository--the new repository will borrow objects from the same repository, and this option can be used to stop the borrowing."
msgstr ""
-"餓롧뵪`--reference`�됮」�뉐츣�꾢뢿�껃춼�ⓨ틩訝��잏뵪野배괌餓끾삸訝뷰틙�뤷컩營묊퍥鴉좄풏竊뚦뭉�ⓨ뀑�녶릮�싪퓝�뜸퐳�잏뵪野배괌�꾢퓚誤곫쑍�겼돬�ф씎�쒏�餓롥�穩▼�잏뵪�귛퐪餓롥럴瀯뤶퍗�╊�"
-"訝ゅ춼�ⓨ틩�잏뵪野배괌�꾢춼�ⓨ틩瓦쏂죱�у쑑�뗩쉮�띰펽阿잌룾餓δ슴�ⓩ��됮」竊싨뼭耶섇궓佯볟컛餓롥릪訝�訝ゅ춼�ⓨ틩�잏뵪野배괌竊뚦뭉訝붻��됮」��뵪雅롥걶閭℡�잏뵪��"
+"餓롧뵪 `--reference` �됮」�뉐츣�꾢뢿�껃춼�ⓨ틩訝��잏뵪野배괌餓끾삸訝뷰틙�뤷컩營묊퍥鴉좄풏竊뚦뭉�ⓨ뀑�녶릮�싪퓝�뜸퐳�잏뵪野배괌�꾢퓚誤곫쑍�겼돬�ф씎�쒏�餓롥�穩▼�잏뵪�귛퐪餓롥럴瀯뤶퍗"
+"�╊�訝ゅ춼�ⓨ틩�잏뵪野배괌�꾢춼�ⓨ틩瓦쏂죱�у쑑�뗩쉮�띰펽阿잌룾餓δ슴�ⓩ��됮」竊싨뼭耶섇궓佯볟컛餓롥릪訝�訝ゅ춼�ⓨ틩�잏뵪野배괌竊뚦뭉訝붻��됮」��뵪雅롥걶閭℡�잏뵪��"
#. type: Plain text
#: en/git-clone.txt:123
@@ -13532,12 +13561,13 @@ msgstr "�쀤퐰瓦먫죱�귚툖壤긷뱧�묉젃�녽뵗瑥�탛�ε몜瓦쎾벧�뜻�곥��"
#, priority:300
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag forces progress status even if the standard error stream is not directed to a terminal."
msgstr ""
+"容섋��끻넻訝뗰펽�꾢뒥�곁퍑塋�뿶竊뚥폏弱녻퓵佯�듁�곫뒫�딁퍢�뉐뇛�숃�役곻펽�ㅹ씆�뉐츣雅� `--quiet` �됮」�귛뜵鵝욘젃�녽뵗瑥�탛�ゅ츣�묈댆瀯덄ク竊뚩��뉐퓱阿잋폏凉뷴댍�양ㅊ瓦쎾벧�뜻�곥��"
#. type: Plain text
#: en/git-clone.txt:146
-#, priority:300
+#, fuzzy, priority:300
msgid "No checkout of HEAD is performed after the clone is complete."
-msgstr ""
+msgstr "�뗩쉮若뚧닇�롳펽訝띷돢烏똇EAD汝��뷸뱧鵝쒌��"
#. type: Labeled list
#: en/git-clone.txt:147 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
@@ -13547,9 +13577,13 @@ msgstr "--bare"
#. type: Plain text
#: en/git-clone.txt:158
-#, priority:300
+#, fuzzy, priority:300
msgid "Make a 'bare' Git repository. That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `--no-checkout` because there is nowhere to check out the working tree. Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`. When this option is used, neither remote-tracking branches nor the related configuration variables are created."
msgstr ""
+"�쎾뻠訝�訝も�쒑８�쒰it耶섇궓佯볝�귚튋弱길삸瑥댐펽訝띹쫨�쎾뻠 `<directory>` 亮뜹컛嶸←릤�뉏뻑�얍쑉 `<directory>/.git`竊뚩�뚧삸弱� "
+"`<directory>` �ц벴溫얌맏`$git_DIR`�귟퓳�양꽫�쀥맜�� `--no-checkout` "
+"�됮」竊뚦썱訝뷸깹�됧쑑�방��뷴램鵝쒏젒�귝�鸚뽳펽瓦쒐쮮�꾢늽��ㅄ�닸렏鸚띶댍�곁쎑佯붺쉪�у쑑�녷뵱鸚댐펽�뚥툖弱녶츆餓ф삝弱꾢댆 `refs/remotes/origin/"
+"`�귚슴�ⓩ��됮」�띰펽訝띴폏�쎾뻠瓦쒐쮮瓮잒릉�녷뵱�뽫쎑�녜뀓營�룜�뤵��"
#. type: Labeled list
#: en/git-clone.txt:159 en/git-pack-objects.txt:199 en/git-show-branch.txt:67 en/rev-list-options.txt:352 en/rev-list-options.txt:485
@@ -13561,7 +13595,7 @@ msgstr "--sparse"
#: en/git-clone.txt:164
#, priority:300
msgid "Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed."
-msgstr ""
+msgstr "�앭쭓�뽫��뤸��뷸뻼餓띰펽餓δ씩藥δ퐳��퐬餓끺퍗耶섇궓佯볠졊��퐬訝�쉪�뉏뻑凉�冶뗣�귛룾餓δ엶�밭��뤹��뷸뻼餓뜸빳�방뜮��誤곫돥掠뺝램鵝쒐쎅壤뺛��"
#. type: Labeled list
#: en/git-clone.txt:165 en/git-push.txt:161
@@ -13571,117 +13605,129 @@ msgstr "--mirror"
#. type: Plain text
#: en/git-clone.txt:172
-#, priority:300
+#, fuzzy, 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 ""
+"兩븀쳦繹먨춼�ⓨ틩�꾦븳�뤵�귟퓳�쀥맜 `--bare` �됮」�귚툗 `--bare` �멩캈竊�`--mirror` "
+"訝띴퍎弱녷틦�꾣쑍�겼늽��삝弱꾢댆��젃�꾣쑍�겼늽��펽瓦섉삝弱꾣��됧폊�⑨펷�끾떖瓦쒐쮮瓮잒릉�녷뵱竊뚧낏�딁춬竊됧뭉溫양쉰雅� refspec �띸쉰竊뚦썱�뚦쑉��젃耶섇궓佯볞릎�㎬죱 `git "
+"remote update` �띰펽���됭퓳雅쎾폊�③꺗鴉싪˙�띶넍��"
#. type: Labeled list
#: en/git-clone.txt:173
#, no-wrap, priority:300
msgid "-o <name>"
-msgstr ""
+msgstr "-o <�띸㎞>"
#. type: Labeled list
#: en/git-clone.txt:174
#, no-wrap, priority:300
msgid "--origin <name>"
-msgstr ""
+msgstr "--origin <�띸㎞>"
#. 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 ""
+msgstr "訝띴슴�②퓶葉뗥릫燁� `origin` �θ퇎甕や툓歷멨춼�ⓨ틩竊뚩�뚥슴��`<�띸㎞>`��"
#. type: Labeled list
#: en/git-clone.txt:178
#, no-wrap, priority:300
msgid "-b <name>"
-msgstr ""
+msgstr "-b <�띸㎞>"
#. type: Labeled list
#: en/git-clone.txt:179
#, no-wrap, priority:300
msgid "--branch <name>"
-msgstr ""
+msgstr "--branch <�띸㎞>"
#. type: Plain text
#: en/git-clone.txt:186
#, priority:300
msgid "Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository's HEAD, point to `<name>` branch instead. In a non-bare repository, this is the branch that will be checked out. `--branch` can also take tags and detaches the HEAD at that commit in the resulting repository."
msgstr ""
+"訝띶컛�겼닗兩븀쉪 HEAD �뉐릲�뗩쉮耶섇궓佯볡쉪 HEAD ���뉐릲�꾢늽��펽�뚧삸�뉐릲`<�띸㎞>`�녷뵱�귛쑉�욆８餓볟틩訝�펽瓦숁삸弱녻˙汝��븀쉪�녷뵱�� `--branch` "
+"阿잌룾餓δ슴�ⓩ젃嶺얍뭉�①뵟�먪쉪耶섇궓佯볞릎�꾣룓雅ㅶ뿶�녺┿ HEAD��"
#. type: Labeled list
#: en/git-clone.txt:187
#, no-wrap, priority:300
msgid "-u <upload-pack>"
-msgstr ""
+msgstr "-u <訝듾폖��>"
#. type: Plain text
#: en/git-clone.txt:192
#, priority:300
msgid "When given, and the repository to clone from is accessed via ssh, this specifies a non-default path for the command run on the other end."
-msgstr ""
+msgstr "倻귝옖�뉐츣雅녻쫨�뗩쉮�꾢춼�ⓨ틩竊뚥툝��빳�싪퓝 ssh 溫욥뿮瑥ε춼�ⓨ틩竊뚩퓳弱녵맏�╊�塋�퓧烏뚨쉪�썰빱�뉐츣�욇퍡溫ㅸ러孃꾠��"
#. type: Labeled list
#: en/git-clone.txt:193 en/git-init.txt:51 en/git-svn.txt:578
#, no-wrap, priority:300
msgid "--template=<template_directory>"
-msgstr ""
+msgstr "--template = <與→씮��퐬>"
#. type: Plain text
#: en/git-clone.txt:196
#, priority:300
msgid "Specify the directory from which templates will be used; (See the \"TEMPLATE DIRECTORY\" section of linkgit:git-init[1].)"
-msgstr ""
+msgstr "�뉐츣弱녵슴�ⓩÆ�욜쉪��퐬竊쏉펷瑥룟뢿�� linkgit:git-init[1] �꾟�쒏Æ�욜쎅壤뺚�앶깿�녴�귨펹"
#. type: Labeled list
#: en/git-clone.txt:197
#, no-wrap, priority:300
msgid "-c <key>=<value>"
-msgstr ""
+msgstr "-c <��> = <��>"
#. type: Labeled list
#: en/git-clone.txt:198
#, no-wrap, priority:300
msgid "--config <key>=<value>"
-msgstr ""
+msgstr "--config <��> = <��>"
#. type: Plain text
#: en/git-clone.txt:207
-#, priority:300
+#, fuzzy, priority:300
msgid "Set a configuration variable in the newly-created repository; this takes effect immediately after the repository is initialized, but before the remote history is fetched or any files checked out. The key is in the same format as expected by linkgit:git-config[1] (e.g., `core.eol=true`). If multiple values are given for the same key, each value will be written to the config file. This makes it safe, for example, to add additional fetch refspecs to the origin remote."
msgstr ""
+"�ⓩ뼭�쎾뻠�꾢춼�ⓨ틩訝��營�뀓營�룜�륅폑瓦쇿컛�ⓨ닜冶뗥뙑耶섇궓佯볞퉳�롢�곮렩�뽬퓶葉뗥럣�꿱�壤뺞닑嶺얍눣餓삡퐬�뉏뻑阿뗥뎺塋뗥뜵�잍븞�귛칳�η쉪�쇔폀訝� linkgit:git-"
+"config[1] �잍쐹�꾣졏凉뤹쎑�뚳펷堊뗥쫩竊�`core.eol = true`竊됥�귛쫩�쒍맏�뚥���뙁若싦틙鸚싦릉�쇽펽�숁캀訝ゅ�쇤꺗弱녶넍�ι뀓營�뻼餓뜰�귚풃倻귨펽"
+"瓦쇿룾餓ε츎�ⓨ쑑弱녶끀餓뽪뒖�� refspec 曆삣뒥�경틦瓦쒐ク��"
#. type: Plain text
#: en/git-clone.txt:213
#, priority:300
msgid "Due to limitations of the current implementation, some configuration variables do not take effect until after the initial fetch and checkout. Configuration variables known to not take effect are: `remote.<name>.mirror` and `remote.<name>.tagOpt`. Use the corresponding `--mirror` and `--no-tags` options instead."
msgstr ""
+"�긴틢壤볟뎺若욅렟�밧폀�꾦솏�띰펽�먧틳�띸쉰�섌뇧誤곭춬�겼닜冶뗨렩�뽩뭽嶺얍눣�롦뎺�썹뵟�덀�귛럴�δ툖鴉싩뵟�덄쉪�띸쉰�섌뇧�됵폏`remote.<s�띸㎞> .mirror` "
+"��`remote.<�띸㎞> .tagOpt`�귛쫩誤곦엶�뱄펽佯붹뵻�①쎑佯붺쉪 `--mirror` �� `--no-tags` �됮」��"
#. type: Labeled list
#: en/git-clone.txt:214
#, no-wrap, priority:300
msgid "--depth <depth>"
-msgstr ""
+msgstr "--depth <曆긷벧>"
#. type: Plain text
#: en/git-clone.txt:220
#, priority:300
msgid "Create a 'shallow' clone with a history truncated to the specified number of commits. Implies `--single-branch` unless `--no-single-branch` is given to fetch the histories near the tips of all branches. If you want to clone submodules shallowly, also pass `--shallow-submodules`."
msgstr ""
+"�쎾뻠訝�訝ゅ럣�꿱�壤뺠˙�ゆ뼪訝뷸뙁若싨룓雅ㅶА�곁쉪�쒏탢�앭뀑�녴�귝슅�� `--single-branch` �됮」竊뚪솮�욅퍢�� `--no-single-branch` "
+"�θ렩�뽪��됧늽��《塋�셿瓦묊쉪�녶뤁溫겼퐬�귛쫩�쒑쫨役끻콆�뗩쉮耶먩Æ�쀯펽瓦섇룾餓δ슴�� `--shallow-submodules` �됮」��"
#. type: Plain text
#: en/git-clone.txt:223
#, priority:300
msgid "Create a shallow clone with a history after the specified time."
-msgstr ""
+msgstr "�쎾뻠役끻뀑�놅펽�ゅ똿�ユ뙁若싩쉪�띌뿴阿뗥릮�꾢럣�꿱�壤뺛��"
#. type: Plain text
#: en/git-clone.txt:228
#, priority:300
msgid "Create a shallow clone with a history, excluding commits reachable from a specified remote branch or tag. This option can be specified multiple times."
-msgstr ""
+msgstr "�쎾뻠訝�訝ゆ쐣�녶뤁�꾣탢�뗩쉮竊뚥툖�끻맜��빳熬ユ뙁若싪퓶葉뗥늽��닑�뉒�溫욥뿮�꾣룓雅ㅳ�귝쑍�됮」��빳鵝욜뵪鸚싨А��"
#. type: Labeled list
#: en/git-clone.txt:229 en/git-submodule.txt:433
@@ -13694,36 +13740,49 @@ msgstr "--[no-]single-branch"
#, priority:300
msgid "Clone only the history leading to the tip of a single branch, either specified by the `--branch` option or the primary branch remote's `HEAD` points at. Further fetches into the resulting repository will only update the remote-tracking branch for the branch this option was used for the initial cloning. If the HEAD at the remote did not point at any branch when `--single-branch` clone was made, no remote-tracking branch is created."
msgstr ""
+"餓끻뀑�녺쎍�겼뜒訝��녷뵱�ュ갼�꾢럣�뀐펽瑥ε늽��˙ `--branch` �됮」�뽨말�녷뵱瓦쒐쮮 `HEAD` "
+"�뉐츣�귟˙�쎾뻠餓볟틩阿뗥릮�꾣뒖�뽩컛�ゆ쎍�겼쑉�뗩쉮�띈˙�뉐츣�꾥퓶葉뗨퇎甕ゅ늽���귛쫩�쒎쑉 `--single-branch` �뗩쉮�띰펽瓦쒐쮮 HEAD "
+"�ゆ뙁�묇뻣鵝뺝늽��펽�쇾툖鴉싧닗兩븃퓶葉뗨퇎甕ゅ늽����"
#. type: Plain text
#: en/git-clone.txt:245
#, priority:300
msgid "Don't clone any tags, and set `remote.<remote>.tagOpt=--no-tags` in the config, ensuring that future `git pull` and `git fetch` operations won't follow any tags. Subsequent explicit tag fetches will still work, (see linkgit:git-fetch[1])."
msgstr ""
+"訝띶뀑�녵뻣鵝뺞젃嶺억펽亮뜹쑉�띸쉰訝��營� `remote.<remote>.tagOpt=--no-tags` 竊뚨‘岳앭컛�η쉪`git pull`��`git "
+"fetch`�띴퐳訝띴폏瓮잓쉹餓삡퐬�뉒��귡쉹�롧쉪�얍폀�뉒��볟룚餓띶컛壅룝퐳�⑨펷�귡쁾 linkgit竊쉍it-fetch [1]竊됥��"
#. type: Plain text
#: en/git-clone.txt:250
#, priority:300
msgid "Can be used in conjunction with `--single-branch` to clone and maintain a branch with no references other than a single cloned branch. This is useful e.g. to maintain minimal clones of the default branch of some repository for search indexing."
msgstr ""
+"��빳訝� `--single-branch` "
+"瀯볟릦鵝욜뵪竊뚥빳�뗩쉮�뚨뺨�ㅹ솮�뺜릉�뗩쉮�녷뵱鸚뽪깹�됧끀餓뽩폊�①쉪�녷뵱�귟퓳�ⓧ풃倻귞뺨�ㅶ윇雅쎽퍜佯볡쉪容섋��녷뵱�꾣�弱뤷뀑�녵빳瓦쏂죱�쒐뇨榮℡폊�뜻쐣�ⓦ��"
#. type: Labeled list
#: en/git-clone.txt:251
#, no-wrap, priority:300
msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+msgstr "--recurse-submodules[=<瓮�푶鰲꾥똽]"
#. type: Plain text
#: en/git-clone.txt:259
#, priority:300
msgid "After the clone is created, initialize and clone submodules within based on the provided pathspec. If no pathspec is provided, all submodules are initialized and cloned. This option can be given multiple times for pathspecs consisting of multiple entries. The resulting clone has `submodule.active` set to the provided pathspec, or \".\" (meaning all submodules) if no pathspec is provided."
msgstr ""
+"�쎾뻠�뗩쉮�롳펽�방뜮�먧풘�꾥러孃꾥쭊�껃닜冶뗥뙑亮뜹뀑�녶끀訝�쉪耶먩Æ�쀣�귛쫩�쒏쑋�먧풘瓮�푶鰲꾥똽竊뚦닕弱녶닜冶뗥뙑亮뜹뀑�녷��됧춴與▼쓼�귛�雅롧뵳鸚싦릉�←쎅瀯꾣닇�꾥러孃꾥쭊�껓펽��빳鸚싨А壅뗤틛閭ㅹ�됮」��"
+"�잍닇�꾢뀑�녶컛�� `submodule.active` 溫얌맏�먧풘�꾥러孃꾥쭊�껁�귛쫩�쒏쑋�먧풘瓮�푶鰲꾥똽竊뚨뵟�먪쉪�뗩쉮弱녷뒍 `submodule.active` 溫얌맏 "
+"\".\" 竊덅〃鹽뷸��됧춴與▼쓼竊됥��"
#. type: Plain text
#: en/git-clone.txt:266
#, priority:300
msgid "Submodules are initialized and cloned using their default settings. This is equivalent to running `git submodule update --init --recursive <pathspec>` immediately after the clone is finished. This option is ignored if the cloned repository does not have a worktree/checkout (i.e. if any of `--no-checkout`/`-n`, `--bare`, or `--mirror` is given)"
msgstr ""
+"耶먩Æ�쀤슴�ⓨ끀容섋�溫양쉰瓦쏂죱�앭쭓�뽩뭽�뗩쉮�귟퓳嶺됪븞雅롥뀑�녶츑�먨릮塋뗥뜵瓦먫죱 `git submodule update --init --recursive "
+"<瓮�푶鰲꾥똽>`�귛쫩�쒎뀑�녺쉪餓볟틩亦→쐣藥δ퐳��/汝��븝펷�녕퍢�뷰틙 `--no-checkout`/`-n`竊�`--bare` �� "
+"`--mirror`訝�쉪餓삡퐬訝�訝ら�됮」竊됵펽�쇿옙�ζ��됮」��"
#. type: Labeled list
#: en/git-clone.txt:267
@@ -13735,7 +13794,7 @@ msgstr "--[no-]shallow-submodules"
#: en/git-clone.txt:269
#, priority:300
msgid "All submodules which are cloned will be shallow with a depth of 1."
-msgstr ""
+msgstr "���됧뀑�녺쉪耶먩Æ�쀩꺗弱녷삸役끻뀑�놅펽曆긷벧訝�1��"
#. type: Labeled list
#: en/git-clone.txt:270
@@ -13748,66 +13807,71 @@ msgstr "--[no-]remote-submodules"
#, priority:300
msgid "All submodules which are cloned will use the status of the submodule's remote-tracking branch to update the submodule, rather than the superproject's recorded SHA-1. Equivalent to passing `--remote` to `git submodule update`."
msgstr ""
+"�뗩쉮�꾣��됧춴與▼쓼弱녵슴�ⓨ춴與▼쓼�꾥퓶葉뗨퇎甕ゅ늽��쉪�뜻�곫씎�닸뼭耶먩Æ�쀯펽�뚥툖��텈瀛㏝」��쉪藥꿱�壤뷨HA-1�귞춬�뚥틢弱�`--remote` 鴉좈�믥퍢 `git "
+"submodule update`��"
#. type: Labeled list
#: en/git-clone.txt:276 en/git-init.txt:56
#, no-wrap, priority:300
msgid "--separate-git-dir=<git dir>"
-msgstr ""
+msgstr "--separate-git-dir=<git��퐬>"
#. type: Plain text
#: en/git-clone.txt:282
#, priority:300
msgid "Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, then make a filesystem-agnostic Git symbolic link to there. The result is Git repository can be separated from working tree."
msgstr ""
+"訝띶컛�뗩쉮�꾢춼�ⓨ틩�양쉰�ⓨ렅鸚꾬펽�뚧삸弱녶뀑�녺쉪耶섇궓佯볠붂營�쑉�뉐츣�꾤쎅壤뺜릎竊뚨꽫�롥쑉閭ㅵ쨪兩븀쳦訝롦뻼餓띄내瀯잍뿞�녕쉪Git寧�뤇�얏렏�귟퓳��빳弱낶it餓볟틩訝롥램鵝쒎뙷�녺┿��"
#. type: Labeled list
#: en/git-clone.txt:283 en/git-submodule.txt:427
#, no-wrap, priority:300
msgid "-j <n>"
-msgstr ""
+msgstr "-j <n>"
#. type: Labeled list
#: en/git-clone.txt:284 en/git-submodule.txt:428
#, no-wrap, priority:300
msgid "--jobs <n>"
-msgstr ""
+msgstr "--jobs <n>"
#. type: Plain text
#: en/git-clone.txt:287
#, priority:300
msgid "The number of submodules fetched at the same time. Defaults to the `submodule.fetchJobs` option."
-msgstr ""
+msgstr "�뚧뿶�볟룚�꾢춴與▼쓼�겹�귡퍡溫ㅴ맏 `submodule.fetchJobs` �됮」��"
#. type: Labeled list
#: en/git-clone.txt:288 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
#, no-wrap, priority:300
msgid "<repository>"
-msgstr ""
+msgstr "<餓볟틩>"
#. type: Plain text
#: en/git-clone.txt:292
#, priority:300
msgid "The (possibly remote) repository to clone from. See the <<URLS,GIT URLS>> section below for more information on specifying repositories."
-msgstr ""
+msgstr "誤곩뀑�녺쉪竊덂룾�썸삸瓦쒐쮮�꾬펹餓볟틩�귝쐣�녔뙁若싦퍜佯볡쉪�닷쩀岳→겘竊뚦뢿�끺툔�®쉪 <<URLS,GIT URLS>> �ⓨ늽��"
#. type: Labeled list
#: en/git-clone.txt:293 en/git-cvsserver.txt:53 en/git-daemon.txt:220 en/git-receive-pack.txt:41 en/git-send-pack.txt:95 en/git-upload-archive.txt:57 en/git-upload-pack.txt:44
#, no-wrap, priority:300
msgid "<directory>"
-msgstr ""
+msgstr "<��퐬>"
#. type: Plain text
#: en/git-clone.txt:299
#, priority:300
msgid "The name of a new directory to clone into. The \"humanish\" part of the source repository is used if no directory is explicitly given (`repo` for `/path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an existing directory is only allowed if the directory is empty."
msgstr ""
+"誤곩뀑�녶댆�꾣뼭��퐬�꾢릫燁겹�귛쫩�쒏쑋�롧‘�뉐츣��퐬竊뚦닕鵝욜뵪繹먧퍜佯볞릎�꾟�쒍볶�㎩뙑�앶깿�놅펷野밥틢 `/path/to/repo.git` �뚩�竊뚥맏 `repo`竊쎾�雅� "
+"`host.xz:foo/.git` �뚩�竊뚥맏 `foo`竊됥�귚퍎壤볡쎅壤뺜맏令뷸뿶�띶뀅溫멨뀑�녶댆�경쐣��퐬��"
#. type: Plain text
#: en/git-clone.txt:307
#, priority:300
msgid "Clone from upstream:"
-msgstr ""
+msgstr "餓롣툓歷멨뀑�놅폏"
#. type: delimited block -
#: en/git-clone.txt:312
@@ -13817,12 +13881,15 @@ msgid ""
"$ cd my-linux\n"
"$ make\n"
msgstr ""
+"$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n"
+"$ cd my-linux\n"
+"$ make\n"
#. type: Plain text
#: en/git-clone.txt:316
#, priority:300
msgid "Make a local clone that borrows from the current directory, without checking things out:"
-msgstr ""
+msgstr "�뜸퐳訝�訝や퍗壤볟뎺��퐬�잏뵪�꾣쑍�겼뀑�놅펽�뚧뿞��瓦쏂죱汝��븝폏"
#. type: delimited block -
#: en/git-clone.txt:321
@@ -13832,12 +13899,15 @@ msgid ""
"$ cd ../copy\n"
"$ git show-branch\n"
msgstr ""
+"$ git clone -l -s -n . ../copy\n"
+"$ cd ../copy\n"
+"$ git show-branch\n"
#. type: Plain text
#: en/git-clone.txt:325
#, priority:300
msgid "Clone from upstream while borrowing from an existing local directory:"
-msgstr ""
+msgstr "餓롣툓歷멨뀑�녷뿶�잏뵪�у쑑��퐬竊�"
#. type: delimited block -
#: en/git-clone.txt:331
@@ -13848,18 +13918,22 @@ msgid ""
"\tmy-linux\n"
"$ cd my-linux\n"
msgstr ""
+"$ git clone --reference /git/linux.git \\\n"
+"\tgit://git.kernel.org/pub/scm/.../linux.git \\\n"
+"\tmy-linux\n"
+"$ cd my-linux\n"
#. type: Plain text
#: en/git-clone.txt:335
#, priority:300
msgid "Create a bare repository to publish your changes to the public:"
-msgstr ""
+msgstr "�쎾뻠訝�訝よ８餓볟틩竊뚥빳弱녷궓�꾣쎍�밧룕躍껆퍢�т폌竊�"
#. type: delimited block -
#: en/git-clone.txt:338
#, no-wrap, priority:300
msgid "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
-msgstr ""
+msgstr "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
#. type: Title =
#: en/git-column.txt:2
@@ -28930,232 +29004,255 @@ msgid ""
"\t [--separate-git-dir <git dir>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
+"'git init' [-q | --quiet] [--bare] [--template=<與→씮��퐬>]\n"
+"\t [--separate-git-dir <git ��퐬>]\n"
+"\t [--shared[=<�껈솏>]] [��퐬]\n"
#. type: Plain text
#: en/git-init.txt:24
#, priority:300
msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files. An initial `HEAD` file that references the HEAD of the master branch is also created."
msgstr ""
+"瑥ε뫝餓ㅵ닗兩뷰�訝ょ㈉�껯it耶섇궓佯� - �ц뇽訝딀삸訝�訝� `.git` ��퐬竊뚦끀訝�똿�� `objects`��`refs/heads`��`refs/"
+"tags`�뚧Æ�욘뻼餓띄쉪耶먪쎅壤뺛�귟퓲弱녶닗兩뷰�訝ゅ폊�쮕aster�녷뵱 HEAD �꾢닜冶� `HEAD` �뉏뻑��"
#. type: Plain text
#: en/git-init.txt:27
-#, priority:300
+#, fuzzy, priority:300
msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
-msgstr ""
+msgstr "倻귝옖溫양쉰雅� `$GIT_DIR` ��쥊�섌뇧竊뚪궍阿덂츆弱녷뙁若싩뵪雅롣퍜佯볟읃簾��꾥러孃꾬펽�뚥툖�� `./.git` ."
#. type: Plain text
#: en/git-init.txt:32
#, priority:300
msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
+"倻귝옖�싪퓝 `$GIT_OBJECT_DIRECTORY` ��쥊�섌뇧�뉐츣雅녶�穩▼춼�①쎅壤뺧펽�ｄ퉰弱녶쑉瑥η쎅壤뺜툔�쎾뻠 sha1 ��퐬竊뚦맔�쇿컛鵝욜뵪容섋��� `$"
+"GIT_DIR/objects` ��퐬��"
#. type: Plain text
#: en/git-init.txt:37
-#, priority:300
+#, fuzzy, priority:300
msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
msgstr ""
+"�①렟�됧춼�ⓨ틩訝�퓧烏� 'git init' ��츎�①쉪�귛츆訝띴폏誤녺썣藥꿰퍘耶섇쑉�꾢냵若밤�귡뇥�계퓧烏� 'git init' �꾡말誤곩렅�졿삸�됪떓�경렌�좂쉪與→씮竊덂쫩�쒐퍢若싦틙 "
+"--separate-git-dir �귝빊竊뚦닕弱녶춼�ⓨ틩燁삭눛�╊�訝や퐤營�펹��"
#. type: Plain text
#: en/git-init.txt:45
#, priority:300
msgid "Only print error and warning messages; all other output will be suppressed."
-msgstr ""
+msgstr "餓끾돀�곈뵗瑥�뭽鈺�몜易덃겘竊쎿��됧끀餓뽬풏�뷴컛訝띴폏�양ㅊ��"
#. type: Plain text
#: en/git-init.txt:50
#, priority:300
msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
-msgstr ""
+msgstr "�쎾뻠訝�訝ょ변餓볟틩�귛쫩�쒏쑋溫양쉰 `GIT_DIR` ��쥊�섌뇧竊뚦닕弱녶끀溫양쉰訝뷴퐪�띶램鵝쒐쎅壤뺛��"
#. type: Plain text
#: en/git-init.txt:55
#, priority:300
msgid "Specify the directory from which templates will be used. (See the \"TEMPLATE DIRECTORY\" section below.)"
-msgstr ""
+msgstr "�뉐츣誤곦슴�ⓩÆ�욜쉪��퐬�귨펷瑥룟뢿鰲곦툔�®쉪�쒏Æ�욜쎅壤뺚�앶깿�녴�귨펹"
#. type: Plain text
#: en/git-init.txt:62
#, priority:300
msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository. This file acts as filesystem-agnostic Git symbolic link to the repository."
msgstr ""
+"亮뜸툖弱녶춼�ⓨ틩�앭쭓�뽬눛 `$GIT_DIR` �� `./.git/` ��퐬竊뚩�뚧삸�ⓨ끀訝�닗兩뷰�訝ゅ똿�ュ츩�끻춼�ⓨ틩瓮�푶�꾣뻼�ф뻼餓뜰�귝��뉏뻑鵝쒍맏瓦욄렏�겻퍜佯볡쉪 Git "
+"寧�뤇�얏렏竊뚦끀訝롦뻼餓띄내瀯잍뿞�녈��"
#. type: Plain text
#: en/git-init.txt:64
#, priority:300
msgid "If this is reinitialization, the repository will be moved to the specified path."
-msgstr ""
+msgstr "倻귝옖訝븅뇥�겼닜冶뗥뙑�띴퐳竊뚦닕弱녶춼�ⓨ틩燁삣뒯�경뙁若싩쉪瓮�푶��"
#. type: Labeled list
#: en/git-init.txt:65
#, no-wrap, priority:300
msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
-msgstr ""
+msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
#. type: Plain text
#: en/git-init.txt:73
#, priority:300
msgid "Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository. When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions. When not specified, Git will use permissions reported by umask(2)."
msgstr ""
+"�뉐츣 Git 耶섇궓佯볟쑉鸚싦릉�ⓩ댎阿뗩뿴�긴벴�귟퓳�곮�掠욂틢�뚥�瀯꾤쉪�ⓩ댎�③�곩댆瑥ε춼�ⓨ틩�귝뙁若싨뿶竊뚦컛溫양쉰�띸쉰�섌뇧 \"core.sharedRepository\"竊�"
+"餓δ씩鵝욜뵪瑥룡콆�꾣쓢�먨닗兩� `$GIT_DIR` 訝뗧쉪�뉏뻑�뚨쎅壤뺛�귝쑋�뉐츣�띰펽Git 弱녵슴�� umask(2) 瓦붷썮�꾣쓢�먦��"
#. type: Plain text
#: en/git-init.txt:76
#, priority:300
msgid "The option can have the following values, defaulting to 'group' if no value is given:"
-msgstr ""
+msgstr "閭ㅹ�됮」��빳�됦빳訝뗥�쇽펽倻귝옖�ょ퍢若싧�쇽펽�숅퍡溫ㅴ맏 'group'竊�"
#. type: Labeled list
#: en/git-init.txt:78
#, no-wrap, priority:300
msgid "'umask' (or 'false')"
-msgstr ""
+msgstr "'umask'竊덃닑 'false'竊�"
#. type: Plain text
#: en/git-init.txt:82
#, priority:300
msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
-msgstr ""
+msgstr "鵝욜뵪 umask(2) 瓦붷썮�꾣쓢�먦�귝쑋�뉐츣 `--shared` �띰펽閭ㅴ맏容섋��쇈��"
#. type: Labeled list
#: en/git-init.txt:83
#, no-wrap, priority:300
msgid "'group' (or 'true')"
-msgstr ""
+msgstr "'group'竊덃닑 'true'竊�"
#. type: Plain text
#: en/git-init.txt:91
#, priority:300
msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
msgstr ""
+"鵝욕춼�ⓨ틩瀯꾢룾�숋펷亮뜸툝 g+sx竊뚦썱訝� git 瀯꾢룾�썰툖����됬뵪�루쉪訝삭쫨瀯꾬펹�귟퓳�ⓧ틢�얍��잍쑍若됧뀲�� umask(2) �쇘쉪�껈솏�귟�力ⓩ꼷竊똵mask "
+"餓띸꽫�귞뵪雅롥끀餓뽪쓢�먧퐤竊덁풃倻귨펽倻귝옖 umask 訝� '0022'竊뚦닕鵝욜뵪 'group' "
+"訝띴폏�좈솮�뜸퍟竊덆씆瀯꾬펹�ⓩ댎�꾥��뽫돶�껓펹�귝쐣�녑쫩鵝뺟꼐簾�뙁若싧춼�ⓨ틩�껈솏�꾡에��펽瑥룟뢿鰲� '0xxx'��"
#. type: Labeled list
#: en/git-init.txt:92
#, no-wrap, priority:300
msgid "'all' (or 'world' or 'everybody')"
-msgstr ""
+msgstr "'all' 竊덃닑 'world' �� 'everybody'竊�"
#. type: Plain text
#: en/git-init.txt:95
#, priority:300
msgid "Same as 'group', but make the repository readable by all users."
-msgstr ""
+msgstr "訝롣슴�� 'group' �됮」�멨릪竊뚥퐜鵝욕춼�ⓨ틩野방��됬뵪�룟룾瑥삠��"
#. type: Labeled list
#: en/git-init.txt:96
#, no-wrap, priority:300
msgid "'0xxx'"
-msgstr ""
+msgstr "'0xxx'"
#. type: Plain text
#: en/git-init.txt:103
#, priority:300
msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
msgstr ""
+"'0xxx' ���訝ゅ뀵瓦쎾댍�곤펽驪뤶릉�뉏뻑�꾣Æ凉뤷쓦訝� '0xxx'��' 0xxx' 弱녻쫮�뽫뵪�루쉪 umask(2) �쇽펷訝띴퍎�� 'group �� 'all' "
+"�ｆ졆�얍��껈솏竊됥��'0640' 弱녶닗兩뷰�訝ょ퍍����뽨퐜訝띹꺗瀯꾢넍�δ툝�뜸퍟�ⓩ댎�졿퀡溫욥뿮�꾢춼�ⓨ틩��'0660' "
+"弱녶닗兩뷴퐪�띸뵪�룟뭽瀯꾢룾瑥삣룾�쇾퐜�뜸퍟�ⓩ댎�졿퀡溫욥뿮�꾢춼�ⓨ틩��"
#. type: Plain text
#: en/git-init.txt:108
#, priority:300
msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
-msgstr ""
+msgstr "容섋��끻넻訝뗰펽�긴벴耶섇궓佯볞릎��뵪雅녽뀓營�젃恙� `receive.denyNonFastForwards`竊뚦썱閭ㅶ궓訝띹꺗凉뷴댍弱녽씆恙ラ�잌뎺瓦쎿룓雅ㅶ렓�곩댆�뜸릎��"
#. type: Plain text
#: en/git-init.txt:111
#, priority:300
msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
-msgstr ""
+msgstr "倻귝옖�먧풘 'dicrectory'竊뚦닕�썰빱�ⓨ끀訝�퓧烏뚣�귛쫩�쒏���퐬訝띶춼�⑨펽�쇿닗兩뷴츆��"
#. type: Title -
#: en/git-init.txt:113
#, no-wrap, priority:300
msgid "TEMPLATE DIRECTORY"
-msgstr ""
+msgstr "與→씮��퐬"
#. type: Plain text
#: en/git-init.txt:117
#, priority:300
msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
-msgstr ""
+msgstr "與→씮��퐬訝�릫燁겻툖餓η궧凉�鸚당쉪�뉏뻑�뚨쎅壤뺝컛�ⓨ닗兩뷴릮鸚띶댍�� `$GIT_DIR` 訝���"
#. type: Plain text
#: en/git-init.txt:119
#, priority:300
msgid "The template directory will be one of the following (in order):"
-msgstr ""
+msgstr "與→씮��퐬弱녷삸餓δ툔阿뗤�竊덃뙃窈뷴틣竊됵폏"
#. type: Plain text
#: en/git-init.txt:121
#, priority:300
msgid "the argument given with the `--template` option;"
-msgstr ""
+msgstr "�� `--template` �됮」瀯쇿눣�꾢뢿�곤폑"
#. type: Plain text
#: en/git-init.txt:123
#, priority:300
msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
-msgstr ""
+msgstr "`$GIT_TEMPLATE_DIR` ��쥊�섌뇧竊�"
#. type: Plain text
#: en/git-init.txt:125
#, priority:300
msgid "the `init.templateDir` configuration variable; or"
-msgstr ""
+msgstr "`init.templateDir` �띸쉰�섌뇧竊쎿닑��"
#. type: Plain text
#: en/git-init.txt:127
#, priority:300
msgid "the default template directory: `/usr/share/git-core/templates`."
-msgstr ""
+msgstr "容섋�與→씮��퐬竊�`/usr/share/git-core/templates`��"
#. type: Plain text
#: en/git-init.txt:130
#, priority:300
msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
-msgstr ""
+msgstr "容섋��꾣Æ�욜쎅壤뺝똿�т�雅쏁쎅壤뺟퍜�꾬펽兩븃��꾟�쒏럲�ㅶÆ凉뤴�앾펷瑥룟뢿�� linkgit:gitignore[5]竊됧뭽鹽뷰풃�⒴춴�뉏뻑��"
#. type: Plain text
#: en/git-init.txt:133
#, priority:300
msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
-msgstr ""
+msgstr "容섋��끻넻訝뗰펽�룝풃�⒴춴�썼˙獵곭뵪�귟쫨��뵪訝�訝ょㅊ堊뗦똼�⑼펽瑥룬�싪퓝�좈솮�뜹릮煐� `.sample` 野밧끀�띶뫝�띲��"
#. type: Plain text
#: en/git-init.txt:135
#, priority:300
msgid "See linkgit:githooks[5] for more general info on hook execution."
-msgstr ""
+msgstr "�됧뀽�⒴춴�㎬죱�꾣쎍鸚싦에��펽瑥룟뢿鰲� linkgit:githooks[5]��"
#. type: Labeled list
#: en/git-init.txt:139
#, no-wrap, priority:300
msgid "Start a new Git repository for an existing code base"
-msgstr ""
+msgstr "訝븀렟�됦빰�곩틩��뒯�곁쉪 Git 餓볟틩"
#. type: delimited block -
#: en/git-init.txt:146
-#, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:300
msgid ""
"$ cd /path/to/my/codebase\n"
"$ git init <1>\n"
"$ git add . <2>\n"
"$ git commit <3>\n"
msgstr ""
+"$ cd /path/to/my/codebase\n"
+"$ git init <1>\n"
+"$ git add . <2>\n"
+"$ git commit <3>\n"
#. type: Plain text
#: en/git-init.txt:149
#, priority:300
msgid "Create a /path/to/my/codebase/.git directory."
-msgstr ""
+msgstr "�쎾뻠 /path/to/my/codebase/.git ��퐬��"
#. type: Plain text
#: en/git-init.txt:150
#, priority:300
msgid "Add all existing files to the index."
-msgstr ""
+msgstr "弱녷��됬렟�됪뻼餓뜻렌�졾댆榮℡폊��"
#. type: Plain text
#: en/git-init.txt:151
#, priority:300
msgid "Record the pristine state as the first commit in the history."
-msgstr ""
+msgstr "弱녶렅冶뗧듁�곮�壤뺜맏�녶뤁溫겼퐬訝�쉪寧т�轝→룓雅ㅳ��"
#. type: Title =
#: en/git-instaweb.txt:2
@@ -62283,171 +62380,186 @@ msgstr ""
#: en/urls.txt:2
#, no-wrap, priority:300
msgid "GIT URLS[[URLS]]"
-msgstr ""
+msgstr "GIT URLS[[URLS]]"
#. type: Plain text
#: en/urls.txt:8
#, priority:300
msgid "In general, URLs contain information about the transport protocol, the address of the remote server, and the path to the repository. Depending on the transport protocol, some of this information may be absent."
-msgstr ""
+msgstr "�싧만竊똗RL �끻맜�됧뀽鴉좄풏�뤺�竊뚩퓶葉뗦쐨�▼솳�꾢쑑��餓ε룋耶섇궓佯볢러孃꾤쉪岳→겘�귛�雅롦윇雅쎽폖渦볟뜌溫�펽訝�雅쎽에��룾�썰폏煐뷴ㅁ��"
#. type: Plain text
#: en/urls.txt:12
#, priority:300
msgid "Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps can be used for fetching, but this is inefficient and deprecated; do not use it)."
msgstr ""
+"Git ��똻 ssh竊똤it竊똦ttp �� https �뤺�竊덃�鸚뽳펽��빳鵝욜뵪 ftp �� ftps 瓦쏂죱�볟룚竊뚥퐜瓦숁븞�뉏퐥訝뗤툝訝띶뻠溫�슴�⑨폑瑥룟떯鵝욜뵪竊됥��"
#. type: Plain text
#: en/urls.txt:15
#, priority:300
msgid "The native transport (i.e. git:// URL) does no authentication and should be used with caution on unsecured networks."
-msgstr ""
+msgstr "�у쑑鴉좄풏竊덂뜵 git:// URL竊됦툖瓦쏂죱翁ヤ뻥謠뚩칮竊뚦쑉訝띶츎�①쉪營묊퍥訝듿틪瘟ⓩ뀕鵝욜뵪��"
#. type: Plain text
#: en/urls.txt:17
#, priority:300
msgid "The following syntaxes may be used with them:"
-msgstr ""
+msgstr "餓δ툔��툓瓦겼뇿訝や폖渦볟뜌溫�쉪�쇔폀竊�"
#. type: Plain text
#: en/urls.txt:19
#, priority:300
msgid "ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/"
msgstr ""
+"ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/"
#. type: Plain text
#: en/urls.txt:20
#, priority:300
msgid "git://host.xz{startsb}:port{endsb}/path/to/repo.git/"
-msgstr ""
+msgstr "git://host.xz{startsb}:port{endsb}/path/to/repo.git/"
#. type: Plain text
#: en/urls.txt:21
#, priority:300
msgid "http{startsb}s{endsb}://host.xz{startsb}:port{endsb}/path/to/repo.git/"
-msgstr ""
+msgstr "http{startsb}s{endsb}://host.xz{startsb}:port{endsb}/path/to/repo.git/"
#. type: Plain text
#: en/urls.txt:22
#, priority:300
msgid "ftp{startsb}s{endsb}://host.xz{startsb}:port{endsb}/path/to/repo.git/"
-msgstr ""
+msgstr "ftp{startsb}s{endsb}://host.xz{startsb}:port{endsb}/path/to/repo.git/"
#. type: Plain text
#: en/urls.txt:24
#, priority:300
msgid "An alternative scp-like syntax may also be used with the ssh protocol:"
-msgstr ""
+msgstr "ssh �뤺�阿잌룾餓δ슴�①굳鴉� scp �꾥�力뺧폏"
#. type: Plain text
#: en/urls.txt:26
#, priority:300
msgid "{startsb}user@{endsb}host.xz:path/to/repo.git/"
-msgstr ""
+msgstr "{startsb}user@{endsb}host.xz:path/to/repo.git/"
#. type: Plain text
#: en/urls.txt:32
#, priority:300
msgid "This syntax is only recognized if there are no slashes before the first colon. This helps differentiate a local path that contains a colon. For example the local path `foo:bar` could be specified as an absolute path or `./foo:bar` to avoid being misinterpreted as an ssh url."
msgstr ""
+"餓끻퐪寧т�訝ゅ넂�룝퉳�띷깹�됪뼔�졿뿶�띹꺗瑥녶닽閭ㅸ�力뺛�귟퓳�됧뒰雅롥뙷�녶똿�ュ넂�루쉪�у쑑瓮�푶�귚풃倻귨펽��빳弱녷쑍�계러孃� `foo:bar` �뉐츣訝븀퍦野배러孃꾬펽�뽬�끻컛 "
+"`./foo:bar` �뉐츣訝븀퍦野배러孃꾬펽餓ι겳�띹˙瑥�칳�ヤ맏 ssh url��"
#. type: Plain text
#: en/urls.txt:34
#, priority:300
msgid "The ssh and git protocols additionally support ~username expansion:"
-msgstr ""
+msgstr "ssh �� git �뤺�瓦섉뵱�� ~username �⒴콝竊�"
#. type: Plain text
#: en/urls.txt:36
#, priority:300
msgid "ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
msgstr ""
+"ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}user{endsb}"
+"/path/to/repo.git/"
#. type: Plain text
#: en/urls.txt:37
#, priority:300
msgid "git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
msgstr ""
+"git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
#. type: Plain text
#: en/urls.txt:38
#, priority:300
msgid "{startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/"
-msgstr ""
+msgstr "{startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/"
#. type: Plain text
#: en/urls.txt:41
#, priority:300
msgid "For local repositories, also supported by Git natively, the following syntaxes may be used:"
-msgstr ""
+msgstr "野밥틢�у쑑耶섇궓佯볩펷Git �ц벴阿잍뵱�곻펹竊뚦룾餓δ슴�ⓧ빳訝뗨�力뺧폏"
#. type: Plain text
#: en/urls.txt:43
#, priority:300
msgid "/path/to/repo.git/"
-msgstr ""
+msgstr "/path/to/repo.git/"
#. type: Plain text
#: en/urls.txt:44
#, priority:300
msgid "\\file:///path/to/repo.git/"
-msgstr ""
+msgstr "\\file:///path/to/repo.git/"
#. type: Plain text
#: en/urls.txt:49
#, priority:300
msgid "These two syntaxes are mostly equivalent, except when cloning, when the former implies --local option. See linkgit:git-clone[1] for details."
-msgstr ""
+msgstr "瓦쇾륵燁띹�力뺝뇿阿롦삸嶺됪븞�꾬펽�ㅴ틙�ⓨ뀑�녷뿶竊뚦뎺�끾슅�� --local �됮」�귝쐣�녘�瀯녵에��펽瑥룟뢿�� linkgit:git-clone[1]��"
#. type: Plain text
#: en/urls.txt:54
#, priority:300
msgid "These two syntaxes are mostly equivalent, except the former implies --local option."
-msgstr ""
+msgstr "瓦쇾륵燁띹�力뺝뇿阿롦삸嶺됪븞�꾬펽�ㅴ틙�띹�끾슅�� --local �됮」��"
#. type: Plain text
#: en/urls.txt:58
#, 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' �� 'git pull'竊뚥퐜訝띶똿�� 'git push'竊뚥튋弱녷렏�쀥릦�귞쉪�녺퍚�뉏뻑�귛뢿鰲� linkgit"
+":git-bundle[1]��"
#. type: Plain text
#: en/urls.txt:63
#, priority:300
msgid "When Git doesn't know how to handle a certain transport protocol, it attempts to use the 'remote-<transport>' remote helper, if one exists. To explicitly request a remote helper, the following syntax may be used:"
msgstr ""
+"壤� Git 訝띸윥�볟쫩鵝뺝쨪�녷윇燁띴폖渦볟뜌溫�뿶竊뚦츆鴉싧컼瑥뺜슴�� 'remote- <鴉좄풏�밧폀>' "
+"瓦쒐쮮躍�뒰葉뗥틣竊덂쫩�쒎춼�⑨펹�귟쫨�얍폀瑥룡콆瓦쒐쮮躍�뒰葉뗥틣竊뚦룾餓δ슴�ⓧ빳訝뗨�力뺧폏"
#. type: Plain text
#: en/urls.txt:65
#, priority:300
msgid "<transport>::<address>"
-msgstr ""
+msgstr "<鴉좄풏�밧폀>::<�겼�>"
#. type: Plain text
#: en/urls.txt:69
#, 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 ""
+"�뜸릎竊�<�겼�> ��빳��러孃꾬펽�띶뒦�ⓧ툗瓮�푶竊뚥튋��빳��룾熬ヨ컘�①쉪�밧츣瓦쒐쮮躍�뒰葉뗥틣瑥녶닽�꾤굳鴉쇌틢 URL �꾡뻣�뤷춻寧╊림�귝쐣�녘�瀯녵에��펽瑥룟뢿�� linkgit"
+":gitremote-helpers[7]��"
#. type: Plain text
#: en/urls.txt:74
#, priority:300
msgid "If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you use will be rewritten into URLs that work), you can create a configuration section of the form:"
-msgstr ""
+msgstr "倻귝옖耶섇쑉鸚㏝뇧映삡세�띸㎞�꾥퓶葉뗥춼�ⓨ틩竊뚦뭉訝붹궓誤곦맏�뜸슴�ⓧ툖�뚨쉪�쇔폀竊덅퓳�뤄펽�ⓧ슴�①쉪 URL 弱녻˙�띶넍訝뷸쐣�덄쉪 URL竊됵펽�쇿룾餓ε닗兩뷰빳訝뗥숱凉뤹쉪�띸쉰竊�"
#. type: delimited block -
#: en/urls.txt:78
-#, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:300
msgid ""
"\t[url \"<actual url base>\"]\n"
"\t\tinsteadOf = <other url base>\n"
msgstr ""
+"\t[URL�� <若욇솀 URL base>��]\n"
+"\t\tinsteadOf = <�뜸퍟 URL base>\n"
#. type: Plain text
#: en/urls.txt:81 en/urls.txt:100
#, priority:300
msgid "For example, with this:"
-msgstr ""
+msgstr "堊뗥쫩竊뚧쐣倻귚툔竊�"
#. type: delimited block -
#: en/urls.txt:86
@@ -62457,26 +62569,33 @@ msgid ""
"\t\tinsteadOf = host.xz:/path/to/\n"
"\t\tinsteadOf = work:\n"
msgstr ""
+"\t[url \"git://git.host.xz/\"]\n"
+"\t\tinsteadOf = host.xz:/path/to/\n"
+"\t\tinsteadOf = work:\n"
#. type: Plain text
#: en/urls.txt:90
#, priority:300
msgid "a URL like \"work:repo.git\" or like \"host.xz:/path/to/repo.git\" will be rewritten in any context that takes a URL to be \"git://git.host.xz/repo.git\"."
msgstr ""
+"URL 瑥멨쫩 \"work:repo.git\" �� \"host.xz:/path/to/repo.git\" 鴉싧쑉餓삡퐬 URL 映삡세雅� \""
+"git://git.host.xz/repo\" �꾡툓訝뗦뻼訝�뇥�쇻��"
#. type: Plain text
#: en/urls.txt:93
#, priority:300
msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
-msgstr ""
+msgstr "倻귝옖誤곲뇥�쇾퍎�ⓧ틢�③�곭쉪 URL竊뚦룾餓ε닗兩븃〃�뺟쉪�띸쉰�ⓨ늽竊�"
#. type: delimited block -
#: en/urls.txt:97
-#, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:300
msgid ""
"\t[url \"<actual url base>\"]\n"
"\t\tpushInsteadOf = <other url base>\n"
msgstr ""
+"\t[url \"<若욇솀 url base>\"]\n"
+"\t\tpushInsteadOf = <�뜹츆 url base>\n"
#. type: delimited block -
#: en/urls.txt:104
@@ -62485,12 +62604,16 @@ msgid ""
"\t[url \"ssh://example.org/\"]\n"
"\t\tpushInsteadOf = git://example.org/\n"
msgstr ""
+"\t[url \"ssh://example.org/\"]\n"
+"\t\tpushInsteadOf = git://example.org/\n"
#. type: Plain text
#: en/urls.txt:108
#, priority:300
msgid "a URL like \"git://example.org/path/to/repo.git\" will be rewritten to \"ssh://example.org/path/to/repo.git\" for pushes, but pulls will still use the original URL."
msgstr ""
+"映삡세雅� \"git://example.org/path/to/repo.git\" �� URL 鴉싪˙�띶넍訝� \"ssh://example.org/"
+"path/to/repo.git\"竊뚨뵪雅롦렓�곥�귚퐜�됧룚餓ｇ쟻�뜸퍖�뜸슴�ⓨ렅冶뗧쉪 URL��"
#. type: Title =
#: en/git-bisect-lk2009.txt:2
@@ -64060,9 +64183,9 @@ msgstr ""
#. type: Plain text
#: en/git-bisect-lk2009.txt:1020
-#, fuzzy, priority:100
+#, priority:100
msgid "use \"git bisect run\" to find the commit that introduced it"
-msgstr " bug "
+msgstr "鵝욜뵪 \"git bisect run\" �ζ돻凉뺝뀯若껆쉪�먧벡"
#. type: Plain text
#: en/git-bisect-lk2009.txt:1021