From 592a1534c8e1577a4a32251bf817981785d5181f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Date: Tue, 2 Jun 2020 21:51:21 +0200
Subject: [PATCH] source: update to latest v2.27.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jean-No챘l Avila <jn.avila@free.fr>
---
Makefile | 4 +-
en/cmds-ancillaryinterrogators.txt | 3 +
en/cmds-mainporcelain.txt | 3 +
en/date-formats.txt | 3 +-
en/git-bugreport.txt | 2 +-
en/git-credential.txt | 16 +-
en/git-grep.txt | 2 +-
en/git-init.txt | 2 +-
en/git-remote.txt | 18 +-
en/git.txt | 2 +-
en/rev-list-options.txt | 35 +-
po/documentation.de.po | 950 +--
po/documentation.es.po | 412 +-
po/documentation.es_MX.po | 412 +-
po/documentation.fr.po | 1255 +---
po/documentation.hu.po | 412 +-
po/documentation.id.po | 412 +-
po/documentation.it.po | 1873 ++---
po/documentation.ko.po | 412 +-
po/documentation.mr.po | 412 +-
po/documentation.nb_NO.po | 412 +-
po/documentation.nl.po | 412 +-
po/documentation.pl.po | 412 +-
po/documentation.pot | 419 +-
po/documentation.pt_BR.po | 10357 +++++----------------------
po/documentation.pt_PT.po | 412 +-
po/documentation.ru.po | 478 +-
po/documentation.tr.po | 412 +-
po/documentation.zh_HANS-CN.po | 520 +-
po/documentation.zh_HANT.po | 412 +-
30 files changed, 6578 insertions(+), 14308 deletions(-)
diff --git a/Makefile b/Makefile
index 8fd9f12..e076a08 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,8 @@ po4a-stamp: po4a.conf $(EN_SOURCES) $(LANGUAGE_PO) Makefile
update-sources:
./scripts/update-sources.sh
- $(QUIET_PO4A)PERL5LIB=./po4a/lib po4a/po4a -v po4a.conf
- for f in po/documentation.*.po; do ./scripts/pre-translate-po $f; ./scripts/set-priorities $f; done
+ $(QUIET_PO4A)PERL5LIB=./po4a/lib po4a/po4a -v --no-translations po4a.conf
+ @for f in po/documentation.*.po; do ./scripts/pre-translate-po $f; ./scripts/set-priorities $f; done
define MAKE_TARGET
diff --git a/en/cmds-ancillaryinterrogators.txt b/en/cmds-ancillaryinterrogators.txt
index 0193259..41324df 100644
--- a/en/cmds-ancillaryinterrogators.txt
+++ b/en/cmds-ancillaryinterrogators.txt
@@ -4,6 +4,9 @@ linkgit:git-annotate[1]::
linkgit:git-blame[1]::
Show what revision and author last modified each line of a file.
+linkgit:git-bugreport[1]::
+ Collect information for user to file a bug report.
+
linkgit:git-count-objects[1]::
Count unpacked number of objects and their disk consumption.
diff --git a/en/cmds-mainporcelain.txt b/en/cmds-mainporcelain.txt
index 72108b2..6731d49 100644
--- a/en/cmds-mainporcelain.txt
+++ b/en/cmds-mainporcelain.txt
@@ -100,6 +100,9 @@ linkgit:git-shortlog[1]::
linkgit:git-show[1]::
Show various types of objects.
+linkgit:git-sparse-checkout[1]::
+ Initialize and modify the sparse-checkout.
+
linkgit:git-stash[1]::
Stash the changes in a dirty working directory away.
diff --git a/en/date-formats.txt b/en/date-formats.txt
index 7e7eaba..f1097fa 100644
--- a/en/date-formats.txt
+++ b/en/date-formats.txt
@@ -22,8 +22,7 @@ ISO 8601::
`2005-04-07T22:13:13`. The parser accepts a space instead of the
`T` character as well. Fractional parts of a second will be ignored,
for example `2005-04-07T22:13:13.019` will be treated as
- `2005-04-07T22:13:13`
-
+ `2005-04-07T22:13:13`.
+
NOTE: In addition, the date part is accepted in the following formats:
`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`.
diff --git a/en/git-bugreport.txt b/en/git-bugreport.txt
index 7fe9aef..9edad66 100644
--- a/en/git-bugreport.txt
+++ b/en/git-bugreport.txt
@@ -46,7 +46,7 @@ OPTIONS
--suffix <format>::
Specify an alternate suffix for the bugreport name, to create a file
named 'git-bugreport-<formatted suffix>'. This should take the form of a
- link:strftime[3] format string; the current local time will be used.
+ strftime(3) format string; the current local time will be used.
GIT
---
diff --git a/en/git-credential.txt b/en/git-credential.txt
index 8d990e9..31c81c4 100644
--- a/en/git-credential.txt
+++ b/en/git-credential.txt
@@ -151,11 +151,11 @@ Git understands the following attributes:
were read (e.g., `url=https://example.com` would behave as if
`protocol=https` and `host=example.com` had been provided). This
can help callers avoid parsing URLs themselves.
-
- Note that specifying a protocol is mandatory and if the URL
- doesn't specify a hostname (e.g., "cert:///path/to/file") the
- credential will contain a hostname attribute whose value is an
- empty string.
-
- Components which are missing from the URL (e.g., there is no
- username in the example above) will be left unset.
++
+Note that specifying a protocol is mandatory and if the URL
+doesn't specify a hostname (e.g., "cert:///path/to/file") the
+credential will contain a hostname attribute whose value is an
+empty string.
++
+Components which are missing from the URL (e.g., there is no
+username in the example above) will be left unset.
diff --git a/en/git-grep.txt b/en/git-grep.txt
index a7f9bc9..6077ff0 100644
--- a/en/git-grep.txt
+++ b/en/git-grep.txt
@@ -209,7 +209,7 @@ providing this option will cause it to die.
Use \0 as the delimiter for pathnames in the output, and print
them verbatim. Without this option, pathnames with "unusual"
characters are quoted as explained for the configuration
- variable core.quotePath (see git-config(1)).
+ variable core.quotePath (see linkgit:git-config[1]).
-o::
--only-matching::
diff --git a/en/git-init.txt b/en/git-init.txt
index adc6adf..f9467cc 100644
--- a/en/git-init.txt
+++ b/en/git-init.txt
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git init' [-q | --quiet] [--bare] [--template=<template_directory>]
- [--separate-git-dir <git dir>] [--object-format=<format]
+ [--separate-git-dir <git dir>] [--object-format=<format>]
[--shared[=<permissions>]] [directory]
diff --git a/en/git-remote.txt b/en/git-remote.txt
index 9659abb..32b6e79 100644
--- a/en/git-remote.txt
+++ b/en/git-remote.txt
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git remote' [-v | --verbose]
-'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>
+'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>
'git remote rename' <old> <new>
'git remote remove' <name>
'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)
@@ -35,7 +35,7 @@ OPTIONS
-v::
--verbose::
Be a little more verbose and show remote url after name.
- NOTE: This must be placed between `remote` and `subcommand`.
+ NOTE: This must be placed between `remote` and subcommand.
COMMANDS
@@ -46,7 +46,7 @@ subcommands are available to perform operations on the remotes.
'add'::
-Adds a remote named <name> for the repository at
+Add a remote named <name> for the repository at
<url>. The command `git fetch <name>` can then be used to create and
update remote-tracking branches <name>/<branch>.
+
@@ -109,13 +109,13 @@ With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted.
+
With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the
symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote
-`HEAD` is pointed at `next`, "`git remote set-head origin -a`" will set
+`HEAD` is pointed at `next`, `git remote set-head origin -a` will set
the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will
only work if `refs/remotes/origin/next` already exists; if not it must be
fetched first.
+
-Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., "git
-remote set-head origin master" will set the symbolic-ref `refs/remotes/origin/HEAD` to
+Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git
+remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to
`refs/remotes/origin/master`. This will only work if
`refs/remotes/origin/master` already exists; if not it must be fetched first.
+
@@ -127,7 +127,7 @@ This can be used to track a subset of the available remote branches
after the initial setup for a remote.
+
The named branches will be interpreted as if specified with the
-`-t` option on the 'git remote add' command line.
+`-t` option on the `git remote add` command line.
+
With `--add`, instead of replacing the list of currently tracked
branches, adds to that list.
@@ -181,13 +181,13 @@ fetch --prune <name>`, except that no new references will be fetched.
See the PRUNING section of linkgit:git-fetch[1] for what it'll prune
depending on various configuration.
+
-With `--dry-run` option, report what branches will be pruned, but do not
+With `--dry-run` option, report what branches would be pruned, but do not
actually prune them.
'update'::
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,
+`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
diff --git a/en/git.txt b/en/git.txt
index 9d6769e..1289084 100644
--- a/en/git.txt
+++ b/en/git.txt
@@ -493,7 +493,7 @@ double-quotes and respecting backslash escapes. E.g., the value
details. This variable has lower precedence than other path
variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY...
-`GIT_DEFAULT_HASH_ALGORITHM`::
+`GIT_DEFAULT_HASH`::
If this variable is set, the default hash algorithm for new
repositories will be set to this value. This value is currently
ignored when cloning; the setting of the remote repository
diff --git a/en/rev-list-options.txt b/en/rev-list-options.txt
index 04ad7dd..b01b2b6 100644
--- a/en/rev-list-options.txt
+++ b/en/rev-list-options.txt
@@ -581,12 +581,12 @@ option does. Applied to the 'D..M' range, it results in:
Before discussing another option, `--show-pulls`, we need to
create a new example history.
-+
+
A common problem users face when looking at simplified history is that a
commit they know changed a file somehow does not appear in the file's
simplified history. Let's demonstrate a new example and show how options
such as `--full-history` and `--simplify-merges` works in that case:
-+
+
-----------------------------------------------------------------------
.-A---M-----C--N---O---P
/ / \ \ \/ / /
@@ -595,7 +595,7 @@ such as `--full-history` and `--simplify-merges` works in that case:
\ / /\ /
`---X--' `---Y--'
-----------------------------------------------------------------------
-+
+
For this example, suppose `I` created `file.txt` which was modified by
`A`, `B`, and `X` in different ways. The single-parent commits `C`, `Z`,
and `Y` do not change `file.txt`. The merge commit `M` was created by
@@ -607,19 +607,19 @@ the contents of `file.txt` at `X`. Hence, `R` is TREESAME to `X` but not
contents of `file.txt` at `R`, so `N` is TREESAME to `R` but not `C`.
The merge commits `O` and `P` are TREESAME to their first parents, but
not to their second parents, `Z` and `Y` respectively.
-+
+
When using the default mode, `N` and `R` both have a TREESAME parent, so
those edges are walked and the others are ignored. The resulting history
graph is:
-+
+
-----------------------------------------------------------------------
I---X
-----------------------------------------------------------------------
-+
+
When using `--full-history`, Git walks every edge. This will discover
the commits `A` and `B` and the merge `M`, but also will reveal the
merge commits `O` and `P`. With parent rewriting, the resulting graph is:
-+
+
-----------------------------------------------------------------------
.-A---M--------N---O---P
/ / \ \ \/ / /
@@ -628,21 +628,21 @@ merge commits `O` and `P`. With parent rewriting, the resulting graph is:
\ / /\ /
`---X--' `------'
-----------------------------------------------------------------------
-+
+
Here, the merge commits `O` and `P` contribute extra noise, as they did
not actually contribute a change to `file.txt`. They only merged a topic
that was based on an older version of `file.txt`. This is a common
issue in repositories using a workflow where many contributors work in
parallel and merge their topic branches along a single trunk: manu
unrelated merges appear in the `--full-history` results.
-+
+
When using the `--simplify-merges` option, the commits `O` and `P`
disappear from the results. This is because the rewritten second parents
of `O` and `P` are reachable from their first parents. Those edges are
removed and then the commits look like single-parent commits that are
TREESAME to their parent. This also happens to the commit `N`, resulting
in a history view as follows:
-+
+
-----------------------------------------------------------------------
.-A---M--.
/ / \
@@ -651,18 +651,18 @@ in a history view as follows:
\ / /
`---X--'
-----------------------------------------------------------------------
-+
+
In this view, we see all of the important single-parent changes from
`A`, `B`, and `X`. We also see the carefully-resolved merge `M` and the
not-so-carefully-resolved merge `R`. This is usually enough information
to determine why the commits `A` and `B` "disappeared" from history in
the default view. However, there are a few issues with this approach.
-+
+
The first issue is performance. Unlike any previous option, the
`--simplify-merges` option requires walking the entire commit history
before returning a single result. This can make the option difficult to
use for very large repositories.
-+
+
The second issue is one of auditing. When many contributors are working
on the same repository, it is important which merge commits introduced
a change into an important branch. The problematic merge `R` above is
@@ -671,10 +671,13 @@ important branch. Instead, the merge `N` was used to merge `R` and `X`
into the important branch. This commit may have information about why
the change `X` came to override the changes from `A` and `B` in its
commit message.
+
+--show-pulls::
+ In addition to the commits shown in the default history, show
+ each merge commit that is not TREESAME to its first parent but
+ is TREESAME to a later parent.
+
-The `--show-pulls` option helps with both of these issues by adding more
-merge commits to the history results. If a merge is not TREESAME to its
-first parent but is TREESAME to a later parent, then that merge is
+When a merge commit is included by `--show-pulls`, the merge is
treated as if it "pulled" the change from another branch. When using
`--show-pulls` on this example (and no other options) the resulting
graph is:
diff --git a/po/documentation.de.po b/po/documentation.de.po
index a06e006..9c20b63 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2020-06-01 19:41+0000\n"
"Last-Translator: BMN <weblate@yopmail.com>\n"
"Language-Team: Matthias A횩hauer <mha1993@live.de>\n"
@@ -94,7 +94,7 @@ msgid "Show long rev (Default: off)."
msgstr "Zeige lange Revisionsnummer an (Standard: aus)."
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -318,143 +318,155 @@ msgstr "Anzeigen, durch welchen Commit und Autor die jeweiligen Zeilen einer Dat
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr "Anzahl und Speicherverbrauch ungepackter Objekte z채hlen."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr "횆nderungen mittels den allgemeinen Diff-Tools anzeigen."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr "Stellt die Verbundenheit und G체ltigkeit der Objekte in der Datenbank sicher."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr "Hilfsinformationen 체ber Git anzeigen."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr "Ihr aktuelles Repository sofort in gitweb betrachten."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr "3-Wege-Merge anzeigen ohne den Index zu ver채ndern."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr "Aufgezeichnete Aufl철sung von Merge-Konflikten wiederverwenden."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr "Branches und ihre Commits ausgeben."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr "Die GPG-Signatur von Commits pr체fen."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr "Die GPG-Signatur von Tags pr체fen."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr "Logs mit dem Unterschied, den jeder Commit einf체hrt, anzeigen."
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr "Git Web Interface (Web-Frontend f체r Git-Repositories)."
@@ -1122,83 +1134,95 @@ msgstr "Verschiedene Arten von Objekten anzeigen."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr "횆nderungen in einem Arbeitsverzeichnis aufbewahren."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr "Den Zustand des Arbeitsverzeichnisses anzeigen."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr "Submodule initialisieren, aktualisieren oder inspizieren."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Switch branches."
msgstr "Branches wechseln."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr "Ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, l철schen oder verifizieren."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr "Mehrere Arbeitsverzeichnisse verwalten."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr "Der Git-Repository-Browser."
@@ -2801,16 +2825,13 @@ msgstr "ISO 8601"
#. type: Plain text
#: en/date-formats.txt:26
-#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
-msgstr ""
-"Datum und Uhrzeit, wie sie im ISO-Standard 8601 definiert sind. Zum Beispiel "
-"`2005-04-07T22:13:13`. Der Parser akzeptiert auch ein Leerzeichen statt dem "
-"`T`. Sekundenbruchteile werden ignoriert, zum Beispiel wird "
-"`2005-04-07T22:13:13.019` als `2005-04-07T22:13:13` behandelt."
+#, fuzzy, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
+msgstr "Datum und Uhrzeit, wie sie im ISO-Standard 8601 definiert sind. Zum Beispiel `2005-04-07T22:13:13`. Der Parser akzeptiert auch ein Leerzeichen statt dem `T`. Sekundenbruchteile werden ignoriert, zum Beispiel wird `2005-04-07T22:13:13.019` als `2005-04-07T22:13:13` behandelt."
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 "Au횩erdem wird das Datum in folgenden Formaten akzeptiert: `YYYY.MM.DD`, `MM/DD/YYYY` und `DD.MM.YYYY`."
@@ -2825,17 +2846,13 @@ msgstr "Rohdaten-Ausgabe-Format"
#: 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 ""
-"Die rohen Ausgabeformate von \"git-diff-index\", \"git-diff-tree\", \"git"
-"-diff-files\" und \"git diff --raw\" sind sehr 채hnlich."
+msgstr "Die rohen Ausgabeformate von \"git-diff-index\", \"git-diff-tree\", \"git-diff-files\" und \"git diff --raw\" sind sehr 채hnlich."
#. type: Plain text
#: en/diff-format.txt:9
#, priority:280
msgid "These commands all compare two sets of things; what is compared differs:"
-msgstr ""
-"Die Befehle vergleichen alle zwei S채tze von Dingen; was verglichen wird, "
-"unterscheidet sich:"
+msgstr "Die Befehle vergleichen alle zwei S채tze von Dingen; was verglichen wird, unterscheidet sich:"
#. type: Labeled list
#: en/diff-format.txt:10
@@ -2889,10 +2906,7 @@ msgstr ""
#: 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 ""
-"Der \"git-diff-tree\"-Befehl beginnt seine Ausgabe mit dem Ausgeben des "
-"Hashes von dem, was verglichen wird. Danach geben alle Befehle eine "
-"Ausgabelinie pro ge채nderter Datei aus."
+msgstr "Der \"git-diff-tree\"-Befehl beginnt seine Ausgabe mit dem Ausgeben des Hashes von dem, was verglichen wird. Danach geben alle Befehle eine Ausgabelinie pro ge채nderter Datei aus."
#. type: Plain text
#: en/diff-format.txt:27
@@ -2976,9 +2990,7 @@ msgstr "Pfad f체r \"src\""
#: 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 ""
-"ein Tab oder ein NUL, wenn die `-z`-Option benutzt wird; existiert nur f체r C "
-"oder R."
+msgstr "ein Tab oder ein NUL, wenn die `-z`-Option benutzt wird; existiert nur f체r C oder R."
#. type: Plain text
#: en/diff-format.txt:53
@@ -2990,9 +3002,7 @@ msgstr "Pfad f체r \"dst\"; existiert nur f체r C oder R."
#: en/diff-format.txt:54
#, priority:280
msgid "an LF or a NUL when `-z` option is used, to terminate the record."
-msgstr ""
-"ein LF oder ein NUL, wenn die `-z`-Option benutzt wird, um den Datensatz zu "
-"beenden."
+msgstr "ein LF oder ein NUL, wenn die `-z`-Option benutzt wird, um den Datensatz zu beenden."
#. type: Plain text
#: en/diff-format.txt:56
@@ -3040,35 +3050,25 @@ msgstr "T: 횆nderungen in dem Typ der Datei"
#: en/diff-format.txt:65
#, priority:280
msgid "U: file is unmerged (you must complete the merge before it can be committed)"
-msgstr ""
-"U: Datei ist nicht zusammengef체hrt (du musst die Zusammenf체hrung "
-"abschlie횩en, bevor es commited werden kann)"
+msgstr "U: Datei ist nicht zusammengef체hrt (du musst die Zusammenf체hrung abschlie횩en, bevor es commited werden kann)"
#. type: Plain text
#: en/diff-format.txt:66
#, priority:280
msgid "X: \"unknown\" change type (most probably a bug, please report it)"
-msgstr ""
-"X: \"unbekannt\" 횆nderungstyp (h철chstwahrscheinlich ein Bug, bitte melde ihn)"
+msgstr "X: \"unbekannt\" 횆nderungstyp (h철chstwahrscheinlich ein Bug, bitte melde ihn)"
#. 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 ""
-"Die Status-Buchstaben C und R werden immer von einer Punktzahl gefolgt (die "
-"den Prozentsatz der 횆hnlichkeit zwischen Quelle und Ziel des Verschiebens "
-"oder des Kopierens angibt). Auf den Status-Buchstaben M kann eine Punktzahl "
-"(die den Prozentsatz der Un채hnlichkeit angibt) f체r das Umschreiben von "
-"Dateien folgen."
+msgstr "Die Status-Buchstaben C und R werden immer von einer Punktzahl gefolgt (die den Prozentsatz der 횆hnlichkeit zwischen Quelle und Ziel des Verschiebens oder des Kopierens angibt). Auf den Status-Buchstaben M kann eine Punktzahl (die den Prozentsatz der Un채hnlichkeit angibt) f체r das Umschreiben von Dateien folgen."
#. 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 ""
-"<sha1> wird als alle 0 angezeigt, wenn eine Datei neu auf dem Dateisystem "
-"ist und sie nicht synchron mit dem Index ist."
+msgstr "<sha1> wird als alle 0 angezeigt, wenn eine Datei neu auf dem Dateisystem ist und sie nicht synchron mit dem Index ist."
#. type: Labeled list
#: en/diff-format.txt:76 en/git-svn.txt:499 en/git-svn.txt:539
@@ -4861,10 +4861,7 @@ msgstr "-O<Steuer-Datei>"
#: en/diff-options.txt:610
#, priority:280
msgid "Control the order in which files appear in the output. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`."
-msgstr ""
-"Steuert die Reihenfolge der Dateien in der Ausgabe. Dies setzt die "
-"Konfigurations-Variable `diff.orderFile` au횩er Kraft (siehe linkgit:git-"
-"config[1]). Um `diff.orderFile` zu stornieren, benutzen Sie `-O/dev/null`."
+msgstr "Steuert die Reihenfolge der Dateien in der Ausgabe. Dies setzt die Konfigurations-Variable `diff.orderFile` au횩er Kraft (siehe linkgit:git-config[1]). Um `diff.orderFile` zu stornieren, benutzen Sie `-O/dev/null`."
#. type: Plain text
#: en/diff-options.txt:622
@@ -5658,13 +5655,7 @@ msgstr "--server-option=<Option>"
#: en/fetch-options.txt:251 en/git-clone.txt:143
#, 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 ""
-"횥bertragen Sie die angegebene Zeichenfolge an den Server, wenn Sie mit "
-"Protokollversion 2 kommunizieren. Die angegebene Zeichenfolge darf kein NUL-"
-" oder LF-Zeichen enthalten. Die Behandlung von Server-Optionen, "
-"einschlie횩lich unbekannter, durch den Server ist serverspezifisch. Wenn "
-"mehrmals `--server-option=<Option>` angegeben wird, werden sie alle, wie in "
-"angegebenen Reihenfolge, an die andere Seite gesendet."
+msgstr "횥bertragen Sie die angegebene Zeichenfolge an den Server, wenn Sie mit Protokollversion 2 kommunizieren. Die angegebene Zeichenfolge darf kein NUL- oder LF-Zeichen enthalten. Die Behandlung von Server-Optionen, einschlie횩lich unbekannter, durch den Server ist serverspezifisch. Wenn mehrmals `--server-option=<Option>` angegeben wird, werden sie alle, wie in angegebenen Reihenfolge, an die andere Seite gesendet."
#. type: Labeled list
#: en/fetch-options.txt:252
@@ -5776,35 +5767,19 @@ msgstr "BESCHREIBUNG"
#: en/git-add.txt:25
#, 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 ""
-"Dieser Befehl aktualisiert den Index mit dem aktuellen Inhalt im "
-"Arbeitsbereich, um den Inhalt f체r den n채chsten Commit vorzubereiten. "
-"Typischerweise wird der gesamte aktuelle Inhalt in existierenden Pfaden "
-"hinzugef체gt. Mit einigen Optionen kann der Befehl so verwendet werden, dass "
-"nur bestimmte 횆nderungen hinzugef체gt werden, oder bestimmte Pfade entfernt "
-"werden, die in der Arbeitskopie nicht mehr existieren."
+msgstr "Dieser Befehl aktualisiert den Index mit dem aktuellen Inhalt im Arbeitsbereich, um den Inhalt f체r den n채chsten Commit vorzubereiten. Typischerweise wird der gesamte aktuelle Inhalt in existierenden Pfaden hinzugef체gt. Mit einigen Optionen kann der Befehl so verwendet werden, dass nur bestimmte 횆nderungen hinzugef체gt werden, oder bestimmte Pfade entfernt werden, die in der Arbeitskopie nicht mehr existieren."
#. 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 ""
-"Der �얢ndex�� enth채lt eine Momentaufnahme (snapshot) des Inhalts des "
-"Arbeitsbereichs und es ist genau diese Momentaufnahme, die beim n채chsten "
-"Commit 체bernommen wird. Nachdem man 횆nderungen am Arbeitsbereich vorgenommen "
-"hat und bevor man den Commit-Befehl ausf체hrt, muss man deshalb den Befehl "
-"`add` verwenden, um alle neuen oder ge채nderten Dateien zum Index "
-"hinzuzuf체gen."
+msgstr "Der �얢ndex�� enth채lt eine Momentaufnahme (snapshot) des Inhalts des Arbeitsbereichs und es ist genau diese Momentaufnahme, die beim n채chsten Commit 체bernommen wird. Nachdem man 횆nderungen am Arbeitsbereich vorgenommen hat und bevor man den Commit-Befehl ausf체hrt, muss man deshalb den Befehl `add` verwenden, um alle neuen oder ge채nderten Dateien zum Index hinzuzuf체gen."
#. type: Plain text
#: 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 muss `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 muss `git add` erneut aufgerufen werden."
#. type: Plain text
#: en/git-add.txt:39
@@ -5822,9 +5797,7 @@ msgstr "Der Befehl `git add` wird standardm채횩ig keine ignorierten Dateien hinz
#: en/git-add.txt:49
#, priority:300
msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a commit."
-msgstr ""
-"Bitte lesen Sie linkgit:git-commit[1] f체r Alternativen zum Hinzuf체gen von "
-"Inhalt zu einem Commit."
+msgstr "Bitte lesen Sie linkgit:git-commit[1] f체r Alternativen zum Hinzuf체gen von Inhalt zu einem Commit."
#. type: Title -
#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
@@ -5842,27 +5815,13 @@ msgstr "<Pfadspezifikation>..."
#: 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 ""
-"Dateien aus denen Inhalt hinzugef체gt wird. Dateien, mit im Namen enthaltenen "
-"Wildcards (sog. File-Globs, 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."
+msgstr "Dateien aus denen Inhalt hinzugef체gt wird. Dateien, mit im Namen enthaltenen Wildcards (sog. File-Globs, 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:334
#, 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 <Pfadspezifikation> Syntax kann der ''pathspec'' "
-"Eintrag im linkgit:gitglossary[7] zur Rate gezogen werden."
+msgstr "F체r mehr Detail 체ber die <Pfadspezifikation> Syntax kann der ''pathspec'' Eintrag im linkgit:gitglossary[7] zur Rate gezogen werden."
#. type: Plain text
#: en/git-add.txt:73
@@ -6036,12 +5995,7 @@ msgstr "--ignore-errors"
#: en/git-add.txt:165
#, priority:300
msgid "If some files could not be added because of errors indexing them, do not abort the operation, but continue adding the others. The command shall still exit with non-zero status. The configuration variable `add.ignoreErrors` can be set to true to make this the default behaviour."
-msgstr ""
-"Konnten einige Dateien aufgrund von Fehlern beim Indizieren nicht "
-"hinzugef체gt werden, dann fahre mit dem Hinzuf체gen weiter, ohne die Operation "
-"abzubrechen. Der Befehl wird trotzdem mit einem Fehlerwert ungleich 0 "
-"beendet. Die Konfigurations-Variable `add.ignoreErrors` kann auf �엝rue�� "
-"gesetzt werden, um dieses Verhalten standardm채횩ig zu aktivieren."
+msgstr "Konnten einige Dateien aufgrund von Fehlern beim Indizieren nicht hinzugef체gt werden, dann fahre mit dem Hinzuf체gen weiter, ohne die Operation abzubrechen. Der Befehl wird trotzdem mit einem Fehlerwert ungleich 0 beendet. Die Konfigurations-Variable `add.ignoreErrors` kann auf �엝rue�� gesetzt werden, um dieses Verhalten standardm채횩ig zu aktivieren."
#. type: Labeled list
#: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:201
@@ -6101,14 +6055,7 @@ msgstr "--pathspec-from-file=<Datei>"
#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:119 en/git-restore.txt:132 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 ""
-"Die Pfadangabe wird in `<Datei>` statt 체ber Befehlszeilen-Argumente "
-"체bergeben. Wenn `<Datei>` 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 "
-"Konfigurations-Variable `core.quotePath` beschrieben (siehe linkgit:git-"
-"config[1]). Siehe auch `--pathspec-file-nul` und global `--literal-"
-"pathspecs`."
+msgstr "Die Pfadangabe wird in `<Datei>` statt 체ber Befehlszeilen-Argumente 체bergeben. Wenn `<Datei>` 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 Konfigurations-Variable `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:120 en/git-restore.txt:133 en/git-rm.txt:86 en/git-stash.txt:208
@@ -6174,10 +6121,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 ""
-"Weil in diesem Beispiel die Shell 체ber das Sternchen expandiert (d.h. Sie "
-"listen die Dateien explizit auf), wird `subdir/git-foo.sh` nicht "
-"ber체cksichtigt."
+msgstr "Weil in diesem Beispiel die Shell 체ber das Sternchen expandiert (d.h. Sie listen die Dateien explizit auf), wird `subdir/git-foo.sh` nicht ber체cksichtigt."
#. type: Title -
#: en/git-add.txt:235 en/git-rebase.txt:799
@@ -6189,10 +6133,7 @@ msgstr "INTERAKTIVER MODUS"
#: 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 ""
-"Wird Git im interaktiven Modus gestartet, zeigt es zuerst die Ausgabe des "
-"'status' Unterbefehls, und beginnt dann mit der interaktiven "
-"Befehlsverarbeitung."
+msgstr "Wird Git im interaktiven Modus gestartet, zeigt es zuerst die Ausgabe des 'status' Unterbefehls, und beginnt dann mit der interaktiven Befehlsverarbeitung."
#. type: Plain text
#: en/git-add.txt:244 en/git-clean.txt:85
@@ -6254,15 +6195,7 @@ msgstr ""
#: en/git-add.txt:280
#, priority:300
msgid "It shows that foo.png has differences from HEAD (but that is binary so line count cannot be shown) and there is no difference between indexed copy and the working tree version (if the working tree version were also different, 'binary' would have been shown in place of 'nothing'). The other file, git-add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and one deletion)."
-msgstr ""
-"Es zeigt sich, dass foo.png im Vergleich mit dem HEAD ge채ndert wurde, (da es "
-"sich um eine Bin채rdatei handelt wird keine Zeilenanzahl gezeigt), und dass "
-"kein Unterschied zwischen dem Index und der Version im Arbeitsbereich "
-"besteht (W채re diese ebenfalls unterschiedlich, w체rde 'binary' anstatt "
-"'nothing' angezeigt werden). Die andere Datei, git-add{litdd}"
-"interactive.perl, hat 403 hinzugef체gte und 35 gel철schte Zeilen, wenn man das "
-"commited was sich aktuell im Index befindet, und im Arbeitsbereich befinden "
-"sich weitere 횆nderungen (1 Zeile hinzugef체gt, 1 Zeile gel철scht)."
+msgstr "Es zeigt sich, dass foo.png im Vergleich mit dem HEAD ge채ndert wurde, (da es sich um eine Bin채rdatei handelt wird keine Zeilenanzahl gezeigt), und dass kein Unterschied zwischen dem Index und der Version im Arbeitsbereich besteht (W채re diese ebenfalls unterschiedlich, w체rde 'binary' anstatt 'nothing' angezeigt werden). Die andere Datei, git-add{litdd}interactive.perl, hat 403 hinzugef체gte und 35 gel철schte Zeilen, wenn man das commited was sich aktuell im Index befindet, und im Arbeitsbereich befinden sich weitere 횆nderungen (1 Zeile hinzugef체gt, 1 Zeile gel철scht)."
#. type: Labeled list
#: en/git-add.txt:281 en/git-update-ref.txt:102
@@ -6274,14 +6207,7 @@ msgstr "update"
#: en/git-add.txt:290
#, priority:300
msgid "This shows the status information and issues an \"Update>>\" prompt. When the prompt ends with double '>>', you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything."
-msgstr ""
-"Zeigt die Status Information und wartet mit der Meldung \"Update>>\" auf "
-"weitere Eingaben. Wenn die Meldung mit doppelten '>>' endet, kann man, "
-"getrennt durch Leerzeichen oder Beistriche, mehrere Operationen ausw채hlen. "
-"Man kann auch ganze Bereiche angeben, z.B. \"2-5 7,9\" um 2,3,4,5,7,9 aus "
-"der Liste auszuw채hlen. Wird die zweite Nummer eines Bereichs nicht "
-"angegeben, reicht dieser bis an das Ende der Liste, z.B. \"7-\" um 7,8,9 aus "
-"der Liste auszuw채hlen. Durch '*' werden alle Listeneintr채ge ausgew채hlt."
+msgstr "Zeigt die Status Information und wartet mit der Meldung \"Update>>\" auf weitere Eingaben. Wenn die Meldung mit doppelten '>>' endet, kann man, getrennt durch Leerzeichen oder Beistriche, mehrere Operationen ausw채hlen. Man kann auch ganze Bereiche angeben, z.B. \"2-5 7,9\" um 2,3,4,5,7,9 aus der Liste auszuw채hlen. Wird die zweite Nummer eines Bereichs nicht angegeben, reicht dieser bis an das Ende der Liste, z.B. \"7-\" um 7,8,9 aus der Liste auszuw채hlen. Durch '*' werden alle Listeneintr채ge ausgew채hlt."
#. type: Plain text
#: en/git-add.txt:293
@@ -6329,11 +6255,7 @@ msgstr "revert"
#: 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 ""
-"Diese Option ist sehr 채hnlich zu 'update', nur wird die im Index "
-"gespeicherte 횆nderungsinformation f체r die ausgew채hlten Dateien auf die im "
-"HEAD gespeicherte Version zur체ckgesetzt. Werden neue Dateien zur체ckgesetzt, "
-"so wird die Information dar체ber aus Git wieder entfernt."
+msgstr "Diese Option ist sehr 채hnlich zu 'update', nur wird die im Index gespeicherte 횆nderungsinformation f체r die ausgew채hlten Dateien auf die im HEAD gespeicherte Version zur체ckgesetzt. Werden neue Dateien zur체ckgesetzt, so wird die Information dar체ber aus Git wieder entfernt."
#. type: Labeled list
#: en/git-add.txt:316
@@ -6345,9 +6267,7 @@ msgstr "add untracked"
#: 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 ""
-"Mit einer zu 'update' und 'revert' sehr 채hnlichen Bedienweise k철nnen mit Git "
-"noch nicht verwaltete Dateien zum Index hinzugef체gt werden."
+msgstr "Mit einer zu 'update' und 'revert' sehr 채hnlichen Bedienweise k철nnen mit Git noch nicht verwaltete Dateien zum Index hinzugef체gt werden."
#. type: Labeled list
#: en/git-add.txt:321
@@ -6382,18 +6302,14 @@ msgid ""
msgstr ""
"y - diesen Patch-Block zum Commit vormerken\n"
"n - diesen Patch-Block nicht zum Commit vormerken\n"
-"q - Beenden; diesen oder alle verbleibenden Patch-Bl철cke nicht zum Commit "
-"vormerken\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Bl철cke nicht zum Commit vormerken\n"
"a - diesen und alle weiteren Patch-Bl철cke dieser Datei zum Commit vormerken\n"
-"d - diesen oder alle weiteren Patch-Bl철cke in dieser Datei nicht zum Commit "
-"vormerken\n"
+"d - diesen oder alle weiteren Patch-Bl철cke in dieser Datei nicht zum Commit vormerken\n"
"g - Patch-Block zum hinspringen ausw채hlen\n"
"/ - nach Patch-Block suchen, der gegebenem regul채rem Ausdruck entspricht\n"
-"j - diesen Patch-Block unbestimmt lassen, n채chsten unbestimmten Patch-Block "
-"anzeigen\n"
+"j - diesen Patch-Block unbestimmt lassen, n채chsten unbestimmten Patch-Block anzeigen\n"
"J - diesen Patch-Block unbestimmt lassen, n채chsten Patch-Block anzeigen\n"
-"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-"
-"Block anzeigen\n"
+"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-Block anzeigen\n"
"K - diesen Patch-Block unbestimmt lassen, vorherigen Patch-Block anzeigen\n"
"s - aktuellen Patch-Block in kleinere Patch-Bl철cke aufteilen\n"
"e - aktuellen Patch-Block manuell editieren\n"
@@ -6409,9 +6325,7 @@ msgstr "Nachdem zumindest ein Source Brocken ausgew채hlt wurde werden die ausgew
#: 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 ""
-"Sie k철nnen die Konfigurations-Variable `interactive.singleKey` auf `true` "
-"setzen um hier nicht Enter dr체cken zu m체ssen."
+msgstr "Sie k철nnen die Konfigurations-Variable `interactive.singleKey` auf `true` setzen um hier nicht Enter dr체cken zu m체ssen."
#. type: Labeled list
#: en/git-add.txt:350
@@ -6656,7 +6570,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6686,7 +6600,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6934,7 +6848,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7267,7 +7181,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -10071,7 +9985,7 @@ msgstr "--format <Format>"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -12558,10 +12472,10 @@ msgstr "$ git checkout mytopic\n"
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 "Der \"falsche\" Branch und der korrekte Branch \"mytopic\" k철nnen sich in lokal ge채nderten Dateien unterscheiden, was daz f체hrt, dass der obige Checkout folgenderma횩en fehlschl채gt:"
+#. type: delimited block -
# git-checkout.txt is not up to date. The fuzzy msgid is the message prior to 142183d0 2010-07-09 "checkout: accord documentation to what git does", the msgid is the message in the documentation afterwards.
# At that time there weren't even po files in the git tree. This message does not exist since 23cbf11b 2010-08-11 "merge-recursive: porcelain messages for checkout".
# The current message is "Your local changes to the following files would be overwritten by merge:\n%%s" as of 2e3926b9 2016-05-13 "i18n: unpack-trees: avoid substituting only a verb in sentences"
-#. type: delimited block -
#: en/git-checkout.txt:561
#, fuzzy, no-wrap, priority:240
#| msgid ""
@@ -13715,8 +13629,7 @@ msgstr ""
"\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 [--recurse-submodules[=<Pfad-Spezifikation>]] [--[no-]shallow-submodules]\n"
"\t [--[no-]remote-submodules] [--jobs <n>] [--sparse]\n"
"\t [--filter=<Filter>] [--] <Repository>\n"
"\t [<Directory>]\n"
@@ -13731,22 +13644,13 @@ msgstr "Klont ein Repository in ein neu erzeugtes Verzeichnis, erzeugt Remote-Tr
#: en/git-clone.txt:36
#, 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 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 der Remote-Branch �쉖aster�� "
-"in den lokalen Master-Branch mergen (das gilt nicht, wenn ��--single-branch�� "
-"angegeben wird; 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 der Remote-Branch �쉖aster�� in den lokalen Master-Branch mergen (das gilt nicht, wenn ��--single-branch�� angegeben wird; siehe unten)."
#. type: Plain text
#: en/git-clone.txt:41
#, 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 Standard-Konfiguration wird durch Anlegen einer Referenz auf den "
-"'HEAD' der Remote-Branch unter `refs/remotes/origin` und der Einrichtung der "
-"Konfigurations-Variablen `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 Konfigurations-Variablen `remote.origin.url` und `remote.origin.fetch` erreicht."
#. type: Labeled list
#: en/git-clone.txt:46 en/git-config.txt:127 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
@@ -13776,10 +13680,7 @@ msgstr "--no-hardlinks"
#: en/git-clone.txt:66
#, 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 ""
-"Erzwingt ein physikalisches Kopieren aller Dateien im `.git/objects/` "
-"Verzeichnis anstelle von Hard-Links. Dies kann erw체nscht sein, wenn eine "
-"Sicherung des Repositorys erstellt werden soll."
+msgstr "Erzwingt ein physikalisches Kopieren aller Dateien im `.git/objects/` Verzeichnis anstelle von Hard-Links. Dies kann erw체nscht sein, wenn eine Sicherung des Repositorys erstellt werden soll."
#. type: Labeled list
#: en/git-clone.txt:68
@@ -13896,15 +13797,7 @@ msgstr "--bare"
#: en/git-clone.txt:159
#, 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 ""
-"Erstellt ein `bare` Git-Repository. D.h. anstatt ein `<Directory>` zu "
-"erstellen und die Verwaltungsdateien in `<Directory>/.git` abzulegen, wird "
-"aus dem `<Directory>` selbst das `$GIT_DIR`. Dies impliziert offensichtlich "
-"`--no-checkout`, weil es nirgendwo eine M철glichkeit gibt, das Arbeitsbereich "
-"auszuchecken. Auch die Branch-Heads auf der Remote-Seite werden direkt auf "
-"die entsprechenden lokalen Branch-Heads kopiert, ohne sie auf `refs/remotes/"
-"origin/` abzubilden. Wenn diese Option verwendet wird, werden weder Remote-"
-"Tracking-Branches noch die zugeh철rigen Konfigurationsvariablen erstellt."
+msgstr "Erstellt ein `bare` Git-Repository. D.h. anstatt ein `<Directory>` zu erstellen und die Verwaltungsdateien in `<Directory>/.git` abzulegen, wird aus dem `<Directory>` selbst das `$GIT_DIR`. Dies impliziert offensichtlich `--no-checkout`, weil es nirgendwo eine M철glichkeit gibt, das Arbeitsbereich auszuchecken. Auch die Branch-Heads auf der Remote-Seite werden direkt auf die entsprechenden lokalen Branch-Heads kopiert, ohne sie auf `refs/remotes/origin/` abzubilden. Wenn diese Option verwendet wird, werden weder Remote-Tracking-Branches noch die zugeh철rigen Konfigurationsvariablen erstellt."
#. type: Labeled list
#: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:358 en/rev-list-options.txt:491
@@ -13919,7 +13812,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
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:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr "--filter=<Filter-Spezifikation>"
@@ -13928,16 +13821,7 @@ msgstr "--filter=<Filter-Spezifikation>"
#: en/git-clone.txt:175
#, priority:300
msgid "Use the partial clone feature and request that the server sends a subset of reachable objects according to a given object filter. When using `--filter`, the supplied `<filter-spec>` is used for the partial clone filter. For example, `--filter=blob:none` will filter out all blobs (file contents) until needed by Git. Also, `--filter=blob:limit=<size>` will filter out all blobs of size at least `<size>`. For more details on filter specifications, see the `--filter` option in linkgit:git-rev-list[1]."
-msgstr ""
-"Verwendet die Funktion des partiellen Klonens und fordert den Server auf, "
-"eine Teilmenge der verf체gbaren Objekte, entsprechend einem vorgegebenen "
-"Objektfilter, zu senden. Bei der Verwendung von `--filter` wird die mit "
-"angegebene `<filter-spec>` f체r den partiellen Klon-Filter verwendet. Zum "
-"Beispiel wird `--filter=blob:none` alle Blobs (Dateiinhalte) herausfiltern, "
-"bis sie von Git ben철tigt werden. Au횩erdem wird `--filter=blob:limit=<size>` "
-"alle BLOBs herausfiltern, die mindestens die Gr철횩e `<size>` haben. Weitere "
-"Details zu den Filterspezifikationen finden Sie unter der Option `--filter` "
-"in linkgit:git-rev-list[1]."
+msgstr "Verwendet die Funktion des partiellen Klonens und fordert den Server auf, eine Teilmenge der verf체gbaren Objekte, entsprechend einem vorgegebenen Objektfilter, zu senden. Bei der Verwendung von `--filter` wird die mit angegebene `<filter-spec>` f체r den partiellen Klon-Filter verwendet. Zum Beispiel wird `--filter=blob:none` alle Blobs (Dateiinhalte) herausfiltern, bis sie von Git ben철tigt werden. Au횩erdem wird `--filter=blob:limit=<size>` alle BLOBs herausfiltern, die mindestens die Gr철횩e `<size>` haben. Weitere Details zu den Filterspezifikationen finden Sie unter der Option `--filter` in linkgit:git-rev-list[1]."
#. type: Labeled list
#: en/git-clone.txt:176 en/git-push.txt:161
@@ -13949,13 +13833,7 @@ msgstr "--mirror"
#: en/git-clone.txt:183
#, 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, sodass alle diese Refs durch ein `git remote "
-"update` im Ziel-Repository 체berschrieben werden k철nnen."
+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, sodass alle diese Refs durch ein `git remote update` im Ziel-Repository 체berschrieben werden k철nnen."
#. type: Labeled list
#: en/git-clone.txt:184
@@ -13973,9 +13851,7 @@ msgstr "--origin <Name>"
#: en/git-clone.txt:188
#, priority:300
msgid "Instead of using the remote name `origin` to keep track of the upstream repository, use `<name>`."
-msgstr ""
-"Verwendet den Namen `<Name>` statt `origin` zum Tracken der 횆nderungen des "
-"Upstream-Repository."
+msgstr "Verwendet den Namen `<Name>` statt `origin` zum Tracken der 횆nderungen des Upstream-Repository."
#. type: Labeled list
#: en/git-clone.txt:189
@@ -13993,12 +13869,7 @@ msgstr "--branch <Name>"
#: en/git-clone.txt:197
#, 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 �엖on-bare�� Repository ist dies der Branch, der "
-"ausgecheckt wird. `--branch` kann auch Tags 체bernehmen und HEAD im "
-"resultierenden Repository von diesem Commit abtrennen."
+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 �엖on-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:198
@@ -14010,10 +13881,7 @@ msgstr "-u <Upload-Pack>"
#: en/git-clone.txt:203
#, 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 ""
-"Wurde diese Option angegeben und der Zugriff auf das zu klonende Repository "
-"erfolgt 체ber SSH, so wird damit ein Nicht-Standardpfad f체r den Befehlsaufruf "
-"am anderen Ende angegeben."
+msgstr "Wurde diese Option angegeben und der Zugriff auf das zu klonende Repository erfolgt 체ber SSH, so wird damit ein Nicht-Standardpfad f체r den Befehlsaufruf am anderen Ende angegeben."
#. type: Labeled list
#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
@@ -14049,12 +13917,7 @@ msgstr "Setzt eine Konfigurations-Variable im neu angelegten Repository; die sof
#: en/git-clone.txt:224
#, 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. Bekannterma횩en nicht wirksame Konfigurations-Variablen sind: "
-"`remote.<Name>.mirror` und `remote.<Name>.tagOpt`. Verwenden Sie "
-"stattdessen die entsprechenden Optionen `---mirror` und `--no-tags`."
+msgstr "Aufgrund von Einschr채nkungen der aktuellen Implementierung werden einige Konfigurations-Variablen erst *nach* dem initialen Fetchen und Checkout wirksam. Bekannterma횩en nicht wirksame Konfigurations-Variablen 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:225
@@ -14066,12 +13929,7 @@ msgstr "--depth <Tiefe>"
#: en/git-clone.txt:231
#, 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."
+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:234
@@ -14101,11 +13959,7 @@ msgstr "Klont nur die Historie, die zur Spitze eines einzelnen Branchs geh철rt,
#: en/git-clone.txt:256
#, 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])."
+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:261
@@ -14129,13 +13983,7 @@ msgstr "Initialisiert und klont nach der Erstellung des Klons Submodule auf der
#: en/git-clone.txt:277
#, 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)"
+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:278
@@ -14159,11 +14007,7 @@ msgstr "--[no-]remote-submodules"
#: en/git-clone.txt:286
#, 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` mit dem "
-"Befehl `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` mit dem Befehl `git submodule update`."
#. type: Labeled list
#: en/git-clone.txt:287 en/git-init.txt:61
@@ -14678,11 +14522,7 @@ msgstr "Durch Verwendung von linkgit:git-rm[1] um Dateien, vor Aufruf des 'commi
#: 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 ""
-"durch die Angabe von Dateien als Argumente zum 'commit' Befehl (ohne --"
-"interactive oder --patch switch). In diesem Fall ignoriert der Commit die im "
-"Index gestagten 횆nderungen und erfasst stattdessen den aktuellen Inhalt der "
-"aufgelisteten Dateien (die Git bereits bekannt sein m체ssen);"
+msgstr "durch die Angabe von Dateien als Argumente zum 'commit' Befehl (ohne --interactive oder --patch switch). In diesem Fall ignoriert der Commit die im Index gestagten 횆nderungen und erfasst stattdessen den aktuellen Inhalt der aufgelisteten Dateien (die Git bereits bekannt sein m체ssen);"
#. type: Plain text
#: en/git-commit.txt:48
@@ -14694,12 +14534,7 @@ msgstr "Durch Verwendung des -a Schalters des 'git commit' Befehls, um zuvor aut
#: 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 ""
-"durch Verwendung der --interactive oder --patch Argumente zusammen mit dem "
-"'commit' Befehl. So kann nacheinander entschieden werden, welche Dateien "
-"oder Hunks, zus채tzlich zu dem Index-Inhalt, Teil des Commits sein sollen, "
-"bevor die Operation abgeschlossen wird. Siehe den Abschnitt �얢nteraktiver "
-"Modus�� in linkgit:git-add[1], um zu erfahren, wie man diese Modi bedient."
+msgstr "durch Verwendung der --interactive oder --patch Argumente zusammen mit dem 'commit' Befehl. So kann nacheinander entschieden werden, welche Dateien oder Hunks, zus채tzlich zu dem Index-Inhalt, Teil des Commits sein sollen, bevor die Operation abgeschlossen wird. Siehe den Abschnitt �얢nteraktiver Modus�� in linkgit:git-add[1], um zu erfahren, wie man diese Modi bedient."
#. type: Plain text
#: en/git-commit.txt:58
@@ -14903,10 +14738,7 @@ msgstr "--message=<Nachricht>"
#: en/git-commit.txt:152
#, 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 ""
-"Verwendet die angegebene <Nachricht> als Commit-Beschreibung. Falls mehrere "
-"`-m` Optionen angegeben sind, werden ihre Werte als separate Abs채tze "
-"verkn체pft."
+msgstr "Verwendet die angegebene <Nachricht> als Commit-Beschreibung. Falls mehrere `-m` Optionen angegeben sind, werden ihre Werte als separate Abs채tze verkn체pft."
#. type: Plain text
#: en/git-commit.txt:154
@@ -14954,12 +14786,7 @@ msgstr "Diese Option schaltet die pre-commit und commit-msg Einsprungspunkte (ho
#: en/git-commit.txt:185
#, priority:280
msgid "Usually recording a commit that has the exact same tree as its sole parent commit is a mistake, and the command prevents you from making such a commit. This option bypasses the safety, and is primarily for use by foreign SCM interface scripts."
-msgstr ""
-"Normalerweise ist es fehlerhaft einen Commit aufzuzeichnen, der genau "
-"denselben Tree, wie sein einziger Elternteil hat. Der Befehl hindert Sie "
-"daran, einen solchen Commit zu erstellen. Diese Option umgeht die "
-"Sicherheits체berpr체fung und wird haupts채chlich von fremden SCM-"
-"Schnittstellenskripten verwendet."
+msgstr "Normalerweise ist es fehlerhaft einen Commit aufzuzeichnen, der genau denselben Tree, wie sein einziger Elternteil hat. Der Befehl hindert Sie daran, einen solchen Commit zu erstellen. Diese Option umgeht die Sicherheits체berpr체fung und wird haupts채chlich von fremden SCM-Schnittstellenskripten verwendet."
#. type: Plain text
#: en/git-commit.txt:191
@@ -15037,19 +14864,13 @@ msgstr ""
#: en/git-commit.txt:219
#, priority:280
msgid "The default can be changed by the `commit.cleanup` configuration variable (see linkgit:git-config[1])."
-msgstr ""
-"Die Voreinstellung kann durch die Konfigurations-Variable `commit.cleanup` "
-"ge채ndert werden (siehe linkgit:git-config[1])."
+msgstr "Die Voreinstellung kann durch die Konfigurations-Variable `commit.cleanup` ge채ndert werden (siehe linkgit:git-config[1])."
#. type: Plain text
#: en/git-commit.txt:226
#, priority:280
msgid "The message taken from file with `-F`, command line with `-m`, and from commit object with `-C` are usually used as the commit log message unmodified. This option lets you further edit the message taken from these sources."
-msgstr ""
-"Die Commit-Beschreibung, die mit `-F` aus der Datei, mit `-m` 체ber die "
-"Kommandozeile und mit `-C` vom Commit-Objekt 체bernommen wird, dient "
-"normalerweise unver채ndert als Commit-Log-Nachricht. Mit dieser Option k철nnen "
-"Sie die aus diesen Quellen entnommene Beschreibung weiter bearbeiten."
+msgstr "Die Commit-Beschreibung, die mit `-F` aus der Datei, mit `-m` 체ber die Kommandozeile und mit `-C` vom Commit-Objekt 체bernommen wird, dient normalerweise unver채ndert als Commit-Log-Nachricht. Mit dieser Option k철nnen Sie die aus diesen Quellen entnommene Beschreibung weiter bearbeiten."
#. type: Labeled list
#: en/git-commit.txt:227 en/git-revert.txt:66 en/merge-options.txt:17
@@ -15139,18 +14960,7 @@ msgstr "--only"
#: en/git-commit.txt:281
#, priority:280
msgid "Make a commit by taking the updated working tree contents of the paths specified on the command line, disregarding any contents that have been staged for other paths. This is the default mode of operation of 'git commit' if any paths are given on the command line, in which case this option can be omitted. If this option is specified together with `--amend`, then no paths need to be specified, which can be used to amend the last commit without committing changes that have already been staged. If used together with `--allow-empty` paths are also not required, and an empty commit will be created."
-msgstr ""
-"F체hrt einen Commit durch, indem er den aktualisierten Inhalt des "
-"Arbeitsbereichs der in der Befehlszeile angegebenen Pfade 체bernimmt. Dabei "
-"werden alle Inhalte, die f체r andere Pfade gestagt (zur Staging-Area "
-"hinzugef체gt) wurden, nicht ber체cksichtigt. Das ist der Standard-"
-"Betriebsmodus von 'git commit'. Falls irgendwelche Pfade auf der "
-"Befehlszeile angegeben sind �� dann kann diese Option weggelassen werden. "
-"Wenn diese Option zusammen mit `--amend` angegeben wird, m체ssen keine Pfade "
-"spezifiziert werden, die erm철glichen k철nnten, den letzten Commit zu 채ndern, "
-"ohne bereits gestagten 횆nderungen zu committen. Wird diese Option zusammen "
-"mit `--allow-empty` angegeben, dann sind ebenfalls keine Pfade erforderlich "
-"und ein leerer Commit wird erstellt."
+msgstr "F체hrt einen Commit durch, indem er den aktualisierten Inhalt des Arbeitsbereichs der in der Befehlszeile angegebenen Pfade 체bernimmt. Dabei werden alle Inhalte, die f체r andere Pfade gestagt (zur Staging-Area hinzugef체gt) wurden, nicht ber체cksichtigt. Das ist der Standard-Betriebsmodus von 'git commit'. Falls irgendwelche Pfade auf der Befehlszeile angegeben sind �� dann kann diese Option weggelassen werden. Wenn diese Option zusammen mit `--amend` angegeben wird, m체ssen keine Pfade spezifiziert werden, die erm철glichen k철nnten, den letzten Commit zu 채ndern, ohne bereits gestagten 횆nderungen zu committen. Wird diese Option zusammen mit `--allow-empty` angegeben, dann sind ebenfalls keine Pfade erforderlich und ein leerer Commit wird erstellt."
#. type: Labeled list
#: en/git-commit.txt:295 en/git-status.txt:58
@@ -15174,11 +14984,7 @@ msgstr "Zeigt nicht getrackte Dateien an."
#: en/git-commit.txt:303
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
-msgstr ""
-"Der <Modus> Parameter ist optional (Standardwert ist 'all') und wird "
-"verwendet, um die Verarbeitung von nicht getrackten Dateien zu bestimmen; "
-"wenn -u nicht verwendet wird, ist der Standardwert 'normal', d.h. anzeigen "
-"von nicht getrackten Dateien und Verzeichnissen."
+msgstr "Der <Modus> Parameter ist optional (Standardwert ist 'all') und wird verwendet, um die Verarbeitung von nicht getrackten Dateien zu bestimmen; wenn -u nicht verwendet wird, ist der Standardwert 'normal', d.h. anzeigen von nicht getrackten Dateien und Verzeichnissen."
#. type: Plain text
#: en/git-commit.txt:305 en/git-status.txt:68 en/git-status.txt:110
@@ -15208,23 +15014,13 @@ msgstr "'all' - zeige zus채tzlich die einzelnen Dateien in den unverwalteten
#: en/git-commit.txt:312 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
-msgstr ""
-"Die Voreinstellung kann 체ber die Konfigurations-Variable `status."
-"showUntrackedFiles` ge채ndert werden, die in linkgit:git-config[1] "
-"dokumentiert ist."
+msgstr "Die Voreinstellung kann 체ber die Konfigurations-Variable `status.showUntrackedFiles` ge채ndert werden, die in linkgit:git-config[1] dokumentiert ist."
#. type: Plain text
#: en/git-commit.txt:324
#, priority:280
msgid "Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template to help the user describe the commit by reminding what changes the commit has. Note that this diff output doesn't have its lines prefixed with '#'. This diff will not be a part of the commit message. See the `commit.verbose` configuration variable in linkgit:git-config[1]."
-msgstr ""
-"Zeigt das vereinheitlichte Diff zwischen dem HEAD-Commit und dem Inhalt am "
-"Ende der Commit-Nachrichtenvorlage an, um dem Benutzer bei der Beschreibung "
-"des Commits zu helfen, indem er die 횆nderungen im Commit anzeigt. Beachten "
-"Sie, dass die Zeilen dieser Diff-Ausgabe nicht mit einem '#' vorangestellt "
-"sind. Diese Diff-Variante wird nicht Teil der Commit-Beschreibung sein. "
-"Siehe auch die Konfigurations-Variable `commit.verbose` in linkgit:git-"
-"config[1]."
+msgstr "Zeigt das vereinheitlichte Diff zwischen dem HEAD-Commit und dem Inhalt am Ende der Commit-Nachrichtenvorlage an, um dem Benutzer bei der Beschreibung des Commits zu helfen, indem er die 횆nderungen im Commit anzeigt. Beachten Sie, dass die Zeilen dieser Diff-Ausgabe nicht mit einem '#' vorangestellt sind. Diese Diff-Variante wird nicht Teil der Commit-Beschreibung sein. Siehe auch die Konfigurations-Variable `commit.verbose` in linkgit:git-config[1]."
#. type: Plain text
#: en/git-commit.txt:328
@@ -15272,26 +15068,13 @@ msgstr ""
#: en/git-commit.txt:366
#, priority:280
msgid "When pathspec is given on the command line, commit the contents of the files that match the pathspec without recording the changes already added to the index. The contents of these files are also staged for the next commit on top of what have been staged before."
-msgstr ""
-"Werden Pfadspezifikationen in der Befehlszeile angegeben, 체bergeben Sie den "
-"Inhalt der Dateien, die der Pfadspezifikation entsprechen, ohne die bereits "
-"zum Index hinzugef체gten 횆nderungen aufzuzeichnen. Der Inhalt dieser Dateien "
-"wird ebenfalls f체r den n채chsten Commit gestagt, zus채tzlich zu dem, was zuvor "
-"schon gestagt wurde."
+msgstr "Werden Pfadspezifikationen in der Befehlszeile angegeben, 체bergeben Sie den Inhalt der Dateien, die der Pfadspezifikation entsprechen, ohne die bereits zum Index hinzugef체gten 횆nderungen aufzuzeichnen. Der Inhalt dieser Dateien wird ebenfalls f체r den n채chsten Commit gestagt, zus채tzlich zu dem, was zuvor schon gestagt wurde."
#. type: Plain text
#: en/git-commit.txt:382
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
-msgstr ""
-"Beim Aufzeichnen der eigenen Arbeit wird der Inhalt der ver채nderten Dateien "
-"im Arbeitsbereich mit 'git add' tempor채r in der Staging-Area (auch \"Index\" "
-"genannt) abgelegt. Die mit 'git add' vorbereiteten 횆nderungen einer Datei "
-"k철nnen mit `git restore --staged <Datei>` wieder aus dem Index entfernt "
-"werden, ohne dadurch die Datei selbst zu ver채ndern. Nachdem die gew체nschten "
-"횆nderungen im Index vorbereitet wurden, k철nnen diese mit dem Befehl `git "
-"commit` im Arbeitsbereich eingetragen (commited) werden. Dabei handelt es "
-"sich um die elementarste Form des Befehls. Ein Beispiel:"
+msgstr "Beim Aufzeichnen der eigenen Arbeit wird der Inhalt der ver채nderten Dateien im Arbeitsbereich mit 'git add' tempor채r in der Staging-Area (auch \"Index\" genannt) abgelegt. Die mit 'git add' vorbereiteten 횆nderungen einer Datei k철nnen mit `git restore --staged <Datei>` wieder aus dem Index entfernt werden, ohne dadurch die Datei selbst zu ver채ndern. Nachdem die gew체nschten 횆nderungen im Index vorbereitet wurden, k철nnen diese mit dem Befehl `git commit` im Arbeitsbereich eingetragen (commited) werden. Dabei handelt es sich um die elementarste Form des Befehls. Ein Beispiel:"
#. type: delimited block -
#: en/git-commit.txt:388
@@ -15373,14 +15156,7 @@ msgstr "werden in einer zweiten Eintragung (commit) die 횆nderungen an 'hello.c'
#: en/git-commit.txt:439
#, priority:280
msgid "After a merge (initiated by 'git merge' or 'git pull') stops because of conflicts, cleanly merged paths are already staged to be committed for you, and paths that conflicted are left in unmerged state. You would have to first check which paths are conflicting with 'git status' and after fixing them manually in your working tree, you would stage the result as usual with 'git add':"
-msgstr ""
-"Nachdem ein (durch 'git merge' oder 'git pull' eingeleiteter) Merge aufgrund "
-"von Konflikten gestoppt wurde, werden sauber gemergte Pfade zwischenzeitlich "
-"gestagt, um committet zu werden. Die Pfade, die Konflikte verursacht haben, "
-"werden in einem nicht gestagten Zustand belassen. Sie m체ssten zun채chst mit "
-"'git status' pr체fen, welche Pfade in Konflikt stehen. Nachdem Sie diese "
-"Konflikte manuell in Ihrem Arbeitsbereich behoben haben, w체rden Sie das "
-"Ergebnis wie 체blich mit 'git add' zur Staging-Area hinzuf체gen (stagen):"
+msgstr "Nachdem ein (durch 'git merge' oder 'git pull' eingeleiteter) Merge aufgrund von Konflikten gestoppt wurde, werden sauber gemergte Pfade zwischenzeitlich gestagt, um committet zu werden. Die Pfade, die Konflikte verursacht haben, werden in einem nicht gestagten Zustand belassen. Sie m체ssten zun채chst mit 'git status' pr체fen, welche Pfade in Konflikt stehen. Nachdem Sie diese Konflikte manuell in Ihrem Arbeitsbereich behoben haben, w체rden Sie das Ergebnis wie 체blich mit 'git add' zur Staging-Area hinzuf체gen (stagen):"
#. type: delimited block -
#: en/git-commit.txt:445
@@ -15418,9 +15194,7 @@ msgstr "COMMIT-INFORMATIONEN"
#: en/git-commit.txt:467
#, priority:280
msgid "Author and committer information is taken from the following environment variables, if set:"
-msgstr ""
-"Autoren- und Committer-Informationen werden aus den folgenden "
-"Umgebungsvariablen entnommen, sofern diese gesetzt sind:"
+msgstr "Autoren- und Committer-Informationen werden aus den folgenden Umgebungsvariablen entnommen, sofern diese gesetzt sind:"
#. type: Plain text
#: en/git-commit.txt:474
@@ -15468,16 +15242,7 @@ msgstr ""
#: en/git-commit.txt:510
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
-msgstr ""
-"Obwohl es technisch nicht erforderlich ist, ist es gebr채uchlich die Commit-"
-"Beschreibung mit einer einzigen kurzen (weniger als 50 Zeichen) Zeile zu "
-"beginnen, die die 횆nderung zusammenfasst. Danach folgt eine Leerzeile und "
-"dann eine ausf체hrlichere Beschreibung. Der Text bis zur ersten Leerzeile in "
-"einer Commit-Nachricht wird als Titel der Commit-Nachricht behandelt. Dieser "
-"Titel wird in Git verwendet. Mit linkgit:git-format-patch[1] wird "
-"beispielsweise eine Commit-Nachricht in eine E-Mail umgewandelt und der "
-"Titel in der Betreffzeile verwendet. Der Rest der Commit-Nachricht wird "
-"direkt im Textteil eingef체gt."
+msgstr "Obwohl es technisch nicht erforderlich ist, ist es gebr채uchlich die Commit-Beschreibung mit einer einzigen kurzen (weniger als 50 Zeichen) Zeile zu beginnen, die die 횆nderung zusammenfasst. Danach folgt eine Leerzeile und dann eine ausf체hrlichere Beschreibung. Der Text bis zur ersten Leerzeile in einer Commit-Nachricht wird als Titel der Commit-Nachricht behandelt. Dieser Titel wird in Git verwendet. Mit linkgit:git-format-patch[1] wird beispielsweise eine Commit-Nachricht in eine E-Mail umgewandelt und der Titel in der Betreffzeile verwendet. Der Rest der Commit-Nachricht wird direkt im Textteil eingef체gt."
#. type: Title -
#: en/git-commit.txt:514
@@ -15489,20 +15254,13 @@ msgstr "ENVIRONMENT AND CONFIGURATION VARIABLES"
#: en/git-commit.txt:519
#, 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 ""
-"Als Editor zum Bearbeiten der Commit-Log-Nachrichten wird die "
-"Umgebungsvariable `GIT_EDITOR`, die Konfigurations-Variable `core.editor`, "
-"die Umgebungsvariable `VISUAL` oder die Umgebungsvariable `EDITOR` (in "
-"dieser Reihenfolge) verwendet. Siehe linkgit:git-var[1] f체r Einzelheiten."
+msgstr "Als Editor zum Bearbeiten der Commit-Log-Nachrichten wird die Umgebungsvariable `GIT_EDITOR`, die Konfigurations-Variable `core.editor`, die Umgebungsvariable `VISUAL` oder die Umgebungsvariable `EDITOR` (in dieser Reihenfolge) verwendet. Siehe linkgit:git-var[1] f체r Einzelheiten."
#. type: Plain text
#: en/git-commit.txt:525
#, 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 ""
-"Dieser Befehl kann die folgenden Hooks (Einsprungpunkte) aufrufen: `commit-"
-"msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` und `post-rewrite`. "
-"Siehe linkgit:githooks[5] f체r weitere Information."
+msgstr "Dieser Befehl kann die folgenden Hooks (Einsprungpunkte) aufrufen: `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-commit` und `post-rewrite`. Siehe linkgit:githooks[5] f체r weitere Information."
#. type: Labeled list
#: en/git-commit.txt:529
@@ -19105,9 +18863,7 @@ msgstr "git-describe(1)"
#: en/git-describe.txt:7
#, priority:260
msgid "git-describe - Give an object a human readable name based on an available ref"
-msgstr ""
-"Einem Objekt einen f체r Menschen lesbaren Namen basierend auf einer "
-"verf체gbaren Referenz geben."
+msgstr "Einem Objekt einen f체r Menschen lesbaren Namen basierend auf einer verf체gbaren Referenz geben."
#. type: Plain text
#: en/git-describe.txt:14
@@ -19455,7 +19211,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -20114,13 +19870,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27666,7 +27422,7 @@ msgstr ""
#: en/git-grep.txt:213
#, fuzzy, priority:100
#| msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr "Ohne diese Option werden Pfadnamen mit �엞n체blichen�� Zeichen in Anf체hrungszeichen gesetzt, wie es f체r die Konfigurations-Variable `core.quotePath` definiert ist (siehe linkgit:git-config[1])."
#. type: Labeled list
@@ -27682,7 +27438,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29773,10 +29529,14 @@ msgstr "git-init-db �� Erstellt ein leeres Git-Repository oder initialisiert ei
#. type: Plain text
#: en/git-init.txt:15
-#, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:300
+#| msgid ""
+#| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
+#| "\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+#| "\t [--shared[=<permissions>]] [directory]\n"
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
"'git init' [-q | --quiet] [--bare] [--template=<Template-Verzeichnis>]\n"
@@ -29799,10 +29559,7 @@ msgstr "Wenn die Umgebungsvariable `$GIT_DIR` gesetzt ist, dann gibt sie einen P
#: 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 ""
-"Wenn das Objektverzeichnis 체ber die Umgebungsvariable `$GIT_OBJECT_DIRECTORY`"
-" angegeben wird, werden die SHA1-Verzeichnisse darunter angelegt �� "
-"andernfalls wird das Standardverzeichnis `$GIT_DIR/objects` verwendet."
+msgstr "Wenn das Objektverzeichnis 체ber die Umgebungsvariable `$GIT_OBJECT_DIRECTORY` angegeben wird, werden die SHA1-Verzeichnisse darunter angelegt �� andernfalls wird das Standardverzeichnis `$GIT_DIR/objects` verwendet."
#. type: Plain text
#: en/git-init.txt:37
@@ -29832,10 +29589,7 @@ msgstr "--object-format=<Format>"
#: en/git-init.txt:55
#, priority:300
msgid "Specify the given object format (hash algorithm) for the repository. The valid values are 'sha1' and (if enabled) 'sha256'. 'sha1' is the default."
-msgstr ""
-"Spezifiziert das angegebene Objektformat (Hash-Algorithmus) f체r das "
-"Repository. Die g체ltigen Werte sind 'sha1' und, falls aktiviert, 'sha256'. "
-"'sha1' ist die Voreinstellung."
+msgstr "Spezifiziert das angegebene Objektformat (Hash-Algorithmus) f체r das Repository. Die g체ltigen Werte sind 'sha1' und, falls aktiviert, 'sha256'. 'sha1' ist die Voreinstellung."
#. type: Plain text
#: en/git-init.txt:60
@@ -29925,19 +29679,13 @@ msgstr "'0xxx' ist eine Oktalzahl und jede Datei hat den Status '0xxx'. '0xxx'
#: en/git-init.txt:113
#, 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 �엖on-fast-"
-"forward�� Push erzwingen k철nnen."
+msgstr "Standardm채횩ig ist das Konfigurationsflag `receive.denyNonFastForwards` in gemeinsam genutzten Repositorys aktiviert, sodass Sie keinen �엖on-fast-forward�� Push erzwingen k철nnen."
#. type: Plain text
#: en/git-init.txt:116
#, 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 ein 'Directory' (Verzeichnis) angeben, wird der Befehl innerhalb "
-"dieses Verzeichnisses ausgef체hrt. Wenn dieses Verzeichnis nicht existiert, "
-"wird es erstellt."
+msgstr "Wenn Sie ein 'Directory' (Verzeichnis) angeben, wird der Befehl innerhalb dieses Verzeichnisses ausgef체hrt. Wenn dieses Verzeichnis nicht existiert, wird es erstellt."
#. type: Title -
#: en/git-init.txt:118
@@ -30898,11 +30646,7 @@ msgstr "Zeigt die Geschichte des Projekts."
#: en/git-log.txt:22
#, priority:260
msgid "The command takes options applicable to the `git rev-list` command to control what is shown and how, and options applicable to the `git diff-*` commands to control how the changes each commit introduces are shown."
-msgstr ""
-"Der Befehl nutzt Optionen, die auf den Befehl `git rev-list` anwendbar sind, "
-"um zu steuern, was und wie angezeigt wird und Optionen, die auf die Befehle `"
-"git diff-*` anwendbar sind, um zu steuern, wie die 횆nderungen, die jeder "
-"Commit einf체hrt, angezeigt werden."
+msgstr "Der Befehl nutzt Optionen, die auf den Befehl `git rev-list` anwendbar sind, um zu steuern, was und wie angezeigt wird und Optionen, die auf die Befehle `git diff-*` anwendbar sind, um zu steuern, wie die 횆nderungen, die jeder Commit einf체hrt, angezeigt werden."
#. type: Labeled list
#: en/git-log.txt:27
@@ -30914,9 +30658,7 @@ msgstr "--follow"
#: en/git-log.txt:30
#, priority:260
msgid "Continue listing the history of a file beyond renames (works only for a single file)."
-msgstr ""
-"Setzt die Auflistung des Verlaufs einer Datei 체ber Umbenennungen hinaus fort "
-"(das gilt nur f체r eine einzige Datei)."
+msgstr "Setzt die Auflistung des Verlaufs einer Datei 체ber Umbenennungen hinaus fort (das gilt nur f체r eine einzige Datei)."
#. type: Labeled list
#: en/git-log.txt:31
@@ -30964,9 +30706,7 @@ msgstr "--source"
#: en/git-log.txt:54
#, priority:260
msgid "Print out the ref name given on the command line by which each commit was reached."
-msgstr ""
-"Ausgabe des Referenznamen, der in der Befehlszeile angegeben wurde, 체ber die "
-"die einzelnen Commits aufgerufen wurden."
+msgstr "Ausgabe des Referenznamen, der in der Befehlszeile angegeben wurde, 체ber die die einzelnen Commits aufgerufen wurden."
#. type: Labeled list
#: en/git-log.txt:55
@@ -33875,8 +33615,7 @@ msgstr "'git mv' <Optionen>... <Argumente>...\n"
#: en/git-mv.txt:17
#, priority:280
msgid "Move or rename a file, directory or symlink."
-msgstr ""
-"Eine Datei, ein Verzeichnis oder einen Symlink verschieben oder umbenennen"
+msgstr "Eine Datei, ein Verzeichnis oder einen Symlink verschieben oder umbenennen"
#. type: Plain text
#: en/git-mv.txt:20
@@ -36296,7 +36035,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -36518,7 +36257,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -36530,13 +36269,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -36548,7 +36287,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -36560,7 +36299,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -36930,26 +36669,13 @@ msgstr ""
#: en/git-patch-id.txt:41
#, priority:100
msgid "Reordering file diffs that make up a patch does not affect the ID. In particular, two patches produced by comparing the same two trees with two different settings for \"-O<orderfile>\" result in the same patch ID signature, thereby allowing the computed result to be used as a key to index some meta-information about the change between the two trees;"
-msgstr ""
-"Das Neuordnen von Datei-Diffs, aus denen ein Patch besteht, hat keinen "
-"Einfluss auf die ID. Insbesondere f체hren zwei Patches, die durch den "
-"Vergleich derselben beiden St채mme (trees) mit zwei verschiedenen "
-"Einstellungen f체r \"-O<Steuer-Datei>\" erzeugt werden, zu derselben Patch-ID-"
-"Signatur, wodurch das berechnete Ergebnis als Schl체ssel zur Indizierung "
-"einiger Metainformationen 체ber die 횆nderung zwischen den beiden B채umen "
-"verwendet werden kann;"
+msgstr "Das Neuordnen von Datei-Diffs, aus denen ein Patch besteht, hat keinen Einfluss auf die ID. Insbesondere f체hren zwei Patches, die durch den Vergleich derselben beiden St채mme (trees) mit zwei verschiedenen Einstellungen f체r \"-O<Steuer-Datei>\" erzeugt werden, zu derselben Patch-ID-Signatur, wodurch das berechnete Ergebnis als Schl체ssel zur Indizierung einiger Metainformationen 체ber die 횆nderung zwischen den beiden B채umen verwendet werden kann;"
#. type: Plain text
#: en/git-patch-id.txt:47
#, priority:100
msgid "Result is different from the value produced by git 1.9 and older or produced when an \"unstable\" hash (see --unstable below) is configured - even when used on a diff output taken without any use of \"-O<orderfile>\", thereby making existing databases storing such \"unstable\" or historical patch-ids unusable."
-msgstr ""
-"Das Ergebnis unterscheidet sich von dem Wert, der von Git 1.9 und 채lter "
-"erzeugt wird oder wenn ein \"unstable\" Hash (siehe --unstable weiter unten) "
-"konfiguriert wird �� selbst wenn es f체r eine Diff-Ausgabe verwendet wird, die "
-"ohne die Verwendung von \"-O<Steuer-Datei>\" aufgenommen wurde. Dadurch "
-"werden vorhandene Datenbanken, die solche \"unstable\" oder historischen "
-"Patch-Ids speichern, unbrauchbar."
+msgstr "Das Ergebnis unterscheidet sich von dem Wert, der von Git 1.9 und 채lter erzeugt wird oder wenn ein \"unstable\" Hash (siehe --unstable weiter unten) konfiguriert wird �� selbst wenn es f체r eine Diff-Ausgabe verwendet wird, die ohne die Verwendung von \"-O<Steuer-Datei>\" aufgenommen wurde. Dadurch werden vorhandene Datenbanken, die solche \"unstable\" oder historischen Patch-Ids speichern, unbrauchbar."
#. type: Plain text
#: en/git-patch-id.txt:49
@@ -39826,10 +39552,7 @@ msgstr ""
#: en/git-rebase.txt:519
#, ignore-ellipsis, priority:100
msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
-msgstr ""
-"Es ist derzeit nur m철glich, Merge-Commits mit der Merge-Strategie `recursive`"
-" neu zu erstellen. Andere Merge-Strategien k철nnen nur 체ber den expliziten "
-"Befehl `exec git merge -s <Strategie> [...]` aufgerufen werden."
+msgstr "Es ist derzeit nur m철glich, Merge-Commits mit der Merge-Strategie `recursive` neu zu erstellen. Andere Merge-Strategien k철nnen nur 체ber den expliziten Befehl `exec git merge -s <Strategie> [...]` aufgerufen werden."
#. type: Plain text
#: en/git-rebase.txt:521
@@ -42100,7 +41823,7 @@ msgstr "git-remote - Einen Satz entfernter Repositories verwalten"
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -42124,7 +41847,7 @@ msgstr "Einen Satz Repositories (\"Remotes\"), deren Zweige von Ihnen verfolgt w
#: en/git-remote.txt:39
#, fuzzy, priority:220
#| msgid "Be a little more verbose and show remote url after name."
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr "Sei ein wenig gespr채chiger und zeige die entfernte URL nach dem Namen."
#. type: Plain text
@@ -42141,8 +41864,9 @@ msgstr "'add'"
#. type: Plain text
#: en/git-remote.txt:52
-#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+#, fuzzy, priority:220
+#| msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>. F체gt einen Remote mit dem Namen <Name> f체r das Repository auf <URL> hinzu. Der Befehl `git fetch <Name>` kann dann um einen Remote-verfolgenden Zweig <Name>/<Zweig> zu erstellen und zu aktualisieren."
#. type: Plain text
@@ -42257,13 +41981,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -42281,7 +42005,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -42390,7 +42114,7 @@ msgstr ""
#: en/git-remote.txt:186
#, fuzzy, priority:220
#| msgid "With `--dry-run` option, report what branches will be pruned, but do no actually prune them."
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr "Mit der Option `--dry-run`, wird lediglich angezeigt, welche Zweige gel철scht werden w체rden, sie werden jedoch nicht gel철scht."
#. type: Labeled list
@@ -42403,7 +42127,7 @@ msgstr "'update'"
#: en/git-remote.txt:195
#, fuzzy, priority:220
#| msgid "Fetch updates for a named set of remotes in the repository as defined by remotes.<group>. If a named group is not specified on the command line, the configuration parameter remotes.default will get 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])."
-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])."
+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 "Holt Updates f체r eine genannte Sammlung von entfernten Repositories, die in remotes.<Gruppe> definiert wurden. Wenn eine genannte Gruppe nicht in der Kommandozeile angegeben wurden, wird der Parameter remotes.default verwendet; wenn remotes.default ebenfalls nicht gesetzt ist, werden alle entfernten Repositories, welche keinen Konfigurationsparameter remote.<Name>.skipDefaultUpdate auf true gesetzt haben, aktualisiert. (Siehe linkgit:git-config[1])."
#. type: Plain text
@@ -43837,9 +43561,7 @@ msgstr ""
#: en/git-reset.txt:301
#, no-wrap, priority:280
msgid "Keep changes in working tree while discarding some previous commits"
-msgstr ""
-"횆nderungen im Arbeitsbereich beibehalten, w채hrend einige fr체here Commits "
-"verworfen werden"
+msgstr "횆nderungen im Arbeitsbereich beibehalten, w채hrend einige fr체here Commits verworfen werden"
#. type: Plain text
#: en/git-reset.txt:308
@@ -45519,28 +45241,13 @@ msgstr ""
#: en/git-rm.txt:27
#, priority:280
msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
-msgstr ""
-"Entfernt Dateien, die mit der Pfadangabe 체bereinstimmen, aus dem Index oder "
-"aus dem Arbeitsbereich und dem Index. `git rm` wird eine Datei nicht allein "
-"aus dem Arbeitsverzeichnis entfernen. (Es gibt keine M철glichkeit, eine Datei "
-"nur aus dem Arbeitsbaum zu entfernen und sie dennoch im Index zu belassen; "
-"benutzen Sie `/bin/rm`, wenn Sie das tun wollen). Die Dateien, die entfernt "
-"werden sollen, m체ssen mit der Spitze des Branch identisch sein, und im Index "
-"k철nnen keine Aktualisierungen des Inhalts durchgef체hrt werden, obwohl dieses "
-"Standardverhalten mit der Option `-f` 체berschrieben werden kann. Wenn die "
-"Option `--cached` angegeben wird, muss der gestagte Inhalt entweder mit der "
-"Spitze des Branch oder mit der Datei auf der Festplatte 체bereinstimmen, "
-"sodass die Datei allein aus dem Index entfernt werden kann."
+msgstr "Entfernt Dateien, die mit der Pfadangabe 체bereinstimmen, aus dem Index oder aus dem Arbeitsbereich und dem Index. `git rm` wird eine Datei nicht allein aus dem Arbeitsverzeichnis entfernen. (Es gibt keine M철glichkeit, eine Datei nur aus dem Arbeitsbaum zu entfernen und sie dennoch im Index zu belassen; benutzen Sie `/bin/rm`, wenn Sie das tun wollen). Die Dateien, die entfernt werden sollen, m체ssen mit der Spitze des Branch identisch sein, und im Index k철nnen keine Aktualisierungen des Inhalts durchgef체hrt werden, obwohl dieses Standardverhalten mit der Option `-f` 체berschrieben werden kann. Wenn die Option `--cached` angegeben wird, muss der gestagte Inhalt entweder mit der Spitze des Branch oder mit der Datei auf der Festplatte 체bereinstimmen, sodass die Datei allein aus dem Index entfernt werden kann."
#. type: Plain text
#: en/git-rm.txt:36
#, priority:280
msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
-msgstr ""
-"Zu entfernende Dateien. Ein vorangestellter Verzeichnisname (z.B. `dir` zum "
-"Entfernen von `dir/file1` und `dir/file2`) kann angegeben werden, um alle "
-"Dateien im Verzeichnis und rekursiv alle Unterverzeichnisse zu entfernen, "
-"aber dies erfordert die explizite Angabe der Option `-r`."
+msgstr "Zu entfernende Dateien. Ein vorangestellter Verzeichnisname (z.B. `dir` zum Entfernen von `dir/file1` und `dir/file2`) kann angegeben werden, um alle Dateien im Verzeichnis und rekursiv alle Unterverzeichnisse zu entfernen, aber dies erfordert die explizite Angabe der Option `-r`."
#. type: Plain text
#: en/git-rm.txt:38
@@ -45552,11 +45259,7 @@ msgstr ""
#: en/git-rm.txt:43
#, priority:280
msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-"Dateisuchkriterien k철nnen Verzeichnis-체bergreifend verwendet werden. "
-"Demzufolge gibt es bei zwei Verzeichnissen `d` und `d2` einen Unterschied "
-"zwischen der Verwendung von `git rm 'd*'` und `git rm 'd/*'`, weil ersteres "
-"auch das gesamte Verzeichnis `d2` entfernt."
+msgstr "Dateisuchkriterien k철nnen Verzeichnis-체bergreifend verwendet werden. Demzufolge gibt es bei zwei Verzeichnissen `d` und `d2` einen Unterschied zwischen der Verwendung von `git rm 'd*'` und `git rm 'd/*'`, weil ersteres auch das gesamte Verzeichnis `d2` entfernt."
#. type: Plain text
#: en/git-rm.txt:49
@@ -45598,9 +45301,7 @@ msgstr "Der Befehl wird mit einem Fehlerwert von 0 beendet, selbst wenn keine Da
#: en/git-rm.txt:77
#, priority:280
msgid "`git rm` normally outputs one line (in the form of an `rm` command) for each file removed. This option suppresses that output."
-msgstr ""
-"`git rm` gibt f체r jede entfernte Datei normalerweise eine Zeile (in Form "
-"eines `rm` Befehls) aus. Diese Option unterdr체ckt diese Ausgabe."
+msgstr "`git rm` gibt f체r jede entfernte Datei normalerweise eine Zeile (in Form eines `rm` Befehls) aus. Diese Option unterdr체ckt diese Ausgabe."
#. type: Title -
#: en/git-rm.txt:93
@@ -45654,9 +45355,7 @@ msgstr ""
#: en/git-rm.txt:123
#, priority:280
msgid "and then untar the new code in the working tree. Alternately you could 'rsync' the changes into the working tree."
-msgstr ""
-"und dann den neuen Code im Arbeitsbereich entpacken. Alternativ k철nnten Sie "
-"die 횆nderungen in den Arbeitsbereich 'rsyncen'."
+msgstr "und dann den neuen Code im Arbeitsbereich entpacken. Alternativ k철nnten Sie die 횆nderungen in den Arbeitsbereich 'rsyncen'."
#. type: Plain text
#: en/git-rm.txt:126
@@ -45722,18 +45421,13 @@ msgstr "git rm Documentation/\\*.txt"
#: en/git-rm.txt:171
#, priority:280
msgid "Removes all `*.txt` files from the index that are under the `Documentation` directory and any of its subdirectories."
-msgstr ""
-"Entfernt alle `*.txt` Dateien aus dem Index die im `Documentation` "
-"Verzeichnis oder dessen Unterverzeichnissen liegen."
+msgstr "Entfernt alle `*.txt` Dateien aus dem Index die im `Documentation` Verzeichnis oder dessen Unterverzeichnissen liegen."
#. type: Plain text
#: en/git-rm.txt:175
#, priority:280
msgid "Note that the asterisk `*` is quoted from the shell in this example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory."
-msgstr ""
-"Beachten Sie, dass in diesem Beispiel das Sternchen `*` aus der Shell "
-"zitiert wird; das l채sst Git, und nicht die Shell, die Pfadnamen von Dateien "
-"und Unterverzeichnissen unter dem Verzeichnis `Dokumentation/` erweitern."
+msgstr "Beachten Sie, dass in diesem Beispiel das Sternchen `*` aus der Shell zitiert wird; das l채sst Git, und nicht die Shell, die Pfadnamen von Dateien und Unterverzeichnissen unter dem Verzeichnis `Dokumentation/` erweitern."
#. type: Labeled list
#: en/git-rm.txt:176
@@ -47378,7 +47072,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr "Beachten Sie, dass git pull mit dem aktuellen Zweig zusammenf체hrt, egal was als Argument angegeben wird."
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -47390,7 +47084,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -48860,9 +48554,7 @@ msgstr "Zeige auch ignorierte Dateien an."
#: en/git-status.txt:108
#, priority:280
msgid "The mode parameter is used to specify the handling of ignored files. It is optional: it defaults to 'traditional'."
-msgstr ""
-"Der Modus-Parameter wird verwendet, um die Handhabung von ignorierten "
-"Dateien zu bestimmen. Er ist optional und voreingestellt auf 'traditional'."
+msgstr "Der Modus-Parameter wird verwendet, um die Handhabung von ignorierten Dateien zu bestimmen. Er ist optional und voreingestellt auf 'traditional'."
#. type: Plain text
#: en/git-status.txt:112
@@ -49365,10 +49057,7 @@ msgstr ""
#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
-msgstr ""
-"Wenn die Konfigurationsvariable `status.relativePaths` auf �엂alse�� gesetzt "
-"ist, dann bezieht sich die Anzeige aller Pfade auf die Wurzel des "
-"Repositorys, nicht auf das aktuelle Verzeichnis."
+msgstr "Wenn die Konfigurationsvariable `status.relativePaths` auf �엂alse�� gesetzt ist, dann bezieht sich die Anzeige aller Pfade auf die Wurzel des Repositorys, nicht auf das aktuelle Verzeichnis."
#. type: Plain text
#: en/git-status.txt:423
@@ -50841,7 +50530,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr "git config --get-all svn-remote.<Name>.commiturl"
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -53936,8 +53625,8 @@ msgstr ""
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
-# noqa
#. type: Plain text
+# noqa
#: en/git.txt:495
#, 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..."
@@ -53946,8 +53635,8 @@ msgstr "Wenn diese Variable einen Pfad enth채lt, werden nicht-Arbeitsverzeichnis
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -62180,7 +61869,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -62432,7 +62121,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -62928,31 +62617,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -62964,43 +62659,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -63008,91 +62703,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -63101,439 +62796,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr "--date=<Format>"
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -63544,19 +63239,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -63568,85 +63263,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
@@ -63982,11 +63677,7 @@ msgstr "'git clone', 'git fetch' und 'git pull', aber nicht 'git push', akzeptie
#: 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 'Remote-<Transport>'-Hilfsprogramm zu benutzen, falls "
-"es eines gibt. Um ein Remote-Hilfsprogramm explizit anzufordern, kann die "
-"folgende Syntax verwendet werden:"
+msgstr "Wenn Git nicht versteht, wie ein bestimmtes Transportprotokoll zu verwenden ist, versucht es, das 'Remote-<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
@@ -64070,10 +63761,7 @@ msgstr ""
#: 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 Pushes in "
-"�엜sh://example.org/path/to/repo.git�� umgeschrieben, aber Pulls verwenden "
-"weiterhin die Original-URL."
+msgstr "eine URL wie �엃it://example.org/path/to/repo.git�� wird f체r Pushes in �엜sh://example.org/path/to/repo.git�� umgeschrieben, aber Pulls verwenden weiterhin die Original-URL."
#. type: Title =
#: en/git-bisect-lk2009.txt:2
diff --git a/po/documentation.es.po b/po/documentation.es.po
index 1e0e3d7..100f078 100644
--- a/po/documentation.es.po
+++ b/po/documentation.es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2020-04-28 14:59+0000\n"
"Last-Translator: Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -91,7 +91,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -315,143 +315,155 @@ msgstr "Mostrar qu챕 revisi처n y autor modificaron al 첬ltimo cada l챠nea de un
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, fuzzy, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr "Contar n첬mero de objetos no empaquetados y su consumo en disco"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, fuzzy, priority:100
msgid "Show changes using common diff tools."
msgstr "Mostrar cambios usando herramientas de diff comunes"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, fuzzy, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr "Verifica la conectividad y disponibilidad de los objetos en la base de datos"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, fuzzy, priority:100
msgid "Display help information about Git."
msgstr "Mostrar informaci처n sobre Git"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, fuzzy, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr "Buscar instant찼neamente tu repositorio de trabajo en gitweb"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, fuzzy, priority:100
msgid "Show three-way merge without touching index."
msgstr "Mostrar fusi처n de tres v챠as sin tocar el 챠ndice"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, fuzzy, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr "Reutilizar la resoluci처n registrada de fusiones conflictivas"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, fuzzy, priority:100
msgid "Show branches and their commits."
msgstr "Mostrar ramas y sus commits"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, fuzzy, priority:100
msgid "Check the GPG signature of commits."
msgstr "Verificar firma GPG de commits"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, fuzzy, priority:100
msgid "Check the GPG signature of tags."
msgstr "Verifica la firma GPG de etiquetas"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, fuzzy, priority:100
msgid "Show logs with difference each commit introduces."
msgstr "Muestra logs con las diferencias que cada commit introduce"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, fuzzy, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr "Interfaz web Git (interfaz web para repositorios Git)"
@@ -1119,83 +1131,95 @@ msgstr "Muestra varios tipos de objetos"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, fuzzy, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr "Poner en un stash los cambios en un directorio de trabajo sucio de todas maneras"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, fuzzy, priority:100
msgid "Show the working tree status."
msgstr "Muestra el estado del 찼rbol de trabajo"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, fuzzy, priority:100
msgid "Initialize, update or inspect submodules."
msgstr "Inicializa, actualiza o inspecciona subm처dulos"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, fuzzy, priority:100
msgid "Switch branches."
msgstr "Cambiar branches"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, fuzzy, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, fuzzy, priority:100
msgid "Manage multiple working trees."
msgstr "Gestiona m첬ltiples 찼rboles de trabajo"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, fuzzy, priority:100
msgid "The Git repository browser."
msgstr "El navegador de repositorio Git"
@@ -2784,11 +2808,11 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 ""
@@ -6486,7 +6510,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6516,7 +6540,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6764,7 +6788,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7097,7 +7121,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9868,7 +9892,7 @@ msgstr "--git-format"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13620,7 +13644,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -18890,7 +18914,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19538,13 +19562,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27002,7 +27026,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27018,7 +27042,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29077,7 +29101,7 @@ msgstr "git-init: crear un repositorio de Git vac챠o o reinicializar uno ya exis
#, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
@@ -35502,7 +35526,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35724,7 +35748,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35736,13 +35760,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35754,7 +35778,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35766,7 +35790,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -41255,7 +41279,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41278,7 +41302,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41296,7 +41320,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41404,13 +41428,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41428,7 +41452,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41536,7 +41560,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41548,7 +41572,7 @@ msgstr "update"
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46449,7 +46473,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46461,7 +46485,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49883,7 +49907,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -52947,8 +52971,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61128,7 +61152,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61380,7 +61404,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -61876,31 +61900,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -61912,43 +61942,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -61956,91 +61986,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62049,439 +62079,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62492,19 +62522,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62516,85 +62546,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index b9658d5..3ff9d59 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2019-10-05 21:56+0000\n"
"Last-Translator: Far찼ndula <farandula@versoblanco.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -89,7 +89,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -315,143 +315,155 @@ msgstr "Mostrar qu챕 revisi처n y autor modificaron al 첬ltimo cada l챠nea de un
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, fuzzy, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr "Contar n첬mero de objetos no empaquetados y su consumo en disco"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, fuzzy, priority:100
msgid "Show changes using common diff tools."
msgstr "Mostrar cambios usando herramientas de diff comunes"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, fuzzy, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr "Verifica la conectividad y disponibilidad de los objetos en la base de datos"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, fuzzy, priority:100
msgid "Display help information about Git."
msgstr "Mostrar informaci처n sobre Git"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, fuzzy, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr "Buscar instant찼neamente tu repositorio de trabajo en gitweb"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, fuzzy, priority:100
msgid "Show three-way merge without touching index."
msgstr "Mostrar fusi처n de tres v챠as sin tocar el 챠ndice"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, fuzzy, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr "Reutilizar la resoluci처n registrada de fusiones conflictivas"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, fuzzy, priority:100
msgid "Show branches and their commits."
msgstr "Mostrar ramas y sus commits"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, fuzzy, priority:100
msgid "Check the GPG signature of commits."
msgstr "Verificar firma GPG de commits"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, fuzzy, priority:100
msgid "Check the GPG signature of tags."
msgstr "Verifica la firma GPG de etiquetas"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, fuzzy, priority:100
msgid "Show logs with difference each commit introduces."
msgstr "Muestra logs con las diferencias que cada commit introduce"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, fuzzy, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr "Interfaz web Git (interfaz web para repositorios Git)"
@@ -1119,83 +1131,95 @@ msgstr "Muestra varios tipos de objetos"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, fuzzy, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr "Poner en un stash los cambios en un directorio de trabajo sucio de todas maneras"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, fuzzy, priority:100
msgid "Show the working tree status."
msgstr "Muestra el estado del 찼rbol de trabajo"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, fuzzy, priority:100
msgid "Initialize, update or inspect submodules."
msgstr "Inicializa, actualiza o inspecciona subm처dulos"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, fuzzy, priority:100
msgid "Switch branches."
msgstr "Reescribir ramas"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, fuzzy, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, fuzzy, priority:100
msgid "Manage multiple working trees."
msgstr "Gestiona m첬ltiples 찼rboles de trabajo"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, fuzzy, priority:100
msgid "The Git repository browser."
msgstr "El navegador de repositorio Git"
@@ -2784,11 +2808,11 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 ""
@@ -6496,7 +6520,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6526,7 +6550,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6774,7 +6798,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7107,7 +7131,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9878,7 +9902,7 @@ msgstr "--git-format"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13631,7 +13655,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -18901,7 +18925,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19549,13 +19573,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27017,7 +27041,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27033,7 +27057,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29092,7 +29116,7 @@ msgstr "Crea un repositorio de Git vac챠o o reinicia el que ya existe"
#, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
@@ -35517,7 +35541,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35739,7 +35763,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35751,13 +35775,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35769,7 +35793,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35781,7 +35805,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -41271,7 +41295,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41294,7 +41318,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41312,7 +41336,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41420,13 +41444,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41444,7 +41468,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41552,7 +41576,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41564,7 +41588,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46467,7 +46491,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46479,7 +46503,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49903,7 +49927,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -52969,8 +52993,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61171,7 +61195,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61423,7 +61447,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -61919,31 +61943,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -61955,43 +61985,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -61999,91 +62029,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62092,439 +62122,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62535,19 +62565,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62559,85 +62589,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 7b570a8..d922724 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2020-05-24 21:41+0000\n"
"Last-Translator: Jean-No챘l Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-No챘l Avila <jn.avila@free.fr>\n"
@@ -90,7 +90,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -314,143 +314,155 @@ msgstr "Montrer la r챕vision et l'auteur qui ont modifi챕 en dernier chaque lign
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr "Compter le nombre non-empaquet챕 d'objets et leur consommation d'espace disque."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr "Afficher les modifications en utilisant les outils habituels de diff."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr "V챕rifie la connectivit챕 et la validit챕 des objets en base de donn챕es."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr "Afficher l'information d'aide 횪 propos de Git."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr "Naviguer instantan챕ment votre d챕p척t de travail dans gitweb."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr "Afficher la fusion 횪 trois points sans modifier l'index."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr "R챕utiliser une r챕solution enregistr챕e de fusions conflictuelles."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr "Afficher les branches et leurs commits."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr "V챕rifier la signature GPG de commits."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr "V챕rifier la signature GPG d'챕tiquettes."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr "Afficher les journaux avec la diff챕rence que chaque commit introduit."
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr "Interface web de Git (frontal web vers les d챕p척ts Git)."
@@ -1118,83 +1130,95 @@ msgstr "Afficher diff챕rents types d'objets."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr "Remiser les modifications d'un r챕pertoire de travail sale."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr "Afficher l'챕tat de l'arbre de travail."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr "Initialiser, mettre 횪 jour et inspecter les sous-modules."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Switch branches."
msgstr "Basculer de branche."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr "Cr챕er, lister, supprimer ou v챕rifier un objet d'챕tiquette sign챕 avec GPG."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr "G챕rer des arbres de travail multiples."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr "Le navigateur de d챕p척t Git."
@@ -2628,15 +2652,7 @@ msgstr "merge.autoStash"
#: en/config/merge.txt:82
#, priority:240
msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run merge on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts. This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1]. Defaults to false."
-msgstr ""
-"Lorsque r챕gl챕 sur true, cr챕er automatiquement une entr챕e temporaire de "
-"remisage avant le d챕but de l'op챕ration, et l'appliquer apr챔s la fin de "
-"l'op챕ration. Cela signifie que vous pouvez ex챕cuter la fusion sur un arbre "
-"de travail sale. Cependant, 횪 utiliser avec pr챕caution : l'application "
-"finale du remisage apr챔s une fusion r챕ussie peut entra챤ner des conflits non "
-"n챕gligeables. Cette option peut 챗tre remplac챕e par les options `--no-"
-"autostash` et `--autostash` de linkgit:git-merge[1]. La valeur par d챕faut "
-"est false."
+msgstr "Lorsque r챕gl챕 sur true, cr챕er automatiquement une entr챕e temporaire de remisage avant le d챕but de l'op챕ration, et l'appliquer apr챔s la fin de l'op챕ration. Cela signifie que vous pouvez ex챕cuter la fusion sur un arbre de travail sale. Cependant, 횪 utiliser avec pr챕caution : l'application finale du remisage apr챔s une fusion r챕ussie peut entra챤ner des conflits non n챕gligeables. Cette option peut 챗tre remplac챕e par les options `--no-autostash` et `--autostash` de linkgit:git-merge[1]. La valeur par d챕faut est false."
#. type: Labeled list
#: en/config/merge.txt:83
@@ -2790,17 +2806,13 @@ msgstr "ISO 8601"
#. type: Plain text
#: en/date-formats.txt:26
-#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
-msgstr ""
-"Les heures et les dates sont sp챕cifi챕es par le standard ISO 8601, par "
-"exemple `2005-04-07T22:13:13`. L'analyseur accepte aussi un espace au lieu "
-"du caract챔re `T`. Les parties fractionnelles d'une seconde seront ignor챕es, "
-"par exemple, `2005-04-07T22:13:13.019` sera consid챕r챕 comme 챕tant "
-"`2005-04-07T22:13:13`"
+#, fuzzy, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
+msgstr "Les heures et les dates sont sp챕cifi챕es par le standard ISO 8601, par exemple `2005-04-07T22:13:13`. L'analyseur accepte aussi un espace au lieu du caract챔re `T`. Les parties fractionnelles d'une seconde seront ignor챕es, par exemple, `2005-04-07T22:13:13.019` sera consid챕r챕 comme 챕tant `2005-04-07T22:13:13`"
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 "De plus, la partie date est accept챕e dans les formats suivants혻: `AAAA.MM.JJ`, `MM/JJ/AAAA` et `JJ.MM.AAAA`."
@@ -5540,29 +5552,8 @@ msgstr "--recurse-submodules[=yes|on-demand|no]"
#. type: Plain text
#: en/fetch-options.txt:168
#, 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. By default, 'on-demand' is used, unless `fetch."
-"recurseSubmodules` is set (see linkgit:git-config[1])."
-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. Par d챕faut, 'on-demand' est utilis챕 "
-"횪 moins que `fetch.recurseSubmodules` ne soit param챕tr챕 (voir linkgit:git-"
-"config[1])."
+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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
+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. Par d챕faut, 'on-demand' est utilis챕 횪 moins que `fetch.recurseSubmodules` ne soit param챕tr챕 (voir linkgit:git-config[1])."
#. type: Labeled list
#: en/fetch-options.txt:170
@@ -6647,7 +6638,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr "Avec `--keep-cr`, appeler 'git mailsplit' (voir linkgit:git-mailsplit[1]) avec la m챗me option, pour l'emp챗cher de supprimer les CR en fin de ligne. La variable de configuration `am.keepcr` peut 챗tre utilis챕e pour sp챕cifier le comportement par d챕faut. `--no-keep-cr` permet de surcharger `am.keepcr`."
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6677,7 +6668,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr "Ignorer les lignes ciseaux (voir linkgit:git-mailinfo[1])."
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6918,12 +6909,7 @@ msgstr "--no-gpg-sign"
#: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:357 en/git-rebase.txt:395 en/git-revert.txt:99
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`."
-msgstr ""
-"Signer les commits avec GPG. L'argument `idcl챕` est optionnel avec par "
-"d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit 챗tre coll챕e 횪 "
-"l'option sans aucun espace. `--no-gpg-sign` est utile pour annuler l'effet "
-"de la variable de configuration `commit.gpgSign` ainsi que tout `--gpg-sign` "
-"pr챕c챕dent."
+msgstr "Signer les commits avec GPG. L'argument `idcl챕` est optionnel avec par d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit 챗tre coll챕e 횪 l'option sans aucun espace. `--no-gpg-sign` est utile pour annuler l'effet de la variable de configuration `commit.gpgSign` ainsi que tout `--gpg-sign` pr챕c챕dent."
#. type: Labeled list
#: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:246 en/sequencer.txt:1
@@ -6932,7 +6918,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7264,7 +7250,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9360,10 +9346,7 @@ msgstr "Les options `-c` et `-C` ont exactement la m챗me s챕mantique que `-m` et
#: en/git-branch.txt:87
#, priority:240
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
-msgstr ""
-"Avec une option `-d` ou `-D`, `<branchname>` sera supprim챕. Vous pouvez "
-"sp챕cifier plus d'une branche pour la suppression. Si la branche a "
-"actuellement un reflog, alors le reflog sera aussi supprim챕."
+msgstr "Avec une option `-d` ou `-D`, `<branchname>` sera supprim챕. Vous pouvez sp챕cifier plus d'une branche pour la suppression. Si la branche a actuellement un reflog, alors le reflog sera aussi supprim챕."
#. type: Plain text
#: en/git-branch.txt:93
@@ -10060,7 +10043,7 @@ msgstr "--suffix <format>"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -12157,14 +12140,7 @@ msgstr "--recurse-submodules"
#: en/git-checkout.txt:302
#, priority:240
msgid "Using `--recurse-submodules` will update the content of all active 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, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule."
-msgstr ""
-"L'utilisation de `--recurse-submodules` permet de mettre 횪 jour le contenu "
-"de tous les sous-modules actifs en fonction du commit enregistr챕 dans le "
-"super-projet. Si des modifications locales au sous-modules seraient "
-"챕cras챕es, l'extraction 챕choue 횪 moins d'utiliser `-f`. Si l'option n'est pas "
-"sp챕cifi챕e (ou si `--no-recurse-submodules` est sp챕cifi챕), les arbres de "
-"travail des sous-modules ne sont pas mis 횪 jour. Comme linkgit:git-"
-"submodule[1], la `HEAD` des sous-modules sera d챕tach챕e."
+msgstr "L'utilisation de `--recurse-submodules` permet de mettre 횪 jour le contenu de tous les sous-modules actifs en fonction du commit enregistr챕 dans le super-projet. Si des modifications locales au sous-modules seraient 챕cras챕es, l'extraction 챕choue 횪 moins d'utiliser `-f`. Si l'option n'est pas sp챕cifi챕e (ou si `--no-recurse-submodules` est sp챕cifi챕), les arbres de travail des sous-modules ne sont pas mis 횪 jour. Comme linkgit:git-submodule[1], la `HEAD` des sous-modules sera d챕tach챕e."
#. type: Labeled list
#: en/git-checkout.txt:303 en/git-restore.txt:118
@@ -13919,7 +13895,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr "Initialiser le fichier d'extraction partielle pour que le r챕pertoire de travail ne commence qu'avec les fichiers de la racine du d챕p척t. Le fichier d'extraction partielle peut 챗tre modifi챕 pour agrandir le r챕pertoire de travail selon les besoins."
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr "--filter=<sp챕c. du filtre>"
@@ -13928,15 +13904,7 @@ msgstr "--filter=<sp챕c. du filtre>"
#: en/git-clone.txt:175
#, priority:300
msgid "Use the partial clone feature and request that the server sends a subset of reachable objects according to a given object filter. When using `--filter`, the supplied `<filter-spec>` is used for the partial clone filter. For example, `--filter=blob:none` will filter out all blobs (file contents) until needed by Git. Also, `--filter=blob:limit=<size>` will filter out all blobs of size at least `<size>`. For more details on filter specifications, see the `--filter` option in linkgit:git-rev-list[1]."
-msgstr ""
-"Utiliser la fonction de clonage partiel et demander que le serveur envoie un "
-"sous-ensemble d'objets accessibles selon un filtre d'objets donn챕. Lorsque "
-"l'on utilise `--filter`, le `<sp챕c-de-filtre>` fourni est utilis챕 pour le "
-"filtre de clonage partiel. Par exemple, `--filter=blob:none` filtrera tous "
-"les blobs (contenu des fichiers) jusqu'횪 ce que Git en ait besoin. De m챗me, "
-"`--filter=blob:limit=<taille>` filtrera tous les blobs de taille au moins "
-"챕gale 횪 `<taille>`. Pour plus de d챕tails sur les sp챕cifications de filtre, "
-"voir l'option `--filter` dans linkgit:git-rev-list[1]."
+msgstr "Utiliser la fonction de clonage partiel et demander que le serveur envoie un sous-ensemble d'objets accessibles selon un filtre d'objets donn챕. Lorsque l'on utilise `--filter`, le `<sp챕c-de-filtre>` fourni est utilis챕 pour le filtre de clonage partiel. Par exemple, `--filter=blob:none` filtrera tous les blobs (contenu des fichiers) jusqu'횪 ce que Git en ait besoin. De m챗me, `--filter=blob:limit=<taille>` filtrera tous les blobs de taille au moins 챕gale 횪 `<taille>`. Pour plus de d챕tails sur les sp챕cifications de filtre, voir l'option `--filter` dans linkgit:git-rev-list[1]."
#. type: Labeled list
#: en/git-clone.txt:176 en/git-push.txt:161
@@ -14514,12 +14482,7 @@ msgstr "Lire le message de validation depuis le fichier indiqu챕. Utilisez '-' p
#: en/git-commit-tree.txt:69
#, priority:100
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand a `--gpg-sign` option given earlier on the command line."
-msgstr ""
-"Signer les commits avec GPG. L'argument `idcl챕` est optionnel avec par "
-"d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit 챗tre coll챕e 횪 "
-"l'option sans aucun espace. `--no-gpg-sign` est utile pour annuler l'effet "
-"de la variable de configuration `commit.gpgSign` ainsi que tout `--gpg-sign` "
-"pr챕c챕dent."
+msgstr "Signer les commits avec GPG. L'argument `idcl챕` est optionnel avec par d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit 챗tre coll챕e 횪 l'option sans aucun espace. `--no-gpg-sign` est utile pour annuler l'effet de la variable de configuration `commit.gpgSign` ainsi que tout `--gpg-sign` pr챕c챕dent."
#. type: Title -
#: en/git-commit-tree.txt:71
@@ -19260,7 +19223,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr "Par d챕faut, la diff챕rence est calcul챕e contre notre branche (-2) et les chemins r챕solus proprement. L'option -0 peut 챗tre fournie pour omettre la sortie pour les entr챕es non fusionn챕es et afficher juste 짬혻non fusionn챕혻쨩."
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19908,13 +19871,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr "Cet indicateur fait en sorte que les diffs combin챕s (utilis챕s pour les commits de fusion) listent le nom du fichier de tous les parents. Il n'a donc d'effet que lorsque -c ou --cc sont sp챕cifi챕s, et n'est probablement utile que si des changements de nom de fichier sont d챕tect챕s (c.-횪-d. lorsque la d챕tection de renommage ou de copie a 챕t챕 demand챕e)."
@@ -27413,13 +27376,10 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
-#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
-msgstr ""
-"Utiliser \\ 0 comme d챕limiteur pour les noms de chemin dans la sortie et les "
-"afficher verbatim. Sans cette option, les noms de chemin avec des caract챔res "
-"짬혻inhabituels혻쨩 sont cit챕s comme expliqu챕 pour la variable de configuration "
-"core.quotePath (voir linkgit:git-config[1])."
+#, fuzzy, priority:100
+#| msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgstr "Utiliser \\ 0 comme d챕limiteur pour les noms de chemin dans la sortie et les afficher verbatim. Sans cette option, les noms de chemin avec des caract챔res 짬혻inhabituels혻쨩 sont cit챕s comme expliqu챕 pour la variable de configuration core.quotePath (voir linkgit:git-config[1])."
#. type: Labeled list
#: en/git-grep.txt:215
@@ -27434,7 +27394,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29490,10 +29450,14 @@ msgstr "git-init - Cr챕e un d챕p척t Git vide ou r챕initialise un d챕p척t existan
#. type: Plain text
#: en/git-init.txt:15
-#, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:300
+#| msgid ""
+#| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
+#| "\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+#| "\t [--shared[=<permissions>]] [directory]\n"
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
"'git init' [-q | --quiet] [--bare] [--template=<r챕pertoire_mod챔le>]\n"
@@ -29546,10 +29510,7 @@ msgstr "--object-format=<format>"
#: en/git-init.txt:55
#, priority:300
msgid "Specify the given object format (hash algorithm) for the repository. The valid values are 'sha1' and (if enabled) 'sha256'. 'sha1' is the default."
-msgstr ""
-"Sp챕cifier le format d'objet donn챕 (algorithme d'empreinte) pour le d챕p척t. "
-"Les valeurs valides sont 'sha1' et (si activ챕) 'sha256'. 'sha1' est la "
-"valeur par d챕faut."
+msgstr "Sp챕cifier le format d'objet donn챕 (algorithme d'empreinte) pour le d챕p척t. Les valeurs valides sont 'sha1' et (si activ챕) 'sha256'. 'sha1' est la valeur par d챕faut."
#. type: Plain text
#: en/git-init.txt:60
@@ -30650,14 +30611,7 @@ msgstr "--decorate-refs-exclude=<motif>"
#: en/git-log.txt:50
#, priority:260
msgid "If no `--decorate-refs` is given, pretend as if all refs were included. For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
-msgstr ""
-"Si aucun `--decorate-refs' n'est donn챕, faire comme si tous les refs 챕taient "
-"inclus. Pour chaque candidat, ne pas l'utiliser pour la d챕coration s'il "
-"correspond 횪 un motif fourni 횪 `--decorate-refs-exclude' ou s'il ne "
-"correspond 횪 aucun des motifs fournis 횪 `--decorate-refs'. L'option de "
-"configuration `log.excludeDecoration` permet d'exclure les r챕f챕rences des "
-"d챕corations, mais un motif explicite `--decorate-refs` remplacera une "
-"correspondance dans `log.excludeDecoration`."
+msgstr "Si aucun `--decorate-refs' n'est donn챕, faire comme si tous les refs 챕taient inclus. Pour chaque candidat, ne pas l'utiliser pour la d챕coration s'il correspond 횪 un motif fourni 횪 `--decorate-refs-exclude' ou s'il ne correspond 횪 aucun des motifs fournis 횪 `--decorate-refs'. L'option de configuration `log.excludeDecoration` permet d'exclure les r챕f챕rences des d챕corations, mais un motif explicite `--decorate-refs` remplacera une correspondance dans `log.excludeDecoration`."
#. type: Labeled list
#: en/git-log.txt:51
@@ -33066,10 +33020,7 @@ msgstr "횋craser silencieusement les fichiers ignor챕s du r챕sultat de la fusion
#: en/git-merge.txt:99
#, priority:240
msgid "Abort the current conflict resolution process, and try to reconstruct the pre-merge state. If an autostash entry is present, apply it to the worktree."
-msgstr ""
-"Abandonner le processus actuel de r챕solution des conflits, et essayer de "
-"reconstruire l'챕tat ant챕rieur 횪 la fusion. Si une entr챕e de remisage "
-"automatique est pr챕sente, l'appliquer 횪 l'arbre de travail."
+msgstr "Abandonner le processus actuel de r챕solution des conflits, et essayer de reconstruire l'챕tat ant챕rieur 횪 la fusion. Si une entr챕e de remisage automatique est pr챕sente, l'appliquer 횪 l'arbre de travail."
#. type: Plain text
#: en/git-merge.txt:104
@@ -33081,21 +33032,13 @@ msgstr "S'il y avait des modifications non valid챕es dans l'arbre de travail lor
#: en/git-merge.txt:110
#, priority:240
msgid "'git merge --abort' is equivalent to 'git reset --merge' when `MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in which case 'git merge --abort' applies the stash entry to the worktree whereas 'git reset --merge' will save the stashed changes in the stash list."
-msgstr ""
-"'git merge --abort' est 챕quivalent 횪 'git reset --merge' quand `MERGE_HEAD` "
-"est pr챕sent 횪 moins que `MERGE_AUTOSTASH` soit 챕galement pr챕sent, auquel cas "
-"'git merge --abort' applique l'entr챕e de la remisage 횪 l'arbre de travail "
-"alors que 'git reset --merge' sauvegardera les changements remis챕s dans la "
-"liste de remisage."
+msgstr "'git merge --abort' est 챕quivalent 횪 'git reset --merge' quand `MERGE_HEAD` est pr챕sent 횪 moins que `MERGE_AUTOSTASH` soit 챕galement pr챕sent, auquel cas 'git merge --abort' applique l'entr챕e de la remisage 횪 l'arbre de travail alors que 'git reset --merge' sauvegardera les changements remis챕s dans la liste de remisage."
#. type: Plain text
#: en/git-merge.txt:115
#, priority:240
msgid "Forget about the current merge in progress. Leave the index and the working tree as-is. If `MERGE_AUTOSTASH` is present, the stash entry will be saved to the stash list."
-msgstr ""
-"Oublier la fusion en cours. Laisser l'index et l'arbre de travail en l'梳퓍at. "
-"Si `MERGE_AUTOSTASH` est pr챕sent, l'entr챕e de la remisage sera sauvegard챕e "
-"dans la liste des remisages."
+msgstr "Oublier la fusion en cours. Laisser l'index et l'arbre de travail en l'梳퓍at. Si `MERGE_AUTOSTASH` est pr챕sent, l'entr챕e de la remisage sera sauvegard챕e dans la liste des remisages."
#. type: Plain text
#: en/git-merge.txt:120
@@ -35998,7 +35941,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -36220,7 +36163,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -36232,13 +36175,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr "--missing=<action-manquante>"
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr "Une option de d챕bogage pour aider au d챕veloppement futur de \"clones partiels\". Cette option sp챕cifie comment les objets manquants sont trait챕s."
@@ -36250,7 +36193,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr "La forme '--missing=allow-any' permet de continuer le parcours d'objet si un objet manquant est rencontr챕. Les objets manquants seront silencieusement omis des r챕sultats."
@@ -36262,7 +36205,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -36948,11 +36891,7 @@ msgstr "--[no-]recurse-submodules[=yes|on-demand|no]"
#: en/git-pull.txt:92
#, priority:220
msgid "This option controls if new commits of populated submodules should be fetched, and if the working trees of active submodules should be updated, too (see linkgit:git-fetch[1], linkgit:git-config[1] and linkgit:gitmodules[5])."
-msgstr ""
-"Cette option contr척le si les nouveaux commits des sous-modules peupl챕s "
-"doivent 챗tre r챕cup챕r챕s et si les arbres de travail des sous-modules actifs "
-"devraient 챗tre aussi mis 횪 jour (voir linkgit:git-fetch[1], linkgit:git-"
-"config[1] et linkgit:gitmodules[5])."
+msgstr "Cette option contr척le si les nouveaux commits des sous-modules peupl챕s doivent 챗tre r챕cup챕r챕s et si les arbres de travail des sous-modules actifs devraient 챗tre aussi mis 횪 jour (voir linkgit:git-fetch[1], linkgit:git-config[1] et linkgit:gitmodules[5])."
#. type: Plain text
#: en/git-pull.txt:94
@@ -37148,10 +37087,7 @@ msgstr "$ git pull origin next\n"
#: en/git-pull.txt:227
#, priority:220
msgid "This leaves a copy of `next` temporarily in FETCH_HEAD, and updates the remote-tracking branch `origin/next`. The same can be done by invoking fetch and merge:"
-msgstr ""
-"Cela laisse une copie de `next` temporairement dans FETCH_HEAD, et met pas 횪 "
-"jour la branche de suivi 횪 distance `origin/next`. La m챗me chose peut 챗tre "
-"faite en invoquant fetch et merge :"
+msgstr "Cela laisse une copie de `next` temporairement dans FETCH_HEAD, et met pas 횪 jour la branche de suivi 횪 distance `origin/next`. La m챗me chose peut 챗tre faite en invoquant fetch et merge :"
#. type: delimited block -
#: en/git-pull.txt:231
@@ -37665,22 +37601,7 @@ msgstr "--recurse-submodules=check|on-demand|only|no"
#: en/git-push.txt:392
#, priority:220
msgid "May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If 'check' is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If 'on-demand' is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If 'only' is used all submodules will be recursively pushed while the superproject is left unpushed. A value of 'no' or using `--no-recurse-submodules` can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required."
-msgstr ""
-"Peut 챗tre utilis챕 pour s'assurer que tous les commits de sous-module "
-"utilis챕s par les r챕visions 횪 pousser sont disponibles sur une branche de "
-"suivi 횪 distance. Si 'check' est utilis챕, Git v챕rifiera que tous les "
-"commits de sous-module qui ont chang챕 dans les r챕visions 횪 pousser sont "
-"disponibles sur au moins une branche distante du sous-module. S'il manque "
-"des validations, la pouss챕e sera interrompue et sortira avec un statut non "
-"nul. Si 'on-demand' est utilis챕, tous les sous-module qui ont 챕t챕 modifi챕s "
-"dans les r챕visions 횪 pousser seront pouss챕s. Si 'on-demand' n'a pas pu "
-"pousser toutes les r챕visions n챕cessaires, il sera 챕galement interrompu et "
-"sortira avec un statut non nul. Si 'only' est utilis챕, tous les sous-modules "
-"seront pouss챕s r챕cursivement alors que le superprojet est laiss챕 sans "
-"pouss챕e. La valeur 'no' ou l'utilisation de `--no-recurse-submodules` peut "
-"챗tre utilis챕e pour remplacer la variable de configuration "
-"push.recurseSubmodules lorsqu'aucune r챕cursion de sous-module n'est "
-"n챕cessaire."
+msgstr "Peut 챗tre utilis챕 pour s'assurer que tous les commits de sous-module utilis챕s par les r챕visions 횪 pousser sont disponibles sur une branche de suivi 횪 distance. Si 'check' est utilis챕, Git v챕rifiera que tous les commits de sous-module qui ont chang챕 dans les r챕visions 횪 pousser sont disponibles sur au moins une branche distante du sous-module. S'il manque des validations, la pouss챕e sera interrompue et sortira avec un statut non nul. Si 'on-demand' est utilis챕, tous les sous-module qui ont 챕t챕 modifi챕s dans les r챕visions 횪 pousser seront pouss챕s. Si 'on-demand' n'a pas pu pousser toutes les r챕visions n챕cessaires, il sera 챕galement interrompu et sortira avec un statut non nul. Si 'only' est utilis챕, tous les sous-modules seront pouss챕s r챕cursivement alors que le superprojet est laiss챕 sans pouss챕e. La valeur 'no' ou l'utilisation de `--no-recurse-submodules` peut 챗tre utilis챕e pour remplacer la variable de configuration push.recurseSubmodules lorsqu'aucune r챕cursion de sous-module n'est n챕cessaire."
#. type: Labeled list
#: en/git-push.txt:393
@@ -37692,28 +37613,19 @@ msgstr "--[no-]verify"
#: en/git-push.txt:397
#, 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 ""
-"Basculer le crochet de pr챕-pouss챕e 'pre-push' (voir linkgit:githooks[5]). "
-"La valeur par d챕faut est --verify, ce qui donne au crochet une chance "
-"d'emp챗cher la pouss챕e. Avec --no-verify, le crochet est compl챔tement "
-"contourn챕."
+msgstr "Basculer le crochet de pr챕-pouss챕e 'pre-push' (voir linkgit:githooks[5]). La valeur par d챕faut est --verify, ce qui donne au crochet une chance d'emp챗cher la pouss챕e. Avec --no-verify, le crochet est compl챔tement contourn챕."
#. type: Plain text
#: en/git-push.txt:414
#, priority:220
msgid "The output of \"git push\" depends on the transport method used; this section describes the output when pushing over the Git protocol (either locally or via ssh)."
-msgstr ""
-"La sortie de \"git push\" d챕pend de la m챕thode de transport utilis챕e ; cette "
-"section d챕crit la sortie lors du passage par protocole Git (soit localement "
-"soit via ssh)."
+msgstr "La sortie de \"git push\" d챕pend de la m챕thode de transport utilis챕e ; cette section d챕crit la sortie lors du passage par protocole Git (soit localement soit via ssh)."
#. type: Plain text
#: en/git-push.txt:417
#, priority:220
msgid "The status of the push 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 pouss챕e est affich챕 sous forme de tableau, chaque ligne "
-"repr챕sentant l'챕tat d'une seule r챕f챕rence. Chaque ligne est de la forme :"
+msgstr "L'챕tat de la pouss챕e 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-push.txt:420
@@ -37725,8 +37637,7 @@ msgstr " <drapeau> <r챕sum챕> <de> -> <횪> (<raison>)\n"
#: en/git-push.txt:423
#, priority:220
msgid "If --porcelain is used, then each line of the output is of the form:"
-msgstr ""
-"Si --porcelain est utilis챕, alors chaque ligne de la sortie est de la forme :"
+msgstr "Si --porcelain est utilis챕, alors chaque ligne de la sortie est de la forme :"
#. type: delimited block -
#: en/git-push.txt:426
@@ -37738,9 +37649,7 @@ msgstr " <drapeau> \\t <de>:<횪> \\t <r챕sum챕> (<raison>)\n"
#: en/git-push.txt:430
#, priority:220
msgid "The status of up-to-date refs is shown only if --porcelain or --verbose option is used."
-msgstr ""
-"L'챕tat des r챕f챕rences 횪 jour n'est indiqu챕 que si l'option --porcelaine ou --"
-"verbose est utilis챕e."
+msgstr "L'챕tat des r챕f챕rences 횪 jour n'est indiqu챕 que si l'option --porcelaine ou --verbose est utilis챕e."
#. type: Plain text
#: en/git-push.txt:434
@@ -37764,27 +37673,19 @@ msgstr "pour une nouvelle r챕f챕rence pouss챕e avec succ챔s ;"
#: en/git-push.txt:438
#, priority:220
msgid "for a ref that was rejected or failed to push; and"
-msgstr ""
-"pour une r챕f챕rence qui a 챕t챕 rejet챕e ou qui n'a pas r챕ussi 횪 챗tre pouss챕e혻; "
-"et"
+msgstr "pour une r챕f챕rence qui a 챕t챕 rejet챕e ou qui n'a pas r챕ussi 횪 챗tre pouss챕e혻; et"
#. type: Plain text
#: en/git-push.txt:439
#, priority:220
msgid "for a ref that was up to date and did not need pushing."
-msgstr ""
-"pour une r챕f챕rence qui 챕tait 횪 jour et n'avait pas besoin d'챗tre pouss챕e."
+msgstr "pour une r챕f챕rence qui 챕tait 횪 jour et n'avait pas besoin d'챗tre pouss챕e."
#. type: Plain text
#: en/git-push.txt:445
#, ignore-ellipsis, priority:220
msgid "For a successfully pushed 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 pouss챕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)."
+msgstr "Pour une r챕f pouss챕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: Plain text
#: en/git-push.txt:447
@@ -37802,9 +37703,7 @@ msgstr "rejet챕"
#: en/git-push.txt:452
#, priority:220
msgid "Git did not try to send the ref at all, typically because it is not a fast-forward and you did not force the update."
-msgstr ""
-"Git n'a pas du tout essay챕 d'envoyer la r챕f챕rence, g챕n챕ralement parce que ce "
-"n'est pas une avance rapide et que vous n'avez pas forc챕 la mise 횪 jour."
+msgstr "Git n'a pas du tout essay챕 d'envoyer la r챕f챕rence, g챕n챕ralement parce que ce n'est pas une avance rapide et que vous n'avez pas forc챕 la mise 횪 jour."
#. type: Labeled list
#: en/git-push.txt:453
@@ -37816,13 +37715,7 @@ msgstr "le distant a rejet챕"
#: en/git-push.txt:461
#, 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 ""
-"Le serveur distant a refus챕 la mise 횪 jour. G챕n챕ralement caus챕 par un "
-"crochet du c척t챕 distant, ou parce que le d챕p척t distant a l'une des options "
-"de s챕curit챕 suivantes en vigueur : `receive.denyCurrentBranch` (pour les "
-"pouss챕es vers la branche extraite), `receive.denyNonFastForwards` (pour les "
-"mises 횪 jour forc챕es mais pas en avance rapide), `receive.denyDeletes` ou "
-"`receive.denyDeleteCurrent`. Voir linkgit:git-config[1]."
+msgstr "Le serveur distant a refus챕 la mise 횪 jour. G챕n챕ralement caus챕 par un crochet du c척t챕 distant, ou parce que le d챕p척t distant a l'une des options de s챕curit챕 suivantes en vigueur : `receive.denyCurrentBranch` (pour les pouss챕es vers la branche extraite), `receive.denyNonFastForwards` (pour les mises 횪 jour forc챕es mais pas en avance rapide), `receive.denyDeletes` ou `receive.denyDeleteCurrent`. Voir linkgit:git-config[1]."
#. type: Labeled list
#: en/git-push.txt:462
@@ -37834,35 +37727,25 @@ msgstr "챕chec distant"
#: en/git-push.txt:466
#, priority:220
msgid "The remote end did not report the successful update of the ref, perhaps because of a temporary error on the remote side, a break in the network connection, or other transient error."
-msgstr ""
-"Le serveur distant n'a pas signal챕 la mise 횪 jour r챕ussie de la r챕f챕rence, "
-"peut-챗tre en raison d'une erreur temporaire du c척t챕 distant, d'une rupture "
-"de la connexion r챕seau ou d'une autre erreur transitoire."
+msgstr "Le serveur distant n'a pas signal챕 la mise 횪 jour r챕ussie de la r챕f챕rence, peut-챗tre en raison d'une erreur temporaire du c척t챕 distant, d'une rupture de la connexion r챕seau ou d'une autre erreur transitoire."
#. type: Plain text
#: en/git-push.txt:472
#, priority:220
msgid "The name of the local ref being pushed, minus its `refs/<type>/` prefix. In the case of deletion, the name of the local ref is omitted."
-msgstr ""
-"Le nom de la r챕f챕rence locale qui est pouss챕e, moins son pr챕fixe `refs/"
-"<type>/`. En cas de suppression, le nom de la r챕f챕rence locale est omis."
+msgstr "Le nom de la r챕f챕rence locale qui est pouss챕e, moins son pr챕fixe `refs/<type>/`. En cas de suppression, le nom de la r챕f챕rence locale est omis."
#. type: Plain text
#: en/git-push.txt:476
#, priority:220
msgid "The name of the remote ref being updated, minus its `refs/<type>/` prefix."
-msgstr ""
-"Le nom de la r챕f챕rence distante en cours de mise 횪 jour, moins son pr챕fixe `"
-"refs/<type>/`."
+msgstr "Le nom de la r챕f챕rence distante en cours de mise 횪 jour, moins son pr챕fixe `refs/<type>/`."
#. type: Plain text
#: en/git-push.txt:481
#, priority:220
msgid "A human-readable explanation. In the case of successfully pushed 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챕 "
-"pouss챕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."
+msgstr "Une explication compr챕hensible. Dans le cas des r챕f챕rences qui ont 챕t챕 pouss챕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: Title -
#: en/git-push.txt:483
@@ -37874,31 +37757,19 @@ msgstr "NOTE SUR LES AVANCES RAPIDES"
#: en/git-push.txt:488
#, priority:220
msgid "When an update changes a branch (or more in general, a ref) that used to point at commit A to point at another commit B, it is called a fast-forward update if and only if B is a descendant of A."
-msgstr ""
-"Lorsqu'une mise 횪 jour modifie une branche (ou plus g챕n챕ralement, une r챕f) "
-"qui pointait auparavant vers le commit A pour pointer vers un autre commit "
-"B, on parle de mise 횪 jour en avance rapide si et seulement si B est un "
-"descendant de A."
+msgstr "Lorsqu'une mise 횪 jour modifie une branche (ou plus g챕n챕ralement, une r챕f) qui pointait auparavant vers le commit A pour pointer vers un autre commit B, on parle de mise 횪 jour en avance rapide si et seulement si B est un descendant de A."
#. type: Plain text
#: en/git-push.txt:492
#, priority:220
msgid "In a fast-forward update from A to B, the set of commits that the original commit A built on top of is a subset of the commits the new commit B builds on top of. Hence, it does not lose any history."
-msgstr ""
-"Dans une mise 횪 jour rapide de A 횪 B, l'ensemble des commits sur lesquels le "
-"commit original A s'appuyait est un sous-ensemble des commits sur lesquels "
-"le nouveau commit B s'appuie. Ainsi, il ne perd pas d'historique."
+msgstr "Dans une mise 횪 jour rapide de A 횪 B, l'ensemble des commits sur lesquels le commit original A s'appuyait est un sous-ensemble des commits sur lesquels le nouveau commit B s'appuie. Ainsi, il ne perd pas d'historique."
#. type: Plain text
#: en/git-push.txt:497
#, priority:220
msgid "In contrast, a non-fast-forward update will lose history. For example, suppose you and somebody else started at the same commit X, and you built a history leading to commit B while the other person built a history leading to commit A. The history looks like this:"
-msgstr ""
-"En revanche, une mise 횪 jour pas en avance rapide fera perdre de "
-"l'historique. Par exemple, supposons que vous et quelqu'un d'autre ayez "
-"commenc챕 au m챗me commit X, et que vous ayez construit un historique menant "
-"au commit B alors que l'autre personne a construit un historique menant au "
-"commit A. L'historique ressemble 횪 ceci :"
+msgstr "En revanche, une mise 횪 jour pas en avance rapide fera perdre de l'historique. Par exemple, supposons que vous et quelqu'un d'autre ayez commenc챕 au m챗me commit X, et que vous ayez construit un historique menant au commit B alors que l'autre personne a construit un historique menant au commit A. L'historique ressemble 횪 ceci :"
#. type: delimited block -
#: en/git-push.txt:503
@@ -37916,56 +37787,37 @@ msgstr ""
#: en/git-push.txt:509
#, priority:220
msgid "Further suppose that the other person already pushed changes leading to A back to the original repository from which you two obtained the original commit X."
-msgstr ""
-"Supposons en outre que l'autre personne ait d챕j횪 pouss챕 les modifications "
-"menant 횪 A vers le d챕p척t original dont vous avez tous deux obtenu le commit "
-"X original."
+msgstr "Supposons en outre que l'autre personne ait d챕j횪 pouss챕 les modifications menant 횪 A vers le d챕p척t original dont vous avez tous deux obtenu le commit X original."
#. type: Plain text
#: en/git-push.txt:512
#, priority:220
msgid "The push done by the other person updated the branch that used to point at commit X to point at commit A. It is a fast-forward."
-msgstr ""
-"La pouss챕e effectu챕e par l'autre personne a mis 횪 jour la branche qui "
-"pointait sur le commit X pour pointer sur le commit A. Il s'agit d'une "
-"avance rapide."
+msgstr "La pouss챕e effectu챕e par l'autre personne a mis 횪 jour la branche qui pointait sur le commit X pour pointer sur le commit A. Il s'agit d'une avance rapide."
#. type: Plain text
#: en/git-push.txt:517
#, priority:220
msgid "But if you try to push, you will attempt to update the branch (that now points at A) with commit B. This does _not_ fast-forward. If you did so, the changes introduced by commit A will be lost, because everybody will now start building on top of B."
-msgstr ""
-"Mais si vous essayez de pousser, vous essaierez de mettre 횪 jour la branche ("
-"qui pointe maintenant vers A) avec le commit B. Cela ne fait _pas_ d'avance "
-"rapide. Si vous le faites, les modifications introduits par le commit A "
-"seront perdues, car tout le monde va maintenant commencer 횪 construire sur B."
+msgstr "Mais si vous essayez de pousser, vous essaierez de mettre 횪 jour la branche (qui pointe maintenant vers A) avec le commit B. Cela ne fait _pas_ d'avance rapide. Si vous le faites, les modifications introduits par le commit A seront perdues, car tout le monde va maintenant commencer 횪 construire sur B."
#. type: Plain text
#: en/git-push.txt:520
#, priority:220
msgid "The command by default does not allow an update that is not a fast-forward to prevent such loss of history."
-msgstr ""
-"La commande par d챕faut ne permet pas une mise 횪 jour qui ne soit pas une "
-"avance rapide pour 챕viter une telle perte d'historique."
+msgstr "La commande par d챕faut ne permet pas une mise 횪 jour qui ne soit pas une avance rapide pour 챕viter une telle perte d'historique."
#. type: Plain text
#: en/git-push.txt:525
#, priority:220
msgid "If you do not want to lose your work (history from X to B) or the work by the other person (history from X to A), you would need to first fetch the history from the repository, create a history that contains changes done by both parties, and push the result back."
-msgstr ""
-"Si vous ne voulez pas perdre votre travail (historique de X 횪 B) ou le "
-"travail de l'autre personne (historique de X 횪 A), vous devez d'abord "
-"r챕cup챕rer l'historique du d챕p척t, cr챕er un historique qui contient les "
-"modifications effectu챕es par les deux parties et repousser le r챕sultat."
+msgstr "Si vous ne voulez pas perdre votre travail (historique de X 횪 B) ou le travail de l'autre personne (historique de X 횪 A), vous devez d'abord r챕cup챕rer l'historique du d챕p척t, cr챕er un historique qui contient les modifications effectu챕es par les deux parties et repousser le r챕sultat."
#. type: Plain text
#: en/git-push.txt:529
#, priority:220
msgid "You can perform \"git pull\", resolve potential conflicts, and \"git push\" the result. A \"git pull\" will create a merge commit C between commits A and B."
-msgstr ""
-"Vous pouvez effectuer un \"git pull\", r챕soudre les conflits potentiels et \""
-"git push\" le r챕sultat. Un \"git pull\" cr챕era un commit de fusion C entre "
-"les commit A et B."
+msgstr "Vous pouvez effectuer un \"git pull\", r챕soudre les conflits potentiels et \"git push\" le r챕sultat. Un \"git pull\" cr챕era un commit de fusion C entre les commit A et B."
#. type: delimited block -
#: en/git-push.txt:535
@@ -37983,18 +37835,13 @@ msgstr ""
#: en/git-push.txt:540
#, priority:220
msgid "Updating A with the resulting merge commit will fast-forward and your push will be accepted."
-msgstr ""
-"La mise 횪 jour de A avec le commit de fusion r챕sultant sera une avance "
-"rapide et votre pouss챕e sera accept챕e."
+msgstr "La mise 횪 jour de A avec le commit de fusion r챕sultant sera une avance rapide et votre pouss챕e sera accept챕e."
#. type: Plain text
#: en/git-push.txt:545
#, priority:220
msgid "Alternatively, you can rebase your change between X and B on top of A, with \"git pull --rebase\", and push the result back. The rebase will create a new commit D that builds the change between X and B on top of A."
-msgstr ""
-"Vous pouvez 챕galement rebaser votre modification entre X et B sur A, avec \""
-"git pull --rebase\", et pousser le r챕sultat. Le rebasage cr챕era un nouveau "
-"commit D qui construit la modification entre X et B sur A."
+msgstr "Vous pouvez 챕galement rebaser votre modification entre X et B sur A, avec \"git pull --rebase\", et pousser le r챕sultat. Le rebasage cr챕era un nouveau commit D qui construit la modification entre X et B sur A."
#. type: delimited block -
#: en/git-push.txt:551
@@ -38012,26 +37859,13 @@ msgstr ""
#: en/git-push.txt:556
#, priority:220
msgid "Again, updating A with this commit will fast-forward and your push will be accepted."
-msgstr ""
-"L횪 encore, la mise 횪 jour de A avec ce commit sera en avance rapide et votre "
-"pouss챕e sera accept챕e."
+msgstr "L횪 encore, la mise 횪 jour de A avec ce commit sera en avance rapide et votre pouss챕e sera accept챕e."
#. type: Plain text
#: en/git-push.txt:567
#, priority:220
msgid "There is another common situation where you may encounter non-fast-forward rejection when you try to push, and it is possible even when you are pushing into a repository nobody else pushes into. After you push commit A yourself (in the first picture in this section), replace it with \"git commit --amend\" to produce commit B, and you try to push it out, because forgot that you have pushed A out already. In such a case, and only if you are certain that nobody in the meantime fetched your earlier commit A (and started building on top of it), you can run \"git push --force\" to overwrite it. In other words, \"git push --force\" is a method reserved for a case where you do mean to lose history."
-msgstr ""
-"Il existe une autre situation courante dans laquelle vous pouvez rencontrer "
-"un rejet du fait d'absence d'avance rapide lorsque vous essayez de pousser, "
-"et c'est possible m챗me lorsque vous poussez dans un d챕p척t dans lequel "
-"personne d'autre ne pousse. Apr챔s avoir vous-m챗me pouss챕 le commit A (dans "
-"la premi챔re image de cette section), remplacez-le par \"git commit --amend\" "
-"pour produire le commit B, et vous essayez de le pousser, parce que vous "
-"avez oubli챕 que vous avez d챕j횪 pouss챕 A. Dans un tel cas, et seulement si "
-"vous 챗tes certain que personne n'a r챕cup챕r챕 votre commit A pr챕c챕dent (et a "
-"commenc챕 횪 construire dessus), vous pouvez lancer \"git push --force\" pour "
-"l'챕craser. En d'autres termes, \"git push --force\" est une m챕thode r챕serv챕e "
-"aux cas o첫 vous voulez vraiment perdre l'historique."
+msgstr "Il existe une autre situation courante dans laquelle vous pouvez rencontrer un rejet du fait d'absence d'avance rapide lorsque vous essayez de pousser, et c'est possible m챗me lorsque vous poussez dans un d챕p척t dans lequel personne d'autre ne pousse. Apr챔s avoir vous-m챗me pouss챕 le commit A (dans la premi챔re image de cette section), remplacez-le par \"git commit --amend\" pour produire le commit B, et vous essayez de le pousser, parce que vous avez oubli챕 que vous avez d챕j횪 pouss챕 A. Dans un tel cas, et seulement si vous 챗tes certain que personne n'a r챕cup챕r챕 votre commit A pr챕c챕dent (et a commenc챕 횪 construire dessus), vous pouvez lancer \"git push --force\" pour l'챕craser. En d'autres termes, \"git push --force\" est une m챕thode r챕serv챕e aux cas o첫 vous voulez vraiment perdre l'historique."
#. type: Labeled list
#: en/git-push.txt:572
@@ -38043,10 +37877,7 @@ msgstr "`git push`"
#: en/git-push.txt:576
#, priority:220
msgid "Works like `git push <remote>`, where <remote> is the current branch's remote (or `origin`, if no remote is configured for the current branch)."
-msgstr ""
-"Fonctionne comme `git push <distant>`, o첫 <distant> est le distant de la "
-"branche actuelle (ou `origin`, si aucun distant n'est configur챕 pour la "
-"branche actuelle)."
+msgstr "Fonctionne comme `git push <distant>`, o첫 <distant> est le distant de la branche actuelle (ou `origin`, si aucun distant n'est configur챕 pour la branche actuelle)."
#. type: Labeled list
#: en/git-push.txt:577
@@ -38058,30 +37889,19 @@ msgstr "`git push origin`"
#: en/git-push.txt:582
#, priority:220
msgid "Without additional configuration, pushes the current branch to the configured upstream (`remote.origin.merge` configuration variable) if it has the same name as the current branch, and errors out without pushing otherwise."
-msgstr ""
-"Sans configuration suppl챕mentaire, pousse la branche en cours vers l'amont "
-"configur챕 (variable de configuration `remote.origin.merge`) si elle a le "
-"m챗me nom que la branche actuelle et g챕n챔re des erreurs sans pousser "
-"autrement."
+msgstr "Sans configuration suppl챕mentaire, pousse la branche en cours vers l'amont configur챕 (variable de configuration `remote.origin.merge`) si elle a le m챗me nom que la branche actuelle et g챕n챔re des erreurs sans pousser autrement."
#. type: Plain text
#: en/git-push.txt:586
#, priority:220
msgid "The default behavior of this command when no <refspec> is given can be configured by setting the `push` option of the remote, or the `push.default` configuration variable."
-msgstr ""
-"Le comportement par d챕faut de cette commande quand aucun <spec-de-r챕f> n'est "
-"donn챕 peut 챗tre configur챕 en d챕finissant l'option `push` du distant, ou la "
-"variable de configuration `push.default`."
+msgstr "Le comportement par d챕faut de cette commande quand aucun <spec-de-r챕f> n'est donn챕 peut 챗tre configur챕 en d챕finissant l'option `push` du distant, ou la variable de configuration `push.default`."
#. type: Plain text
#: en/git-push.txt:591
#, priority:220
msgid "For example, to default to pushing only the current branch to `origin` use `git config remote.origin.push HEAD`. Any valid <refspec> (like the ones in the examples below) can be configured as the default for `git push origin`."
-msgstr ""
-"Par exemple, pour pousser par d챕faut uniquement la branche actelle vers "
-"`origin`, utilisez `git config remote.origin.push HEAD`. Tout <spec-de-r챕f> "
-"valide (comme ceux des exemples ci-dessous) peut 챗tre configur챕 par d챕faut "
-"pour `git push origin`."
+msgstr "Par exemple, pour pousser par d챕faut uniquement la branche actelle vers `origin`, utilisez `git config remote.origin.push HEAD`. Tout <spec-de-r챕f> valide (comme ceux des exemples ci-dessous) peut 챗tre configur챕 par d챕faut pour `git push origin`."
#. type: Labeled list
#: en/git-push.txt:592
@@ -38093,10 +37913,7 @@ msgstr "`git push origin :`"
#: en/git-push.txt:596
#, priority:220
msgid "Push \"matching\" branches to `origin`. See <refspec> in the <<OPTIONS,OPTIONS>> section above for a description of \"matching\" branches."
-msgstr ""
-"Pousse les branches \"correspondantes\" sur `origin챔. Voir <spec-de-r챕f> "
-"dans la section <<OPTIONS,OPTIONS>> ci-dessus pour une description des "
-"branches \"correspondantes\"."
+msgstr "Pousse les branches \"correspondantes\" sur `origin챔. Voir <spec-de-r챕f> dans la section <<OPTIONS,OPTIONS>> ci-dessus pour une description des branches \"correspondantes\"."
#. type: Labeled list
#: en/git-push.txt:597
@@ -38108,11 +37925,7 @@ msgstr "`git push origin master`"
#: en/git-push.txt:603
#, priority:220
msgid "Find a ref that matches `master` in the source repository (most likely, it would find `refs/heads/master`), and update the same ref (e.g. `refs/heads/master`) in `origin` repository with it. If `master` did not exist remotely, it would be created."
-msgstr ""
-"Trouve une r챕f qui correspond 횪 `master` dans le d챕p척t source (le plus "
-"souvent, trouvera `refs/heads/master`), et met 횪 jour la m챗me r챕f (par "
-"exemple `refs/heads/master`) dans le d챕p척t `origin` avec elle. Si `master` "
-"n'existait pas 횪 distance, elle serait cr챕챕e."
+msgstr "Trouve une r챕f qui correspond 횪 `master` dans le d챕p척t source (le plus souvent, trouvera `refs/heads/master`), et met 횪 jour la m챗me r챕f (par exemple `refs/heads/master`) dans le d챕p척t `origin` avec elle. Si `master` n'existait pas 횪 distance, elle serait cr챕챕e."
#. type: Labeled list
#: en/git-push.txt:604
@@ -38124,9 +37937,7 @@ msgstr "`git push origin HEAD`"
#: en/git-push.txt:607
#, priority:220
msgid "A handy way to push the current branch to the same name on the remote."
-msgstr ""
-"Un moyen pratique de pousser la branche actuelle vers le m챗me nom sur le "
-"distant."
+msgstr "Un moyen pratique de pousser la branche actuelle vers le m챗me nom sur le distant."
#. type: Labeled list
#: en/git-push.txt:608
@@ -38138,42 +37949,25 @@ msgstr "`git push vaisseaum챔re master:satellite/master dev:satellite/dev`"
#: en/git-push.txt:613
#, priority:220
msgid "Use the source ref that matches `master` (e.g. `refs/heads/master`) to update the ref that matches `satellite/master` (most probably `refs/remotes/satellite/master`) in the `mothership` repository; do the same for `dev` and `satellite/dev`."
-msgstr ""
-"Utiliser la r챕f챕rence source qui correspond 횪 `master` (par exemple `refs/"
-"heads/master`) pour mettre 횪 jour la r챕f챕rence qui correspond 횪 `satellite/"
-"master` (tr챔s probablement `refs/remotes/satellite/master`) dans le d챕p척t "
-"`vaisseaum챔re` ; faire de m챗me pour `dev` et `satellite/dev`."
+msgstr "Utiliser la r챕f챕rence source qui correspond 횪 `master` (par exemple `refs/heads/master`) pour mettre 횪 jour la r챕f챕rence qui correspond 횪 `satellite/master` (tr챔s probablement `refs/remotes/satellite/master`) dans le d챕p척t `vaisseaum챔re` ; faire de m챗me pour `dev` et `satellite/dev`."
#. type: Plain text
#: en/git-push.txt:616
#, ignore-ellipsis, priority:220
msgid "See the section describing `<refspec>...` above for a discussion of the matching semantics."
-msgstr ""
-"Voir la section d챕crivant `<sp챕c-de-r챕f>...` ci-dessus pour une discussion "
-"sur la s챕mantique de correspondance."
+msgstr "Voir la section d챕crivant `<sp챕c-de-r챕f>...` ci-dessus pour une discussion sur la s챕mantique de correspondance."
#. type: Plain text
#: en/git-push.txt:623
#, priority:220
msgid "This is to emulate `git fetch` run on the `mothership` using `git push` that is run in the opposite direction in order to integrate the work done on `satellite`, and is often necessary when you can only make connection in one way (i.e. satellite can ssh into mothership but mothership cannot initiate connection to satellite because the latter is behind a firewall or does not run sshd)."
-msgstr ""
-"Il s'agit d'챕muler `git fetch` ex챕cut챕 sur le `vaisseaum챔re` en utilisant `"
-"git push` qui est ex챕cut챕 dans la direction oppos챕e afin d'int챕grer le "
-"travail effectu챕 sur `satellite`, et est souvent n챕cessaire lorsque vous ne "
-"pouvez 챕tablir la connexion que dans un seul sens (c'est-횪-dire que le "
-"satellite peut ssh dans vaisseaum챔re mais que le vaisseaum챔re ne peut pas "
-"챕tablir de connexion avec satellite parce que ce dernier se trouve derri챔re "
-"un pare-feu ou n'ex챕cute pas sshd)."
+msgstr "Il s'agit d'챕muler `git fetch` ex챕cut챕 sur le `vaisseaum챔re` en utilisant `git push` qui est ex챕cut챕 dans la direction oppos챕e afin d'int챕grer le travail effectu챕 sur `satellite`, et est souvent n챕cessaire lorsque vous ne pouvez 챕tablir la connexion que dans un seul sens (c'est-횪-dire que le satellite peut ssh dans vaisseaum챔re mais que le vaisseaum챔re ne peut pas 챕tablir de connexion avec satellite parce que ce dernier se trouve derri챔re un pare-feu ou n'ex챕cute pas sshd)."
#. type: Plain text
#: en/git-push.txt:628
#, priority:220
msgid "After running this `git push` on the `satellite` machine, you would ssh into the `mothership` and run `git merge` there to complete the emulation of `git pull` that were run on `mothership` to pull changes made on `satellite`."
-msgstr ""
-"Apr챔s avoir lanc챕 ce `git push` sur la machine `satellite`, vous ouvririez "
-"un ssh sur le `vaisseaum챔re` et y lanceriez `git merge` pour compl챕ter "
-"l'챕mulation de `git pull` qui 챕tait lanc챕e sur `vaisseaum챔re` afin de tirer "
-"les modifications faites sur `satellite`."
+msgstr "Apr챔s avoir lanc챕 ce `git push` sur la machine `satellite`, vous ouvririez un ssh sur le `vaisseaum챔re` et y lanceriez `git merge` pour compl챕ter l'챕mulation de `git pull` qui 챕tait lanc챕e sur `vaisseaum챔re` afin de tirer les modifications faites sur `satellite`."
#. type: Labeled list
#: en/git-push.txt:629
@@ -38185,10 +37979,7 @@ msgstr "`git push origin HEAD:master`"
#: en/git-push.txt:633
#, priority:220
msgid "Push the current branch to the remote ref matching `master` in the `origin` repository. This form is convenient to push the current branch without thinking about its local name."
-msgstr ""
-"Pousser la branche actuelle vers la r챕f챕rence distante correspondant 횪 "
-"`master` dans le d챕p척t `origin`. Cette forme est pratique pour pousser la "
-"branche actuelle sans avoir 횪 penser 횪 son nom local."
+msgstr "Pousser la branche actuelle vers la r챕f챕rence distante correspondant 횪 `master` dans le d챕p척t `origin`. Cette forme est pratique pour pousser la branche actuelle sans avoir 횪 penser 횪 son nom local."
#. type: Labeled list
#: en/git-push.txt:634
@@ -38200,11 +37991,7 @@ msgstr "`git push origin master:refs/heads/experimental`"
#: en/git-push.txt:640
#, priority:220
msgid "Create the branch `experimental` in the `origin` repository by copying the current `master` branch. This form is only needed to create a new branch or tag in the remote repository when the local name and the remote name are different; otherwise, the ref name on its own will work."
-msgstr ""
-"Cr챕er la branche `experimental` dans le d챕p척t `origin` en copiant la branche "
-"`master` actuelle. Cette forme n'est n챕cessaire que pour cr챕er une nouvelle "
-"branche ou 챕tiquette dans le d챕p척t distant lorsque le nom local et le nom "
-"distant sont diff챕rents ; sinon, le nom de la r챕f seul fonctionnera."
+msgstr "Cr챕er la branche `experimental` dans le d챕p척t `origin` en copiant la branche `master` actuelle. Cette forme n'est n챕cessaire que pour cr챕er une nouvelle branche ou 챕tiquette dans le d챕p척t distant lorsque le nom local et le nom distant sont diff챕rents ; sinon, le nom de la r챕f seul fonctionnera."
#. type: Labeled list
#: en/git-push.txt:641
@@ -38216,9 +38003,7 @@ msgstr "`git push origin :experimental`"
#: en/git-push.txt:644
#, priority:220
msgid "Find a ref that matches `experimental` in the `origin` repository (e.g. `refs/heads/experimental`), and delete it."
-msgstr ""
-"Trouver une ref qui correspond 횪 `experimental` dans le d챕p척t `origin` (par "
-"exemple `refs/heads/experimental`), et la supprimer."
+msgstr "Trouver une ref qui correspond 횪 `experimental` dans le d챕p척t `origin` (par exemple `refs/heads/experimental`), et la supprimer."
#. type: Labeled list
#: en/git-push.txt:645
@@ -38230,11 +38015,7 @@ msgstr "`git push origin +dev:master`"
#: en/git-push.txt:650
#, priority:220
msgid "Update the origin repository's master branch with the dev branch, allowing non-fast-forward updates. *This can leave unreferenced commits dangling in the origin repository.* Consider the following situation, where a fast-forward is not possible:"
-msgstr ""
-"Mettre 횪 jour la branche master du d챕p척t origin avec la branche dev, ce qui "
-"permet des mises 횪 jour en mode non avance rapide. *Ceci peut laisser des "
-"commits non r챕f챕renc챕s dans le d챕p척t origin.* Consid챕rez la situation "
-"suivante, o첫 une avance rapide n'est pas possible :"
+msgstr "Mettre 횪 jour la branche master du d챕p척t origin avec la branche dev, ce qui permet des mises 횪 jour en mode non avance rapide. *Ceci peut laisser des commits non r챕f챕renc챕s dans le d챕p척t origin.* Consid챕rez la situation suivante, o첫 une avance rapide n'est pas possible :"
#. type: delimited block -
#: en/git-push.txt:655
@@ -38270,10 +38051,7 @@ msgstr ""
#: en/git-push.txt:668
#, priority:220
msgid "Commits A and B would no longer belong to a branch with a symbolic name, and so would be unreachable. As such, these commits would be removed by a `git gc` command on the origin repository."
-msgstr ""
-"Les commits A et B n'appartiendraient plus 횪 une branche portant un nom "
-"symbolique, et seraient donc injoignables. Dans cet 챕tat, ces commits "
-"seraient supprim챕s par une commande `git gc` sur le d챕p척t origin."
+msgstr "Les commits A et B n'appartiendraient plus 횪 une branche portant un nom symbolique, et seraient donc injoignables. Dans cet 챕tat, ces commits seraient supprim챕s par une commande `git gc` sur le d챕p척t origin."
#. type: Title =
#: en/git-quiltimport.txt:2
@@ -38535,11 +38313,7 @@ msgstr "--[no-]recurse-submodules"
#: en/git-read-tree.txt:123
#, priority:100
msgid "Using --recurse-submodules will update the content of all active submodules according to the commit recorded in the superproject by calling read-tree recursively, also setting the submodules' HEAD to be detached at that commit."
-msgstr ""
-"L'utilisation de `--recurse-submodules` permet de mettre 횪 jour le contenu "
-"de tous les sous-modules actifs en fonction du commit enregistr챕 dans le "
-"super-projet en appelant r챕cursivement read-tree, en d챕finissant 챕galement "
-"le HEAD des sous-modules 횪 d챕tacher 횪 ce commit."
+msgstr "L'utilisation de `--recurse-submodules` permet de mettre 횪 jour le contenu de tous les sous-modules actifs en fonction du commit enregistr챕 dans le super-projet en appelant r챕cursivement read-tree, en d챕finissant 챕galement le HEAD des sous-modules 횪 d챕tacher 횪 ce commit."
#. type: Labeled list
#: en/git-read-tree.txt:124
@@ -41959,10 +41733,24 @@ msgstr "git-remote - G챔re un ensemble de d챕p척ts suivis"
#. type: Plain text
#: en/git-remote.txt:25
-#, ignore-ellipsis, no-wrap, priority:220
+#, fuzzy, ignore-ellipsis, no-wrap, priority:220
+#| msgid ""
+#| "'git remote' [-v | --verbose]\n"
+#| "'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+#| "'git remote rename' <old> <new>\n"
+#| "'git remote remove' <name>\n"
+#| "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
+#| "'git remote set-branches' [--add] <name> <branch>...\n"
+#| "'git remote get-url' [--push] [--all] <name>\n"
+#| "'git remote set-url' [--push] <name> <newurl> [<oldurl>]\n"
+#| "'git remote set-url --add' [--push] <name> <newurl>\n"
+#| "'git remote set-url --delete' [--push] <name> <url>\n"
+#| "'git remote' [-v | --verbose] 'show' [-n] <name>...\n"
+#| "'git remote prune' [-n | --dry-run] <name>...\n"
+#| "'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41976,8 +41764,7 @@ msgid ""
"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
msgstr ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branche>] [-m <master>] [-f] [--[no-]tags] "
-"[--mirror=(fetch|push)] <nom> <url>\n"
+"'git remote add' [-t <branche>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <nom> <url>\n"
"'git remote renom' <ancien> <nouveau>\n"
"'git remote remove' <nom>\n"
"'git remote set-head' <nom> (-a | --auto | -d | --delete | <branche>)\n"
@@ -41988,31 +41775,26 @@ msgstr ""
"'git remote set-url --delete' [--push] <nom> <url>\n"
"'git remote' [-v | --verbose] 'show' [-n] <nom>...\n"
"'git remote prune' [-n | --dry-run] <nom>...\n"
-"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<groupe> | "
-"<distant>)...]\n"
+"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<groupe> | <distant>)...]\n"
#. type: Plain text
#: en/git-remote.txt:30
#, priority:220
msgid "Manage the set of repositories (\"remotes\") whose branches you track."
-msgstr ""
-"G챔re un ensemble de d챕p척ts (짬혻distants 쨩) dont vous suivez les branches."
+msgstr "G챔re un ensemble de d챕p척ts (짬혻distants 쨩) dont vous suivez les branches."
#. type: Plain text
#: en/git-remote.txt:39
-#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
-msgstr ""
-"횎tre un peu plus verbeux et montrer les urls distantes apr챔s les noms. NOTE��:"
-" cette option doit 챗tre plac챕e entre `remote` et la sous-commande."
+#, fuzzy, priority:220
+#| msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
+msgstr "횎tre un peu plus verbeux et montrer les urls distantes apr챔s les noms. NOTE��: cette option doit 챗tre plac챕e entre `remote` et la sous-commande."
#. type: Plain text
#: en/git-remote.txt:46
#, priority:220
msgid "With no arguments, shows a list of existing remotes. Several subcommands are available to perform operations on the remotes."
-msgstr ""
-"Sans argument, affiche la liste des distants existants. Quelques sous-"
-"commandes permettent d'appliquer des op챕rations sur les distants."
+msgstr "Sans argument, affiche la liste des distants existants. Quelques sous-commandes permettent d'appliquer des op챕rations sur les distants."
#. type: Labeled list
#: en/git-remote.txt:47
@@ -42022,83 +41804,58 @@ msgstr "'add'"
#. type: Plain text
#: en/git-remote.txt:52
-#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
-msgstr ""
-"Ajoute un distant nomm챕 <nom> pour le d챕p척t 횪 <url>. La commande `git fetch "
-"<nom>` peut alors 챗tre utilis챕e pour cr챕er et mettre 횪 jour les branches de "
-"suivi 횪 distance <nom>/<branche>."
+#, fuzzy, priority:220
+#| msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgstr "Ajoute un distant nomm챕 <nom> pour le d챕p척t 횪 <url>. La commande `git fetch <nom>` peut alors 챗tre utilis챕e pour cr챕er et mettre 횪 jour les branches de suivi 횪 distance <nom>/<branche>."
#. type: Plain text
#: en/git-remote.txt:55
#, priority:220
msgid "With `-f` option, `git fetch <name>` is run immediately after the remote information is set up."
-msgstr ""
-"Avec l'option `-f`, `git fetch <nom>` est lanc챕 imm챕diatement apr챔s la mise "
-"en place des informations distantes."
+msgstr "Avec l'option `-f`, `git fetch <nom>` est lanc챕 imm챕diatement apr챔s la mise en place des informations distantes."
#. type: Plain text
#: en/git-remote.txt:58
#, priority:220
msgid "With `--tags` option, `git fetch <name>` imports every tag from the remote repository."
-msgstr ""
-"Avec l'option `--tags`, `git fetch <nom>` importe chaque 챕tiquette du d챕p척t "
-"distant."
+msgstr "Avec l'option `--tags`, `git fetch <nom>` importe chaque 챕tiquette du d챕p척t distant."
#. type: Plain text
#: en/git-remote.txt:61
#, priority:220
msgid "With `--no-tags` option, `git fetch <name>` does not import tags from the remote repository."
-msgstr ""
-"Avec l'option `--no-tags`, `git fetch <nom>` n'importe pas les 챕tiquettes du "
-"d챕p척t distant."
+msgstr "Avec l'option `--no-tags`, `git fetch <nom>` n'importe pas les 챕tiquettes du d챕p척t distant."
#. type: Plain text
#: en/git-remote.txt:64
#, priority:220
msgid "By default, only tags on fetched branches are imported (see linkgit:git-fetch[1])."
-msgstr ""
-"Par d챕faut, seules les 챕tiquettes sur les branches r챕cup챕r챕es sont import챕es "
-"(voir linkgit:git-fetch[1])."
+msgstr "Par d챕faut, seules les 챕tiquettes sur les branches r챕cup챕r챕es sont import챕es (voir linkgit:git-fetch[1])."
#. type: Plain text
#: en/git-remote.txt:70
#, priority:220
msgid "With `-t <branch>` option, instead of the default glob refspec for the remote to track all branches under the `refs/remotes/<name>/` namespace, a refspec to track only `<branch>` is created. You can give more than one `-t <branch>` to track multiple branches without grabbing all branches."
-msgstr ""
-"Avec l'option `-t <branche>`, au lieu du sp챕cificateur par d챕faut de glob "
-"pour que le distant suive toutes les branches dans l'espace de noms `refs/"
-"remotes/<nom>/`, un sp챕cificateur de r챕f챕rence de suivi uniquement pour "
-"`<branche>` est cr챕챕. Vous pouvez donner plus d'un `-t <branche>` pour "
-"suivre plusieurs branches sans saisir toutes les branches."
+msgstr "Avec l'option `-t <branche>`, au lieu du sp챕cificateur par d챕faut de glob pour que le distant suive toutes les branches dans l'espace de noms `refs/remotes/<nom>/`, un sp챕cificateur de r챕f챕rence de suivi uniquement pour `<branche>` est cr챕챕. Vous pouvez donner plus d'un `-t <branche>` pour suivre plusieurs branches sans saisir toutes les branches."
#. type: Plain text
#: en/git-remote.txt:73
#, priority:220
msgid "With `-m <master>` option, a symbolic-ref `refs/remotes/<name>/HEAD` is set up to point at remote's `<master>` branch. See also the set-head command."
-msgstr ""
-"Avec l'option `-m <master>`, une r챕f symbolique `refs/remotes/<nom>/HEAD` "
-"est mise en place pour pointer sur la branche `<master>` du distant. Voir "
-"aussi la commande set-head."
+msgstr "Avec l'option `-m <master>`, une r챕f symbolique `refs/remotes/<nom>/HEAD` est mise en place pour pointer sur la branche `<master>` du distant. Voir aussi la commande set-head."
#. type: Plain text
#: en/git-remote.txt:79
#, priority:220
msgid "When a fetch mirror is created with `--mirror=fetch`, the refs will not be stored in the 'refs/remotes/' namespace, but rather everything in 'refs/' on the remote will be directly mirrored into 'refs/' in the local repository. This option only makes sense in bare repositories, because a fetch would overwrite any local commits."
-msgstr ""
-"Lorsqu'un miroir est cr챕챕 avec `--mirror=fetch`, les refs ne seront pas "
-"stock챕es dans l'espace de noms 'refs/remotes/', mais tout ce qui se trouve "
-"dans 'refs/' sur le serveur distant sera directement refl챕t챕 dans 'refs/' "
-"dans le d챕p척t local. Cette option n'a de sens que dans les d챕p척ts nus, car "
-"une r챕cup챕ration 챕craserait tous les commit locaux."
+msgstr "Lorsqu'un miroir est cr챕챕 avec `--mirror=fetch`, les refs ne seront pas stock챕es dans l'espace de noms 'refs/remotes/', mais tout ce qui se trouve dans 'refs/' sur le serveur distant sera directement refl챕t챕 dans 'refs/' dans le d챕p척t local. Cette option n'a de sens que dans les d챕p척ts nus, car une r챕cup챕ration 챕craserait tous les commit locaux."
#. type: Plain text
#: en/git-remote.txt:82
#, priority:220
msgid "When a push mirror is created with `--mirror=push`, then `git push` will always behave as if `--mirror` was passed."
-msgstr ""
-"Lorsqu'un miroir de pouss챕 est cr챕챕 avec `--mirror=push`, alors `git push` "
-"se comportera toujours comme si `--mirror` 챕tait pass챕."
+msgstr "Lorsqu'un miroir de pouss챕 est cr챕챕 avec `--mirror=push`, alors `git push` se comportera toujours comme si `--mirror` 챕tait pass챕."
#. type: Labeled list
#: en/git-remote.txt:83
@@ -42110,19 +41867,13 @@ msgstr "'rename'"
#: en/git-remote.txt:87
#, priority:220
msgid "Rename the remote named <old> to <new>. All remote-tracking branches and configuration settings for the remote are updated."
-msgstr ""
-"Renommer le distant nomm챕 <ancien> en <nouveau>. Toutes les branches de "
-"suivi 횪 distance et les param챔tres de configuration du distant sont mis 횪 "
-"jour."
+msgstr "Renommer le distant nomm챕 <ancien> en <nouveau>. Toutes les branches de suivi 횪 distance et les param챔tres de configuration du distant sont mis 횪 jour."
#. type: Plain text
#: en/git-remote.txt:91
#, priority:220
msgid "In case <old> and <new> are the same, and <old> is a file under `$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to the configuration file format."
-msgstr ""
-"Dans le cas o첫 <ancien> et <nouveau> sont identiques, et que <ancien> est un "
-"fichier sous `$GIT_DIR/remotes` ou `$GIT_DIR/branches`, le distant est "
-"converti au format de fichier de configuration."
+msgstr "Dans le cas o첫 <ancien> et <nouveau> sont identiques, et que <ancien> est un fichier sous `$GIT_DIR/remotes` ou `$GIT_DIR/branches`, le distant est converti au format de fichier de configuration."
#. type: Labeled list
#: en/git-remote.txt:92
@@ -42140,9 +41891,7 @@ msgstr "'rm'"
#: en/git-remote.txt:97
#, priority:220
msgid "Remove the remote named <name>. All remote-tracking branches and configuration settings for the remote are removed."
-msgstr ""
-"Supprimer le distant nomm챕 <nom>. Toutes les branches de suivi 횪 distance et "
-"tous les param챔tres de configuration du distant sont supprim챕s."
+msgstr "Supprimer le distant nomm챕 <nom>. Toutes les branches de suivi 횪 distance et tous les param챔tres de configuration du distant sont supprim챕s."
#. type: Labeled list
#: en/git-remote.txt:98
@@ -42154,45 +41903,27 @@ msgstr "'set-head'"
#: en/git-remote.txt:107
#, priority:220
msgid "Sets or deletes the default branch (i.e. the target of the symbolic-ref `refs/remotes/<name>/HEAD`) for the named remote. Having a default branch for a remote is not required, but allows the name of the remote to be specified in lieu of a specific branch. For example, if the default branch for `origin` is set to `master`, then `origin` may be specified wherever you would normally specify `origin/master`."
-msgstr ""
-"D챕finir ou supprimet la branche par d챕faut (c'est-횪-dire la cible de la "
-"r챕f챕rence symbolique `refs/remotes/<nom>/HEAD`) pour le distant nomm챕. Il "
-"n'est pas n챕cessaire de disposer d'une branche par d챕faut pour un distant, "
-"mais cela permet de sp챕cifier le nom du distant 횪 la place d'une branche "
-"sp챕cifique. Par exemple, si la branche par d챕faut pour `origin` est d챕finie "
-"횪 `master`, alors `origin` peut 챗tre sp챕cifi챕 l횪 o첫 vous sp챕cifieriez "
-"normalement `origin/master`."
+msgstr "D챕finir ou supprimet la branche par d챕faut (c'est-횪-dire la cible de la r챕f챕rence symbolique `refs/remotes/<nom>/HEAD`) pour le distant nomm챕. Il n'est pas n챕cessaire de disposer d'une branche par d챕faut pour un distant, mais cela permet de sp챕cifier le nom du distant 횪 la place d'une branche sp챕cifique. Par exemple, si la branche par d챕faut pour `origin` est d챕finie 횪 `master`, alors `origin` peut 챗tre sp챕cifi챕 l횪 o첫 vous sp챕cifieriez normalement `origin/master`."
#. type: Plain text
#: en/git-remote.txt:109
#, priority:220
msgid "With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted."
-msgstr ""
-"Avec `-d` ou `--delete`, la r챕f챕rence symbolique `refs/remotes/<nom>/HEAD` "
-"est supprim챕e."
+msgstr "Avec `-d` ou `--delete`, la r챕f챕rence symbolique `refs/remotes/<nom>/HEAD` est supprim챕e."
#. type: Plain text
#: en/git-remote.txt:116
-#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
-msgstr ""
-"Avec `-a` ou `--auto`, le distant est interrog챕 pour d챕terminer son `HEAD`, "
-"puis la r챕f챕rence symbolique `refs/remotes/<nom>/HEAD` est d챕finie sur la "
-"m챗me branche. Par exemple, si le distant `HEAD` est point챕 sur `next`, `git "
-"remote set-head origin -a` d챕finira la r챕f챕rence symbolique `refs/remotes/"
-"origin/HEAD` sur `refs/remotes/origin/next`. Cela ne fonctionnera que si `"
-"refs/remotes/origin/next` existe d챕j횪 ; sinon, il faut d'abord la r챕cup챕rer."
+#, fuzzy, priority:220
+#| msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgstr "Avec `-a` ou `--auto`, le distant est interrog챕 pour d챕terminer son `HEAD`, puis la r챕f챕rence symbolique `refs/remotes/<nom>/HEAD` est d챕finie sur la m챗me branche. Par exemple, si le distant `HEAD` est point챕 sur `next`, `git remote set-head origin -a` d챕finira la r챕f챕rence symbolique `refs/remotes/origin/HEAD` sur `refs/remotes/origin/next`. Cela ne fonctionnera que si `refs/remotes/origin/next` existe d챕j횪 ; sinon, il faut d'abord la r챕cup챕rer."
#. type: Plain text
#: en/git-remote.txt:121
-#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
-msgstr ""
-"Utiliser `<branche>` pour d챕finir la r챕f챕rence symbolique `refs/remotes/"
-"<nom>/HEAD` explicitement. Par exemple, `git remote set-head origin master` "
-"d챕finira la r챕f챕rence symbolique `refs/remotes/origin/HEAD` 횪 `refs/remotes/"
-"origin/master`. Cela ne fonctionnera que si `refs/remotes/origin/master` "
-"existe d챕j횪 ; sinon, il faut d'abord le r챕cup챕rer."
+#, fuzzy, priority:220
+#| msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgstr "Utiliser `<branche>` pour d챕finir la r챕f챕rence symbolique `refs/remotes/<nom>/HEAD` explicitement. Par exemple, `git remote set-head origin master` d챕finira la r챕f챕rence symbolique `refs/remotes/origin/HEAD` 횪 `refs/remotes/origin/master`. Cela ne fonctionnera que si `refs/remotes/origin/master` existe d챕j횪 ; sinon, il faut d'abord le r챕cup챕rer."
#. type: Labeled list
#: en/git-remote.txt:123
@@ -42204,26 +41935,20 @@ msgstr "'set-branches'"
#: en/git-remote.txt:128
#, priority:220
msgid "Changes the list of branches tracked by the named remote. This can be used to track a subset of the available remote branches after the initial setup for a remote."
-msgstr ""
-"Modifier la liste des branches suivies par le distant nomm챕. Cela peut 챗tre "
-"utilis챕 pour suivre un sous-ensemble des branches distantes disponibles "
-"apr챔s la configuration initiale d'un distant."
+msgstr "Modifier la liste des branches suivies par le distant nomm챕. Cela peut 챗tre utilis챕 pour suivre un sous-ensemble des branches distantes disponibles apr챔s la configuration initiale d'un distant."
#. type: Plain text
#: en/git-remote.txt:131
-#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
-msgstr ""
-"Les branches nomm챕es seront interpr챕t챕es comme si elles 챕taient sp챕cifi챕es "
-"avec l'option `-t` sur la ligne de commande `git remote add`."
+#, fuzzy, priority:220
+#| msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgstr "Les branches nomm챕es seront interpr챕t챕es comme si elles 챕taient sp챕cifi챕es avec l'option `-t` sur la ligne de commande `git remote add`."
#. type: Plain text
#: en/git-remote.txt:134
#, priority:220
msgid "With `--add`, instead of replacing the list of currently tracked branches, adds to that list."
-msgstr ""
-"Avec `--add`, au lieu de remplacer la liste des branches actuellement "
-"suivies, ajouter 횪 cette liste."
+msgstr "Avec `--add`, au lieu de remplacer la liste des branches actuellement suivies, ajouter 횪 cette liste."
#. type: Labeled list
#: en/git-remote.txt:135
@@ -42235,18 +41960,13 @@ msgstr "'get-url'"
#: en/git-remote.txt:139
#, priority:220
msgid "Retrieves the URLs for a remote. Configurations for `insteadOf` and `pushInsteadOf` are expanded here. By default, only the first URL is listed."
-msgstr ""
-"R챕cup챔rer les URL pour un distant. Les configurations pour `insteadOf` et "
-"`pushInsteadOf` sont d챕velopp챕es ici. Par d챕faut, seule la premi챔re URL est "
-"list챕e."
+msgstr "R챕cup챔rer les URL pour un distant. Les configurations pour `insteadOf` et `pushInsteadOf` sont d챕velopp챕es ici. Par d챕faut, seule la premi챔re URL est list챕e."
#. type: Plain text
#: en/git-remote.txt:141
#, priority:220
msgid "With `--push`, push URLs are queried rather than fetch URLs."
-msgstr ""
-"Avec `--push`, on interroge les URL de pouss챕e plut척t que les URL de "
-"r챕cup챕ration."
+msgstr "Avec `--push`, on interroge les URL de pouss챕e plut척t que les URL de r챕cup챕ration."
#. type: Plain text
#: en/git-remote.txt:143
@@ -42264,49 +41984,31 @@ msgstr "'set-url'"
#: en/git-remote.txt:149
#, priority:220
msgid "Changes URLs for the remote. Sets first URL for remote <name> that matches regex <oldurl> (first URL if no <oldurl> is given) to <newurl>. If <oldurl> doesn't match any URL, an error occurs and nothing is changed."
-msgstr ""
-"Modifier les URL pour le distant. Fixer la premi챔re URL pour le distant "
-"<nom> qui correspond 횪 la regex <ancienne-url> (premi챔re URL si aucune "
-"<ancienne-url> n'est donn챕e) 횪 <nouvelle-url>. Si <ancienne-url> ne "
-"correspond 횪 aucune URL, une erreur se produit et rien n'est modifi챕."
+msgstr "Modifier les URL pour le distant. Fixer la premi챔re URL pour le distant <nom> qui correspond 횪 la regex <ancienne-url> (premi챔re URL si aucune <ancienne-url> n'est donn챕e) 횪 <nouvelle-url>. Si <ancienne-url> ne correspond 횪 aucune URL, une erreur se produit et rien n'est modifi챕."
#. type: Plain text
#: en/git-remote.txt:151
#, priority:220
msgid "With `--push`, push URLs are manipulated instead of fetch URLs."
-msgstr ""
-"Avec `--push`, les URL de pouss챕e sont manipul챕es au lieu des URL de "
-"r챕cup챕ration."
+msgstr "Avec `--push`, les URL de pouss챕e sont manipul챕es au lieu des URL de r챕cup챕ration."
#. type: Plain text
#: en/git-remote.txt:153
#, priority:220
msgid "With `--add`, instead of changing existing URLs, new URL is added."
-msgstr ""
-"Avec `--add`, au lieu de modifier les URL existantes, on ajoute une nouvelle "
-"URL."
+msgstr "Avec `--add`, au lieu de modifier les URL existantes, on ajoute une nouvelle URL."
#. type: Plain text
#: en/git-remote.txt:157
#, priority:220
msgid "With `--delete`, instead of changing existing URLs, all URLs matching regex <url> are deleted for remote <name>. Trying to delete all non-push URLs is an error."
-msgstr ""
-"Avec `--delete`, au lieu de changer les URL existantes, toutes les URL "
-"correspondant 횪 la regex <url> sont supprim챕es pour le distant <nom>. "
-"Essayer de supprimer toutes les URL non pouss챕e est une erreur."
+msgstr "Avec `--delete`, au lieu de changer les URL existantes, toutes les URL correspondant 횪 la regex <url> sont supprim챕es pour le distant <nom>. Essayer de supprimer toutes les URL non pouss챕e est une erreur."
#. type: Plain text
#: en/git-remote.txt:164
#, priority:220
msgid "Note that the push URL and the fetch URL, even though they can be set differently, must still refer to the same place. What you pushed to the push URL should be what you would see if you immediately fetched from the fetch URL. If you are trying to fetch from one place (e.g. your upstream) and push to another (e.g. your publishing repository), use two separate remotes."
-msgstr ""
-"Notez que l'URL de pouss챕e et l'URL de r챕cup챕ration, m챗me si elles peuvent "
-"챗tre d챕finies diff챕remment, doivent toujours se r챕f챕rer au m챗me endroit. Ce "
-"que vous avez pouss챕 횪 l'URL de pouss챕e doit 챗tre ce que vous verriez si "
-"vous alliez r챕cup챕rer imm챕diatement 횪 l'URL de r챕cup챕ration. Si vous "
-"essayez de r챕cup챕rer depuis un endroit (par exemple votre site en amont) et "
-"de pousser 횪 un autre (par exemple votre d챕p척t de publication), utilisez "
-"deux distants distincts."
+msgstr "Notez que l'URL de pouss챕e et l'URL de r챕cup챕ration, m챗me si elles peuvent 챗tre d챕finies diff챕remment, doivent toujours se r챕f챕rer au m챗me endroit. Ce que vous avez pouss챕 횪 l'URL de pouss챕e doit 챗tre ce que vous verriez si vous alliez r챕cup챕rer imm챕diatement 횪 l'URL de r챕cup챕ration. Si vous essayez de r챕cup챕rer depuis un endroit (par exemple votre site en amont) et de pousser 횪 un autre (par exemple votre d챕p척t de publication), utilisez deux distants distincts."
#. type: Labeled list
#: en/git-remote.txt:166
@@ -42324,10 +42026,7 @@ msgstr "Fournir quelques informations sur le d챕p척t <nom>."
#: en/git-remote.txt:172
#, priority:220
msgid "With `-n` option, the remote heads are not queried first with `git ls-remote <name>`; cached information is used instead."
-msgstr ""
-"Avec l'option `-n`, les branches distantes ne sont pas interrog챕es en "
-"premier avec `git ls-remote <nom>` ; les informations en cache sont "
-"utilis챕es 횪 la place."
+msgstr "Avec l'option `-n`, les branches distantes ne sont pas interrog챕es en premier avec `git ls-remote <nom>` ; les informations en cache sont utilis챕es 횪 la place."
#. type: Labeled list
#: en/git-remote.txt:173
@@ -42339,29 +42038,20 @@ msgstr "'prune'"
#: en/git-remote.txt:180
#, priority:220
msgid "Deletes stale references associated with <name>. By default, stale remote-tracking branches under <name> are deleted, but depending on global configuration and the configuration of the remote we might even prune local tags that haven't been pushed there. Equivalent to `git fetch --prune <name>`, except that no new references will be fetched."
-msgstr ""
-"Supprimer les r챕f챕rences p챕rim챕es associ챕es 횪 <nom>. Par d챕faut, les "
-"branches de suivi 횪 distance p챕rim챕es sous <nom> sont supprim챕es, mais en "
-"fonction de la configuration globale et de la configuration du distant, nous "
-"pourrions m챗me 챕laguer les 챕tiquettes locales qui n'y ont pas 챕t챕 pouss챕es. "
-"횋quivalent 횪 `git fetch --prune <nom>`, sauf qu'aucune nouvelle r챕f챕rence ne "
-"sera r챕cup챕r챕e."
+msgstr "Supprimer les r챕f챕rences p챕rim챕es associ챕es 횪 <nom>. Par d챕faut, les branches de suivi 횪 distance p챕rim챕es sous <nom> sont supprim챕es, mais en fonction de la configuration globale et de la configuration du distant, nous pourrions m챗me 챕laguer les 챕tiquettes locales qui n'y ont pas 챕t챕 pouss챕es. 횋quivalent 횪 `git fetch --prune <nom>`, sauf qu'aucune nouvelle r챕f챕rence ne sera r챕cup챕r챕e."
#. type: Plain text
#: en/git-remote.txt:183
#, priority:220
msgid "See the PRUNING section of linkgit:git-fetch[1] for what it'll prune depending on various configuration."
-msgstr ""
-"Voir la section 횋LAGAGE de linkgit:git-fetch[1] pour savoir ce qui sera "
-"챕lagu챕 en fonction des diff챕rentes configurations."
+msgstr "Voir la section 횋LAGAGE de linkgit:git-fetch[1] pour savoir ce qui sera 챕lagu챕 en fonction des diff챕rentes configurations."
#. type: Plain text
#: en/git-remote.txt:186
-#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
-msgstr ""
-"Avec l'option `--dry-run`, signaler les branches qui seront 챕lagu챕es, mais "
-"ne pas r챕ellement les 챕laguer."
+#, fuzzy, priority:220
+#| msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgstr "Avec l'option `--dry-run`, signaler les branches qui seront 챕lagu챕es, mais ne pas r챕ellement les 챕laguer."
#. type: Labeled list
#: en/git-remote.txt:187
@@ -42371,24 +42061,16 @@ msgstr "'update'"
#. type: Plain text
#: en/git-remote.txt:195
-#, 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 ""
-"R챕cup챕rer les mises 횪 jour pour les distants ou les groupes de distants dans "
-"le d챕p척t comme d챕fini par `remotes.<groupe>`. Si aucun groupe ni aucun "
-"distant n'est sp챕cifi챕 sur la ligne de commande, le param챔tre de "
-"configuration `remotes.default` sera utilis챕 ; si `remotes.default` n'est "
-"pas d챕fini, tous les distants dont le param챔tre de configuration "
-"`remote.<nom>.skipDefaultUpdate` n'est pas d챕fini 횪 true seront mis 횪 jour. "
-"(Voir linkgit:git-config[1])."
+#, 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])."
+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 "R챕cup챕rer les mises 횪 jour pour les distants ou les groupes de distants dans le d챕p척t comme d챕fini par `remotes.<groupe>`. Si aucun groupe ni aucun distant n'est sp챕cifi챕 sur la ligne de commande, le param챔tre de configuration `remotes.default` sera utilis챕 ; si `remotes.default` n'est pas d챕fini, tous les distants dont le param챔tre de configuration `remote.<nom>.skipDefaultUpdate` n'est pas d챕fini 횪 true seront mis 횪 jour. (Voir linkgit:git-config[1])."
#. type: Plain text
#: en/git-remote.txt:197
#, priority:220
msgid "With `--prune` option, run pruning against all the remotes that are updated."
-msgstr ""
-"Avec l'option `--prune`, lancer l'챕lagage contre tous les distants qui sont "
-"mises 횪 jour."
+msgstr "Avec l'option `--prune`, lancer l'챕lagage contre tous les distants qui sont mises 횪 jour."
#. type: Plain text
#: en/git-remote.txt:205
@@ -43503,12 +43185,7 @@ msgstr "R챕initialiser les entr챕es d'index et mettre 횪 jour les fichiers dans
#: en/git-reset.txt:96
#, priority:280
msgid "When the working tree is updated, using --recurse-submodules will also recursively reset the working tree of all active submodules according to the commit recorded in the superproject, also setting the submodules' HEAD to be detached at that commit."
-msgstr ""
-"Lorsque l'arbre de travail est mis 횪 jour, l'utilisation de --recurse-"
-"submodules r챕initialisera 챕galement de mani챔re r챕cursive l'arbre de travail "
-"de tous les sous-modules actifs en fonction du commit enregistr챕 dans le "
-"superprojet, en d챕finissant 챕galement la HEAD des sous-modules 횪 d챕tacher 횪 "
-"ce commit."
+msgstr "Lorsque l'arbre de travail est mis 횪 jour, l'utilisation de --recurse-submodules r챕initialisera 챕galement de mani챔re r챕cursive l'arbre de travail de tous les sous-modules actifs en fonction du commit enregistr챕 dans le superprojet, en d챕finissant 챕galement la HEAD des sous-modules 횪 d챕tacher 횪 ce commit."
#. type: Plain text
#: en/git-reset.txt:100 en/git-restore.txt:30 en/git-revert.txt:33
@@ -44353,14 +44030,7 @@ msgstr "En mode d'extraction clairsem챕, le comportement par d챕faut met seuleme
#: en/git-restore.txt:117
#, priority:100
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
-msgstr ""
-"Si `<pathspec>` nomme un sous-module actif et que l'emplacement de la "
-"restauration inclut l'arbre de travail, le sous-module ne sera mis 횪 jour "
-"que si cette option est donn챕e, auquel cas son arbre de travail sera "
-"restaur챕 au commit enregistr챕 dans le superprojet, et toute modification "
-"locale sera 챕cras챕e. Si rien (ou `--no-recurse-submodules`) n'est utilis챕, "
-"les arbres de travail des sous-modules ne seront pas mis 횪 jour. Tout comme "
-"linkgit:git-checkout[1], cela d챕tachera le `HEAD` du sous-module."
+msgstr "Si `<pathspec>` nomme un sous-module actif et que l'emplacement de la restauration inclut l'arbre de travail, le sous-module ne sera mis 횪 jour que si cette option est donn챕e, auquel cas son arbre de travail sera restaur챕 au commit enregistr챕 dans le superprojet, et toute modification locale sera 챕cras챕e. Si rien (ou `--no-recurse-submodules`) n'est utilis챕, les arbres de travail des sous-modules ne seront pas mis 횪 jour. Tout comme linkgit:git-checkout[1], cela d챕tachera le `HEAD` du sous-module."
#. type: Plain text
#: en/git-restore.txt:124
@@ -47449,7 +47119,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -47461,7 +47131,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49750,8 +49420,7 @@ msgstr "git-submodule(1)"
#: en/git-submodule.txt:7
#, priority:220
msgid "git-submodule - Initialize, update or inspect submodules"
-msgstr ""
-"git-submodule - Initialisation, mise 횪 jour ou inspection des sous-modules"
+msgstr "git-submodule - Initialisation, mise 횪 jour ou inspection des sous-modules"
#. type: Plain text
#: en/git-submodule.txt:24
@@ -49772,8 +49441,7 @@ msgid ""
msgstr ""
"'git submodule' [--quiet] [--cached]\n"
"'git submodule' [--quiet] add [<options>] [--] <d챕p척t> [<chemin>]\n"
-"'git submodule' [--quiet] status [--cached] [--recursive] [--] [<chemin>...]"
-"\n"
+"'git submodule' [--quiet] status [--cached] [--recursive] [--] [<chemin>...]\n"
"'git submodule' [--quiet] init [--] [<chemin>...]\n"
"'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <chemin>...)\n"
"'git submodule' [--quiet] update [<options>] [--] [<chemin>...]\n"
@@ -49800,77 +49468,43 @@ msgstr "Pour plus d'informations sur les sous-modules, voir linkgit:gitsubmodule
#: en/git-submodule.txt:36
#, priority:220
msgid "With no arguments, shows the status of existing submodules. Several subcommands are available to perform operations on the submodules."
-msgstr ""
-"Sans arguments, montrer l'챕tat des sous-modules existants. Plusieurs sous-"
-"commandes sont disponibles pour effectuer des op챕rations sur les sous-"
-"modules."
+msgstr "Sans arguments, montrer l'챕tat des sous-modules existants. Plusieurs sous-commandes sont disponibles pour effectuer des op챕rations sur les sous-modules."
#. type: Labeled list
#: en/git-submodule.txt:37
#, no-wrap, priority:220
msgid "add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]"
-msgstr ""
-"add [-b <branche>] [-f|--force] [--name <nom>] [--reference <d챕p척t>] [--"
-"depth <profondeur>] [--] <d챕p척t> [<chemin>]"
+msgstr "add [-b <branche>] [-f|--force] [--name <nom>] [--reference <d챕p척t>] [--depth <profondeur>] [--] <d챕p척t> [<chemin>]"
#. type: Plain text
#: en/git-submodule.txt:41
#, priority:220
msgid "Add the given repository as a submodule at the given path to the changeset to be committed next to the current project: the current project is termed the \"superproject\"."
-msgstr ""
-"Ajouter le d챕p척t donn챕 comme sous-module au chemin donn챕 vers les "
-"modifications 횪 valider 횪 c척t챕 du projet en cours : le projet en cours est "
-"appel챕 짬 superprojet 쨩."
+msgstr "Ajouter le d챕p척t donn챕 comme sous-module au chemin donn챕 vers les modifications 횪 valider 횪 c척t챕 du projet en cours : le projet en cours est appel챕 짬 superprojet 쨩."
#. type: Plain text
#: en/git-submodule.txt:50
#, priority:220
msgid "<repository> is the URL of the new submodule's origin repository. This may be either an absolute URL, or (if it begins with ./ or ../), the location relative to the superproject's default remote repository (Please note that to specify a repository 'foo.git' which is located right next to a superproject 'bar.git', you'll have to use `../foo.git` instead of `./foo.git` - as one might expect when following the rules for relative URLs - because the evaluation of relative URLs in Git is identical to that of relative directories)."
-msgstr ""
-"<d챕p척t> est l'URL du d챕p척t d'origine du nouveau sous-module. Il peut s'agir "
-"soit d'une URL absolue, soit (si elle commence par ./ ou ../) de "
-"l'emplacement par rapport au d챕p척t distant par d챕faut du superprojet ("
-"veuillez noter que pour sp챕cifier un d챕p척t 'foo.git', voisin d'un "
-"superprojet 'bar.git', vous devrez utiliser `../foo.git` au lieu de `./foo."
-"git` - comme on pourrait s'y attendre en suivant les r챔gles pour les URL "
-"relatives - car l'챕valuation des URL relatives dans Git est identique 횪 "
-"celle des r챕pertoires relatifs)."
+msgstr "<d챕p척t> est l'URL du d챕p척t d'origine du nouveau sous-module. Il peut s'agir soit d'une URL absolue, soit (si elle commence par ./ ou ../) de l'emplacement par rapport au d챕p척t distant par d챕faut du superprojet (veuillez noter que pour sp챕cifier un d챕p척t 'foo.git', voisin d'un superprojet 'bar.git', vous devrez utiliser `../foo.git` au lieu de `./foo.git` - comme on pourrait s'y attendre en suivant les r챔gles pour les URL relatives - car l'챕valuation des URL relatives dans Git est identique 횪 celle des r챕pertoires relatifs)."
#. type: Plain text
#: en/git-submodule.txt:57
#, priority:220
msgid "The default remote is the remote of the remote-tracking branch of the current branch. If no such remote-tracking branch exists or the HEAD is detached, \"origin\" is assumed to be the default remote. If the superproject doesn't have a default remote configured the superproject is its own authoritative upstream and the current working directory is used instead."
-msgstr ""
-"Le distant par d챕faut est le distant de la branche de suivi 횪 distance de la "
-"branche actuelle. Si une telle branche de suivi 횪 distance n'existe pas ou "
-"si HEAD est d챕tach챕e, \"origin\" est suppos챕 챗tre le distant par d챕faut. Si "
-"le superprojet n'a pas de distant par d챕faut configur챕, le superprojet est "
-"l'amont d'autorit챕 et le r챕pertoire de travail actuel est utilis챕 횪 la place."
+msgstr "Le distant par d챕faut est le distant de la branche de suivi 횪 distance de la branche actuelle. Si une telle branche de suivi 횪 distance n'existe pas ou si HEAD est d챕tach챕e, \"origin\" est suppos챕 챗tre le distant par d챕faut. Si le superprojet n'a pas de distant par d챕faut configur챕, le superprojet est l'amont d'autorit챕 et le r챕pertoire de travail actuel est utilis챕 횪 la place."
#. type: Plain text
#: en/git-submodule.txt:66
#, priority:220
msgid "The optional argument <path> is the relative location for the cloned submodule to exist in the superproject. If <path> is not given, the canonical part of the source repository is used (\"repo\" for \"/path/to/repo.git\" and \"foo\" for \"host.xz:foo/.git\"). If <path> exists and is already a valid Git repository, then it is staged for commit without cloning. The <path> is also used as the submodule's logical name in its configuration entries unless `--name` is used to specify a logical name."
-msgstr ""
-"L'argument facultatif <chemin> est l'emplacement relatif du sous-module "
-"clon챕 dans le superprojet. Si <chemin> n'est pas donn챕, la partie canonique "
-"du d챕p척t de sources est utilis챕e (\"depot\" pour \"/chemin/du/depot.git\" et "
-"\"foo\" pour \"hote.xz:foo/.git\"). Si <chemin> existe et est d챕j횪 un d챕p척t "
-"Git valide, alors il est index챕 pour le commit sans clonage. Le <chemin> est "
-"챕galement utilis챕 comme nom logique du sous-module dans ses entr챕es de "
-"configuration, sauf si `--name` est utilis챕 pour sp챕cifier un nom logique."
+msgstr "L'argument facultatif <chemin> est l'emplacement relatif du sous-module clon챕 dans le superprojet. Si <chemin> n'est pas donn챕, la partie canonique du d챕p척t de sources est utilis챕e (\"depot\" pour \"/chemin/du/depot.git\" et \"foo\" pour \"hote.xz:foo/.git\"). Si <chemin> existe et est d챕j횪 un d챕p척t Git valide, alors il est index챕 pour le commit sans clonage. Le <chemin> est 챕galement utilis챕 comme nom logique du sous-module dans ses entr챕es de configuration, sauf si `--name` est utilis챕 pour sp챕cifier un nom logique."
#. type: Plain text
#: en/git-submodule.txt:74
#, priority:220
msgid "The given URL is recorded into `.gitmodules` for use by subsequent users cloning the superproject. If the URL is given relative to the superproject's repository, the presumption is the superproject and submodule repositories will be kept together in the same relative location, and only the superproject's URL needs to be provided. git-submodule will correctly locate the submodule using the relative URL in `.gitmodules`."
-msgstr ""
-"L'URL donn챕e est enregistr챕e dans `.gitmodules` pour 챗tre utilis챕e par les "
-"utilisateurs qui clonent le superprojet plus tard. Si l'URL est donn챕e par "
-"rapport au d챕p척t du superprojet, on suppose que les d챕p척ts du superprojet et "
-"du sous-module seront conserv챕s ensemble au m챗me emplacement relatif, et que "
-"seule l'URL du superprojet doit 챗tre fournie. git-submodule localisera "
-"correctement le sous-module en utilisant l'URL relative dans `.gitmodules`."
+msgstr "L'URL donn챕e est enregistr챕e dans `.gitmodules` pour 챗tre utilis챕e par les utilisateurs qui clonent le superprojet plus tard. Si l'URL est donn챕e par rapport au d챕p척t du superprojet, on suppose que les d챕p척ts du superprojet et du sous-module seront conserv챕s ensemble au m챗me emplacement relatif, et que seule l'URL du superprojet doit 챗tre fournie. git-submodule localisera correctement le sous-module en utilisant l'URL relative dans `.gitmodules`."
#. type: Labeled list
#: en/git-submodule.txt:75
@@ -51070,7 +50704,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -52589,13 +52223,7 @@ msgstr "`git switch` 챕choue quand la r챕f챕rence voulue est d챕j횪 extraite dan
#: en/git-switch.txt:189
#, priority:100
msgid "Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules."
-msgstr ""
-"L'utilisation de `--recurse-submodules` permet de mettre 횪 jour le contenu "
-"de tous les sous-modules actifs en fonction du commit enregistr챕 dans le "
-"super-projet. Si l'option n'est pas sp챕cifi챕e (ou si `--no-recurse-"
-"submodules` est sp챕cifi챕), les arbres de travail des sous-modules ne sont "
-"pas mis 횪 jour. Comme linkgit:git-submodule[1], les `HEAD` des sous-modules "
-"seront d챕tach챕es."
+msgstr "L'utilisation de `--recurse-submodules` permet de mettre 횪 jour le contenu de tous les sous-modules actifs en fonction du commit enregistr챕 dans le super-projet. Si l'option n'est pas sp챕cifi챕e (ou si `--no-recurse-submodules` est sp챕cifi챕), les arbres de travail des sous-modules ne sont pas mis 횪 jour. Comme linkgit:git-submodule[1], les `HEAD` des sous-modules seront d챕tach챕es."
#. type: Plain text
#: en/git-switch.txt:194
@@ -54167,8 +53795,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -57549,16 +57177,7 @@ msgstr "D횋TAILS"
#: 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 `/"
-"chemin/autre/test-prochain` et cr챕e aussi un r챕pertoire `$GIT_DIR/worktrees/"
-"test-prochain` (ou`$GIT_DIR/worktrees/test-prochain1` si `test-prochain` est "
-"d챕j횪 pris)."
+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 `/chemin/autre/test-prochain` et cr챕e aussi 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
@@ -59368,12 +58987,7 @@ msgstr "Dans le cas `--ff-only`, il faut r챕soudre la fusion en avance rapide lo
#: en/merge-options.txt:70
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`."
-msgstr ""
-"Signer le commit r챕sultant de la fusion avec GPG. L'argument `idcl챕` est "
-"optionnel avec par d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit "
-"챗tre coll챕e 횪 l'option sans aucun espace. `--no-gpg-sign` est utile pour "
-"annuler l'effet de la variable de configuration `commit.gpgSign` ainsi que "
-"tout `--gpg-sign` pr챕c챕dent."
+msgstr "Signer le commit r챕sultant de la fusion avec GPG. L'argument `idcl챕` est optionnel avec par d챕faut l'identit챕 du validateur혻; si sp챕cifi챕e, elle doit 챗tre coll챕e 횪 l'option sans aucun espace. `--no-gpg-sign` est utile pour annuler l'effet de la variable de configuration `commit.gpgSign` ainsi que tout `--gpg-sign` pr챕c챕dent."
#. type: Plain text
#: en/merge-options.txt:76
@@ -59511,12 +59125,7 @@ msgstr "Activer/d챕sactiver explicitement l'affichage du progr챔s. Si aucun des
#: en/merge-options.txt:170
#, priority:240
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts."
-msgstr ""
-"Cr챕er automatiquement une entr챕e temporaire de remisage avant le d챕but de "
-"l'op챕ration et l'appliquer apr챔s la fin de l'op챕ration. Cela signifie que "
-"vous pouvez ex챕cuter l'op챕ration sur un arbre de travail sale. Cependant, "
-"utilisez-le avec pr챕caution : l'application finale du remisage apr챔s une "
-"fusion r챕ussie peut entra챤ner des conflits non n챕gligeables."
+msgstr "Cr챕er automatiquement une entr챕e temporaire de remisage avant le d챕but de l'op챕ration et l'appliquer apr챔s la fin de l'op챕ration. Cela signifie que vous pouvez ex챕cuter l'op챕ration sur un arbre de travail sale. Cependant, utilisez-le avec pr챕caution : l'application finale du remisage apr챔s une fusion r챕ussie peut entra챤ner des conflits non n챕gligeables."
#. type: Labeled list
#: en/merge-options.txt:171
@@ -60090,10 +59699,7 @@ msgstr "'mboxrd'"
#: en/pretty-formats.txt:91
#, priority:260
msgid "Like 'email', but lines in the commit message starting with \"From \" (preceded by zero or more \">\") are quoted with \">\" so they aren't confused as starting a new commit."
-msgstr ""
-"Comme 'email', mais les lignes dans le message de validation commen챌ant par "
-"\"From\" (pr챕c챕d챕 de z챕ro ou plus \">\") sont cit챕es avec \">\" pour ne pas "
-"챗tre confondues avec le d챕but d'un nouveau commit."
+msgstr "Comme 'email', mais les lignes dans le message de validation commen챌ant par \"From\" (pr챕c챕d챕 de z챕ro ou plus \">\") sont cit챕es avec \">\" pour ne pas 챗tre confondues avec le d챕but d'un nouveau commit."
#. type: Plain text
#: en/pretty-formats.txt:93
@@ -62447,7 +62053,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr "En voyant un nom d'objet invalide dans l'entr챕e, faire comme si la mauvaise entr챕e n'avait pas 챕t챕 donn챕e."
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -62699,7 +62305,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr "Simplifie l'historique jusqu'횪 l'historique le plus simple en expliquant l'챕tat final de l'arbre. Le plus simple parce qu'il taille certaines branches lat챕rales si le r챕sultat final est le m챗me (c'est-횪-dire qu'il fusionne des branches avec le m챗me contenu)"
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -62708,11 +62314,7 @@ msgstr "--show-pulls"
#: en/rev-list-options.txt:350
#, priority:260
msgid "Include all commits from the default mode, but also any merge commits that are not TREESAME to the first parent but are TREESAME to a later parent. This mode is helpful for showing the merge commits that \"first introduced\" a change to a branch."
-msgstr ""
-"Inclure tous les commits du mode par d챕faut, mais aussi tous les commits de "
-"fusion qui ne sont pas MEMEARBRE au premier parent mais qui sont MEMEARBRE 횪 "
-"un parent ult챕rieur. Ce mode est utile pour montrer les commits de fusion "
-"qui ont \"introduit en premier\" une modification dans une branche."
+msgstr "Inclure tous les commits du mode par d챕faut, mais aussi tous les commits de fusion qui ne sont pas MEMEARBRE au premier parent mais qui sont MEMEARBRE 횪 un parent ult챕rieur. Ce mode est utile pour montrer les commits de fusion qui ont \"introduit en premier\" une modification dans une branche."
#. type: Labeled list
#: en/rev-list-options.txt:351
@@ -63128,20 +62730,13 @@ msgstr ""
#: en/rev-list-options.txt:584
#, priority:260
msgid "Before discussing another option, `--show-pulls`, we need to create a new example history."
-msgstr ""
-"Avant de discuter d'une autre option, `--show-pulls`, nous devons cr챕er un "
-"nouvel exemple d'historique."
+msgstr "Avant de discuter d'une autre option, `--show-pulls`, nous devons cr챕er un nouvel exemple d'historique."
#. type: Plain text
#: en/rev-list-options.txt:589
#, priority:260
msgid "A common problem users face when looking at simplified history is that a commit they know changed a file somehow does not appear in the file's simplified history. Let's demonstrate a new example and show how options such as `--full-history` and `--simplify-merges` works in that case:"
-msgstr ""
-"Un probl챔me courant auquel les utilisateurs sont confront챕s lorsqu'ils "
-"consultent l'historique simplifi챕 est qu'un commit dont ils savent qu'il a "
-"modifi챕 un fichier n'appara챤t pas dans l'historique simplifi챕 du fichier. "
-"Prenons un nouvel exemple et montrons comment des options telles que `--full-"
-"history` et `--simplify-history` fonctionnent dans ce cas :"
+msgstr "Un probl챔me courant auquel les utilisateurs sont confront챕s lorsqu'ils consultent l'historique simplifi챕 est qu'un commit dont ils savent qu'il a modifi챕 un fichier n'appara챤t pas dans l'historique simplifi챕 du fichier. Prenons un nouvel exemple et montrons comment des options telles que `--full-history` et `--simplify-history` fonctionnent dans ce cas :"
#. type: delimited block -
#: en/rev-list-options.txt:597
@@ -63165,28 +62760,13 @@ msgstr ""
#: en/rev-list-options.txt:610
#, priority:260
msgid "For this example, suppose `I` created `file.txt` which was modified by `A`, `B`, and `X` in different ways. The single-parent commits `C`, `Z`, and `Y` do not change `file.txt`. The merge commit `M` was created by resolving the merge conflict to include both changes from `A` and `B` and hence is not TREESAME to either. The merge commit `R`, however, was created by ignoring the contents of `file.txt` at `M` and taking only the contents of `file.txt` at `X`. Hence, `R` is TREESAME to `X` but not `M`. Finally, the natural merge resolution to create `N` is to take the contents of `file.txt` at `R`, so `N` is TREESAME to `R` but not `C`. The merge commits `O` and `P` are TREESAME to their first parents, but not to their second parents, `Z` and `Y` respectively."
-msgstr ""
-"Pour cet exemple, supposons que `I` a cr챕챕 `fichier.txt` qui a 챕t챕 modifi챕 "
-"par `A`, `B` et `X` de diff챕rentes mani챔res. Les commits 횪 parent unique `C`"
-", `Z` et `Y` ne modifient pas `fichier.txt`. Le commit de fusion `M` a 챕t챕 "
-"cr챕챕 en r챕solvant le conflit de fusion pour inclure les deux modifications "
-"de `A` et `B` et n'est donc pas MEMEARBRE pour l'un ou l'autre. Le commit de "
-"fusion `R`, cependant, a 챕t챕 cr챕챕 en ignorant le contenu du fichier `fichier."
-"txt` 횪 `M` et en prenant seulement le contenu du fichier `fichier.txt` 횪 `X`"
-". Par cons챕quent, `R` est MEMEARBRE 횪 `X` mais pas 횪 `M`. Enfin, la "
-"r챕solution de fusion naturelle pour cr챕er `N` est de prendre le contenu du "
-"`fichier.txt` 횪 `R`, donc `N` est MEMEARBRE 횪 `R` mais pas 횪 `C`. La fusion "
-"engage `O` et `P` sont MEMEARBRE 횪 leurs premiers parents, mais pas 횪 leurs "
-"seconds parents, `Z` et `Y` respectivement."
+msgstr "Pour cet exemple, supposons que `I` a cr챕챕 `fichier.txt` qui a 챕t챕 modifi챕 par `A`, `B` et `X` de diff챕rentes mani챔res. Les commits 횪 parent unique `C`, `Z` et `Y` ne modifient pas `fichier.txt`. Le commit de fusion `M` a 챕t챕 cr챕챕 en r챕solvant le conflit de fusion pour inclure les deux modifications de `A` et `B` et n'est donc pas MEMEARBRE pour l'un ou l'autre. Le commit de fusion `R`, cependant, a 챕t챕 cr챕챕 en ignorant le contenu du fichier `fichier.txt` 횪 `M` et en prenant seulement le contenu du fichier `fichier.txt` 횪 `X`. Par cons챕quent, `R` est MEMEARBRE 횪 `X` mais pas 횪 `M`. Enfin, la r챕solution de fusion naturelle pour cr챕er `N` est de prendre le contenu du `fichier.txt` 횪 `R`, donc `N` est MEMEARBRE 횪 `R` mais pas 횪 `C`. La fusion engage `O` et `P` sont MEMEARBRE 횪 leurs premiers parents, mais pas 횪 leurs seconds parents, `Z` et `Y` respectivement."
#. type: Plain text
#: en/rev-list-options.txt:614
#, priority:260
msgid "When using the default mode, `N` and `R` both have a TREESAME parent, so those edges are walked and the others are ignored. The resulting history graph is:"
-msgstr ""
-"En utilisant le mode par d챕faut, `N` et `R` ont tous deux un parent "
-"MEMEARBRE, donc ces bords sont parcourus et les autres sont ignor챕s. Le "
-"graphique d'historique qui en r챕sulte est :"
+msgstr "En utilisant le mode par d챕faut, `N` et `R` ont tous deux un parent MEMEARBRE, donc ces bords sont parcourus et les autres sont ignor챕s. Le graphique d'historique qui en r챕sulte est :"
#. type: delimited block -
#: en/rev-list-options.txt:617
@@ -63198,11 +62778,7 @@ msgstr "\tI---X\n"
#: en/rev-list-options.txt:622
#, priority:260
msgid "When using `--full-history`, Git walks every edge. This will discover the commits `A` and `B` and the merge `M`, but also will reveal the merge commits `O` and `P`. With parent rewriting, the resulting graph is:"
-msgstr ""
-"Lors de l'utilisation de `--full-history`, Git parcourt toutes les ar챗tes . "
-"Il d챕couvrira les commits `A` et `B` et la fusion `M`, mais aussi les "
-"commits de fusion `O` et `P`. Avec la r챕챕criture des parents, le graphe "
-"r챕sultant est :"
+msgstr "Lors de l'utilisation de `--full-history`, Git parcourt toutes les ar챗tes . Il d챕couvrira les commits `A` et `B` et la fusion `M`, mais aussi les commits de fusion `O` et `P`. Avec la r챕챕criture des parents, le graphe r챕sultant est :"
#. type: delimited block -
#: en/rev-list-options.txt:630
@@ -63226,27 +62802,13 @@ msgstr ""
#: en/rev-list-options.txt:638
#, priority:260
msgid "Here, the merge commits `O` and `P` contribute extra noise, as they did not actually contribute a change to `file.txt`. They only merged a topic that was based on an older version of `file.txt`. This is a common issue in repositories using a workflow where many contributors work in parallel and merge their topic branches along a single trunk: manu unrelated merges appear in the `--full-history` results."
-msgstr ""
-"Ici, les commits de fusion `O` et `P` apportent un bruit suppl챕mentaire, car "
-"ils n'ont pas r챕ellement apport챕 de modification 횪 `fichier.txt`. Ils ont "
-"seulement fusionn챕 une branche th챕matique qui 챕tait bas챕e sur une ancienne "
-"version de `fichier.txt`. C'est un probl챔me courant dans les d챕p척ts "
-"utilisant une organisation o첫 de nombreux contributeurs travaillent en "
-"parall챔le et fusionnent leurs branches th챕matiques le long d'un seul tronc : "
-"de nombreuses fusions sans rapport apparaissent dans les r챕sultats de "
-"`--full-history`."
+msgstr "Ici, les commits de fusion `O` et `P` apportent un bruit suppl챕mentaire, car ils n'ont pas r챕ellement apport챕 de modification 횪 `fichier.txt`. Ils ont seulement fusionn챕 une branche th챕matique qui 챕tait bas챕e sur une ancienne version de `fichier.txt`. C'est un probl챔me courant dans les d챕p척ts utilisant une organisation o첫 de nombreux contributeurs travaillent en parall챔le et fusionnent leurs branches th챕matiques le long d'un seul tronc : de nombreuses fusions sans rapport apparaissent dans les r챕sultats de `--full-history`."
#. type: Plain text
#: en/rev-list-options.txt:645
#, priority:260
msgid "When using the `--simplify-merges` option, the commits `O` and `P` disappear from the results. This is because the rewritten second parents of `O` and `P` are reachable from their first parents. Those edges are removed and then the commits look like single-parent commits that are TREESAME to their parent. This also happens to the commit `N`, resulting in a history view as follows:"
-msgstr ""
-"Lorsque l'on utilise l'option `--simplify-merges`, les valeurs `O` et `P` "
-"disparaissent des r챕sultats. Cela est d청 au fait que les seconds parents "
-"r챕챕crits de `O` et `P` sont accessibles depuis leurs premiers parents. Ces "
-"ar챗tes sont supprim챕es et les commits ressemblent alors 횪 des commits "
-"monoparentaux qui sont MEMEARBRE pour leur parent. C'est 챕galement le cas "
-"pour le commit `N`, ce qui donne l'historique suivant :"
+msgstr "Lorsque l'on utilise l'option `--simplify-merges`, les valeurs `O` et `P` disparaissent des r챕sultats. Cela est d청 au fait que les seconds parents r챕챕crits de `O` et `P` sont accessibles depuis leurs premiers parents. Ces ar챗tes sont supprim챕es et les commits ressemblent alors 횪 des commits monoparentaux qui sont MEMEARBRE pour leur parent. C'est 챕galement le cas pour le commit `N`, ce qui donne l'historique suivant :"
#. type: delimited block -
#: en/rev-list-options.txt:653
@@ -63270,77 +62832,53 @@ msgstr ""
#: en/rev-list-options.txt:660
#, priority:260
msgid "In this view, we see all of the important single-parent changes from `A`, `B`, and `X`. We also see the carefully-resolved merge `M` and the not-so-carefully-resolved merge `R`. This is usually enough information to determine why the commits `A` and `B` \"disappeared\" from history in the default view. However, there are a few issues with this approach."
-msgstr ""
-"Dans cette optique, nous voyons toutes les modifications monoparentales de "
-"`A`, `B` et `X`. Nous voyons 챕galement la fusion `M`, soigneusement r챕solue, "
-"et la fusion `R`, pas si soigneusement r챕solue. Ces informations sont "
-"g챕n챕ralement suffisantes pour d챕terminer pourquoi les commits `A` et `B` ont "
-"짬혻disparu혻쨩 de l'historique dans la vue par d챕faut. Cependant, cette "
-"approche pose quelques probl챔mes."
+msgstr "Dans cette optique, nous voyons toutes les modifications monoparentales de `A`, `B` et `X`. Nous voyons 챕galement la fusion `M`, soigneusement r챕solue, et la fusion `R`, pas si soigneusement r챕solue. Ces informations sont g챕n챕ralement suffisantes pour d챕terminer pourquoi les commits `A` et `B` ont 짬혻disparu혻쨩 de l'historique dans la vue par d챕faut. Cependant, cette approche pose quelques probl챔mes."
#. type: Plain text
#: en/rev-list-options.txt:665
#, priority:260
msgid "The first issue is performance. Unlike any previous option, the `--simplify-merges` option requires walking the entire commit history before returning a single result. This can make the option difficult to use for very large repositories."
-msgstr ""
-"La premi챔re question est celle de la performance. Contrairement 횪 toutes les "
-"options pr챕c챕dentes, l'option `--simplify-merges` n챕cessite de parcourir "
-"l'historique complet des commits avant de renvoyer un seul r챕sultat. Cela "
-"peut rendre l'option difficile 횪 utiliser pour les tr챔s grands d챕p척ts."
+msgstr "La premi챔re question est celle de la performance. Contrairement 횪 toutes les options pr챕c챕dentes, l'option `--simplify-merges` n챕cessite de parcourir l'historique complet des commits avant de renvoyer un seul r챕sultat. Cela peut rendre l'option difficile 횪 utiliser pour les tr챔s grands d챕p척ts."
#. type: Plain text
#: en/rev-list-options.txt:674
#, priority:260
msgid "The second issue is one of auditing. When many contributors are working on the same repository, it is important which merge commits introduced a change into an important branch. The problematic merge `R` above is not likely to be the merge commit that was used to merge into an important branch. Instead, the merge `N` was used to merge `R` and `X` into the important branch. This commit may have information about why the change `X` came to override the changes from `A` and `B` in its commit message."
-msgstr ""
-"La deuxi챔me question est celle de l'audit. Lorsque plusieurs contributeurs "
-"travaillent sur le m챗me d챕p척t, il est important de savoir quels commits de "
-"fusion ont introduit un changement dans une branche importante. La fusion "
-"probl챕matique `R` ci-dessus n'est probablement pas le commit de fusion qui a "
-"챕t챕 utilis챕 pour fusionner dans une branche importante. Au lieu de cela, la "
-"fusion `N` a 챕t챕 utilis챕e pour fusionner `R` et `X` dans la branche "
-"importante. Ce commit peut avoir des informations sur la raison pour "
-"laquelle la modifcation `X` est venu remplacer les changements de `A` et `B` "
-"dans son message de commit."
+msgstr "La deuxi챔me question est celle de l'audit. Lorsque plusieurs contributeurs travaillent sur le m챗me d챕p척t, il est important de savoir quels commits de fusion ont introduit un changement dans une branche importante. La fusion probl챕matique `R` ci-dessus n'est probablement pas le commit de fusion qui a 챕t챕 utilis챕 pour fusionner dans une branche importante. Au lieu de cela, la fusion `N` a 챕t챕 utilis챕e pour fusionner `R` et `X` dans la branche importante. Ce commit peut avoir des informations sur la raison pour laquelle la modifcation `X` est venu remplacer les changements de `A` et `B` dans son message de commit."
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-"L'option `--show-pulls` aide 횪 r챕soudre ces deux probl챔mes en ajoutant plus "
-"commits de fusion aux r챕sultats de l'historique. Si une fusion n'est pas "
-"MEMEARBRE vers son premier parent mais est MEMEARBRE vers un parent "
-"ult챕rieur, alors cette fusion est trait챕e comme si elle avait \"tir챕\" le "
-"changement d'une autre branche. Lorsque l'on utilise `--show-pulls` sur cet "
-"exemple (et aucune autre option), le graphe r챕sultant est :"
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, fuzzy, priority:260
+#| msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr "L'option `--show-pulls` aide 횪 r챕soudre ces deux probl챔mes en ajoutant plus commits de fusion aux r챕sultats de l'historique. Si une fusion n'est pas MEMEARBRE vers son premier parent mais est MEMEARBRE vers un parent ult챕rieur, alors cette fusion est trait챕e comme si elle avait \"tir챕\" le changement d'une autre branche. Lorsque l'on utilise `--show-pulls` sur cet exemple (et aucune autre option), le graphe r챕sultant est :"
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr "\tI---X---R---N\n"
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
-msgstr ""
-"Ici, les commits de fusion `R` et `N` sont inclus, car ils ont tir챕 les "
-"commits `X` et `R` dans la branche de base, respectivement. Ces fusions sont "
-"les raisons pour lesquelles les commits `A` et `B` n'apparaissent pas dans "
-"l'historique par d챕faut."
+msgstr "Ici, les commits de fusion `R` et `N` sont inclus, car ils ont tir챕 les commits `X` et `R` dans la branche de base, respectivement. Ces fusions sont les raisons pour lesquelles les commits `A` et `B` n'apparaissent pas dans l'historique par d챕faut."
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
-msgstr ""
-"Lorsque l'option `--show-pulls` est associ챕e 횪 l'option `--simplify-merges`, "
-"le graphe comprend toutes les informations n챕cessaires :"
+msgstr "Lorsque l'option `--show-pulls` est associ챕e 횪 l'option `--simplify-merges`, le graphe comprend toutes les informations n챕cessaires :"
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -63358,47 +62896,43 @@ msgstr ""
"\t `---X--'\n"
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
-msgstr ""
-"Remarquez que puisque `M` est accessible 횪 partir de `R`, l'ar챗te entre `N` "
-"et `M` a 챕t챕 simplifi챕e. Cependant, `N` appara챤t toujours dans l'historique "
-"comme un commit important parce qu'il a 짬혻tir챕혻쨩 le changement `R` dans la "
-"branche principale."
+msgstr "Remarquez que puisque `M` est accessible 횪 partir de `R`, l'ar챗te entre `N` et `M` a 챕t챕 simplifi챕e. Cependant, `N` appara챤t toujours dans l'historique comme un commit important parce qu'il a 짬혻tir챕혻쨩 le changement `R` dans la branche principale."
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr "L'option `--simplify-by-decoration` vous donne une vue d'ensemble de la topologie de l'historique, en omettant les commits qui ne sont pas r챕f챕renc챕s par des 챕tiquettes. Les commits sont marqu챕s comme !MEMEARBRE(en d'autres termes, conserv챕s apr챔s les r챔gles de simplification de l'historique d챕crites ci-dessus) si (1) ils sont r챕f챕renc챕s par des 챕tiquettes, ou (2) ils changent le contenu des chemins donn챕s sur la ligne de commande. Tous les autres commits sont marqu챕s comme MEMEARBRE (soumis 횪 une possible simplification)."
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr "Aides 횪 la bisection"
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr "Limiter la sortie 횪 l'objet commit qui est 횪 peu pr챔s 횪 mi-chemin entre les commits inclus et les commits exclus. Notez que la r챕f챕rence mauvaise de bissection `refs/bisect/bad` est ajout챕e aux commits inclus (si elle existe) et la r챕f챕rence bonne de bissection `refs/bisect/good-*` est ajout챕e aux commits exclus (s'ils existent). Ainsi, en supposant qu'il n'y ait pas de r챕f챕rences dans `refs/bisect/`, si"
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr "\t$ git rev-list --bisect foo ^bar ^baz\n"
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr "affiche 'midpoint', la sortie des deux commandes"
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -63408,91 +62942,91 @@ msgstr ""
"\t$ git rev-list midpoint ^bar ^baz\n"
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr "seraientt 횪 peu pr챔s de la m챗me longueur. Trouver le changement qui introduit une r챕gression se r챕duit donc 횪 une recherche binaire : g챕n챕rer et tester 횪 plusieurs reprises de nouveaux 'midpoint' jusqu'횪 ce que la cha챤ne de commits soit de longueur un. Ne peut pas 챗tre combin챕 avec --first-parent."
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr "Cela calcule la m챗me chose que '--bisect', sauf que les r챕f챕rences dans `refs/bisect/` ne sont pas utilis챕es, et sauf que cela affiche un texte pr챗t 횪 챗tre 챕valu챕 par le shell. Ces lignes attribueront le nom de la r챕vision 횪 mi-parcours 횪 la variable `bisect_rev`, et le nombre pr챕vu de commits 횪 tester apr챔s `bisect_rev` est test챕 횪 `bisect_nr`, le nombre pr챕vu de commits 횪 tester si `bisect_rev` s'av챔re 챗tre bon 횪 `bisect_good`, le nombre pr챕vu d'engagements 횪 tester si `bisect_rev` s'av챔re 챗tre mauvais 횪 `bisect_bad`, et le nombre de commits que nous sommes en train de bissecter en ce moment 횪 `bisect_all`."
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr "Ceci affiche tous les objets commit entre les commits inclus et exclus, class챕s selon leur distance par rapport aux commits inclus et exclus. Les r챕f챕rences dans `refs/bisect/` ne sont pas utilis챕es. Le plus 챕loign챕 d'eux est affich챕 en premier. (C'est le seul affich챕 par `--bisect`.)"
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr "Ceci est utile car il est facile de choisir un bon commit 횪 tester lorsque vous voulez 챕viter de tester certains d'entre eux pour une raison quelconque (ils peuvent ne pas compiler par exemple)."
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr "Cette option peut 챗tre utilis챕e avec `--bisect-vars', dans ce cas, apr챔s tous les objets commit tri챕s, le texte sera le m챗me que si `--bisect-vars' avait 챕t챕 utilis챕 seul."
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr "Ordre des commits"
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr "Par d챕faut, les commits sont affich챕s dans l'ordre chronologique inverse."
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr "N'afficher aucun parent avant que tous ses enfants ne soient affich챕s, mais sinon montrer les commits dans l'ordre de l'horodatage des commits."
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr "N'afficher aucun parent avant que tous ses enfants ne soient affich챕s, mais autrement afficher les commits dans l'ordre d'horodatage de l'auteur."
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr "N'afficher aucun parent avant que tous ses enfants ne soient affich챕s, et 챕viter d'afficher des commits entrem챗l챕s sur plusieurs lignes d'historique."
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr "Par exemple, dans un historique de commit comme celui-ci :"
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -63504,442 +63038,439 @@ msgstr ""
"\t 3----5----6----8---\n"
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr "o첫 les nombres indiquent l'ordre des horodatages de commit, `git rev-list` et consorts avec `--date-order` affichent les commits dans l'ordre d'horodatage : 8 7 6 5 4 3 2 1."
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr "Avec `--topo-order', ils afficheraient 8 6 5 5 3 3 7 4 7 4 2 1 (ou 8 7 4 2 2 6 5 5 3 1) ; certains commits plus anciens sont affich챕s avant les plus r챕cents afin d'챕viter de montrer m챕lang챕s ensemble les commits de deux pistes de d챕veloppement parall챔les."
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr "Sortir les commits choisis pour 챗tre affich챕s (voir la section Limitation des commits ci-dessus) dans l'ordre inverse. Ne peut pas 챗tre combin챕 avec `--walk-reflogs`."
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr "Travers챕e d'objets"
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr "Ces options sont principalement destin챕es 횪 l'empaquetage des d챕p척ts Git."
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
-msgstr ""
-"Imprimer les ID d'objet de tout objet r챕f챕renc챕 par les commits list챕s. `--"
-"objets foo ^bar` signifie donc ``envoie-moi tous les ID d'objets que je dois "
-"t챕l챕charger si j'ai l'objet commit _bar_ mais pas _foo_''."
+msgstr "Imprimer les ID d'objet de tout objet r챕f챕renc챕 par les commits list챕s. `--objets foo ^bar` signifie donc ``envoie-moi tous les ID d'objets que je dois t챕l챕charger si j'ai l'objet commit _bar_ mais pas _foo_''."
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr "Imprimer les identifiants des arbres et des blobs dans l'ordre des commits. Les identifiants des arbres et des blobs sont imprim챕s que lors qu'ils sont r챕f챕renc챕s la premi챔re fois par un commit."
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr "Semblable 횪 `--objects`, mais afficher aussi les ID des commits exclus pr챕fix챕s par un caract챔re ``-''. Ceci est utilis챕 par linkgit:git-pack-objects[1] pour construire un paquet ``thin'', qui enregistre les objets sous forme d챕ltaifi챕e en fonction des objets contenus dans ces commits exclus pour r챕duire le trafic r챕seau."
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr "Similaire 횪 `--objects-edge', mais s'efforce de trouver les commits exclus au prix d'un temps plus long de traitement. Ceci est utilis챕 횪 la place de `--objects-edge' pour construire des paquets ``thin'' pour les d챕p척ts superficiels."
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr "Faire comme si tous les arbres et tous les blobs utilis챕s par l'index 챕taient list챕s sur la ligne de commande. Notez que vous voudrez probablement utiliser aussi `--objects`."
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr "Uniquement utile avec `--objects` ; afficher les ID d'objets qui ne sont pas dans les paquets."
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr "Uniquement utile avec `--objects` ; afficher les noms des ID des objets trouv챕s. C'est le comportement par d챕faut."
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr "Uniquement utile avec `--objects` ; ne pas afficher les noms des ID des objets trouv챕s. Ceci inverse `--object-names`. Ce drapeau permet 횪 la sortie d'챗tre plus facilement analys챕e par des commandes telles que linkgit:git-cat-file[1]."
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr "Uniquement utile avec l'un des `--objects*' ; omettre des objets (g챕n챕ralement les blobs) de la liste des objets affich챕s. Le'<sp챕cificateur-de-filtre>' peut 챗tre l'un des suivants :"
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr "La forme '--filter=blob:none' omet tous les blobs."
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr "La forme'--filter=blob:limit=<n>[kmg]' omet les blobls plus gros que n octets ou unit챕s. n peut 챗tre z챕ro. Les suffixes k, m et g peuvent 챗tre utilis챕s pour nommer les unit챕s en Kio, Mio ou Gio. Par exemple,'blob:limit=1k' est identique 횪 'blob:limit=1024'."
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr "La forme '--filter=sparse:oid=<blob-esque>' utilise une sp챕cification d'extraction clairsem챕e contenue dans le blob (ou l'expression de blob) '<blob-esque>' pour omettre les blobs qui ne seraient pas n챕cessaires pour une extraction clairsem챕e sur les r챕f챕rences demand챕es."
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr "La forme '--filter=tree:<profondeur>' omet tous les blobs et tous les arbres dont la profondeur de l'arbre racine est >= <profondeur> (profondeur minimale si un objet est situ챕 횪 plusieurs profondeurs dans les commits travers챕s). <profondeur>=0 n'inclura pas d'arbres ni de blobs 횪 moins d'챗tre inclus explicitement dans la ligne de commande (ou dans l'entr챕e standard lorsque --stdin est utilis챕). <profondeur>=1 inclura seulement l'arbre et les blobs qui sont r챕f챕renc챕s directement par un commit accessible depuis <commit> ou un objet explicitement donn챕. <profondeur>=2 est comme <profondeur>=1 tout en incluant aussi les arbres et les blobs d'un niveau suppl챕mentaire tir챕 d'un commit ou d'un arbre explicitement donn챕."
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr "Notez que la forme '--filter=sparse:path=<chemin>' qui veut lire 횪 partir d'un chemin arbitraire sur le syst챔me de fichiers a 챕t챕 supprim챕 pour des raisons de s챕curit챕."
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr "Plusieurs drapeaux '--filter=' peuvent 챗tre sp챕cifi챕s pour combiner les filtres. Seuls les objets accept챕s par tous les filtres sont inclus."
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr "La forme'--filter=combine:<filtre1>+<filtre2>+...<filtreN>' peut aussi 챗tre utilis챕e pour combiner plusieurs filtres, mais c'est plus difficile que de r챕p챕ter simplement le drapeau'--filter' et ce n'est g챕n챕ralement pas n챕cessaire. Les filtres sont joints par des signes '{plus}' et les filtres individuels sont cod챕s en % (c'est-횪-dire cod챕s comme des URL). Outre les caract챔res '{plus}' et'%', les caract챔res suivants sont r챕serv챕s et doivent 챕galement 챗tre encod챕s : `~!@#$^^&*()[]{]{}\\ ;\",<>?`+'`+ ainsi que tous les caract챔res avec un code ASCII <= `0x20`, qui inclut l'espace et la ligne nouvelle."
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr "D'autres caract챔res arbitraires peuvent 챕galement 챗tre encod챕s. Par exemple,'combine:tree:3+blob:none' et 'combine:tree%3A3+blob%3Anone' sont 챕quivalents."
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr "D챕sactiver tout argument `--filter=` pr챕c챕dent."
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr "Uniquement utile avec `--filter=` ; imprimer une liste des objets omis par le filtre. Les ID d'objet sont pr챕fix챕s par un caract챔re \"~\"."
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr "La forme '--missing=error' demande que rev-list s'arr챗te avec une erreur si un objet manquant est rencontr챕. C'est l'action par d챕faut."
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr "Le forme '--missing=allow-promisor' est comme 'allow-any', mais ne permettra la travers챕e d'objets de continuer que pour les objets manquants du promettant EXPECTED. Les objets manquants inattendus entra챤neront une erreur."
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr "La forme '--missing=print' est comme 'allow-any', mais affichera aussi une liste des objets manquants. Les ID d'objet sont pr챕fix챕s par un caract챔re \"?\"."
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr "(Pour usage interne seulement.) Pr챕filtrer la travers챕e de l'objet 횪 la limite du promettant. Ceci est utilis챕 avec un clone partiel. C'est plus fort que `--missing=allow-promisor` parce qu'il limite la travers챕e, plut척t que de simplement r챕duire au silence les erreurs sur les objets manquants."
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr "--no-walk[=(sorted|unsorted)]"
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr "Montrer seulement les commits donn챕s, mais ne pas traverser leurs anc챗tres. Ceci n'a aucun effet si une plage est sp챕cifi챕e. Si l'argument `unsorted` est donn챕, les commits sont affich챕s dans l'ordre dans lequel ils ont 챕t챕 donn챕s sur la ligne de commande. Sinon (si `sorted` ou aucun argument n'a 챕t챕 donn챕), les commits sont affich챕s dans l'ordre chronologique inverse par date de validation. Ne peut pas 챗tre combin챕 avec `--graph`."
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr "Remplacer un `--no-walk` pr챕c챕dent."
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr "Formatage des commits"
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr "En utilisant ces options, linkgit:git-rev-list[1] agira de la m챗me mani챔re que la famille plus sp챕cialis챕e d'outils de journaux de validation혻: linkgit:git-log[1], linkgit:git-show[1] et linkgit:git-whatch changed[1]"
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr "Synonyme de `혻--date=relative`."
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr "--date=<format>"
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr "Ne prendre effet que pour les dates indiqu챕es dans un format lisible par l'homme, par exemple lors de l'utilisation de `--pretty`. La variable config `log.date` d챕finit une valeur par d챕faut pour l'option `--date` de la commande log. Par d챕faut, les dates sont affich챕es dans le fuseau horaire d'origine (soit celui du validateur ou celui de l'auteur). Si `-local` est ajout챕 au format (p. ex., `iso-local`), le fuseau horaire local de l'utilisateur est utilis챕 횪 la place."
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr "`--date=relative` affiche les dates relatives 횪 l'heure actuelle, par exemple ``Il y a 2 heures''. L'option `-local` n'a aucun effet pour `--date=relative`."
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr "`--date=local` est un alias pour `--date=default-local`."
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr "`--date=iso` (ou `--date=iso8601`) montre les horodatages dans un format similaire 횪 ISO 8601. Les diff챕rences par rapport au format strict ISO 8601 sont혻:"
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr "une espace au lieu du d챕limiteur date/heure `T`"
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr "une espace entre l'heure et le fuseau horaire"
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr "pas de deux points entre les heures et les minutes du fuseau horaire"
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr "`--date=iso-strict` (ou `--date=iso8601-strict`) affiche les horodatages au format ISO 8601 strict."
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr "`--date=rfc` (ou `--date=rfc2822`) montre les horodatages au format RFC 2822, souvent trouv챕s dans les messages 챕lectroniques."
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr "`--date=short` montre seulement la date, mais pas l'heure, au format `AAA-MM-JJ`."
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr "`--date=raw` montre la date en secondes depuis l'챕poque (1970-01-01 00:00:00 UTC), suivi d'une espace, puis le fuseau horaire en d챕calage par rapport 횪 UTC (un `+` ou `-` avec quatre chiffres ; les deux premiers sont des heures, et les deux seconds des minutes), c'est-횪-dire comme si l'horodatage 챕tait format챕 avec `strftime(\"%s %z\")`). Notez que l'option `-local` n'affecte pas la valeur des secondes depuis l'챕cho (qui est toujours mesur챕e en UTC), mais commute la valeur du fuseau horaire qui l'accompagne."
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr "`--date=human` montre le fuseau horaire si le fuseau horaire ne correspond pas au fuseau horaire actuel, et n'affiche pas la date compl챔te s'il y a correspondance (c'est-횪-dire ne pas afficher l'ann챕e pour les dates qui sont \"cette ann챕e\", mais aussi sauter la date compl챔te elle-m챗me si elle est dans les derniers jours et que nous pouvons juste indiquer le jour de la semaine pass챕e). Pour les dates plus anciennes, l'heure et la minute sont 챕galement omises."
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr "`--date=unix` affiche la date sous forme d'un horodatage d'챕poque Unix (secondes depuis 1970). Comme dans le cas de \" --raw \", c'est toujours en UTC et donc \" --local \" n'a aucun effet."
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr "`--date=format :...` alimente le format `...` vers `strftime` de votre syst챔me , sauf pour %z et %Z, qui sont g챕r챕s en interne. Utilisez `--date=format:%c` pour afficher la date dans le format pr챕f챕r챕 de la locale de votre syst챔me. Voir le manuel de `strftime` pour une liste compl챔te des espaces r챕serv챕s de format. Quand on utilise `-local`, la syntaxe correcte est `--date=format-local :...`."
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr "`--date=default` est le format par d챕faut, et est similaire 횪 `--date=rfc2822`, avec quelques exceptions :"
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr "il n'y a pas de virgule apr챔s le jour de la semaine"
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr "le fuseau horaire est omis lorsque le fuseau horaire local est utilis챕"
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr "Afficher le contenu du commit en format brut ; chaque enregistrement est s챕par챕 par un caract챔re NUL."
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr "Afficher aussi les parents du commit (sous la forme \"parent du commit...\"). Permet 챕galement la r챕챕criture des parents, voir \" Simplification de l'historique \" ci-dessus."
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr "Afficher aussi les enfants du commit (sous la forme \"commit child...\"). Permet 챕galement la r챕챕criture des parents, voir \" Simplification de l'historique \" ci-dessus."
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr "Imprimer l'horodatage brut du commit."
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr "Indiquer de quel c척t챕 d'une diff챕rence sym챕trique un commit est accessible. Les commits de gauche sont pr챕fix챕s par \" < \" et ceux de droite par \" > \". Si on combine avec `--boundary`, ces commits sont pr챕fix챕s par `-`."
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr "Par exemple, si vous avez cette topologie :"
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -63955,19 +63486,19 @@ msgstr ""
"\t o---x---a---a branche A\n"
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr "vous obtiendriez une sortie comme celle-ci :"
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -63985,85 +63516,85 @@ msgstr ""
"\t-xxxxxxx... 1st on a\n"
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr "Dessiner une repr챕sentation graphique en texte de l'historique du commit sur la gauche de la sortie. Cela peut entra챤ner l'impression de lignes suppl챕mentaires entre les validations, afin que l'historique du graphique soit correctement trac챕. Ne peut pas 챗tre combin챕 avec `--no-walk`."
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr "Cela permet la r챕챕criture des parents, voir 짬 Simplification de l'historique 쨩 ci-dessus."
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr "Cela implique l'option `--topo-order` par d챕faut, mais l'option `--date-order` peut aussi 챗tre sp챕cifi챕e."
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr "--show-linear-break [=<barri챔re>]"
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr "Lorsque --graph n'est pas utilis챕, toutes les branches de l'historique sont aplaties, ce qui peut rendre difficile de voir que les deux commits cons챕cutifs n'appartiennent pas 횪 une branche lin챕aire. Dans ce cas, cette option met une barri챔re entre les deux. Si `<barri챔re>` est sp챕cifi챕, c'est la cha챤ne de caract챔res qui sera affich챕e 횪 la place de celle par d챕faut."
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr "Imprimer un nombre indiquant combien de commits auraient 챕t챕 list챕s, et supprimer toutes les autres sorties. Lorsqu'il est utilis챕 avec `--left-right`, imprimer 횪 la place les comptes des commits gauche et droite, s챕par챕s par une tabulation. Lorsqu'utilis챕 avec `--cherry-mark`, omettre les commits 챕quivalents de rustines de ces comptes et imprimer le compte des commits 챕quivalents s챕par챕s par une tabulation."
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr "Formatage des diffs"
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 "Voici la liste des options qui permettent de contr척ler la mise en forme de la sortie de la commande diff. Certaines d'entre elles sont sp챕cifiques 횪 linkgit:git-rev-list[1], mais d'autres options de diff peuvent 챗tre sp챕cifi챕es. Voir linkgit:git-diff-files[1] pour plus d'options."
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr "Avec cette option, la sortie de diff pour un commit de fusion montre les diff챕rences de chacun des parents vers le r챕sultat de la fusion simultan챕ment au lieu de montrer une 횪 une les diff챕rences par paires entre un parent et le r챕sultat. De plus, il ne r챕pertorie que les fichiers qui ont 챕t챕 modifi챕s par tous les parents."
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr "Ce drapeau implique l'option `-c` et compresse davantage la sortie du patch en omettant les morceaux inint챕ressants dont le contenu dans les parents n'a que deux variantes et le r챕sultat de la fusion choisit l'une d'entre elles sans modification."
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr "Ce drapeau fait que les commits de fusion montrent la diff챕rence compl챔te comme les commits r챕guliers ; pour chaque parent de la fusion, une entr챕e de journal et une diff챕rence s챕par챕es sont g챕n챕r챕es. Une exception est que seule la diff챕rence par rapport au premier parent est affich챕e quand l'option `--first-parent` est donn챕e ; dans ce cas, la sortie repr챕sente les modifications que la fusion a apport챕es _dans_ la branche alors courante."
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr "Afficher les diff챕rences r챕cursives."
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr "Afficher les objets arbres dans la sortie diff. Cela implique `-r`."
@@ -64303,10 +63834,8 @@ msgstr "Les syntaxes suivantes peuvent 챗tre utilis챕es avec eux혻:"
#. 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}compte@{endsb}h척te.xz{startsb}:port{endsb}/chemin/du/d챕p척t.git/"
+msgid "ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/"
+msgstr "ssh://{startsb}compte@{endsb}h척te.xz{startsb}:port{endsb}/chemin/du/d챕p척t.git/"
#. type: Plain text
#: en/urls.txt:20
diff --git a/po/documentation.hu.po b/po/documentation.hu.po
index c219ccb..88a8a8e 100644
--- a/po/documentation.hu.po
+++ b/po/documentation.hu.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2019-12-10 22:56+0100\n"
"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -312,143 +312,155 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr ""
@@ -1116,83 +1128,95 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Switch branches."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr ""
@@ -2781,11 +2805,11 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 ""
@@ -6483,7 +6507,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6513,7 +6537,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6761,7 +6785,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7094,7 +7118,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9866,7 +9890,7 @@ msgstr "--git-format"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13618,7 +13642,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -18888,7 +18912,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19536,13 +19560,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27003,7 +27027,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27019,7 +27043,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29078,7 +29102,7 @@ msgstr ""
#, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
@@ -35500,7 +35524,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35722,7 +35746,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35734,13 +35758,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35752,7 +35776,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35764,7 +35788,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -41254,7 +41278,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41277,7 +41301,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41295,7 +41319,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41403,13 +41427,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41427,7 +41451,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41535,7 +41559,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41547,7 +41571,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46445,7 +46469,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46457,7 +46481,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49879,7 +49903,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -52939,8 +52963,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61127,7 +61151,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61379,7 +61403,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -61875,31 +61899,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -61911,43 +61941,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -61955,91 +61985,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62048,439 +62078,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62491,19 +62521,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62515,85 +62545,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.id.po b/po/documentation.id.po
index 1ee1027..862908f 100644
--- a/po/documentation.id.po
+++ b/po/documentation.id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -312,143 +312,155 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr ""
@@ -1116,83 +1128,95 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Switch branches."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr ""
@@ -2781,11 +2805,11 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 ""
@@ -6483,7 +6507,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6513,7 +6537,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6761,7 +6785,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7094,7 +7118,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9866,7 +9890,7 @@ msgstr "--git-format"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13618,7 +13642,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -18888,7 +18912,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19536,13 +19560,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27003,7 +27027,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27019,7 +27043,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29078,7 +29102,7 @@ msgstr ""
#, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
@@ -35500,7 +35524,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35722,7 +35746,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35734,13 +35758,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35752,7 +35776,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35764,7 +35788,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -41254,7 +41278,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41277,7 +41301,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41295,7 +41319,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41403,13 +41427,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41427,7 +41451,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41535,7 +41559,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41547,7 +41571,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46445,7 +46469,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46457,7 +46481,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49879,7 +49903,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -52939,8 +52963,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61127,7 +61151,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61379,7 +61403,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -61875,31 +61899,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -61911,43 +61941,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -61955,91 +61985,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62048,439 +62078,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62491,19 +62521,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62515,85 +62545,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.it.po b/po/documentation.it.po
index fc12bbd..420e478 100644
--- a/po/documentation.it.po
+++ b/po/documentation.it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2020-05-24 21:41+0000\n"
"Last-Translator: Ivan Fossati <vania1366@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -91,7 +91,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -315,143 +315,155 @@ msgstr "Visualizza quali revisione e autore hanno modificato ogni singola riga d
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, fuzzy, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr "Conta il numero di oggetti non in un pack e la loro occupazione di spazio su disco"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, fuzzy, priority:100
msgid "Show changes using common diff tools."
msgstr "Visualizza le modifiche usando tool comuni per la visualizzazione dei diff"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, fuzzy, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr "Verifica la connessione e la validit횪 degli oggetti nel database"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, fuzzy, priority:100
msgid "Display help information about Git."
msgstr "Visualizza una guida a Git"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, fuzzy, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr "Sfoglia istantaneamente il tuo repository di lavoro su gitweb"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, fuzzy, priority:100
msgid "Show three-way merge without touching index."
msgstr "Visualizza un merge a tre vie senza modificare l'indice"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, fuzzy, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr "Riusa la risoluzione registrata dei merge che hanno generato conflitti"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, fuzzy, priority:100
msgid "Show branches and their commits."
msgstr "Visualizza i branch e i loro commit"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, fuzzy, priority:100
msgid "Check the GPG signature of commits."
msgstr "Verifica la firma GPG dei commit"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, fuzzy, priority:100
msgid "Check the GPG signature of tags."
msgstr "Verifica la firma GPG dei tag"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, fuzzy, priority:100
msgid "Show logs with difference each commit introduces."
msgstr "Visualizza i registri insieme alle differenze introdotte da ciascun commit"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, fuzzy, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr "Interfaccia Web per Git (frontend Web ai repository Git)"
@@ -1119,83 +1131,95 @@ msgstr "Visualizza vari tipi di oggetti"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, fuzzy, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr "Mette da parte le modifiche in una directory di lavoro sporca"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, fuzzy, priority:100
msgid "Show the working tree status."
msgstr "Visualizza lo stato dell'albero di lavoro"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, fuzzy, priority:100
msgid "Initialize, update or inspect submodules."
msgstr "Inizializza, aggiorna o esamina sottomoduli"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, fuzzy, priority:100
msgid "Switch branches."
msgstr "Passa da un branch a un altro"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, fuzzy, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr "Crea, elenca, elimina o verifica un oggetto tag firmato con GPG"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, fuzzy, priority:100
msgid "Manage multiple working trees."
msgstr "Gestisce alberi di lavoro multipli"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, fuzzy, priority:100
msgid "The Git repository browser."
msgstr "Il browser per i repository Git"
@@ -2761,11 +2785,7 @@ msgstr ""
#: en/date-formats.txt:15
#, 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 timestamp> <offset fuso orario>`, dove `<unix timestamp>` 챔 il "
-"numero di secondi dall'epoca UNIX. `<offset fuso orario>` 챔 un offset "
-"positivo o negativo da UTC. Ad esempio CET (che 챔 1 ora avanti rispetto a "
-"UTC) 챔 `+ 0100`."
+msgstr "횊 `<unix timestamp> <offset fuso orario>`, dove `<unix timestamp>` 챔 il numero di secondi dall'epoca UNIX. `<offset fuso orario>` 챔 un offset positivo o negativo da UTC. Ad esempio CET (che 챔 1 ora avanti rispetto a UTC) 챔 `+ 0100`."
#. type: Labeled list
#: en/date-formats.txt:16
@@ -2777,9 +2797,7 @@ msgstr "RFC 2822"
#: en/date-formats.txt:19
#, fuzzy, priority:280
msgid "The standard email format as described by RFC 2822, for example `Thu, 07 Apr 2005 22:13:13 +0200`."
-msgstr ""
-"Il formato e-mail standard descritto da RFC 2822, ad esempio \"Gio, 07 "
-"aprile 2005 22:13:13 + 0200\"."
+msgstr "Il formato e-mail standard descritto da RFC 2822, ad esempio \"Gio, 07 aprile 2005 22:13:13 + 0200\"."
#. type: Labeled list
#: en/date-formats.txt:20
@@ -2789,21 +2807,16 @@ msgstr "ISO 8601"
#. type: Plain text
#: en/date-formats.txt:26
-#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
-msgstr ""
-"Ora e data specificate dalla norma ISO 8601, ad esempio \"2005-04-07T22: 13: "
-"13\". Il parser accetta anche uno spazio al posto del carattere `T`. Le "
-"parti frazionarie di un secondo verranno ignorate, ad esempio `2005-04-07T22:"
-" 13: 13.019` sar횪 trattato come` 2005-04-07T22: 13: 13`"
+#, fuzzy, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
+msgstr "Ora e data specificate dalla norma ISO 8601, ad esempio \"2005-04-07T22: 13: 13\". Il parser accetta anche uno spazio al posto del carattere `T`. Le parti frazionarie di un secondo verranno ignorate, ad esempio `2005-04-07T22: 13: 13.019` sar횪 trattato come` 2005-04-07T22: 13: 13`"
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, fuzzy, 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 ""
-"Inoltre, la parte della data 챔 accettata nei seguenti formati: `AAAA.MM.DG`,`"
-" MM / GG / AAAA` e `GG.MM.AAAA`."
+msgstr "Inoltre, la parte della data 챔 accettata nei seguenti formati: `AAAA.MM.DG`,` MM / GG / AAAA` e `GG.MM.AAAA`."
#. type: Title -
#: en/diff-format.txt:2
@@ -2821,9 +2834,7 @@ msgstr ""
#: en/diff-format.txt:9
#, fuzzy, priority:280
msgid "These commands all compare two sets of things; what is compared differs:"
-msgstr ""
-"Tutti questi comandi mettono a confronto due serie di cose; ci챵 che viene "
-"confrontato differisce:"
+msgstr "Tutti questi comandi mettono a confronto due serie di cose; ci챵 che viene confrontato differisce:"
#. type: Labeled list
#: en/diff-format.txt:10
@@ -2877,10 +2888,7 @@ msgstr "confronta l'indice e i file sul filesystem."
#: en/diff-format.txt:25
#, fuzzy, 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 ""
-"Il comando \"git-diff-tree\" inizia il suo output stampando l'hash di ci챵 "
-"che viene confrontato. Successivamente, tutti i comandi stampano una riga di "
-"output per file modificato."
+msgstr "Il comando \"git-diff-tree\" inizia il suo output stampando l'hash di ci챵 che viene confrontato. Successivamente, tutti i comandi stampano una riga di output per file modificato."
#. type: Plain text
#: en/diff-format.txt:27
@@ -2946,9 +2954,7 @@ msgstr "sha1 per \"src\"; 0 \\ {40 \\} se creazione o non fuso."
#: en/diff-format.txt:47
#, fuzzy, priority:280
msgid "sha1 for \"dst\"; 0\\{40\\} if creation, unmerged or \"look at work tree\"."
-msgstr ""
-"sha1 per \"dst\"; 0 \\ {40 \\} se la creazione, non unita o \"guarda "
-"l'albero di lavoro\"."
+msgstr "sha1 per \"dst\"; 0 \\ {40 \\} se la creazione, non unita o \"guarda l'albero di lavoro\"."
#. type: Plain text
#: en/diff-format.txt:49
@@ -2972,8 +2978,7 @@ msgstr "percorso per \"src\""
#: en/diff-format.txt:52
#, fuzzy, priority:280
msgid "a tab or a NUL when `-z` option is used; only exists for C or R."
-msgstr ""
-"un tab o un NUL quando viene usata l'opzione `-z`; esiste solo per C o R."
+msgstr "un tab o un NUL quando viene usata l'opzione `-z`; esiste solo per C o R."
#. type: Plain text
#: en/diff-format.txt:53
@@ -3033,9 +3038,7 @@ msgstr "T: modifica del tipo di file"
#: en/diff-format.txt:65
#, fuzzy, priority:280
msgid "U: file is unmerged (you must complete the merge before it can be committed)"
-msgstr ""
-"U: il file non 챔 unito (챔 necessario completare l'unione prima di poter "
-"eseguire il commit)"
+msgstr "U: il file non 챔 unito (챔 necessario completare l'unione prima di poter eseguire il commit)"
#. type: Plain text
#: en/diff-format.txt:66
@@ -3047,11 +3050,7 @@ msgstr "X: tipo di modifica \"unknown\" (molto probabilmente un bug, segnalalo)"
#: en/diff-format.txt:71
#, fuzzy, 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 ""
-"Le lettere di stato C e R sono sempre seguite da un punteggio (che indica la "
-"percentuale di somiglianza tra la fonte e il bersaglio della mossa o della "
-"copia). La lettera di stato M pu챵 essere seguita da un punteggio (che indica "
-"la percentuale di differenza) per la riscrittura dei file."
+msgstr "Le lettere di stato C e R sono sempre seguite da un punteggio (che indica la percentuale di somiglianza tra la fonte e il bersaglio della mossa o della copia). La lettera di stato M pu챵 essere seguita da un punteggio (che indica la percentuale di differenza) per la riscrittura dei file."
#. type: Plain text
#: en/diff-format.txt:74
@@ -3075,11 +3074,7 @@ msgstr ":100644 100644 5be4a4a 0000000 M file.c\n"
#: en/diff-format.txt:85 en/git-ls-files.txt:212 en/git-ls-tree.txt:101
#, fuzzy, priority:280
msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). Using `-z` the filename is output verbatim and the line is terminated by a NUL byte."
-msgstr ""
-"Senza l'opzione `-z`, i nomi dei percorsi con caratteri\" insoliti \"sono "
-"citati come spiegato per la variabile di configurazione` core.quotePath` ("
-"vedi linkgit: git-config [1]). Usando `-z` il nome del file viene emesso "
-"testualmente e la linea viene terminata da un byte NUL."
+msgstr "Senza l'opzione `-z`, i nomi dei percorsi con caratteri\" insoliti \"sono citati come spiegato per la variabile di configurazione` core.quotePath` (vedi linkgit: git-config [1]). Usando `-z` il nome del file viene emesso testualmente e la linea viene terminata da un byte NUL."
#. type: Title -
#: en/diff-format.txt:87
@@ -3091,10 +3086,7 @@ msgstr "differente formato per le fusioni"
#: en/diff-format.txt:93
#, priority:280
msgid "\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` or `--cc` option to generate diff output also for merge commits. The output differs from the format described above in the following way:"
-msgstr ""
-"\"git-diff-tree\", \"git-diff-files\" e \"git-diff --raw\" possono prendere "
-"l'opzione `-c` o` --cc` per generare output differenti anche per incorporare "
-"commit. L'output differisce dal formato sopra descritto nel modo seguente:"
+msgstr "\"git-diff-tree\", \"git-diff-files\" e \"git-diff --raw\" possono prendere l'opzione `-c` o` --cc` per generare output differenti anche per incorporare commit. L'output differisce dal formato sopra descritto nel modo seguente:"
#. type: Plain text
#: en/diff-format.txt:95
@@ -3130,11 +3122,7 @@ msgstr ""
#: en/diff-format.txt:104
#, fuzzy, priority:280
msgid "For `-c` and `--cc`, only the destination or final path is shown even if the file was renamed on any side of history. With `--combined-all-paths`, the name of the path in each parent is shown followed by the name of the path in the merge commit."
-msgstr ""
-"Per `-c` e` --cc`, viene mostrato solo il percorso di destinazione o finale "
-"anche se il file 챔 stato rinominato su qualsiasi lato della cronologia. Con "
-"`--combined-all-percorsi`, viene mostrato il nome del percorso in ciascun "
-"genitore seguito dal nome del percorso nel commit di unione."
+msgstr "Per `-c` e` --cc`, viene mostrato solo il percorso di destinazione o finale anche se il file 챔 stato rinominato su qualsiasi lato della cronologia. Con `--combined-all-percorsi`, viene mostrato il nome del percorso in ciascun genitore seguito dal nome del percorso nel commit di unione."
#. type: Plain text
#: en/diff-format.txt:106
@@ -3170,16 +3158,13 @@ msgid ""
msgstr ""
"::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdesc.c\tdesc.c\tdesc.c\n"
"::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM\tfoo.sh\tbar.sh\tbar.sh\n"
-"::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tfooey.c\tfuey.c\tphooey."
-"c\n"
+"::100644 100644 100644 e07d6c5 9042e82 ee91881 RR\tfooey.c\tfuey.c\tphooey.c\n"
#. type: Plain text
#: en/diff-format.txt:122
#, fuzzy, priority:280
msgid "Note that 'combined diff' lists only files which were modified from all parents."
-msgstr ""
-"Notare che \"combinata diff\" elenca solo i file che sono stati modificati "
-"da tutti i genitori."
+msgstr "Notare che \"combinata diff\" elenca solo i file che sono stati modificati da tutti i genitori."
#. type: Title -
#: en/diff-format.txt:128
@@ -3191,22 +3176,13 @@ msgstr "altri formati differenti"
#: en/diff-format.txt:134
#, fuzzy, priority:280
msgid "The `--summary` option describes newly added, deleted, renamed and copied files. The `--stat` option adds diffstat(1) graph to the output. These options can be combined with other options, such as `-p`, and are meant for human consumption."
-msgstr ""
-"L'opzione `--summary` descrive i file appena aggiunti, eliminati, rinominati "
-"e copiati. L'opzione `--stat` aggiunge il grafico diffstat (1) all'output. "
-"Queste opzioni possono essere combinate con altre opzioni, come `-p`, e sono "
-"pensate per il consumo umano."
+msgstr "L'opzione `--summary` descrive i file appena aggiunti, eliminati, rinominati e copiati. L'opzione `--stat` aggiunge il grafico diffstat (1) all'output. Queste opzioni possono essere combinate con altre opzioni, come `-p`, e sono pensate per il consumo umano."
#. type: Plain text
#: en/diff-format.txt:139
#, fuzzy, priority:280
msgid "When showing a change that involves a rename or a copy, `--stat` output formats the pathnames compactly by combining common prefix and suffix of the pathnames. For example, a change that moves `arch/i386/Makefile` to `arch/x86/Makefile` while modifying 4 lines will be shown like this:"
-msgstr ""
-"Quando si mostra una modifica che comporta una ridenominazione o una copia, "
-"l'output `--stat` formatta i nomi dei percorsi in modo compatto combinando "
-"prefisso e suffisso comuni dei nomi dei percorsi. Ad esempio, una modifica "
-"che sposta `arch / i386 / Makefile` su` arch / x86 / Makefile` durante la "
-"modifica di 4 linee verr횪 mostrata in questo modo:"
+msgstr "Quando si mostra una modifica che comporta una ridenominazione o una copia, l'output `--stat` formatta i nomi dei percorsi in modo compatto combinando prefisso e suffisso comuni dei nomi dei percorsi. Ad esempio, una modifica che sposta `arch / i386 / Makefile` su` arch / x86 / Makefile` durante la modifica di 4 linee verr횪 mostrata in questo modo:"
#. type: delimited block -
#: en/diff-format.txt:142
@@ -3218,10 +3194,7 @@ msgstr "arch/{i386 => x86}/Makefile | 4 +--\n"
#: en/diff-format.txt:147
#, fuzzy, priority:280
msgid "The `--numstat` option gives the diffstat(1) information but is designed for easier machine consumption. An entry in `--numstat` output looks like this:"
-msgstr ""
-"L'opzione `--numstat` fornisce le informazioni diffstat (1) ma 챔 progettata "
-"per facilitare il consumo della macchina. Una voce nell'output `--numstat` 챔 "
-"simile alla seguente:"
+msgstr "L'opzione `--numstat` fornisce le informazioni diffstat (1) ma 챔 progettata per facilitare il consumo della macchina. Una voce nell'output `--numstat` 챔 simile alla seguente:"
#. type: delimited block -
#: en/diff-format.txt:151
@@ -3271,9 +3244,7 @@ msgstr "una newline."
#: en/diff-format.txt:163
#, fuzzy, priority:280
msgid "When `-z` output option is in effect, the output is formatted this way:"
-msgstr ""
-"Quando l'opzione di output `-z` 챔 attiva, l'output viene formattato in "
-"questo modo:"
+msgstr "Quando l'opzione di output `-z` 챔 attiva, l'output viene formattato in questo modo:"
#. type: delimited block -
#: en/diff-format.txt:167
@@ -3317,13 +3288,7 @@ msgstr ""
#: en/diff-format.txt:185
#, fuzzy, priority:280
msgid "The extra `NUL` before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to `NUL` would yield the pathname, but if that is `NUL`, the record will show two paths."
-msgstr ""
-"Il `NUL` extra prima del percorso di preimage nel caso rinominato 챔 quello "
-"di consentire agli script che leggono l'output di dire se il record corrente "
-"da leggere 챔 un record a percorso singolo o un record di rinomina / copia "
-"senza continuare a leggere. Dopo aver letto le righe aggiunte ed eliminate, "
-"la lettura fino a `NUL` produrrebbe il nome del percorso, ma se questo 챔` "
-"NUL`, il record mostrer횪 due percorsi."
+msgstr "Il `NUL` extra prima del percorso di preimage nel caso rinominato 챔 quello di consentire agli script che leggono l'output di dire se il record corrente da leggere 챔 un record a percorso singolo o un record di rinomina / copia senza continuare a leggere. Dopo aver letto le righe aggiunte ed eliminate, la lettura fino a `NUL` produrrebbe il nome del percorso, ma se questo 챔` NUL`, il record mostrer횪 due percorsi."
#. type: Title -
#: en/diff-generate-patch.txt:2
@@ -3675,9 +3640,7 @@ msgstr "--no-patch"
#: en/diff-options.txt:34
#, fuzzy, priority:280
msgid "Suppress diff output. Useful for commands like `git show` that show the patch by default, or to cancel the effect of `--patch`."
-msgstr ""
-"Sopprime l'output differente. Utile per comandi come `git show` che mostrano "
-"la patch di default, o per cancellare l'effetto di` --patch`."
+msgstr "Sopprime l'output differente. Utile per comandi come `git show` che mostrano la patch di default, o per cancellare l'effetto di` --patch`."
#. type: Labeled list
#: en/diff-options.txt:36
@@ -3737,10 +3700,7 @@ msgstr "--output-indicator-context=<char>"
#: en/diff-options.txt:53
#, fuzzy, priority:280
msgid "Specify the character used to indicate new, old or context lines in the generated patch. Normally they are '+', '-' and ' ' respectively."
-msgstr ""
-"Specifica il carattere utilizzato per indicare le linee nuove, vecchie o di "
-"contesto nella patch generata. Normalmente sono '+', '-' e '' "
-"rispettivamente."
+msgstr "Specifica il carattere utilizzato per indicare le linee nuove, vecchie o di contesto nella patch generata. Normalmente sono '+', '-' e '' rispettivamente."
#. type: Labeled list
#: en/diff-options.txt:55 en/git-replace.txt:78 en/git-verify-commit.txt:19 en/git-verify-tag.txt:19
@@ -3787,9 +3747,7 @@ msgstr "--indent-heuristic"
#: en/diff-options.txt:79
#, fuzzy, priority:280
msgid "Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default."
-msgstr ""
-"Abilita la ricerca che sposta i diversi limiti del pezzo per rendere pi첫 "
-"semplice la lettura delle patch. Questo 챔 il valore predefinito."
+msgstr "Abilita la ricerca che sposta i diversi limiti del pezzo per rendere pi첫 semplice la lettura delle patch. Questo 챔 il valore predefinito."
#. type: Labeled list
#: en/diff-options.txt:80
@@ -3813,9 +3771,7 @@ msgstr "--minimal"
#: en/diff-options.txt:86 en/diff-options.txt:112
#, fuzzy, priority:280
msgid "Spend extra time to make sure the smallest possible diff is produced."
-msgstr ""
-"Trascorrere del tempo extra per assicurarsi che venga prodotta la differenza "
-"pi첫 piccola possibile."
+msgstr "Trascorrere del tempo extra per assicurarsi che venga prodotta la differenza pi첫 piccola possibile."
#. type: Labeled list
#: en/diff-options.txt:87
@@ -3863,11 +3819,7 @@ msgstr "Questa opzione pu챵 essere specificata pi첫 di una volta."
#: en/diff-options.txt:102
#, fuzzy, priority:280
msgid "If a line exists in both the source and destination, exists only once, and starts with this text, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the \"patience diff\" algorithm internally."
-msgstr ""
-"Se esiste una riga sia nella sorgente che nella destinazione, esiste una "
-"sola volta e inizia con questo testo, questo algoritmo tenta di impedire che "
-"appaia come una cancellazione o aggiunta nell'output. Utilizza internamente "
-"l'algoritmo \"pazience diff\"."
+msgstr "Se esiste una riga sia nella sorgente che nella destinazione, esiste una sola volta e inizia con questo testo, questo algoritmo tenta di impedire che appaia come una cancellazione o aggiunta nell'output. Utilizza internamente l'algoritmo \"pazience diff\"."
#. type: Labeled list
#: en/diff-options.txt:103
@@ -3909,8 +3861,7 @@ msgstr "`patience`"
#: en/diff-options.txt:114
#, fuzzy, priority:280
msgid "Use \"patience diff\" algorithm when generating patches."
-msgstr ""
-"Utilizzare l'algoritmo \"pazience diff\" durante la generazione di patch."
+msgstr "Utilizzare l'algoritmo \"pazience diff\" durante la generazione di patch."
#. type: Labeled list
#: en/diff-options.txt:114
@@ -3922,18 +3873,13 @@ msgstr "`histogram`"
#: en/diff-options.txt:117
#, fuzzy, priority:280
msgid "This algorithm extends the patience algorithm to \"support low-occurrence common elements\"."
-msgstr ""
-"Questo algoritmo estende l'algoritmo patience per \"supportare elementi "
-"comuni a bassa occorrenza\"."
+msgstr "Questo algoritmo estende l'algoritmo patience per \"supportare elementi comuni a bassa occorrenza\"."
#. type: Plain text
#: en/diff-options.txt:122
#, fuzzy, priority:280
msgid "For instance, if you configured the `diff.algorithm` variable to a non-default value and want to use the default one, then you have to use `--diff-algorithm=default` option."
-msgstr ""
-"Ad esempio, se hai configurato la variabile `diff.algorithm` su un valore "
-"non predefinito e vuoi usare quello predefinito, allora devi usare l'opzione`"
-" --diff-algoritmo = default`."
+msgstr "Ad esempio, se hai configurato la variabile `diff.algorithm` su un valore non predefinito e vuoi usare quello predefinito, allora devi usare l'opzione` --diff-algoritmo = default`."
#. type: Labeled list
#: en/diff-options.txt:123
@@ -3951,10 +3897,7 @@ msgstr ""
#: en/diff-options.txt:140
#, fuzzy, priority:280
msgid "These parameters can also be set individually with `--stat-width=<width>`, `--stat-name-width=<name-width>` and `--stat-count=<count>`."
-msgstr ""
-"Questi parametri possono anche essere impostati individualmente con `--stat-"
-"width = <width>`, `--stat-name-width = <name-width>` e `--stat-count = "
-"<count>`."
+msgstr "Questi parametri possono anche essere impostati individualmente con `--stat-width = <width>`, `--stat-name-width = <name-width>` e `--stat-count = <count>`."
#. type: Labeled list
#: en/diff-options.txt:141
@@ -3966,13 +3909,7 @@ msgstr "--compact-summary"
#: en/diff-options.txt:148
#, fuzzy, priority:280
msgid "Output a condensed summary of extended header information such as file creations or deletions (\"new\" or \"gone\", optionally \"+l\" if it's a symlink) and mode changes (\"+x\" or \"-x\" for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies `--stat`."
-msgstr ""
-"emette un riepilogo sintetico delle informazioni di intestazione estese come "
-"creazioni o eliminazioni di file (\"new\" o \"gone\", facoltativamente \"+ "
-"l\" se si tratta di un collegamento simbolico) e cambi di modalit횪 (\"+ x\" "
-"o \"-x\" per l'aggiunta o la rimozione bit eseguibile rispettivamente) in "
-"diffstat. Le informazioni vengono inserite tra la parte del nome file e la "
-"parte del grafico. Implica `--stat`."
+msgstr "emette un riepilogo sintetico delle informazioni di intestazione estese come creazioni o eliminazioni di file (\"new\" o \"gone\", facoltativamente \"+ l\" se si tratta di un collegamento simbolico) e cambi di modalit횪 (\"+ x\" o \"-x\" per l'aggiunta o la rimozione bit eseguibile rispettivamente) in diffstat. Le informazioni vengono inserite tra la parte del nome file e la parte del grafico. Implica `--stat`."
#. type: Labeled list
#: en/diff-options.txt:149 en/git-apply.txt:45
@@ -3984,10 +3921,7 @@ msgstr "--numstat"
#: en/diff-options.txt:155
#, fuzzy, priority:280
msgid "Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`."
-msgstr ""
-"Simile a `--stat`, ma mostra il numero di righe aggiunte ed eliminate in "
-"notazione decimale e il pathname senza abbreviazione, per renderlo pi첫 "
-"intuitivo. Per i file binari, genera due `-` invece di dire` 0 0`."
+msgstr "Simile a `--stat`, ma mostra il numero di righe aggiunte ed eliminate in notazione decimale e il pathname senza abbreviazione, per renderlo pi첫 intuitivo. Per i file binari, genera due `-` invece di dire` 0 0`."
#. type: Labeled list
#: en/diff-options.txt:156
@@ -4017,12 +3951,7 @@ msgstr "--dirstat[=<param1,param2,...>]"
#: en/diff-options.txt:169
#, fuzzy, priority:280
msgid "Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters. The defaults are controlled by the `diff.dirstat` configuration variable (see linkgit:git-config[1]). The following parameters are available:"
-msgstr ""
-"Emette la distribuzione della quantit횪 relativa di modifiche per ciascuna "
-"sottocartelle. Il comportamento di `--dststat` pu챵 essere personalizzato "
-"passandogli un elenco di parametri separato da virgole. I valori di default "
-"sono controllati dalla variabile di configurazione `diff.dirstat` (vedi "
-"linkgit: git-config [1]). Sono disponibili i seguenti parametri:"
+msgstr "Emette la distribuzione della quantit횪 relativa di modifiche per ciascuna sottocartelle. Il comportamento di `--dststat` pu챵 essere personalizzato passandogli un elenco di parametri separato da virgole. I valori di default sono controllati dalla variabile di configurazione `diff.dirstat` (vedi linkgit: git-config [1]). Sono disponibili i seguenti parametri:"
#. type: Labeled list
#: en/diff-options.txt:171
@@ -4034,13 +3963,7 @@ msgstr "`changes`"
#: en/diff-options.txt:177
#, fuzzy, priority:280
msgid "Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file. In other words, rearranging lines in a file is not counted as much as other changes. This is the default behavior when no parameter is given."
-msgstr ""
-"Calcola i numeri di dirstat contando le linee che sono state rimosse dalla "
-"fonte o aggiunte alla destinazione. Ci챵 ignora la quantit횪 di movimenti di "
-"codice puri all'interno di un file. In altre parole, la riorganizzazione "
-"delle righe in un file non viene conteggiata tanto quanto le altre "
-"modifiche. Questo 챔 il comportamento predefinito quando non viene fornito "
-"alcun parametro."
+msgstr "Calcola i numeri di dirstat contando le linee che sono state rimosse dalla fonte o aggiunte alla destinazione. Ci챵 ignora la quantit횪 di movimenti di codice puri all'interno di un file. In altre parole, la riorganizzazione delle righe in un file non viene conteggiata tanto quanto le altre modifiche. Questo 챔 il comportamento predefinito quando non viene fornito alcun parametro."
#. type: Labeled list
#: en/diff-options.txt:177
@@ -4052,14 +3975,7 @@ msgstr "`lines`"
#: en/diff-options.txt:185
#, fuzzy, priority:280
msgid "Compute the dirstat numbers by doing the regular line-based diff analysis, and summing the removed/added line counts. (For binary files, count 64-byte chunks instead, since binary files have no natural concept of lines). This is a more expensive `--dirstat` behavior than the `changes` behavior, but it does count rearranged lines within a file as much as other changes. The resulting output is consistent with what you get from the other `--*stat` options."
-msgstr ""
-"Calcola i numeri dirstat eseguendo la normale analisi differente basata su "
-"linee e sommando i conteggi delle linee rimosse / aggiunte. (Per i file "
-"binari, contare invece i blocchi di 64 byte, poich챕 i file binari non hanno "
-"un concetto naturale di linee). Questo 챔 un comportamento `--dirstat` pi첫 "
-"costoso rispetto al comportamento` change`, ma conta le righe riorganizzate "
-"all'interno di un file tanto quanto le altre modifiche. L'output risultante "
-"챔 coerente con ci챵 che si ottiene dalle altre opzioni `- * stat`."
+msgstr "Calcola i numeri dirstat eseguendo la normale analisi differente basata su linee e sommando i conteggi delle linee rimosse / aggiunte. (Per i file binari, contare invece i blocchi di 64 byte, poich챕 i file binari non hanno un concetto naturale di linee). Questo 챔 un comportamento `--dirstat` pi첫 costoso rispetto al comportamento` change`, ma conta le righe riorganizzate all'interno di un file tanto quanto le altre modifiche. L'output risultante 챔 coerente con ci챵 che si ottiene dalle altre opzioni `- * stat`."
#. type: Labeled list
#: en/diff-options.txt:185
@@ -4083,11 +3999,7 @@ msgstr "`cumulative`"
#: en/diff-options.txt:195
#, fuzzy, priority:280
msgid "Count changes in a child directory for the parent directory as well. Note that when using `cumulative`, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the `noncumulative` parameter."
-msgstr ""
-"Contare le modifiche in una cartella-figlia anche per la cartella-padre. Si "
-"noti che quando si utilizza \"cumulative\", la somma delle percentuali "
-"riportate pu챵 superare il 100%. Il comportamento predefinito (non cumulativo)"
-" pu챵 essere specificato con il parametro `non cumulativo`."
+msgstr "Contare le modifiche in una cartella-figlia anche per la cartella-padre. Si noti che quando si utilizza \"cumulative\", la somma delle percentuali riportate pu챵 superare il 100%. Il comportamento predefinito (non cumulativo) pu챵 essere specificato con il parametro `non cumulativo`."
#. type: Labeled list
#: en/diff-options.txt:195 en/git-cherry.txt:39
@@ -4099,10 +4011,7 @@ msgstr "<limit>"
#: en/diff-options.txt:199
#, fuzzy, priority:280
msgid "An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes are not shown in the output."
-msgstr ""
-"Un parametro intero specifica una percentuale di interruzione (3% per "
-"impostazione predefinita). Le directory che contribuiscono con meno di "
-"questa percentuale delle modifiche non vengono mostrate nell'output."
+msgstr "Un parametro intero specifica una percentuale di interruzione (3% per impostazione predefinita). Le directory che contribuiscono con meno di questa percentuale delle modifiche non vengono mostrate nell'output."
#. type: Plain text
#: en/diff-options.txt:205
@@ -4144,9 +4053,7 @@ msgstr "--summary"
#: en/diff-options.txt:215
#, fuzzy, priority:280
msgid "Output a condensed summary of extended header information such as creations, renames and mode changes."
-msgstr ""
-"Stampa un riepilogo sintetico delle informazioni di intestazione estese come "
-"creazioni, rinominazioni e cambi di modalit횪."
+msgstr "Stampa un riepilogo sintetico delle informazioni di intestazione estese come creazioni, rinominazioni e cambi di modalit횪."
#. type: Labeled list
#: en/diff-options.txt:217
@@ -4176,9 +4083,7 @@ msgstr "\tSeparare gli commit con NUL invece che con nuove nuove righe.\n"
#: en/diff-options.txt:229
#, fuzzy, priority:280
msgid "Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators."
-msgstr ""
-"Also, when `--raw` or `--numstat` has been given, do not munge pathnames and "
-"use NULs as output field terminators."
+msgstr "Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators."
#. type: Plain text
#: en/diff-options.txt:233
@@ -4188,17 +4093,13 @@ msgid ""
"\tgiven, do not munge pathnames and use NULs as output field terminators.\n"
msgstr ""
"\tQuando `--raw`,` --numstat`, `--name-only` o` --name-status` 챔 stato\n"
-"dato, non confondere i nomi dei percorsi e usare NUL come terminatori del "
-"campo di output.\n"
+"dato, non confondere i nomi dei percorsi e usare NUL come terminatori del campo di output.\n"
#. type: Plain text
#: en/diff-options.txt:238 en/git-apply.txt:122
#, fuzzy, priority:280
msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgstr ""
-"Senza questa opzione, i nomi dei percorsi con caratteri \"insoliti\" sono "
-"citati come spiegato per la variabile di configurazione `core.quotePath` ("
-"vedi linkgit: git-config [1])."
+msgstr "Senza questa opzione, i nomi dei percorsi con caratteri \"insoliti\" sono citati come spiegato per la variabile di configurazione `core.quotePath` (vedi linkgit: git-config [1])."
#. type: Labeled list
#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
@@ -4222,9 +4123,7 @@ msgstr "--name-status"
#: en/diff-options.txt:245
#, fuzzy, priority:280
msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean."
-msgstr ""
-"Mostra solo i nomi e lo stato dei file modificati. Vedi la descrizione "
-"dell'opzione `--diff-filter` su cosa significano le lettere di stato."
+msgstr "Mostra solo i nomi e lo stato dei file modificati. Vedi la descrizione dell'opzione `--diff-filter` su cosa significano le lettere di stato."
#. type: Labeled list
#: en/diff-options.txt:246
@@ -4236,16 +4135,7 @@ msgstr ""
#: en/diff-options.txt:257
#, fuzzy, priority:280
msgid "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset."
-msgstr ""
-"Specify how differences in submodules are shown. When specifying "
-"`--submodule=short` the 'short' format is used. This format just shows the "
-"names of the commits at the beginning and end of the range. When "
-"`--submodule` or `--submodule=log` is specified, the 'log' format is used. "
-"This format lists the commits in the range like linkgit:git-submodule[1] "
-"`summary` does. When `--submodule=diff` is specified, the 'diff' format is "
-"used. This format shows an inline diff of the changes in the submodule "
-"contents between the commit range. Defaults to `diff.submodule` or the "
-"'short' format if the config option is unset."
+msgstr "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset."
#. type: Labeled list
#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:224 en/git-show-branch.txt:119 en/git-tag.txt:125
@@ -4257,9 +4147,7 @@ msgstr "--color[=<when>]"
#: en/diff-options.txt:262
#, priority:280
msgid "Show colored diff. `--color` (i.e. without '=<when>') is the same as `--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
-msgstr ""
-"Mostra diff colorato. `--color` (ovvero senza '= <when>') 챔 uguale a` --"
-"color = always`. '<when>' pu챵 essere uno di `always`,` never` o `auto`"
+msgstr "Mostra diff colorato. `--color` (ovvero senza '= <when>') 챔 uguale a` --color = always`. '<when>' pu챵 essere uno di `always`,` never` o `auto`"
#. type: Plain text
#: en/diff-options.txt:265
@@ -4287,9 +4175,7 @@ msgstr "Disabilitare diff colorato."
#: en/diff-options.txt:271
#, fuzzy, no-wrap, priority:280
msgid "\tThis can be used to override configuration settings.\n"
-msgstr ""
-"\tQuesto pu챵 essere usato per sovrascrivere le impostazioni di "
-"configurazione.\n"
+msgstr "\tQuesto pu챵 essere usato per sovrascrivere le impostazioni di configurazione.\n"
#. type: Plain text
#: en/diff-options.txt:273
@@ -4313,9 +4199,7 @@ msgstr "le righe di codice spostate sono colorate in modo diverso"
#: en/diff-options.txt:278
#, fuzzy, no-wrap, priority:280
msgid "\tIt can be changed by the `diff.colorMoved` configuration setting.\n"
-msgstr ""
-"\tPu챵 essere modificato dall'impostazione di configurazione `diff."
-"colorMoved`.\n"
+msgstr "\tPu챵 essere modificato dall'impostazione di configurazione `diff.colorMoved`.\n"
#. type: Plain text
#: en/diff-options.txt:282
@@ -4363,13 +4247,7 @@ msgstr "plain"
#: en/diff-options.txt:296
#, fuzzy, priority:280
msgid "Any line that is added in one location and was removed in another location will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved' will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation."
-msgstr ""
-"Qualsiasi riga aggiunta in una posizione e rimossa in un'altra posizione "
-"verr횪 colorata con 'color.diff.newMoved'. Allo stesso modo "
-"'color.diff.oldMoved' verr횪 usato per le linee rimosse che vengono aggiunte "
-"da qualche altra parte nel diff. Questa modalit횪 rileva qualsiasi linea "
-"spostata, ma non 챔 molto utile in una revisione per determinare se un blocco "
-"di codice 챔 stato spostato senza permutazione."
+msgstr "Qualsiasi riga aggiunta in una posizione e rimossa in un'altra posizione verr횪 colorata con 'color.diff.newMoved'. Allo stesso modo 'color.diff.oldMoved' verr횪 usato per le linee rimosse che vengono aggiunte da qualche altra parte nel diff. Questa modalit횪 rileva qualsiasi linea spostata, ma non 챔 molto utile in una revisione per determinare se un blocco di codice 챔 stato spostato senza permutazione."
#. type: Labeled list
#: en/diff-options.txt:296
@@ -4381,11 +4259,7 @@ msgstr "blocks"
#: en/diff-options.txt:301
#, fuzzy, priority:280
msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart."
-msgstr ""
-"I blocchi di testo spostato di almeno 20 caratteri alfanumerici vengono "
-"rilevati avidamente. I blocchi rilevati vengono dipinti utilizzando il "
-"colore \"color.diff. {Vecchio, nuovo} Spostato\". I blocchi adiacenti non "
-"possono essere separati."
+msgstr "I blocchi di testo spostato di almeno 20 caratteri alfanumerici vengono rilevati avidamente. I blocchi rilevati vengono dipinti utilizzando il colore \"color.diff. {Vecchio, nuovo} Spostato\". I blocchi adiacenti non possono essere separati."
#. type: Labeled list
#: en/diff-options.txt:301
@@ -4397,11 +4271,7 @@ msgstr "zebra"
#: en/diff-options.txt:306
#, fuzzy, priority:280
msgid "Blocks of moved text are detected as in 'blocks' mode. The blocks are painted using either the 'color.diff.{old,new}Moved' color or 'color.diff.{old,new}MovedAlternative'. The change between the two colors indicates that a new block was detected."
-msgstr ""
-"I blocchi di testo spostato vengono rilevati come nella modalit횪 \"blocchi\""
-". I blocchi sono dipinti usando 'color.diff. {Vecchio, nuovo} Spostato' "
-"colore o 'color.diff. {Vecchio, nuovo} SpostatoAlternativo'. Il cambiamento "
-"tra i due colori indica che 챔 stato rilevato un nuovo blocco."
+msgstr "I blocchi di testo spostato vengono rilevati come nella modalit횪 \"blocchi\". I blocchi sono dipinti usando 'color.diff. {Vecchio, nuovo} Spostato' colore o 'color.diff. {Vecchio, nuovo} SpostatoAlternativo'. Il cambiamento tra i due colori indica che 챔 stato rilevato un nuovo blocco."
#. type: Labeled list
#: en/diff-options.txt:306
@@ -4425,10 +4295,7 @@ msgstr "--no-color-moved"
#: en/diff-options.txt:316
#, fuzzy, priority:280
msgid "Turn off move detection. This can be used to override configuration settings. It is the same as `--color-moved=no`."
-msgstr ""
-"Disattiva il rilevamento delle mosse. Questo pu챵 essere usato per "
-"sovrascrivere le impostazioni di configurazione. 횊 lo stesso di `--color-"
-"moved = no`"
+msgstr "Disattiva il rilevamento delle mosse. Questo pu챵 essere usato per sovrascrivere le impostazioni di configurazione. 횊 lo stesso di `--color-moved = no`"
#. type: Labeled list
#: en/diff-options.txt:317
@@ -4440,25 +4307,19 @@ msgstr "--color-moved-ws=<modes>"
#: en/diff-options.txt:320
#, fuzzy, priority:280
msgid "This configures how whitespace is ignored when performing the move detection for `--color-moved`."
-msgstr ""
-"Questo configura come lo spazio bianco viene ignorato quando si esegue il "
-"rilevamento di movimenti per `--color-moved`."
+msgstr "Questo configura come lo spazio bianco viene ignorato quando si esegue il rilevamento di movimenti per `--color-moved`."
#. type: Plain text
#: en/diff-options.txt:322
#, fuzzy, no-wrap, priority:280
msgid "\tIt can be set by the `diff.colorMovedWS` configuration setting.\n"
-msgstr ""
-"\tPu챵 essere impostato dall'impostazione di configurazione `diff."
-"colorMovedWS`.\n"
+msgstr "\tPu챵 essere impostato dall'impostazione di configurazione `diff.colorMovedWS`.\n"
#. type: Plain text
#: en/diff-options.txt:324
#, fuzzy, no-wrap, priority:280
msgid "\tThese modes can be given as a comma separated list:\n"
-msgstr ""
-"\tQueste modalit횪 possono essere fornite come un elenco separato da virgole "
-":.\n"
+msgstr "\tQueste modalit횪 possono essere fornite come un elenco separato da virgole :.\n"
#. type: Plain text
#: en/diff-options.txt:328
@@ -4488,10 +4349,7 @@ msgstr "ignore-space-change"
#: en/diff-options.txt:334 en/diff-options.txt:671
#, fuzzy, priority:280
msgid "Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
-msgstr ""
-"Ignore changes in amount of whitespace. This ignores whitespace at line "
-"end, and considers all other sequences of one or more whitespace characters "
-"to be equivalent."
+msgstr "Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
#. type: Labeled list
#: en/diff-options.txt:334 en/merge-strategies.txt:60
@@ -4503,9 +4361,7 @@ msgstr "ignore-all-space"
#: en/diff-options.txt:337
#, fuzzy, priority:280
msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
-msgstr ""
-"Ignora gli spazi bianchi quando si confrontano le linee. Questo ignora le "
-"differenze anche se una riga ha spazi bianchi dove l'altra riga non ne ha."
+msgstr "Ignora gli spazi bianchi quando si confrontano le linee. Questo ignora le differenze anche se una riga ha spazi bianchi dove l'altra riga non ne ha."
#. type: Labeled list
#: en/diff-options.txt:337
@@ -4517,11 +4373,7 @@ msgstr "allow-indentation-change"
#: en/diff-options.txt:342
#, fuzzy, priority:280
msgid "Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in whitespace is the same per line. This is incompatible with the other modes."
-msgstr ""
-"Inizialmente ignora qualsiasi spazio bianco nel rilevamento dello "
-"spostamento, quindi raggruppa i blocchi di codice spostati solo in un blocco "
-"se la modifica dello spazio bianco 챔 la stessa per riga. Questo 챔 "
-"incompatibile con le altre modalit횪."
+msgstr "Inizialmente ignora qualsiasi spazio bianco nel rilevamento dello spostamento, quindi raggruppa i blocchi di codice spostati solo in un blocco se la modifica dello spazio bianco 챔 la stessa per riga. Questo 챔 incompatibile con le altre modalit횪."
#. type: Labeled list
#: en/diff-options.txt:344
@@ -4533,10 +4385,7 @@ msgstr "--no-color-moved-ws"
#: en/diff-options.txt:348
#, fuzzy, priority:280
msgid "Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as `--color-moved-ws=no`."
-msgstr ""
-"Non ignorare gli spazi bianchi quando si esegue il rilevamento delle mosse. "
-"Questo pu챵 essere usato per sovrascrivere le impostazioni di configurazione. "
-"횊 lo stesso di `--color-moved-ws = no`."
+msgstr "Non ignorare gli spazi bianchi quando si esegue il rilevamento delle mosse. Questo pu챵 essere usato per sovrascrivere le impostazioni di configurazione. 횊 lo stesso di `--color-moved-ws = no`."
#. type: Labeled list
#: en/diff-options.txt:349
@@ -4548,11 +4397,7 @@ msgstr ""
#: en/diff-options.txt:354
#, fuzzy, priority:280
msgid "Show a word diff, using the <mode> to delimit changed words. By default, words are delimited by whitespace; see `--word-diff-regex` below. The <mode> defaults to 'plain', and must be one of:"
-msgstr ""
-"Mostra una parola differente, usando <mode> per delimitare le parole "
-"modificate. Per impostazione predefinita, le parole sono delimitate da spazi "
-"bianchi; vedi `--word-diff-regex` sotto. L'impostazione predefinita <mode> 챔 "
-"'plain' e deve essere uno di:"
+msgstr "Mostra una parola differente, usando <mode> per delimitare le parole modificate. Per impostazione predefinita, le parole sono delimitate da spazi bianchi; vedi `--word-diff-regex` sotto. L'impostazione predefinita <mode> 챔 'plain' e deve essere uno di:"
#. type: Plain text
#: en/diff-options.txt:358
@@ -4564,10 +4409,7 @@ msgstr "Evidenzia le parole modificate usando solo i colori. Implica `--color`."
#: en/diff-options.txt:362
#, fuzzy, priority:280
msgid "Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous."
-msgstr ""
-"Mostra le parole come `[-removed-]` e `{+ added}`. Non tenta di sfuggire ai "
-"delimitatori se compaiono nell'input, quindi l'output potrebbe essere "
-"ambiguo."
+msgstr "Mostra le parole come `[-removed-]` e `{+ added}`. Non tenta di sfuggire ai delimitatori se compaiono nell'input, quindi l'output potrebbe essere ambiguo."
#. type: Labeled list
#: en/diff-options.txt:362
@@ -4597,10 +4439,7 @@ msgstr "Disabilitare la parola 'diff' nuovamente"
#: en/diff-options.txt:375
#, fuzzy, priority:280
msgid "Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled."
-msgstr ""
-"Si noti che nonostante il nome della prima modalit횪, il colore viene "
-"utilizzato per evidenziare le parti modificate in tutte le modalit횪 se "
-"abilitato."
+msgstr "Si noti che nonostante il nome della prima modalit횪, il colore viene utilizzato per evidenziare le parti modificate in tutte le modalit횪 se abilitato."
#. type: Labeled list
#: en/diff-options.txt:376
@@ -4612,32 +4451,19 @@ msgstr "--word-diff-regex=<regex>"
#: en/diff-options.txt:380
#, fuzzy, priority:280
msgid "Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies `--word-diff` unless it was already enabled."
-msgstr ""
-"Usa <regex> per decidere che cosa 챔 una parola, invece di considerare una "
-"serie di esecuzioni di spazi non bianchi. Implica anche `--word-diff` a meno "
-"che non sia gi횪 stato abilitato. Usa <regex> per decidere cosa 챔 una parola, "
-"invece di considerare una serie di esecuzioni di spazi non bianchi. Implica "
-"anche `--word-diff` a meno che non sia gi횪 stato abilitato."
+msgstr "Usa <regex> per decidere che cosa 챔 una parola, invece di considerare una serie di esecuzioni di spazi non bianchi. Implica anche `--word-diff` a meno che non sia gi횪 stato abilitato. Usa <regex> per decidere cosa 챔 una parola, invece di considerare una serie di esecuzioni di spazi non bianchi. Implica anche `--word-diff` a meno che non sia gi횪 stato abilitato."
#. type: Plain text
#: en/diff-options.txt:388
#, fuzzy, priority:280
msgid "Every non-overlapping match of the <regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline."
-msgstr ""
-"Ogni corrispondenza non sovrapposta del <regex> 챔 considerata una parola. "
-"Qualunque cosa tra queste partite 챔 considerata spazio bianco e ignorata (!) "
-"allo scopo di trovare differenze. Potresti voler aggiungere `| [^ [: "
-"space:]]` alla tua espressione regolare per assicurarti che corrisponda a "
-"tutti i caratteri non bianchi. Una corrispondenza che contiene una nuova "
-"riga viene troncata silenziosamente (!) sulla nuova riga."
+msgstr "Ogni corrispondenza non sovrapposta del <regex> 챔 considerata una parola. Qualunque cosa tra queste partite 챔 considerata spazio bianco e ignorata (!) allo scopo di trovare differenze. Potresti voler aggiungere `| [^ [: space:]]` alla tua espressione regolare per assicurarti che corrisponda a tutti i caratteri non bianchi. Una corrispondenza che contiene una nuova riga viene troncata silenziosamente (!) sulla nuova riga."
#. type: Plain text
#: en/diff-options.txt:391
#, fuzzy, priority:280
msgid "For example, `--word-diff-regex=.` will treat each character as a word and, correspondingly, show differences character by character."
-msgstr ""
-"Ad esempio, `--word-diff-regex = .` tratter횪 ogni carattere come una parola "
-"e, di conseguenza, mostrer횪 le differenze carattere per carattere."
+msgstr "Ad esempio, `--word-diff-regex = .` tratter횪 ogni carattere come una parola e, di conseguenza, mostrer횪 le differenze carattere per carattere."
#. type: Plain text
#: en/diff-options.txt:396
@@ -4655,9 +4481,7 @@ msgstr "--color-words[=<regex>]"
#: en/diff-options.txt:400
#, fuzzy, priority:280
msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=<regex>`."
-msgstr ""
-"Equivalente a `--word-diff = color` plus (se 챔 stata specificata una regex)` "
-"--word-diff-regex = <regex> `."
+msgstr "Equivalente a `--word-diff = color` plus (se 챔 stata specificata una regex)` --word-diff-regex = <regex> `."
#. type: Labeled list
#: en/diff-options.txt:402 en/git-status.txt:143
@@ -4669,9 +4493,7 @@ msgstr "--no-renames"
#: en/diff-options.txt:405
#, fuzzy, priority:280
msgid "Turn off rename detection, even when the configuration file gives the default to do so."
-msgstr ""
-"Disattiva il rilevamento della ridenominazione, anche quando il file di "
-"configurazione fornisce l'impostazione predefinita per farlo."
+msgstr "Disattiva il rilevamento della ridenominazione, anche quando il file di configurazione fornisce l'impostazione predefinita per farlo."
#. type: Labeled list
#: en/diff-options.txt:406
@@ -4707,14 +4529,7 @@ msgstr "--ws-error-highlight=<kind>"
#: en/diff-options.txt:429
#, fuzzy, priority:280
msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`."
-msgstr ""
-"Evidenzia gli errori degli spazi bianchi nelle righe `context`,` old` o `new`"
-" del diff. I valori multipli sono separati da una virgola, `none` resetta i "
-"valori precedenti,` default` reimposta la lista su `new` e` all` 챔 una "
-"scorciatoia per `old, new, context`. Quando questa opzione non viene fornita "
-"e la variabile di configurazione `diff.wsErrorHighlight` non 챔 impostata, "
-"vengono evidenziati solo gli errori di spazio bianco nelle righe` new`. Gli "
-"errori degli spazi bianchi sono colorati con `color.diff.whitespace`."
+msgstr "Evidenzia gli errori degli spazi bianchi nelle righe `context`,` old` o `new` del diff. I valori multipli sono separati da una virgola, `none` resetta i valori precedenti,` default` reimposta la lista su `new` e` all` 챔 una scorciatoia per `old, new, context`. Quando questa opzione non viene fornita e la variabile di configurazione `diff.wsErrorHighlight` non 챔 impostata, vengono evidenziati solo gli errori di spazio bianco nelle righe` new`. Gli errori degli spazi bianchi sono colorati con `color.diff.whitespace`."
#. type: Labeled list
#: en/diff-options.txt:432
@@ -4726,10 +4541,7 @@ msgstr "--full-index"
#: en/diff-options.txt:436
#, fuzzy, 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 ""
-"Invece del primo pugno di caratteri, mostra i nomi completi degli oggetti "
-"BLOB pre e post immagine sulla riga \"indice\" durante la generazione "
-"dell'output del formato patch."
+msgstr "Invece del primo pugno di caratteri, mostra i nomi completi degli oggetti BLOB pre e post immagine sulla riga \"indice\" durante la generazione dell'output del formato patch."
#. type: Labeled list
#: en/diff-options.txt:437 en/git-apply.txt:160
@@ -4741,9 +4553,7 @@ msgstr "--binary"
#: 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`. Implies `--patch`."
-msgstr ""
-"Oltre a `--full-index`, genera un differenziale binario che pu챵 essere "
-"applicato con` git-apply`. Implica `--patch`."
+msgstr "Oltre a `--full-index`, genera un differenziale binario che pu챵 essere applicato con` git-apply`. Implica `--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
@@ -4755,12 +4565,7 @@ msgstr ""
#: en/diff-options.txt:448
#, fuzzy, priority:280
msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. This is independent of the `--full-index` option above, which controls the diff-patch output format. Non default number of digits can be specified with `--abbrev=<n>`."
-msgstr ""
-"Invece di mostrare l'intero nome dell'oggetto esadecimale a 40 byte "
-"nell'output del formato diff-raw e nelle righe dell'intestazione dell'albero "
-"diff, mostra solo un prefisso parziale. Questo 챔 indipendente dall'opzione "
-"`--full-index` sopra, che controlla il formato di output del patch diff. Il "
-"numero non predefinito di cifre pu챵 essere specificato con `--abbrev = <n>`."
+msgstr "Invece di mostrare l'intero nome dell'oggetto esadecimale a 40 byte nell'output del formato diff-raw e nelle righe dell'intestazione dell'albero diff, mostra solo un prefisso parziale. Questo 챔 indipendente dall'opzione `--full-index` sopra, che controlla il formato di output del patch diff. Il numero non predefinito di cifre pu챵 essere specificato con `--abbrev = <n>`."
#. type: Labeled list
#: en/diff-options.txt:449
@@ -4778,9 +4583,7 @@ msgstr "--break-rewrites[=[<n>][/<m>]]"
#: en/diff-options.txt:453
#, fuzzy, priority:280
msgid "Break complete rewrite changes into pairs of delete and create. This serves two purposes:"
-msgstr ""
-"Suddividi le modifiche di riscrittura complete in coppie di elimina e crea. "
-"Questo ha due scopi:"
+msgstr "Suddividi le modifiche di riscrittura complete in coppie di elimina e crea. Questo ha due scopi:"
#. type: Plain text
#: en/diff-options.txt:463
@@ -4792,14 +4595,7 @@ msgstr ""
#: en/diff-options.txt:471
#, fuzzy, priority:280
msgid "When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number `n` controls this aspect of the -B option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file."
-msgstr ""
-"Se usato con -M, un file totalmente riscritto viene anche considerato come "
-"l'origine di una ridenominazione (di solito -M considera solo un file che 챔 "
-"scomparso come l'origine di una ridenominazione) e il numero `n` controlla "
-"questo aspetto di - Opzione B (predefinito al 50%). `-B20%` specifica che "
-"una modifica con aggiunta ed eliminazione rispetto al 20% o pi첫 della "
-"dimensione del file pu챵 essere raccolta come possibile fonte di una "
-"ridenominazione in un altro file."
+msgstr "Se usato con -M, un file totalmente riscritto viene anche considerato come l'origine di una ridenominazione (di solito -M considera solo un file che 챔 scomparso come l'origine di una ridenominazione) e il numero `n` controlla questo aspetto di - Opzione B (predefinito al 50%). `-B20%` specifica che una modifica con aggiunta ed eliminazione rispetto al 20% o pi첫 della dimensione del file pu챵 essere raccolta come possibile fonte di una ridenominazione in un altro file."
#. type: Labeled list
#: en/diff-options.txt:472
@@ -4871,9 +4667,7 @@ msgstr ""
#: en/diff-options.txt:496
#, fuzzy, priority:280
msgid "Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M<n>`."
-msgstr ""
-"Rileva copie e rinomina. Vedi anche `--find-copy-harder`. Se viene "
-"specificato `n`, ha lo stesso significato di` -M <n> `."
+msgstr "Rileva copie e rinomina. Vedi anche `--find-copy-harder`. Se viene specificato `n`, ha lo stesso significato di` -M <n> `."
#. type: Labeled list
#: en/diff-options.txt:497 en/git-svn.txt:626
@@ -4885,13 +4679,7 @@ msgstr "--find-copies-harder"
#: en/diff-options.txt:505
#, fuzzy, priority:280
msgid "For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one `-C` option has the same effect."
-msgstr ""
-"Per motivi di prestazioni, per impostazione predefinita, l'opzione `-C` "
-"trova copie solo se il file originale della copia 챔 stato modificato nello "
-"stesso changeset. Questo flag fa s챙 che il comando controlli i file non "
-"modificati come candidati per l'origine della copia. Questa 챔 un'operazione "
-"molto costosa per grandi progetti, quindi usala con cautela. Dare pi첫 di "
-"un'opzione `-C` ha lo stesso effetto."
+msgstr "Per motivi di prestazioni, per impostazione predefinita, l'opzione `-C` trova copie solo se il file originale della copia 챔 stato modificato nello stesso changeset. Questo flag fa s챙 che il comando controlli i file non modificati come candidati per l'origine della copia. Questa 챔 un'operazione molto costosa per grandi progetti, quindi usala con cautela. Dare pi첫 di un'opzione `-C` ha lo stesso effetto."
#. type: Labeled list
#: en/diff-options.txt:506 en/git-branch.txt:103 en/git-http-push.txt:45
@@ -4915,9 +4703,7 @@ msgstr ""
#: en/diff-options.txt:518
#, fuzzy, priority:280
msgid "When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair."
-msgstr ""
-"Se utilizzato insieme a `-B`, omette anche il preimage nella parte di "
-"eliminazione di una coppia di eliminazione / creazione."
+msgstr "Se utilizzato insieme a `-B`, omette anche il preimage nella parte di eliminazione di una coppia di eliminazione / creazione."
#. type: Labeled list
#: en/diff-options.txt:519 en/git-svn.txt:625
@@ -4929,11 +4715,7 @@ msgstr "-l<num>"
#: en/diff-options.txt:525
#, fuzzy, priority:280
msgid "The `-M` and `-C` options require O(n^2) processing time where n is the number of potential rename/copy targets. This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number."
-msgstr ""
-"Le opzioni `-M` e` -C` richiedono il tempo di elaborazione O (n ^ 2) dove n "
-"챔 il numero di potenziali destinazioni di rinomina / copia. Questa opzione "
-"impedisce l'esecuzione del rilevamento di rinomina / copia se il numero di "
-"destinazioni di rinomina / copia supera il numero specificato."
+msgstr "Le opzioni `-M` e` -C` richiedono il tempo di elaborazione O (n ^ 2) dove n 챔 il numero di potenziali destinazioni di rinomina / copia. Questa opzione impedisce l'esecuzione del rilevamento di rinomina / copia se il numero di destinazioni di rinomina / copia supera il numero specificato."
#. type: Labeled list
#: en/diff-options.txt:527
@@ -4945,35 +4727,19 @@ msgstr ""
#: en/diff-options.txt:538
#, fuzzy, ignore-ellipsis, priority:280
msgid "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters (including none) can be used. When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected."
-msgstr ""
-"Seleziona solo i file che vengono aggiunti (`A`), copiati (` C`), eliminati "
-"(`D`), modificati (` M`), rinominati (`R`), hanno il loro tipo (cio챔 file "
-"normale, link simbolico, sottomodulo, ...) modificato (`T`), sono Unmerged (`"
-" U`), sono Sconosciuto (`X`) o hanno avuto il loro accoppiamento Broken (` "
-"B`). 횊 possibile utilizzare qualsiasi combinazione di caratteri filtro ("
-"incluso nessuno). Quando `*` (Tutto-o-nessuno) viene aggiunto alla "
-"combinazione, vengono selezionati tutti i percorsi se esiste un file che "
-"corrisponde ad altri criteri nel confronto; se non esiste alcun file che "
-"soddisfi altri criteri, non viene selezionato nulla."
+msgstr "Seleziona solo i file che vengono aggiunti (`A`), copiati (` C`), eliminati (`D`), modificati (` M`), rinominati (`R`), hanno il loro tipo (cio챔 file normale, link simbolico, sottomodulo, ...) modificato (`T`), sono Unmerged (` U`), sono Sconosciuto (`X`) o hanno avuto il loro accoppiamento Broken (` B`). 횊 possibile utilizzare qualsiasi combinazione di caratteri filtro (incluso nessuno). Quando `*` (Tutto-o-nessuno) viene aggiunto alla combinazione, vengono selezionati tutti i percorsi se esiste un file che corrisponde ad altri criteri nel confronto; se non esiste alcun file che soddisfi altri criteri, non viene selezionato nulla."
#. type: Plain text
#: en/diff-options.txt:541
#, fuzzy, priority:280
msgid "Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths."
-msgstr ""
-"Inoltre, queste lettere maiuscole possono essere declassate per escludere. "
-"Per esempio. `--diff-filter = ad` esclude i percorsi aggiunti ed eliminati."
+msgstr "Inoltre, queste lettere maiuscole possono essere declassate per escludere. Per esempio. `--diff-filter = ad` esclude i percorsi aggiunti ed eliminati."
#. type: Plain text
#: en/diff-options.txt:547
#, fuzzy, priority:280
msgid "Note that not all diffs can feature all types. For instance, diffs from the index to the working tree can never have Added entries (because the set of paths included in the diff is limited by what is in the index). Similarly, copied and renamed entries cannot appear if detection for those types is disabled."
-msgstr ""
-"Nota che non tutte le differenze possono presentare tutti i tipi. Ad "
-"esempio, le differenze dall'indice al worktree non possono mai avere voci "
-"aggiunte (perch챕 l'insieme di percorsi inclusi nel differenziale 챔 limitato "
-"da ci챵 che 챔 nell'indice). Allo stesso modo, le voci copiate e rinominate "
-"non possono apparire se il rilevamento per questi tipi 챔 disabilitato."
+msgstr "Nota che non tutte le differenze possono presentare tutti i tipi. Ad esempio, le differenze dall'indice al worktree non possono mai avere voci aggiunte (perch챕 l'insieme di percorsi inclusi nel differenziale 챔 limitato da ci챵 che 챔 nell'indice). Allo stesso modo, le voci copiate e rinominate non possono apparire se il rilevamento per questi tipi 챔 disabilitato."
#. type: Labeled list
#: en/diff-options.txt:548
@@ -4991,11 +4757,7 @@ msgstr ""
#: en/diff-options.txt:558
#, fuzzy, priority:280
msgid "It is useful when you're looking for an exact block of code (like a struct), and want to know the history of that block since it first came into being: use the feature iteratively to feed the interesting block in the preimage back into `-S`, and keep going until you get the very first version of the block."
-msgstr ""
-"횊 utile quando stai cercando un blocco esatto di codice (come uno struct) e "
-"vuoi conoscere la cronologia di quel blocco dalla sua prima creazione: usa "
-"la funzione in modo iterativo per reinserire l'interessante blocco nel "
-"preimage in `-S`, e continua finch챕 non ottieni la prima versione del blocco."
+msgstr "횊 utile quando stai cercando un blocco esatto di codice (come uno struct) e vuoi conoscere la cronologia di quel blocco dalla sua prima creazione: usa la funzione in modo iterativo per reinserire l'interessante blocco nel preimage in `-S`, e continua finch챕 non ottieni la prima versione del blocco."
#. type: Plain text
#: en/diff-options.txt:560
@@ -5013,9 +4775,7 @@ msgstr "<espressione regolare>"
#: en/diff-options.txt:564
#, fuzzy, priority:280
msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
-msgstr ""
-"Cerca le differenze il cui testo di patch contiene righe aggiunte / rimosse "
-"che corrispondono a <regex>."
+msgstr "Cerca le differenze il cui testo di patch contiene righe aggiunte / rimosse che corrispondono a <regex>."
#. type: Plain text
#: en/diff-options.txt:568
@@ -5039,18 +4799,13 @@ msgstr ""
#: en/diff-options.txt:578
#, fuzzy, 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 ""
-"Mentre `git log -G\" frotz \\ (nitfol \"` mostrer횪 questo commit, `git log -"
-"S\" frotz \\ (nitfol \"--pickaxe-regex` non cambier횪 (perch챕 il numero di "
-"occorrenze di quella stringa non 챔 cambiato) ."
+msgstr "Mentre `git log -G\" frotz \\ (nitfol \"` mostrer횪 questo commit, `git log -S\" frotz \\ (nitfol \"--pickaxe-regex` non cambier횪 (perch챕 il numero di occorrenze di quella stringa non 챔 cambiato) ."
#. type: Plain text
#: en/diff-options.txt:581
#, fuzzy, priority:280
msgid "Unless `--text` is supplied patches of binary files without a textconv filter will be ignored."
-msgstr ""
-"A meno che non venga fornito `--text`, le patch di file binari senza un "
-"filtro textconv verranno ignorate."
+msgstr "A meno che non venga fornito `--text`, le patch di file binari senza un filtro textconv verranno ignorate."
#. type: Plain text
#: en/diff-options.txt:584
@@ -5068,18 +4823,13 @@ msgstr "--find-object=<object-id>"
#: en/diff-options.txt:590
#, fuzzy, priority:280
msgid "Look for differences that change the number of occurrences of the specified object. Similar to `-S`, just the argument is different in that it doesn't search for a specific string but for a specific object id."
-msgstr ""
-"Cerca le differenze che cambiano il numero di occorrenze dell'oggetto "
-"specificato. Simile a `-S`, solo l'argomento 챔 diverso in quanto non cerca "
-"una stringa specifica ma un ID di un oggetto specifico"
+msgstr "Cerca le differenze che cambiano il numero di occorrenze dell'oggetto specificato. Simile a `-S`, solo l'argomento 챔 diverso in quanto non cerca una stringa specifica ma un ID di un oggetto specifico"
#. type: Plain text
#: en/diff-options.txt:593
#, fuzzy, 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 ""
-"L'oggetto pu챵 essere un BLOB o un commit del sottomodulo. Implica l'opzione "
-"`-t` in` git-log` per trovare anche alberi."
+msgstr "L'oggetto pu챵 essere un BLOB o un commit del sottomodulo. Implica l'opzione `-t` in` git-log` per trovare anche alberi."
#. type: Labeled list
#: en/diff-options.txt:594
@@ -5091,9 +4841,7 @@ msgstr "--pickaxe-all"
#: en/diff-options.txt:598
#, fuzzy, priority:280
msgid "When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change in <string>."
-msgstr ""
-"Quando `-S` o` -G` trovano una modifica, mostra tutte le modifiche in quel "
-"changeset, non solo i file che contengono la modifica in <string>."
+msgstr "Quando `-S` o` -G` trovano una modifica, mostra tutte le modifiche in quel changeset, non solo i file che contengono la modifica in <string>."
#. type: Labeled list
#: en/diff-options.txt:599
@@ -5105,9 +4853,7 @@ msgstr "--pickaxe-regex"
#: en/diff-options.txt:602
#, fuzzy, priority:280
msgid "Treat the <string> given to `-S` as an extended POSIX regular expression to match."
-msgstr ""
-"Considera <stringa> dato a `-S` come un'espressione regolare POSIX estesa da "
-"abbinare."
+msgstr "Considera <stringa> dato a `-S` come un'espressione regolare POSIX estesa da abbinare."
#. type: Labeled list
#: en/diff-options.txt:605 en/git-mergetool.txt:95
@@ -5119,26 +4865,13 @@ msgstr ""
#: en/diff-options.txt:610
#, fuzzy, priority:280
msgid "Control the order in which files appear in the output. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`."
-msgstr ""
-"Controlla l'ordine in cui i file compaiono nell'output. Questo sovrascrive "
-"la variabile di configurazione `diff.orderFile` (vedi linkgit: git-config "
-"[1]). Per cancellare `diff.orderFile`, usa` -O / dev / null`."
+msgstr "Controlla l'ordine in cui i file compaiono nell'output. Questo sovrascrive la variabile di configurazione `diff.orderFile` (vedi linkgit: git-config [1]). Per cancellare `diff.orderFile`, usa` -O / dev / null`."
#. type: Plain text
#: en/diff-options.txt:622
#, fuzzy, priority:280
msgid "The output order is determined by the order of glob patterns in <orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. All files with pathnames that do not match any pattern are output last, as if there was an implicit match-all pattern at the end of the file. If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order."
-msgstr ""
-"L'ordine di output 챔 determinato dall'ordine dei pattern glob in "
-"<orderfile>. Tutti i file con nomi di percorso che corrispondono al primo "
-"modello vengono emessi per primi, tutti i file con nomi di percorso che "
-"corrispondono al secondo motivo (ma non il primo) vengono emessi "
-"successivamente e cos챙 via. Tutti i file con nomi di percorso che non "
-"corrispondono a nessun pattern vengono stampati per ultimi, come se alla "
-"fine del file fosse presente un pattern match-all implicito. Se pi첫 percorsi "
-"hanno lo stesso rango (corrispondono allo stesso modello ma non a modelli "
-"precedenti), il loro ordine di output l'uno rispetto all'altro 챔 l'ordine "
-"normale."
+msgstr "L'ordine di output 챔 determinato dall'ordine dei pattern glob in <orderfile>. Tutti i file con nomi di percorso che corrispondono al primo modello vengono emessi per primi, tutti i file con nomi di percorso che corrispondono al secondo motivo (ma non il primo) vengono emessi successivamente e cos챙 via. Tutti i file con nomi di percorso che non corrispondono a nessun pattern vengono stampati per ultimi, come se alla fine del file fosse presente un pattern match-all implicito. Se pi첫 percorsi hanno lo stesso rango (corrispondono allo stesso modello ma non a modelli precedenti), il loro ordine di output l'uno rispetto all'altro 챔 l'ordine normale."
#. type: Plain text
#: en/diff-options.txt:624
@@ -5150,9 +4883,7 @@ msgstr ""
#: en/diff-options.txt:628
#, fuzzy, priority:280
msgid "Blank lines are ignored, so they can be used as separators for readability."
-msgstr ""
-"Le righe vuote vengono ignorate, quindi possono essere utilizzate come "
-"separatori per la leggibilit횪."
+msgstr "Le righe vuote vengono ignorate, quindi possono essere utilizzate come separatori per la leggibilit횪."
#. type: Plain text
#: en/diff-options.txt:632
@@ -5194,13 +4925,7 @@ msgstr "--relative[=<path>]"
#: en/diff-options.txt:654
#, fuzzy, priority:280
msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
-msgstr ""
-"Quando eseguito da una sottocartella del progetto, pu챵 essere detto di "
-"escludere le modifiche all'esterno della cartella e mostrare i percorsi "
-"relativi ad essa con questa opzione. Quando non ci si trova in una "
-"sottocartella (ad es. In un repository nudo), 챔 possibile assegnare un nome "
-"a quale aottocartellarendere l'output relativo fornendo un <path> come "
-"argomento."
+msgstr "Quando eseguito da una sottocartella del progetto, pu챵 essere detto di escludere le modifiche all'esterno della cartella e mostrare i percorsi relativi ad essa con questa opzione. Quando non ci si trova in una sottocartella (ad es. In un repository nudo), 챔 possibile assegnare un nome a quale aottocartellarendere l'output relativo fornendo un <path> come argomento."
#. type: Labeled list
#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
@@ -5260,9 +4985,7 @@ msgstr "--ignore-all-space"
#: en/diff-options.txt:677
#, fuzzy, priority:280
msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
-msgstr ""
-"Ignora gli spazi bianchi quando si confrontano le linee. Questo ignora le "
-"differenze anche se una riga ha spazi bianchi dove l'altra riga non ne ha."
+msgstr "Ignora gli spazi bianchi quando si confrontano le linee. Questo ignora le differenze anche se una riga ha spazi bianchi dove l'altra riga non ne ha."
#. type: Labeled list
#: en/diff-options.txt:678
@@ -5286,10 +5009,7 @@ msgstr ""
#: en/diff-options.txt:686
#, fuzzy, priority:280
msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. Defaults to `diff.interHunkContext` or 0 if the config option is unset."
-msgstr ""
-"Mostra il contesto tra hunk diff, fino al numero specificato di linee, "
-"fondendo in tal modo hunk vicini l'uno all'altro. Il valore predefinito 챔 "
-"`diff.interHunkContext` o 0 se l'opzione di configurazione non 챔 impostata."
+msgstr "Mostra il contesto tra hunk diff, fino al numero specificato di linee, fondendo in tal modo hunk vicini l'uno all'altro. Il valore predefinito 챔 `diff.interHunkContext` o 0 se l'opzione di configurazione non 챔 impostata."
#. type: Labeled list
#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
@@ -5385,20 +5105,7 @@ msgstr "--ignore-submodules[=<when>]"
#: en/diff-options.txt:734
#, fuzzy, priority:280
msgid "Ignore changes to submodules in the diff generation. <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 until 1.7.0). Using \"all\" hides all changes to submodules."
-msgstr ""
-"Ignora le modifiche ai sottomoduli nella generazione diff. <when> pu챵 essere "
-"\"none\", \"untracked\", \"dirty\" o \"all\", che 챔 l'impostazione "
-"predefinita. L'uso di \"none\" considerer횪 il sottomodulo modificato quando "
-"contiene file non tracciati o modificati o il suo HEAD differisce dal commit "
-"registrato nel superprogetto e pu챵 essere usato per sovrascrivere qualsiasi "
-"impostazione dell'opzione 'ignore' in linkgit: git-config [1 ] o linkgit: "
-"gitmodules [5]. Quando si utilizza \"untracked\", i sottomoduli non sono "
-"considerati sporchi quando contengono solo contenuto non tracciato (ma sono "
-"ancora sottoposti a scansione per il contenuto modificato). L'uso di \"dirty"
-"\" ignora tutte le modifiche all'albero di lavoro dei sottomoduli, vengono "
-"mostrate solo le modifiche ai commit archiviati nel superprogetto (questo "
-"era il comportamento fino alla 1.7.0). L'uso di \"all\" nasconde tutte le "
-"modifiche ai sottomoduli."
+msgstr "Ignora le modifiche ai sottomoduli nella generazione diff. <when> pu챵 essere \"none\", \"untracked\", \"dirty\" o \"all\", che 챔 l'impostazione predefinita. L'uso di \"none\" considerer횪 il sottomodulo modificato quando contiene file non tracciati o modificati o il suo HEAD differisce dal commit registrato nel superprogetto e pu챵 essere usato per sovrascrivere qualsiasi impostazione dell'opzione 'ignore' in linkgit: git-config [1 ] o linkgit: gitmodules [5]. Quando si utilizza \"untracked\", i sottomoduli non sono considerati sporchi quando contengono solo contenuto non tracciato (ma sono ancora sottoposti a scansione per il contenuto modificato). L'uso di \"dirty\" ignora tutte le modifiche all'albero di lavoro dei sottomoduli, vengono mostrate solo le modifiche ai commit archiviati nel superprogetto (questo era il comportamento fino alla 1.7.0). L'uso di \"all\" nasconde tutte le modifiche ai sottomoduli."
#. type: Labeled list
#: en/diff-options.txt:735
@@ -5464,9 +5171,7 @@ msgstr ""
#: en/diff-options.txt:756
#, fuzzy, priority:280
msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
-msgstr ""
-"Per una spiegazione pi첫 dettagliata di queste opzioni comuni, vedere anche "
-"linkgit: gitdiffcore [7]."
+msgstr "Per una spiegazione pi첫 dettagliata di queste opzioni comuni, vedere anche linkgit: gitdiffcore [7]."
#. type: Labeled list
#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
@@ -5954,13 +5659,7 @@ msgstr "--server-option=<opzione>"
#: en/fetch-options.txt:251 en/git-clone.txt:143
#, 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. 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 ""
-"Trasmettere le stringhe date al server quando si comunica usando il "
-"protocollo versione 2. LA stringa data non deve contenere un carattere NUL o "
-"LF. La gestione da parte del server delle opzioni del server, comprese "
-"quelle sconosciute, 챔 specifica del server. Quando multiple `--server-"
-"option=<option>`sono date, sono tutte inviate dall'altra parte nell'ordine "
-"listato sulla linea di comando."
+msgstr "Trasmettere le stringhe date al server quando si comunica usando il protocollo versione 2. LA stringa data non deve contenere un carattere NUL o LF. La gestione da parte del server delle opzioni del server, comprese quelle sconosciute, 챔 specifica del server. Quando multiple `--server-option=<option>`sono date, sono tutte inviate dall'altra parte nell'ordine listato sulla linea di comando."
#. type: Labeled list
#: en/fetch-options.txt:252
@@ -6056,11 +5755,9 @@ 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 [--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"
@@ -6074,66 +5771,37 @@ msgstr "DESCRIZIONE"
#: en/git-add.txt:25
#, fuzzy, 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 ""
-"Questo comando aggiorna l'indice usando il contenuto corrente trovato nel "
-"working tree, per preparare il contenuto organizzato per il commit seguente. "
-"In genere aggiunge il contenuto corrente dei percorsi esistenti nel loro "
-"insieme, ma con alcune opzioni pu챵 anche essere usato per aggiungere "
-"contenuto con solo una parte delle modifiche apportate ai file dell'albero "
-"di lavoro applicati o rimuovere percorsi che non esistono nell'albero di "
-"lavoro pi첫."
+msgstr "Questo comando aggiorna l'indice usando il contenuto corrente trovato nel working tree, per preparare il contenuto organizzato per il commit seguente. In genere aggiunge il contenuto corrente dei percorsi esistenti nel loro insieme, ma con alcune opzioni pu챵 anche essere usato per aggiungere contenuto con solo una parte delle modifiche apportate ai file dell'albero di lavoro applicati o rimuovere percorsi che non esistono nell'albero di lavoro pi첫."
#. type: Plain text
#: en/git-add.txt:31
#, fuzzy, 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 ""
-"L'indice contiene un'istantanea del contenuto dell'albero funzionante, ed 챔 "
-"questa istantanea che 챔 presa come contenuto del seguente commit. Pertanto, "
-"dopo aver fatto qualsiasi modifica all'albero funzionante, e prima di "
-"avviare il commando del commit, si deve utilizzare il comando 'add' "
-"(aggiungi) per aggiungere qualsiasi file, nuovo o modificato all'indice."
+msgstr "L'indice contiene un'istantanea del contenuto dell'albero funzionante, ed 챔 questa istantanea che 챔 presa come contenuto del seguente commit. Pertanto, dopo aver fatto qualsiasi modifica all'albero funzionante, e prima di avviare il commando del commit, si deve utilizzare il comando 'add' (aggiungi) per aggiungere qualsiasi file, nuovo o modificato all'indice."
#. type: Plain text
#: en/git-add.txt:36
#, fuzzy, 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 ""
-"Questo comando pu챵 essere eseguito pi첫 volte prima di un commit. Aggiunge "
-"solo il contenuto dei file specificati al momento dell'esecuzione del "
-"comando aggiungi; se si desidera che le modifiche successive vengano incluse "
-"nel commit successivo, 챔 necessario eseguire nuovamente `git add` per "
-"aggiungere il nuovo contenuto all'indice."
+msgstr "Questo comando pu챵 essere eseguito pi첫 volte prima di un commit. Aggiunge solo il contenuto dei file specificati al momento dell'esecuzione del comando aggiungi; se si desidera che le modifiche successive vengano incluse nel commit successivo, 챔 necessario eseguire nuovamente `git add` per aggiungere il nuovo contenuto all'indice."
#. type: Plain text
#: en/git-add.txt:39
#, fuzzy, priority:300
msgid "The `git status` command can be used to obtain a summary of which files have changes that are staged for the next commit."
-msgstr ""
-"Il comando 'git status' pu챵 essere utilizzato per ottenere un sommario di "
-"quali file possiedono delle modifiche che rappresentate/organizzate per il "
-"commit seguente."
+msgstr "Il comando 'git status' pu챵 essere utilizzato per ottenere un sommario di quali file possiedono delle modifiche che rappresentate/organizzate per il commit seguente."
#. type: Plain text
#: en/git-add.txt:46
#, fuzzy, priority:300
msgid "The `git add` command will not add ignored files by default. If any ignored files were explicitly specified on the command line, `git add` will fail with a list of ignored files. Ignored files reached by directory recursion or filename globbing performed by Git (quote your globs before the shell) will be silently ignored. The 'git add' command can be used to add ignored files with the `-f` (force) option."
-msgstr ""
-"Il comando `git add` non aggiunger횪 i file ignorati di default. Se qualche "
-"file ignorato fosse esplicitamente specificato sulla riga di comando, `git "
-"add` fallir횪 con un elenco di file ignorati. I file ignorati raggiunti dalla "
-"ricorsione della directory o dal globbing del nome file eseguito da Git ("
-"citare i globs prima della shell) verranno silenziosamente ignorati. Il "
-"comando 'git add' pu챵 essere usato per aggiungere file ignorati con "
-"l'opzione `-f` (force)."
+msgstr "Il comando `git add` non aggiunger횪 i file ignorati di default. Se qualche file ignorato fosse esplicitamente specificato sulla riga di comando, `git add` fallir횪 con un elenco di file ignorati. I file ignorati raggiunti dalla ricorsione della directory o dal globbing del nome file eseguito da Git (citare i globs prima della shell) verranno silenziosamente ignorati. Il comando 'git add' pu챵 essere usato per aggiungere file ignorati con l'opzione `-f` (force)."
#. type: Plain text
#: en/git-add.txt:49
#, fuzzy, priority:300
msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a commit."
-msgstr ""
-"Prego vedere linkgit:git-commit[1] per madalit횪 alternative per aggiungere "
-"un contenuto al commit."
+msgstr "Prego vedere linkgit:git-commit[1] per madalit횪 alternative per aggiungere un contenuto al commit."
#. type: Title -
#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
@@ -6151,32 +5819,19 @@ msgstr "<pathspec<"
#: en/git-add.txt:65
#, fuzzy, 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 ""
-"File dai quali si possono aggiungere contenuti. Fileglobs (es. `*.c`) pu챵 "
-"essere dato per aggiungere tutti i file corrispondenti. Anche un nome di una "
-"cartella principale (es. `dir` to add `dir/file1` and `dir/file2`) pu챵 "
-"essere dato per aggiornare l'indice per abbinare lo stato correntedella "
-"cartella nel complesso (es. 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). "
-"Notare che le versioni pi첫 vecchie di Git sono solite ignorare i file "
-"rimossi; usare l'opzione '--no-all' se si vuole aggiungere file, nuovi o "
-"modificati ma ignorare quelli rimossi."
+msgstr "File dai quali si possono aggiungere contenuti. Fileglobs (es. `*.c`) pu챵 essere dato per aggiungere tutti i file corrispondenti. Anche un nome di una cartella principale (es. `dir` to add `dir/file1` and `dir/file2`) pu챵 essere dato per aggiornare l'indice per abbinare lo stato correntedella cartella nel complesso (es. 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). Notare che le versioni pi첫 vecchie di Git sono solite ignorare i file rimossi; usare l'opzione '--no-all' se si vuole aggiungere file, nuovi o modificati ma ignorare quelli rimossi."
#. type: Plain text
#: en/git-add.txt:68 en/git-grep.txt:334
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
-msgstr ""
-"For more details about the <pathspec> syntax, see the 'pathspec' entry in "
-"linkgit:gitglossary[7]."
+msgstr "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
#. type: Plain text
#: en/git-add.txt:73
#, fuzzy, priority:300
msgid "Don't actually add the file(s), just show if they exist and/or will be ignored."
-msgstr ""
-"Non aggiungere file, mostrare solamente se esistono e/o saranno ignorati."
+msgstr "Non aggiungere file, mostrare solamente se esistono e/o saranno ignorati."
#. type: Plain text
#: en/git-add.txt:81
@@ -6200,20 +5855,13 @@ msgstr "--interactive"
#: en/git-add.txt:88
#, fuzzy, 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 ""
-"Aggiungi i contenuti modificati nella struttura di lavoro in modo "
-"interattivo all'indice. 횊 possibile fornire argomenti del percorso "
-"facoltativi per limitare l'operazione a un sottoinsieme dell'albero di "
-"lavoro. Vedi `` Modalit횪 interattiva '' per i dettagli."
+msgstr "Aggiungi i contenuti modificati nella struttura di lavoro in modo interattivo all'indice. 횊 possibile fornire argomenti del percorso facoltativi per limitare l'operazione a un sottoinsieme dell'albero di lavoro. Vedi `` Modalit횪 interattiva '' per i dettagli."
#. type: Plain text
#: en/git-add.txt:95
#, fuzzy, 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 ""
-"Scegliere interattivamente pezzi grossi di patch fra l'indice ed il work "
-"tree e aggiungerli all'indice. Ci챵 da all'utente la possibilit횪 di rivedere "
-"la differenza prima di aggiungere contenuti modificati all'indice."
+msgstr "Scegliere interattivamente pezzi grossi di patch fra l'indice ed il work tree e aggiungerli all'indice. Ci챵 da all'utente la possibilit횪 di rivedere la differenza prima di aggiungere contenuti modificati all'indice."
#. type: Plain text
#: en/git-add.txt:99
@@ -6237,22 +5885,13 @@ msgstr "--edit"
#: en/git-add.txt:105
#, fuzzy, 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 ""
-"Aprire la differenza vs. l'indice in un editor a lasciare che l'utente lo "
-"modifichi. Dopo che l'editor 챔 stato chiuo, regolare il pezzo d'intestazione "
-"ed applicare la patch all'indice."
+msgstr "Aprire la differenza vs. l'indice in un editor a lasciare che l'utente lo modifichi. Dopo che l'editor 챔 stato chiuo, regolare il pezzo d'intestazione ed applicare la patch all'indice."
#. type: Plain text
#: en/git-add.txt:111
#, fuzzy, 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 ""
-"L'intento di questa opzione 챔 quello di scegliere e selezionare le linee "
-"della patch da applicare o anche di modificare il contenuto delle linee da "
-"mettere in scena. Questo pu챵 essere pi첫 rapido e flessibile rispetto all'uso "
-"del selettore di un pezzo interattivo. Tuttavia, 챔 facile confondersi e "
-"creare una patch che non si applica all'indice. Vedi MODIFICA DEI PATCH di "
-"seguito."
+msgstr "L'intento di questa opzione 챔 quello di scegliere e selezionare le linee della patch da applicare o anche di modificare il contenuto delle linee da mettere in scena. Questo pu챵 essere pi첫 rapido e flessibile rispetto all'uso del selettore di un pezzo interattivo. Tuttavia, 챔 facile confondersi e creare una patch che non si applica all'indice. Vedi MODIFICA DEI PATCH di seguito."
#. type: Labeled list
#: en/git-add.txt:113
@@ -6264,20 +5903,13 @@ msgstr "--update"
#: en/git-add.txt:117
#, fuzzy, 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 ""
-"Aggiornare l'indice solo dove esso possiede un ingresso <patchspech> "
-"corrispondente. Ci챵 rimuove e modifica le voci dell'indice in modo che "
-"corrispondano al working tree, ma non aggiunge nuovi file."
+msgstr "Aggiornare l'indice solo dove esso possiede un ingresso <patchspech> corrispondente. Ci챵 rimuove e modifica le voci dell'indice in modo che corrispondano al working tree, ma non aggiunge nuovi file."
#. type: Plain text
#: en/git-add.txt:122
#, fuzzy, 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 ""
-"Se non viene fornito <pathspec> quando viene usata l'opzione `-u`, tutti i "
-"file tracciati nell'intero albero di lavoro vengono aggiornati (le vecchie "
-"versioni di Git venivano usate per limitare l'aggiornamento alla directory "
-"corrente e alle sue sottodirectory)."
+msgstr "Se non viene fornito <pathspec> quando viene usata l'opzione `-u`, tutti i file tracciati nell'intero albero di lavoro vengono aggiornati (le vecchie versioni di Git venivano usate per limitare l'aggiornamento alla directory corrente e alle sue sottodirectory)."
#. type: Labeled list
#: en/git-add.txt:123 en/git-repack.txt:49 en/git-svn.txt:418
@@ -6295,20 +5927,13 @@ msgstr "--no-ignore-removal"
#: en/git-add.txt:130
#, fuzzy, 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 ""
-"Aggiorna l'indice non solo dove l'albero di lavoro ha un file corrispondente "
-"a <pathspec> ma anche dove l'indice ha gi횪 una voce. Ci챵 aggiunge, modifica "
-"e rimuove le voci di indice in modo che corrispondano all'albero di lavoro."
+msgstr "Aggiorna l'indice non solo dove l'albero di lavoro ha un file corrispondente a <pathspec> ma anche dove l'indice ha gi횪 una voce. Ci챵 aggiunge, modifica e rimuove le voci di indice in modo che corrispondano all'albero di lavoro."
#. type: Plain text
#: en/git-add.txt:135
#, fuzzy, 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 ""
-"Se nessun <pathspec> 챔 dato quando l'opzione '-A' 챔 utilizzata, tutti i file "
-"nell'intero working tree vengono aggiornati (la vecchia versione di Git era "
-"solita limitare gli aggiornamenti alla cartella corrente ed alle sue "
-"sottocartelle)."
+msgstr "Se nessun <pathspec> 챔 dato quando l'opzione '-A' 챔 utilizzata, tutti i file nell'intero working tree vengono aggiornati (la vecchia versione di Git era solita limitare gli aggiornamenti alla cartella corrente ed alle sue sottocartelle)."
#. type: Labeled list
#: en/git-add.txt:136
@@ -6326,20 +5951,13 @@ msgstr "--ignore-removal"
#: en/git-add.txt:142
#, fuzzy, 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 ""
-"Aggiorna l'indice aggiungendo nuovi file sconosciuti all'indice e file "
-"modificati nella struttura di lavoro, ma ignora i file che sono stati "
-"rimossi dalla struttura di lavoro. Questa opzione 챔 no-op quando non viene "
-"utilizzato <pathspec>."
+msgstr "Aggiorna l'indice aggiungendo nuovi file sconosciuti all'indice e file modificati nella struttura di lavoro, ma ignora i file che sono stati rimossi dalla struttura di lavoro. Questa opzione 챔 no-op quando non viene utilizzato <pathspec>."
#. type: Plain text
#: en/git-add.txt:146
#, fuzzy, 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 ""
-"Questa opzione aiuta primariamente quegli utenti che sono abituati alle "
-"vecchie versioni di Git, del quale \"git add <pathspec>...\" era un sinonimo "
-"per \"git add--no-all <pathspec>...\" ignorava i file rimossi."
+msgstr "Questa opzione aiuta primariamente quegli utenti che sono abituati alle vecchie versioni di Git, del quale \"git add <pathspec>...\" era un sinonimo per \"git add--no-all <pathspec>...\" ignorava i file rimossi."
#. type: Labeled list
#: en/git-add.txt:147 en/git-format-patch.txt:104 en/git-submodule.txt:351
@@ -6357,11 +5975,7 @@ msgstr "--intent-to-add"
#: en/git-add.txt:154
#, fuzzy, 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 ""
-"Ricordare solo il fatto che il percorso sar횪 aggiunto successivamente. Un "
-"ingresso per il percorso 챔 posto nell'indice senza contenuto. Ci챵 챔 utile "
-"per, tra le altre cose, mostrare il contenuto non organizzato di tali file "
-"con `git diff`e impegnarli con `git commit -a`."
+msgstr "Ricordare solo il fatto che il percorso sar횪 aggiunto successivamente. Un ingresso per il percorso 챔 posto nell'indice senza contenuto. Ci챵 챔 utile per, tra le altre cose, mostrare il contenuto non organizzato di tali file con `git diff`e impegnarli con `git commit -a`."
#. type: Labeled list
#: en/git-add.txt:155 en/git-update-index.txt:55
@@ -6373,9 +5987,7 @@ msgstr "--refresh"
#: en/git-add.txt:158
#, fuzzy, priority:300
msgid "Don't add the file(s), but only refresh their stat() information in the index."
-msgstr ""
-"Non aggiungere file, ma aggiornare solo il loro stato di informazione "
-"nell'indice."
+msgstr "Non aggiungere file, ma aggiornare solo il loro stato di informazione nell'indice."
#. type: Labeled list
#: en/git-add.txt:159
@@ -6387,12 +5999,7 @@ msgstr "--ignore-errors"
#: en/git-add.txt:165
#, fuzzy, priority:300
msgid "If some files could not be added because of errors indexing them, do not abort the operation, but continue adding the others. The command shall still exit with non-zero status. The configuration variable `add.ignoreErrors` can be set to true to make this the default behaviour."
-msgstr ""
-"Se non 챔 possibile aggiungere alcuni file a causa di errori di "
-"indicizzazione, non interrompere l'operazione, ma continuare ad aggiungere "
-"gli altri. Il comando deve comunque uscire con uno stato diverso da zero. La "
-"variabile di configurazione `add.ignoreErrors` pu챵 essere impostata su \"true"
-"\" (vero) per rendere questo comportamento predefinito."
+msgstr "Se non 챔 possibile aggiungere alcuni file a causa di errori di indicizzazione, non interrompere l'operazione, ma continuare ad aggiungere gli altri. Il comando deve comunque uscire con uno stato diverso da zero. La variabile di configurazione `add.ignoreErrors` pu챵 essere impostata su \"true\" (vero) per rendere questo comportamento predefinito."
#. type: Labeled list
#: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:201
@@ -6404,10 +6011,7 @@ msgstr "--ignore-missing"
#: en/git-add.txt:171
#, fuzzy, 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 ""
-"Questa opzione pu챵 essere utilizzata solo con --dry-run. Utilizzando questa "
-"opzione l'utente pu챵 controllare se ogni singolo file dato verr횪 ignorato, "
-"non importa se siano gi횪 presenti nel work tree o no."
+msgstr "Questa opzione pu챵 essere utilizzata solo con --dry-run. Utilizzando questa opzione l'utente pu챵 controllare se ogni singolo file dato verr횪 ignorato, non importa se siano gi횪 presenti nel work tree o no."
#. type: Labeled list
#: en/git-add.txt:172
@@ -6419,11 +6023,7 @@ msgstr "--no-warn-embedded-repo"
#: en/git-add.txt:178
#, fuzzy, priority:300
msgid "By default, `git add` will warn when adding an embedded repository to the index without using `git submodule add` to create an entry in `.gitmodules`. This option will suppress the warning (e.g., if you are manually performing operations on submodules)."
-msgstr ""
-"Di default, `git add` avviser횪 quando si aggiunge un archivio incorporato "
-"all'indice senza usare` git submodule add` per creare una voce in `."
-"gitmodules`. Questa opzione eliminer횪 l'avviso (ad es. Se si eseguono "
-"operazioni manualmente su sottomoduli)."
+msgstr "Di default, `git add` avviser횪 quando si aggiunge un archivio incorporato all'indice senza usare` git submodule add` per creare una voce in `.gitmodules`. Questa opzione eliminer횪 l'avviso (ad es. Se si eseguono operazioni manualmente su sottomoduli)."
#. type: Labeled list
#: en/git-add.txt:179
@@ -6435,11 +6035,7 @@ msgstr "--renormalize"
#: en/git-add.txt:185
#, fuzzy, 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 ""
-"Applicare il processo \"pulito\" di recente a tutti i file tracciati per "
-"aggiungerli forzatamente all'indice. Ci챵 챔 utile dopo aver cambiato la "
-"configurazione `core.autocrlf` o l'attributo 'text' per correggere file "
-"utilizzati con l'errato fine riga CRLF/LF. Questa opzione sottintende '-u'."
+msgstr "Applicare il processo \"pulito\" di recente a tutti i file tracciati per aggiungerli forzatamente all'indice. Ci챵 챔 utile dopo aver cambiato la configurazione `core.autocrlf` o l'attributo 'text' per correggere file utilizzati con l'errato fine riga CRLF/LF. Questa opzione sottintende '-u'."
#. type: Labeled list
#: en/git-add.txt:186 en/git-update-index.txt:86
@@ -6451,9 +6047,7 @@ msgstr ""
#: en/git-add.txt:190
#, fuzzy, 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 ""
-"Sovrascrivere il bit fattibili dei file aggiunti. Il bit fattibile viene "
-"cambiato solo nell'indice, i file nel disco rimangono invariati."
+msgstr "Sovrascrivere il bit fattibili dei file aggiunti. Il bit fattibile viene cambiato solo nell'indice, i file nel disco rimangono invariati."
#. type: Labeled list
#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:112 en/git-restore.txt:125 en/git-rm.txt:78 en/git-stash.txt:198
@@ -6465,13 +6059,7 @@ msgstr "--pathspec-from-file=<file>"
#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:119 en/git-restore.txt:132 en/git-rm.txt:85 en/git-stash.txt:207
#, fuzzy, 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 viene passato in `<file>` invece degli arg della riga di comando. "
-"Se `<file>` 챔 esattamente `-`, viene utilizzato l'input standard. Gli "
-"elementi pathspec vengono separati da LF o CR/LF. Gli elementi pathspec "
-"possono essere citati come spiegato per la variabile di configurazione `core."
-"quotePath` (see linkgit:git-config[1]). Vedere anche `--pathspec-file-nul` "
-"ed il `--literal-pathspecs` global."
+msgstr "Pathspec viene passato in `<file>` invece degli arg della riga di comando. Se `<file>` 챔 esattamente `-`, viene utilizzato l'input standard. Gli elementi pathspec vengono separati da LF o CR/LF. Gli elementi pathspec possono essere citati come spiegato per la variabile di configurazione `core.quotePath` (see linkgit:git-config[1]). Vedere anche `--pathspec-file-nul` ed il `--literal-pathspecs` global."
#. type: Labeled list
#: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:120 en/git-restore.txt:133 en/git-rm.txt:86 en/git-stash.txt:208
@@ -6483,10 +6071,7 @@ msgstr "--pathspec-file-nul"
#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:124 en/git-restore.txt:137 en/git-rm.txt:90 en/git-stash.txt:214
#, fuzzy, 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 ""
-"Importante solo con `--pathspec-from-file`. Gli elementi pathspec vengono "
-"separati con caratteru NUL e tutti gli altri caratteri vengono presi "
-"letteralmente (tra cui newline e citazioni)."
+msgstr "Importante solo con `--pathspec-from-file`. Gli elementi pathspec vengono separati con caratteru NUL e tutti gli altri caratteri vengono presi letteralmente (tra cui newline e citazioni)."
#. 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:358 en/git-grep.txt:324 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:138 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
@@ -6498,10 +6083,7 @@ msgstr "\\--"
#: en/git-add.txt:208 en/git-rm.txt:64
#, fuzzy, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
-msgstr ""
-"Questa opzione pu챵 essere usata per separare opzioni di comando di linea "
-"dalla lista dei file, (utile quando i nomi dei file potrebbero essere errati "
-"le opzioni del comando di linea)."
+msgstr "Questa opzione pu챵 essere usata per separare opzioni di comando di linea dalla lista dei file, (utile quando i nomi dei file potrebbero essere errati le opzioni del comando di linea)."
#. type: Title -
#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
@@ -6513,9 +6095,7 @@ msgstr "ESEMPI"
#: en/git-add.txt:215
#, fuzzy, priority:300
msgid "Adds content from all `*.txt` files under `Documentation` directory and its subdirectories:"
-msgstr ""
-"Aggiunge contenuti da tutta la cartella `*.txt` files under `Documentation` "
-"e le sue sottocartelle."
+msgstr "Aggiunge contenuti da tutta la cartella `*.txt` files under `Documentation` e le sue sottocartelle."
#. type: delimited block -
#: en/git-add.txt:218
@@ -6527,10 +6107,7 @@ msgstr "$ git add Documentation/\\*.txt\n"
#: en/git-add.txt:223
#, fuzzy, 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 ""
-"Notare che l'asterisco '*' 챔 citato dallo shell in questo esempio; questo "
-"permette al comando di includere i file dalle sottodirectory della directory "
-"`Documentation /`."
+msgstr "Notare che l'asterisco '*' 챔 citato dallo shell in questo esempio; questo permette al comando di includere i file dalle sottodirectory della directory `Documentation /`."
#. type: Plain text
#: en/git-add.txt:225
@@ -6548,9 +6125,7 @@ msgstr "$ git add git-*.sh.\n"
#: en/git-add.txt:233
#, fuzzy, 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 ""
-"Poich챕 questo esempio consente allo shell di espandere l'asterisco (ovvero "
-"si elencano i file in modo esplicito), non considera `subdir / git-foo.sh`."
+msgstr "Poich챕 questo esempio consente allo shell di espandere l'asterisco (ovvero si elencano i file in modo esplicito), non considera `subdir / git-foo.sh`."
#. type: Title -
#: en/git-add.txt:235 en/git-rebase.txt:799
@@ -6562,18 +6137,13 @@ msgstr "MODALITA' INTERATTIVA"
#: en/git-add.txt:239
#, fuzzy, 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 ""
-"Quando il comando entra in modalit횪 interattiva, mostra l'output del "
-"sottocomando \"status\", quindi passa al suo ciclo di comandi interattivo."
+msgstr "Quando il comando entra in modalit횪 interattiva, mostra l'output del sottocomando \"status\", quindi passa al suo ciclo di comandi interattivo."
#. type: Plain text
#: en/git-add.txt:244 en/git-clean.txt:85
#, fuzzy, 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 ""
-"Il comando loop mostra la lista dei sotto-comandi disponibile e da un "
-"messaggio \"Adesso cosa>\". In generale, quando il messaggio finisce con un "
-"singolo '>', pu챵 scegliere solo una delle scelte date e premere invio, cos챙:"
+msgstr "Il comando loop mostra la lista dei sotto-comandi disponibile e da un messaggio \"Adesso cosa>\". In generale, quando il messaggio finisce con un singolo '>', pu챵 scegliere solo una delle scelte date e premere invio, cos챙:"
#. type: delimited block -
#: en/git-add.txt:250
@@ -6593,8 +6163,7 @@ msgstr ""
#: en/git-add.txt:254
#, fuzzy, priority:300
msgid "You also could say `s` or `sta` or `status` above as long as the choice is unique."
-msgstr ""
-"Puoi anche dire 's' o 'sta' o 'status' sopra purch챕 la scelta sia unica."
+msgstr "Puoi anche dire 's' o 'sta' o 'status' sopra purch챕 la scelta sia unica."
#. type: Plain text
#: en/git-add.txt:256
@@ -6612,11 +6181,7 @@ msgstr "--status"
#: en/git-add.txt:264
#, fuzzy, 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 ""
-"Ci챵 mostra il cambiamento fra HEAD e l'indice (ossia: cosa verrebbe "
-"impiegato sei dici 'git commit'), e tra l'indice ed i files del working tree "
-"(ossia: cosa puoi organizzare ancora prima che 'git commit' usi 'git add') "
-"per ogni percorso. Un esempio dell'output appare cos챙:"
+msgstr "Ci챵 mostra il cambiamento fra HEAD e l'indice (ossia: cosa verrebbe impiegato sei dici 'git commit'), e tra l'indice ed i files del working tree (ossia: cosa puoi organizzare ancora prima che 'git commit' usi 'git add') per ogni percorso. Un esempio dell'output appare cos챙:"
#. type: delimited block -
#: en/git-add.txt:269
@@ -6634,15 +6199,7 @@ msgstr ""
#: en/git-add.txt:280
#, fuzzy, priority:300
msgid "It shows that foo.png has differences from HEAD (but that is binary so line count cannot be shown) and there is no difference between indexed copy and the working tree version (if the working tree version were also different, 'binary' would have been shown in place of 'nothing'). The other file, git-add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and one deletion)."
-msgstr ""
-"Questo mostra che foo.png ha delle differenza da HEAD (ma che quello 챔 "
-"binario pertanto il conteggio delle linee non pu챵 essere mostrato) e non c'챔 "
-"differenza fra la copia indicizzata e la versione del working tree (se la "
-"versione del working tree fosse diversa, 'binary' verrebbe mostrata al posto "
-"di 'niente'). L'altro file, git-add{litdd}interactive.perl, ha 403 linee "
-"aggiunte e 35 linee cancellate se impegni ci챵 che c'챔 nell'indice, ma il "
-"file del working tree ha una modificazione aggiuntive (un'aggiunta ed una "
-"cancellazione)."
+msgstr "Questo mostra che foo.png ha delle differenza da HEAD (ma che quello 챔 binario pertanto il conteggio delle linee non pu챵 essere mostrato) e non c'챔 differenza fra la copia indicizzata e la versione del working tree (se la versione del working tree fosse diversa, 'binary' verrebbe mostrata al posto di 'niente'). L'altro file, git-add{litdd}interactive.perl, ha 403 linee aggiunte e 35 linee cancellate se impegni ci챵 che c'챔 nell'indice, ma il file del working tree ha una modificazione aggiuntive (un'aggiunta ed una cancellazione)."
#. type: Labeled list
#: en/git-add.txt:281 en/git-update-ref.txt:102
@@ -6654,14 +6211,7 @@ msgstr "update"
#: en/git-add.txt:290
#, fuzzy, priority:300
msgid "This shows the status information and issues an \"Update>>\" prompt. When the prompt ends with double '>>', you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything."
-msgstr ""
-"Questo mostra le informazioni sullo stato e genera un messaggio\"Aggiorna >>"
-"\". Quando il messaggio termina con il doppio '>>', puoi effettuare pi첫 di "
-"una selezione, concatenata con spazi bianchi o virgola. Inoltre puoi "
-"selezionare intervalli. Per esempio. \"2-5 7,9\" per selezionare 2,3,4,5,7,9 "
-"dall'elenco. Se il secondo numero in un intervallo viene omesso, vengono "
-"prese tutte le patch rimanenti. Per esempio. \"7-\" per scegliere 7,8,9 "
-"dall'elenco. Puoi dire '*' per scegliere tutto."
+msgstr "Questo mostra le informazioni sullo stato e genera un messaggio\"Aggiorna >>\". Quando il messaggio termina con il doppio '>>', puoi effettuare pi첫 di una selezione, concatenata con spazi bianchi o virgola. Inoltre puoi selezionare intervalli. Per esempio. \"2-5 7,9\" per selezionare 2,3,4,5,7,9 dall'elenco. Se il secondo numero in un intervallo viene omesso, vengono prese tutte le patch rimanenti. Per esempio. \"7-\" per scegliere 7,8,9 dall'elenco. Puoi dire '*' per scegliere tutto."
#. type: Plain text
#: en/git-add.txt:293
@@ -6697,9 +6247,7 @@ msgstr "Aggiorna>> -2\n"
#: en/git-add.txt:309
#, fuzzy, 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 ""
-"Dopo aver fatto la selezione, rispondere con una linea vuota per organizzare "
-"i contenuti dei file del working tree per percorsi selezionati nell'indice."
+msgstr "Dopo aver fatto la selezione, rispondere con una linea vuota per organizzare i contenuti dei file del working tree per percorsi selezionati nell'indice."
#. type: Labeled list
#: en/git-add.txt:310
@@ -6711,11 +6259,7 @@ msgstr "revert"
#: en/git-add.txt:315
#, fuzzy, 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 ""
-"Questa ha un'interfaccia utente molto simile all '\"aggiornamento\" e le "
-"informazioni organizzate per i percorsi selezionati vengono ripristinate a "
-"quelle della versione HEAD. Il ripristino di nuovi percorsi li rende non "
-"tracciati."
+msgstr "Questa ha un'interfaccia utente molto simile all '\"aggiornamento\" e le informazioni organizzate per i percorsi selezionati vengono ripristinate a quelle della versione HEAD. Il ripristino di nuovi percorsi li rende non tracciati."
#. type: Labeled list
#: en/git-add.txt:316
@@ -6727,9 +6271,7 @@ msgstr "Aggiungi file non tracciati"
#: en/git-add.txt:320
#, fuzzy, priority:300
msgid "This has a very similar UI to 'update' and 'revert', and lets you add untracked paths to the index."
-msgstr ""
-"Questa 챔 una UI molto simile a 'update' e 'revert', e ti lascia aggiungere "
-"percorsi non tracciati nell'indice."
+msgstr "Questa 챔 una UI molto simile a 'update' e 'revert', e ti lascia aggiungere percorsi non tracciati nell'indice."
#. type: Labeled list
#: en/git-add.txt:321
@@ -6781,17 +6323,13 @@ msgstr ""
#: en/git-add.txt:346
#, fuzzy, 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 ""
-"Dopo aver deciso il destino di tutti i pezzi, se 챔 stato scelto un pezzo, "
-"l'indice viene aggiornato con i pezzi selezionati."
+msgstr "Dopo aver deciso il destino di tutti i pezzi, se 챔 stato scelto un pezzo, l'indice viene aggiornato con i pezzi selezionati."
#. type: Plain text
#: en/git-add.txt:349
#, fuzzy, priority:300
msgid "You can omit having to type return here, by setting the configuration variable `interactive.singleKey` to `true`."
-msgstr ""
-"Puoi omettere di dover digitare return qui, impostando la variabile di "
-"configurazione `interactive.singleKey` su` true`."
+msgstr "Puoi omettere di dover digitare return qui, impostando la variabile di configurazione `interactive.singleKey` su` true`."
#. type: Labeled list
#: en/git-add.txt:350
@@ -6815,16 +6353,7 @@ msgstr "MODIFICA DELLA PATCH"
#: en/git-add.txt:367
#, fuzzy, priority:300
msgid "Invoking `git add -e` or selecting `e` from the interactive hunk selector will open a patch in your editor; after the editor exits, the result is applied to the index. You are free to make arbitrary changes to the patch, but note that some changes may have confusing results, or even result in a patch that cannot be applied. If you want to abort the operation entirely (i.e., stage nothing new in the index), simply delete all lines of the patch. The list below describes some common things you may see in a patch, and which editing operations make sense on them."
-msgstr ""
-"Invocare `git add -e` o selezionare` e` dal selettore di hunk interattivo "
-"aprir횪 una patch nel tuo editor; dopo la chiusura dell'editor, il risultato "
-"viene applicato all'indice. Sei libero di apportare modifiche arbitrarie "
-"alla patch, ma tieni presente che alcune modifiche possono avere risultati "
-"confusi o addirittura provocare una patch che non pu챵 essere applicata. Se "
-"si desidera interrompere completamente l'operazione (ovvero non inserire "
-"nulla di nuovo nell'indice), 챔 sufficiente eliminare tutte le linee della "
-"patch. L'elenco seguente descrive alcune cose comuni che potresti vedere in "
-"una patch e quali operazioni di modifica hanno senso su di esse."
+msgstr "Invocare `git add -e` o selezionare` e` dal selettore di hunk interattivo aprir횪 una patch nel tuo editor; dopo la chiusura dell'editor, il risultato viene applicato all'indice. Sei libero di apportare modifiche arbitrarie alla patch, ma tieni presente che alcune modifiche possono avere risultati confusi o addirittura provocare una patch che non pu챵 essere applicata. Se si desidera interrompere completamente l'operazione (ovvero non inserire nulla di nuovo nell'indice), 챔 sufficiente eliminare tutte le linee della patch. L'elenco seguente descrive alcune cose comuni che potresti vedere in una patch e quali operazioni di modifica hanno senso su di esse."
#. type: Labeled list
#: en/git-add.txt:369
@@ -6836,10 +6365,7 @@ msgstr "contenuto aggiunto"
#: en/git-add.txt:373
#, fuzzy, priority:300
msgid "Added content is represented by lines beginning with \"{plus}\". You can prevent staging any addition lines by deleting them."
-msgstr ""
-"Il contenuto aggiunto 챔 rappresentato da righe che iniziano con \"{plus}\". "
-"횊 possibile impedire la messa in scena di eventuali linee di addizione "
-"eliminandole."
+msgstr "Il contenuto aggiunto 챔 rappresentato da righe che iniziano con \"{plus}\". 횊 possibile impedire la messa in scena di eventuali linee di addizione eliminandole."
#. type: Labeled list
#: en/git-add.txt:374
@@ -6851,10 +6377,7 @@ msgstr "rimuovere contenuto"
#: en/git-add.txt:378
#, fuzzy, priority:300
msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)."
-msgstr ""
-"Il contenuto rimosso 챔 rappresentato da linee che iniziano con \"-\". 횊 "
-"possibile impedire la loro rimozione temporanea convertendo \"-\" in \"\" "
-"(spazio)."
+msgstr "Il contenuto rimosso 챔 rappresentato da linee che iniziano con \"-\". 횊 possibile impedire la loro rimozione temporanea convertendo \"-\" in \"\" (spazio)."
#. type: Labeled list
#: en/git-add.txt:379
@@ -6866,24 +6389,13 @@ msgstr "contenuto modificato, "
#: en/git-add.txt:386
#, fuzzy, priority:300
msgid "Modified content is represented by \"-\" lines (removing the old content) followed by \"{plus}\" lines (adding the replacement content). You can prevent staging the modification by converting \"-\" lines to \" \", and removing \"{plus}\" lines. Beware that modifying only half of the pair is likely to introduce confusing changes to the index."
-msgstr ""
-"Il contenuto modificato 챔 rappresentato dalla linea \"-\" (rimuovendo il "
-"contenuto vecchio) seguito da \"{plus}\" (aggiungendo il contenuto di "
-"rimpiazzo), Puoi evitare di organizzare la modifica convertendo le linee \"-"
-"\" a \" \", e rimuovendo \"{plus}\". Stare attenti che modificare solo met횪 "
-"della copia pu챵 portare a cambiamenti fuorvianti all'indice."
+msgstr "Il contenuto modificato 챔 rappresentato dalla linea \"-\" (rimuovendo il contenuto vecchio) seguito da \"{plus}\" (aggiungendo il contenuto di rimpiazzo), Puoi evitare di organizzare la modifica convertendo le linee \"-\" a \" \", e rimuovendo \"{plus}\". Stare attenti che modificare solo met횪 della copia pu챵 portare a cambiamenti fuorvianti all'indice."
#. type: Plain text
#: en/git-add.txt:394
#, fuzzy, 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 ""
-"Ci sono anche operazioni pi첫 complesse che possono essere eseguite. "
-"Tuttavia, poich챕 la patch viene applicata solo all'indice e non al working "
-"tree, l'albero di lavoro sembrer횪 \"annullare\" la modifica dell'indice. Ad "
-"esempio, l'introduzione di una nuova linea nell'indice che non si trova n챕 "
-"nell'HEAD n챕 nell'albero di lavoro metter횪 in scena la nuova linea per il "
-"commit, ma la linea apparir횪 ripristinata nel working tree."
+msgstr "Ci sono anche operazioni pi첫 complesse che possono essere eseguite. Tuttavia, poich챕 la patch viene applicata solo all'indice e non al working tree, l'albero di lavoro sembrer횪 \"annullare\" la modifica dell'indice. Ad esempio, l'introduzione di una nuova linea nell'indice che non si trova n챕 nell'HEAD n챕 nell'albero di lavoro metter횪 in scena la nuova linea per il commit, ma la linea apparir횪 ripristinata nel working tree."
#. type: Plain text
#: en/git-add.txt:396
@@ -6901,11 +6413,7 @@ msgstr "rimozione di contenuti intatti"
#: en/git-add.txt:404
#, fuzzy, priority:300
msgid "Content which does not differ between the index and working tree may be shown on context lines, beginning with a \" \" (space). You can stage context lines for removal by converting the space to a \"-\". The resulting working tree file will appear to re-add the content."
-msgstr ""
-"Il contenuto che non differisce fra l'indice ed il working tree potrebbe "
-"essere mostrato su linee di contesto, iniziando con \" \" (spazio). Puoi "
-"organizzare linee di contesto per rimozione convertendo lo spazio a \"-\". "
-"Il file del work tree risultante apparir횪 per riaggiungere il contenuto."
+msgstr "Il contenuto che non differisce fra l'indice ed il working tree potrebbe essere mostrato su linee di contesto, iniziando con \" \" (spazio). Puoi organizzare linee di contesto per rimozione convertendo lo spazio a \"-\". Il file del work tree risultante apparir횪 per riaggiungere il contenuto."
#. type: Labeled list
#: en/git-add.txt:405
@@ -6917,12 +6425,7 @@ msgstr "modifica del contenuto esistente"
#: en/git-add.txt:412
#, fuzzy, 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 ""
-"Uno pu챵 anche modificare linee di contesto organizzandole per rimozione ("
-"convertendo \" \" a \"-\") ed aggiungendo un \"{plus}\" con il nuovo "
-"contenuto. Similmente, uno pu챵 modificare \"{plus}\" per aggiunte o "
-"modifiche esistenti. In tutti i casi, la nuova modifica apparir횪 inversa nel "
-"working tree."
+msgstr "Uno pu챵 anche modificare linee di contesto organizzandole per rimozione (convertendo \" \" a \"-\") ed aggiungendo un \"{plus}\" con il nuovo contenuto. Similmente, uno pu챵 modificare \"{plus}\" per aggiunte o modifiche esistenti. In tutti i casi, la nuova modifica apparir횪 inversa nel working tree."
#. type: Labeled list
#: en/git-add.txt:413
@@ -6934,10 +6437,7 @@ msgstr "nuovo contenuto"
#: en/git-add.txt:418
#, fuzzy, 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 ""
-"Puoi anche aggiungere un nuovo contenuto con non esiste nella patch; "
-"semplicemente aggiungere nuove linee, ognuna che inizi con \"{plus}\". "
-"L'aggiunta apparir횪 invertita nel working tree."
+msgstr "Puoi anche aggiungere un nuovo contenuto con non esiste nella patch; semplicemente aggiungere nuove linee, ognuna che inizi con \"{plus}\". L'aggiunta apparir횪 invertita nel working tree."
#. type: Plain text
#: en/git-add.txt:422
@@ -7074,7 +6574,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -7104,7 +6604,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -7352,7 +6852,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7685,7 +7185,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -10456,7 +9956,7 @@ msgstr "--git-format"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -14053,30 +13553,19 @@ msgstr ""
#: en/git-clone.txt:30
#, 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 --remotes`), and creates and checks out an initial branch that is forked from the cloned repository's currently active branch."
-msgstr ""
-"Clona un deposito una cartella creata recentemente, crea branche di remote-"
-"tracking per ogni branca nel deposito clonato (visibilmente utilizzando `git "
-"branch --remotes`), e crea e verifica una branca iniziale che viene "
-"biforcata dalla branca, attiva al momento, del deposito clonato."
+msgstr "Clona un deposito una cartella creata recentemente, crea branche di remote-tracking per ogni branca nel deposito clonato (visibilmente utilizzando `git branch --remotes`), e crea e verifica una branca iniziale che viene biforcata dalla branca, attiva al momento, del deposito clonato."
#. type: Plain text
#: en/git-clone.txt:36
#, fuzzy, 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 ""
-"Dopo il clone, un semplice `git fetch` senza argomenti aggiorner횪 tutti i "
-"rami di tracciamento remoto e un` git pull` senza argomenti unir횪 inoltre il "
-"ramo principale remoto nel ramo principale corrente, se presente (non 챔 vero "
-"quando Viene fornito \"--single-branch\", vedi sotto)."
+msgstr "Dopo il clone, un semplice `git fetch` senza argomenti aggiorner횪 tutti i rami di tracciamento remoto e un` git pull` senza argomenti unir횪 inoltre il ramo principale remoto nel ramo principale corrente, se presente (non 챔 vero quando Viene fornito \"--single-branch\", vedi sotto)."
#. type: Plain text
#: en/git-clone.txt:41
#, fuzzy, 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 ""
-"Questa configurazione predefinita 챔 raggiunta creando richiami alle remote "
-"branche di testa sotto `refs/remotes/origin` ed inizializzando variabili di "
-"configurazione `remote.origin.url` e `remote.origin.fetch`."
+msgstr "Questa configurazione predefinita 챔 raggiunta creando richiami alle remote branche di testa sotto `refs/remotes/origin` ed inizializzando variabili di configurazione `remote.origin.url` e `remote.origin.fetch`."
#. type: Labeled list
#: en/git-clone.txt:46 en/git-config.txt:127 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
@@ -14088,24 +13577,13 @@ msgstr "--local"
#: en/git-clone.txt:53
#, fuzzy, 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 ""
-"Quando il repository da cui clonare si trova su una macchina locale, questo "
-"flag ignora il normale meccanismo di trasporto \"Git aware\" e clona il "
-"repository facendo una copia di HEAD e tutto ci챵 che si trova sotto le "
-"directory degli oggetti e dei ref. I file nella directory `.git / objects /` "
-"sono collegati per salvare spazio quando possibile."
+msgstr "Quando il repository da cui clonare si trova su una macchina locale, questo flag ignora il normale meccanismo di trasporto \"Git aware\" e clona il repository facendo una copia di HEAD e tutto ci챵 che si trova sotto le directory degli oggetti e dei ref. I file nella directory `.git / objects /` sono collegati per salvare spazio quando possibile."
#. type: Plain text
#: en/git-clone.txt:60
#, fuzzy, priority:300
msgid "If the repository is specified as a local path (e.g., `/path/to/repo`), this is the default, and --local is essentially a no-op. If the repository is specified as a URL, then this flag is ignored (and we never use the local optimizations). Specifying `--no-local` will override the default when `/path/to/repo` is given, using the regular Git transport instead."
-msgstr ""
-"Se il deposito 챔 designato come percorso locale (ossia: `/path/to/repo`) "
-"questo 챔 di base, e --local is essentially a no-op. Se il deposito 챔 "
-"designato come URL, dunque questa bandiera viene ignorata (e non utilizziamo "
-"mai le ottimizzazioni locali). Specificando '--no-local' sovrascriver횪 il "
-"predefinito quando `/path/to/repo` 챔 dato, utilizzando invece il regolare "
-"Git trasport."
+msgstr "Se il deposito 챔 designato come percorso locale (ossia: `/path/to/repo`) questo 챔 di base, e --local is essentially a no-op. Se il deposito 챔 designato come URL, dunque questa bandiera viene ignorata (e non utilizziamo mai le ottimizzazioni locali). Specificando '--no-local' sovrascriver횪 il predefinito quando `/path/to/repo` 챔 dato, utilizzando invece il regolare Git trasport."
#. type: Labeled list
#: en/git-clone.txt:61
@@ -14117,11 +13595,7 @@ msgstr "--no-hardlinks"
#: en/git-clone.txt:66
#, fuzzy, 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 ""
-"Forza il processo di clonazione da un archivio su un filesystem locale per "
-"copiare i file nella cartella `.git / objects` invece di usare hardlink. Ci챵 "
-"pu챵 essere desiderabile se si sta tentando di eseguire un backup del proprio "
-"archivio."
+msgstr "Forza il processo di clonazione da un archivio su un filesystem locale per copiare i file nella cartella `.git / objects` invece di usare hardlink. Ci챵 pu챵 essere desiderabile se si sta tentando di eseguire un backup del proprio archivio."
#. type: Labeled list
#: en/git-clone.txt:68
@@ -14133,11 +13607,7 @@ msgstr "--shared"
#: en/git-clone.txt:74
#, fuzzy, 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 ""
-"Quando il deposito da clonare 챔 sulla macchina locale, invece di utilizzare "
-"hard link, selezionare automaticamente `.git/objects/info/alternates` per "
-"condividere gli oggetti il deposito della sorgente. IL deposito derivante "
-"parte nessun proprio oggetto."
+msgstr "Quando il deposito da clonare 챔 sulla macchina locale, invece di utilizzare hard link, selezionare automaticamente `.git/objects/info/alternates` per condividere gli oggetti il deposito della sorgente. IL deposito derivante parte nessun proprio oggetto."
#. type: Plain text
#: en/git-clone.txt:84
@@ -14155,37 +13625,24 @@ msgid ""
msgstr ""
"* NOTA *: questa 챔 un'operazione forse pericolosa; non usare\n"
"a meno che tu non capisca cosa fa. Se cloni il tuo\n"
-"repository utilizzando questa opzione e quindi eliminare i rami (o "
-"utilizzare qualsiasi\n"
-"altro comando Git che rende qualsiasi commit esistente senza riferimento) "
-"nel repository di origine, alcuni oggetti potrebbero non essere pi첫 "
-"referenziati (o appesi?).\n"
-"Questi oggetti possono essere rimossi dalle normali operazioni di Git (come `"
-"git commit`)\n"
+"repository utilizzando questa opzione e quindi eliminare i rami (o utilizzare qualsiasi\n"
+"altro comando Git che rende qualsiasi commit esistente senza riferimento) nel repository di origine, alcuni oggetti potrebbero non essere pi첫 referenziati (o appesi?).\n"
+"Questi oggetti possono essere rimossi dalle normali operazioni di Git (come `git commit`)\n"
"che chiama automaticamente `git gc --auto`. (Vedi linkgit: git-gc [1].)\n"
-"Se questi oggetti vengono rimossi e sono stati referenziati dal repository "
-"clonato,\n"
+"Se questi oggetti vengono rimossi e sono stati referenziati dal repository clonato,\n"
"allora il repository clonato diverr횪 corrotto.\n"
#. type: Plain text
#: en/git-clone.txt:90
#, fuzzy, 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 ""
-"Nota che eseguire `git repack` senza l'opzione` --local` in un deposito "
-"clonato con `--shared` copier횪 gli oggetti dal deposito di origine in un "
-"pacchetto nel deposito clonato, rimuovendo il risparmio di spazio su disco "
-"di` clone - shared`."
+msgstr "Nota che eseguire `git repack` senza l'opzione` --local` in un deposito clonato con `--shared` copier횪 gli oggetti dal deposito di origine in un pacchetto nel deposito clonato, rimuovendo il risparmio di spazio su disco di` clone - shared`."
#. type: Plain text
#: en/git-clone.txt:94
#, fuzzy, 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 vuoi spezzare la dipendenza di un archivio clonato con `--shared` sul suo "
-"archivio di origine, puoi semplicemente eseguire` git repack -a` per copiare "
-"tutti gli oggetti dal archivio di origine in un pacchetto nel archivio "
-"clonato."
+msgstr "Se vuoi spezzare la dipendenza di un archivio clonato con `--shared` sul suo archivio di origine, puoi semplicemente eseguire` git repack -a` per copiare tutti gli oggetti dal archivio di origine in un pacchetto nel archivio clonato."
#. type: Labeled list
#: en/git-clone.txt:95
@@ -14197,14 +13654,7 @@ msgstr "--reference[-if-able] <repository>"
#: en/git-clone.txt:105
#, 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. When using the `--reference-if-able`, a non existing directory is skipped with a warning instead of aborting the clone."
-msgstr ""
-"Se il repository di riferimento si trova sul computer locale, impostare "
-"automaticamente `.git / objects / info / alternates` per ottenere oggetti "
-"dal repository di riferimento. L'uso di un repository esistente come "
-"alternativa richieder횪 la copia di meno oggetti dal repository da clonare, "
-"riducendo i costi di archiviazione locale e di rete. Quando si usa "
-"`--reference-if-able`, una directory non esistente viene saltata con un "
-"avviso invece di bloccare il clone."
+msgstr "Se il repository di riferimento si trova sul computer locale, impostare automaticamente `.git / objects / info / alternates` per ottenere oggetti dal repository di riferimento. L'uso di un repository esistente come alternativa richieder횪 la copia di meno oggetti dal repository da clonare, riducendo i costi di archiviazione locale e di rete. Quando si usa `--reference-if-able`, una directory non esistente viene saltata con un avviso invece di bloccare il clone."
#. type: Plain text
#: en/git-clone.txt:108
@@ -14226,31 +13676,19 @@ msgstr "--dissociate"
#: en/git-clone.txt:119
#, fuzzy, 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 ""
-"Prendi in prestito gli oggetti dai depositi di riferimento specificati con "
-"le opzioni `--reference` solo per ridurre il trasferimento in rete e "
-"smettere di prenderli in prestito dopo che 챔 stato creato un clone, "
-"effettuando le copie locali necessarie degli oggetti presi in prestito. "
-"Questa opzione pu챵 essere utilizzata anche durante la clonazione locale da "
-"un deposito che prende in prestito oggetti da un altro deposito: il nuovo "
-"deposito prender횪 in prestito oggetti dallo stesso deposito e questa opzione "
-"pu챵 essere utilizzata per interrompere il prestito."
+msgstr "Prendi in prestito gli oggetti dai depositi di riferimento specificati con le opzioni `--reference` solo per ridurre il trasferimento in rete e smettere di prenderli in prestito dopo che 챔 stato creato un clone, effettuando le copie locali necessarie degli oggetti presi in prestito. Questa opzione pu챵 essere utilizzata anche durante la clonazione locale da un deposito che prende in prestito oggetti da un altro deposito: il nuovo deposito prender횪 in prestito oggetti dallo stesso deposito e questa opzione pu챵 essere utilizzata per interrompere il prestito."
#. type: Plain text
#: en/git-clone.txt:124
#, fuzzy, priority:300
msgid "Operate quietly. Progress is not reported to the standard error stream."
-msgstr ""
-"Operare in silenzio. L'avanzamento non viene segnalato al flusso di errori "
-"standard."
+msgstr "Operare in silenzio. L'avanzamento non viene segnalato al flusso di errori standard."
#. type: Plain text
#: en/git-clone.txt:129
#, fuzzy, priority:300
msgid "Run verbosely. Does not affect the reporting of progress status to the standard error stream."
-msgstr ""
-"Eseguire dettagliatamente. Non influisce sulla segnalazione dello stato di "
-"avanzamento al flusso di errori standard."
+msgstr "Eseguire dettagliatamente. Non influisce sulla segnalazione dello stato di avanzamento al flusso di errori standard."
#. type: Plain text
#: en/git-clone.txt:135
@@ -14274,15 +13712,7 @@ msgstr "--bare"
#: en/git-clone.txt:159
#, 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 ""
-"Crea un archivio Git 'nudo'. Cio챔, invece di creare `<cartella>` e "
-"posizionare i file amministrativi in `<cartella> / .git`, rendere` "
-"<cartella> `stesso` $ GIT_DIR`. Ci챵 implica ovviamente `--no-checkout` "
-"perch챕 non c'챔 nessun posto dove controllare l'albero di lavoro. Anche le "
-"teste di diramazione a remoto vengono copiate direttamente nelle "
-"corrispondenti diramazioni locali, senza mapparle su `refs / remotes / "
-"origin /`. Quando viene utilizzata questa opzione, non vengono creati n챕 "
-"rami di tracciamento remoto n챕 le relative variabili di configurazione."
+msgstr "Crea un archivio Git 'nudo'. Cio챔, invece di creare `<cartella>` e posizionare i file amministrativi in `<cartella> / .git`, rendere` <cartella> `stesso` $ GIT_DIR`. Ci챵 implica ovviamente `--no-checkout` perch챕 non c'챔 nessun posto dove controllare l'albero di lavoro. Anche le teste di diramazione a remoto vengono copiate direttamente nelle corrispondenti diramazioni locali, senza mapparle su `refs / remotes / origin /`. Quando viene utilizzata questa opzione, non vengono creati n챕 rami di tracciamento remoto n챕 le relative variabili di configurazione."
#. type: Labeled list
#: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:358 en/rev-list-options.txt:491
@@ -14294,13 +13724,10 @@ msgstr "--sparse"
#: en/git-clone.txt:165
#, fuzzy, priority:300
msgid "Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed."
-msgstr ""
-"Inizializza il file sparse-checkout in modo che la cartella di lavoro inizi "
-"con solo i file nella radice del deposito. Il file sparse-checkout pu챵 "
-"essere modificato per espandere la directory di lavoro secondo necessit횪."
+msgstr "Inizializza il file sparse-checkout in modo che la cartella di lavoro inizi con solo i file nella radice del deposito. Il file sparse-checkout pu챵 essere modificato per espandere la directory di lavoro secondo necessit횪."
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, fuzzy, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr "--filter=<filter-spec>"
@@ -14309,15 +13736,7 @@ msgstr "--filter=<filter-spec>"
#: en/git-clone.txt:175
#, fuzzy, priority:300
msgid "Use the partial clone feature and request that the server sends a subset of reachable objects according to a given object filter. When using `--filter`, the supplied `<filter-spec>` is used for the partial clone filter. For example, `--filter=blob:none` will filter out all blobs (file contents) until needed by Git. Also, `--filter=blob:limit=<size>` will filter out all blobs of size at least `<size>`. For more details on filter specifications, see the `--filter` option in linkgit:git-rev-list[1]."
-msgstr ""
-"Utilizzare la funzione di clonazione parziale e richiedere che il server "
-"invii un sottoinsieme di oggetti raggiungibili in base a un determinato "
-"filtro oggetti. Quando si usa `--filter`, il` <filter-spec> `in dotazione "
-"viene usato per il filtro del clone parziale. Ad esempio, `--filter = blob: "
-"none` filtrer횪 tutti i BLOB (contenuto del file) fino a quando non sar횪 "
-"richiesto da Git. Inoltre, `--filter = blob: limit = <size>` filtrer횪 tutti "
-"i BLOB di dimensioni almeno `<size>`. Per maggiori dettagli sulle specifiche "
-"del filtro, vedere l'opzione `--filter` in linkgit: git-rev-list [1]."
+msgstr "Utilizzare la funzione di clonazione parziale e richiedere che il server invii un sottoinsieme di oggetti raggiungibili in base a un determinato filtro oggetti. Quando si usa `--filter`, il` <filter-spec> `in dotazione viene usato per il filtro del clone parziale. Ad esempio, `--filter = blob: none` filtrer횪 tutti i BLOB (contenuto del file) fino a quando non sar횪 richiesto da Git. Inoltre, `--filter = blob: limit = <size>` filtrer횪 tutti i BLOB di dimensioni almeno `<size>`. Per maggiori dettagli sulle specifiche del filtro, vedere l'opzione `--filter` in linkgit: git-rev-list [1]."
#. type: Labeled list
#: en/git-clone.txt:176 en/git-push.txt:161
@@ -14329,13 +13748,7 @@ msgstr "--mirror"
#: en/git-clone.txt:183
#, 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 ""
-"Imposta un mirror del archivio di origine. Questo implica `--bare`. Rispetto "
-"a `--bare`,` --mirror`, non solo mappa i rami locali della sorgente sui rami "
-"locali della destinazione, ma mappa tutti i ref (inclusi rami di "
-"tracciamento remoto, note ecc.) E imposta una configurazione refspec tale "
-"che tutti questi riferimenti vengono sovrascritti da un `git remote update` "
-"nell'archivio di destinazione."
+msgstr "Imposta un mirror del archivio di origine. Questo implica `--bare`. Rispetto a `--bare`,` --mirror`, non solo mappa i rami locali della sorgente sui rami locali della destinazione, ma mappa tutti i ref (inclusi rami di tracciamento remoto, note ecc.) E imposta una configurazione refspec tale che tutti questi riferimenti vengono sovrascritti da un `git remote update` nell'archivio di destinazione."
#. type: Labeled list
#: en/git-clone.txt:184
@@ -14353,9 +13766,7 @@ msgstr "--origin<name>"
#: en/git-clone.txt:188
#, fuzzy, priority:300
msgid "Instead of using the remote name `origin` to keep track of the upstream repository, use `<name>`."
-msgstr ""
-"Invece di usare il nome remoto 'origini' per tenere traccia dei depositi "
-"dello sviluppatore, usare '<nome<'."
+msgstr "Invece di usare il nome remoto 'origini' per tenere traccia dei depositi dello sviluppatore, usare '<nome<'."
#. type: Labeled list
#: en/git-clone.txt:189
@@ -14373,11 +13784,7 @@ msgstr "--branch<nome>"
#: en/git-clone.txt:197
#, fuzzy, 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 ""
-"Invece di puntare l'HEAD appena creato sul ramo indicato dal HEAD del "
-"repository clonato, punta invece al ramo `<name>`. In un repository non "
-"base, questo 챔 il ramo che verr횪 estratto. `--branch` pu챵 anche prendere tag "
-"e stacca l'HEAD a quel commit nel repository risultante."
+msgstr "Invece di puntare l'HEAD appena creato sul ramo indicato dal HEAD del repository clonato, punta invece al ramo `<name>`. In un repository non base, questo 챔 il ramo che verr횪 estratto. `--branch` pu챵 anche prendere tag e stacca l'HEAD a quel commit nel repository risultante."
#. type: Labeled list
#: en/git-clone.txt:198
@@ -14389,10 +13796,7 @@ msgstr "-u <upload-pack>"
#: en/git-clone.txt:203
#, fuzzy, 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 fornito, e al repository da cui clonare si accede tramite ssh, questo "
-"specifica un percorso non predefinito per il comando eseguito dall'altra "
-"parte."
+msgstr "Quando fornito, e al repository da cui clonare si accede tramite ssh, questo specifica un percorso non predefinito per il comando eseguito dall'altra parte."
#. type: Labeled list
#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
@@ -14422,25 +13826,13 @@ msgstr "--config <key>=<value>"
#: en/git-clone.txt:218
#, 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 ""
-"Impostare una variabile di configurazione nel depoito creato di recente; ci챵 "
-"entra in funzione immediatamente dopo che il deposito viene inizializzato; "
-"ma prima che la remote history sia recuperata o ogni altro file sia "
-"estratto. La chiave 챔 nello stesso formato come previsto da linkgit:git-"
-"config[1] (ossia: `core.eol=true`). Se valori multipli sono dati per la "
-"stessa chiave, ogni valore sar횪 scritto nel file di configurazione. Ci챵 "
-"rende sicuro, per esempio, aggiungere materia addizionale all'origine remota."
+msgstr "Impostare una variabile di configurazione nel depoito creato di recente; ci챵 entra in funzione immediatamente dopo che il deposito viene inizializzato; ma prima che la remote history sia recuperata o ogni altro file sia estratto. La chiave 챔 nello stesso formato come previsto da linkgit:git-config[1] (ossia: `core.eol=true`). Se valori multipli sono dati per la stessa chiave, ogni valore sar횪 scritto nel file di configurazione. Ci챵 rende sicuro, per esempio, aggiungere materia addizionale all'origine remota."
#. type: Plain text
#: en/git-clone.txt:224
#, fuzzy, 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 ""
-"A causa delle limitazioni dell'implementazione corrente, alcune variabili di "
-"configurazione non hanno effetto fino a dopo il recupero e il checkout "
-"iniziali. Le variabili di configurazione che non hanno effetto sono: `"
-"remote. <name> .mirror` e` remote. <name> .tagOpt`. Usa invece le "
-"corrispondenti opzioni `--mirror` e` --no-tags`."
+msgstr "A causa delle limitazioni dell'implementazione corrente, alcune variabili di configurazione non hanno effetto fino a dopo il recupero e il checkout iniziali. Le variabili di configurazione che non hanno effetto sono: `remote. <name> .mirror` e` remote. <name> .tagOpt`. Usa invece le corrispondenti opzioni `--mirror` e` --no-tags`."
#. type: Labeled list
#: en/git-clone.txt:225
@@ -14452,27 +13844,19 @@ msgstr "--depth <depth>"
#: en/git-clone.txt:231
#, fuzzy, 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 ""
-"Creare un clone 'shallow' troncato nel numero specifico di commit. "
-"Sottintende `--single-branch` a meno che --no-single-branch` non sia dato "
-"per recuperare le history vicino alle punte di tutte le branche. Se vuoi "
-"clonare sotto-moduli superficialmente, funziona anche `--shallow-submodules`."
+msgstr "Creare un clone 'shallow' troncato nel numero specifico di commit. Sottintende `--single-branch` a meno che --no-single-branch` non sia dato per recuperare le history vicino alle punte di tutte le branche. Se vuoi clonare sotto-moduli superficialmente, funziona anche `--shallow-submodules`."
#. type: Plain text
#: en/git-clone.txt:234
#, fuzzy, priority:300
msgid "Create a shallow clone with a history after the specified time."
-msgstr ""
-"Crea un clone superficiale con una cronologia dopo il tempo specificato."
+msgstr "Crea un clone superficiale con una cronologia dopo il tempo specificato."
#. type: Plain text
#: en/git-clone.txt:239
#, fuzzy, 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 ""
-"Creare un clone superficiale con una history, escludendo commit "
-"reaggiungibili da una indicata branca remota o tag. Questa opzione pu챵 "
-"essere indicata pi첫 volte."
+msgstr "Creare un clone superficiale con una history, escludendo commit reaggiungibili da una indicata branca remota o tag. Questa opzione pu챵 essere indicata pi첫 volte."
#. type: Labeled list
#: en/git-clone.txt:240 en/git-submodule.txt:433
@@ -14484,34 +13868,19 @@ msgstr "--[no-]single-branch"
#: en/git-clone.txt:249
#, fuzzy, 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 ""
-"Clona solo la cronologia che porta alla punta di un singolo ramo, "
-"specificata dall'opzione `--branch` o dai punti` HEAD` del telecomando del "
-"ramo primario. Ulteriori recuperi nel'archivio risultante aggiorneranno solo "
-"il ramo di tracciamento remoto per il ramo per cui questa opzione 챔 stata "
-"utilizzata per la clonazione iniziale. Se l'HEAD a remoto non puntava a "
-"nessun ramo quando veniva creato il clone `--single-branch`, non veniva "
-"creato alcun ramo di tracciamento remoto."
+msgstr "Clona solo la cronologia che porta alla punta di un singolo ramo, specificata dall'opzione `--branch` o dai punti` HEAD` del telecomando del ramo primario. Ulteriori recuperi nel'archivio risultante aggiorneranno solo il ramo di tracciamento remoto per il ramo per cui questa opzione 챔 stata utilizzata per la clonazione iniziale. Se l'HEAD a remoto non puntava a nessun ramo quando veniva creato il clone `--single-branch`, non veniva creato alcun ramo di tracciamento remoto."
#. type: Plain text
#: en/git-clone.txt:256
#, fuzzy, 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 ""
-"Non clonare nessun tag, ed imposta `remote.<remote>.tagOpt=--no-tags`nella "
-"configurazione, assicurandosi che future operazioni 'git pull' e 'git fetch' "
-"non seguano nessun tag. I successivi recuperi espliciti di tag continueranno "
-"a funzionare, (vedi linkgit: git-fetch [1])."
+msgstr "Non clonare nessun tag, ed imposta `remote.<remote>.tagOpt=--no-tags`nella configurazione, assicurandosi che future operazioni 'git pull' e 'git fetch' non seguano nessun tag. I successivi recuperi espliciti di tag continueranno a funzionare, (vedi linkgit: git-fetch [1])."
#. type: Plain text
#: en/git-clone.txt:261
#, fuzzy, 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 ""
-"Pu챵 essere usato insieme a `--single-branch` per clonare e mantenere un ramo "
-"senza riferimenti diversi da un singolo ramo clonato. Questo 챔 utile ad es. "
-"per mantenere cloni minimi del ramo predefinito di alcuni repository per "
-"l'indicizzazione della ricerca."
+msgstr "Pu챵 essere usato insieme a `--single-branch` per clonare e mantenere un ramo senza riferimenti diversi da un singolo ramo clonato. Questo 챔 utile ad es. per mantenere cloni minimi del ramo predefinito di alcuni repository per l'indicizzazione della ricerca."
#. type: Labeled list
#: en/git-clone.txt:262
@@ -14523,25 +13892,13 @@ msgstr "--recurse-submodules[=<pathspec]"
#: en/git-clone.txt:270
#, fuzzy, 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 ""
-"Dopo che il clone 챔 stato creato, inizializzare e clonare sotto-moduli "
-"all'interno che si basano sula pathspec fornita. Se nessuna pathspec 챔 "
-"fornita, tutti i sotto-moduli sono inizializzati e clonati. Questa opzione "
-"pu챵 essere utilizzata diverse volte per \t composto sta pi첫 ingressi. Il "
-"clone derivante ha `submodule.active`settato nel pathspec fornito, o \".\" ("
-"intende tutti i sotto-moduli) se nessun pathspec 챔 fornito."
+msgstr "Dopo che il clone 챔 stato creato, inizializzare e clonare sotto-moduli all'interno che si basano sula pathspec fornita. Se nessuna pathspec 챔 fornita, tutti i sotto-moduli sono inizializzati e clonati. Questa opzione pu챵 essere utilizzata diverse volte per \t composto sta pi첫 ingressi. Il clone derivante ha `submodule.active`settato nel pathspec fornito, o \".\" (intende tutti i sotto-moduli) se nessun pathspec 챔 fornito."
#. type: Plain text
#: en/git-clone.txt:277
#, fuzzy, 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 ""
-"I sottomoduli sono inizializzati e clonati usando le loro impostazioni "
-"predefinite. Ci챵 equivale a eseguire `git submodule update --init --"
-"recursive <pathspec>` immediatamente dopo il completamento del clone. Questa "
-"opzione viene ignorata se il repository clonato non ha un worktree / "
-"checkout (ovvero se viene dato uno di `--no-checkout` /` -n`, `--bare` o` "
-"--mirror`)"
+msgstr "I sottomoduli sono inizializzati e clonati usando le loro impostazioni predefinite. Ci챵 equivale a eseguire `git submodule update --init --recursive <pathspec>` immediatamente dopo il completamento del clone. Questa opzione viene ignorata se il repository clonato non ha un worktree / checkout (ovvero se viene dato uno di `--no-checkout` /` -n`, `--bare` o` --mirror`)"
#. type: Labeled list
#: en/git-clone.txt:278
@@ -14553,9 +13910,7 @@ msgstr "--[no-]shallow-submodules"
#: en/git-clone.txt:280
#, fuzzy, priority:300
msgid "All submodules which are cloned will be shallow with a depth of 1."
-msgstr ""
-"Tutti i sotto-moduli che sono stati clonati saranno superficiali con una "
-"profondit횪 di 1."
+msgstr "Tutti i sotto-moduli che sono stati clonati saranno superficiali con una profondit횪 di 1."
#. type: Labeled list
#: en/git-clone.txt:281
@@ -14567,11 +13922,7 @@ msgstr "--[no-]remote-submodules"
#: en/git-clone.txt:286
#, fuzzy, 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 ""
-"Tutti i sottomoduli che vengono clonati useranno lo stato del ramo di "
-"tracciamento remoto del sottomodulo per aggiornare il sottomodulo, piuttosto "
-"che lo SHA-1 registrato del superprogetto. Equivale a passare `--remote` a` "
-"git submodule update`."
+msgstr "Tutti i sottomoduli che vengono clonati useranno lo stato del ramo di tracciamento remoto del sottomodulo per aggiornare il sottomodulo, piuttosto che lo SHA-1 registrato del superprogetto. Equivale a passare `--remote` a` git submodule update`."
#. type: Labeled list
#: en/git-clone.txt:287 en/git-init.txt:61
@@ -14583,11 +13934,7 @@ msgstr "--separate-git-dir=<git dir>"
#: en/git-clone.txt:293
#, fuzzy, 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 ""
-"Invece di piazzare il deposito clonato dove dovrebbe andare, piazzare il "
-"deposito clonato alla cartella indicata, quindi creare un link simboli "
-"filesystem-agnostic Git come connessione. Il risultato 챔 che il deposito Git "
-"pu챵 essere separato dal working tree."
+msgstr "Invece di piazzare il deposito clonato dove dovrebbe andare, piazzare il deposito clonato alla cartella indicata, quindi creare un link simboli filesystem-agnostic Git come connessione. Il risultato 챔 che il deposito Git pu챵 essere separato dal working tree."
#. type: Labeled list
#: en/git-clone.txt:294 en/git-submodule.txt:427
@@ -14605,9 +13952,7 @@ msgstr "--jobs <n>"
#: en/git-clone.txt:298
#, fuzzy, priority:300
msgid "The number of submodules fetched at the same time. Defaults to the `submodule.fetchJobs` option."
-msgstr ""
-"Il numero di sotto-moduli recuperati nello stesso momento. Predefinisce "
-"all'opzione `submodule.fetchJobs`"
+msgstr "Il numero di sotto-moduli recuperati nello stesso momento. Predefinisce all'opzione `submodule.fetchJobs`"
#. type: Labeled list
#: en/git-clone.txt:299 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83 en/git-push.txt:50 en/pull-fetch-param.txt:1
@@ -14619,9 +13964,7 @@ msgstr "repository"
#: en/git-clone.txt:303
#, fuzzy, priority:300
msgid "The (possibly remote) repository to clone from. See the <<URLS,GIT URLS>> section below for more information on specifying repositories."
-msgstr ""
-"Il deposito (possibilmente remoto) da cui clonare. Vedere la sezione "
-"<<URLS,GIT URLS>> sotto per maggiori informazioni su depositi indicanti."
+msgstr "Il deposito (possibilmente remoto) da cui clonare. Vedere la sezione <<URLS,GIT URLS>> sotto per maggiori informazioni su depositi indicanti."
#. type: Labeled list
#: en/git-clone.txt:304 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
@@ -14633,12 +13976,7 @@ msgstr ""
#: en/git-clone.txt:310
#, 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 only allowed if the directory is empty."
-msgstr ""
-"Il nome di una nuova cartella in cui clonare. La parte \"umanistica\" "
-"dell'archivio di origine viene usata se nessuna cartella viene "
-"esplicitamente fornita (`repo` per` / path / to / repo.git` e `foo` per` host"
-".xz: foo / .git`). La clonazione in una cartella esistente 챔 consentita solo "
-"se la cartella 챔 vuota."
+msgstr "Il nome di una nuova cartella in cui clonare. La parte \"umanistica\" dell'archivio di origine viene usata se nessuna cartella viene esplicitamente fornita (`repo` per` / path / to / repo.git` e `foo` per` host.xz: foo / .git`). La clonazione in una cartella esistente 챔 consentita solo se la cartella 챔 vuota."
#. type: Plain text
#: en/git-clone.txt:318
@@ -14662,9 +14000,7 @@ msgstr ""
#: en/git-clone.txt:327
#, fuzzy, priority:300
msgid "Make a local clone that borrows from the current directory, without checking things out:"
-msgstr ""
-"Crea un clone locale che prenda in prestito dalla cartella corrente, senza "
-"verificare le cose:"
+msgstr "Crea un clone locale che prenda in prestito dalla cartella corrente, senza verificare le cose:"
#. type: delimited block -
#: en/git-clone.txt:332
@@ -14682,9 +14018,7 @@ msgstr ""
#: en/git-clone.txt:336
#, fuzzy, priority:300
msgid "Clone from upstream while borrowing from an existing local directory:"
-msgstr ""
-"Clonare dall'upstream mentre si prende in prestito da una cartella locale "
-"esistente:"
+msgstr "Clonare dall'upstream mentre si prende in prestito da una cartella locale esistente:"
#. type: delimited block -
#: en/git-clone.txt:342
@@ -15071,13 +14405,7 @@ msgstr ""
#: en/git-commit.txt:27
#, fuzzy, 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 ""
-"Creare un nuovo commit contenente il contenuto corrente dell'indice e il "
-"messaggio di registro fornito che descrive le modifiche. Il nuovo commit 챔 "
-"un figlio diretto di HEAD, in genere la punta del ramo corrente, e il ramo "
-"viene aggiornato per puntarlo (a meno che nessun ramo sia associato "
-"all'albero di lavoro, nel qual caso HEAD viene \"staccato\" come descritto "
-"in linkgit : git-checkout [1])."
+msgstr "Creare un nuovo commit contenente il contenuto corrente dell'indice e il messaggio di registro fornito che descrive le modifiche. Il nuovo commit 챔 un figlio diretto di HEAD, in genere la punta del ramo corrente, e il ramo viene aggiornato per puntarlo (a meno che nessun ramo sia associato all'albero di lavoro, nel qual caso HEAD viene \"staccato\" come descritto in linkgit : git-checkout [1])."
#. type: Plain text
#: en/git-commit.txt:29
@@ -15089,10 +14417,7 @@ msgstr ""
#: en/git-commit.txt:33
#, fuzzy, 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 ""
-"usando linkgit: git-add [1] per \"aggiungere\" in modo incrementale le "
-"modifiche all'indice prima di usare il comando 'commit' (Nota: anche i file "
-"modificati devono essere \"aggiunti\");"
+msgstr "usando linkgit: git-add [1] per \"aggiungere\" in modo incrementale le modifiche all'indice prima di usare il comando 'commit' (Nota: anche i file modificati devono essere \"aggiunti\");"
#. type: Plain text
#: en/git-commit.txt:36
@@ -15104,11 +14429,7 @@ msgstr ""
#: en/git-commit.txt:42
#, fuzzy, 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 ""
-"elencando i file come argomenti nel comando 'commit' (senza l'opzione --"
-"interactive o --patch), nel qual caso il commit ignorer횪 le modifiche messe "
-"in scena nell'indice e registrer횪 invece il contenuto corrente dei file "
-"elencati (che deve gi횪 essere noto a Git);"
+msgstr "elencando i file come argomenti nel comando 'commit' (senza l'opzione --interactive o --patch), nel qual caso il commit ignorer횪 le modifiche messe in scena nell'indice e registrer횪 invece il contenuto corrente dei file elencati (che deve gi횪 essere noto a Git);"
#. type: Plain text
#: en/git-commit.txt:48
@@ -15120,12 +14441,7 @@ msgstr ""
#: en/git-commit.txt:54
#, fuzzy, 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 ""
-"usando le opzioni --interactive o --patch con il comando 'commit' per "
-"decidere uno per uno quali file o hunk dovrebbero essere parte del commit "
-"oltre ai contenuti nell'indice, prima di finalizzare l'operazione. Vedi la "
-"sezione `` Modalit횪 interattiva '' di linkgit: git-add [1] per imparare come "
-"utilizzare queste modalit횪."
+msgstr "usando le opzioni --interactive o --patch con il comando 'commit' per decidere uno per uno quali file o hunk dovrebbero essere parte del commit oltre ai contenuti nell'indice, prima di finalizzare l'operazione. Vedi la sezione `` Modalit횪 interattiva '' di linkgit: git-add [1] per imparare come utilizzare queste modalit횪."
#. type: Plain text
#: en/git-commit.txt:58
@@ -15137,9 +14453,7 @@ msgstr ""
#: en/git-commit.txt:61
#, fuzzy, 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 ""
-"Se fai un commit e poi trovi subito un errore, puoi recuperarlo con 'git "
-"reset'."
+msgstr "Se fai un commit e poi trovi subito un errore, puoi recuperarlo con 'git reset'."
#. type: Plain text
#: en/git-commit.txt:70
@@ -15151,9 +14465,7 @@ msgstr ""
#: en/git-commit.txt:76
#, fuzzy, priority:280
msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
-msgstr ""
-"Utilizzare l'interfaccia di selezione patch interattiva per scegliere quali "
-"modifiche eseguire. Vedi link git: git-add [1] per i dettagli."
+msgstr "Utilizzare l'interfaccia di selezione patch interattiva per scegliere quali modifiche eseguire. Vedi link git: git-add [1] per i dettagli."
#. type: Labeled list
#: en/git-commit.txt:77
@@ -15171,10 +14483,7 @@ msgstr "--reuse-message=<commit>"
#: en/git-commit.txt:82
#, fuzzy, priority:280
msgid "Take an existing commit object, and reuse the log message and the authorship information (including the timestamp) when creating the commit."
-msgstr ""
-"Prendere un oggetto commit esistente e riutilizzare il messaggio di registro "
-"e le informazioni sull'autore (incluso il timestamp) durante la creazione "
-"del commit."
+msgstr "Prendere un oggetto commit esistente e riutilizzare il messaggio di registro e le informazioni sull'autore (incluso il timestamp) durante la creazione del commit."
#. type: Labeled list
#: en/git-commit.txt:83
@@ -15192,9 +14501,7 @@ msgstr "--reedit-message=<commit>"
#: en/git-commit.txt:87
#, fuzzy, priority:280
msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the commit message."
-msgstr ""
-"Come '-C', ma con `-c` viene richiamato l'editor, in modo che l'utente possa "
-"modificare ulteriormente il messaggio di commit."
+msgstr "Come '-C', ma con `-c` viene richiamato l'editor, in modo che l'utente possa modificare ulteriormente il messaggio di commit."
#. type: Labeled list
#: en/git-commit.txt:88
@@ -15206,10 +14513,7 @@ msgstr ""
#: en/git-commit.txt:93
#, fuzzy, 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 ""
-"Costruisci un messaggio di commit da usare con `rebase --autosquash`. Il "
-"messaggio di commit sar횪 la riga dell'oggetto dal commit specificato con un "
-"prefisso \"fixup!\". Vedi linkgit: git-rebase [1] per i dettagli."
+msgstr "Costruisci un messaggio di commit da usare con `rebase --autosquash`. Il messaggio di commit sar횪 la riga dell'oggetto dal commit specificato con un prefisso \"fixup!\". Vedi linkgit: git-rebase [1] per i dettagli."
#. type: Labeled list
#: en/git-commit.txt:94
@@ -15221,12 +14525,7 @@ msgstr ""
#: en/git-commit.txt:100
#, fuzzy, 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 ""
-"Costruisci un messaggio di commit da usare con `rebase --autosquash`. La "
-"riga dell'oggetto del messaggio di commit viene presa dal commit specificato "
-"con un prefisso \"squash!\". Pu챵 essere usato con opzioni di messaggi di "
-"commit aggiuntivi (`-m` /` -c` / `-C` /` -F`). Vedi linkgit: git-rebase [1] "
-"per i dettagli."
+msgstr "Costruisci un messaggio di commit da usare con `rebase --autosquash`. La riga dell'oggetto del messaggio di commit viene presa dal commit specificato con un prefisso \"squash!\". Pu챵 essere usato con opzioni di messaggi di commit aggiuntivi (`-m` /` -c` / `-C` /` -F`). Vedi linkgit: git-rebase [1] per i dettagli."
#. type: Labeled list
#: en/git-commit.txt:101
@@ -15250,9 +14549,7 @@ msgstr "--short"
#: en/git-commit.txt:110
#, fuzzy, 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 ""
-"Quando si esegue una prova a secco, fornire l'output nel formato breve. Vedi "
-"linkgit: git-status [1] per i dettagli. Implica `--dry-run`."
+msgstr "Quando si esegue una prova a secco, fornire l'output nel formato breve. Vedi linkgit: git-status [1] per i dettagli. Implica `--dry-run`."
#. type: Labeled list
#: en/git-commit.txt:111 en/git-status.txt:32
@@ -15270,9 +14567,7 @@ msgstr ""
#: en/git-commit.txt:118
#, fuzzy, 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 ""
-"Quando si esegue una prova a secco, fornire l'output in un formato porcelain-"
-"ready. Vedi linkgit: git-status [1] per i dettagli. Implica `--dry-run`."
+msgstr "Quando si esegue una prova a secco, fornire l'output in un formato porcelain-ready. Vedi linkgit: git-status [1] per i dettagli. Implica `--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
@@ -15296,13 +14591,7 @@ msgstr "--null"
#: en/git-commit.txt:131
#, fuzzy, 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 ""
-"Quando si visualizza l'output di stato `short` o` porcelain`, stampare il "
-"nome del file alla lettera e terminare le voci con NUL, anzich챕 LF. Se non "
-"viene fornito alcun formato, implica il formato di output `--porcelain`. "
-"Senza l'opzione `-z`, i nomi dei file con caratteri\" insoliti \"sono citati "
-"come spiegato per la variabile di configurazione` core.quotePath` (vedi "
-"linkgit: git-config [1])."
+msgstr "Quando si visualizza l'output di stato `short` o` porcelain`, stampare il nome del file alla lettera e terminare le voci con NUL, anzich챕 LF. Se non viene fornito alcun formato, implica il formato di output `--porcelain`. Senza l'opzione `-z`, i nomi dei file con caratteri\" insoliti \"sono citati come spiegato per la variabile di configurazione` core.quotePath` (vedi 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
@@ -15314,9 +14603,7 @@ msgstr ""
#: en/git-commit.txt:136
#, fuzzy, priority:280
msgid "Take the commit message from the given file. Use '-' to read the message from the standard input."
-msgstr ""
-"Prendi il messaggio di commit dal file indicato. Utilizzare '-' per leggere "
-"il messaggio dall'input standard."
+msgstr "Prendi il messaggio di commit dal file indicato. Utilizzare '-' per leggere il messaggio dall'input standard."
#. type: Labeled list
#: en/git-commit.txt:137
@@ -15328,12 +14615,7 @@ msgstr ""
#: en/git-commit.txt:143
#, fuzzy, 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 ""
-"Sostituisci l'autore del commit. Specificare un autore esplicito utilizzando "
-"il formato standard `A U Thor <author@example.com>`. Altrimenti si presume "
-"che <author> sia uno schema e viene utilizzato per cercare un commit "
-"esistente da quell'autore (cio챔 rev-list --all -i --author = <author>); "
-"l'autore del commit viene quindi copiato dal primo tale commit trovato."
+msgstr "Sostituisci l'autore del commit. Specificare un autore esplicito utilizzando il formato standard `A U Thor <author@example.com>`. Altrimenti si presume che <author> sia uno schema e viene utilizzato per cercare un commit esistente da quell'autore (cio챔 rev-list --all -i --author = <author>); l'autore del commit viene quindi copiato dal primo tale commit trovato."
#. type: Labeled list
#: en/git-commit.txt:144
@@ -15393,12 +14675,7 @@ msgstr ""
#: en/git-commit.txt:174 en/merge-options.txt:88
#, fuzzy, priority:280
msgid "Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically certifies that committer has the rights to submit this work under the same license and agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information)."
-msgstr ""
-"Aggiungi linea firmata fuori dal committer alla fine del messaggio di "
-"registro di commit. Il significato di una firma dipende dal progetto, ma in "
-"genere certifica che il committer ha i diritti di presentare quest'opera con "
-"la stessa licenza e accetta un certificato di origine per sviluppatori ("
-"vedere http://developercertificate.org/ per ulteriori informazioni)."
+msgstr "Aggiungi linea firmata fuori dal committer alla fine del messaggio di registro di commit. Il significato di una firma dipende dal progetto, ma in genere certifica che il committer ha i diritti di presentare quest'opera con la stessa licenza e accetta un certificato di origine per sviluppatori (vedere http://developercertificate.org/ per ulteriori informazioni)."
#. type: Labeled list
#: en/git-commit.txt:176 en/git-rebase.txt:412 en/merge-options.txt:115
@@ -15416,11 +14693,7 @@ msgstr ""
#: en/git-commit.txt:185
#, fuzzy, priority:280
msgid "Usually recording a commit that has the exact same tree as its sole parent commit is a mistake, and the command prevents you from making such a commit. This option bypasses the safety, and is primarily for use by foreign SCM interface scripts."
-msgstr ""
-"Di solito la registrazione di un commit che ha lo stesso albero esatto del "
-"commit del suo unico genitore 챔 un errore e il comando ti impedisce di "
-"effettuare tale commit. Questa opzione ignora la sicurezza ed 챔 "
-"principalmente utilizzata dagli script di interfaccia SCM esterni."
+msgstr "Di solito la registrazione di un commit che ha lo stesso albero esatto del commit del suo unico genitore 챔 un errore e il comando ti impedisce di effettuare tale commit. Questa opzione ignora la sicurezza ed 챔 principalmente utilizzata dagli script di interfaccia SCM esterni."
#. type: Plain text
#: en/git-commit.txt:191
@@ -15432,10 +14705,7 @@ msgstr ""
#: en/git-commit.txt:196
#, fuzzy, priority:280
msgid "This option determines how the supplied commit message should be cleaned up before committing. The '<mode>' can be `strip`, `whitespace`, `verbatim`, `scissors` or `default`."
-msgstr ""
-"Questa opzione determina come ripulire il messaggio di commit fornito prima "
-"di eseguire il commit. '<mode>' pu챵 essere `strip`,` whitespace`, "
-"`verbatim`,` scissors` o `default`"
+msgstr "Questa opzione determina come ripulire il messaggio di commit fornito prima di eseguire il commit. '<mode>' pu챵 essere `strip`,` whitespace`, `verbatim`,` scissors` o `default`"
#. type: Labeled list
#: en/git-commit.txt:198
@@ -15447,9 +14717,7 @@ msgstr "strip"
#: en/git-commit.txt:201
#, fuzzy, priority:280
msgid "Strip leading and trailing empty lines, trailing whitespace, commentary and collapse consecutive empty lines."
-msgstr ""
-"Rimuovi le righe vuote iniziali e finali, trascina gli spazi bianchi, "
-"commenta e comprimi le righe vuote consecutive."
+msgstr "Rimuovi le righe vuote iniziali e finali, trascina gli spazi bianchi, commenta e comprimi le righe vuote consecutive."
#. type: Labeled list
#: en/git-commit.txt:201
@@ -15485,10 +14753,7 @@ msgstr "--scissors"
#: en/git-commit.txt:209
#, fuzzy, priority:280
msgid "Same as `whitespace` except that everything from (and including) the line found below is truncated, if the message is to be edited. \"`#`\" can be customized with core.commentChar."
-msgstr ""
-"Come \"spazi bianchi\", tranne per il fatto che tutto il contenuto (e "
-"incluso) della riga trovata di seguito viene troncato, se il messaggio deve "
-"essere modificato. \"` # `\" pu챵 essere personalizzato con core.commentChar."
+msgstr "Come \"spazi bianchi\", tranne per il fatto che tutto il contenuto (e incluso) della riga trovata di seguito viene troncato, se il messaggio deve essere modificato. \"` # `\" pu챵 essere personalizzato con core.commentChar."
#. type: Plain text
#: en/git-commit.txt:211
@@ -15500,9 +14765,7 @@ msgstr ""
#: en/git-commit.txt:215
#, fuzzy, priority:280
msgid "Same as `strip` if the message is to be edited. Otherwise `whitespace`."
-msgstr ""
-"Come \"striscia\" se il messaggio deve essere modificato. Altrimenti \"spazio"
-"\"."
+msgstr "Come \"striscia\" se il messaggio deve essere modificato. Altrimenti \"spazio\"."
#. type: Plain text
#: en/git-commit.txt:219
@@ -15514,11 +14777,7 @@ msgstr ""
#: en/git-commit.txt:226
#, fuzzy, priority:280
msgid "The message taken from file with `-F`, command line with `-m`, and from commit object with `-C` are usually used as the commit log message unmodified. This option lets you further edit the message taken from these sources."
-msgstr ""
-"Il messaggio preso dal file con `-F`, dalla riga di comando con` -m`, e "
-"dall'oggetto commit con `-C` sono normalmente usati come messaggio di log di "
-"commit non modificato. Questa opzione ti consente di modificare "
-"ulteriormente il messaggio preso da queste fonti."
+msgstr "Il messaggio preso dal file con `-F`, dalla riga di comando con` -m`, e dall'oggetto commit con `-C` sono normalmente usati come messaggio di log di commit non modificato. Questa opzione ti consente di modificare ulteriormente il messaggio preso da queste fonti."
#. type: Labeled list
#: en/git-commit.txt:227 en/git-revert.txt:66 en/merge-options.txt:17
@@ -15542,14 +14801,7 @@ msgstr "--amend"
#: en/git-commit.txt:242
#, fuzzy, priority:280
msgid "Replace the tip of the current branch by creating a new commit. The recorded tree is prepared as usual (including the effect of the `-i` and `-o` options and explicit pathspec), and the message from the original commit is used as the starting point, instead of an empty message, when no other message is specified from the command line via options such as `-m`, `-F`, `-c`, etc. The new commit has the same parents and author as the current one (the `--reset-author` option can countermand this)."
-msgstr ""
-"Sostituisci la punta del ramo corrente creando un nuovo commit. L'albero "
-"registrato viene preparato come al solito (incluso l'effetto delle opzioni "
-"`-i` e` -o` e pathspec esplicito) e il messaggio dal commit originale viene "
-"usato come punto di partenza, anzich챕 un messaggio vuoto, quando no l'altro "
-"messaggio viene specificato dalla riga di comando tramite opzioni come `-m`,`"
-" -F`, `-c`, ecc. Il nuovo commit ha gli stessi genitori e autore di quello "
-"attuale (il` --reset-author `L'opzione pu챵 contrastare questo)."
+msgstr "Sostituisci la punta del ramo corrente creando un nuovo commit. L'albero registrato viene preparato come al solito (incluso l'effetto delle opzioni `-i` e` -o` e pathspec esplicito) e il messaggio dal commit originale viene usato come punto di partenza, anzich챕 un messaggio vuoto, quando no l'altro messaggio viene specificato dalla riga di comando tramite opzioni come `-m`,` -F`, `-c`, ecc. Il nuovo commit ha gli stessi genitori e autore di quello attuale (il` --reset-author `L'opzione pu챵 contrastare questo)."
#. type: Plain text
#: en/git-commit.txt:245
@@ -15603,11 +14855,7 @@ msgstr "--include"
#: en/git-commit.txt:267
#, fuzzy, priority:280
msgid "Before making a commit out of staged contents so far, stage the contents of paths given on the command line as well. This is usually not what you want unless you are concluding a conflicted merge."
-msgstr ""
-"Prima di effettuare finora un commit dei contenuti in fasi, metti in scena "
-"anche i contenuti dei percorsi forniti dalla riga di comando. Questo di "
-"solito non 챔 quello che vuoi a meno che tu non stia concludendo una fusione "
-"in conflitto."
+msgstr "Prima di effettuare finora un commit dei contenuti in fasi, metti in scena anche i contenuti dei percorsi forniti dalla riga di comando. Questo di solito non 챔 quello che vuoi a meno che tu non stia concludendo una fusione in conflitto."
#. type: Labeled list
#: en/git-commit.txt:269
@@ -19762,7 +19010,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -20410,13 +19658,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27876,9 +27124,9 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
-#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
-msgstr ""
+#, fuzzy, priority:100
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgstr "Senza questa opzione, i nomi dei percorsi con caratteri \"insoliti\" sono citati come spiegato per la variabile di configurazione `core.quotePath` (vedi linkgit: git-config [1])."
#. type: Labeled list
#: en/git-grep.txt:215
@@ -27893,7 +27141,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29952,7 +29200,7 @@ msgstr "Crea un repository Git vuoto o ne reinizializza uno esistente"
#, fuzzy, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
@@ -29963,54 +29211,37 @@ msgstr ""
#: en/git-init.txt:24
#, fuzzy, 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 ""
-"Questo comando crea un archivio Git vuoto - sostanzialmente una directory `."
-"git` con sottocartella per` oggetti`, `refs / heads`,` refs / tag` e file "
-"modello. Viene anche creato un file iniziale `HEAD` che fa riferimento "
-"all'HEAD del ramo master."
+msgstr "Questo comando crea un archivio Git vuoto - sostanzialmente una directory `.git` con sottocartella per` oggetti`, `refs / heads`,` refs / tag` e file modello. Viene anche creato un file iniziale `HEAD` che fa riferimento all'HEAD del ramo master."
#. type: Plain text
#: en/git-init.txt:27
#, 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 ""
-"Se 챔 impostata la variabile d'ambiente `$ GIT_DIR`, esso specifica un "
-"percorso da usare invece di` ./. Git` per la base del repository."
+msgstr "Se 챔 impostata la variabile d'ambiente `$ GIT_DIR`, esso specifica un percorso da usare invece di` ./. Git` per la base del repository."
#. type: Plain text
#: en/git-init.txt:32
#, fuzzy, 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 ""
-"Se la directory di archiviazione degli oggetti viene specificata tramite la "
-"variabile d'ambiente `$ GIT_OBJECT_DIRECTORY`, vengono create le directory "
-"sha1 al di sotto, altrimenti viene utilizzata la directory predefinita $ "
-"GIT_DIR / objects."
+msgstr "Se la directory di archiviazione degli oggetti viene specificata tramite la variabile d'ambiente `$ GIT_OBJECT_DIRECTORY`, vengono create le directory sha1 al di sotto, altrimenti viene utilizzata la directory predefinita $ GIT_DIR / objects."
#. type: Plain text
#: en/git-init.txt:37
#, 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 ""
-"L'esecuzione di \"git init\" in un repository esistente 챔 sicura. Non "
-"sovrascriver횪 le cose che sono gi횪 l챙. Il motivo principale per la "
-"riesecuzione di 'git init' 챔 quello di raccogliere i modelli appena aggiunti "
-"(o spostare il repository in un altro posto se --separate-git-dir 챔 dato)."
+msgstr "L'esecuzione di \"git init\" in un repository esistente 챔 sicura. Non sovrascriver횪 le cose che sono gi횪 l챙. Il motivo principale per la riesecuzione di 'git init' 챔 quello di raccogliere i modelli appena aggiunti (o spostare il repository in un altro posto se --separate-git-dir 챔 dato)."
#. type: Plain text
#: en/git-init.txt:45
#, fuzzy, priority:300
msgid "Only print error and warning messages; all other output will be suppressed."
-msgstr ""
-"Only print error and warning messages; all other output will be suppressed."
+msgstr "Only print error and warning messages; all other output will be suppressed."
#. type: Plain text
#: en/git-init.txt:50
#, fuzzy, priority:300
msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
-msgstr ""
-"Crea un archivio base. Se l'ambiente `GIT_DIR` non 챔 impostato, 챔 impostato "
-"sulla cartella di lavoro corrente."
+msgstr "Crea un archivio base. Se l'ambiente `GIT_DIR` non 챔 impostato, 챔 impostato sulla cartella di lavoro corrente."
#. type: Labeled list
#: en/git-init.txt:51
@@ -30028,27 +29259,19 @@ msgstr ""
#: en/git-init.txt:60
#, fuzzy, priority:300
msgid "Specify the directory from which templates will be used. (See the \"TEMPLATE DIRECTORY\" section below.)"
-msgstr ""
-"Specifica la cartella da cui verranno utilizzati i modelli. (Vedi la sezione "
-"\"DIRECTORY DEL MODELLO\" di seguito.)"
+msgstr "Specifica la cartella da cui verranno utilizzati i modelli. (Vedi la sezione \"DIRECTORY DEL MODELLO\" di seguito.)"
#. type: Plain text
#: en/git-init.txt:67
#, fuzzy, 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 ""
-"Invece di inizializzare il repository come directory su `$ GIT_DIR` o` ./. "
-"Git / `, crea l챙 un file di testo contenente il percorso del repository "
-"effettivo. Questo file funge da collegamento simbolico Git indipendente dal "
-"filesystem al repository."
+msgstr "Invece di inizializzare il repository come directory su `$ GIT_DIR` o` ./. Git / `, crea l챙 un file di testo contenente il percorso del repository effettivo. Questo file funge da collegamento simbolico Git indipendente dal filesystem al repository."
#. type: Plain text
#: en/git-init.txt:69
#, fuzzy, priority:300
msgid "If this is reinitialization, the repository will be moved to the specified path."
-msgstr ""
-"Se questa 챔 una reinizializzazione, il repository verr횪 mosso su un percorso "
-"specifico."
+msgstr "Se questa 챔 una reinizializzazione, il repository verr횪 mosso su un percorso specifico."
#. type: Labeled list
#: en/git-init.txt:70
@@ -30060,21 +29283,13 @@ msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
#: en/git-init.txt:78
#, fuzzy, 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 ""
-"Specificare che il repository Git deve essere condiviso tra pi첫 utenti. Ci챵 "
-"consente agli utenti appartenenti allo stesso gruppo di inviare il "
-"repository. Se specificato, la variabile di configurazione \"core."
-"sharedRepository\" 챔 impostata in modo che i file e le directory in `$ "
-"GIT_DIR` vengano creati con le autorizzazioni richieste. Se non specificato, "
-"Git utilizzer횪 le autorizzazioni riportate da umask (2)."
+msgstr "Specificare che il repository Git deve essere condiviso tra pi첫 utenti. Ci챵 consente agli utenti appartenenti allo stesso gruppo di inviare il repository. Se specificato, la variabile di configurazione \"core.sharedRepository\" 챔 impostata in modo che i file e le directory in `$ GIT_DIR` vengano creati con le autorizzazioni richieste. Se non specificato, Git utilizzer횪 le autorizzazioni riportate da umask (2)."
#. type: Plain text
#: en/git-init.txt:81
#, fuzzy, priority:300
msgid "The option can have the following values, defaulting to 'group' if no value is given:"
-msgstr ""
-"L'opzione pu챵 avere i seguenti valori, per impostazione predefinita su "
-"\"gruppo\" se non viene fornito alcun valore:"
+msgstr "L'opzione pu챵 avere i seguenti valori, per impostazione predefinita su \"gruppo\" se non viene fornito alcun valore:"
#. type: Labeled list
#: en/git-init.txt:83
@@ -30086,9 +29301,7 @@ msgstr "'umask' (or 'false')"
#: en/git-init.txt:87
#, fuzzy, priority:300
msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
-msgstr ""
-"Usa le autorizzazioni riportate da umask (2). L'impostazione predefinita, "
-"quando `--shared` non 챔 specificato."
+msgstr "Usa le autorizzazioni riportate da umask (2). L'impostazione predefinita, quando `--shared` non 챔 specificato."
#. type: Labeled list
#: en/git-init.txt:88
@@ -30100,14 +29313,7 @@ msgstr "'group' (o 'true')"
#: en/git-init.txt:96
#, fuzzy, 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 ""
-"Rendi il gruppo di repository scrivibile, (e g + sx, poich챕 il gruppo git "
-"potrebbe non essere il gruppo principale di tutti gli utenti). Viene "
-"utilizzato per allentare le autorizzazioni di un valore umask (2) altrimenti "
-"sicuro. Si noti che umask si applica ancora agli altri bit di autorizzazione "
-"(ad es. Se umask 챔 \"0022\", l'uso di \"gruppo\" non rimuover횪 i privilegi "
-"di lettura da altri utenti (non di gruppo)). Vedere '0xxx' per come "
-"specificare esattamente le autorizzazioni del repository."
+msgstr "Rendi il gruppo di repository scrivibile, (e g + sx, poich챕 il gruppo git potrebbe non essere il gruppo principale di tutti gli utenti). Viene utilizzato per allentare le autorizzazioni di un valore umask (2) altrimenti sicuro. Si noti che umask si applica ancora agli altri bit di autorizzazione (ad es. Se umask 챔 \"0022\", l'uso di \"gruppo\" non rimuover횪 i privilegi di lettura da altri utenti (non di gruppo)). Vedere '0xxx' per come specificare esattamente le autorizzazioni del repository."
#. type: Labeled list
#: en/git-init.txt:97
@@ -30131,30 +29337,19 @@ msgstr ""
#: en/git-init.txt:108
#, fuzzy, priority:300
msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
-msgstr ""
-"'0xxx' 챔 un numero ottale e ogni file avr횪 la modalit횪 '0xxx'. '0xxx' "
-"sostituir횪 il valore umask (2) degli utenti (e non solo allenter횪 le "
-"autorizzazioni come 'group' e 'all'). '0640' creer횪 un repository leggibile "
-"in gruppo, ma non scrivibile in gruppo o accessibile ad altri. '0660' creer횪 "
-"un repository leggibile e scrivibile per l'utente e il gruppo attuali, ma "
-"inaccessibile agli altri."
+msgstr "'0xxx' 챔 un numero ottale e ogni file avr횪 la modalit횪 '0xxx'. '0xxx' sostituir횪 il valore umask (2) degli utenti (e non solo allenter횪 le autorizzazioni come 'group' e 'all'). '0640' creer횪 un repository leggibile in gruppo, ma non scrivibile in gruppo o accessibile ad altri. '0660' creer횪 un repository leggibile e scrivibile per l'utente e il gruppo attuali, ma inaccessibile agli altri."
#. type: Plain text
#: en/git-init.txt:113
#, fuzzy, 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 ""
-"Per impostazione predefinita, il flag di configurazione `receive."
-"denyNonFastForwards` 챔 abilitato nei repository condivisi, quindi non 챔 "
-"possibile forzare un push non fast-forwarding in esso."
+msgstr "Per impostazione predefinita, il flag di configurazione `receive.denyNonFastForwards` 챔 abilitato nei repository condivisi, quindi non 챔 possibile forzare un push non fast-forwarding in esso."
#. type: Plain text
#: en/git-init.txt:116
#, fuzzy, 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 ""
-"Se si fornisce una 'directory', il comando viene eseguito al suo interno. Se "
-"questa directory non esiste, verr횪 creata."
+msgstr "Se si fornisce una 'directory', il comando viene eseguito al suo interno. Se questa directory non esiste, verr횪 creata."
#. type: Title -
#: en/git-init.txt:118
@@ -30166,9 +29361,7 @@ msgstr "CARTELLA MODELLO"
#: en/git-init.txt:122
#, fuzzy, 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 ""
-"I file e le directory nella directory del modello il cui nome non inizia con "
-"un punto verranno copiati in `$ GIT_DIR` dopo la sua creazione."
+msgstr "I file e le directory nella directory del modello il cui nome non inizia con un punto verranno copiati in `$ GIT_DIR` dopo la sua creazione."
#. type: Plain text
#: en/git-init.txt:124
@@ -30204,27 +29397,19 @@ msgstr "La cartella modello predefinita: `/usr/share/git-core/templates`."
#: en/git-init.txt:135
#, fuzzy, priority:300
msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
-msgstr ""
-"La directory del modello predefinita include alcune strutture di directory, "
-"suggerito \"escludi pattern\" (vedi link git: gitignore [5]) e file hook di "
-"esempio."
+msgstr "La directory del modello predefinita include alcune strutture di directory, suggerito \"escludi pattern\" (vedi link git: gitignore [5]) e file hook di esempio."
#. type: Plain text
#: en/git-init.txt:138
#, fuzzy, 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 ""
-"Gli hook di esempio sono tutti disabilitati per impostazione predefinita. "
-"Per abilitare uno dei hook di esempio rinominalo rimuovendo il suo suffisso `"
-".sample`."
+msgstr "Gli hook di esempio sono tutti disabilitati per impostazione predefinita. Per abilitare uno dei hook di esempio rinominalo rimuovendo il suo suffisso `.sample`."
#. type: Plain text
#: en/git-init.txt:140
#, fuzzy, priority:300
msgid "See linkgit:githooks[5] for more general info on hook execution."
-msgstr ""
-"Vedi linkgit: githooks [5] per maggiori informazioni generali "
-"sull'esecuzione di hook."
+msgstr "Vedi linkgit: githooks [5] per maggiori informazioni generali sull'esecuzione di hook."
#. type: Labeled list
#: en/git-init.txt:144
@@ -36447,7 +35632,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -36669,7 +35854,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -36681,13 +35866,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -36699,7 +35884,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -36711,7 +35896,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -42200,7 +41385,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -42223,7 +41408,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -42241,7 +41426,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -42349,13 +41534,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -42373,7 +41558,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -42481,7 +41666,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -42493,7 +41678,7 @@ msgstr "update"
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -47395,7 +46580,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -47407,7 +46592,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -50829,7 +50014,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -53894,8 +53079,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -62082,7 +61267,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -62334,7 +61519,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -62830,31 +62015,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -62866,43 +62057,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -62910,91 +62101,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -63003,439 +62194,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -63446,19 +62637,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -63470,85 +62661,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
@@ -63757,28 +62948,19 @@ msgstr "GIT URLS[[URLS]]."
#: en/urls.txt:8
#, fuzzy, 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 ""
-"In generale, gli URL contengono informazioni sul protocollo di trasporto, "
-"l'indirizzo del server remoto e il percorso del repository. A seconda del "
-"protocollo di trasporto, alcune di queste informazioni potrebbero essere "
-"assenti."
+msgstr "In generale, gli URL contengono informazioni sul protocollo di trasporto, l'indirizzo del server remoto e il percorso del repository. A seconda del protocollo di trasporto, alcune di queste informazioni potrebbero essere assenti."
#. type: Plain text
#: en/urls.txt:12
#, fuzzy, 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 supporta i protocolli ssh, git, http e https (inoltre, ftp e ftps "
-"possono essere utilizzati per il recupero, ma questo 챔 inefficiente e "
-"deprecato; non utilizzarlo)."
+msgstr "Git supporta i protocolli ssh, git, http e https (inoltre, ftp e ftps possono essere utilizzati per il recupero, ma questo 챔 inefficiente e deprecato; non utilizzarlo)."
#. type: Plain text
#: en/urls.txt:15
#, fuzzy, priority:300
msgid "The native transport (i.e. git:// URL) does no authentication and should be used with caution on unsecured networks."
-msgstr ""
-"Il trasporto nativo (ovvero git: // URL) non esegue l'autenticazione e deve "
-"essere utilizzato con cautela su reti non protette."
+msgstr "Il trasporto nativo (ovvero git: // URL) non esegue l'autenticazione e deve essere utilizzato con cautela su reti non protette."
#. type: Plain text
#: en/urls.txt:17
@@ -63790,8 +62972,7 @@ msgstr "Le seguenti sintassi possono essere utilizzate con esse:"
#: en/urls.txt:19
#, fuzzy, 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/"
+msgstr "ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/path/to/repo.git/"
#. type: Plain text
#: en/urls.txt:20
@@ -63815,9 +62996,7 @@ msgstr "ftp{startsb}s{endsb}://host.xz{startsb}:port{endsb}/path/to/repo.git/"
#: en/urls.txt:24
#, fuzzy, priority:300
msgid "An alternative scp-like syntax may also be used with the ssh protocol:"
-msgstr ""
-"Una sintassi alternativa simile a scp pu챵 anche essere usata con il "
-"protocollo ssh:"
+msgstr "Una sintassi alternativa simile a scp pu챵 anche essere usata con il protocollo ssh:"
#. type: Plain text
#: en/urls.txt:26
@@ -63829,12 +63008,7 @@ msgstr "{startsb}user@{endsb}host.xz:path/to/repo.git/"
#: en/urls.txt:32
#, fuzzy, 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 ""
-"Questa sintassi 챔 riconosciuta solo se non ci sono barre prima dei primi due "
-"punti. Questo aiuta a differenziare un percorso locale che contiene due "
-"punti. Ad esempio, il percorso locale `foo: bar` potrebbe essere specificato "
-"come percorso assoluto o` ./foo: bar` per evitare di essere interpretato "
-"erroneamente come un URL ssh."
+msgstr "Questa sintassi 챔 riconosciuta solo se non ci sono barre prima dei primi due punti. Questo aiuta a differenziare un percorso locale che contiene due punti. Ad esempio, il percorso locale `foo: bar` potrebbe essere specificato come percorso assoluto o` ./foo: bar` per evitare di essere interpretato erroneamente come un URL ssh."
#. type: Plain text
#: en/urls.txt:34
@@ -63846,16 +63020,13 @@ msgstr "I protocolli ssh e git supportano inoltre ~ espansione nome utente:"
#: en/urls.txt:36
#, fuzzy, 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/"
+msgstr "ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
#. type: Plain text
#: en/urls.txt:37
#, fuzzy, 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/"
+msgstr "git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
#. type: Plain text
#: en/urls.txt:38
@@ -63867,9 +63038,7 @@ msgstr "{startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/"
#: en/urls.txt:41
#, priority:300
msgid "For local repositories, also supported by Git natively, the following syntaxes may be used:"
-msgstr ""
-"Per i repository locali, supportati anche da Git in modo nativo, 챔 possibile "
-"utilizzare le seguenti sintassi:"
+msgstr "Per i repository locali, supportati anche da Git in modo nativo, 챔 possibile utilizzare le seguenti sintassi:"
#. type: Plain text
#: en/urls.txt:43
@@ -63887,36 +63056,25 @@ msgstr "\\file:///path/to/repo.git/"
#: en/urls.txt:49
#, fuzzy, 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 ""
-"Queste due sintassi sono per lo pi첫 equivalenti, tranne durante la "
-"clonazione, quando la prima implica l'opzione --local. Vedi linkgit: git-"
-"clone [1] per i dettagli."
+msgstr "Queste due sintassi sono per lo pi첫 equivalenti, tranne durante la clonazione, quando la prima implica l'opzione --local. Vedi linkgit: git-clone [1] per i dettagli."
#. type: Plain text
#: en/urls.txt:54
#, fuzzy, priority:300
msgid "These two syntaxes are mostly equivalent, except the former implies --local option."
-msgstr ""
-"Queste due sintassi sono per lo pi첫 equivalenti, tranne la prima implica "
-"l'opzione --local."
+msgstr "Queste due sintassi sono per lo pi첫 equivalenti, tranne la prima implica l'opzione --local."
#. type: Plain text
#: en/urls.txt:58
#, fuzzy, 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', ma non 'git push', accettano anche un "
-"file d'archivio adatto. Vedi linkgit: git-bundle [1]."
+msgstr "'git clone', 'git fetch' e 'git pull', ma non 'git push', accettano anche un file d'archivio adatto. Vedi linkgit: git-bundle [1]."
#. type: Plain text
#: en/urls.txt:63
#, fuzzy, 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 ""
-"Quando Git non sa come gestire un determinato protocollo di trasporto, tenta "
-"di utilizzare l'helper remoto \"remote- <transport>\", se presente. Per "
-"richiedere esplicitamente un supporto remoto, 챔 possibile utilizzare la "
-"sintassi seguente:"
+msgstr "Quando Git non sa come gestire un determinato protocollo di trasporto, tenta di utilizzare l'helper remoto \"remote- <transport>\", se presente. Per richiedere esplicitamente un supporto remoto, 챔 possibile utilizzare la sintassi seguente:"
#. type: Plain text
#: en/urls.txt:65
@@ -63928,20 +63086,13 @@ msgstr "<transport>::<address>"
#: en/urls.txt:69
#, fuzzy, 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 ""
-"dove <indirizzo> pu챵 essere un percorso, un server e un percorso o una "
-"stringa arbitraria simile a un URL riconosciuta dall'helper remoto specifico "
-"che viene richiamato. Vedi linkgit:git remote-helpers [7] per i dettagli."
+msgstr "dove <indirizzo> pu챵 essere un percorso, un server e un percorso o una stringa arbitraria simile a un URL riconosciuta dall'helper remoto specifico che viene richiamato. Vedi linkgit:git remote-helpers [7] per i dettagli."
#. type: Plain text
#: en/urls.txt:74
#, fuzzy, 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 ""
-"Se esiste un numero elevato di repository remoti con nomi simili e si "
-"desidera utilizzare un formato diverso per essi (in modo tale che gli URL "
-"utilizzati vengano riscritti in URL funzionanti), 챔 possibile creare una "
-"sezione di configurazione del modulo:"
+msgstr "Se esiste un numero elevato di repository remoti con nomi simili e si desidera utilizzare un formato diverso per essi (in modo tale che gli URL utilizzati vengano riscritti in URL funzionanti), 챔 possibile creare una sezione di configurazione del modulo:"
#. type: delimited block -
#: en/urls.txt:78
@@ -63973,18 +63124,13 @@ msgstr ""
#: en/urls.txt:90
#, fuzzy, 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 ""
-"un URL come \"work: repo.git\" o come \"host.xz: /path/to/repo.git\" verr횪 "
-"riscritto in qualsiasi contesto che ritenga che un URL sia \"git: //git.host."
-"xz/repo .idiota\"."
+msgstr "un URL come \"work: repo.git\" o come \"host.xz: /path/to/repo.git\" verr횪 riscritto in qualsiasi contesto che ritenga che un URL sia \"git: //git.host.xz/repo .idiota\"."
#. type: Plain text
#: en/urls.txt:93
#, fuzzy, priority:300
msgid "If you want to rewrite URLs for push only, you can create a configuration section of the form:"
-msgstr ""
-"Se si desidera riscrivere gli URL solo per push, 챔 possibile creare una "
-"sezione di configurazione del modulo:"
+msgstr "Se si desidera riscrivere gli URL solo per push, 챔 possibile creare una sezione di configurazione del modulo:"
#. type: delimited block -
#: en/urls.txt:97
@@ -64010,10 +63156,7 @@ msgstr ""
#: en/urls.txt:108
#, fuzzy, 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 come \"git: //example.org/path/to/repo.git\" verr횪 riscritto in \"ssh:"
-" //example.org/path/to/repo.git\" per i push, ma i pull useranno comunque il "
-"URL originale."
+msgstr "un URL come \"git: //example.org/path/to/repo.git\" verr횪 riscritto in \"ssh: //example.org/path/to/repo.git\" per i push, ma i pull useranno comunque il URL originale."
#. type: Title =
#: en/git-bisect-lk2009.txt:2
@@ -65898,10 +65041,7 @@ msgstr ""
#: en/git-bisect-lk2009.txt:1252
#, fuzzy, priority:100
msgid "This has been requested by some kernel developers because some bugs called sporadic bugs do not appear in all the kernel builds because they are very dependent on the compiler output."
-msgstr ""
-"Questo 챔 stato richiesto da alcuni sviluppatori del kernel perch챕 alcuni bug "
-"chiamati bug sporadici non compaiono in tutti i build del kernel perch챕 sono "
-"molto dipendenti dall'output del compilatore."
+msgstr "Questo 챔 stato richiesto da alcuni sviluppatori del kernel perch챕 alcuni bug chiamati bug sporadici non compaiono in tutti i build del kernel perch챕 sono molto dipendenti dall'output del compilatore."
#. type: Plain text
#: en/git-bisect-lk2009.txt:1261
@@ -65913,9 +65053,7 @@ msgstr ""
#: en/git-bisect-lk2009.txt:1265
#, fuzzy, priority:100
msgid "There is already a project called BBChop created by Ealdwulf Wuffinga on Github that does something like that using Bayesian Search Theory <<9>>:"
-msgstr ""
-"Esiste gi횪 un progetto chiamato BBChop creato da Ealdwulf Wuffinga su Github "
-"che fa qualcosa del genere usando la teoria della ricerca bayesiana <<9>>:"
+msgstr "Esiste gi횪 un progetto chiamato BBChop creato da Ealdwulf Wuffinga su Github che fa qualcosa del genere usando la teoria della ricerca bayesiana <<9>>:"
#. type: delimited block _
#: en/git-bisect-lk2009.txt:1272
@@ -65927,9 +65065,7 @@ msgstr ""
#: en/git-bisect-lk2009.txt:1276
#, fuzzy, priority:100
msgid "But BBChop is independent of any VCS and it would be easier for Git users to have something integrated in Git."
-msgstr ""
-"Ma BBChop 챔 indipendente da qualsiasi VCS e sarebbe pi첫 facile per gli "
-"utenti Git avere qualcosa di integrato in Git."
+msgstr "Ma BBChop 챔 indipendente da qualsiasi VCS e sarebbe pi첫 facile per gli utenti Git avere qualcosa di integrato in Git."
#. type: Title -
#: en/git-bisect-lk2009.txt:1278
@@ -65947,13 +65083,7 @@ msgstr ""
#: en/git-bisect-lk2009.txt:1292
#, fuzzy, priority:100
msgid "Some improvements to the algorithms inside \"git bisect\" are possible and some new features could help in some cases, but overall \"git bisect\" works already very well, is used a lot, and is already very useful. To back up that last claim, let's give the final word to Ingo Molnar when he was asked by the author how much time does he think \"git bisect\" saves him when he uses it:"
-msgstr ""
-"Alcuni miglioramenti agli algoritmi all'interno di \"git bisect\" sono "
-"possibili e alcune nuove funzionalit횪 potrebbero aiutare in alcuni casi, ma "
-"nel complesso \"git bisect\" funziona gi횪 molto bene, viene utilizzato molto "
-"ed 챔 gi횪 molto utile. Per sostenere quest'ultima affermazione, diamo "
-"l'ultima parola a Ingo Molnar quando gli 챔 stato chiesto dall'autore quanto "
-"tempo pensa che \"git bisect\" lo salvi quando lo usa:"
+msgstr "Alcuni miglioramenti agli algoritmi all'interno di \"git bisect\" sono possibili e alcune nuove funzionalit횪 potrebbero aiutare in alcuni casi, ma nel complesso \"git bisect\" funziona gi횪 molto bene, viene utilizzato molto ed 챔 gi횪 molto utile. Per sostenere quest'ultima affermazione, diamo l'ultima parola a Ingo Molnar quando gli 챔 stato chiesto dall'autore quanto tempo pensa che \"git bisect\" lo salvi quando lo usa:"
#. type: delimited block _
#: en/git-bisect-lk2009.txt:1295
@@ -65965,11 +65095,7 @@ msgstr ""
#: en/git-bisect-lk2009.txt:1300
#, fuzzy, priority:100
msgid "About ten years ago did i do my first 'bisection' of a Linux patch queue. That was prior the Git (and even prior the BitKeeper) days. I literally days spent sorting out patches, creating what in essence were standalone commits that i guessed to be related to that bug."
-msgstr ""
-"Circa dieci anni fa ho fatto la mia prima \"bisection\" di una coda di patch "
-"Linux. Ci챵 avveniva prima dei giorni di Git (e persino prima di BitKeeper). "
-"Ho letteralmente passato giorni a sistemare le patch, creando ci챵 che in "
-"sostanza erano commit autonomi che immaginavo fossero correlati a quel bug."
+msgstr "Circa dieci anni fa ho fatto la mia prima \"bisection\" di una coda di patch Linux. Ci챵 avveniva prima dei giorni di Git (e persino prima di BitKeeper). Ho letteralmente passato giorni a sistemare le patch, creando ci챵 che in sostanza erano commit autonomi che immaginavo fossero correlati a quel bug."
#. type: delimited block _
#: en/git-bisect-lk2009.txt:1303
@@ -65981,11 +65107,7 @@ msgstr ""
#: en/git-bisect-lk2009.txt:1308
#, fuzzy, priority:100
msgid "With Git bisect it's a breeze: in the best case i can get a ~15 step kernel bisection done in 20-30 minutes, in an automated way. Even with manual help or when bisecting multiple, overlapping bugs, it's rarely more than an hour."
-msgstr ""
-"Con Git bisect 챔 un gioco da ragazzi: nel migliore dei casi posso ottenere "
-"una bisection del kernel di circa 15 passaggi in 20-30 minuti, in modo "
-"automatizzato. Anche con l'aiuto manuale o quando si taglia in due pi첫 bug "
-"sovrapposti, raramente dura pi첫 di un'ora."
+msgstr "Con Git bisect 챔 un gioco da ragazzi: nel migliore dei casi posso ottenere una bisection del kernel di circa 15 passaggi in 20-30 minuti, in modo automatizzato. Anche con l'aiuto manuale o quando si taglia in due pi첫 bug sovrapposti, raramente dura pi첫 di un'ora."
#. type: delimited block _
#: en/git-bisect-lk2009.txt:1314
@@ -65997,10 +65119,7 @@ msgstr ""
#: en/git-bisect-lk2009.txt:1318
#, fuzzy, priority:100
msgid "And even if a bisection fails today it tells us something valuable about the bug: that it's non-deterministic - timing or kernel image layout dependent."
-msgstr ""
-"E anche se una bisection oggi fallisce, ci dice qualcosa di prezioso "
-"riguardo al bug: che non 챔 un timing non-deterministico - o il dipendente "
-"del layout dell'immagine del kernel ."
+msgstr "E anche se una bisection oggi fallisce, ci dice qualcosa di prezioso riguardo al bug: che non 챔 un timing non-deterministico - o il dipendente del layout dell'immagine del kernel ."
#. type: delimited block _
#: en/git-bisect-lk2009.txt:1321
@@ -66024,11 +65143,7 @@ msgstr ""
#: en/git-bisect-lk2009.txt:1335
#, fuzzy, priority:100
msgid "Many thanks to Ingo Molnar for giving me very useful information that appears in this paper, for commenting on this paper, for his suggestions to improve \"git bisect\" and for evangelizing \"git bisect\" on the linux kernel mailing lists."
-msgstr ""
-"Mille grazie a Ingo Molnar per avermi dato informazioni molto utili che "
-"appaiono in questo documento, per commentare questo documento, per i suoi "
-"suggerimenti per migliorare \"git bisect\" e per evangelizzare \"git bisect\""
-" nelle mailing list del kernel di Linux."
+msgstr "Mille grazie a Ingo Molnar per avermi dato informazioni molto utili che appaiono in questo documento, per commentare questo documento, per i suoi suggerimenti per migliorare \"git bisect\" e per evangelizzare \"git bisect\" nelle mailing list del kernel di Linux."
#. type: Plain text
#: en/git-bisect-lk2009.txt:1338
@@ -66040,11 +65155,7 @@ msgstr ""
#: en/git-bisect-lk2009.txt:1343
#, fuzzy, priority:100
msgid "Many thanks to the many other great people who helped one way or another when I worked on Git, especially to Andreas Ericsson, Johannes Schindelin, H. Peter Anvin, Daniel Barkalow, Bill Lear, John Hawley, Shawn O. Pierce, Jeff King, Sam Vilain, Jon Seymour."
-msgstr ""
-"Mille grazie a molte altre grandi persone che mi hanno aiutato in un modo o "
-"nell'altro quando ho lavorato su Git, in particolare ad Andreas Ericsson, "
-"Johannes Schindelin, H. Peter Anvin, Daniel Barkalow, Bill Lear, John "
-"Hawley, Shawn O. Pierce, Jeff King, Sam Vilain, Jon Seymour."
+msgstr "Mille grazie a molte altre grandi persone che mi hanno aiutato in un modo o nell'altro quando ho lavorato su Git, in particolare ad Andreas Ericsson, Johannes Schindelin, H. Peter Anvin, Daniel Barkalow, Bill Lear, John Hawley, Shawn O. Pierce, Jeff King, Sam Vilain, Jon Seymour."
#. type: Plain text
#: en/git-bisect-lk2009.txt:1346
@@ -66063,11 +65174,7 @@ msgstr "--dereference"
#: en/git-bisect-lk2009.txt:1351
#, fuzzy, priority:100
msgid "[[[1]]] https://www.nist.gov/sites/default/files/documents/director/planning/report02-3.pdf['The Economic Impacts of Inadequate Infratructure for Software Testing'. Nist Planning Report 02-3], see Executive Summary and Chapter 8."
-msgstr ""
-"[[[1]]] https://www.nist.gov/sites/default/files/documents/director/planning/"
-"report02-3.pdf['Gli impatti economici dell'infrastruttura inadeguata per i "
-"test del software'. Nist Planning Report 02-3], vedere il sommario "
-"esecutivo ed il capitolo 8."
+msgstr "[[[1]]] https://www.nist.gov/sites/default/files/documents/director/planning/report02-3.pdf['Gli impatti economici dell'infrastruttura inadeguata per i test del software'. Nist Planning Report 02-3], vedere il sommario esecutivo ed il capitolo 8."
#. type: Plain text
#: en/git-bisect-lk2009.txt:1352
@@ -66079,9 +65186,7 @@ msgstr ""
#: en/git-bisect-lk2009.txt:1353
#, fuzzy, priority:100
msgid "[[[3]]] https://en.wikipedia.org/wiki/Software_maintenance['Software maintenance'. Wikipedia.]"
-msgstr ""
-"[[[3]]] https://en.wikipedia.org/wiki/Software_maintenance['Manutenzione "
-"software '. Wikipedia.]"
+msgstr "[[[3]]] https://en.wikipedia.org/wiki/Software_maintenance['Manutenzione software '. Wikipedia.]"
#. type: Plain text
#: en/git-bisect-lk2009.txt:1354
@@ -66093,9 +65198,7 @@ msgstr ""
#: en/git-bisect-lk2009.txt:1355
#, fuzzy, priority:100
msgid "[[[5]]] https://lwn.net/Articles/317154/[Christian Couder. 'Fully automated bisecting with \"git bisect run\"'. LWN.net.]"
-msgstr ""
-"[[[5]]] https://lwn.net/Articles/317154/[Christian Couder. 'Automatizzato "
-"completamente bisezionando con\"git bisect run\"'. LWN.net.]"
+msgstr "[[[5]]] https://lwn.net/Articles/317154/[Christian Couder. 'Automatizzato completamente bisezionando con\"git bisect run\"'. LWN.net.]"
#. type: Plain text
#: en/git-bisect-lk2009.txt:1356
diff --git a/po/documentation.ko.po b/po/documentation.ko.po
index 8b060dc..69edddd 100644
--- a/po/documentation.ko.po
+++ b/po/documentation.ko.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: git-manpages-l10n\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2020-03-02 13:01+0100\n"
"Last-Translator: Jean-No챘l AVILA <jn.avila@free.fr>\n"
"Language-Team: Korean\n"
@@ -89,7 +89,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -313,143 +313,155 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr ""
@@ -1117,83 +1129,95 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Switch branches."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr ""
@@ -2782,11 +2806,11 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 ""
@@ -6484,7 +6508,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6514,7 +6538,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6762,7 +6786,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7095,7 +7119,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9867,7 +9891,7 @@ msgstr "--git-format"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13619,7 +13643,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -18889,7 +18913,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19537,13 +19561,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27001,7 +27025,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27017,7 +27041,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29076,7 +29100,7 @@ msgstr ""
#, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
@@ -35498,7 +35522,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35720,7 +35744,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35732,13 +35756,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35750,7 +35774,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35762,7 +35786,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -41251,7 +41275,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41274,7 +41298,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41292,7 +41316,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41400,13 +41424,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41424,7 +41448,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41532,7 +41556,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41544,7 +41568,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46441,7 +46465,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46453,7 +46477,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49875,7 +49899,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -52934,8 +52958,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61115,7 +61139,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61367,7 +61391,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -61863,31 +61887,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -61899,43 +61929,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -61943,91 +61973,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62036,439 +62066,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62479,19 +62509,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62503,85 +62533,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.mr.po b/po/documentation.mr.po
index 3e22da1..232014e 100644
--- a/po/documentation.mr.po
+++ b/po/documentation.mr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git-manpages-l 10n\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2020-02-17 13:50+0000\n"
"Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
"Language-Team: Marathi\n"
@@ -91,7 +91,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -315,143 +315,155 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr ""
@@ -1119,83 +1131,95 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Switch branches."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr ""
@@ -2784,11 +2808,11 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 ""
@@ -6486,7 +6510,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6516,7 +6540,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6764,7 +6788,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7097,7 +7121,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9869,7 +9893,7 @@ msgstr "--git-format"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13621,7 +13645,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -18891,7 +18915,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19539,13 +19563,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27003,7 +27027,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27019,7 +27043,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29078,7 +29102,7 @@ msgstr ""
#, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
@@ -35500,7 +35524,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35722,7 +35746,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35734,13 +35758,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35752,7 +35776,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35764,7 +35788,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -41253,7 +41277,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41276,7 +41300,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41294,7 +41318,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41402,13 +41426,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41426,7 +41450,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41534,7 +41558,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41546,7 +41570,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46443,7 +46467,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46455,7 +46479,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49877,7 +49901,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -52936,8 +52960,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61122,7 +61146,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61374,7 +61398,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -61870,31 +61894,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -61906,43 +61936,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -61950,91 +61980,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62043,439 +62073,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62486,19 +62516,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62510,85 +62540,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index 26e1289..9d50b54 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2019-10-14 23:28+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -86,7 +86,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -312,143 +312,155 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr ""
@@ -1116,84 +1128,96 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, fuzzy, priority:100
#| msgid "--detect-branches"
msgid "Switch branches."
msgstr "--detect-branches"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr ""
@@ -2782,11 +2806,11 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 ""
@@ -6485,7 +6509,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6515,7 +6539,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6763,7 +6787,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7096,7 +7120,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9868,7 +9892,7 @@ msgstr "--git-format"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13620,7 +13644,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -18890,7 +18914,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19538,13 +19562,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27006,7 +27030,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27022,7 +27046,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29081,7 +29105,7 @@ msgstr ""
#, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
@@ -35503,7 +35527,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35725,7 +35749,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35737,13 +35761,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35755,7 +35779,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35767,7 +35791,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -41257,7 +41281,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41280,7 +41304,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41298,7 +41322,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41406,13 +41430,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41430,7 +41454,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41538,7 +41562,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41550,7 +41574,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46449,7 +46473,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46461,7 +46485,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49884,7 +49908,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -52949,8 +52973,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61152,7 +61176,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61404,7 +61428,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -61900,31 +61924,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -61936,43 +61966,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -61980,91 +62010,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62073,439 +62103,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62516,19 +62546,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62540,85 +62570,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.nl.po b/po/documentation.nl.po
index 9b4db51..45700fe 100644
--- a/po/documentation.nl.po
+++ b/po/documentation.nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2019-10-31 12:31+0100\n"
"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -312,143 +312,155 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr ""
@@ -1116,83 +1128,95 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Switch branches."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr ""
@@ -2781,11 +2805,11 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 ""
@@ -6483,7 +6507,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6513,7 +6537,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6761,7 +6785,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7094,7 +7118,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9866,7 +9890,7 @@ msgstr "--patch-format"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13618,7 +13642,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -18888,7 +18912,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19536,13 +19560,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27003,7 +27027,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27019,7 +27043,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29078,7 +29102,7 @@ msgstr ""
#, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
@@ -35501,7 +35525,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35723,7 +35747,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35735,13 +35759,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35753,7 +35777,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35765,7 +35789,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -41269,7 +41293,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41292,7 +41316,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41310,7 +41334,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41421,13 +41445,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41446,7 +41470,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41557,7 +41581,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41570,7 +41594,7 @@ msgstr "update"
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46504,7 +46528,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46516,7 +46540,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49959,7 +49983,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -53043,8 +53067,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61275,7 +61299,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61530,7 +61554,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -62026,31 +62050,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -62062,43 +62092,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -62106,91 +62136,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62199,440 +62229,440 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, fuzzy, no-wrap, priority:260
#| msgid "--patch-format"
msgid "--date=<format>"
msgstr "--patch-format"
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62643,19 +62673,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62667,85 +62697,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.pl.po b/po/documentation.pl.po
index cc43011..acfc63d 100644
--- a/po/documentation.pl.po
+++ b/po/documentation.pl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\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"
@@ -90,7 +90,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -314,143 +314,155 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr ""
@@ -1118,83 +1130,95 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Switch branches."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr ""
@@ -2783,11 +2807,11 @@ msgstr "ISO 8601"
#. type: Plain text
#: en/date-formats.txt:26
#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 ""
@@ -6490,7 +6514,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6520,7 +6544,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6768,7 +6792,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7101,7 +7125,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9873,7 +9897,7 @@ msgstr "--git-format"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13625,7 +13649,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -18903,7 +18927,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19551,13 +19575,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27021,7 +27045,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27037,7 +27061,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29096,7 +29120,7 @@ msgstr ""
#, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
@@ -35518,7 +35542,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35740,7 +35764,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35752,13 +35776,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35770,7 +35794,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35782,7 +35806,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -41283,7 +41307,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41306,7 +41330,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41324,7 +41348,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41432,13 +41456,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41456,7 +41480,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41564,7 +41588,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41576,7 +41600,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46474,7 +46498,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46486,7 +46510,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49911,7 +49935,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -52971,8 +52995,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61159,7 +61183,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61411,7 +61435,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -61942,31 +61966,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, fuzzy, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -61983,43 +62013,43 @@ msgstr ""
"\t `---------'\n"
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -62027,91 +62057,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, fuzzy, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62123,439 +62153,439 @@ msgstr ""
"\t 3----5----6----8---\n"
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62566,19 +62596,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62590,85 +62620,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.pot b/po/documentation.pot
index 274123e..94b0588 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -91,7 +91,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, no-wrap
msgid "-t"
msgstr ""
@@ -355,132 +355,143 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, no-wrap
-msgid "linkgit:git-count-objects[1]"
+msgid "linkgit:git-bugreport[1]"
msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:9
-msgid "Count unpacked number of objects and their disk consumption."
+msgid "Collect information for user to file a bug report."
msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
#, no-wrap
-msgid "linkgit:git-difftool[1]"
+msgid "linkgit:git-count-objects[1]"
msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:12
-msgid "Show changes using common diff tools."
+msgid "Count unpacked number of objects and their disk consumption."
msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
#, no-wrap
+msgid "linkgit:git-difftool[1]"
+msgstr ""
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:15
+msgid "Show changes using common diff tools."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:16
+#, no-wrap
msgid "linkgit:git-fsck[1]"
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, no-wrap
msgid "linkgit:git-help[1]"
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
msgid "Display help information about Git."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, no-wrap
msgid "linkgit:git-instaweb[1]"
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
msgid "Instantly browse your working repository in gitweb."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, no-wrap
msgid "linkgit:git-merge-tree[1]"
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
msgid "Show three-way merge without touching index."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, no-wrap
msgid "linkgit:git-rerere[1]"
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
msgid "Reuse recorded resolution of conflicted merges."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, no-wrap
msgid "linkgit:git-show-branch[1]"
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
msgid "Show branches and their commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, no-wrap
msgid "linkgit:git-verify-commit[1]"
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
msgid "Check the GPG signature of commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, no-wrap
msgid "linkgit:git-verify-tag[1]"
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
msgid "Check the GPG signature of tags."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, no-wrap
msgid "linkgit:git-whatchanged[1]"
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
msgid "Show logs with difference each commit introduces."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, no-wrap
msgid "linkgit:gitweb[1]"
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
msgid "Git web interface (web frontend to Git repositories)."
msgstr ""
@@ -1092,77 +1103,88 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, no-wrap
-msgid "linkgit:git-stash[1]"
+msgid "linkgit:git-sparse-checkout[1]"
msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:105
-msgid "Stash the changes in a dirty working directory away."
+msgid "Initialize and modify the sparse-checkout."
msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:106
#, no-wrap
-msgid "linkgit:git-status[1]"
+msgid "linkgit:git-stash[1]"
msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:108
-msgid "Show the working tree status."
+msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:109
#, no-wrap
-msgid "linkgit:git-submodule[1]"
+msgid "linkgit:git-status[1]"
msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:111
-msgid "Initialize, update or inspect submodules."
+msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:112
#, no-wrap
-msgid "linkgit:git-switch[1]"
+msgid "linkgit:git-submodule[1]"
msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:114
-msgid "Switch branches."
+msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:115
#, no-wrap
-msgid "linkgit:git-tag[1]"
+msgid "linkgit:git-switch[1]"
msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:117
-msgid "Create, list, delete or verify a tag object signed with GPG."
+msgid "Switch branches."
msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:118
#, no-wrap
-msgid "linkgit:git-worktree[1]"
+msgid "linkgit:git-tag[1]"
msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:120
+msgid "Create, list, delete or verify a tag object signed with GPG."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:121
+#, no-wrap
+msgid "linkgit:git-worktree[1]"
+msgstr ""
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:123
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, no-wrap
msgid "linkgit:gitk[1]"
msgstr ""
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
msgid "The Git repository browser."
msgstr ""
@@ -2862,11 +2884,11 @@ 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. Fractional parts of a second will be ignored, for example "
-"`2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+"`2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
msgid ""
"In addition, the date part is accepted in the following formats: "
"`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
@@ -6997,7 +7019,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, no-wrap
msgid "-c"
msgstr ""
@@ -7028,7 +7050,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, no-wrap
msgid "-m"
msgstr ""
@@ -7298,7 +7320,7 @@ msgid "--continue"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, no-wrap
msgid "-r"
msgstr ""
@@ -7687,7 +7709,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, no-wrap
msgid "--reverse"
msgstr ""
@@ -10845,7 +10867,7 @@ msgstr ""
msgid ""
"Specify an alternate suffix for the bugreport name, to create a file named "
"'git-bugreport-<formatted suffix>'. This should take the form of a "
-"link:strftime[3] format string; the current local time will be used."
+"strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -15170,7 +15192,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap
msgid "--filter=<filter-spec>"
msgstr ""
@@ -21202,7 +21224,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, no-wrap
msgid "--cc"
msgstr ""
@@ -21935,13 +21957,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, no-wrap
msgid "--combined-all-paths"
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
msgid ""
"This flag causes combined diffs (used for merge commits) to list the name of "
"the file from all parents. It thus only has effect when -c or --cc are "
@@ -30900,7 +30922,7 @@ msgid ""
"Use \\0 as the delimiter for pathnames in the output, and print them "
"verbatim. Without this option, pathnames with \"unusual\" characters are "
"quoted as explained for the configuration variable core.quotePath (see "
-"git-config(1))."
+"linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -30917,7 +30939,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, no-wrap
msgid "--count"
msgstr ""
@@ -33196,7 +33218,7 @@ msgstr ""
#, no-wrap
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
@@ -40513,7 +40535,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, no-wrap
msgid "--unpacked"
msgstr ""
@@ -40805,7 +40827,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, no-wrap
msgid "--no-filter"
msgstr ""
@@ -40816,13 +40838,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
msgid ""
"A debug option to help with future \"partial clone\" development. This "
"option specifies how missing objects are handled."
@@ -40836,7 +40858,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
msgid ""
"The form '--missing=allow-any' will allow object traversal to continue if a "
"missing object is encountered. Missing objects will silently be omitted "
@@ -40852,7 +40874,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, no-wrap
msgid "--exclude-promisor-objects"
msgstr ""
@@ -47281,7 +47303,7 @@ msgstr ""
msgid ""
"'git remote' [-v | --verbose]\n"
"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] "
-"[--mirror=<fetch|push>] <name> <url>\n"
+"[--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -47305,7 +47327,7 @@ msgstr ""
#: en/git-remote.txt:39
msgid ""
"Be a little more verbose and show remote url after name. NOTE: This must be "
-"placed between `remote` and `subcommand`."
+"placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -47324,7 +47346,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
msgid ""
-"Adds a remote named <name> for the repository at <url>. The command `git "
+"Add a remote named <name> for the repository at <url>. The command `git "
"fetch <name>` can then be used to create and update remote-tracking branches "
"<name>/<branch>."
msgstr ""
@@ -47459,8 +47481,8 @@ msgstr ""
msgid ""
"With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then "
"the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., "
-"if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin "
-"-a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to "
+"if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` "
+"will set the symbolic-ref `refs/remotes/origin/HEAD` to "
"`refs/remotes/origin/next`. This will only work if "
"`refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
@@ -47469,7 +47491,7 @@ msgstr ""
#: en/git-remote.txt:121
msgid ""
"Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` "
-"explicitly. e.g., \"git remote set-head origin master\" will set the "
+"explicitly. e.g., `git remote set-head origin master` will set the "
"symbolic-ref `refs/remotes/origin/HEAD` to "
"`refs/remotes/origin/master`. This will only work if "
"`refs/remotes/origin/master` already exists; if not it must be fetched "
@@ -47494,7 +47516,7 @@ msgstr ""
#: en/git-remote.txt:131
msgid ""
"The named branches will be interpreted as if specified with the `-t` option "
-"on the 'git remote add' command line."
+"on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -47614,7 +47636,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
msgid ""
-"With `--dry-run` option, report what branches will be pruned, but do not "
+"With `--dry-run` option, report what branches would be pruned, but do not "
"actually prune them."
msgstr ""
@@ -47628,7 +47650,7 @@ msgstr ""
#: en/git-remote.txt:195
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 "
+"`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 "
@@ -53242,7 +53264,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, no-wrap
msgid "--topo-order"
msgstr ""
@@ -53256,7 +53278,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, no-wrap
msgid "--date-order"
msgstr ""
@@ -57227,7 +57249,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, no-wrap
msgid "--parents"
msgstr ""
@@ -60814,7 +60836,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, no-wrap
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
msgstr ""
#. type: Plain text
@@ -70197,7 +70219,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, no-wrap
msgid "--bisect"
msgstr ""
@@ -70483,7 +70505,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, no-wrap
msgid "--show-pulls"
msgstr ""
@@ -71076,24 +71098,29 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
msgid ""
-"The `--show-pulls` option helps with both of these issues by adding more "
-"merge commits to the history results. If a merge is not TREESAME to its "
-"first parent but is TREESAME to a later parent, then that merge is treated "
-"as if it \"pulled\" the change from another branch. When using "
-"`--show-pulls` on this example (and no other options) the resulting graph "
-"is:"
+"In addition to the commits shown in the default history, show each merge "
+"commit that is not TREESAME to its first parent but is TREESAME to a later "
+"parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+msgid ""
+"When a merge commit is included by `--show-pulls`, the merge is treated as "
+"if it \"pulled\" the change from another branch. When using `--show-pulls` "
+"on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
msgid ""
"Here, the merge commits `R` and `N` are included because they pulled the "
"commits `X` and `R` into the base branch, respectively. These merges are the "
@@ -71101,14 +71128,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
msgid ""
"When `--show-pulls` is paired with `--simplify-merges`, the graph includes "
"all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap
msgid ""
"\t .-A---M--. N\n"
@@ -71120,7 +71147,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
msgid ""
"Notice that since `M` is reachable from `R`, the edge from `N` to `M` was "
"simplified away. However, `N` still appears in the history as an important "
@@ -71128,7 +71155,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
msgid ""
"The `--simplify-by-decoration` option allows you to view only the big "
"picture of the topology of the history, by omitting commits that are not "
@@ -71140,13 +71167,13 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
msgid ""
"Limit output to the one commit object which is roughly halfway between "
"included and excluded commits. Note that the bad bisection ref "
@@ -71156,18 +71183,18 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -71175,7 +71202,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
msgid ""
"would be of roughly the same length. Finding the change which introduces a "
"regression is thus reduced to a binary search: repeatedly generate and test "
@@ -71184,13 +71211,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, no-wrap
msgid "--bisect-vars"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
msgid ""
"This calculates the same as `--bisect`, except that refs in `refs/bisect/` "
"are not used, and except that this outputs text ready to be eval'ed by the "
@@ -71204,13 +71231,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, no-wrap
msgid "--bisect-all"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
msgid ""
"This outputs all the commit objects between the included and excluded "
"commits, ordered by their distance to the included and excluded "
@@ -71219,7 +71246,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
msgid ""
"This is useful because it makes it easy to choose a good commit to test when "
"you want to avoid to test some of them for some reason (they may not compile "
@@ -71227,7 +71254,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
msgid ""
"This option can be used along with `--bisect-vars`, in this case, after all "
"the sorted commit objects, there will be the same text as if `--bisect-vars` "
@@ -71235,50 +71262,50 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
msgid ""
"Show no parents before all of its children are shown, but otherwise show "
"commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, no-wrap
msgid "--author-date-order"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
msgid ""
"Show no parents before all of its children are shown, but otherwise show "
"commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
msgid ""
"Show no parents before all of its children are shown, and avoid showing "
"commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap
msgid ""
" ---1----2----4----7\n"
@@ -71287,7 +71314,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
msgid ""
"where the numbers denote the order of commit timestamps, `git rev-list` and "
"friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 "
@@ -71295,7 +71322,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
msgid ""
"With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); "
"some older commits are shown before newer ones in order to avoid showing the "
@@ -71303,31 +71330,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
msgid ""
"Output the commits chosen to be shown (see Commit Limiting section above) in "
"reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, no-wrap
msgid "--objects"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
msgid ""
"Print the object IDs of any object referenced by the listed commits. "
"`--objects foo ^bar` thus means ``send me all object IDs which I need to "
@@ -71335,26 +71362,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, no-wrap
msgid "--in-commit-order"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
msgid ""
"Print tree and blob ids in order of the commits. The tree and blob ids are "
"printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, no-wrap
msgid "--objects-edge"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
msgid ""
"Similar to `--objects`, but also print the IDs of excluded commits prefixed "
"with a ``-'' character. This is used by linkgit:git-pack-objects[1] to "
@@ -71363,13 +71390,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, no-wrap
msgid "--objects-edge-aggressive"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
msgid ""
"Similar to `--objects-edge`, but it tries harder to find excluded commits at "
"the cost of increased time. This is used instead of `--objects-edge` to "
@@ -71377,44 +71404,44 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, no-wrap
msgid "--indexed-objects"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
msgid ""
"Pretend as if all trees and blobs used by the index are listed on the "
"command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, no-wrap
msgid "--object-names"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
msgid ""
"Only useful with `--objects`; print the names of the object IDs that are "
"found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, no-wrap
msgid "--no-object-names"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
msgid ""
"Only useful with `--objects`; does not print the names of the object IDs "
"that are found. This inverts `--object-names`. This flag allows the output "
@@ -71422,7 +71449,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
msgid ""
"Only useful with one of the `--objects*`; omits objects (usually blobs) from "
"the list of printed objects. The '<filter-spec>' may be one of the "
@@ -71430,12 +71457,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
msgid ""
"The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or "
"units. n may be zero. The suffixes k, m, and g can be used to name units "
@@ -71444,7 +71471,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
msgid ""
"The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout "
"specification contained in the blob (or blob-expression) '<blob-ish>' to "
@@ -71453,7 +71480,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
msgid ""
"The form '--filter=tree:<depth>' omits all blobs and trees whose depth from "
"the root tree is >= <depth> (minimum depth if an object is located at "
@@ -71467,21 +71494,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
msgid ""
"Note that the form '--filter=sparse:path=<path>' that wants to read from an "
"arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
msgid ""
"Multiple '--filter=' flags can be specified to combine filters. Only objects "
"which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
msgid ""
"The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be "
"used to combined several filters, but this is harder than just repeating the "
@@ -71493,7 +71520,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
msgid ""
"Other arbitrary characters can also be encoded. For instance, "
"'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are "
@@ -71501,32 +71528,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, no-wrap
msgid "--filter-print-omitted"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
msgid ""
"Only useful with `--filter=`; prints a list of the objects omitted by the "
"filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
msgid ""
"The form '--missing=error' requests that rev-list stop with an error if a "
"missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
msgid ""
"The form '--missing=allow-promisor' is like 'allow-any', but will only allow "
"object traversal to continue for EXPECTED promisor missing objects. "
@@ -71534,14 +71561,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
msgid ""
"The form '--missing=print' is like 'allow-any', but will also print a list "
"of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
msgid ""
"(For internal use only.) Prefilter object traversal at promisor boundary. "
"This is used with partial clone. This is stronger than "
@@ -71550,13 +71577,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
msgid ""
"Only show the given commits, but do not traverse their ancestors. This has "
"no effect if a range is specified. If the argument `unsorted` is given, the "
@@ -71567,24 +71594,24 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, no-wrap
msgid "--do-walk"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
msgid ""
"Using these options, linkgit:git-rev-list[1] will act similar to the more "
"specialized family of commit log tools: linkgit:git-log[1], "
@@ -71592,24 +71619,24 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, no-wrap
msgid "--relative-date"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
msgid ""
"Only takes effect for dates shown in human-readable format, such as when "
"using `--pretty`. `log.date` config variable sets a default value for the "
@@ -71619,62 +71646,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
msgid ""
"`--date=relative` shows dates relative to the current time, e.g. ``2 hours "
"ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
msgid ""
"`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like "
"format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
msgid ""
"`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict "
"ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
msgid ""
"`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, "
"often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
msgid ""
"`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` "
"format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
msgid ""
"`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 "
"UTC), followed by a space, and then the timezone as an offset from UTC (a "
@@ -71686,7 +71713,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
msgid ""
"`--date=human` shows the timezone if the timezone does not match the current "
"time-zone, and doesn't print the whole date if that matches (ie skip "
@@ -71696,7 +71723,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
msgid ""
"`--date=unix` shows the date as a Unix epoch timestamp (seconds since "
"1970). As with `--raw`, this is always in UTC and therefore `-local` has no "
@@ -71704,7 +71731,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
msgid ""
"`--date=format:...` feeds the format `...` to your system `strftime`, except "
"for %z and %Z, which are handled internally. Use `--date=format:%c` to show "
@@ -71714,74 +71741,74 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
msgid ""
"`--date=default` is the default format, and is similar to `--date=rfc2822`, "
"with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, no-wrap
msgid "--header"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
msgid ""
"Print the contents of the commit in raw-format; each record is separated "
"with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
msgid ""
"Print also the parents of the commit (in the form \"commit parent...\"). "
"Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, no-wrap
msgid "--children"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
msgid ""
"Print also the children of the commit (in the form \"commit child...\"). "
"Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, no-wrap
msgid "--timestamp"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, no-wrap
msgid "--left-right"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
msgid ""
"Mark which side of a symmetric difference a commit is reachable from. "
"Commits from the left side are prefixed with `<` and those from the right "
@@ -71790,12 +71817,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap
msgid ""
"\t y---b---b branch B\n"
@@ -71806,18 +71833,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, no-wrap
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, no-wrap
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -71829,13 +71856,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, no-wrap
msgid "--graph"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
msgid ""
"Draw a text-based graphical representation of the commit history on the left "
"hand side of the output. This may cause extra lines to be printed in "
@@ -71844,25 +71871,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
msgid ""
"This implies the `--topo-order` option by default, but the `--date-order` "
"option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
msgid ""
"When --graph is not used, all history branches are flattened which can make "
"it hard to see that the two consecutive commits do not belong to a linear "
@@ -71872,7 +71899,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
msgid ""
"Print a number stating how many commits would have been listed, and suppress "
"all other output. When used together with `--left-right`, instead print the "
@@ -71882,13 +71909,13 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
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 "
@@ -71896,7 +71923,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
msgid ""
"With this option, diff output for a merge commit shows the differences from "
"each of the parents to the merge result simultaneously instead of showing "
@@ -71905,7 +71932,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
msgid ""
"This flag implies the `-c` option and further compresses the patch output by "
"omitting uninteresting hunks whose contents in the parents have only two "
@@ -71913,7 +71940,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
msgid ""
"This flag makes the merge commits show the full diff like regular commits; "
"for each merge parent, a separate log entry and diff is generated. An "
@@ -71923,12 +71950,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 4946c72..3de4918 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2020-05-31 14:41+0000\n"
"Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
"Language-Team: none\n"
@@ -26,9 +26,7 @@ msgstr "-b"
#: en/blame-options.txt:4
#, priority:100
msgid "Show blank SHA-1 for boundary commits. This can also be controlled via the `blame.blankboundary` config option."
-msgstr ""
-"Exiba o SHA-1 em branco para os commits limite. Tamb챕m pode ser controlado "
-"atrav챕s da op챌찾o da configura챌찾o `blame.blankboundary`."
+msgstr "Exiba o SHA-1 em branco para os commits limite. Tamb챕m pode ser controlado atrav챕s da op챌찾o da configura챌찾o `blame.blankboundary`."
#. type: Labeled list
#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:351 en/git-fsck.txt:38 en/git-rebase.txt:560
@@ -40,9 +38,7 @@ msgstr "--root"
#: en/blame-options.txt:8
#, priority:100
msgid "Do not treat root commits as boundaries. This can also be controlled via the `blame.showRoot` config option."
-msgstr ""
-"N찾o trate os commits raiz como limitadores. Tamb챕m pode ser controlado "
-"atrav챕s da op챌찾o da configura챌찾o `blame.showRoot`."
+msgstr "N찾o trate os commits raiz como limitadores. Tamb챕m pode ser controlado atrav챕s da op챌찾o da configura챌찾o `blame.showRoot`."
#. type: Labeled list
#: en/blame-options.txt:9
@@ -72,18 +68,13 @@ msgstr "-L :<funcname>"
#: en/blame-options.txt:16
#, priority:100
msgid "Annotate only the given line range. May be specified multiple times. Overlapping ranges are allowed."
-msgstr ""
-"Anote apenas o intervalo das linhas informadas. Pode ser utilizado mais de "
-"uma vez. As varia챌천es sobrepostas s찾o permitidas."
+msgstr "Anote apenas o intervalo das linhas informadas. Pode ser utilizado mais de uma vez. As varia챌천es sobrepostas s찾o permitidas."
#. type: Plain text
#: en/blame-options.txt:19
#, priority:100
msgid "<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from <start> to end of file. ``-L ,<end>'' spans from start of file to <end>."
-msgstr ""
-"<inicio> e <fim> s찾o opcionais. ``-L <inicio>'' ou ``-L <inicio>,'' abrange "
-"do <inicio> para o final do arquivo. ``-L ,<fim>'' abrange do come챌o ao "
-"<fim>."
+msgstr "<inicio> e <fim> s찾o opcionais. ``-L <inicio>'' ou ``-L <inicio>,'' abrange do <inicio> para o final do arquivo. ``-L ,<fim>'' abrange do come챌o ao <fim>."
#. type: Labeled list
#: en/blame-options.txt:22 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:197 en/git-clone.txt:45 en/git-config.txt:164 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
@@ -98,7 +89,7 @@ msgid "Show long rev (Default: off)."
msgstr "Exibe o rev longo (Predefini챌찾o: desligado)."
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -107,8 +98,7 @@ msgstr "-t"
#: en/blame-options.txt:27
#, priority:100
msgid "Show raw timestamp (Default: off)."
-msgstr ""
-"Exibe o registro de data e hora em formato bruto (predefini챌찾o: desligado)."
+msgstr "Exibe o registro de data e hora em formato bruto (predefini챌찾o: desligado)."
#. type: Labeled list
#: en/blame-options.txt:28
@@ -120,9 +110,7 @@ msgstr "-S <revs-file>"
#: en/blame-options.txt:30
#, priority:100
msgid "Use revisions from revs-file instead of calling linkgit:git-rev-list[1]."
-msgstr ""
-"Utilize as revis천es do arquivo-revs no lugar de chamar linkgit:git-rev-"
-"list[1]."
+msgstr "Utilize as revis천es do arquivo-revs no lugar de chamar linkgit:git-rev-list[1]."
#. type: Labeled list
#: en/blame-options.txt:31
@@ -134,12 +122,7 @@ msgstr "--reverse <rev>..<rev>"
#: en/blame-options.txt:38
#, priority:100
msgid "Walk history forward instead of backward. Instead of showing the revision in which a line appeared, this shows the last revision in which a line has existed. This requires a range of revision like START..END where the path to blame exists in START. `git blame --reverse START` is taken as `git blame --reverse START..HEAD` for convenience."
-msgstr ""
-"Avance a hist처ria adiante em vez de retroceder. Em vez de exibir a revis찾o "
-"onde a linha apareceu, exibe a 첬ltima revis찾o na qual a linha j찼 existiu. 횋 "
-"necess찼rio um intervalo de revis천es como START..END (INICIO..FIM) onde o "
-"caminho reclamado exista em START. Por mera conveni챗ncia, o comando `git "
-"blame --reverse START` 챕 atalho para `git blame --reverse START..HEAD`."
+msgstr "Avance a hist처ria adiante em vez de retroceder. Em vez de exibir a revis찾o onde a linha apareceu, exibe a 첬ltima revis찾o na qual a linha j찼 existiu. 횋 necess찼rio um intervalo de revis천es como START..END (INICIO..FIM) onde o caminho reclamado exista em START. Por mera conveni챗ncia, o comando `git blame --reverse START` 챕 atalho para `git blame --reverse START..HEAD`."
#. type: Labeled list
#: en/blame-options.txt:39 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:98 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:267 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41 en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:522 en/git-request-pull.txt:29 en/git-restore.txt:44 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
@@ -169,10 +152,7 @@ msgstr "--line-porcelain"
#: en/blame-options.txt:47
#, priority:100
msgid "Show the porcelain format, but output commit information for each line, not just the first time a commit is referenced. Implies --porcelain."
-msgstr ""
-"Exiba o formato porcelana, por챕m envie informa챌천es do commit na sa챠da para "
-"cada linha e n찾o apenas na primeira vez que um commit tiver uma refer챗ncia. "
-"Implica no uso da op챌찾o --porcelain."
+msgstr "Exiba o formato porcelana, por챕m envie informa챌천es do commit na sa챠da para cada linha e n찾o apenas na primeira vez que um commit tiver uma refer챗ncia. Implica no uso da op챌찾o --porcelain."
#. type: Labeled list
#: en/blame-options.txt:48 en/git-pack-objects.txt:138 en/git-svn.txt:373
@@ -184,9 +164,7 @@ msgstr "--incremental"
#: en/blame-options.txt:51
#, priority:100
msgid "Show the result incrementally in a format designed for machine consumption."
-msgstr ""
-"Exiba o resultado incrementadamente em um formado designado para o consumo "
-"de uma m찼quina."
+msgstr "Exiba o resultado incrementadamente em um formado designado para o consumo de uma m찼quina."
#. type: Labeled list
#: en/blame-options.txt:52 en/git-mailinfo.txt:62 en/pretty-options.txt:35
@@ -198,11 +176,7 @@ 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 ""
-"Defina a codifica챌찾o a ser utilizada para gerar os nomes dos autores e do "
-"resumo dos commits. Definindo como `none` torna a sa챠da \"blame\" em dados "
-"sem convers찾o. Para mais informa챌천es, consulte a discuss찾o sobre codifica챌찾o "
-"na p찼gina de manual linkgit:git-log[1]."
+msgstr "Defina a codifica챌찾o a ser utilizada para gerar os nomes dos autores e do resumo dos commits. Definindo como `none` torna a sa챠da \"blame\" em dados sem convers찾o. Para mais informa챌천es, consulte a discuss찾o sobre codifica챌찾o na p찼gina de manual linkgit:git-log[1]."
#. type: Labeled list
#: en/blame-options.txt:59
@@ -214,12 +188,7 @@ msgstr "--contents <arquivo>"
#: en/blame-options.txt:65
#, priority:100
msgid "When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy. This flag makes the command pretend as if the working tree copy has the contents of the named file (specify `-` to make the command read from the standard input)."
-msgstr ""
-"Quando <rev> n찾o for definido, o comando anotar찼 as altera챌천es iniciando em "
-"sentido contr찼rio na c처pia da 찼rvore de trabalho. Essa flag faz com que o "
-"comando pare챌a estar trabalhando na c처pia da 찼rvore de trabalho que tenha os "
-"conte첬dos informados do arquivo (especifique `-` para que o comando leia 횪 "
-"partir da entrada predefinida)."
+msgstr "Quando <rev> n찾o for definido, o comando anotar찼 as altera챌천es iniciando em sentido contr찼rio na c처pia da 찼rvore de trabalho. Essa flag faz com que o comando pare챌a estar trabalhando na c처pia da 찼rvore de trabalho que tenha os conte첬dos informados do arquivo (especifique `-` para que o comando leia 횪 partir da entrada predefinida)."
#. type: Labeled list
#: en/blame-options.txt:66
@@ -231,12 +200,7 @@ 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 utilizado para gerar as datas. Caso --date n찾o seja "
-"utilizado, o valor da vari찼vel da configura챌찾o `blame.date` ser찼 utilizado. "
-"Caso a vari찼vel da configura챌찾o `blame.date` tamb챕m n찾o esteja definida, o "
-"formato ISO ser찼 utilizado. Para ver quais s찾o os valores compat챠veis, "
-"consulte a discuss찾o da op챌찾o `--date` em linkgit:git-log[1]."
+msgstr "Especifica o formato utilizado para gerar as datas. Caso --date n찾o seja utilizado, o valor da vari찼vel da configura챌찾o `blame.date` ser찼 utilizado. Caso a vari찼vel da configura챌찾o `blame.date` tamb챕m n찾o esteja definida, o formato ISO ser찼 utilizado. Para ver quais s찾o os valores compat챠veis, consulte 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
@@ -248,12 +212,7 @@ 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 ""
-"횋 predefinido que a condi챌찾o do progresso seja relatado no fluxo de erros "
-"padr찾o quando estiver conectado em um terminal. Essa flag permite que os "
-"relat처rios de progresso sejam feitos ainda que n찾o estejam conectados em um "
-"terminal. N찾o 챕 poss챠vel usar `--progress` junto com `--porcelain` ou "
-"`--incremental`."
+msgstr "횋 predefinido que a condi챌찾o do progresso seja relatado no fluxo de erros padr찾o quando estiver conectado em um terminal. Essa flag permite que os relat처rios de progresso sejam feitos ainda que n찾o estejam conectados em um terminal. N찾o 챕 poss챠vel usar `--progress` junto com `--porcelain` ou `--incremental`."
#. type: Labeled list
#: en/blame-options.txt:80
@@ -265,25 +224,13 @@ msgstr "-M[<num>]"
#: en/blame-options.txt:90
#, priority:100
msgid "Detect moved or copied lines within a file. When a commit moves or copies a block of lines (e.g. the original file has A and then B, and the commit changes it to B and then A), the traditional 'blame' algorithm notices only half of the movement and typically blames the lines that were moved up (i.e. B) to the parent and assigns blame to the lines that were moved down (i.e. A) to the child commit. With this option, both groups of lines are blamed on the parent by running extra passes of inspection."
-msgstr ""
-"Detecte as linhas movidas ou copiadas em um arquivo. Quando um commit move "
-"ou copia um bloco de linhas (o arquivo original possui A e, em seguida, B, e "
-"o commit muda para B e, em seguida, A por exemplo), o algoritmo tradicional "
-"de 'blame' percebe apenas metade do movimento e normalmente responsabiliza "
-"as linhas que forem movidos para cima (ou seja, B) para a origem e atribuem "
-"a responsabilidade 횪s linhas que foram movidas para baixo (ou seja, A) para "
-"o herdeiro do commit. Com esta op챌찾o, os dois grupos das linhas s찾o "
-"atribu챠dos 횪 origem durante a execu챌찾o dos passes extras de inspe챌찾o."
+msgstr "Detecte as linhas movidas ou copiadas em um arquivo. Quando um commit move ou copia um bloco de linhas (o arquivo original possui A e, em seguida, B, e o commit muda para B e, em seguida, A por exemplo), o algoritmo tradicional de 'blame' percebe apenas metade do movimento e normalmente responsabiliza as linhas que forem movidos para cima (ou seja, B) para a origem e atribuem a responsabilidade 횪s linhas que foram movidas para baixo (ou seja, A) para o herdeiro do commit. Com esta op챌찾o, os dois grupos das linhas s찾o atribu챠dos 횪 origem durante a execu챌찾o dos passes extras de inspe챌찾o."
#. type: Plain text
#: en/blame-options.txt:95
#, priority:100
msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying within a file for it to associate those lines with the parent commit. The default value is 20."
-msgstr ""
-"A op챌찾o `<num>` 챕 opcional por챕m 챕 o limite inferior da quantidade de "
-"caracteres alfanum챕ricos que o Git deve detectar como mover/copiar dentro de "
-"um arquivo para associar essas linhas ao commit de origem. 20 챕 o valor "
-"predefinido."
+msgstr "A op챌찾o `<num>` 챕 opcional por챕m 챕 o limite inferior da quantidade de caracteres alfanum챕ricos que o Git deve detectar como mover/copiar dentro de um arquivo para associar essas linhas ao commit de origem. 20 챕 o valor predefinido."
#. type: Labeled list
#: en/blame-options.txt:96
@@ -295,25 +242,13 @@ msgstr "-C[<num>]"
#: en/blame-options.txt:105
#, priority:100
msgid "In addition to `-M`, detect lines moved or copied from other files that were modified in the same commit. This is useful when you reorganize your program and move code around across files. When this option is given twice, the command additionally looks for copies from other files in the commit that creates the file. When this option is given three times, the command additionally looks for copies from other files in any commit."
-msgstr ""
-"Al챕m de `-M`, detecte as linhas movidas ou copiadas de outros arquivos que "
-"foram alterados no mesmo commit. 횋 첬til ao reorganizar o seu programa e "
-"move o c처digo atrav챕s dos arquivos. Quando essa op챌찾o 챕 utilizada duas "
-"vezes, o comando procura adicionalmente c처pias dos outros arquivos no commit "
-"que cria o arquivo. Quando essa op챌찾o 챕 utilizada tr챗s vezes, o comando "
-"procura adicionalmente por c처pias dos outros arquivos em qualquer outro "
-"commit."
+msgstr "Al챕m de `-M`, detecte as linhas movidas ou copiadas de outros arquivos que foram alterados no mesmo commit. 횋 첬til ao reorganizar o seu programa e move o c처digo atrav챕s dos arquivos. Quando essa op챌찾o 챕 utilizada duas vezes, o comando procura adicionalmente c처pias dos outros arquivos no commit que cria o arquivo. Quando essa op챌찾o 챕 utilizada tr챗s vezes, o comando procura adicionalmente por c처pias dos outros arquivos em qualquer outro commit."
#. type: Plain text
#: en/blame-options.txt:112
#, priority:100
msgid "<num> is optional but it is the lower bound on the number of alphanumeric characters that Git must detect as moving/copying between files for it to associate those lines with the parent commit. And the default value is 40. If there are more than one `-C` options given, the <num> argument of the last `-C` will take effect."
-msgstr ""
-"A op챌찾o `<num>` 챕 opcional por챕m 챕 o limite inferior da quantidade de "
-"caracteres alfanum챕ricos que o Git deve detectar como mover/copiar entre os "
-"arquivos para associar estas linhas ao commit de origem. 40 챕 o valor "
-"predefinido. Caso haja mais de uma op챌찾o `-C`, o argumento <num> do 첬ltimo "
-"`-C` entrar찼 em vigor."
+msgstr "A op챌찾o `<num>` 챕 opcional por챕m 챕 o limite inferior da quantidade de caracteres alfanum챕ricos que o Git deve detectar como mover/copiar entre os arquivos para associar estas linhas ao commit de origem. 40 챕 o valor predefinido. Caso haja mais de uma op챌찾o `-C`, o argumento <num> do 첬ltimo `-C` entrar찼 em vigor."
#. type: Labeled list
#: en/blame-options.txt:113
@@ -325,17 +260,7 @@ msgstr "--ignore-rev <rev>"
#: en/blame-options.txt:124
#, priority:100
msgid "Ignore changes made by the revision when assigning blame, as if the change never happened. Lines that were changed or added by an ignored commit will be blamed on the previous commit that changed that line or nearby lines. This option may be specified multiple times to ignore more than one revision. If the `blame.markIgnoredLines` config option is set, then lines that were changed by an ignored commit and attributed to another commit will be marked with a `?` in the blame output. If the `blame.markUnblamableLines` config option is set, then those lines touched by an ignored commit that we could not attribute to another revision are marked with a '*'."
-msgstr ""
-"Ignore as altera챌천es feitas pela revis찾o assumindo a responsabilidade como "
-"se a mudan챌a nunca tivesse acontecido. As linhas que foram alteradas ou "
-"adicionadas atrav챕s de um commit ignorado ser찾o responsabilizados pelo "
-"commit anterior que alterou esta linha ou as pr처ximas. Esta op챌찾o pode ser "
-"utilizada v찼rias vezes para ignorar mais de uma revis찾o. Caso a op챌찾o da "
-"configura챌찾o `blame.markIgnoredLines` estiver definida, as linhas que forem "
-"alteradas por um commit ignorado e atribu챠das a outro commit, ser찾o marcados "
-"com um`?`. Caso a op챌찾o da configura챌찾o `blame.markUnblamableLines` estiver "
-"definida, as linhas tocadas por um commit ignorado onde n찾o foi poss챠vel "
-"atribuir uma outra revis찾o, ser찾o marcadas com um '*'."
+msgstr "Ignore as altera챌천es feitas pela revis찾o assumindo a responsabilidade como se a mudan챌a nunca tivesse acontecido. As linhas que foram alteradas ou adicionadas atrav챕s de um commit ignorado ser찾o responsabilizados pelo commit anterior que alterou esta linha ou as pr처ximas. Esta op챌찾o pode ser utilizada v찼rias vezes para ignorar mais de uma revis찾o. Caso a op챌찾o da configura챌찾o `blame.markIgnoredLines` estiver definida, as linhas que forem alteradas por um commit ignorado e atribu챠das a outro commit, ser찾o marcados com um`?`. Caso a op챌찾o da configura챌찾o `blame.markUnblamableLines` estiver definida, as linhas tocadas por um commit ignorado onde n찾o foi poss챠vel atribuir uma outra revis찾o, ser찾o marcadas com um '*'."
#. type: Labeled list
#: en/blame-options.txt:125
@@ -347,12 +272,7 @@ msgstr "--ignore-revs-file <arquivo>"
#: en/blame-options.txt:131
#, priority:100
msgid "Ignore revisions listed in `file`, which must be in the same format as an `fsck.skipList`. This option may be repeated, and these files will be processed after any files specified with the `blame.ignoreRevsFile` config option. An empty file name, `\"\"`, will clear the list of revs from previously processed files."
-msgstr ""
-"Ignore as revis천es listadas no `arquivo` que deve estar no mesmo formato que "
-"um `fsck.skipList`. Esta op챌찾o pode ser repetida, estes arquivos ser찾o "
-"processados ap처s qualquer outro arquivo definido com a op챌찾o da configura챌찾o "
-"`blame.ignoreRevsFile`. Um nome vazio de arquivo, `\"\"` limpar찼 a lista de "
-"rota챌천es dos arquivos processados anteriormente."
+msgstr "Ignore as revis천es listadas no `arquivo` que deve estar no mesmo formato que um `fsck.skipList`. Esta op챌찾o pode ser repetida, estes arquivos ser찾o processados ap처s qualquer outro arquivo definido com a op챌찾o da configura챌찾o `blame.ignoreRevsFile`. Um nome vazio de arquivo, `\"\"` limpar찼 a lista de rota챌천es dos arquivos processados anteriormente."
#. type: Labeled list
#: en/blame-options.txt:132 en/git-archimport.txt:71 en/git-cvsimport.txt:184 en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
@@ -388,151 +308,161 @@ msgstr "linkgit:git-blame[1]"
#: en/cmds-ancillaryinterrogators.txt:6
#, priority:100
msgid "Show what revision and author last modified each line of a file."
-msgstr ""
-"Exibe quais foram as 첬ltimas modifica챌천es feitas em cada linha de um arquivo "
-"separados pela vers찾o da revis찾o e do autor da modifica챌찾o."
+msgstr "Exibe quais foram as 첬ltimas modifica챌천es feitas em cada linha de um arquivo separados pela vers찾o da revis찾o e do autor da modifica챌찾o."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, fuzzy, priority:100
+#| msgid "git-bugreport - Collect information for user to file a bug report"
+msgid "Collect information for user to file a bug report."
+msgstr "git-bugreport - Colete informa챌천es para que o usu찼rio arquive um relat처rio de erro"
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr "Conta a quantidade de objetos n찾o empacotados e seu consumo de disco."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr "Exibe as mudan챌as utilizando ferramentas diff tradicionais."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr "Verifica a conectividade e validade dos objetos em um banco de dados."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr "Exiba a informa챌찾o de ajuda sobre o Git."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr "Navegue instantaneamente no seu reposit처rio de trabalho com o gitweb."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr "Exiba as tr챗s maneiras de mesclagem sem mexer no 챠ndice."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr "Reutilize uma resolu챌찾o gravada das mesclagens conflitantes."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr "Exiba os ramos e seus respectivos commits."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr "Verifique a assinatura GPG dos commits."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr "Verifique a assinatura GPG das tags."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
-msgstr ""
-"Exiba os registros logs com a diferen챌a entre a introdu챌찾o de cada commit."
+msgstr "Exiba os registros logs com a diferen챌a entre a introdu챌찾o de cada commit."
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr "Interface web do Git (frontend web para os reposit처rios Git)."
@@ -595,9 +525,7 @@ 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 problemas para resolver os conflitos de "
-"mesclagem."
+msgstr "Executa as ferramentas de resolu챌찾o problemas para resolver os conflitos de mesclagem."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
@@ -609,8 +537,7 @@ msgstr "linkgit:git-pack-refs[1]"
#: en/cmds-ancillarymanipulators.txt:18
#, priority:100
msgid "Pack heads and tags for efficient repository access."
-msgstr ""
-"Empacota os cabe챌alhos e as tags para um acesso eficiente ao reposit처rio."
+msgstr "Empacota os cabe챌alhos e as tags para um acesso eficiente ao reposit처rio."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
@@ -706,8 +633,7 @@ msgstr "linkgit:git-cvsimport[1]"
#: en/cmds-foreignscminterface.txt:9
#, priority:100
msgid "Salvage your data out of another SCM people love to hate."
-msgstr ""
-"Recupera os seus dados vindos de outros SCM que as pessoas adoram odiar."
+msgstr "Recupera os seus dados vindos de outros SCM que as pessoas adoram odiar."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
@@ -731,8 +657,7 @@ msgstr "linkgit:git-imap-send[1]"
#: en/cmds-foreignscminterface.txt:15
#, priority:100
msgid "Send a collection of patches from stdin to an IMAP folder."
-msgstr ""
-"Envia uma cole챌찾o de patches da entrada predefinida para um diret처rio IMAP."
+msgstr "Envia uma cole챌찾o de patches da entrada predefinida para um diret처rio IMAP."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:16
@@ -840,8 +765,7 @@ msgstr "linkgit:git-bisect[1]"
#: en/cmds-mainporcelain.txt:12
#, priority:100
msgid "Use binary search to find the commit that introduced a bug."
-msgstr ""
-"utilize a procura bin찼ria para localizar o commit que introduziu um bug."
+msgstr "utilize a procura bin찼ria para localizar o commit que introduziu um bug."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
@@ -949,9 +873,7 @@ msgstr "linkgit:git-describe[1]"
#: en/cmds-mainporcelain.txt:39
#, priority:100
msgid "Give an object a human readable name based on an available ref."
-msgstr ""
-"D찼 a um objeto um nome em um formato leg챠vel para humanos com base em um "
-"\"ref\" dispon챠vel."
+msgstr "D찼 a um objeto um nome em um formato leg챠vel para humanos com base em um \"ref\" dispon챠vel."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:138
@@ -963,8 +885,7 @@ msgstr "linkgit:git-diff[1]"
#: en/cmds-mainporcelain.txt:42
#, priority:100
msgid "Show changes between commits, commit and working tree, etc."
-msgstr ""
-"Exiba as altera챌천es entre os commits, o commit, 찼rvore de trabalho, etc."
+msgstr "Exiba as altera챌천es entre os commits, o commit, 찼rvore de trabalho, etc."
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
@@ -1036,9 +957,7 @@ msgstr "linkgit:git-init[1]"
#: en/cmds-mainporcelain.txt:60
#, priority:100
msgid "Create an empty Git repository or reinitialize an existing one."
-msgstr ""
-"Cria um reposit처rio vazio para o Git ou reinicializa um reposit처rio j찼 "
-"existente."
+msgstr "Cria um reposit처rio vazio para o Git ou reinicializa um reposit처rio j찼 existente."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
@@ -1098,8 +1017,7 @@ msgstr "linkgit:git-pull[1]"
#: en/cmds-mainporcelain.txt:75
#, priority:100
msgid "Fetch from and integrate with another repository or a local branch."
-msgstr ""
-"Capture de e o integre com um outro reposit처rio ou em um outro ramo local."
+msgstr "Capture de e o integre com um outro reposit처rio ou em um outro ramo local."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
@@ -1123,9 +1041,7 @@ msgstr "linkgit:git-range-diff[1]"
#: en/cmds-mainporcelain.txt:81
#, priority:100
msgid "Compare two commit ranges (e.g. two versions of a branch)."
-msgstr ""
-"Compara os dois intervalos de um commit (duas vers천es de um ramo por "
-"exemplo)."
+msgstr "Compara os dois intervalos de um commit (duas vers천es de um ramo por exemplo)."
#. type: Plain text
#: en/cmds-mainporcelain.txt:82 en/git-svn.txt:1172
@@ -1214,83 +1130,95 @@ msgstr "Exiba os v찼rios tipos de objetos."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr "Armazene as altera챌천es em um diret처rio fora do diret처rio de trabalho."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr "Exiba a condi챌찾o atual da 찼rvore de trabalho."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr "Inicializa, atualiza ou inspeciona subm처dulos."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Switch branches."
msgstr "Alterna entre os ramos."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr "Cria, lista, exclui ou verifica uma tag do objeto com assinatura GPG."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr "Manipula as diversas 찼rvores de trabalho."
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr "O navegador do reposit처rio Git."
@@ -1305,9 +1233,7 @@ msgstr "linkgit:git-cat-file[1]"
#: en/cmds-plumbinginterrogators.txt:3
#, priority:100
msgid "Provide content or type and size information for repository objects."
-msgstr ""
-"Proporciona o conte첬do, o tipo e a informa챌찾o sobre o tamanho dos objetos no "
-"reposit처rio."
+msgstr "Proporciona o conte첬do, o tipo e a informa챌찾o sobre o tamanho dos objetos no reposit처rio."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
@@ -1355,9 +1281,7 @@ msgstr "linkgit:git-diff-tree[1]"
#: en/cmds-plumbinginterrogators.txt:15
#, priority:100
msgid "Compares the content and mode of blobs found via two tree objects."
-msgstr ""
-"Compara o conte첬do e o modo das bolhas encontrados atrav챕s de dois objetos "
-"da 찼rvore."
+msgstr "Compara o conte첬do e o modo das bolhas encontrados atrav챕s de dois objetos da 찼rvore."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
@@ -1597,8 +1521,7 @@ msgstr "linkgit:git-hash-object[1]"
#: en/cmds-plumbingmanipulators.txt:15
#, priority:100
msgid "Compute object ID and optionally creates a blob from a file."
-msgstr ""
-"Calcula o ID do objeto e opcionalmente cria uma bolha vinda de um arquivo."
+msgstr "Calcula o ID do objeto e opcionalmente cria uma bolha vinda de um arquivo."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
@@ -1610,8 +1533,7 @@ msgstr "linkgit:git-index-pack[1]"
#: en/cmds-plumbingmanipulators.txt:18
#, priority:100
msgid "Build pack index file for an existing packed archive."
-msgstr ""
-"Constr처i um pacote 챠ndice do arquivo para um arquivo de pacote j찼 existente."
+msgstr "Constr처i um pacote 챠ndice do arquivo para um arquivo de pacote j찼 existente."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
@@ -1695,8 +1617,7 @@ msgstr "linkgit:git-prune-packed[1]"
#: en/cmds-plumbingmanipulators.txt:39
#, priority:100
msgid "Remove extra objects that are already in pack files."
-msgstr ""
-"Remove os objetos extras que estejam atualmente nos arquivos empacotados."
+msgstr "Remove os objetos extras que estejam atualmente nos arquivos empacotados."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
@@ -1888,8 +1809,7 @@ msgstr "linkgit:git-interpret-trailers[1]"
#: en/cmds-purehelpers.txt:30
#, priority:100
msgid "Add or parse structured information in commit messages."
-msgstr ""
-"Adiciona ou analisa as informa챌천es estruturadas nas mensagens do commit."
+msgstr "Adiciona ou analisa as informa챌천es estruturadas nas mensagens do commit."
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
@@ -1925,8 +1845,7 @@ msgstr "linkgit:git-merge-one-file[1]"
#: en/cmds-purehelpers.txt:39
#, priority:100
msgid "The standard helper program to use with git-merge-index."
-msgstr ""
-"O programa assistente predefinido de ajuda para usar com o `git-merge-index`."
+msgstr "O programa assistente predefinido de ajuda para usar com o `git-merge-index`."
#. type: Plain text
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
@@ -1998,8 +1917,7 @@ msgstr "linkgit:git-http-push[1]"
#: en/cmds-synchelpers.txt:6
#, priority:100
msgid "Push objects over HTTP/DAV to another repository."
-msgstr ""
-"Impulsiona (push) os objetos atrav챕s do HTTP/DAV para um outro reposit처rio."
+msgstr "Impulsiona (push) os objetos atrav챕s do HTTP/DAV para um outro reposit처rio."
#. type: Labeled list
#: en/cmds-synchelpers.txt:7
@@ -2011,9 +1929,7 @@ msgstr "linkgit:git-parse-remote[1]"
#: en/cmds-synchelpers.txt:9
#, priority:100
msgid "Routines to help parsing remote repository access parameters."
-msgstr ""
-"Rotinas para auxiliar na analise dos par창metros de acesso ao reposit처rio "
-"remoto."
+msgstr "Rotinas para auxiliar na analise dos par창metros de acesso ao reposit처rio remoto."
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
@@ -2121,9 +2037,7 @@ msgstr "linkgit:git-update-server-info[1]"
#: en/cmds-synchingrepositories.txt:15
#, priority:100
msgid "Update auxiliary info file to help dumb servers."
-msgstr ""
-"Atualiza a informa챌찾o auxiliar sobre o arquivo para ajudar os servidores "
-"burros."
+msgstr "Atualiza a informa챌찾o auxiliar sobre o arquivo para ajudar os servidores burros."
#. type: Title -
#: en/config.txt:2 en/git-worktree.txt:237
@@ -2135,29 +2049,13 @@ msgstr "ARQUIVO DE CONFIGURA횉횄O"
#: en/config.txt:12
#, priority:100
msgid "The Git configuration file contains a number of variables that affect the Git commands' behavior. The files `.git/config` and optionally `config.worktree` (see the \"CONFIGURATION FILE\" section of linkgit:git-worktree[1]) in each repository are used to store the configuration for that repository, and `$HOME/.gitconfig` is used to store a per-user configuration as fallback values for the `.git/config` file. The file `/etc/gitconfig` can be used to store a system-wide default configuration."
-msgstr ""
-"O arquivo de configura챌찾o do Git cont챕m v찼rias vari찼veis que afetam o "
-"comportamento dos comandos do Git. Os arquivos `.git/config` e opcionalmente "
-"`config.worktree` (consulte a se챌찾o \"ARQUIVO DE CONFIGURA횉횄O\" do linkgit"
-":git-worktree[1]) em cada reposit처rio s찾o utilizados para armazenar a "
-"configura챌찾o para aquele reposit처rio e o `$HOME/.gitconfig` 챕 utilizado para "
-"armazenar uma configura챌찾o por usu찼rio como valores alternativos para o "
-"arquivo `.git/config`. O arquivo `/etc/gitconfig` pode ser utilizado para "
-"armazenar a predefini챌찾o de uma configura챌찾o em todo o sistema."
+msgstr "O arquivo de configura챌찾o do Git cont챕m v찼rias vari찼veis que afetam o comportamento dos comandos do Git. Os arquivos `.git/config` e opcionalmente `config.worktree` (consulte a se챌찾o \"ARQUIVO DE CONFIGURA횉횄O\" do linkgit:git-worktree[1]) em cada reposit처rio s찾o utilizados para armazenar a configura챌찾o para aquele reposit처rio e o `$HOME/.gitconfig` 챕 utilizado para armazenar uma configura챌찾o por usu찼rio como valores alternativos para o arquivo `.git/config`. O arquivo `/etc/gitconfig` pode ser utilizado para armazenar a predefini챌찾o de uma configura챌찾o em todo o sistema."
#. type: Plain text
#: en/config.txt:21
#, priority:100
msgid "The configuration variables are used by both the Git plumbing and the porcelains. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot-separated segment and the section name is everything before the last dot. The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character. Some variables may appear multiple times; we say then that the variable is multivalued."
-msgstr ""
-"As vari찼veis de configura챌찾o s찾o utilizadas pelo encanamento Git e pelas "
-"porcelanas. As vari찼veis s찾o divididas em se챌천es em que o nome completo da "
-"vari찼vel da vari찼vel em si 챕 o 첬ltimo segmento separado por ponto e o nome "
-"da se챌찾o 챕 tudo que estiver antes do 첬ltimo ponto. Os nomes das vari찼veis "
-"n찾o diferenciam mai첬sculas de min첬sculas, permitem apenas os caracteres "
-"alfanum챕ricos e `-` que devem come챌ar com um caractere alfab챕tico. Algumas "
-"vari찼veis podem aparecer v찼rias vezes; dizemos ent찾o que a vari찼vel possui "
-"diversos valores."
+msgstr "As vari찼veis de configura챌찾o s찾o utilizadas pelo encanamento Git e pelas porcelanas. As vari찼veis s찾o divididas em se챌천es em que o nome completo da vari찼vel da vari찼vel em si 챕 o 첬ltimo segmento separado por ponto e o nome da se챌찾o 챕 tudo que estiver antes do 첬ltimo ponto. Os nomes das vari찼veis n찾o diferenciam mai첬sculas de min첬sculas, permitem apenas os caracteres alfanum챕ricos e `-` que devem come챌ar com um caractere alfab챕tico. Algumas vari찼veis podem aparecer v찼rias vezes; dizemos ent찾o que a vari찼vel possui diversos valores."
#. type: Title ~
#: en/config.txt:23
@@ -2169,31 +2067,19 @@ msgstr "Sintaxe"
#: en/config.txt:28
#, priority:100
msgid "The syntax is fairly flexible and permissive; whitespaces are mostly ignored. The '#' and ';' characters begin comments to the end of line, blank lines are ignored."
-msgstr ""
-"A sintaxe 챕 bastante flex챠vel e permissiva; os espa챌os em branco s찾o "
-"ignorados na maioria das vezes. Os caracteres '#' e ';' define o come챌o dos "
-"coment찼rios at챕 o final da linha, as linhas em branco s찾o ignoradas."
+msgstr "A sintaxe 챕 bastante flex챠vel e permissiva; os espa챌os em branco s찾o ignorados na maioria das vezes. Os caracteres '#' e ';' define o come챌o dos coment찼rios at챕 o final da linha, as linhas em branco s찾o ignoradas."
#. type: Plain text
#: en/config.txt:35
#, priority:100
msgid "The file consists of sections and variables. A section begins with the name of the section in square brackets and continues until the next section begins. Section names are case-insensitive. Only alphanumeric characters, `-` and `.` are allowed in section names. Each variable must belong to some section, which means that there must be a section header before the first setting of a variable."
-msgstr ""
-"O arquivo consiste em se챌천es e vari찼veis. Uma se챌찾o come챌a com o nome da "
-"se챌찾o entre colchetes e continua at챕 a pr처xima se챌찾o. Os nomes de se챌찾o n찾o "
-"diferenciam as mai첬sculas das min첬sculas. Apenas os caracteres "
-"alfanum챕ricos, `-` e `.` s찾o permitidos nos nomes das se챌천es. Cada vari찼vel "
-"deve pertencer a alguma se챌찾o, o que significa que deve haver um cabe챌alho "
-"da se챌찾o antes da primeira configura챌찾o de uma vari찼vel."
+msgstr "O arquivo consiste em se챌천es e vari찼veis. Uma se챌찾o come챌a com o nome da se챌찾o entre colchetes e continua at챕 a pr처xima se챌찾o. Os nomes de se챌찾o n찾o diferenciam as mai첬sculas das min첬sculas. Apenas os caracteres alfanum챕ricos, `-` e `.` s찾o permitidos nos nomes das se챌천es. Cada vari찼vel deve pertencer a alguma se챌찾o, o que significa que deve haver um cabe챌alho da se챌찾o antes da primeira configura챌찾o de uma vari찼vel."
#. type: Plain text
#: en/config.txt:39
#, priority:100
msgid "Sections can be further divided into subsections. To begin a subsection put its name in double quotes, separated by space from the section name, in the section header, like in the example below:"
-msgstr ""
-"As se챌천es podem ser divididas em subse챌천es. Para iniciar uma subse챌찾o, "
-"coloque seu nome entre aspas duplas, separado por um espa챌o do nome da "
-"se챌찾o, no cabe챌alho da se챌찾o, como no exemplo abaixo:"
+msgstr "As se챌천es podem ser divididas em subse챌천es. Para iniciar uma subse챌찾o, coloque seu nome entre aspas duplas, separado por um espa챌o do nome da se챌찾o, no cabe챌alho da se챌찾o, como no exemplo abaixo:"
#. type: delimited block -
#: en/config.txt:42
@@ -2205,69 +2091,37 @@ msgstr "\t[se챌찾o \"subse챌찾o\"]\n"
#: en/config.txt:53
#, priority:100
msgid "Subsection names are case sensitive and can contain any characters except newline and the null byte. Doublequote `\"` and backslash can be included by escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding other characters are dropped when reading; for example, `\\t` is read as `t` and `\\0` is read as `0` Section headers cannot span multiple lines. Variables may belong directly to a section or to a given subsection. You can have `[section]` if you have `[section \"subsection\"]`, but you don't need to."
-msgstr ""
-"Os nomes das subse챌천es diferenciam mai첬sculas de min첬sculas, podem conter "
-"qualquer caractere, exceto os que definem uma nova linha e um byte nulo. As "
-"aspas duplas `\"` e a barra invertida podem ser inclu챠das escapando-as como` "
-"\\\"` e `\\\\` respectivamente. As barras invertidas anteriores aos outros "
-"caracteres s찾o descartadas durante a leitura; `\\t` 챕 lido como` t` e `\\0` "
-"챕 lido como `0` cabe챌alhos da se챌찾o por exemplo e n찾o podem abranger v찼rias "
-"linhas. As vari찼veis podem pertencer diretamente a uma se챌찾o ou a uma "
-"determinada subse챌찾o. Voc챗 pode ter `[section]` caso tenha `[section "
-"\"subsection\"]`, mas n찾o 챕 necess찼rio."
+msgstr "Os nomes das subse챌천es diferenciam mai첬sculas de min첬sculas, podem conter qualquer caractere, exceto os que definem uma nova linha e um byte nulo. As aspas duplas `\"` e a barra invertida podem ser inclu챠das escapando-as como` \\\"` e `\\\\` respectivamente. As barras invertidas anteriores aos outros caracteres s찾o descartadas durante a leitura; `\\t` 챕 lido como` t` e `\\0` 챕 lido como `0` cabe챌alhos da se챌찾o por exemplo e n찾o podem abranger v찼rias linhas. As vari찼veis podem pertencer diretamente a uma se챌찾o ou a uma determinada subse챌찾o. Voc챗 pode ter `[section]` caso tenha `[section \"subsection\"]`, mas n찾o 챕 necess찼rio."
#. type: Plain text
#: en/config.txt:58
#, priority:100
msgid "There is also a deprecated `[section.subsection]` syntax. With this syntax, the subsection name is converted to lower-case and is also compared case sensitively. These subsection names follow the same restrictions as section names."
-msgstr ""
-"Tamb챕m existe uma sintaxe obsoleta `[section.subsection]`. Com esta sintaxe "
-"o nome da subse챌찾o 챕 convertido em min첬sculas e tamb챕m 챕 comparado com "
-"distin챌찾o entre mai첬sculas e min첬sculas. Estes nomes de subse챌천es seguem as "
-"mesmas restri챌천es que os nomes de se챌찾o."
+msgstr "Tamb챕m existe uma sintaxe obsoleta `[section.subsection]`. Com esta sintaxe o nome da subse챌찾o 챕 convertido em min첬sculas e tamb챕m 챕 comparado com distin챌찾o entre mai첬sculas e min첬sculas. Estes nomes de subse챌천es seguem as mesmas restri챌천es que os nomes de se챌찾o."
#. type: Plain text
#: en/config.txt:65
#, priority:100
msgid "All the other lines (and the remainder of the line after the section header) are recognized as setting variables, in the form 'name = value' (or just 'name', which is a short-hand to say that the variable is the boolean \"true\"). The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character."
-msgstr ""
-"Todas as outras linhas (e o restante da linha ap처s o cabe챌alho da se챌찾o) s찾o "
-"reconhecidas como vari찼veis de configura챌찾o, no formato 'name=value' (ou "
-"apenas 'name', que 챕 uma abrevia챌찾o para dizer que a vari찼vel 챕 um valor "
-"booleano \"true\"). Os nomes das vari찼veis n찾o diferenciam mai첬sculas de "
-"min첬sculas, permitem apenas os caracteres alfanum챕ricos e `-` que devem "
-"come챌ar com um caractere alfab챕tico."
+msgstr "Todas as outras linhas (e o restante da linha ap처s o cabe챌alho da se챌찾o) s찾o reconhecidas como vari찼veis de configura챌찾o, no formato 'name=value' (ou apenas 'name', que 챕 uma abrevia챌찾o para dizer que a vari찼vel 챕 um valor booleano \"true\"). Os nomes das vari찼veis n찾o diferenciam mai첬sculas de min첬sculas, permitem apenas os caracteres alfanum챕ricos e `-` que devem come챌ar com um caractere alfab챕tico."
#. type: Plain text
#: en/config.txt:73
#, priority:100
msgid "A line that defines a value can be continued to the next line by ending it with a `\\`; the backquote and the end-of-line are stripped. Leading whitespaces after 'name =', the remainder of the line after the first comment character '#' or ';', and trailing whitespaces of the line are discarded unless they are enclosed in double quotes. Internal whitespaces within the value are retained verbatim."
-msgstr ""
-"Uma linha que define um valor pode ser continuada para a pr처xima linha, "
-"terminando com um `\\`; acento grave e o final da linha s찾o removidos. S찾o "
-"descartados os espa챌os em branco 횪 esquerda ap처s 'name=', o restante da "
-"linha ap처s o primeiro caractere de coment찼rio '#' ou ';' e os espa챌os em "
-"branco 횪 direita da linha a menos que estejam entre aspas duplas. "
-"Internamente os espa챌os em branco com valores s찾o retidos de forma literal."
+msgstr "Uma linha que define um valor pode ser continuada para a pr처xima linha, terminando com um `\\`; acento grave e o final da linha s찾o removidos. S찾o descartados os espa챌os em branco 횪 esquerda ap처s 'name=', o restante da linha ap처s o primeiro caractere de coment찼rio '#' ou ';' e os espa챌os em branco 횪 direita da linha a menos que estejam entre aspas duplas. Internamente os espa챌os em branco com valores s찾o retidos de forma literal."
#. type: Plain text
#: en/config.txt:76
#, priority:100
msgid "Inside double quotes, double quote `\"` and backslash `\\` characters must be escaped: use `\\\"` for `\"` and `\\\\` for `\\`."
-msgstr ""
-"Dentro de uma aspa dupla `\"` e barra invertida `\\` os caracteres podem ser "
-"utilizados literalmente: utilize `\\\"` para `\"` e `\\\\` para `\\`."
+msgstr "Dentro de uma aspa dupla `\"` e barra invertida `\\` os caracteres podem ser utilizados literalmente: utilize `\\\"` para `\"` e `\\\\` para `\\`."
#. type: Plain text
#: en/config.txt:81
#, priority:100
msgid "The following escape sequences (beside `\\\"` and `\\\\`) are recognized: `\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB) and `\\b` for backspace (BS). Other char escape sequences (including octal escape sequences) are invalid."
-msgstr ""
-"As seguintes sequ챗ncias de escape (ao lado de `\\\"` e `\\\\`) s찾o "
-"reconhecidos: `\\n"
-"` para caracteres de nova linha (NL), `\\t` para tabula챌찾o horizontal (HT, "
-"TAB) e `\\b` para o backspace (BS). S찾o validas tamb챕m as outras "
-"sequ챗ncias de escape de caracteres (incluindo sequ챗ncias de escape octais)."
+msgstr "As seguintes sequ챗ncias de escape (ao lado de `\\\"` e `\\\\`) s찾o reconhecidos: `\\n` para caracteres de nova linha (NL), `\\t` para tabula챌찾o horizontal (HT, TAB) e `\\b` para o backspace (BS). S찾o validas tamb챕m as outras sequ챗ncias de escape de caracteres (incluindo sequ챗ncias de escape octais)."
#. type: Title ~
#: en/config.txt:84
@@ -2279,33 +2133,19 @@ msgstr "Inclui"
#: en/config.txt:91
#, priority:100
msgid "The `include` and `includeIf` sections allow you to include config directives from another source. These sections behave identically to each other with the exception that `includeIf` sections may be ignored if their condition does not evaluate to true; see \"Conditional includes\" below."
-msgstr ""
-"As se챌천es `include` e `includeIf` permitem que voc챗 inclua diretivas da "
-"configura챌찾o de outra fonte. Estas se챌천es se comportam de forma id챗ntica, "
-"com exce챌찾o das se챌천es `includeIf` que podem ser ignorados se a sua condi챌찾o "
-"n찾o for avaliada como verdadeira; consulte \"Inclus찾o condicional\" abaixo."
+msgstr "As se챌천es `include` e `includeIf` permitem que voc챗 inclua diretivas da configura챌찾o de outra fonte. Estas se챌천es se comportam de forma id챗ntica, com exce챌찾o das se챌천es `includeIf` que podem ser ignorados se a sua condi챌찾o n찾o for avaliada como verdadeira; consulte \"Inclus찾o condicional\" abaixo."
#. type: Plain text
#: en/config.txt:96
#, 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 da configura챌찾o de outro configurando a "
-"vari찼vel especial `include.path` (ou`includeIf.*.path`) como o nome do "
-"arquivo a ser inclu챠do. A vari찼vel assume um nome do caminho como seu valor "
-"e est찼 sujeita 횪 expans찾o do til. Estas vari찼veis podem ser utilizadas "
-"v찼rias vezes."
+msgstr "Voc챗 pode incluir um arquivo da configura챌찾o de outro configurando a vari찼vel especial `include.path` (ou`includeIf.*.path`) como o nome do arquivo a ser inclu챠do. A vari찼vel assume um nome do caminho como seu valor e est찼 sujeita 횪 expans찾o do til. Estas vari찼veis podem ser utilizadas v찼rias vezes."
#. type: Plain text
#: en/config.txt:102
#, priority:100
msgid "The contents of the included file are inserted immediately, as if they had been found at the location of the include directive. If the value of the variable is a relative path, the path is considered to be relative to the configuration file in which the include directive was found. See below for examples."
-msgstr ""
-"O conte첬do do arquivo inclu챠do 챕 inserido imediatamente, como se tivesse "
-"sido encontrado no local da diretiva de inclus찾o. Caso o valor da vari찼vel "
-"seja um caminho relativo, o caminho ser찼 considerado relativo ao arquivo da "
-"configura챌찾o no qual a diretiva de inclus찾o foi encontrada. Veja os "
-"exemplos abaixo."
+msgstr "O conte첬do do arquivo inclu챠do 챕 inserido imediatamente, como se tivesse sido encontrado no local da diretiva de inclus찾o. Caso o valor da vari찼vel seja um caminho relativo, o caminho ser찼 considerado relativo ao arquivo da configura챌찾o no qual a diretiva de inclus찾o foi encontrada. Veja os exemplos abaixo."
#. type: Title ~
#: en/config.txt:104
@@ -2317,19 +2157,13 @@ msgstr "Inclus찾o condicional"
#: en/config.txt:109
#, priority:100
msgid "You can include a config file from another conditionally by setting a `includeIf.<condition>.path` variable to the name of the file to be included."
-msgstr ""
-"Voc챗 pode incluir um arquivo da configura챌찾o de outro condicionalmente "
-"setando uma vari찼vel `includeIf.<condi챌찾o>.path` para o nome do arquivo que "
-"ser찼 inclu챠do."
+msgstr "Voc챗 pode incluir um arquivo da configura챌찾o de outro condicionalmente setando uma vari찼vel `includeIf.<condi챌찾o>.path` para o nome do arquivo que ser찼 inclu챠do."
#. type: Plain text
#: en/config.txt:113
#, priority:100
msgid "The condition starts with a keyword followed by a colon and some data whose format and meaning depends on the keyword. Supported keywords are:"
-msgstr ""
-"A condi챌찾o come챌a com uma palavra-chave seguida de dois pontos e alguns "
-"dados cujo formato e significado dependem da palavra-chave. As palavras-"
-"chave compat챠veis s찾o:"
+msgstr "A condi챌찾o come챌a com uma palavra-chave seguida de dois pontos e alguns dados cujo formato e significado dependem da palavra-chave. As palavras-chave compat챠veis s찾o:"
#. type: Labeled list
#: en/config.txt:114
@@ -2341,21 +2175,13 @@ msgstr "`gitdir`"
#: en/config.txt:119
#, priority:100
msgid "The data that follows the keyword `gitdir:` is used as a glob pattern. If the location of the .git directory matches the pattern, the include condition is met."
-msgstr ""
-"Os dados que seguem a palavra-chave `gitdir:` s찾o utilizados como um padr찾o "
-"de agrupamento. Caso o local do diret처rio .git coincida com o padr찾o, a "
-"condi챌찾o de inclus찾o ser찼 atendida."
+msgstr "Os dados que seguem a palavra-chave `gitdir:` s찾o utilizados como um padr찾o de agrupamento. Caso o local do diret처rio .git coincida com o padr찾o, a condi챌찾o de inclus찾o ser찼 atendida."
#. type: Plain text
#: en/config.txt:124
#, priority:100
msgid "The .git location may be auto-discovered, or come from `$GIT_DIR` environment variable. If the repository is auto discovered via a .git file (e.g. from submodules, or a linked worktree), the .git location would be the final location where the .git directory is, not where the"
-msgstr ""
-"O local .git pode ser descoberto automaticamente ou vir da vari찼vel de "
-"ambiente `$GIT_DIR`. Caso o reposit처rio seja descoberto automaticamente por "
-"meio de um arquivo .git (de subm처dulos ou uma 찼rvore de trabalho vinculada "
-"por exemplo), o local .git ser찼 o local final onde est찼 o diret처rio .git, e "
-"n찾o o diret처rio"
+msgstr "O local .git pode ser descoberto automaticamente ou vir da vari찼vel de ambiente `$GIT_DIR`. Caso o reposit처rio seja descoberto automaticamente por meio de um arquivo .git (de subm처dulos ou uma 찼rvore de trabalho vinculada por exemplo), o local .git ser찼 o local final onde est찼 o diret처rio .git, e n찾o o diret처rio"
#. type: Block title
#: en/config.txt:124
@@ -2367,44 +2193,31 @@ msgstr "o que o arquivo git seja."
#: en/config.txt:129
#, 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 curingas de mascaramento padr찾o e dois adicionais, `**/`"
-" e `/**`, que podem coincidir com diversos componentes do caminho. Para mais "
-"detalhes, consulte o linkgit:gitignore[5] para detalhes. Por conveni챗ncia:"
+msgstr "O padr찾o pode conter curingas de mascaramento padr찾o e dois adicionais, `**/` e `/**`, que podem coincidir com diversos componentes do caminho. Para mais detalhes, consulte o linkgit:gitignore[5] para detalhes. Por conveni챗ncia:"
#. type: Plain text
#: en/config.txt:132
#, priority:100
msgid "If the pattern starts with `~/`, `~` will be substituted with the content of the environment variable `HOME`."
-msgstr ""
-"Caso o padr찾o comece com `~/`, `~` ser찼 substitu챠do com o conte첬do da "
-"vari찼vel de ambiente `HOME`."
+msgstr "Caso o padr찾o comece com `~/`, `~` ser찼 substitu챠do com o conte첬do da vari찼vel de ambiente `HOME`."
#. type: Plain text
#: en/config.txt:135
#, priority:100
msgid "If the pattern starts with `./`, it is replaced with the directory containing the current config file."
-msgstr ""
-"Caso o padr찾o comece com `./`, 챕 substitu챠do com o diret처rio contendo o "
-"arquivo da configura챌찾o atual."
+msgstr "Caso o padr찾o comece com `./`, 챕 substitu챠do com o diret처rio contendo o arquivo da configura챌찾o atual."
#. type: Plain text
#: en/config.txt:139
#, 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 ""
-"Caso o padr찾o n찾o comece com com nenhum `~/`, `./` ou `/`, `**/` ser찼 "
-"anexado automaticamente. O padr찾o `foo/bar` se torna `**/foo/bar` e "
-"coincidir찼 com `/qualquer/caminho/para/foo/bar` por exemplo."
+msgstr "Caso o padr찾o n찾o comece com com nenhum `~/`, `./` ou `/`, `**/` ser찼 anexado automaticamente. O padr찾o `foo/bar` se torna `**/foo/bar` e coincidir찼 com `/qualquer/caminho/para/foo/bar` por exemplo."
#. type: Plain text
#: en/config.txt:143
#, 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 ""
-"Caso o padr찾o termine com `/`, `**` ser찼 adicionado automaticamente. O "
-"padr찾o `foo/` se torna `foo/**` por exemplo. Em outras palavras, ele combina "
-"\"foo\" e tudo dentro, recursivamente."
+msgstr "Caso o padr찾o termine com `/`, `**` ser찼 adicionado automaticamente. O padr찾o `foo/` se torna `foo/**` por exemplo. Em outras palavras, ele combina \"foo\" e tudo dentro, recursivamente."
#. type: Labeled list
#: en/config.txt:144
@@ -2416,10 +2229,7 @@ msgstr "`gitdir/i`"
#: en/config.txt:147
#, priority:100
msgid "This is the same as `gitdir` except that matching is done case-insensitively (e.g. on case-insensitive file systems)"
-msgstr ""
-"횋 o mesmo que `gitdir` exceto que a coincid챗ncia 챕 feita sem distinguir as "
-"mai첬sculas das minusculas (em sistemas onde seja indiferente o sistema de "
-"arquivos n찾o se importa com mai첬sculas de minusculas)"
+msgstr "횋 o mesmo que `gitdir` exceto que a coincid챗ncia 챕 feita sem distinguir as mai첬sculas das minusculas (em sistemas onde seja indiferente o sistema de arquivos n찾o se importa com mai첬sculas de minusculas)"
#. type: Labeled list
#: en/config.txt:148
@@ -2431,66 +2241,43 @@ msgstr "`onbranch`"
#: en/config.txt:155
#, priority:100
msgid "The data that follows the keyword `onbranch:` is taken to be a pattern with standard globbing wildcards and two additional ones, `**/` and `/**`, that can match multiple path components. If we are in a worktree where the name of the branch that is currently checked out matches the pattern, the include condition is met."
-msgstr ""
-"Os dados que seguem a palavra-chave `onbranch:` s찾o considerados um padr찾o "
-"com caracteres curinga de mascaramento predefinidos e dois adicionais, `**/` "
-"e `/**`, que podem coincidir com v찼rios componentes do caminho. Caso "
-"estejamos em uma 찼rvore de trabalho cujo nome do ramo atual com check-out "
-"coincida com o padr찾o, a inclus찾o condicional ser찼 atendida."
+msgstr "Os dados que seguem a palavra-chave `onbranch:` s찾o considerados um padr찾o com caracteres curinga de mascaramento predefinidos e dois adicionais, `**/` e `/**`, que podem coincidir com v찼rios componentes do caminho. Caso estejamos em uma 찼rvore de trabalho cujo nome do ramo atual com check-out coincida com o padr찾o, a inclus찾o condicional ser찼 atendida."
#. type: Plain text
#: en/config.txt:161
#, priority:100
msgid "If the pattern ends with `/`, `**` will be automatically added. For example, the pattern `foo/` becomes `foo/**`. In other words, it matches all branches that begin with `foo/`. This is useful if your branches are organized hierarchically and you would like to apply a configuration to all the branches in that hierarchy."
-msgstr ""
-"Caso o padr찾o termine com `/`, `**` ser찼 adicionado automaticamente. O "
-"padr찾o `foo/` se torna `foo/**` por exemplo. Em outras palavras, ele "
-"coincide com todos os ramos que come챌am com `foo/`. Isso 챕 첬til pois caso as "
-"suas ramifica챌천es estejam organizadas hierarquicamente e voc챗 queira aplicar "
-"uma configura챌찾o em todas as ramifica챌천es nesta hierarquia."
+msgstr "Caso o padr찾o termine com `/`, `**` ser찼 adicionado automaticamente. O padr찾o `foo/` se torna `foo/**` por exemplo. Em outras palavras, ele coincide com todos os ramos que come챌am com `foo/`. Isso 챕 첬til pois caso as suas ramifica챌천es estejam organizadas hierarquicamente e voc챗 queira aplicar uma configura챌찾o em todas as ramifica챌천es nesta hierarquia."
#. type: Plain text
#: en/config.txt:163
#, priority:100
msgid "A few more notes on matching via `gitdir` and `gitdir/i`:"
-msgstr ""
-"Algumas poucas anota챌천es sobre coincidir atrav챕s de `gitdir` e `gitdir/i`:"
+msgstr "Algumas poucas anota챌천es sobre coincidir atrav챕s de `gitdir` e `gitdir/i`:"
#. type: Plain text
#: en/config.txt:165
#, priority:100
msgid "Symlinks in `$GIT_DIR` are not resolved before matching."
-msgstr ""
-"Os \"symlinks\" (links simb처licos) em `$GIT_DIR` n찾o s찾o resolvidos antes "
-"que sejam coincididos."
+msgstr "Os \"symlinks\" (links simb처licos) em `$GIT_DIR` n찾o s찾o resolvidos antes que sejam coincididos."
#. type: Plain text
#: en/config.txt:170
#, priority:100
msgid "Both the symlink & realpath versions of paths will be matched outside of `$GIT_DIR`. E.g. if ~/git is a symlink to /mnt/storage/git, both `gitdir:~/git` and `gitdir:/mnt/storage/git` will match."
-msgstr ""
-"Ambas as vers천es do \"symlink\" (links simb처lico) e do \"realpath\" (caminho "
-"real) dos caminhos ser찾o coincididos fora do `$GIT_DIR`. Por exemplo, caso "
-"`~/git` seja um link simb처lico para /mnt/storage/git, ambos os `gitdir:~/git`"
-" e `gitdir:/mnt/storage/git` coincidir찾o."
+msgstr "Ambas as vers천es do \"symlink\" (links simb처lico) e do \"realpath\" (caminho real) dos caminhos ser찾o coincididos fora do `$GIT_DIR`. Por exemplo, caso `~/git` seja um link simb처lico para /mnt/storage/git, ambos os `gitdir:~/git` e `gitdir:/mnt/storage/git` coincidir찾o."
#. type: Plain text
#: en/config.txt:175
#, priority:100
msgid "This was not the case in the initial release of this feature in v2.13.0, which only matched the realpath version. Configuration that wants to be compatible with the initial release of this feature needs to either specify only the realpath version, or both versions."
-msgstr ""
-"Este n찾o foi o caso no lan챌amento inicial desse recurso na vers찾o v2.13.0, "
-"que coincidia apenas 횪 vers찾o do caminho real. A configura챌찾o que queira ser "
-"compat챠vel com o lan챌amento inicial deste recurso precisa definir apenas a "
-"vers찾o do caminho real ou das duas vers천es."
+msgstr "Este n찾o foi o caso no lan챌amento inicial desse recurso na vers찾o v2.13.0, que coincidia apenas 횪 vers찾o do caminho real. A configura챌찾o que queira ser compat챠vel com o lan챌amento inicial deste recurso precisa definir apenas a vers찾o do caminho real ou das duas vers천es."
#. type: Plain text
#: en/config.txt:178
#, priority:100
msgid "Note that \"../\" is not special and will match literally, which is unlikely what you want."
-msgstr ""
-"Note que \"../\" n찾o 챕 especial e n찾o ir찼 coincidir literalmente, o que n찾o "
-"챕 o que voc챗 quer."
+msgstr "Note que \"../\" n찾o 챕 especial e n찾o ir찼 coincidir literalmente, o que n찾o 챕 o que voc챗 quer."
#. type: Title ~
#: en/config.txt:180 en/git-rev-parse.txt:367 en/git-rev-parse.txt:423
@@ -2642,10 +2429,7 @@ msgstr "Valores"
#: en/config.txt:237
#, priority:100
msgid "Values of many variables are treated as a simple string, but there are variables that take values of specific types and there are rules as to how to spell them."
-msgstr ""
-"Os Valores das v찼rias vari찼veis s찾o tratadas como uma cadeia de caracteres "
-"simples, por챕m existem vari찼veis que pegam os valores de tipos espec챠ficos e "
-"existem regras de como soletr찼-los."
+msgstr "Os Valores das v찼rias vari찼veis s찾o tratadas como uma cadeia de caracteres simples, por챕m existem vari찼veis que pegam os valores de tipos espec챠ficos e existem regras de como soletr찼-los."
#. type: Labeled list
#: en/config.txt:238
@@ -2657,10 +2441,7 @@ msgstr "booleano"
#: en/config.txt:243
#, priority:100
msgid "When a variable is said to take a boolean value, many synonyms are accepted for 'true' and 'false'; these are all case-insensitive."
-msgstr ""
-"Quando uma vari찼vel pega um valor booleano, muitos sin척nimos s찾o aceitos "
-"para 'true' e 'false', estes s찾o todos insens챠veis as mudan챌as de mai첬sculas "
-"e minusculas."
+msgstr "Quando uma vari찼vel pega um valor booleano, muitos sin척nimos s찾o aceitos para 'true' e 'false', estes s찾o todos insens챠veis as mudan챌as de mai첬sculas e minusculas."
#. type: Labeled list
#: en/config.txt:244
@@ -2706,10 +2487,7 @@ msgstr "`0` e uma cadeia de caracteres vazia.\n"
#: en/config.txt:254
#, priority:100
msgid "When converting a value to its canonical form using the `--type=bool` type specifier, 'git config' will ensure that the output is \"true\" or \"false\" (spelled in lowercase)."
-msgstr ""
-"Quando converter um valor para a sua forma can척nica utilizando o "
-"`--type=bool`, tipo de especifica챌찾o 'git config' se assegurar찼 que a sa챠da "
-"seja \"true\" ou \"false\" (em minusculas)."
+msgstr "Quando converter um valor para a sua forma can척nica utilizando o `--type=bool`, tipo de especifica챌찾o 'git config' se assegurar찼 que a sa챠da seja \"true\" ou \"false\" (em minusculas)."
#. type: Labeled list
#: en/config.txt:255
@@ -2721,82 +2499,49 @@ msgstr "inteiro"
#: en/config.txt:259
#, ignore-ellipsis, priority:100
msgid "The value for many variables that specify various sizes can be suffixed with `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc."
-msgstr ""
-"O valor das muitas vari찼veis que determinam os v찼rios tamanhos podem ter "
-"como sufixo `k`, `M`,... que significa \"escale o n첬mero por 1024\", \"por "
-"1024x1024\", etc."
+msgstr "O valor das muitas vari찼veis que determinam os v찼rios tamanhos podem ter como sufixo `k`, `M`,... que significa \"escale o n첬mero por 1024\", \"por 1024x1024\", etc."
#. type: Labeled list
#: en/config.txt:260 en/diff-options.txt:356 en/git-for-each-ref.txt:177
#, ignore-same, no-wrap, priority:280
msgid "color"
-msgstr "cor"
+msgstr "color"
#. type: Plain text
#: en/config.txt:264
#, priority:100
msgid "The value for a variable that takes a color is a list of colors (at most two, one for foreground and one for background) and attributes (as many as you want), separated by spaces."
-msgstr ""
-"O valor de uma vari찼vel que pega uma cor de uma lista de cores (ao menos "
-"duas, uma para o primeiro plano e outra para o plano de fundo) e os "
-"atributos (quantos queira), separados por espa챌os."
+msgstr "O valor de uma vari찼vel que pega uma cor de uma lista de cores (ao menos duas, uma para o primeiro plano e outra para o plano de fundo) e os atributos (quantos queira), separados por espa챌os."
#. type: Plain text
#: en/config.txt:270
#, 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 que s찾o 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 segunda 챕 o plano de fundo. Todas as cores b찼sicas "
-"exceto `normal` possuem uma variante brilhante que pode ser definida "
-"prefixando a cor com `bright`, como `brightred`."
+msgstr "As cores b찼sicas que s찾o 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 segunda 챕 o plano de fundo. Todas as cores b찼sicas exceto `normal` possuem uma variante brilhante que pode ser definida prefixando a cor com `bright`, como `brightred`."
#. type: Plain text
#: en/config.txt:275
#, priority:100
msgid "Colors may also be given as numbers between 0 and 255; these use ANSI 256-color mode (but note that not all terminals may support this). If your terminal supports it, you may also specify 24-bit RGB values as hex, like `#ff0ab3`."
-msgstr ""
-"As cores tamb챕m podem ser utilizadas como n첬meros entre 0 e 255; estes usam "
-"o modo ANSI com 256 cores (note que nem todos os terminais s찾o compat챠veis)"
-". Caso o seu terminal seja compat챠vel, voc챗 tamb챕m pode definir os valores "
-"RGB de 24 bits como hexadecimais, `#ff0ab3` por exemplo."
+msgstr "As cores tamb챕m podem ser utilizadas como n첬meros entre 0 e 255; estes usam o modo ANSI com 256 cores (note que nem todos os terminais s찾o compat챠veis). Caso o seu terminal seja compat챠vel, voc챗 tamb챕m pode definir os valores RGB de 24 bits como hexadecimais, `#ff0ab3` por exemplo."
#. type: Plain text
#: en/config.txt:282
#, priority:100
msgid "The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
-msgstr ""
-"Os atributos compat챠veis s찾o `bold`, `dim`, `ul`, `blink`, `reverse`, "
-"`italic`, e `strike` (para letras cruzadas ou \"rasuradas\"). A posi챌찾o de "
-"qualquer atributo em rela챌찾o 횪s cores (antes, depois ou entre) n찾o importa. "
-"Atributos espec챠ficos podem ser desativados prefixando-os com `no` ou `no-` ("
-"por exemplo `noreverse`, `no-ul`, etc)."
+msgstr "Os atributos compat챠veis s찾o `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, e `strike` (para letras cruzadas ou \"rasuradas\"). A posi챌찾o de qualquer atributo em rela챌찾o 횪s cores (antes, depois ou entre) n찾o importa. Atributos espec챠ficos podem ser desativados prefixando-os com `no` ou `no-` (por exemplo `noreverse`, `no-ul`, etc)."
#. type: Plain text
#: en/config.txt:285
#, priority:100
msgid "An empty color string produces no color effect at all. This can be used to avoid coloring specific elements without disabling color entirely."
-msgstr ""
-"Uma sequ챗ncia de cores vazias n찾o produz nenhum efeito de cor. Isso pode ser "
-"utilizado para evitar colorir elementos espec챠ficos sem desabilitar "
-"totalmente a cor."
+msgstr "Uma sequ챗ncia de cores vazias n찾o produz nenhum efeito de cor. Isso pode ser utilizado para evitar colorir elementos espec챠ficos sem desabilitar totalmente a cor."
#. type: Plain text
#: en/config.txt:294
#, priority:100
msgid "For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting `color.decorate.branch` to `black` will paint that branch name in a plain `black`, even if the previous thing on the same output line (e.g. opening parenthesis before the list of branch names in `log --decorate` output) is set to be painted with `bold` or some other attribute. However, custom log formats may do more complicated and layered coloring, and the negated forms may be useful there."
-msgstr ""
-"Para os slots com as cores predefinidas do git, os atributos devem ser "
-"redefinidos no in챠cio de cada item na sa챠da colorida. Portanto ao definir a "
-"vari찼vel `color.decorate.branch` como` black` pintar찼 esse nome do ramo como "
-"`preto` simples, mesmo se a coisa anterior na mesma linha de sa챠da (abrir "
-"par챗nteses antes da lista dos nomes das ramifica챌천es na sa챠da de `log "
-"--decorate` por exemplo) 챕 definido para ser pintado com `bold` (negrito) ou "
-"algum outro atributo. No entanto, os formatos dos registros log "
-"personalizados podem fazer uma colora챌찾o mais complicada e em camadas, as "
-"formas negadas podem ser 첬teis l찼."
+msgstr "Para os slots com as cores predefinidas do git, os atributos devem ser redefinidos no in챠cio de cada item na sa챠da colorida. Portanto ao definir a vari찼vel `color.decorate.branch` como` black` pintar찼 esse nome do ramo como `preto` simples, mesmo se a coisa anterior na mesma linha de sa챠da (abrir par챗nteses antes da lista dos nomes das ramifica챌천es na sa챠da de `log --decorate` por exemplo) 챕 definido para ser pintado com `bold` (negrito) ou algum outro atributo. No entanto, os formatos dos registros log personalizados podem fazer uma colora챌찾o mais complicada e em camadas, as formas negadas podem ser 첬teis l찼."
#. type: Labeled list
#: en/config.txt:295
@@ -2808,12 +2553,7 @@ msgstr "caminho do diret처rio"
#: en/config.txt:301
#, 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 para o nome do caminho pode receber uma "
-"cadeia de caracteres que come챌a com \"`~/`\" ou \"`~user/`\", a expans찾o "
-"usual do til acontece com essa cadeia de caracteres: `~/` 챕 expandida para o "
-"valor `$HOME`, e `~user/` para o diret처rio inicial do usu찼rio que foi "
-"definido."
+msgstr "Uma vari찼vel que recebe um valor para o nome do caminho pode receber uma cadeia de caracteres que come챌a com \"`~/`\" ou \"`~user/`\", a expans찾o usual do til acontece com essa cadeia de caracteres: `~/` 챕 expandida para o valor `$HOME`, e `~user/` para o diret처rio inicial do usu찼rio que foi definido."
#. type: Title ~
#: en/config.txt:304 en/git-imap-send.txt:58
@@ -2825,21 +2565,13 @@ msgstr "Vari찼veis"
#: en/config.txt:309
#, priority:100
msgid "Note that this list is non-comprehensive and not necessarily complete. For command-specific variables, you will find a more detailed description in the appropriate manual page."
-msgstr ""
-"Observe que esta lista n찾o 챕 abrangente e n찾o est찼 completa. Para vari찼veis "
-"espec챠ficas do comando, voc챗 encontrar찼 uma descri챌찾o mais detalhada na "
-"p찼gina apropriada do manual."
+msgstr "Observe que esta lista n찾o 챕 abrangente e n찾o est찼 completa. Para vari찼veis espec챠ficas do comando, voc챗 encontrar찼 uma descri챌찾o mais detalhada na p찼gina apropriada do manual."
#. type: Plain text
#: en/config.txt:314
#, priority:100
msgid "Other git-related tools may and do use their own variables. When inventing new variables for use in your own tool, make sure their names do not conflict with those that are used by Git itself and other popular tools, and describe them in your documentation."
-msgstr ""
-"Outras ferramentas relacionadas ao `git-related` podem usar as suas pr처prias "
-"vari찼veis. Ao inventar novas vari찼veis para utiliza챌찾o em sua pr처pria "
-"ferramenta, certifique-se que os seus respectivos nomes n찾o entram em "
-"conflito com os que j찼 s찾o utilizados pelo pr처prio Git e outras ferramentas "
-"populares, e descreva-os em sua documenta챌찾o."
+msgstr "Outras ferramentas relacionadas ao `git-related` podem usar as suas pr처prias vari찼veis. Ao inventar novas vari찼veis para utiliza챌찾o em sua pr처pria ferramenta, certifique-se que os seus respectivos nomes n찾o entram em conflito com os que j찼 s찾o utilizados pelo pr처prio Git e outras ferramentas populares, e descreva-os em sua documenta챌찾o."
#. type: Labeled list
#: en/config/merge.txt:1
@@ -2863,15 +2595,7 @@ msgstr "merge.defaultToUpstream"
#: en/config/merge.txt:18
#, priority:240
msgid "If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches. The values of the `branch.<current branch>.merge` that name the branches at the remote named by `branch.<current branch>.remote` are consulted, and then they are mapped via `remote.<remote>.fetch` to their corresponding remote-tracking branches, and the tips of these tracking branches are merged."
-msgstr ""
-"Se a mesclagem for chamada sem nenhum argumento para o commit, mescle as "
-"ramifica챌천es \"upstream\" configuradas para a ramifica챌찾o atual utilizando "
-"os seus 첬ltimos valores observados e armazenados nas suas ramifica챌천es de "
-"rastreamento remoto. Os valores do `branch.<ramo atual>.merge` que nomeiam "
-"os ramos remotos informado por `branch.<ramo atual>.remote` s찾o consultados "
-"e em seguida s찾o mapeados atrav챕s de `remote.<remote>.fetch` para as suas "
-"ramifica챌천es coincidentes monitoradas remotamente, as pontas dessas "
-"ramifica챌천es monitoradas s찾o mescladas."
+msgstr "Se a mesclagem for chamada sem nenhum argumento para o commit, mescle as ramifica챌천es \"upstream\" configuradas para a ramifica챌찾o atual utilizando os seus 첬ltimos valores observados e armazenados nas suas ramifica챌천es de rastreamento remoto. Os valores do `branch.<ramo atual>.merge` que nomeiam os ramos remotos informado por `branch.<ramo atual>.remote` s찾o consultados e em seguida s찾o mapeados atrav챕s de `remote.<remote>.fetch` para as suas ramifica챌천es coincidentes monitoradas remotamente, as pontas dessas ramifica챌천es monitoradas s찾o mescladas."
#. type: Labeled list
#: en/config/merge.txt:19
@@ -2883,14 +2607,7 @@ msgstr "merge.ff"
#: en/config/merge.txt:28
#, priority:240
msgid "By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the command line)."
-msgstr ""
-"횋 predefinido que o Git n찾o crie um commit de mesclagem extra ao mesclar um "
-"commit que seja descendente do commit atual. Em vez disso, a ponta do ramo "
-"atual 챕 avan챌ado rapidamente (fast-forwarded). Essa vari찼vel quando definida "
-"como `false` diz ao Git para criar um commit de mesclagem extra nesse caso ("
-"equivalente a utilizar a op챌찾o `--no-ff` na linha de comando). Quando "
-"definido como `only`, somente essas mesclagens de avan챌o r찼pido s찾o "
-"permitidas (equivalente a fornecer a op챌찾o` --ff-only` na linha de comando)."
+msgstr "횋 predefinido que o Git n찾o crie um commit de mesclagem extra ao mesclar um commit que seja descendente do commit atual. Em vez disso, a ponta do ramo atual 챕 avan챌ado rapidamente (fast-forwarded). Essa vari찼vel quando definida como `false` diz ao Git para criar um commit de mesclagem extra nesse caso (equivalente a utilizar a op챌찾o `--no-ff` na linha de comando). Quando definido como `only`, somente essas mesclagens de avan챌o r찼pido s찾o permitidas (equivalente a fornecer a op챌찾o` --ff-only` na linha de comando)."
#. type: Labeled list
#: en/config/merge.txt:29
@@ -2902,9 +2619,7 @@ msgstr "merge.verifySignatures"
#: en/config/merge.txt:32
#, 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 (true), equivale 횪 op챌찾o da linha de comando `--verify-"
-"signatures`. Para mais detalhes consulte linkgit:git-merge[1]."
+msgstr "Se verdadeiro (true), equivale 횪 op챌찾o da linha de comando `--verify-signatures`. Para mais detalhes consulte linkgit:git-merge[1]."
#. type: Labeled list
#: en/config/merge.txt:35
@@ -2916,11 +2631,7 @@ msgstr "merge.renameLimit"
#: en/config/merge.txt:40
#, priority:240
msgid "The number of files to consider when performing rename detection during a merge; if not specified, defaults to the value of diff.renameLimit. This setting has no effect if rename detection is turned off."
-msgstr ""
-"A quantidade de arquivos que ser찾o considerados ao executar a detec챌찾o de "
-"renomea챌찾o durante uma mesclagem; caso n찾o seja especificado, a predefini챌찾o "
-"ser찼 o valor de `diff.renameLimit`. Esta configura챌찾o n찾o tem efeito caso a "
-"detec챌찾o de renomea챌찾o esteja desativada."
+msgstr "A quantidade de arquivos que ser찾o considerados ao executar a detec챌찾o de renomea챌찾o durante uma mesclagem; caso n찾o seja especificado, a predefini챌찾o ser찼 o valor de `diff.renameLimit`. Esta configura챌찾o n찾o tem efeito caso a detec챌찾o de renomea챌찾o esteja desativada."
#. type: Labeled list
#: en/config/merge.txt:41
@@ -2932,10 +2643,7 @@ msgstr "merge.renames"
#: en/config/merge.txt:45
#, priority:240
msgid "Whether Git detects renames. If set to \"false\", rename detection is disabled. If set to \"true\", basic rename detection is enabled. Defaults to the value of diff.renames."
-msgstr ""
-"Se o Git detecta renomea챌천es. Se definido como \"false\", a detec챌찾o da "
-"renomea챌찾o ser찼 desativada. Se definido como \"true\", a detec챌찾o b찼sica da "
-"renomea챌찾o ser찼 ativada. A predefini챌찾o 챕 o valor de `diff.renames`."
+msgstr "Se o Git detecta renomea챌천es. Se definido como \"false\", a detec챌찾o da renomea챌찾o ser찼 desativada. Se definido como \"true\", a detec챌찾o b찼sica da renomea챌찾o ser찼 ativada. A predefini챌찾o 챕 o valor de `diff.renames`."
#. type: Labeled list
#: en/config/merge.txt:46
@@ -2947,19 +2655,7 @@ msgstr "merge.directoryRenames"
#: en/config/merge.txt:58
#, priority:240
msgid "Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history. If merge.directoryRenames is set to \"false\", directory rename detection is disabled, meaning that such new files will be left behind in the old directory. If set to \"true\", directory rename detection is enabled, meaning that such new files will be moved into the new directory. If set to \"conflict\", a conflict will be reported for such paths. If merge.renames is false, merge.directoryRenames is ignored and treated as false. Defaults to \"conflict\"."
-msgstr ""
-"Se o Git detecta a renomea챌찾o de um diret처rio, afeta o que acontece no "
-"momento da mesclagem para os novos arquivos que foram adicionados para um "
-"diret처rio em um lado do hist처rico, quando este diret처rio foi renomeado do "
-"outro lado do hist처rico. Caso `merge.directoryRenames` esteja definido como "
-"\"false\", a detec챌찾o da renomea챌찾o do diret처rio ser찼 desativada, o que "
-"significa que estes novos arquivos ser찾o deixados para tr찼s no diret처rio "
-"antigo. Caso seja definido como \"true\", a detec챌찾o da renomea챌찾o do "
-"diret처rio ser찼 ativada, o que significa que esses novos arquivos ser찾o "
-"movidos para o novo diret처rio. Caso seja definido como \"conflict\", um "
-"conflito ser찼 relatado para tais caminhos. Caso `merge.renames` seja \"false"
-"\", a vari찼vel `merge.directoryRenames` ser찼 ignorada e tratado como \"false"
-"\". A predefini챌찾o 챕 \"conflict\"."
+msgstr "Se o Git detecta a renomea챌찾o de um diret처rio, afeta o que acontece no momento da mesclagem para os novos arquivos que foram adicionados para um diret처rio em um lado do hist처rico, quando este diret처rio foi renomeado do outro lado do hist처rico. Caso `merge.directoryRenames` esteja definido como \"false\", a detec챌찾o da renomea챌찾o do diret처rio ser찼 desativada, o que significa que estes novos arquivos ser찾o deixados para tr찼s no diret처rio antigo. Caso seja definido como \"true\", a detec챌찾o da renomea챌찾o do diret처rio ser찼 ativada, o que significa que esses novos arquivos ser찾o movidos para o novo diret처rio. Caso seja definido como \"conflict\", um conflito ser찼 relatado para tais caminhos. Caso `merge.renames` seja \"false\", a vari찼vel `merge.directoryRenames` ser찼 ignorada e tratado como \"false\". A predefini챌찾o 챕 \"conflict\"."
#. type: Labeled list
#: en/config/merge.txt:59
@@ -2971,15 +2667,7 @@ msgstr "merge.renormalize"
#: en/config/merge.txt:68
#, priority:240
msgid "Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5]."
-msgstr ""
-"Diga ao Git que a representa챌찾o can척nica dos arquivos no reposit처rio mudou "
-"ao longo do tempo (os commits mais recentes registra os arquivos de texto "
-"com termina챌천es de linha tipo CRLF, por챕m os mais recentes utilizam "
-"termina챌천es de linha tipo LF). Em reposit처rios deste tipo o Git pode "
-"converter os dados registrados nos commits para um formato can척nico antes de "
-"realizar uma mesclagem visando reduzir conflitos desnecess찼rios. Para obter "
-"mais informa챌천es consulte a se챌찾o \"Mesclando as ramifica챌천es com diferentes "
-"atributos de check-in/check-out\" em linkgit:gitattributes[5]."
+msgstr "Diga ao Git que a representa챌찾o can척nica dos arquivos no reposit처rio mudou ao longo do tempo (os commits mais recentes registra os arquivos de texto com termina챌천es de linha tipo CRLF, por챕m os mais recentes utilizam termina챌천es de linha tipo LF). Em reposit처rios deste tipo o Git pode converter os dados registrados nos commits para um formato can척nico antes de realizar uma mesclagem visando reduzir conflitos desnecess찼rios. Para obter mais informa챌천es consulte a se챌찾o \"Mesclando as ramifica챌천es com diferentes atributos de check-in/check-out\" em linkgit:gitattributes[5]."
#. type: Labeled list
#: en/config/merge.txt:69
@@ -2991,9 +2679,7 @@ msgstr "merge.stat"
#: en/config/merge.txt:72
#, priority:240
msgid "Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge. True by default."
-msgstr ""
-"Se deve imprimir a diferen챌a entre `ORIG_HEAD` e o resultado da mesclagem no "
-"final da mesclagem. A predefini챌찾o 챕 `true`."
+msgstr "Se deve imprimir a diferen챌a entre `ORIG_HEAD` e o resultado da mesclagem no final da mesclagem. A predefini챌찾o 챕 `true`."
#. type: Labeled list
#: en/config/merge.txt:73
@@ -3005,14 +2691,7 @@ msgstr "merge.autoStash"
#: en/config/merge.txt:82
#, priority:240
msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run merge on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts. This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1]. Defaults to false."
-msgstr ""
-"Quando definido como \"true\", crie automaticamente uma entrada tempor찼ria "
-"\"stash\" antes do in챠cio da opera챌찾o e aplique-a ap처s o t챕rmino. Significa "
-"que voc챗 pode executar a mesclagem em uma 찼rvore de trabalho \"dirty\" (suja)"
-". No entanto, utilize com cuidado: conflitos n찾o triviais podem acontecer "
-"caso a aplica챌찾o final do \"stash\" ocorra ap처s uma mesclagem bem-sucedida. "
-"Esta op챌찾o pode ser substitu챠da pelas op챌천es `--no-autostash` e `--autostash`"
-" do linkgit:git-merge[1]. 횋 predefinido como `false`."
+msgstr "Quando definido como \"true\", crie automaticamente uma entrada tempor찼ria \"stash\" antes do in챠cio da opera챌찾o e aplique-a ap처s o t챕rmino. Significa que voc챗 pode executar a mesclagem em uma 찼rvore de trabalho \"dirty\" (suja). No entanto, utilize com cuidado: conflitos n찾o triviais podem acontecer caso a aplica챌찾o final do \"stash\" ocorra ap처s uma mesclagem bem-sucedida. Esta op챌찾o pode ser substitu챠da pelas op챌천es `--no-autostash` e `--autostash` do linkgit:git-merge[1]. 횋 predefinido como `false`."
#. type: Labeled list
#: en/config/merge.txt:83
@@ -3024,12 +2703,7 @@ msgstr "merge.tool"
#: en/config/merge.txt:88
#, priority:240
msgid "Controls which merge tool is used by linkgit:git-mergetool[1]. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined."
-msgstr ""
-"Controla qual a ferramenta de mesclagem 챕 utilizada pelo linkgit:git-"
-"mergetool[1]. A lista abaixo exibe os valores predefinidos que s찾o v찼lidos "
-". Qualquer outro valor 챕 tratado como uma ferramenta de mesclagem "
-"personalizada e requer que uma vari찼vel `mergetool.<tool>.cmd` "
-"correspondente seja definida."
+msgstr "Controla qual a ferramenta de mesclagem 챕 utilizada pelo linkgit:git-mergetool[1]. A lista abaixo exibe os valores predefinidos que s찾o v찼lidos . Qualquer outro valor 챕 tratado como uma ferramenta de mesclagem personalizada e requer que uma vari찼vel `mergetool.<tool>.cmd` correspondente seja definida."
#. type: Labeled list
#: en/config/merge.txt:89
@@ -3041,12 +2715,7 @@ msgstr "merge.guitool"
#: en/config/merge.txt:94
#, priority:240
msgid "Controls which merge tool is used by linkgit:git-mergetool[1] when the -g/--gui flag is specified. The list below shows the valid built-in values. Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<guitool>.cmd variable is defined."
-msgstr ""
-"Controla qual a ferramenta de mesclagem 챕 utilizada pelo linkgit:git-"
-"mergetool[1] quando a op챌찾o `-g/--gui` for utilizada. A lista abaixo exibe "
-"os valores predefinidos que s찾o v찼lidos . Qualquer outro valor 챕 tratado "
-"como uma ferramenta de mesclagem personalizada e requer que uma vari찼vel "
-"`mergetool.<guitool>.cmd` correspondente seja definida."
+msgstr "Controla qual a ferramenta de mesclagem 챕 utilizada pelo linkgit:git-mergetool[1] quando a op챌찾o `-g/--gui` for utilizada. A lista abaixo exibe os valores predefinidos que s찾o v찼lidos . Qualquer outro valor 챕 tratado como uma ferramenta de mesclagem personalizada e requer que uma vari찼vel `mergetool.<guitool>.cmd` correspondente seja definida."
#. type: Labeled list
#: en/config/merge.txt:97
@@ -3058,13 +2727,7 @@ msgstr "merge.verbosity"
#: en/config/merge.txt:104
#, priority:240
msgid "Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. Can be overridden by the `GIT_MERGE_VERBOSITY` environment variable."
-msgstr ""
-"Controla a quantidade de sa챠da exibida pela estrat챕gia de mesclagem "
-"recursiva. O level 0 n찾o envia nada, exceto uma mensagem final de erro, "
-"caso conflitos sejam detectados. O level 1 gera apenas os conflitos na "
-"sa챠da, o 2 gera conflitos e altera챌천es nos arquivos. O level 5 e acima gera "
-"informa챌천es de depura챌찾o. 2 챕 o valor predefinido. Pode ser substitu챠do "
-"pela vari찼vel de ambiente `GIT_MERGE_VERBOSITY`."
+msgstr "Controla a quantidade de sa챠da exibida pela estrat챕gia de mesclagem recursiva. O level 0 n찾o envia nada, exceto uma mensagem final de erro, caso conflitos sejam detectados. O level 1 gera apenas os conflitos na sa챠da, o 2 gera conflitos e altera챌천es nos arquivos. O level 5 e acima gera informa챌천es de depura챌찾o. 2 챕 o valor predefinido. Pode ser substitu챠do pela vari찼vel de ambiente `GIT_MERGE_VERBOSITY`."
#. type: Labeled list
#: en/config/merge.txt:105
@@ -3076,9 +2739,7 @@ msgstr "merge.<driver>.name"
#: en/config/merge.txt:108
#, 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 o controle de mesclagem personalizado de baixo "
-"n챠vel. Para mais detalhes consulte linkgit:gitattributes[5]."
+msgstr "Define um nome leg챠vel para o controle de mesclagem personalizado de baixo n챠vel. Para mais detalhes consulte linkgit:gitattributes[5]."
#. type: Labeled list
#: en/config/merge.txt:109
@@ -3090,9 +2751,7 @@ msgstr "merge.<driver>.driver"
#: en/config/merge.txt:112
#, 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 ir찼 implementar o controle de mesclagem personalizado "
-"de baixo n챠vel. Para mais detalhes consulte linkgit:gitattributes[5]."
+msgstr "Define o comando que ir찼 implementar o controle de mesclagem personalizado de baixo n챠vel. Para mais detalhes consulte linkgit:gitattributes[5]."
#. type: Labeled list
#: en/config/merge.txt:113
@@ -3104,10 +2763,7 @@ msgstr "merge.<driver>.recursive"
#: en/config/merge.txt:116
#, 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 ""
-"Nomeia um controle de mesclagem de baixo n챠vel que ser찼 utilizado durante a "
-"execu챌찾o de uma mesclagem dos ancestrais em comum. Para mais detalhes "
-"consulte linkgit:gitattributes[5]."
+msgstr "Nomeia um controle de mesclagem de baixo n챠vel que ser찼 utilizado durante a execu챌찾o de uma mesclagem dos ancestrais em comum. Para mais detalhes consulte linkgit:gitattributes[5]."
#. type: Labeled list
#: en/config/fmt-merge-msg.txt:1
@@ -3119,9 +2775,7 @@ msgstr "merge.branchdesc"
#: en/config/fmt-merge-msg.txt:5
#, priority:240
msgid "In addition to branch names, populate the log message with the branch description text associated with them. Defaults to false."
-msgstr ""
-"Al챕m dos nomes das ramifica챌천es, preencha a mensagem do registro log com as "
-"descri챌천es em formato texto associadas com ela. 횋 predefinido como `false`."
+msgstr "Al챕m dos nomes das ramifica챌천es, preencha a mensagem do registro log com as descri챌천es em formato texto associadas com ela. 횋 predefinido como `false`."
#. type: Labeled list
#: en/config/fmt-merge-msg.txt:6
@@ -3133,11 +2787,7 @@ msgstr "merge.log"
#: en/config/fmt-merge-msg.txt:10
#, priority:240
msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged. Defaults to false, and true is a synonym for 20."
-msgstr ""
-"Al챕m dos nomes das ramifica챌천es, preencha o registro log com a mensagem com "
-"pelo menos a quantidade m찼xima especificada nas descri챌천es de uma linha a "
-"partir dos commits reais que est찾o sendo mesclados. A predefini챌찾o 챕 \"false"
-"\" ou \"true\" caso um sin척nimo seja 20."
+msgstr "Al챕m dos nomes das ramifica챌천es, preencha o registro log com a mensagem com pelo menos a quantidade m찼xima especificada nas descri챌천es de uma linha a partir dos commits reais que est찾o sendo mesclados. A predefini챌찾o 챕 \"false\" ou \"true\" caso um sin척nimo seja 20."
#. type: Title -
#: en/date-formats.txt:2
@@ -3173,11 +2823,7 @@ msgstr "Formato interno do Git"
#: en/date-formats.txt:15
#, priority:280
msgid "It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the number of seconds since the UNIX epoch. `<time zone offset>` is a positive or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) is `+0100`."
-msgstr ""
-"횋 `<unix timestamp> <time zone offset>`, onde desde a 챕poca do UNIX `<unix "
-"timestamp>` 챕 o valor em segundos. O `<time zone offset>` 챕 o desvio "
-"positivo ou negativo com bate no UTC. O CET por exemplo (onde 챕 1 hora 횪 "
-"frente do UTC ) 챕 `+0100`."
+msgstr "횋 `<unix timestamp> <time zone offset>`, onde desde a 챕poca do UNIX `<unix timestamp>` 챕 o valor em segundos. O `<time zone offset>` 챕 o desvio positivo ou negativo com bate no UTC. O CET por exemplo (onde 챕 1 hora 횪 frente do UTC ) 챕 `+0100`."
#. type: Labeled list
#: en/date-formats.txt:16
@@ -3199,17 +2845,13 @@ msgstr "ISO 8601"
#. type: Plain text
#: en/date-formats.txt:26
-#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
-msgstr ""
-"A data e hora definidas pela norma ISO 8601 `2005-04-07T22:13:13` por "
-"exemplo. O analisador tamb챕m aceita um espa챌o em vez do caractere `T`. O "
-"analisador aceita um espa챌o em vez do caractere `T` tamb챕m. As partes "
-"fracionadas de um segundo ser찾o ignoradas, logo `2005-04-07T22:13:13.019` "
-"por exemplo, ser찼 tratada como `2005-04-07T22:13:13`"
+#, fuzzy, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
+msgstr "A data e hora definidas pela norma ISO 8601 `2005-04-07T22:13:13` por exemplo. O analisador tamb챕m aceita um espa챌o em vez do caractere `T`. O analisador aceita um espa챌o em vez do caractere `T` tamb챕m. As partes fracionadas de um segundo ser찾o ignoradas, logo `2005-04-07T22:13:13.019` por exemplo, ser찼 tratada como `2005-04-07T22:13:13`"
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 "Al챕m disso, a parte da data 챕 aceita nos seguintes formatos: `YYYY.MM.DD`, `MM/DD/YYYY` e `DD.MM.YYYY`."
@@ -3224,17 +2866,13 @@ msgstr "Formato bruto na sa챠da"
#: en/diff-format.txt:6
#, priority:280
msgid "The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-diff-files\" and \"git diff --raw\" are very similar."
-msgstr ""
-"O formato bruto s찾o muito semelhantes na sa챠da dos comandos \"git-diff-"
-"index\", \"git-diff-tree\", \"git-diff-files\" e \"git diff --raw\"."
+msgstr "O formato bruto s찾o muito semelhantes na sa챠da dos comandos \"git-diff-index\", \"git-diff-tree\", \"git-diff-files\" e \"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 ""
-"Todos estes comandos comparam dois conjuntos de coisas; o que 챕 comparado "
-"difere de:"
+msgstr "Todos estes comandos comparam dois conjuntos de coisas; o que 챕 comparado difere de:"
#. type: Labeled list
#: en/diff-format.txt:10
@@ -3288,10 +2926,7 @@ msgstr "compara o 챠ndice e os arquivos no sistema de arquivos."
#: 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 ""
-"O comando \"git-diff-tree\" inicia a sua sa챠da imprimindo o hash do que est찼 "
-"sendo comparado. Depois disso, todos os comandos imprimem uma linha na sa챠da "
-"por arquivo modificado."
+msgstr "O comando \"git-diff-tree\" inicia a sua sa챠da imprimindo o hash do que est찼 sendo comparado. Depois disso, todos os comandos imprimem uma linha na sa챠da por arquivo modificado."
#. type: Plain text
#: en/diff-format.txt:27
@@ -3357,9 +2992,7 @@ msgstr "sha1 para \"src\"; 0\\{40\\} caso seja criado ou n찾o mesclado."
#: en/diff-format.txt:47
#, priority:280
msgid "sha1 for \"dst\"; 0\\{40\\} if creation, unmerged or \"look at work tree\"."
-msgstr ""
-"sha1 para \"dst\"; 0\\{40\\} caso seja criado, n찾o mesclado ou \"consultar a "
-"찼rvore de trabalho\"."
+msgstr "sha1 para \"dst\"; 0\\{40\\} caso seja criado, n찾o mesclado ou \"consultar a 찼rvore de trabalho\"."
#. type: Plain text
#: en/diff-format.txt:49
@@ -3383,8 +3016,7 @@ msgstr "path para \"src\""
#: 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 ""
-"uma aba ou um NUL quando a op챌찾o `-z` 챕 utilizada; existe apenas para C ou R."
+msgstr "uma aba ou um NUL quando a op챌찾o `-z` 챕 utilizada; existe apenas para C ou R."
#. type: Plain text
#: en/diff-format.txt:53
@@ -3396,8 +3028,7 @@ msgstr "path para \"dst\"; existe apenas para C ou R."
#: en/diff-format.txt:54
#, priority:280
msgid "an LF or a NUL when `-z` option is used, to terminate the record."
-msgstr ""
-"um LF ou um NUL quando a op챌찾o `-z` 챕 utilizada para finalizar o registro."
+msgstr "um LF ou um NUL quando a op챌찾o `-z` 챕 utilizada para finalizar o registro."
#. type: Plain text
#: en/diff-format.txt:56
@@ -3445,35 +3076,25 @@ msgstr "T: altera o tipo do arquivo"
#: en/diff-format.txt:65
#, priority:280
msgid "U: file is unmerged (you must complete the merge before it can be committed)"
-msgstr ""
-"U: o arquivo est찼 sem mesclagem (voc챗 deve concluir a mesclagem antes que o "
-"commit possa ser feito)"
+msgstr "U: o arquivo est찼 sem mesclagem (voc챗 deve concluir a mesclagem antes que o commit possa ser feito)"
#. type: Plain text
#: en/diff-format.txt:66
#, priority:280
msgid "X: \"unknown\" change type (most probably a bug, please report it)"
-msgstr ""
-"X: um tipo de altera챌찾o \"desconhecida\" (provavelmente um bug, por favor "
-"denuncie)"
+msgstr "X: um tipo de altera챌찾o \"desconhecida\" (provavelmente um bug, por favor denuncie)"
#. 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 ""
-"As letras de condi챌찾o C e R sempre s찾o seguidas por uma pontua챌찾o (indicando "
-"a porcentagem da semelhan챌a entre a origem e o destino da movimenta챌찾o ou da "
-"c처pia). A letra de condi챌찾o M pode ser seguida por uma pontua챌찾o (denotando "
-"a porcentagem de dissimilaridade) para reescrever os arquivos."
+msgstr "As letras de condi챌찾o C e R sempre s찾o seguidas por uma pontua챌찾o (indicando a porcentagem da semelhan챌a entre a origem e o destino da movimenta챌찾o ou da c처pia). A letra de condi챌찾o M pode ser seguida por uma pontua챌찾o (denotando a porcentagem de dissimilaridade) para reescrever os arquivos."
#. 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 ""
-"O <sha1> 챕 exibido zerado caso um arquivo seja novo no sistema de arquivos e "
-"esteja fora de sincronia com o 챠ndice."
+msgstr "O <sha1> 챕 exibido zerado caso um arquivo seja novo no sistema de arquivos e esteja fora de sincronia com o 챠ndice."
#. type: Labeled list
#: en/diff-format.txt:76 en/git-svn.txt:499 en/git-svn.txt:539
@@ -3491,11 +3112,7 @@ msgstr ":100644 100644 5be4a4a 0000000 M file.c\n"
#: en/diff-format.txt:85 en/git-ls-files.txt:212 en/git-ls-tree.txt:101
#, priority:280
msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). Using `-z` the filename is output verbatim and the line is terminated by a NUL byte."
-msgstr ""
-"Sem a op챌찾o `z`, os `pathnames` com os caracteres \"incomuns\" s찾o citados "
-"conforme explicado na vari찼vel da configura챌찾o `core.quotePath` (consulte "
-"linkgit:git-config[1]). Utilizando a op챌찾o `-z`, o nome do arquivo 챕 gerado "
-"literalmente e a linha 챕 finalizada com um byte `NUL`."
+msgstr "Sem a op챌찾o `z`, os `pathnames` com os caracteres \"incomuns\" s찾o citados conforme explicado na vari찼vel da configura챌찾o `core.quotePath` (consulte linkgit:git-config[1]). Utilizando a op챌찾o `-z`, o nome do arquivo 챕 gerado literalmente e a linha 챕 finalizada com um byte `NUL`."
#. type: Title -
#: en/diff-format.txt:87
@@ -3507,11 +3124,7 @@ msgstr "formato diff para as mesclagens"
#: en/diff-format.txt:93
#, priority:280
msgid "\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` or `--cc` option to generate diff output also for merge commits. The output differs from the format described above in the following way:"
-msgstr ""
-"Os comandos \"git-diff-tree\", \"git-diff-files\" e \"git-diff --raw\" podem "
-"utilizar as op챌천es `-c` ou `--cc` para tamb챕m gerar uma sa챠da \"diff\" com "
-"os commits mesclados. A sa챠da difere do formato descrito acima da seguinte "
-"maneira:"
+msgstr "Os comandos \"git-diff-tree\", \"git-diff-files\" e \"git-diff --raw\" podem utilizar as op챌천es `-c` ou `--cc` para tamb챕m gerar uma sa챠da \"diff\" com os commits mesclados. A sa챠da difere do formato descrito acima da seguinte maneira:"
#. type: Plain text
#: en/diff-format.txt:95
@@ -3529,8 +3142,7 @@ msgstr "existem mais modos \"src\" e \"src\" sha1"
#: en/diff-format.txt:97
#, priority:280
msgid "status is concatenated status characters for each parent"
-msgstr ""
-"a condi챌찾o 챕 concatenada como uma condi챌찾o dos caracteres para cada origem"
+msgstr "a condi챌찾o 챕 concatenada como uma condi챌찾o dos caracteres para cada origem"
#. type: Plain text
#: en/diff-format.txt:98
@@ -3548,19 +3160,13 @@ msgstr "os caminho(s) separado(s) por tabula챌천es do arquivo"
#: en/diff-format.txt:104
#, priority:280
msgid "For `-c` and `--cc`, only the destination or final path is shown even if the file was renamed on any side of history. With `--combined-all-paths`, the name of the path in each parent is shown followed by the name of the path in the merge commit."
-msgstr ""
-"Para as op챌천es `-c` e `--cc` apenas o destino ou o caminho final 챕 exibido "
-"ainda que o arquivo tenha sido renomeado em qualquer parte do hist처rico. "
-"Com a op챌찾o `--combined-all-paths`, o nome do caminho em cada origem 챕 "
-"exibido seguido pelo nome do caminho durante a mesclagem do commit."
+msgstr "Para as op챌천es `-c` e `--cc` apenas o destino ou o caminho final 챕 exibido ainda que o arquivo tenha sido renomeado em qualquer parte do hist처rico. Com a op챌찾o `--combined-all-paths`, o nome do caminho em cada origem 챕 exibido seguido pelo nome do caminho durante a mesclagem do commit."
#. type: Plain text
#: en/diff-format.txt:106
#, priority:280
msgid "Examples for `-c` and `--cc` without `--combined-all-paths`:"
-msgstr ""
-"Exemplos para as op챌천es `-c` e `--cc` sem utilizar a op챌찾o `--combined-all-"
-"paths`:"
+msgstr "Exemplos para as op챌천es `-c` e `--cc` sem utilizar a op챌찾o `--combined-all-paths`:"
#. type: delimited block -
#: en/diff-format.txt:110
@@ -3578,9 +3184,7 @@ msgstr ""
#: en/diff-format.txt:113
#, priority:280
msgid "Examples when `--combined-all-paths` added to either `-c` or `--cc`:"
-msgstr ""
-"Exemplos quando a op챌찾o `--combined-all-paths` 챕 adicionado entre `-c` ou "
-"`--cc`:"
+msgstr "Exemplos quando a op챌찾o `--combined-all-paths` 챕 adicionado entre `-c` ou `--cc`:"
#. type: delimited block -
#: en/diff-format.txt:118
@@ -3598,9 +3202,7 @@ msgstr ""
#: en/diff-format.txt:122
#, priority:280
msgid "Note that 'combined diff' lists only files which were modified from all parents."
-msgstr ""
-"Note que o 'diff combinado' lista apenas os arquivos que foram alterados em "
-"todas as origems."
+msgstr "Note que o 'diff combinado' lista apenas os arquivos que foram alterados em todas as origems."
#. type: Title -
#: en/diff-format.txt:128
@@ -3612,22 +3214,13 @@ msgstr "outros formatos diff"
#: en/diff-format.txt:134
#, priority:280
msgid "The `--summary` option describes newly added, deleted, renamed and copied files. The `--stat` option adds diffstat(1) graph to the output. These options can be combined with other options, such as `-p`, and are meant for human consumption."
-msgstr ""
-"A op챌찾o `--summary` descreve os arquivos adicionados, exclu챠dos, renomeados "
-"e copiados recentemente. A op챌찾o `--stat` adiciona o gr찼fico diffstat(1) 횪 "
-"sa챠da. Estas op챌천es podem ser combinadas com outras op챌천es como `-p`, que "
-"s찾o leg챠veis para n처s."
+msgstr "A op챌찾o `--summary` descreve os arquivos adicionados, exclu챠dos, renomeados e copiados recentemente. A op챌찾o `--stat` adiciona o gr찼fico diffstat(1) 횪 sa챠da. Estas op챌천es podem ser combinadas com outras op챌천es como `-p`, que s찾o leg챠veis para n처s."
#. type: Plain text
#: en/diff-format.txt:139
#, priority:280
msgid "When showing a change that involves a rename or a copy, `--stat` output formats the pathnames compactly by combining common prefix and suffix of the pathnames. For example, a change that moves `arch/i386/Makefile` to `arch/x86/Makefile` while modifying 4 lines will be shown like this:"
-msgstr ""
-"Ao exibir uma altera챌찾o que envolva uma renomea챌찾o ou uma c처pia, a sa챠da do "
-"comando `--stat` formata os nomes do caminho de forma compacta combinando o "
-"prefixo e sufixo comum aos nomes do caminho. Uma altera챌찾o que mova `arch/"
-"i386/Makefile` para `arch/x86/Makefile` enquanto modifica as 4 linhas ser찼 "
-"exibido assim:"
+msgstr "Ao exibir uma altera챌찾o que envolva uma renomea챌찾o ou uma c처pia, a sa챠da do comando `--stat` formata os nomes do caminho de forma compacta combinando o prefixo e sufixo comum aos nomes do caminho. Uma altera챌찾o que mova `arch/i386/Makefile` para `arch/x86/Makefile` enquanto modifica as 4 linhas ser찼 exibido assim:"
#. type: delimited block -
#: en/diff-format.txt:142
@@ -3639,9 +3232,7 @@ msgstr "arch/{i386 => x86}/Makefile | 4 +--\n"
#: en/diff-format.txt:147
#, priority:280
msgid "The `--numstat` option gives the diffstat(1) information but is designed for easier machine consumption. An entry in `--numstat` output looks like this:"
-msgstr ""
-"A op챌찾o `--numstat` fornece as informa챌천es diffstat(1), foi projetada para "
-"facilitar o consumo da m찼quina. Uma entrada na sa챠da `--numstat` fica assim:"
+msgstr "A op챌찾o `--numstat` fornece as informa챌천es diffstat(1), foi projetada para facilitar o consumo da m찼quina. Uma entrada na sa챠da `--numstat` fica assim:"
#. type: delimited block -
#: en/diff-format.txt:151
@@ -3681,8 +3272,7 @@ msgstr "a quantidade de linhas que foram exclu챠das;"
#: en/diff-format.txt:160
#, priority:280
msgid "pathname (possibly with rename/copy information);"
-msgstr ""
-"nome do caminho (possivelmente com informa챌천es para renomear ou copiar);"
+msgstr "nome do caminho (possivelmente com informa챌천es para renomear ou copiar);"
#. type: Plain text
#: en/diff-format.txt:161
@@ -3694,9 +3284,7 @@ msgstr "uma nova linha."
#: en/diff-format.txt:163
#, priority:280
msgid "When `-z` output option is in effect, the output is formatted this way:"
-msgstr ""
-"Quando a op챌찾o de sa챠da `-z` est찼 em vigor, a sa챠da 챕 formatada desta "
-"maneira:"
+msgstr "Quando a op챌찾o de sa챠da `-z` est찼 em vigor, a sa챠da 챕 formatada desta maneira:"
#. type: delimited block -
#: en/diff-format.txt:167
@@ -3742,13 +3330,7 @@ msgstr "um NUL."
#: en/diff-format.txt:185
#, priority:280
msgid "The extra `NUL` before the preimage path in renamed case is to allow scripts that read the output to tell if the current record being read is a single-path record or a rename/copy record without reading ahead. After reading added and deleted lines, reading up to `NUL` would yield the pathname, but if that is `NUL`, the record will show two paths."
-msgstr ""
-"O `NUL` extra antes do caminho da pr챕-imagem 챕 renomeado para permitir que "
-"os scripts que leem a sa챠da digam se o registro atual que est찼 sendo lido 챕 "
-"um registro do caminho 첬nico ou um nome para a renomea챌찾o ou c처pia sem fazer "
-"a leitura adiante. Depois de ler as linhas adicionadas e exclu챠das, a "
-"leitura at챕 o `NUL` produziria o nome do caminho, mas caso seja um `NUL`, o "
-"registro exibir찼 dois caminhos."
+msgstr "O `NUL` extra antes do caminho da pr챕-imagem 챕 renomeado para permitir que os scripts que leem a sa챠da digam se o registro atual que est찼 sendo lido 챕 um registro do caminho 첬nico ou um nome para a renomea챌찾o ou c처pia sem fazer a leitura adiante. Depois de ler as linhas adicionadas e exclu챠das, a leitura at챕 o `NUL` produziria o nome do caminho, mas caso seja um `NUL`, o registro exibir찼 dois caminhos."
#. type: Title -
#: en/diff-generate-patch.txt:2
@@ -3760,19 +3342,13 @@ msgstr "Gerando a corre챌찾o em um formato texto com a op챌찾o `-p`"
#: en/diff-generate-patch.txt:14
#, 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 ""
-"Executando linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], "
-"linkgit:git-diff-index[1], linkgit:git-diff-tree[1], ou linkgit:git-diff-"
-"files[1] com a op챌찾o `-p` produz um patch em formato texto. 횋 poss챠vel "
-"personalizar a cria챌찾o do patch em um formato texto atrav챕s das vari찼veis de "
-"ambiente `GIT_EXTERNAL_DIFF` e `GIT_DIFF_OPTS`."
+msgstr "Executando linkgit:git-diff[1], linkgit:git-log[1], linkgit:git-show[1], linkgit:git-diff-index[1], linkgit:git-diff-tree[1], ou linkgit:git-diff-files[1] com a op챌찾o `-p` produz um patch em formato texto. 횋 poss챠vel personalizar a cria챌찾o do patch em um formato texto atrav챕s das vari찼veis de ambiente `GIT_EXTERNAL_DIFF` e `GIT_DIFF_OPTS`."
#. type: Plain text
#: en/diff-generate-patch.txt:17
#, priority:260
msgid "What the -p option produces is slightly different from the traditional diff format:"
-msgstr ""
-"O que a op챌찾o `-p` produz 챕 um pouco diferente do formato diff tradicional:"
+msgstr "O que a op챌찾o `-p` produz 챕 um pouco diferente do formato diff tradicional:"
#. type: Plain text
#: en/diff-generate-patch.txt:19
@@ -3790,19 +3366,13 @@ msgstr "diff --git a/arquivo1 b/arquivo2\n"
#: en/diff-generate-patch.txt:25
#, priority:260
msgid "The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames."
-msgstr ""
-"Os nomes dos arquivos `a/` e `b/` s찾o os mesmos a menos que haja uma "
-"renomea챌찾o ou c처pia. Especialmente para uma cria챌찾o ou exclus찾o, `/dev/null`"
-" _n찾o_ 챕 utilizado no lugar dos nomes do arquivo `a/` ou `b/`."
+msgstr "Os nomes dos arquivos `a/` e `b/` s찾o os mesmos a menos que haja uma renomea챌찾o ou c처pia. Especialmente para uma cria챌찾o ou exclus찾o, `/dev/null` _n찾o_ 챕 utilizado no lugar dos nomes do arquivo `a/` ou `b/`."
#. type: Plain text
#: en/diff-generate-patch.txt:29
#, priority:260
msgid "When rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of the file that rename/copy produces, respectively."
-msgstr ""
-"Quando h찼 um envolvimento no processo de renomear ou copiar, `arquivo1` e "
-"`arquivo2` exibem o nome do arquivo de origem da renomea챌찾o ou c처pia e o "
-"nome do arquivo produzido pela renomea챌찾o ou copia respectivamente."
+msgstr "Quando h찼 um envolvimento no processo de renomear ou copiar, `arquivo1` e `arquivo2` exibem o nome do arquivo de origem da renomea챌찾o ou c처pia e o nome do arquivo produzido pela renomea챌찾o ou copia respectivamente."
#. type: Plain text
#: en/diff-generate-patch.txt:31
@@ -3842,57 +3412,37 @@ msgstr ""
#: en/diff-generate-patch.txt:46
#, priority:260
msgid "File modes are printed as 6-digit octal numbers including the file type and file permission bits."
-msgstr ""
-"Os modos dos arquivo s찾o impressos como n첬meros octais com 6 d챠gitos, "
-"incluindo o tipo do arquivo e dos bits de permiss찾o do arquivo."
+msgstr "Os modos dos arquivo s찾o impressos como n첬meros octais com 6 d챠gitos, incluindo o tipo do arquivo e dos bits de permiss찾o do arquivo."
#. type: Plain text
#: en/diff-generate-patch.txt:48
#, priority:260
msgid "Path names in extended headers do not include the `a/` and `b/` prefixes."
-msgstr ""
-"Os nomes do caminho nos cabe챌alhos estendidos n찾o incluem os prefixos `a/` e "
-"`b/`."
+msgstr "Os nomes do caminho nos cabe챌alhos estendidos n찾o incluem os prefixos `a/` e `b/`."
#. type: Plain text
#: en/diff-generate-patch.txt:55
#, priority:260
msgid "The similarity index is the percentage of unchanged lines, and the dissimilarity index is the percentage of changed lines. It is a rounded down integer, followed by a percent sign. The similarity index value of 100% is thus reserved for two equal files, while 100% dissimilarity means that no line from the old file made it into the new one."
-msgstr ""
-"O 챠ndice de similaridade 챕 a porcentagem das linhas inalteradas e o 챠ndice "
-"de dissimilaridade 챕 a porcentagem das linhas alteradas. 횋 um n첬mero "
-"inteiro arredondado, seguido por um sinal de porcentagem. O valor do 챠ndice "
-"de similaridade de 100% 챕 reservado para dois arquivos iguais, enquanto a "
-"dissimilaridade de 100% significa que nenhuma linha do arquivo antigo chegou "
-"ao novo."
+msgstr "O 챠ndice de similaridade 챕 a porcentagem das linhas inalteradas e o 챠ndice de dissimilaridade 챕 a porcentagem das linhas alteradas. 횋 um n첬mero inteiro arredondado, seguido por um sinal de porcentagem. O valor do 챠ndice de similaridade de 100% 챕 reservado para dois arquivos iguais, enquanto a dissimilaridade de 100% significa que nenhuma linha do arquivo antigo chegou ao novo."
#. type: Plain text
#: en/diff-generate-patch.txt:59
#, 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 do 챠ndice inclui os nomes dos objetos bolha antes e depois da "
-"altera챌찾o. O `<modo>` ser찼 inclu챠do caso o modo do arquivo n찾o seja "
-"alterado; caso contr찼rio, linhas separadas indicam o modo antigo e o novo."
+msgstr "A linha do 챠ndice inclui os nomes dos objetos bolha antes e depois da altera챌찾o. O `<modo>` ser찼 inclu챠do caso o modo do arquivo n찾o seja alterado; caso contr찼rio, linhas separadas indicam o modo antigo e o novo."
#. type: Plain text
#: en/diff-generate-patch.txt:63
#, priority:260
msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgstr ""
-"Os nomes dos caminhos com caracteres \"incomuns\" s찾o citados como j찼 "
-"explicado na vari찼vel da configura챌찾o `core.quotePath` (consulte linkgit:git-"
-"config[1])."
+msgstr "Os nomes dos caminhos com caracteres \"incomuns\" s찾o citados como j찼 explicado na vari찼vel da configura챌찾o `core.quotePath` (consulte linkgit:git-config[1])."
#. type: Plain text
#: en/diff-generate-patch.txt:68
#, priority:260
msgid "All the `file1` files in the output refer to files before the commit, and all the `file2` files refer to files after the commit. It is incorrect to apply each change to each file sequentially. For example, this patch will swap a and b:"
-msgstr ""
-"Todos os arquivos `arquivo1` na sa챠da se referem aos arquivos antes do "
-"commit e todos os arquivos `arquivo2` se referem aos arquivos ap처s o "
-"commit. 횋 incorreto aplicar cada altera챌찾o em cada arquivo "
-"sequencialmente. Por exemplo, este patch ir찼 substituir a e b:"
+msgstr "Todos os arquivos `arquivo1` na sa챠da se referem aos arquivos antes do commit e todos os arquivos `arquivo2` se referem aos arquivos ap처s o commit. 횋 incorreto aplicar cada altera챌찾o em cada arquivo sequencialmente. Por exemplo, este patch ir찼 substituir a e b:"
#. type: Plain text
#: en/diff-generate-patch.txt:75
@@ -3922,13 +3472,7 @@ msgstr "Formato diff combinado"
#: en/diff-generate-patch.txt:86
#, priority:260
msgid "Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also that you can give the `-m` option to any of these commands to force generation of diffs with individual parents of a merge."
-msgstr ""
-"Qualquer comando que gere um diff pode utilizar a op챌찾o `-c` ou `--cc` para "
-"produzir um 'diff combinado' ao exibir uma mesclagem. Este 챕 o formato "
-"predefinido durante a exibi챌찾o das mesclagens com linkgit:git-diff[1] or "
-"linkgit:git-show[1]. Observe tamb챕m que 챕 poss챠vel utilizar a op챌찾o `-m` com "
-"qualquer um destes comandos para impor a gera챌찾o dos diffs com as origens "
-"individuais de uma mesclagem."
+msgstr "Qualquer comando que gere um diff pode utilizar a op챌찾o `-c` ou `--cc` para produzir um 'diff combinado' ao exibir uma mesclagem. Este 챕 o formato predefinido durante a exibi챌찾o das mesclagens com linkgit:git-diff[1] or linkgit:git-show[1]. Observe tamb챕m que 챕 poss챠vel utilizar a op챌찾o `-m` com qualquer um destes comandos para impor a gera챌찾o dos diffs com as origens individuais de uma mesclagem."
#. type: Plain text
#: en/diff-generate-patch.txt:88
@@ -4008,9 +3552,7 @@ msgstr ""
#: en/diff-generate-patch.txt:121
#, priority:260
msgid "It is preceded with a \"git diff\" header, that looks like this (when the `-c` option is used):"
-msgstr ""
-"Ele 챕 precedido por um cabe챌alho \"git diff\" parecido com este (quando a "
-"op챌찾o `-c` 챕 utilizada):"
+msgstr "Ele 챕 precedido por um cabe챌alho \"git diff\" parecido com este (quando a op챌찾o `-c` 챕 utilizada):"
#. type: Plain text
#: en/diff-generate-patch.txt:123
@@ -4034,9 +3576,7 @@ msgstr " diff --cc arquivo\n"
#: en/diff-generate-patch.txt:130
#, priority:260
msgid "It is followed by one or more extended header lines (this example shows a merge with two parents):"
-msgstr ""
-"Ele 챕 seguido por uma ou mais linhas estendidas do cabe챌alho (este exemplo "
-"exibe uma mesclagem com duas origens):"
+msgstr "Ele 챕 seguido por uma ou mais linhas estendidas do cabe챌alho (este exemplo exibe uma mesclagem com duas origens):"
#. type: Plain text
#: en/diff-generate-patch.txt:135
@@ -4056,12 +3596,7 @@ msgstr ""
#: en/diff-generate-patch.txt:141
#, priority:260
msgid "The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format."
-msgstr ""
-"A linha `modo <modo>,<modo>..<modo>` aparece apenas caso pelo menos um dos "
-"<modos> seja diferente do restante. Os cabe챌alhos estendidos com informa챌천es "
-"sobre a movimenta챌찾o do conte첬do detectado (renomea챌찾o e detec챌찾o da c처pia) "
-"s찾o projetados para trabalhar com o diff com dois `<tree-ish>` e n찾o s찾o "
-"utilizados pelo formato diff combinado."
+msgstr "A linha `modo <modo>,<modo>..<modo>` aparece apenas caso pelo menos um dos <modos> seja diferente do restante. Os cabe챌alhos estendidos com informa챌천es sobre a movimenta챌찾o do conte첬do detectado (renomea챌찾o e detec챌찾o da c처pia) s찾o projetados para trabalhar com o diff com dois `<tree-ish>` e n찾o s찾o utilizados pelo formato diff combinado."
#. type: Plain text
#: en/diff-generate-patch.txt:143
@@ -4085,40 +3620,25 @@ msgstr "b/arquivo"
#: en/diff-generate-patch.txt:150
#, priority:260
msgid "Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files."
-msgstr ""
-"Semelhante ao cabe챌alho de duas linhas para o formato diff tradicional "
-"'unificado', o `/dev/null` 챕 utilizado para sinalizar os arquivos criados ou "
-"exclu챠dos."
+msgstr "Semelhante ao cabe챌alho de duas linhas para o formato diff tradicional 'unificado', o `/dev/null` 챕 utilizado para sinalizar os arquivos criados ou exclu챠dos."
#. type: Plain text
#: en/diff-generate-patch.txt:154
#, priority:260
msgid "However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, where N is the number of parents in the merge commit"
-msgstr ""
-"No entanto, caso a op챌찾o `--combined-all-paths` seja utilizada, em vez de "
-"duas linhas do arquivo/para o arquivo, ser찼 obtido um cabe챌alho `N+1` do "
-"cabe챌alho do arquivo de \"origem\" para o arquivo de \"destino\" onde N 챕 a "
-"quantidade de origens na mesclagem do commit"
+msgstr "No entanto, caso a op챌찾o `--combined-all-paths` seja utilizada, em vez de duas linhas do arquivo/para o arquivo, ser찼 obtido um cabe챌alho `N+1` do cabe챌alho do arquivo de \"origem\" para o arquivo de \"destino\" onde N 챕 a quantidade de origens na mesclagem do commit"
#. type: Plain text
#: en/diff-generate-patch.txt:163
#, priority:260
msgid "This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents."
-msgstr ""
-"Este formato estendido pode ser 첬til caso a detec챌찾o da renomea챌찾o ou c처pia "
-"esteja ativa, permitindo que voc챗 veja o nome original do arquivo em "
-"diferentes origens."
+msgstr "Este formato estendido pode ser 첬til caso a detec챌찾o da renomea챌찾o ou c처pia esteja ativa, permitindo que voc챗 veja o nome original do arquivo em diferentes origens."
#. type: Plain text
#: en/diff-generate-patch.txt:169
#, 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 prevenir que as pessoas o "
-"alimentem acidentalmente com `patch -p1`. O formato diff combinado foi "
-"criado para revisar as altera챌천es da mesclagem dos commits e n찾o era para "
-"ser aplicado. A altera챌찾o 챕 semelhante a altera챌찾o no cabe챌alho estendido do "
-"'챠ndice':"
+msgstr "O formato do cabe챌alho do peda챌o 챕 modificado para prevenir que as pessoas o alimentem acidentalmente com `patch -p1`. O formato diff combinado foi criado para revisar as altera챌천es da mesclagem dos commits e n찾o era para ser aplicado. A altera챌찾o 챕 semelhante a altera챌찾o no cabe챌alho estendido do '챠ndice':"
#. type: Plain text
#: en/diff-generate-patch.txt:171
@@ -4130,56 +3650,31 @@ msgstr "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
#: en/diff-generate-patch.txt:174
#, priority:260
msgid "There are (number of parents + 1) `@` characters in the chunk header for combined diff format."
-msgstr ""
-"Existem (a quantidade de origens + 1) caracteres `@` no cabe챌alho do bloco "
-"para o formato diff combinado."
+msgstr "Existem (a quantidade de origens + 1) caracteres `@` no cabe챌alho do bloco para o formato diff combinado."
#. type: Plain text
#: en/diff-generate-patch.txt:183
#, ignore-ellipsis, priority:260
msgid "Unlike the traditional 'unified' diff format, which shows two files A and B with a single column that has `-` (minus -- appears in A but removed in B), `+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) prefix, this format compares two or more files file1, file2,... with one file X, and shows how X differs from each of fileN. One column for each of fileN is prepended to the output line to note how X's line is different from it."
-msgstr ""
-"Diferente do formato diff 'unificado' tradicional que exiba os dois arquivos "
-"A e B com uma 첬nica coluna que possua o sinal de menos `-` (o sinal de menos "
-"-- aparece em A mas 챕 removido em B), `+` (o sinal de mais -- ausente em A, "
-"mas adicionado em B), ou o prefixo `\" \"` (sem altera챌찾o -- de espa챌o), "
-"este formato compara dois ou mais arquivos arquivo1, arquivo2, ... com um "
-"arquivo X e exibe como X difere de cada arquivoN. Uma coluna para cada "
-"arquivoN 챕 anexada 횪 linha de sa챠da para observar como a linha de X 챕 "
-"diferente dela."
+msgstr "Diferente do formato diff 'unificado' tradicional que exiba os dois arquivos A e B com uma 첬nica coluna que possua o sinal de menos `-` (o sinal de menos -- aparece em A mas 챕 removido em B), `+` (o sinal de mais -- ausente em A, mas adicionado em B), ou o prefixo `\" \"` (sem altera챌찾o -- de espa챌o), este formato compara dois ou mais arquivos arquivo1, arquivo2, ... com um arquivo X e exibe como X difere de cada arquivoN. Uma coluna para cada arquivoN 챕 anexada 횪 linha de sa챠da para observar como a linha de X 챕 diferente dela."
#. type: Plain text
#: en/diff-generate-patch.txt:189
#, priority:260
msgid "A `-` character in the column N means that the line appears in fileN but it does not appear in the result. A `+` character in the column N means that the line appears in the result, and fileN does not have that line (in other words, the line was added, from the point of view of that parent)."
-msgstr ""
-"Um caractere `-` na coluna N significa que a linha aparece no \"arquivoN\", "
-"mas n찾o aparece no resultado. Um caractere `+` na coluna N significa que a "
-"linha aparece no resultado e o arquivoN n찾o possui essa linha (em outras "
-"palavras, a linha foi adicionada, do ponto de vista dessa origem)."
+msgstr "Um caractere `-` na coluna N significa que a linha aparece no \"arquivoN\", mas n찾o aparece no resultado. Um caractere `+` na coluna N significa que a linha aparece no resultado e o arquivoN n찾o possui essa linha (em outras palavras, a linha foi adicionada, do ponto de vista dessa origem)."
#. type: Plain text
#: en/diff-generate-patch.txt:195
#, priority:260
msgid "In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear in either file1 or file2). Also eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`)."
-msgstr ""
-"Na sa챠da do exemplo acima, a assinatura da fun챌찾o foi alterada nos dois "
-"arquivos (portanto, duas remo챌천es `-` do arquivo1 e do arquivo2, mais `++` "
-"significa que uma linha que foi adicionada n찾o aparece no arquivo1 ou no "
-"arquivo2). Outras oito linhas tamb챕m s찾o iguais no arquivo1, mas n찾o "
-"aparecem no arquivo2 (portanto, prefixadas com `+`)."
+msgstr "Na sa챠da do exemplo acima, a assinatura da fun챌찾o foi alterada nos dois arquivos (portanto, duas remo챌천es `-` do arquivo1 e do arquivo2, mais `++` significa que uma linha que foi adicionada n찾o aparece no arquivo1 ou no arquivo2). Outras oito linhas tamb챕m s찾o iguais no arquivo1, mas n찾o aparecem no arquivo2 (portanto, prefixadas com `+`)."
#. type: Plain text
#: en/diff-generate-patch.txt:201
#, priority:260
msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents). When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
-msgstr ""
-"Quando exibido pelo comando `git diff-tree -c`, compara as origens de um "
-"commit mesclado com o resultado da mesclagem (ou seja, arquivo1..arquivoN "
-"s찾o as origens). Quando exibido pelo comando `git diff-files -c`, as duas "
-"origens com as suas respectivas mesclagens n찾o resolvidas com o arquivo da "
-"찼rvore de trabalho (ou seja, arquivo1 챕 o est찼gio 2, conhecido como \"nossa "
-"vers찾o\", o arquivo2 챕 o est찼gio 3, conhecido como \"a vers찾o deles\")."
+msgstr "Quando exibido pelo comando `git diff-tree -c`, compara as origens de um commit mesclado com o resultado da mesclagem (ou seja, arquivo1..arquivoN s찾o as origens). Quando exibido pelo comando `git diff-files -c`, as duas origens com as suas respectivas mesclagens n찾o resolvidas com o arquivo da 찼rvore de trabalho (ou seja, arquivo1 챕 o est찼gio 2, conhecido como \"nossa vers찾o\", o arquivo2 챕 o est찼gio 3, conhecido como \"a vers찾o deles\")."
#. type: Labeled list
#: en/diff-options.txt:17 en/git-rebase.txt:409 en/merge-options.txt:93
@@ -4233,9 +3728,7 @@ msgstr "--no-patch"
#: en/diff-options.txt:34
#, priority:280
msgid "Suppress diff output. Useful for commands like `git show` that show the patch by default, or to cancel the effect of `--patch`."
-msgstr ""
-"Suprime a sa챠da diff. 횣til para comandos como `git show` que por "
-"predefini챌찾o exibem a corre챌찾o ou para cancelar o efeito de `--patch`."
+msgstr "Suprime a sa챠da diff. 횣til para comandos como `git show` que por predefini챌찾o exibem a corre챌찾o ou para cancelar o efeito de `--patch`."
#. type: Labeled list
#: en/diff-options.txt:36
@@ -4253,9 +3746,7 @@ msgstr "--unified=<n>"
#: en/diff-options.txt:40
#, priority:280
msgid "Generate diffs with <n> lines of context instead of the usual three. Implies `--patch`."
-msgstr ""
-"Gere diffs com uma quantidade de `<n>` linhas de contexto em vez das tr챗s "
-"usuais. Implica no uso da op챌찾o `--patch`."
+msgstr "Gere diffs com uma quantidade de `<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
@@ -4297,10 +3788,7 @@ msgstr "--output-indicator-context=<char>"
#: en/diff-options.txt:53
#, priority:280
msgid "Specify the character used to indicate new, old or context lines in the generated patch. Normally they are '+', '-' and ' ' respectively."
-msgstr ""
-"Informe o caractere que ser찼 utilizado para indicar as linhas novas, antigas "
-"ou do contexto no patch que foi gerado. Normalmente eles s찾o '+', '-' e ' ' "
-"respectivamente."
+msgstr "Informe o caractere que ser찼 utilizado para indicar as linhas novas, antigas ou do contexto no patch que foi gerado. Normalmente eles s찾o '+', '-' e ' ' respectivamente."
#. type: Labeled list
#: en/diff-options.txt:55 en/git-replace.txt:78 en/git-verify-commit.txt:19 en/git-verify-tag.txt:19
@@ -4352,9 +3840,7 @@ msgstr "--indent-heuristic"
#: en/diff-options.txt:79
#, priority:280
msgid "Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default."
-msgstr ""
-"Ativa a heur챠stica que altera os limites dos peda챌os diferentes para "
-"facilitar a leitura dos patches. Esta 챕 a predefini챌찾o."
+msgstr "Ativa a heur챠stica que altera os limites dos peda챌os diferentes para facilitar a leitura dos patches. Esta 챕 a predefini챌찾o."
#. type: Labeled list
#: en/diff-options.txt:80
@@ -4378,9 +3864,7 @@ msgstr "--minimal"
#: en/diff-options.txt:86 en/diff-options.txt:112
#, priority:280
msgid "Spend extra time to make sure the smallest possible diff is produced."
-msgstr ""
-"Expenda um tempo extra para garantir que o menor diferencial poss챠vel seja "
-"produzido."
+msgstr "Expenda um tempo extra para garantir que o menor diferencial poss챠vel seja produzido."
#. type: Labeled list
#: en/diff-options.txt:87
@@ -4428,10 +3912,7 @@ msgstr "Esta op챌찾o pode ser especificada mais de uma vez."
#: en/diff-options.txt:102
#, priority:280
msgid "If a line exists in both the source and destination, exists only once, and starts with this text, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the \"patience diff\" algorithm internally."
-msgstr ""
-"Caso uma linha exista na origem e no destino, exista apenas uma vez e comece "
-"com este texto, este algoritmo tenta impedir que apare챌a como uma exclus찾o "
-"ou adi챌찾o na sa챠da. Ele usa o algoritmo \"pacience diff\" internamente."
+msgstr "Caso uma linha exista na origem e no destino, exista apenas uma vez e comece com este texto, este algoritmo tenta impedir que apare챌a como uma exclus찾o ou adi챌찾o na sa챠da. Ele usa o algoritmo \"pacience diff\" internamente."
#. type: Labeled list
#: en/diff-options.txt:103
@@ -4455,8 +3936,7 @@ msgstr "`default`, `myers`"
#: en/diff-options.txt:109
#, priority:280
msgid "The basic greedy diff algorithm. Currently, this is the default."
-msgstr ""
-"O algoritmo diff ganancioso b찼sico. Atualmente, este 챕 o valor predefinido."
+msgstr "O algoritmo diff ganancioso b찼sico. Atualmente, este 챕 o valor predefinido."
#. type: Labeled list
#: en/diff-options.txt:109
@@ -4492,10 +3972,7 @@ msgstr "Este algoritmo estende o algoritmo de paci챗ncia para \"suportar element
#: en/diff-options.txt:122
#, priority:280
msgid "For instance, if you configured the `diff.algorithm` variable to a non-default value and want to use the default one, then you have to use `--diff-algorithm=default` option."
-msgstr ""
-"Caso tenha configurado uma vari찼vel `diff.algorithm` para um valor sem "
-"predefini챌찾o e quer utilizar a vari찼vel predefinida por exemplo, ent찾o "
-"utilize a op챌찾o `--diff-algorithm=default`."
+msgstr "Caso tenha configurado uma vari찼vel `diff.algorithm` para um valor sem predefini챌찾o e quer utilizar a vari찼vel predefinida por exemplo, ent찾o utilize a op챌찾o `--diff-algorithm=default`."
#. type: Labeled list
#: en/diff-options.txt:123
@@ -4507,27 +3984,13 @@ msgstr "--stat[=<largura>[,<largura-do-nome>[,<count>]]]"
#: en/diff-options.txt:137
#, ignore-ellipsis, priority:280
msgid "Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by `<width>`. The width of the filename part can be limited by giving another width `<name-width>` after a comma. The width of the graph part can be limited by using `--stat-graph-width=<width>` (affects all commands generating a stat graph) or by setting `diff.statGraphWidth=<width>` (does not affect `git format-patch`). By giving a third parameter `<count>`, you can limit the output to the first `<count>` lines, followed by `...` if there are more."
-msgstr ""
-"Gera um diffstat. 횋 predefinido que o espa챌o necess찼rio ser찼 utilizado para "
-"a parte do nome do arquivo e o restante para a parte do gr찼fico. A largura "
-"m찼xima 챕 predefinida como a largura do terminal ou 80 colunas, caso n찾o "
-"esteja conectada em um terminal e pode ser substitu챠da por `<largura>`. A "
-"largura da parte do nome do arquivo pode ser limitada, fornecendo outra "
-"largura `<largura-do-nome>` ap처s uma v챠rgula. A largura da parte do gr찼fico "
-"pode ser limitada utilizando `--stat-graph-width=<largura>` (afeta todos os "
-"comandos que geram um gr찼fico estat챠stico) ou definindo `diff."
-"statGraphWidth=<largura>` (n찾o afeta o `git format-patch`). Ao fornecer um "
-"terceiro par창metro `<count>`, 챕 poss챠vel limitar a sa챠da 횪s primeiras linhas "
-"`<count>`, seguidas por `...` caso haja mais."
+msgstr "Gera um diffstat. 횋 predefinido que o espa챌o necess찼rio ser찼 utilizado para a parte do nome do arquivo e o restante para a parte do gr찼fico. A largura m찼xima 챕 predefinida como a largura do terminal ou 80 colunas, caso n찾o esteja conectada em um terminal e pode ser substitu챠da por `<largura>`. A largura da parte do nome do arquivo pode ser limitada, fornecendo outra largura `<largura-do-nome>` ap처s uma v챠rgula. A largura da parte do gr찼fico pode ser limitada utilizando `--stat-graph-width=<largura>` (afeta todos os comandos que geram um gr찼fico estat챠stico) ou definindo `diff.statGraphWidth=<largura>` (n찾o afeta o `git format-patch`). Ao fornecer um terceiro par창metro `<count>`, 챕 poss챠vel limitar a sa챠da 횪s primeiras linhas `<count>`, seguidas por `...` caso haja mais."
#. type: Plain text
#: en/diff-options.txt:140
#, priority:280
msgid "These parameters can also be set individually with `--stat-width=<width>`, `--stat-name-width=<name-width>` and `--stat-count=<count>`."
-msgstr ""
-"Estes par창metros tamb챕m podem ser ajustados individualmente com `--stat-"
-"width=<largura>`, `--stat-name-width=<largura-do-nome>` e `--stat-"
-"count=<count>`."
+msgstr "Estes par창metros tamb챕m podem ser ajustados individualmente com `--stat-width=<largura>`, `--stat-name-width=<largura-do-nome>` e `--stat-count=<count>`."
#. type: Labeled list
#: en/diff-options.txt:141
@@ -4539,13 +4002,7 @@ msgstr "--compact-summary"
#: en/diff-options.txt:148
#, priority:280
msgid "Output a condensed summary of extended header information such as file creations or deletions (\"new\" or \"gone\", optionally \"+l\" if it's a symlink) and mode changes (\"+x\" or \"-x\" for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies `--stat`."
-msgstr ""
-"A sa챠da de um resumo condensado das informa챌천es do cabe챌alho estendido como "
-"cria챌천es ou exclus천es dos arquivos (\"novo\" ou \"desaparecido\", "
-"opcionalmente \"+l\" se for um link simb처lico) e altera챌천es do modo (\"+x\" "
-"ou \"-x\" para adicionar ou remover um bit execut찼vel, respectivamente) no "
-"diffstat. As informa챌천es s찾o colocadas entre a parte do nome do arquivo e a "
-"parte do gr찼fico. Implica no uso da op챌찾o `--stat`."
+msgstr "A sa챠da de um resumo condensado das informa챌천es do cabe챌alho estendido como cria챌천es ou exclus천es dos arquivos (\"novo\" ou \"desaparecido\", opcionalmente \"+l\" se for um link simb처lico) e altera챌천es do modo (\"+x\" ou \"-x\" para adicionar ou remover um bit execut찼vel, respectivamente) no diffstat. As informa챌천es s찾o colocadas entre a parte do nome do arquivo e a parte do gr찼fico. Implica no uso da op챌찾o `--stat`."
#. type: Labeled list
#: en/diff-options.txt:149 en/git-apply.txt:45
@@ -4557,10 +4014,7 @@ msgstr "--numstat"
#: en/diff-options.txt:155
#, priority:280
msgid "Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`."
-msgstr ""
-"Semelhante ao `--stat`, exibe a quantidade de linhas adicionadas, exclu챠das, "
-"em nota챌찾o decimal e o nome do caminho sem abrevia챌찾o, para torn찼-lo mais "
-"amig찼vel 횪 m찼quina. Para arquivos bin찼rios, gera dois `-` em vez de `0 0`."
+msgstr "Semelhante ao `--stat`, exibe a quantidade de linhas adicionadas, exclu챠das, em nota챌찾o decimal e o nome do caminho sem abrevia챌찾o, para torn찼-lo mais amig찼vel 횪 m찼quina. Para arquivos bin찼rios, gera dois `-` em vez de `0 0`."
#. type: Labeled list
#: en/diff-options.txt:156
@@ -4572,10 +4026,7 @@ msgstr "--shortstat"
#: en/diff-options.txt:160
#, priority:280
msgid "Output only the last line of the `--stat` format containing total number of modified files, as well as number of added and deleted lines."
-msgstr ""
-"Produz apenas a 첬ltima linha do formato `--stat` contendo a quantidade total "
-"dos arquivos modificados, assim como a quantidade de linhas adicionadas e "
-"exclu챠das."
+msgstr "Produz apenas a 첬ltima linha do formato `--stat` contendo a quantidade total dos arquivos modificados, assim como a quantidade de linhas adicionadas e exclu챠das."
#. type: Labeled list
#: en/diff-options.txt:161
@@ -4593,12 +4044,7 @@ msgstr "--dirstat[=<param1,param2,...>]"
#: en/diff-options.txt:169
#, priority:280
msgid "Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters. The defaults are controlled by the `diff.dirstat` configuration variable (see linkgit:git-config[1]). The following parameters are available:"
-msgstr ""
-"Produz a distribui챌찾o da quantidade relativa de altera챌천es para cada "
-"subdiret처rio. O comportamento do `--dirstat` pode ser customizado passando "
-"uma lista de par창metros separados por v챠rgula. As predefini챌천es s찾o "
-"controlados pela vari찼vel da configura챌찾o `diff.dirstat` (veja linkgit:git-"
-"config[1]). Os seguintes par창metros est찾o dispon챠veis:"
+msgstr "Produz a distribui챌찾o da quantidade relativa de altera챌천es para cada subdiret처rio. O comportamento do `--dirstat` pode ser customizado passando uma lista de par창metros separados por v챠rgula. As predefini챌천es s찾o controlados pela vari찼vel da configura챌찾o `diff.dirstat` (veja linkgit:git-config[1]). Os seguintes par창metros est찾o dispon챠veis:"
#. type: Labeled list
#: en/diff-options.txt:171
@@ -4610,12 +4056,7 @@ msgstr "`changes`"
#: en/diff-options.txt:177
#, priority:280
msgid "Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file. In other words, rearranging lines in a file is not counted as much as other changes. This is the default behavior when no parameter is given."
-msgstr ""
-"Calcule os n첬meros \"dirstat\" contando as linhas que foram removidas da "
-"fonte ou adicionadas ao destino. Ignora a quantidade de movimentos de c처digo "
-"puro em um arquivo. Em outras palavras, reorganizar as linhas em um arquivo "
-"n찾o conta tanto quanto as outras altera챌천es. Este 챕 o comportamento "
-"predefinido quando nenhum par창metro for utilizado."
+msgstr "Calcule os n첬meros \"dirstat\" contando as linhas que foram removidas da fonte ou adicionadas ao destino. Ignora a quantidade de movimentos de c처digo puro em um arquivo. Em outras palavras, reorganizar as linhas em um arquivo n찾o conta tanto quanto as outras altera챌천es. Este 챕 o comportamento predefinido quando nenhum par창metro for utilizado."
#. type: Labeled list
#: en/diff-options.txt:177
@@ -4627,15 +4068,7 @@ msgstr "`lines`"
#: en/diff-options.txt:185
#, priority:280
msgid "Compute the dirstat numbers by doing the regular line-based diff analysis, and summing the removed/added line counts. (For binary files, count 64-byte chunks instead, since binary files have no natural concept of lines). This is a more expensive `--dirstat` behavior than the `changes` behavior, but it does count rearranged lines within a file as much as other changes. The resulting output is consistent with what you get from the other `--*stat` options."
-msgstr ""
-"Calcule os n첬meros \"dirstat\" fazendo a an찼lise diferencial com base nas "
-"linhas regulares e somando as contagens das linhas removidas / adicionadas. ("
-"Para os arquivos bin찼rios, conte em blocos de 64 bytes, pois os arquivos "
-"bin찼rios n찾o t챗m um conceito natural de linhas). Este 챕 um comportamento "
-"mais dispendioso do `--dirstat` do que o comportamento `changes` (altera챌천es)"
-", conta as linhas reorganizadas em um arquivo tanto quanto as outras "
-"altera챌천es. A produ챌찾o resultante 챕 consistente com o que voc챗 obt챕m das "
-"outras op챌천es `--*stat`."
+msgstr "Calcule os n첬meros \"dirstat\" fazendo a an찼lise diferencial com base nas linhas regulares e somando as contagens das linhas removidas / adicionadas. (Para os arquivos bin찼rios, conte em blocos de 64 bytes, pois os arquivos bin찼rios n찾o t챗m um conceito natural de linhas). Este 챕 um comportamento mais dispendioso do `--dirstat` do que o comportamento `changes` (altera챌천es), conta as linhas reorganizadas em um arquivo tanto quanto as outras altera챌천es. A produ챌찾o resultante 챕 consistente com o que voc챗 obt챕m das outras op챌천es `--*stat`."
#. type: Labeled list
#: en/diff-options.txt:185
@@ -4647,11 +4080,7 @@ msgstr "`files`"
#: en/diff-options.txt:190
#, priority:280
msgid "Compute the dirstat numbers by counting the number of files changed. Each changed file counts equally in the dirstat analysis. This is the computationally cheapest `--dirstat` behavior, since it does not have to look at the file contents at all."
-msgstr ""
-"Calcule os n첬meros \"dirstat\" contando a quantidade de arquivos alterados. "
-"Cada arquivo alterado conta igualmente na an찼lise do \"dirstat\". Este 챕 o "
-"comportamento computacional mais barato do `--dirstat`, pois n찾o precisa "
-"olhar o conte첬do do arquivo."
+msgstr "Calcule os n첬meros \"dirstat\" contando a quantidade de arquivos alterados. Cada arquivo alterado conta igualmente na an찼lise do \"dirstat\". Este 챕 o comportamento computacional mais barato do `--dirstat`, pois n찾o precisa olhar o conte첬do do arquivo."
#. type: Labeled list
#: en/diff-options.txt:190
@@ -4663,12 +4092,7 @@ msgstr "`cumulative`"
#: en/diff-options.txt:195
#, priority:280
msgid "Count changes in a child directory for the parent directory as well. Note that when using `cumulative`, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the `noncumulative` parameter."
-msgstr ""
-"Conta as altera챌천es em um diret처rio herdeiro e tamb챕m para o diret처rio de "
-"origem. Observe que, ao utilizar `cumulative` (cumulativo), a soma das "
-"porcentagens relatadas pode exceder os 100%. O comportamento predefinido ("
-"n찾o cumulativo) pode ser especificado com o par창metro `noncumulative` (n찾o "
-"cumulativo)."
+msgstr "Conta as altera챌천es em um diret처rio herdeiro e tamb챕m para o diret처rio de origem. Observe que, ao utilizar `cumulative` (cumulativo), a soma das porcentagens relatadas pode exceder os 100%. O comportamento predefinido (n찾o cumulativo) pode ser especificado com o par창metro `noncumulative` (n찾o cumulativo)."
#. type: Labeled list
#: en/diff-options.txt:195 en/git-cherry.txt:39
@@ -4680,20 +4104,13 @@ msgstr "<limite>"
#: en/diff-options.txt:199
#, priority:280
msgid "An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes are not shown in the output."
-msgstr ""
-"Um par창metro inteiro especifica uma porcentagem de corte (a predefini챌찾o 챕 "
-"3%). Os diret처rios que contribuem com menos que esta porcentagem nas "
-"altera챌천es n찾o s찾o exibidos na sa챠da."
+msgstr "Um par창metro inteiro especifica uma porcentagem de corte (a predefini챌찾o 챕 3%). Os diret처rios que contribuem com menos que esta porcentagem nas altera챌천es n찾o s찾o exibidos na sa챠da."
#. type: Plain text
#: en/diff-options.txt:205
#, priority:280
msgid "Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`."
-msgstr ""
-"Exemplo: O seguinte contar찼 os arquivos alterados, ignorando os diret처rios "
-"com menos de 10% da quantidade total dos arquivos alterados e acumulando as "
-"contagens de um diret처rio-herdado nos diret처rios-raiz: "
-"`---dirstat=files,10,cumulative`."
+msgstr "Exemplo: O seguinte contar찼 os arquivos alterados, ignorando os diret처rios com menos de 10% da quantidade total dos arquivos alterados e acumulando as contagens de um diret처rio-herdado nos diret처rios-raiz: `---dirstat=files,10,cumulative`."
#. type: Labeled list
#: en/diff-options.txt:206
@@ -4729,9 +4146,7 @@ msgstr "--summary"
#: en/diff-options.txt:215
#, priority:280
msgid "Output a condensed summary of extended header information such as creations, renames and mode changes."
-msgstr ""
-"Produza um resumo condensado das informa챌천es estendidas do cabe챌alho, como "
-"cria챌천es, renomea챌천es e altera챌천es do modo."
+msgstr "Produza um resumo condensado das informa챌천es estendidas do cabe챌alho, como cria챌천es, renomea챌천es e altera챌천es do modo."
#. type: Labeled list
#: en/diff-options.txt:217
@@ -4755,18 +4170,13 @@ msgstr "-z"
#: en/diff-options.txt:226
#, no-wrap, priority:280
msgid "\tSeparate the commits with NULs instead of with new newlines.\n"
-msgstr ""
-"\tSepare os commits com caracteres `NUL` em vez de novos caracteres "
-"\"newlines\" (novas linhas).\n"
+msgstr "\tSepare os commits com caracteres `NUL` em vez de novos caracteres \"newlines\" (novas linhas).\n"
#. type: Plain text
#: en/diff-options.txt:229
#, priority:280
msgid "Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators."
-msgstr ""
-"Al챕m disso, quando a op챌찾o `--raw` ou `--numstat` for utilizado, n찾o una os "
-"nomes dos caminhos e utilize caracteres `NUL` como terminadores na sa챠da dos "
-"campos."
+msgstr "Al챕m disso, quando a op챌찾o `--raw` ou `--numstat` for utilizado, n찾o una os nomes dos caminhos e utilize caracteres `NUL` como terminadores na sa챠da dos campos."
#. type: Plain text
#: en/diff-options.txt:233
@@ -4776,17 +4186,13 @@ msgid ""
"\tgiven, do not munge pathnames and use NULs as output field terminators.\n"
msgstr ""
"\tQuando `--raw`, `--numstat`, `--name-only` ou `--name-status` tenha sido\n"
-"\tutilizado, n찾o una os nomes do caminho e utilize caracteres `NUL` como "
-"terminadores do campo de sa챠da.\n"
+"\tutilizado, n찾o una os nomes do caminho e utilize caracteres `NUL` como terminadores do campo de sa챠da.\n"
#. type: Plain text
#: en/diff-options.txt:238 en/git-apply.txt:122
#, priority:280
msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgstr ""
-"Sem esta op챌찾o, os nomes do caminho com caracteres \"incomuns\" s찾o citados "
-"como explicado na vari찼vel da configura챌찾o `core.quotePath` (veja linkgit"
-":git-config [1])."
+msgstr "Sem esta op챌찾o, os nomes do caminho com caracteres \"incomuns\" s찾o citados como explicado na vari찼vel da configura챌찾o `core.quotePath` (veja linkgit:git-config [1])."
#. type: Labeled list
#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
@@ -4810,10 +4216,7 @@ msgstr "--name-status"
#: en/diff-options.txt:245
#, priority:280
msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean."
-msgstr ""
-"Exiba apenas os nomes e a condi챌찾o atual dos arquivos que foram alterados. "
-"Consulte a descri챌찾o da op챌찾o `--diff-filter` sobre o significado das letras "
-"de condi챌찾o."
+msgstr "Exiba apenas os nomes e a condi챌찾o atual dos arquivos que foram alterados. Consulte a descri챌찾o da op챌찾o `--diff-filter` sobre o significado das letras de condi챌찾o."
#. type: Labeled list
#: en/diff-options.txt:246
@@ -4825,17 +4228,7 @@ msgstr "--submodule[=<formato>]"
#: en/diff-options.txt:257
#, priority:280
msgid "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset."
-msgstr ""
-"Especifique como as diferen챌as nos subm처dulos s찾o exibidos. Ao especificar "
-"`--submodule=short`, o formato 'short' (curto) 챕 utilizado. Este formato "
-"exibe apenas os nomes dos commits no in챠cio e no final do intervalo. Ao "
-"utilizar a op챌찾o `--submodule` ou `--submodule=log`, o formato 'log' passa a "
-"ser utilizado. Este formato lista os commits no intervalo como o linkgit"
-":git-submodule[1] `summary` (resumo) faz. Ao utilizar a op챌찾o "
-"`--submodule=diff`, o formato 'diff' passa a ser utilizado. Este formato "
-"exibe uma compara챌찾o nas linhas das altera챌천es no conte첬do do subm처dulo "
-"entre o intervalo do commit. A predefini챌찾o 챕 `diff.submodule` ou o formato "
-"'short' (curto) caso a op챌찾o da configura챌찾o estiver desativada."
+msgstr "Especifique como as diferen챌as nos subm처dulos s찾o exibidos. Ao especificar `--submodule=short`, o formato 'short' (curto) 챕 utilizado. Este formato exibe apenas os nomes dos commits no in챠cio e no final do intervalo. Ao utilizar a op챌찾o `--submodule` ou `--submodule=log`, o formato 'log' passa a ser utilizado. Este formato lista os commits no intervalo como o linkgit:git-submodule[1] `summary` (resumo) faz. Ao utilizar a op챌찾o `--submodule=diff`, o formato 'diff' passa a ser utilizado. Este formato exibe uma compara챌찾o nas linhas das altera챌천es no conte첬do do subm처dulo entre o intervalo do commit. A predefini챌찾o 챕 `diff.submodule` ou o formato 'short' (curto) caso a op챌찾o da configura챌찾o estiver desativada."
#. type: Labeled list
#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:224 en/git-show-branch.txt:119 en/git-tag.txt:125
@@ -4847,10 +4240,7 @@ msgstr "--color[=<quando>]"
#: en/diff-options.txt:262
#, priority:280
msgid "Show colored diff. `--color` (i.e. without '=<when>') is the same as `--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
-msgstr ""
-"Exibe o diff colorido. A op챌찾o `--color` (sem '=<quando>' por exemplo) 챕 o "
-"mesmo que a op챌찾o `--color=always`. '<quando>' pode ser `always` (sempre), "
-"`never` (nunca), ou `auto`."
+msgstr "Exibe o diff colorido. A op챌찾o `--color` (sem '=<quando>' por exemplo) 챕 o mesmo que a op챌찾o `--color=always`. '<quando>' pode ser `always` (sempre), `never` (nunca), ou `auto`."
#. type: Plain text
#: en/diff-options.txt:265
@@ -4896,16 +4286,13 @@ msgstr "--color-moved[=<modo>]"
#: en/diff-options.txt:276
#, priority:280
msgid "Moved lines of code are colored differently."
-msgstr ""
-"As linhas de c처digo que foram movidas s찾o coloridas de maneira diferente."
+msgstr "As linhas de c처digo que foram movidas s찾o coloridas de maneira diferente."
#. type: Plain text
#: en/diff-options.txt:278
#, no-wrap, priority:280
msgid "\tIt can be changed by the `diff.colorMoved` configuration setting.\n"
-msgstr ""
-"\tPode ser alterado atrav챕s da pela defini챌찾o da configura챌찾o `diff."
-"colorMoved`.\n"
+msgstr "\tPode ser alterado atrav챕s da pela defini챌찾o da configura챌찾o `diff.colorMoved`.\n"
#. type: Plain text
#: en/diff-options.txt:282
@@ -4941,9 +4328,7 @@ msgstr "default"
#: en/diff-options.txt:289
#, priority:280
msgid "Is a synonym for `zebra`. This may change to a more sensible mode in the future."
-msgstr ""
-"횋 um sin척nimo para `zebra`. Pode ser que isso mude para um modo mais "
-"sens챠vel no futuro."
+msgstr "횋 um sin척nimo para `zebra`. Pode ser que isso mude para um modo mais sens챠vel no futuro."
#. type: Labeled list
#: en/diff-options.txt:289 en/diff-options.txt:358
@@ -4955,12 +4340,7 @@ msgstr "plain"
#: en/diff-options.txt:296
#, priority:280
msgid "Any line that is added in one location and was removed in another location will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved' will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation."
-msgstr ""
-"Qualquer linha adicionada em um local e removida em outro ser찼 colorida com "
-"'color.diff.newMoved'. Da mesma forma, 'color.diff.oldMoved' ser찼 utilizado "
-"para as linhas que forem removidas e que foram adicionadas em outro lugar no "
-"diff. Este modo seleciona qualquer linha movida, mas n찾o 챕 muito 첬til em uma "
-"revis찾o para determinar se um bloco do c처digo foi movido sem permuta챌찾o."
+msgstr "Qualquer linha adicionada em um local e removida em outro ser찼 colorida com 'color.diff.newMoved'. Da mesma forma, 'color.diff.oldMoved' ser찼 utilizado para as linhas que forem removidas e que foram adicionadas em outro lugar no diff. Este modo seleciona qualquer linha movida, mas n찾o 챕 muito 첬til em uma revis찾o para determinar se um bloco do c처digo foi movido sem permuta챌찾o."
#. type: Labeled list
#: en/diff-options.txt:296
@@ -4972,11 +4352,7 @@ msgstr "blocks"
#: en/diff-options.txt:301
#, priority:280
msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart."
-msgstr ""
-"Os blocos de texto movidos com pelo menos 20 caracteres alfanum챕ricos s찾o "
-"detectados de forma 찼vida. Os blocos detectados s찾o pintados utilizando a "
-"cor 'color.diff.{old,new}Moved'. Os blocos adjacentes n찾o podem ser "
-"separados."
+msgstr "Os blocos de texto movidos com pelo menos 20 caracteres alfanum챕ricos s찾o detectados de forma 찼vida. Os blocos detectados s찾o pintados utilizando a cor 'color.diff.{old,new}Moved'. Os blocos adjacentes n찾o podem ser separados."
#. type: Labeled list
#: en/diff-options.txt:301
@@ -4988,11 +4364,7 @@ msgstr "zebra"
#: en/diff-options.txt:306
#, priority:280
msgid "Blocks of moved text are detected as in 'blocks' mode. The blocks are painted using either the 'color.diff.{old,new}Moved' color or 'color.diff.{old,new}MovedAlternative'. The change between the two colors indicates that a new block was detected."
-msgstr ""
-"Os blocos de texto que foram movidos s찾o detectados como no modo 'blocks' "
-"(blocos). Os blocos s찾o pintados utilizando a cor 'color.diff.{old,new}"
-"Moved' ou 'color.diff.{old,new}MovedAlternative'. A altera챌찾o entre as duas "
-"cores indica que um novo bloco foi detectado."
+msgstr "Os blocos de texto que foram movidos s찾o detectados como no modo 'blocks' (blocos). Os blocos s찾o pintados utilizando a cor 'color.diff.{old,new}Moved' ou 'color.diff.{old,new}MovedAlternative'. A altera챌찾o entre as duas cores indica que um novo bloco foi detectado."
#. type: Labeled list
#: en/diff-options.txt:306
@@ -5004,11 +4376,7 @@ msgstr "dimmed-zebra"
#: en/diff-options.txt:311
#, priority:280
msgid "Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated synonym."
-msgstr ""
-"Semelhante ao 'zebra', por챕m 챕 realizado o escurecimento adicional das "
-"partes desinteressantes do c처digo que foi movido. As linhas lim챠trofes dos "
-"dois blocos adjacentes s찾o considerados como interessantes, o resto como n찾o "
-"interessante. `dimmed_zebra` 챕 um sin척nimo obsoleto."
+msgstr "Semelhante ao 'zebra', por챕m 챕 realizado o escurecimento adicional das partes desinteressantes do c처digo que foi movido. As linhas lim챠trofes dos dois blocos adjacentes s찾o considerados como interessantes, o resto como n찾o interessante. `dimmed_zebra` 챕 um sin척nimo obsoleto."
#. type: Labeled list
#: en/diff-options.txt:313
@@ -5020,9 +4388,7 @@ msgstr "--no-color-moved"
#: en/diff-options.txt:316
#, priority:280
msgid "Turn off move detection. This can be used to override configuration settings. It is the same as `--color-moved=no`."
-msgstr ""
-"Desativa a detec챌찾o de movimento. Pode ser utilizado para substituir a "
-"defini챌찾o da configura챌찾o. 횋 o mesmo que `--color-moved=no`."
+msgstr "Desativa a detec챌찾o de movimento. Pode ser utilizado para substituir a defini챌찾o da configura챌찾o. 횋 o mesmo que `--color-moved=no`."
#. type: Labeled list
#: en/diff-options.txt:317
@@ -5034,31 +4400,25 @@ msgstr "--color-moved-ws=<modos>"
#: en/diff-options.txt:320
#, priority:280
msgid "This configures how whitespace is ignored when performing the move detection for `--color-moved`."
-msgstr ""
-"Configura como o espa챌o em branco 챕 ignorado durante a execu챌찾o da detec챌찾o "
-"do mover para `--color-moved`."
+msgstr "Configura como o espa챌o em branco 챕 ignorado durante a execu챌찾o da detec챌찾o do mover para `--color-moved`."
#. type: Plain text
#: en/diff-options.txt:322
#, no-wrap, priority:280
msgid "\tIt can be set by the `diff.colorMovedWS` configuration setting.\n"
-msgstr ""
-"\tPode ser definido atrav챕s da defini챌찾o da vari찼vel da configura챌찾o `diff."
-"colorMovedWS`.\n"
+msgstr "\tPode ser definido atrav챕s da defini챌찾o da vari찼vel da configura챌찾o `diff.colorMovedWS`.\n"
#. type: Plain text
#: en/diff-options.txt:324
#, no-wrap, priority:280
msgid "\tThese modes can be given as a comma separated list:\n"
-msgstr ""
-"\tEstes modos podem ser utilizados como uma lista separada por v챠rgulas:\n"
+msgstr "\tEstes modos podem ser utilizados como uma lista separada por v챠rgulas:\n"
#. type: Plain text
#: en/diff-options.txt:328
#, priority:280
msgid "Do not ignore whitespace when performing move detection."
-msgstr ""
-"N찾o ignore os espa챌os em branco quando realizar a detec챌찾o da a챌찾o de mover."
+msgstr "N찾o ignore os espa챌os em branco quando realizar a detec챌찾o da a챌찾o de mover."
#. type: Labeled list
#: en/diff-options.txt:328 en/merge-strategies.txt:61
@@ -5082,10 +4442,7 @@ msgstr "ignore-space-change"
#: en/diff-options.txt:334 en/diff-options.txt:671
#, priority:280
msgid "Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
-msgstr ""
-"Ignore as altera챌천es na quantidade do espa챌o em branco. Ignora o espa챌o em "
-"branco no final da linha e considera todas as outras sequ챗ncias de um ou "
-"mais caracteres de espa챌o em branco como equivalentes."
+msgstr "Ignore as altera챌천es na quantidade do espa챌o em branco. Ignora o espa챌o em branco no final da linha e considera todas as outras sequ챗ncias de um ou mais caracteres de espa챌o em branco como equivalentes."
#. type: Labeled list
#: en/diff-options.txt:334 en/merge-strategies.txt:60
@@ -5097,10 +4454,7 @@ msgstr "ignore-all-space"
#: en/diff-options.txt:337
#, priority:280
msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
-msgstr ""
-"Ignore o espa챌o em branco durante a compara챌찾o das linhas. Ignore as "
-"diferen챌as mesmo que uma linha tenha espa챌os em branco quando a outra linha "
-"n찾o tiver nenhuma."
+msgstr "Ignore o espa챌o em branco durante a compara챌찾o das linhas. Ignore as diferen챌as mesmo que uma linha tenha espa챌os em branco quando a outra linha n찾o tiver nenhuma."
#. type: Labeled list
#: en/diff-options.txt:337
@@ -5112,11 +4466,7 @@ msgstr "allow-indentation-change"
#: en/diff-options.txt:342
#, priority:280
msgid "Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in whitespace is the same per line. This is incompatible with the other modes."
-msgstr ""
-"Ignore inicialmente, qualquer espa챌o em branco na detec챌찾o da a챌찾o de mover, "
-"em seguida, agrupe os blocos do c처digo que foram movidos apenas em um bloco "
-"caso a altera챌찾o no espa챌o em branco seja a mesma em cada linha. Isto 챕 "
-"incompat챠vel com os outros modos."
+msgstr "Ignore inicialmente, qualquer espa챌o em branco na detec챌찾o da a챌찾o de mover, em seguida, agrupe os blocos do c처digo que foram movidos apenas em um bloco caso a altera챌찾o no espa챌o em branco seja a mesma em cada linha. Isto 챕 incompat챠vel com os outros modos."
#. type: Labeled list
#: en/diff-options.txt:344
@@ -5128,10 +4478,7 @@ msgstr "--no-color-moved-ws"
#: en/diff-options.txt:348
#, priority:280
msgid "Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as `--color-moved-ws=no`."
-msgstr ""
-"N찾o ignore os espa챌os em branco quando realizar a detec챌찾o da a챌찾o de mover. "
-"Pode ser utilizado para substituir a defini챌찾o da configura챌찾o. 횋 o mesmo "
-"que `--color-moved-ws=no`."
+msgstr "N찾o ignore os espa챌os em branco quando realizar a detec챌찾o da a챌찾o de mover. Pode ser utilizado para substituir a defini챌찾o da configura챌찾o. 횋 o mesmo que `--color-moved-ws=no`."
#. type: Labeled list
#: en/diff-options.txt:349
@@ -5143,28 +4490,19 @@ msgstr "--word-diff[=<modo>]"
#: en/diff-options.txt:354
#, priority:280
msgid "Show a word diff, using the <mode> to delimit changed words. By default, words are delimited by whitespace; see `--word-diff-regex` below. The <mode> defaults to 'plain', and must be one of:"
-msgstr ""
-"Exiba umadiff entre as palavras, usando o <modo> para delimitar as palavras "
-"alteradas. 횋 predefinido que as palavras sejam delimitadas por espa챌os em "
-"branco; consulte `--word-diff-regex` abaixo. O <modo> 챕 predefinido como "
-"'plain' e deve ser um dos seguintes:"
+msgstr "Exiba umadiff entre as palavras, usando o <modo> para delimitar as palavras alteradas. 횋 predefinido que as palavras sejam delimitadas por espa챌os em branco; consulte `--word-diff-regex` abaixo. O <modo> 챕 predefinido como 'plain' e deve ser um dos seguintes:"
#. type: Plain text
#: en/diff-options.txt:358
#, priority:280
msgid "Highlight changed words using only colors. Implies `--color`."
-msgstr ""
-"Destaque as palavras alteradas usando apenas as cores. Implica no uso da "
-"op챌찾o `--color`."
+msgstr "Destaque as palavras alteradas usando apenas as cores. Implica no uso da op챌찾o `--color`."
#. type: Plain text
#: en/diff-options.txt:362
#, priority:280
msgid "Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous."
-msgstr ""
-"Exiba as palavras como `[-removed-]` (removido) e `{+added+}` (adicionado). "
-"N찾o faz nenhuma tentativa de escapar os delimitadores caso eles apare챌am na "
-"entrada, portanto, a sa챠da pode ser amb챠gua."
+msgstr "Exiba as palavras como `[-removed-]` (removido) e `{+added+}` (adicionado). N찾o faz nenhuma tentativa de escapar os delimitadores caso eles apare챌am na entrada, portanto, a sa챠da pode ser amb챠gua."
#. type: Labeled list
#: en/diff-options.txt:362
@@ -5176,12 +4514,7 @@ msgstr "porcelain"
#: en/diff-options.txt:369
#, priority:280
msgid "Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a `+`/`-`/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde `~` on a line of its own."
-msgstr ""
-"Use um formato especial orientado em linha destinado para a utiliza챌찾o com "
-"um script. As execu챌천es adicionadas/removidas/inalteradas s찾o impressas no "
-"formato diff unificado tradicional, come챌ando com um caractere `+`/`-`/` ` "
-"no in챠cio da linha e estendendo-se at챕 o final. As novas linhas na entrada "
-"s찾o representadas por um til `~` em uma linha pr처pria."
+msgstr "Use um formato especial orientado em linha destinado para a utiliza챌찾o com um script. As execu챌천es adicionadas/removidas/inalteradas s찾o impressas no formato diff unificado tradicional, come챌ando com um caractere `+`/`-`/` ` no in챠cio da linha e estendendo-se at챕 o final. As novas linhas na entrada s찾o representadas por um til `~` em uma linha pr처pria."
#. type: Labeled list
#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:172
@@ -5199,9 +4532,7 @@ msgstr "Desative a palavra diff novamente."
#: en/diff-options.txt:375
#, priority:280
msgid "Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled."
-msgstr ""
-"Observe que, apesar do nome do primeiro modo, a cor 챕 utilizada para real챌ar "
-"as partes alteradas em todos os modos caso seja ativada."
+msgstr "Observe que, apesar do nome do primeiro modo, a cor 챕 utilizada para real챌ar as partes alteradas em todos os modos caso seja ativada."
#. type: Labeled list
#: en/diff-options.txt:376
@@ -5213,43 +4544,25 @@ msgstr "--word-diff-regex=<regex>"
#: en/diff-options.txt:380
#, priority:280
msgid "Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies `--word-diff` unless it was already enabled."
-msgstr ""
-"Utilize um `<regex>` (express찾o regular) para decidir o que uma palavra 챕 em "
-"vez de considerar as execu챌천es dos espa챌os que n찾o estejam vazios como uma "
-"palavra. Tamb챕m implica no uso da op챌찾o `--word-diff`, a menos que j찼 "
-"esteja ativo."
+msgstr "Utilize um `<regex>` (express찾o regular) para decidir o que uma palavra 챕 em vez de considerar as execu챌천es dos espa챌os que n찾o estejam vazios como uma palavra. Tamb챕m implica no uso da op챌찾o `--word-diff`, a menos que j찼 esteja ativo."
#. type: Plain text
#: en/diff-options.txt:388
#, priority:280
msgid "Every non-overlapping match of the <regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline."
-msgstr ""
-"Toda a coincid챗ncia n찾o sobreposta do `<regex>` 챕 considerado como sendo uma "
-"palavra. Qualquer coisa entre estas coincid챗ncias 챕 considerada um espa챌o "
-"em branco e ignorado(!) com o objetivo de encontrar as diferen챌as. Voc챗 "
-"pode anexar `|[^[:space:]]` 횪 sua express찾o regular para garantir que ela "
-"coincida com todos os caracteres que n찾o sejam espa챌os em branco. Uma "
-"coincid챗ncia que contenha uma nova linha 챕 silenciosamente truncada(!) na "
-"nova linha."
+msgstr "Toda a coincid챗ncia n찾o sobreposta do `<regex>` 챕 considerado como sendo uma palavra. Qualquer coisa entre estas coincid챗ncias 챕 considerada um espa챌o em branco e ignorado(!) com o objetivo de encontrar as diferen챌as. Voc챗 pode anexar `|[^[:space:]]` 횪 sua express찾o regular para garantir que ela coincida com todos os caracteres que n찾o sejam espa챌os em branco. Uma coincid챗ncia que contenha uma nova linha 챕 silenciosamente truncada(!) na nova linha."
#. type: Plain text
#: en/diff-options.txt:391
#, priority:280
msgid "For example, `--word-diff-regex=.` will treat each character as a word and, correspondingly, show differences character by character."
-msgstr ""
-"A op챌찾o `--word-diff-regex=.` por exemplo, tratar찼 cada caractere como uma "
-"palavra e coincidentemente, exibir찼 as diferen챌as caractere a caractere."
+msgstr "A op챌찾o `--word-diff-regex=.` por exemplo, tratar찼 cada caractere como uma palavra e coincidentemente, exibir찼 as diferen챌as caractere a caractere."
#. type: Plain text
#: en/diff-options.txt:396
#, priority:280
msgid "The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings."
-msgstr ""
-"A express찾o regular tamb챕m pode ser definida atrav챕s de um controlador do "
-"diff ou uma op챌찾o de configura챌찾o, consulte linkgit:gitattributes[5] or "
-"linkgit:git-config[1]. A concess찾o expl챠cita substitui qualquer controle "
-"diff ou uma configura챌찾o. Os controles diff substituem as defini챌천es da "
-"configura챌찾o."
+msgstr "A express찾o regular tamb챕m pode ser definida atrav챕s de um controlador do diff ou uma op챌찾o de configura챌찾o, consulte linkgit:gitattributes[5] or linkgit:git-config[1]. A concess찾o expl챠cita substitui qualquer controle diff ou uma configura챌찾o. Os controles diff substituem as defini챌천es da configura챌찾o."
#. type: Labeled list
#: en/diff-options.txt:397
@@ -5261,9 +4574,7 @@ msgstr "--color-words[=<regex>]"
#: en/diff-options.txt:400
#, priority:280
msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=<regex>`."
-msgstr ""
-"Equivalente a `--word-diff=color` mais (caso um regex seja utilizado) "
-"`--word-diff-regex=<regex>`."
+msgstr "Equivalente a `--word-diff=color` mais (caso um regex seja utilizado) `--word-diff-regex=<regex>`."
#. type: Labeled list
#: en/diff-options.txt:402 en/git-status.txt:143
@@ -5275,9 +4586,7 @@ msgstr "--no-renames"
#: en/diff-options.txt:405
#, priority:280
msgid "Turn off rename detection, even when the configuration file gives the default to do so."
-msgstr ""
-"Desative a detec챌찾o da a챌찾o de renomear, mesmo quando o arquivo de "
-"configura챌찾o seja predefinido para tanto."
+msgstr "Desative a detec챌찾o da a챌찾o de renomear, mesmo quando o arquivo de configura챌찾o seja predefinido para tanto."
#. type: Labeled list
#: en/diff-options.txt:406
@@ -5301,15 +4610,7 @@ msgstr "--check"
#: en/diff-options.txt:419
#, priority:280
msgid "Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code."
-msgstr ""
-"Avise caso as altera챌천es introduzirem os marcadores de conflito ou os erros "
-"de espa챌o em branco. A configura챌찾o `core.whitespace` define o que s찾o "
-"considerados erros de espa챌o em branco. 횋 predefinido que os espa챌os em "
-"branco 횪 direita (incluindo as linhas que consistem apenas nos espa챌os em "
-"branco) e um caractere de espa챌o que seja imediatamente seguido por um "
-"caractere de tabula챌찾o dentro do recuo inicial da linha, s찾o considerados "
-"erros de espa챌o em branco. Encerra com uma condi챌찾o diferente de zero caso "
-"problemas sejam encontrados. N찾o 챕 compat챠vel com `--exit-code`."
+msgstr "Avise caso as altera챌천es introduzirem os marcadores de conflito ou os erros de espa챌o em branco. A configura챌찾o `core.whitespace` define o que s찾o considerados erros de espa챌o em branco. 횋 predefinido que os espa챌os em branco 횪 direita (incluindo as linhas que consistem apenas nos espa챌os em branco) e um caractere de espa챌o que seja imediatamente seguido por um caractere de tabula챌찾o dentro do recuo inicial da linha, s찾o considerados erros de espa챌o em branco. Encerra com uma condi챌찾o diferente de zero caso problemas sejam encontrados. N찾o 챕 compat챠vel com `--exit-code`."
#. type: Labeled list
#: en/diff-options.txt:420
@@ -5321,15 +4622,7 @@ msgstr "--ws-error-highlight=<tipo>"
#: en/diff-options.txt:429
#, priority:280
msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`."
-msgstr ""
-"Destaque os erros de espa챌o em branco nas linhas `context` (contexto), `old` "
-"(antigo) ou `new` (novo) do diff. V찼rios valores s찾o separados por v챠rgula, "
-"`none` redefine os valores anteriores, `default` redefine a lista para `new` "
-"e `all` 챕 uma abrevia챌찾o para `old,new,context`. Quando esta op챌찾o n찾o 챕 "
-"utilizada e a vari찼vel da configura챌찾o `diff.wsErrorHighlight` n찾o est찼 "
-"definida, apenas os erros de espa챌o em branco nas linhas `novas` s찾o "
-"destacados. Os erros de espa챌o em branco s찾o coloridos com `color.diff."
-"whitespace`."
+msgstr "Destaque os erros de espa챌o em branco nas linhas `context` (contexto), `old` (antigo) ou `new` (novo) do diff. V찼rios valores s찾o separados por v챠rgula, `none` redefine os valores anteriores, `default` redefine a lista para `new` e `all` 챕 uma abrevia챌찾o para `old,new,context`. Quando esta op챌찾o n찾o 챕 utilizada e a vari찼vel da configura챌찾o `diff.wsErrorHighlight` n찾o est찼 definida, apenas os erros de espa챌o em branco nas linhas `novas` s찾o destacados. Os erros de espa챌o em branco s찾o coloridos com `color.diff.whitespace`."
#. type: Labeled list
#: en/diff-options.txt:432
@@ -5341,10 +4634,7 @@ 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, exiba os nomes completos dos "
-"objetos bolha antes e depois da imagem na linha \"index\" ao produzir a "
-"sa챠da no formato patch."
+msgstr "Em vez do primeiro punhado de caracteres, exiba os nomes completos dos objetos bolha antes e depois da imagem na linha \"index\" ao produzir a sa챠da no formato patch."
#. type: Labeled list
#: en/diff-options.txt:437 en/git-apply.txt:160
@@ -5356,9 +4646,7 @@ msgstr "--binary"
#: en/diff-options.txt:440
#, 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`, gere um diff bin찼rio que possa ser aplicado com o "
-"comando `git-apply`. Implica no uso da op챌찾o `--patch`."
+msgstr "Al챕m de `--full-index`, gere um diff bin찼rio que possa ser aplicado com o comando `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
@@ -5370,13 +4658,7 @@ msgstr "--abrev[=<n>]"
#: en/diff-options.txt:448
#, priority:280
msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. This is independent of the `--full-index` option above, which controls the diff-patch output format. Non default number of digits can be specified with `--abbrev=<n>`."
-msgstr ""
-"Em vez de exibir o nome completo do objeto hexadecimal com 40 bytes na "
-"produ챌찾o do formato diff-raw e nas linhas do cabe챌alho da 찼rvore diff, exiba "
-"apenas um prefixo parcial. Isso 챕 independente da op챌찾o `--full-index` "
-"acima, que controla o formato da produ챌찾o da sa챠da do diff-patch. A "
-"quantidade de d챠gitos fora do preestabelecido pode ser especificado com a "
-"op챌찾o `--abbrev=<n>`."
+msgstr "Em vez de exibir o nome completo do objeto hexadecimal com 40 bytes na produ챌찾o do formato diff-raw e nas linhas do cabe챌alho da 찼rvore diff, exiba apenas um prefixo parcial. Isso 챕 independente da op챌찾o `--full-index` acima, que controla o formato da produ챌찾o da sa챠da do diff-patch. A quantidade de d챠gitos fora do preestabelecido pode ser especificado com a op챌찾o `--abbrev=<n>`."
#. type: Labeled list
#: en/diff-options.txt:449
@@ -5394,37 +4676,19 @@ msgstr "--break-rewrites[=[<n>][/<m>]]"
#: en/diff-options.txt:453
#, priority:280
msgid "Break complete rewrite changes into pairs of delete and create. This serves two purposes:"
-msgstr ""
-"Divida as altera챌천es reescritas que foram completas em pares de exclus찾o e "
-"cria챌찾o. Isso serve a dois prop처sitos:"
+msgstr "Divida as altera챌천es reescritas que foram completas em pares de exclus찾o e cria챌찾o. Isso serve a dois prop처sitos:"
#. type: Plain text
#: en/diff-options.txt:463
#, 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 ""
-"Afeta a maneira 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 combinadas com poucas "
-"linhas que coincidem textualmente com o contexto, e sim como uma 첬nica "
-"exclus찾o de tudo o que 챕 antigo seguido por um inser챌찾o 첬nica de tudo que "
-"for novo, o n첬mero `m` controla esse aspecto da op챌찾o `-B` (a predefini챌찾o 챕 "
-"60%). `-B / 70%` determina que menos de 30% do original deve permanecer no "
-"resultado para que o Git considere-o como uma reescrita total (ou seja, caso "
-"contr찼rio, o patch resultante ser찼 uma s챕rie de exclus천es e inser챌천es "
-"combinados com linhas de contexto)."
+msgstr "Afeta a maneira 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 combinadas com poucas linhas que coincidem textualmente com o contexto, e sim como uma 첬nica exclus찾o de tudo o que 챕 antigo seguido por um inser챌찾o 첬nica de tudo que for novo, o n첬mero `m` controla esse aspecto da op챌찾o `-B` (a predefini챌찾o 챕 60%). `-B / 70%` determina que menos de 30% do original deve permanecer no resultado para que o Git considere-o como uma reescrita total (ou seja, caso contr찼rio, o patch resultante ser찼 uma s챕rie de exclus천es e inser챌천es combinados com linhas de contexto)."
#. type: Plain text
#: en/diff-options.txt:471
#, priority:280
msgid "When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number `n` controls this aspect of the -B option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file."
-msgstr ""
-"Quando utilizado com a op챌찾o `-M`, um arquivo totalmente reescrito tamb챕m 챕 "
-"considerado a fonte de uma renomea챌찾o (O `-M` geralmente considera apenas um "
-"arquivo que desapareceu como a origem de uma renomea챌찾o), o n첬mero `n` "
-"controla esse aspecto da op챌찾o `-B` (a predefini챌찾o 챕 50%). O `-B20%` "
-"determina que uma altera챌찾o com a adi챌찾o e a exclus찾o em compara챌찾o com 20% "
-"ou mais do tamanho do arquivo 챕 eleg챠vel para ser selecionada como uma "
-"poss챠vel fonte de renomea챌찾o para um outro arquivo."
+msgstr "Quando utilizado com a op챌찾o `-M`, um arquivo totalmente reescrito tamb챕m 챕 considerado a fonte de uma renomea챌찾o (O `-M` geralmente considera apenas um arquivo que desapareceu como a origem de uma renomea챌찾o), o n첬mero `n` controla esse aspecto da op챌찾o `-B` (a predefini챌찾o 챕 50%). O `-B20%` determina que uma altera챌찾o com a adi챌찾o e a exclus찾o em compara챌찾o com 20% ou mais do tamanho do arquivo 챕 eleg챠vel para ser selecionada como uma poss챠vel fonte de renomea챌찾o para um outro arquivo."
#. type: Labeled list
#: en/diff-options.txt:472
@@ -5452,10 +4716,8 @@ msgid ""
"\tFor following files across renames while traversing history, see\n"
"\t`--follow`.\n"
msgstr ""
-"\tAo produzir os diffs, detecte e relate tudo que for renomeado em cada "
-"commit.\n"
-"\tPara acompanhar os arquivos atrav챕s das renomea챌천es enquanto percorre o "
-"hist처rico\n"
+"\tAo produzir os diffs, detecte e relate tudo que for renomeado em cada commit.\n"
+"\tPara acompanhar os arquivos atrav챕s das renomea챌천es enquanto percorre o hist처rico\n"
"\tconsulte o comando `--follow`.\n"
#. type: Plain text
@@ -5474,15 +4736,12 @@ msgid ""
msgstr ""
"\tCaso `n` seja utilizado, 챕 a lim챠trofe do 챠ndice da similaridade\n"
"\t(A quantidade de adi챌천es/exclus천es comparado ao tamanho\n"
-"\tdo arquivo). `-M90%` significa que o Git deve considerar uma a챌찾o do par "
-"de\n"
+"\tdo arquivo). `-M90%` significa que o Git deve considerar uma a챌찾o do par de\n"
"\texclus찾o/adi챌찾o para ser renomeado caso mais que 90% do arquivo\n"
-"\tn찾o tenha sido alterado. Sem um sinal de `%`, a quantidade deve ser lida "
-"como\n"
+"\tn찾o tenha sido alterado. Sem um sinal de `%`, a quantidade deve ser lida como\n"
"\tuma fra챌찾o, com um ponto decimal antes dele. `-M5` se torna por exemplo\n"
"\t0.5, aportanto, 챕 o mesmo que `-M50%`. Da mesma forma que `-M05` 챕\n"
-"\to mesmo que `-M5%`. Para limitar a detec챌찾o para renomea챌천es exatas, "
-"utilize\n"
+"\to mesmo que `-M5%`. Para limitar a detec챌찾o para renomea챌천es exatas, utilize\n"
"\t`-M100%`. A predefini챌찾o para o 챠ndice de similaridade 챕 50%.\n"
#. type: Labeled list
@@ -5501,10 +4760,7 @@ msgstr "--find-copies[=<n>]"
#: en/diff-options.txt:496
#, priority:280
msgid "Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M<n>`."
-msgstr ""
-"Detecte as c처pias e tamb챕m o que for renomeado. Consulte tamb챕m `--find-"
-"copies-harder`. Caso `n` seja utilizado, ele ter찼 o mesmo significado que "
-"`-M<n>`."
+msgstr "Detecte as c처pias e tamb챕m o que for renomeado. Consulte tamb챕m `--find-copies-harder`. Caso `n` seja utilizado, ele ter찼 o mesmo significado que `-M<n>`."
#. type: Labeled list
#: en/diff-options.txt:497 en/git-svn.txt:626
@@ -5516,13 +4772,7 @@ msgstr "--find-copies-harder"
#: en/diff-options.txt:505
#, priority:280
msgid "For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one `-C` option has the same effect."
-msgstr ""
-"Por motivos de desempenho, a predefini챌찾o 챕 que a op챌찾o `-C` encontre as "
-"c처pias apenas caso o arquivo original da c처pia tenha sido modificado no "
-"mesmo conjunto de altera챌천es. Essa flag faz com que o comando inspecione os "
-"arquivos que n찾o modificados como candidatos 횪 origem da c처pia. Esta 챕 uma "
-"opera챌찾o muito dispendiosa em projetos grandes, portanto, utilize-a com "
-"cuidado. Tem o mesmo efeito caso a op챌찾o `-C` seja repetida."
+msgstr "Por motivos de desempenho, a predefini챌찾o 챕 que a op챌찾o `-C` encontre as c처pias apenas caso o arquivo original da c처pia tenha sido modificado no mesmo conjunto de altera챌천es. Essa flag faz com que o comando inspecione os arquivos que n찾o modificados como candidatos 횪 origem da c처pia. Esta 챕 uma opera챌찾o muito dispendiosa em projetos grandes, portanto, utilize-a com cuidado. Tem o mesmo efeito caso a op챌찾o `-C` seja repetida."
#. type: Labeled list
#: en/diff-options.txt:506 en/git-branch.txt:103 en/git-http-push.txt:45
@@ -5540,22 +4790,13 @@ msgstr "--irreversible-delete"
#: en/diff-options.txt:515
#, priority:280
msgid "Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, hence the name of the option."
-msgstr ""
-"Omita a imagem pr챕via que ser찼 exclu챠da, ou seja, imprima apenas o "
-"cabe챌alho, mas n찾o a diferen챌a entre a pr챕-imagem e `/dev/null`. O patch "
-"resultante n찾o deve ser aplicado com com o comando `patch` ou `git apply`; 챕 "
-"apenas para pessoas que desejam se concentrar em revisar o texto ap처s a "
-"altera챌찾o. Al챕m disso, a sa챠da obviamente n찾o possui informa챌천es suficientes "
-"para aplicar esse patch em sentido inverso, mesmo manualmente, da챠 o nome da "
-"op챌찾o."
+msgstr "Omita a imagem pr챕via que ser찼 exclu챠da, ou seja, imprima apenas o cabe챌alho, mas n찾o a diferen챌a entre a pr챕-imagem e `/dev/null`. O patch resultante n찾o deve ser aplicado com com o comando `patch` ou `git apply`; 챕 apenas para pessoas que desejam se concentrar em revisar o texto ap처s a altera챌찾o. Al챕m disso, a sa챠da obviamente n찾o possui informa챌천es suficientes para aplicar esse patch em sentido inverso, mesmo manualmente, da챠 o nome da op챌찾o."
#. type: Plain text
#: en/diff-options.txt:518
#, priority:280
msgid "When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair."
-msgstr ""
-"Quando utilizado em conjunto com a op챌찾o `-B`, omita tamb챕m a pr챕-imagem na "
-"parte da exclus찾o de um par excluir/criar."
+msgstr "Quando utilizado em conjunto com a op챌찾o `-B`, omita tamb챕m a pr챕-imagem na parte da exclus찾o de um par excluir/criar."
#. type: Labeled list
#: en/diff-options.txt:519 en/git-svn.txt:625
@@ -5567,11 +4808,7 @@ msgstr "-l<num>"
#: en/diff-options.txt:525
#, priority:280
msgid "The `-M` and `-C` options require O(n^2) processing time where n is the number of potential rename/copy targets. This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number."
-msgstr ""
-"As op챌천es `-M` e` -C` requerem um tempo de processamento O(n^2) em que n 챕 a "
-"quantidade de poss챠veis alvos para renomea챌천es/c처pia. Esta op챌찾o impede que "
-"a detec챌찾o da a챌찾o de renomear/c처pia seja executada se a quantidade dos "
-"alvos a serem renomeados/copiados exceda o a quantidade especificada."
+msgstr "As op챌천es `-M` e` -C` requerem um tempo de processamento O(n^2) em que n 챕 a quantidade de poss챠veis alvos para renomea챌천es/c처pia. Esta op챌찾o impede que a detec챌찾o da a챌찾o de renomear/c처pia seja executada se a quantidade dos alvos a serem renomeados/copiados exceda o a quantidade especificada."
#. type: Labeled list
#: en/diff-options.txt:527
@@ -5583,37 +4820,19 @@ msgstr "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
#: en/diff-options.txt:538
#, ignore-ellipsis, priority:280
msgid "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters (including none) can be used. When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected."
-msgstr ""
-"Selecione apenas os arquivos Adicionados (`A`), Copiados (`C`), Exclu챠dos "
-"(`D`), Modificados (`M`), Renomeados (`R`) e que tenham o seu tipo (por "
-"exemplo, arquivo normal, link simb처lico, o subm처dulo, ...) alterado (`T`), "
-"n찾o est찼 mesclado (`U`), que seja desconhecido (`X`) ou que teve o seu "
-"emparelhamento quebrado (`B`). Qualquer combina챌찾o dos caracteres do filtro "
-"(incluindo `none` nenhum) pode ser utilizado. Quando `*` (Tudo ou nenhum) 챕 "
-"adicionado 횪 combina챌찾o, todos os caminhos s찾o selecionados caso haja algum "
-"arquivo que coincida com outros crit챕rios durante a compara챌찾o; caso n찾o "
-"haja nenhum arquivo que coincida com outros crit챕rios, nada ser찼 selecionado."
+msgstr "Selecione apenas os arquivos Adicionados (`A`), Copiados (`C`), Exclu챠dos (`D`), Modificados (`M`), Renomeados (`R`) e que tenham o seu tipo (por exemplo, arquivo normal, link simb처lico, o subm처dulo, ...) alterado (`T`), n찾o est찼 mesclado (`U`), que seja desconhecido (`X`) ou que teve o seu emparelhamento quebrado (`B`). Qualquer combina챌찾o dos caracteres do filtro (incluindo `none` nenhum) pode ser utilizado. Quando `*` (Tudo ou nenhum) 챕 adicionado 횪 combina챌찾o, todos os caminhos s찾o selecionados caso haja algum arquivo que coincida com outros crit챕rios durante a compara챌찾o; caso n찾o haja nenhum arquivo que coincida com outros crit챕rios, nada ser찼 selecionado."
#. type: Plain text
#: en/diff-options.txt:541
#, priority:280
msgid "Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths."
-msgstr ""
-"Al챕m disso, estas letras mai첬sculas podem ser transformadas em minusculas "
-"para se excluir. `--diff-filter=ad` exclui os caminhos adicionados e "
-"exclu챠dos por exemplo."
+msgstr "Al챕m disso, estas letras mai첬sculas podem ser transformadas em minusculas para se excluir. `--diff-filter=ad` exclui os caminhos adicionados e exclu챠dos por exemplo."
#. type: Plain text
#: en/diff-options.txt:547
#, priority:280
msgid "Note that not all diffs can feature all types. For instance, diffs from the index to the working tree can never have Added entries (because the set of paths included in the diff is limited by what is in the index). Similarly, copied and renamed entries cannot appear if detection for those types is disabled."
-msgstr ""
-"Observe que nem todas as diferen챌as diff podem apresentar todos os tipos. "
-"Por exemplo, diffs do 챠ndice para a 찼rvore de trabalho nunca podem ter "
-"entradas adicionadas (porque o conjunto dos caminhos inclusos no diff 챕 "
-"limitado pelo que est찼 no 챠ndice). Da mesma forma, as entradas copiadas e "
-"renomeadas n찾o podem aparecer caso a detec챌찾o para estes tipos estiverem "
-"desativados."
+msgstr "Observe que nem todas as diferen챌as diff podem apresentar todos os tipos. Por exemplo, diffs do 챠ndice para a 찼rvore de trabalho nunca podem ter entradas adicionadas (porque o conjunto dos caminhos inclusos no diff 챕 limitado pelo que est찼 no 챠ndice). Da mesma forma, as entradas copiadas e renomeadas n찾o podem aparecer caso a detec챌찾o para estes tipos estiverem desativados."
#. type: Labeled list
#: en/diff-options.txt:548
@@ -5625,20 +4844,13 @@ msgstr "-S<string>"
#: en/diff-options.txt:552
#, priority:280
msgid "Look for differences that change the number of occurrences of the specified string (i.e. addition/deletion) in a file. Intended for the scripter's use."
-msgstr ""
-"Procure por diferen챌as que alterem a quantidade de ocorr챗ncias da cadeia de "
-"caracteres especificada (ou seja, adi챌찾o/exclus찾o) em um arquivo. Destinado "
-"ao uso do scripter."
+msgstr "Procure por diferen챌as que alterem a quantidade de ocorr챗ncias da cadeia de caracteres especificada (ou seja, adi챌찾o/exclus찾o) em um arquivo. Destinado ao uso do scripter."
#. type: Plain text
#: en/diff-options.txt:558
#, priority:280
msgid "It is useful when you're looking for an exact block of code (like a struct), and want to know the history of that block since it first came into being: use the feature iteratively to feed the interesting block in the preimage back into `-S`, and keep going until you get the very first version of the block."
-msgstr ""
-"횣til durante a produra por um bloco de c처digo exato (como uma \"struct\"), e "
-"quera saber o hist처rico deste bloco desde que ele surgiu: utilize o recurso "
-"de forma iterativa para alimentar o bloco de interesse na pr챕-imagem de "
-"volta `-S` e continue at챕 voc챗 obter a primeira vers찾o do bloco."
+msgstr "횣til durante a produra por um bloco de c처digo exato (como uma \"struct\"), e quera saber o hist처rico deste bloco desde que ele surgiu: utilize o recurso de forma iterativa para alimentar o bloco de interesse na pr챕-imagem de volta `-S` e continue at챕 voc챗 obter a primeira vers찾o do bloco."
#. type: Plain text
#: en/diff-options.txt:560
@@ -5656,9 +4868,7 @@ msgstr "-G<regex>"
#: en/diff-options.txt:564
#, priority:280
msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
-msgstr ""
-"Procure por diferen챌as cujo texto do patch contenha as linhas adicionadas/"
-"removidas que correspondam a um `<regex>`."
+msgstr "Procure por diferen챌as cujo texto do patch contenha as linhas adicionadas/removidas que correspondam a um `<regex>`."
#. type: Plain text
#: en/diff-options.txt:568
@@ -5682,25 +4892,19 @@ msgstr ""
#: en/diff-options.txt:578
#, 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\"frotz\\(nitfol\"` exibir찼 este commit, j찼 o `git log "
-"-S\"frotz\\(nitfol\" --pickaxe-regex` n찾o (porque a quantidade de "
-"ocorr챗ncias dessa cadeia de caracteres n찾o foi alterada) ."
+msgstr "Enquanto o `git log -G\"frotz\\(nitfol\"` exibir찼 este commit, j찼 o `git log -S\"frotz\\(nitfol\" --pickaxe-regex` n찾o (porque a quantidade de ocorr챗ncias dessa cadeia de caracteres n찾o foi alterada) ."
#. type: Plain text
#: en/diff-options.txt:581
#, priority:280
msgid "Unless `--text` is supplied patches of binary files without a textconv filter will be ignored."
-msgstr ""
-"A menos que `--text` seja utilizado, os patches dos arquivos bin찼rios sem um "
-"filtro \"textconv\" ser찾o ignorados."
+msgstr "A menos que `--text` seja utilizado, os patches dos arquivos bin찼rios sem um filtro \"textconv\" ser찾o ignorados."
#. type: Plain text
#: en/diff-options.txt:584
#, priority:280
msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
-msgstr ""
-"Para mais informa챌천es consulte a entrada 'pickaxe' em linkgit:gitdiffcore[7]."
+msgstr "Para mais informa챌천es consulte a entrada 'pickaxe' em linkgit:gitdiffcore[7]."
#. type: Labeled list
#: en/diff-options.txt:585
@@ -5712,18 +4916,13 @@ msgstr "--find-object=<object-id>"
#: en/diff-options.txt:590
#, priority:280
msgid "Look for differences that change the number of occurrences of the specified object. Similar to `-S`, just the argument is different in that it doesn't search for a specific string but for a specific object id."
-msgstr ""
-"Procure pelas diferen챌as que alteram a quantidade de ocorr챗ncias do objeto "
-"especificado. Similar ao `-S`, por챕m apenas o argumento 챕 diferente pois ele "
-"n찾o procura por uma sequ챗ncia espec챠fica, mas por um ID espec챠fico do objeto."
+msgstr "Procure pelas diferen챌as que alteram a quantidade de ocorr챗ncias do objeto especificado. Similar ao `-S`, por챕m apenas o argumento 챕 diferente pois ele n찾o procura por uma sequ챗ncia espec챠fica, mas por um ID espec챠fico do objeto."
#. type: Plain text
#: 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 uma bolha ou um commit do subm처dulo. Para tamb챕m encontrar "
-"찼rvores, fa챌a a utiliza챌찾o da op챌찾o `-t` tamb챕m no `git-log`."
+msgstr "O objeto pode ser uma bolha ou um commit do subm처dulo. Para tamb챕m encontrar 찼rvores, fa챌a a utiliza챌찾o da op챌찾o `-t` tamb챕m no `git-log`."
#. type: Labeled list
#: en/diff-options.txt:594
@@ -5735,10 +4934,7 @@ msgstr "--pickaxe-all"
#: en/diff-options.txt:598
#, priority:280
msgid "When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change in <string>."
-msgstr ""
-"Quando a op챌찾o `-S` ou` -G` encontra uma altera챌찾o, exiba todas as "
-"altera챌천es naquele conjunto de altera챌천es e n찾o apenas nos arquivos que "
-"contenham as altera챌천es em uma `<string>`."
+msgstr "Quando a op챌찾o `-S` ou` -G` encontra uma altera챌찾o, exiba todas as altera챌천es naquele conjunto de altera챌천es e n찾o apenas nos arquivos que contenham as altera챌천es em uma `<string>`."
#. type: Labeled list
#: en/diff-options.txt:599
@@ -5750,9 +4946,7 @@ msgstr "--pickaxe-regex"
#: en/diff-options.txt:602
#, priority:280
msgid "Treat the <string> given to `-S` as an extended POSIX regular expression to match."
-msgstr ""
-"Trate o `<string>` utilizado com o `-S` como uma express찾o regular POSIX "
-"estendida para coincidir."
+msgstr "Trate o `<string>` utilizado com o `-S` como uma express찾o regular POSIX estendida para coincidir."
#. type: Labeled list
#: en/diff-options.txt:605 en/git-mergetool.txt:95
@@ -5764,25 +4958,13 @@ msgstr "-O<orderfile>"
#: en/diff-options.txt:610
#, priority:280
msgid "Control the order in which files appear in the output. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`."
-msgstr ""
-"Controlar a ordem em que os arquivos aparecem na sa챠da. Substitui a "
-"vari찼vel da configura챌찾o `diff.orderFile` (consulte linkgit:git-config[1]). "
-"Para cancelar a vari찼vel `diff.orderFile`, utilize `-O/dev/null`."
+msgstr "Controlar a ordem em que os arquivos aparecem na sa챠da. Substitui a vari찼vel da configura챌찾o `diff.orderFile` (consulte linkgit:git-config[1]). Para cancelar a vari찼vel `diff.orderFile`, utilize `-O/dev/null`."
#. type: Plain text
#: en/diff-options.txt:622
#, priority:280
msgid "The output order is determined by the order of glob patterns in <orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. All files with pathnames that do not match any pattern are output last, as if there was an implicit match-all pattern at the end of the file. If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order."
-msgstr ""
-"A ordem da sa챠da 챕 determinada pela ordem dos padr천es bolha em <orderfile>. "
-"S찾o enviados primeiro todos os arquivos cujos nomes do caminho coincidam com "
-"o primeiro padr찾o, em seguida todos os arquivos cujos nomes do caminho "
-"coincidam com o segundo padr찾o (mas n찾o ao primeiro) e assim por diante. "
-"S찾o exibidos por 첬ltimo todos os arquivos cujos nomes do caminho n찾o "
-"coincidam com nenhum padr찾o como se houvesse um padr찾o de coincid챗ncia total "
-"impl챠cito no final do arquivo. Caso v찼rios nomes do caminho tenham a mesma "
-"classifica챌찾o (eles coincidem com o mesmo padr찾o, mas n찾o com os padr천es "
-"anteriores), a sua ordem na sa챠da em rela챌찾o 횪 outra 챕 a ordem normal."
+msgstr "A ordem da sa챠da 챕 determinada pela ordem dos padr천es bolha em <orderfile>. S찾o enviados primeiro todos os arquivos cujos nomes do caminho coincidam com o primeiro padr찾o, em seguida todos os arquivos cujos nomes do caminho coincidam com o segundo padr찾o (mas n찾o ao primeiro) e assim por diante. S찾o exibidos por 첬ltimo todos os arquivos cujos nomes do caminho n찾o coincidam com nenhum padr찾o como se houvesse um padr찾o de coincid챗ncia total impl챠cito no final do arquivo. Caso v찼rios nomes do caminho tenham a mesma classifica챌찾o (eles coincidem com o mesmo padr찾o, mas n찾o com os padr천es anteriores), a sua ordem na sa챠da em rela챌찾o 횪 outra 챕 a ordem normal."
#. type: Plain text
#: en/diff-options.txt:624
@@ -5794,18 +4976,13 @@ msgstr "O `<orderfile>` 챕 analisado da seguinte maneira:"
#: en/diff-options.txt:628
#, priority:280
msgid "Blank lines are ignored, so they can be used as separators for readability."
-msgstr ""
-"As linhas em branco s찾o ignoradas para que possam ser utilizadas como "
-"separadores, facilitando a leitura."
+msgstr "As linhas em branco s찾o ignoradas para que possam ser utilizadas como separadores, facilitando a leitura."
#. type: Plain text
#: en/diff-options.txt:632
#, priority:280
msgid "Lines starting with a hash (\"`#`\") are ignored, so they can be used for comments. Add a backslash (\"`\\`\") to the beginning of the pattern if it starts with a hash."
-msgstr ""
-"As linhas que come챌am com um hash (\"`#`\") s찾o ignoradas para que possam "
-"ser utilizadas como coment찼rios. Adicione uma barra invertida (\"`\\`\") ao "
-"in챠cio do padr찾o caso ele comece com um hash."
+msgstr "As linhas que come챌am com um hash (\"`#`\") s찾o ignoradas para que possam ser utilizadas como coment찼rios. Adicione uma barra invertida (\"`\\`\") ao in챠cio do padr찾o caso ele comece com um hash."
#. type: Plain text
#: en/diff-options.txt:634
@@ -5817,13 +4994,7 @@ msgstr "Cada outra linha quem contenha um 첬nico padr찾o."
#: en/diff-options.txt:641
#, priority:280
msgid "Patterns have the same syntax and semantics as patterns used for fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and \"`foo/bar/baz/asdf`\" but not \"`foobarx`\"."
-msgstr ""
-"Os padr천es t챗m a mesma sintaxe e sem창ntica que os padr천es utilizados para "
-"fnmatch(3) sem a flag `FNM_PATHNAME`, exceto que um nome do caminho tamb챕m "
-"coincida com um padr찾o caso a remo챌찾o de qualquer quantidade dos componentes "
-"finais do nome do caminho coincida com o padr찾o. O padr찾o \"`foo*bar`\" "
-"coincide com \"`fooasdfbar`\" e \"`foo/bar/baz/asdf`\" mas n찾o com \""
-"`foobarx`\" por exemplo."
+msgstr "Os padr천es t챗m a mesma sintaxe e sem창ntica que os padr천es utilizados para fnmatch(3) sem a flag `FNM_PATHNAME`, exceto que um nome do caminho tamb챕m coincida com um padr찾o caso a remo챌찾o de qualquer quantidade dos componentes finais do nome do caminho coincida com o padr찾o. O padr찾o \"`foo*bar`\" coincide com \"`fooasdfbar`\" e \"`foo/bar/baz/asdf`\" mas n찾o com \"`foobarx`\" por exemplo."
#. type: Labeled list
#: en/diff-options.txt:643 en/git-apply.txt:104 en/git-cvsimport.txt:168
@@ -5835,9 +5006,7 @@ msgstr "-R"
#: en/diff-options.txt:646
#, priority:280
msgid "Swap two inputs; that is, show differences from index or on-disk file to tree contents."
-msgstr ""
-"Troque as duas entradas; isto 챕, exiba as diferen챌as do 챠ndice ou do arquivo "
-"no disco para o conte첬do da 찼rvore."
+msgstr "Troque as duas entradas; isto 챕, exiba as diferen챌as do 챠ndice ou do arquivo no disco para o conte첬do da 찼rvore."
#. type: Labeled list
#: en/diff-options.txt:647
@@ -5849,12 +5018,7 @@ msgstr "--relative[=<caminho>]"
#: en/diff-options.txt:654
#, priority:280
msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
-msgstr ""
-"Com esta op챌찾o, quando executado a partir de um subdiret처rio do projeto, "
-"pode-se dizer para excluir as altera챌천es fora do diret처rio e exibir os nomes "
-"do caminho relativos a ele. Quando n찾o estiver em um subdiret처rio (em um "
-"reposit처rio vazio por exemplo), 챕 poss챠vel nomear em qual subdiret처rio "
-"tornar a sa챠da relativa, utilizando um `<caminho>` como argumento."
+msgstr "Com esta op챌찾o, quando executado a partir de um subdiret처rio do projeto, pode-se dizer para excluir as altera챌천es fora do diret처rio e exibir os nomes do caminho relativos a ele. Quando n찾o estiver em um subdiret처rio (em um reposit처rio vazio por exemplo), 챕 poss챠vel nomear em qual subdiret처rio tornar a sa챠da relativa, utilizando um `<caminho>` como argumento."
#. type: Labeled list
#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
@@ -5914,10 +5078,7 @@ msgstr "--ignore-all-space"
#: en/diff-options.txt:677
#, priority:280
msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
-msgstr ""
-"Ignore o espa챌o em branco durante a compara챌찾o das linhas. Ignore as "
-"diferen챌as mesmo que uma linha tenha espa챌os em branco quando a outra linha "
-"n찾o tiver nenhuma."
+msgstr "Ignore o espa챌o em branco durante a compara챌찾o das linhas. Ignore as diferen챌as mesmo que uma linha tenha espa챌os em branco quando a outra linha n찾o tiver nenhuma."
#. type: Labeled list
#: en/diff-options.txt:678
@@ -5941,11 +5102,7 @@ msgstr "--inter-hunk-context=<linhas>"
#: en/diff-options.txt:686
#, priority:280
msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. Defaults to `diff.interHunkContext` or 0 if the config option is unset."
-msgstr ""
-"Exiba o contexto entre as diferen챌as, at챕 a quantidade de linhas "
-"especificada, fundindo assim as que est찾o pr처ximas umas das outras. A "
-"predefini챌찾o 챕 `diff.interHunkContext` ou 0 caso a op챌찾o de configura챌찾o n찾o "
-"esteja definida."
+msgstr "Exiba o contexto entre as diferen챌as, at챕 a quantidade de linhas especificada, fundindo assim as que est찾o pr처ximas umas das outras. A predefini챌찾o 챕 `diff.interHunkContext` ou 0 caso a op챌찾o de configura챌찾o n찾o esteja definida."
#. type: Labeled list
#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
@@ -5975,9 +5132,7 @@ msgstr "--exit-code"
#: en/diff-options.txt:697
#, priority:280
msgid "Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences."
-msgstr ""
-"Fa챌a com que o programa encerre com c처digos semelhantes ao diff(1). Ou "
-"seja, encerra com 1 caso haja diferen챌as ou 0 quando n찾o houver."
+msgstr "Fa챌a com que o programa encerre com c처digos semelhantes ao diff(1). Ou seja, encerra com 1 caso haja diferen챌as ou 0 quando n찾o houver."
#. type: Labeled list
#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
@@ -5989,9 +5144,7 @@ msgstr "--quiet"
#: en/diff-options.txt:700
#, priority:280
msgid "Disable all output of the program. Implies `--exit-code`."
-msgstr ""
-"Faz com que o programa trabalhe em sil챗ncio. Implica no uso da op챌찾o `--exit-"
-"code`."
+msgstr "Faz com que o programa trabalhe em sil챗ncio. Implica no uso da op챌찾o `--exit-code`."
#. type: Labeled list
#: en/diff-options.txt:703
@@ -6003,10 +5156,7 @@ msgstr "--ext-diff"
#: en/diff-options.txt:707
#, priority:280
msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
-msgstr ""
-"Permitir que um auxiliar diff externo seja executado. Caso um controlador "
-"diff externo seja definido com linkgit:gitattributes[5], ser찼 necess찼rio a "
-"utiliza챌찾o desta op챌찾o com linkgit:git-log[1] e seus companheiros."
+msgstr "Permitir que um auxiliar diff externo seja executado. Caso um controlador diff externo seja definido com linkgit:gitattributes[5], ser찼 necess찼rio a utiliza챌찾o desta op챌찾o com linkgit:git-log[1] e seus companheiros."
#. type: Labeled list
#: en/diff-options.txt:708
@@ -6036,15 +5186,7 @@ msgstr "--no-textconv"
#: en/diff-options.txt:721
#, priority:280
msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
-msgstr ""
-"Permita (ou n찾o permita) a execu챌찾o dos filtros externos para a convers찾o do "
-"texto durante a compara챌찾o dos arquivos bin찼rios. Para mais detalhes "
-"consulte linkgit:gitattributes[5]. Como os filtros \"textconv\" s찾o "
-"normalmente uma convers찾o unidirecional, o diff resultante 챕 leg챠vel para as "
-"pessoas por챕m n찾o pode ser aplicado. Por este motivo, 챕 predefinido que os "
-"filtros \"textconv\" estejam ativos apenas para os comandos linkgit:git-"
-"diff[1] e linkgit:git-log[1], mas n찾o para os comandos linkgit:git-format-"
-"patch[1] ou comandos \"diff\" que possam ser redirecionados."
+msgstr "Permita (ou n찾o permita) a execu챌찾o dos filtros externos para a convers찾o do texto durante a compara챌찾o dos arquivos bin찼rios. Para mais detalhes consulte linkgit:gitattributes[5]. Como os filtros \"textconv\" s찾o normalmente uma convers찾o unidirecional, o diff resultante 챕 leg챠vel para as pessoas por챕m n찾o pode ser aplicado. Por este motivo, 챕 predefinido que os filtros \"textconv\" estejam ativos apenas para os comandos linkgit:git-diff[1] e linkgit:git-log[1], mas n찾o para os comandos linkgit:git-format-patch[1] ou comandos \"diff\" que possam ser redirecionados."
#. type: Labeled list
#: en/diff-options.txt:722 en/git-status.txt:87
@@ -6056,21 +5198,7 @@ msgstr "--ignore-submodules[=<quando>]"
#: en/diff-options.txt:734
#, priority:280
msgid "Ignore changes to submodules in the diff generation. <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 until 1.7.0). Using \"all\" hides all changes to submodules."
-msgstr ""
-"Ignore as altera챌천es nos subm처dulos durante a gera챌찾o dos diffs. O `<quando>`"
-" pode ser \"none\" (nenhum), \"untracked\" (sem monitoramento/rastreamento), "
-"\"dirty\" (sujo) ou \"all\" (todos), que 챕 a predefini챌찾o. O \"none\" "
-"considera o subm처dulo modificado quando houver arquivos n찾o estejam "
-"rastreados, modificados ou o seu `HEAD` seja diferente do commit registrado "
-"no superprojeto, pode ser utilizado para substituir qualquer configura챌찾o da "
-"op챌찾o 'ignore' (ignorar) em linkgit:git-config[1] ou linkgit:gitmodules[5]. "
-"Quando o \"untracked\" 챕 utilizado, os subm처dulos n찾o s찾o considerados sujos "
-"quando houver apenas um conte첬do sem rastreamento (por챕m o monitoramento de "
-"altera챌천es do seu conte첬do continua) O uso de \"dirty\" ignora todas as "
-"altera챌천es na 찼rvore de trabalho dos subm처dulos, apenas as altera챌천es nos "
-"commits armazenados no superprojeto s찾o exibidos (este era o comportamento "
-"anterior at챕 a vers찾o 1.7.0). O uso de \"all\" oculta todas as altera챌천es "
-"nos subm처dulos."
+msgstr "Ignore as altera챌천es nos subm처dulos durante a gera챌찾o dos diffs. O `<quando>` pode ser \"none\" (nenhum), \"untracked\" (sem monitoramento/rastreamento), \"dirty\" (sujo) ou \"all\" (todos), que 챕 a predefini챌찾o. O \"none\" considera o subm처dulo modificado quando houver arquivos n찾o estejam rastreados, modificados ou o seu `HEAD` seja diferente do commit registrado no superprojeto, pode ser utilizado para substituir qualquer configura챌찾o da op챌찾o 'ignore' (ignorar) em linkgit:git-config[1] ou linkgit:gitmodules[5]. Quando o \"untracked\" 챕 utilizado, os subm처dulos n찾o s찾o considerados sujos quando houver apenas um conte첬do sem rastreamento (por챕m o monitoramento de altera챌천es do seu conte첬do continua) O uso de \"dirty\" ignora todas as altera챌천es na 찼rvore de trabalho dos subm처dulos, apenas as altera챌천es nos commits armazenados no superprojeto s찾o exibidos (este era o comportamento anterior at챕 a vers찾o 1.7.0). O uso de \"all\" oculta todas as altera챌천es nos subm처dulos."
#. type: Labeled list
#: en/diff-options.txt:735
@@ -6130,21 +5258,13 @@ msgstr "--ita-invisible-in-index"
#: en/diff-options.txt:754
#, priority:280
msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\". This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
-msgstr ""
-"횋 predefinido que as entradas adicionadas atrav챕s do comando \"git add -N\" "
-"apare챌am como uma cadeia de caracteres vazia existente com o comando \"git "
-"diff\" e um novo arquivo com \"git diff --cached\". Esta op챌찾o faz com que "
-"a entrada apare챌a como um novo arquivo no \"git diff\" e inexistente no \"git"
-" diff --cached\". Esta op챌찾o pode ser revertida com `--ita-visible-in-index`"
-". Ambas as op챌천es s찾o experimentais e podem ser removidas no futuro."
+msgstr "횋 predefinido que as entradas adicionadas atrav챕s do comando \"git add -N\" apare챌am como uma cadeia de caracteres vazia existente com o comando \"git diff\" e um novo arquivo com \"git diff --cached\". Esta op챌찾o faz com que a entrada apare챌a como um novo arquivo no \"git diff\" e inexistente no \"git diff --cached\". Esta op챌찾o pode ser revertida com `--ita-visible-in-index`. Ambas as op챌천es s찾o experimentais e podem ser removidas no futuro."
#. type: Plain text
#: en/diff-options.txt:756
#, priority:280
msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
-msgstr ""
-"Para uma explica챌찾o mais detalhada sobre estas op챌천es comuns, consulte "
-"tamb챕m linkgit:gitdiffcore[7]."
+msgstr "Para uma explica챌찾o mais detalhada sobre estas op챌천es comuns, consulte tamb챕m linkgit:gitdiffcore[7]."
#. type: Labeled list
#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:138
@@ -6168,10 +5288,7 @@ msgstr "--append"
#: en/fetch-options.txt:9
#, 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 ""
-"Acrescente nomes ao \"ref\" e os nomes dos objetos \"refs\" capturados ao "
-"conte첬do existente de `.git/FETCH_HEAD`. Sem esta op챌찾o, os dados antigos "
-"em `.git/FETCH_HEAD` ser찾o substitu챠dos."
+msgstr "Acrescente nomes ao \"ref\" e os nomes dos objetos \"refs\" capturados ao conte첬do existente de `.git/FETCH_HEAD`. Sem esta op챌찾o, os dados antigos em `.git/FETCH_HEAD` ser찾o substitu챠dos."
#. type: Labeled list
#: en/fetch-options.txt:10
@@ -6183,13 +5300,7 @@ msgstr "--depth=<profundidade>"
#: en/fetch-options.txt:16
#, 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 ""
-"Limite a captura para uma quantidade espec챠fica de commits na ponta do "
-"hist처rico de cada ramifica챌찾o remota. Caso esteja capturando um reposit처rio "
-"'shallow' (superficial) criado pelo `git clone` com a op챌찾o "
-"`--depth=<profundidade>` (consulte linkgit:git-clone[1]), aprofunde ou "
-"encurte o hist처rico para a quantidade especificada de commits. As tags para "
-"os commits aprofundados n찾o s찾o capturados."
+msgstr "Limite a captura para uma quantidade espec챠fica de commits na ponta do hist처rico de cada ramifica챌찾o remota. Caso esteja capturando um reposit처rio 'shallow' (superficial) criado pelo `git clone` com a op챌찾o `--depth=<profundidade>` (consulte linkgit:git-clone[1]), aprofunde ou encurte o hist처rico para a quantidade especificada de commits. As tags para os commits aprofundados n찾o s찾o capturados."
#. type: Labeled list
#: en/fetch-options.txt:17
@@ -6201,9 +5312,7 @@ msgstr "--deepen=<profundidade>"
#: en/fetch-options.txt:21
#, 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 ""
-"Semelhante a op챌찾o `--depth`, exceto que especifica a quantidade de commits "
-"do limite raso atual em vez da ponta de cada hist처rico do ramo remoto."
+msgstr "Semelhante a op챌찾o `--depth`, exceto que especifica a quantidade de commits do limite raso atual em vez da ponta de cada hist처rico do ramo remoto."
#. type: Labeled list
#: en/fetch-options.txt:22 en/git-clone.txt:232 en/git-fetch-pack.txt:90
@@ -6215,9 +5324,7 @@ msgstr "--shallow-since=<data>"
#: en/fetch-options.txt:25 en/git-fetch-pack.txt:93
#, priority:220
msgid "Deepen or shorten the history of a shallow repository to include all reachable commits after <date>."
-msgstr ""
-"Aprofunde ou encurte o hist처rico de um reposit처rio raso para incluir todas "
-"os commits alcan챌찼veis ap처s a <data>."
+msgstr "Aprofunde ou encurte o hist처rico de um reposit처rio raso para incluir todas os commits alcan챌찼veis ap처s a <data>."
#. type: Labeled list
#: en/fetch-options.txt:26 en/git-clone.txt:235 en/git-fetch-pack.txt:94
@@ -6229,10 +5336,7 @@ msgstr "--shallow-exclude=<revis찾o>"
#: en/fetch-options.txt:30 en/git-fetch-pack.txt:98
#, 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 ""
-"Aprofunde ou diminua o hist처rico de um reposit처rio raso para excluir os "
-"commits alcan챌찼veis vindos de uma determinada tag ou ramifica챌찾o remota. "
-"Esta op챌찾o pode ser utilizada v찼rias vezes."
+msgstr "Aprofunde ou diminua o hist처rico de um reposit처rio raso para excluir os commits alcan챌찼veis vindos de uma determinada tag ou ramifica챌찾o remota. Esta op챌찾o pode ser utilizada v찼rias vezes."
#. type: Labeled list
#: en/fetch-options.txt:31
@@ -6244,18 +5348,13 @@ msgstr "--unshallow"
#: en/fetch-options.txt:35
#, 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 ""
-"Caso o reposit처rio de origem esteja completo, converta um reposit처rio raso "
-"em um completo, removendo todas as limita챌천es impostas pelos reposit처rios "
-"rasos."
+msgstr "Caso o reposit처rio de origem esteja completo, converta um reposit처rio raso em um completo, removendo todas as limita챌천es impostas pelos reposit처rios rasos."
#. 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 ""
-"Caso o reposit처rio de origem seja superficial, busque o m찼ximo poss챠vel para "
-"que o reposit처rio atual tenha o mesmo hist처rico que o reposit처rio de origem."
+msgstr "Caso o reposit처rio de origem seja superficial, busque o m찼ximo poss챠vel para que o reposit처rio atual tenha o mesmo hist처rico que o reposit처rio de origem."
#. type: Labeled list
#: en/fetch-options.txt:39
@@ -6267,10 +5366,7 @@ msgstr "--update-shallow"
#: en/fetch-options.txt:44
#, 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 ""
-"횋 predefinido que durante a captura em um reposit처rio superficial, o `git "
-"fetch` recuse os \"refs\" que exijam a atualiza챌찾o do `.git/shallow`. Esta "
-"op챌찾o atualiza o `.git/shallow` e aceita tais \"refs\"."
+msgstr "횋 predefinido que durante a captura em um reposit처rio superficial, o `git fetch` recuse os \"refs\" que exijam a atualiza챌찾o do `.git/shallow`. Esta op챌찾o atualiza o `.git/shallow` e aceita tais \"refs\"."
#. type: Labeled list
#: en/fetch-options.txt:45
@@ -6282,40 +5378,25 @@ msgstr "--negotiation-tip=<commit|glob>"
#: 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 ""
-"횋 predefinido que o Git relatar찼 ao servidor os commits acess챠veis de todos "
-"os \"refs\" locais para que encontre os commits comuns na tentativa de "
-"reduzir o tamanho do pacote que ser찼 recebido. Caso seja utilizado, o Git "
-"relatar찼 apenas os commits alcan챌찼veis a partir das dicas informadas. 횣til "
-"para acelerar as capturas quando o usu찼rio sabe qual \"ref\" local "
-"provavelmente haver찼 commits em comum com um \"ref\" upstream que est찼 sendo "
-"capturado."
+msgstr "횋 predefinido que o Git relatar찼 ao servidor os commits acess챠veis de todos os \"refs\" locais para que encontre os commits comuns na tentativa de reduzir o tamanho do pacote que ser찼 recebido. Caso seja utilizado, o Git relatar찼 apenas os commits alcan챌찼veis a partir das dicas informadas. 횣til para acelerar as capturas quando o usu찼rio sabe qual \"ref\" local provavelmente haver찼 commits em comum com um \"ref\" upstream que est찼 sendo capturado."
#. 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 ""
-"Esta op챌찾o pode ser utilizada mais de uma vez; Se assim for, o Git ir찼 "
-"reportar os commits de qualquer um dos commits informados."
+msgstr "Esta op챌찾o pode ser utilizada mais de uma vez; Se assim for, o Git ir찼 reportar os commits de qualquer um dos commits informados."
#. 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 ""
-"O argumento para esta op챌찾o pode ser um \"ref\" aos nomes de refer챗ncia, uma "
-"refer챗ncia ou o (possivelmente abreviado) SHA-1 de um commit. Especificar um "
-"agrupamento 챕 o equivalente a utilizar esta op챌찾o v찼rias vezes, uma para "
-"cada nome \"ref\" coincidente."
+msgstr "O argumento para esta op챌찾o pode ser um \"ref\" aos nomes de refer챗ncia, uma refer챗ncia ou o (possivelmente abreviado) SHA-1 de um commit. Especificar um agrupamento 챕 o equivalente a utilizar esta op챌찾o v찼rias vezes, uma para cada nome \"ref\" coincidente."
#. 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 ""
-"Consulte tamb챕m a vari찼vel da configura챌찾o `fetch.negotiationAlgorithm` "
-"documentada em linkgit:git-config[1]."
+msgstr "Consulte tamb챕m a vari찼vel da configura챌찾o `fetch.negotiationAlgorithm` documentada em linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:64 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
@@ -6345,9 +5426,7 @@ msgstr "--force"
#: en/fetch-options.txt:71
#, priority:220
msgid "When 'git fetch' is used with `<src>:<dst>` refspec it may refuse to update the local branch as discussed"
-msgstr ""
-"Quando 'git fetch' 챕 utilizado com `<src>:<dst>` \"refspec\" ele pode se "
-"recusar a atualizar o ramo local como discutido"
+msgstr "Quando 'git fetch' 챕 utilizado com `<src>:<dst>` \"refspec\" ele pode se recusar a atualizar o ramo local como discutido"
#. type: Plain text
#: en/fetch-options.txt:74
@@ -6399,9 +5478,7 @@ msgstr "--multiple"
#: en/fetch-options.txt:88
#, priority:220
msgid "Allow several <repository> and <group> arguments to be specified. No <refspec>s may be specified."
-msgstr ""
-"Permita que v찼rios argumentos <reposit처rio> e <grupo> sejam utilizados. "
-"Nenhum `<refspec>` pode ser utilizado."
+msgstr "Permita que v찼rios argumentos <reposit처rio> e <grupo> sejam utilizados. Nenhum `<refspec>` pode ser utilizado."
#. type: Labeled list
#: en/fetch-options.txt:89
@@ -6413,9 +5490,7 @@ msgstr "--[no-]auto-gc"
#: en/fetch-options.txt:92
#, priority:220
msgid "Run `git gc --auto` at the end to perform garbage collection if needed. This is enabled by default."
-msgstr ""
-"Execute o `git gc --auto` no final para executar a coleta de lixo, caso seja "
-"necess찼rio. A predefini챌찾o 챕, sempre ativado."
+msgstr "Execute o `git gc --auto` no final para executar a coleta de lixo, caso seja necess찼rio. A predefini챌찾o 챕, sempre ativado."
#. type: Labeled list
#: en/fetch-options.txt:93
@@ -6439,15 +5514,7 @@ msgstr "--prune"
#: en/fetch-options.txt:109
#, 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 ""
-"Antes de capturar, remova as refer챗ncias do rastreamento remoto que n찾o "
-"exista mais remotamente. As tags n찾o est찾o sujeitas a remo챌찾o caso sejam "
-"capturadas apenas por causa do acompanhamento autom찼tico da tag predefinida "
-"ou devido a uma op챌찾o `--tags`. No entanto, caso as tags seja capturadas "
-"por causa de um \"refspec\" expl챠cito (na linha de comandos ou na "
-"configura챌찾o remota, por exemplo, caso haja uma clonagem remota com a op챌찾o "
-"`--mirror`), elas tamb챕m estar찾o sujeitas a remo챌찾o. Informar a op챌찾o "
-"`--prune-tags` 챕 uma abrevia챌찾o para informar a tag refspec."
+msgstr "Antes de capturar, remova as refer챗ncias do rastreamento remoto que n찾o exista mais remotamente. As tags n찾o est찾o sujeitas a remo챌찾o caso sejam capturadas apenas por causa do acompanhamento autom찼tico da tag predefinida ou devido a uma op챌찾o `--tags`. No entanto, caso as tags seja capturadas por causa de um \"refspec\" expl챠cito (na linha de comandos ou na configura챌찾o remota, por exemplo, caso haja uma clonagem remota com a op챌찾o `--mirror`), elas tamb챕m estar찾o sujeitas a remo챌찾o. Informar a op챌찾o `--prune-tags` 챕 uma abrevia챌찾o para informar a tag refspec."
#. type: Plain text
#: en/fetch-options.txt:112 en/fetch-options.txt:123
@@ -6471,13 +5538,7 @@ msgstr "--prune-tags"
#: en/fetch-options.txt:121
#, 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 ""
-"Antes de capturar, remova as tags locais que n찾o existam mais remotamente "
-"caso a op챌찾o `--prune` esteja ativa. Esta op챌찾o deve ser utilizada com mais "
-"cuidado, ao contr찼rio da op챌찾o `--prune`, ela remover찼 todas as refer챗ncias "
-"locais (tags locais) que forem criadas. Esta op챌찾o 챕 um atalho para informar "
-"a tag expl챠cita refspec junto com a op챌찾o `--prune`, consulte a discuss찾o "
-"sobre isso em sua documenta챌찾o."
+msgstr "Antes de capturar, remova as tags locais que n찾o existam mais remotamente caso a op챌찾o `--prune` esteja ativa. Esta op챌찾o deve ser utilizada com mais cuidado, ao contr찼rio da op챌찾o `--prune`, ela remover찼 todas as refer챗ncias locais (tags locais) que forem criadas. Esta op챌찾o 챕 um atalho para informar a tag expl챠cita refspec junto com a op챌찾o `--prune`, consulte a discuss찾o sobre isso em sua documenta챌찾o."
#. 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:144 en/git-commit.txt:175 en/git-format-patch.txt:100 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:408 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:92
@@ -6495,12 +5556,7 @@ msgstr "--no-tags"
#: en/fetch-options.txt:135
#, 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 ""
-"횋 predefinido que as tags que apontem para os objetos baixados do "
-"reposit처rio remoto sejam capturados e armazenadas localmente. Esta op챌찾o "
-"desativa essa tag autom찼tica a seguir. O comportamento remoto predefinido "
-"pode ser especificado com a configura챌찾o remote.<nome>.tagOpt. Consulte "
-"linkgit:git-config[1]."
+msgstr "횋 predefinido que as tags que apontem para os objetos baixados do reposit처rio remoto sejam capturados e armazenadas localmente. Esta op챌찾o desativa essa tag autom찼tica a seguir. O comportamento remoto predefinido pode ser especificado com a configura챌찾o remote.<nome>.tagOpt. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:136
@@ -6512,15 +5568,7 @@ msgstr "--refmap=<refspec>"
#: en/fetch-options.txt:146
#, 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 capturar as \"refs\" listadas na linha de comando, utilize o \"refspec\" "
-"informado (pode ser utilizado mais de uma vez) para mapear os \"refs\" para "
-"as ramifica챌천es rastreadas remotamente em vez dos valores das vari찼veis da "
-"configura챌찾o `remote.*.fetch` para o reposit처rio remoto. Informe um "
-"`<refspec>` vazio 횪 op챌찾o `--refmap` faz com que o Git ignore os \"refspecs\""
-" configurados e confie inteiramente nos \"refspecs\" informados como os "
-"argumentos da linha de comando. Para mais detalhes consulte a se챌찾o "
-"\"Ramifica챌천es Rastreadas Remotamente Configurada\"."
+msgstr "Ao capturar as \"refs\" listadas na linha de comando, utilize o \"refspec\" informado (pode ser utilizado mais de uma vez) para mapear os \"refs\" para as ramifica챌천es rastreadas remotamente em vez dos valores das vari찼veis da configura챌찾o `remote.*.fetch` para o reposit처rio remoto. Informe um `<refspec>` vazio 횪 op챌찾o `--refmap` faz com que o Git ignore os \"refspecs\" configurados e confie inteiramente nos \"refspecs\" informados como os argumentos da linha de comando. Para mais detalhes consulte a se챌찾o \"Ramifica챌천es Rastreadas Remotamente Configurada\"."
#. type: Labeled list
#: en/fetch-options.txt:148 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
@@ -6532,13 +5580,7 @@ msgstr "--tags"
#: en/fetch-options.txt:155
#, 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 ""
-"Capture todas as tags remotas (ou seja, capture as tags remotas `refs/tags/*`"
-" nas tags locais com o mesmo nome), al챕m de qualquer outra coisa que possa "
-"ser capturada. O uso desta op챌찾o por si s처 n찾o sujeita a remo챌찾o das tags, "
-"mesmo que `--prune` seja utilizado (embora as tags possam ser removidas de "
-"qualquer maneira, caso tamb챕m sejam o destino de um \"refspec\" expl챠cito; "
-"consulte `--prune`)."
+msgstr "Capture todas as tags remotas (ou seja, capture as tags remotas `refs/tags/*` nas tags locais com o mesmo nome), al챕m de qualquer outra coisa que possa ser capturada. O uso desta op챌찾o por si s처 n찾o sujeita a remo챌찾o das tags, mesmo que `--prune` seja utilizado (embora as tags possam ser removidas de qualquer maneira, caso tamb챕m sejam o destino de um \"refspec\" expl챠cito; consulte `--prune`)."
#. type: Labeled list
#: en/fetch-options.txt:157
@@ -6550,18 +5592,7 @@ msgstr "--recurse-submodules[=yes|on-demand|no]"
#: en/fetch-options.txt:168
#, 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. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
-msgstr ""
-"Essa op챌찾o controla se e sob quais condi챌천es os novos commits dos subm처dulos "
-"preenchidos tamb챕m devem ser capturadas. Pode ser utilizado como uma op챌찾o "
-"booleana para desativar completamente a recurs찾o quando definido como 'no' "
-"ou para recursar incondicionalmente em todos os sub-m처dulos preenchidos "
-"quando definido como 'sim', que 챕 a predefini챌찾o quando esta op챌찾o 챕 "
-"utilizada sem qualquer valor. Utilize 'on demand' para re-examinar apenas em "
-"um subm처dulo preenchido quando o superprojeto recuperar uma confirma챌찾o que "
-"atualize a refer챗ncia do subm처dulo para um commit que ainda n찾o esteja no "
-"clone do subm처dulo local. 횋 predefinido que 'on demand' seja utilizado, a "
-"menos que `fetch.recurseSubmodules` seja definido (consulte linkgit:git-"
-"config[1])."
+msgstr "Essa op챌찾o controla se e sob quais condi챌천es os novos commits dos subm처dulos preenchidos tamb챕m devem ser capturadas. Pode ser utilizado como uma op챌찾o booleana para desativar completamente a recurs찾o quando definido como 'no' ou para recursar incondicionalmente em todos os sub-m처dulos preenchidos quando definido como 'sim', que 챕 a predefini챌찾o quando esta op챌찾o 챕 utilizada sem qualquer valor. Utilize 'on demand' para re-examinar apenas em um subm처dulo preenchido quando o superprojeto recuperar uma confirma챌찾o que atualize a refer챗ncia do subm처dulo para um commit que ainda n찾o esteja no clone do subm처dulo local. 횋 predefinido que 'on demand' seja utilizado, a menos que `fetch.recurseSubmodules` seja definido (consulte linkgit:git-config[1])."
#. type: Labeled list
#: en/fetch-options.txt:170
@@ -6579,29 +5610,19 @@ msgstr "--jobs=<n>"
#: en/fetch-options.txt:173
#, priority:220
msgid "Number of parallel children to be used for all forms of fetching."
-msgstr ""
-"A quantidade de processos paralelos que ser찾o utilizados para todas as "
-"formas de captura."
+msgstr "A quantidade de processos paralelos que ser찾o utilizados para todas as formas de captura."
#. type: Plain text
#: en/fetch-options.txt:178
#, 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 ""
-"Caso a op챌찾o `--multiple` seja utilizada, os diferentes ramos remotos ser찾o "
-"capturados em paralelo. Caso v찼rios subm처dulos sejam capturados, estes ser찾o "
-"capturados em paralelo. Para control찼-los de forma independente, utilize as "
-"defini챌천es da configura챌찾o `fetch.parallel` e `submodule.fetchJobs` ("
-"consulte linkgit:git-config[1])."
+msgstr "Caso a op챌찾o `--multiple` seja utilizada, os diferentes ramos remotos ser찾o capturados em paralelo. Caso v찼rios subm처dulos sejam capturados, estes ser찾o capturados em paralelo. Para control찼-los de forma independente, utilize as defini챌천es da configura챌찾o `fetch.parallel` e `submodule.fetchJobs` (consulte linkgit:git-config[1])."
#. type: Plain text
#: en/fetch-options.txt:181
#, priority:220
msgid "Typically, parallel recursive and multi-remote fetches will be faster. By default fetches are performed sequentially, not in parallel."
-msgstr ""
-"Normalmente, as capturas remotas dos m첬ltiplos ramos de forma paralela e "
-"recursiva ser찾o mais r찼pidas. A predefini챌찾o 챕 realizar as capturas em "
-"sequ챗ncia e n찾o em paralelo."
+msgstr "Normalmente, as capturas remotas dos m첬ltiplos ramos de forma paralela e recursiva ser찾o mais r찼pidas. A predefini챌찾o 챕 realizar as capturas em sequ챗ncia e n찾o em paralelo."
#. type: Labeled list
#: en/fetch-options.txt:183 en/git-checkout.txt:294 en/git-push.txt:377 en/git-restore.txt:108 en/git-switch.txt:182
@@ -6613,9 +5634,7 @@ msgstr "--no-recurse-submodules"
#: en/fetch-options.txt:186
#, priority:220
msgid "Disable recursive fetching of submodules (this has the same effect as using the `--recurse-submodules=no` option)."
-msgstr ""
-"Desative a captura recursiva dos subm처dulos (tem o mesmo efeito que utilizar "
-"a op챌찾o `--recurse-submodules=no`)."
+msgstr "Desative a captura recursiva dos subm처dulos (tem o mesmo efeito que utilizar a op챌찾o `--recurse-submodules=no`)."
#. type: Labeled list
#: en/fetch-options.txt:188 en/git-branch.txt:225 en/git-push.txt:349
@@ -6627,12 +5646,7 @@ msgstr "--set-upstream"
#: en/fetch-options.txt:194
#, priority:220
msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
-msgstr ""
-"Caso a captura remota seja bem sucedida, uma refer챗ncia de rastreamento "
-"`pull` e `add` ser찼 adicionada ao \"upstream\", utilizado pelo argumento "
-"`less` linkgit:git-pull[1] e outros comandos. Para mais informa챌천es, "
-"consulte `branch.<name>.merge` e `branch.<name>.remote` em linkgit:git-"
-"config[1]."
+msgstr "Caso a captura remota seja bem sucedida, uma refer챗ncia de rastreamento `pull` e `add` ser찼 adicionada ao \"upstream\", utilizado pelo argumento `less` linkgit:git-pull[1] e outros comandos. Para mais informa챌천es, consulte `branch.<name>.merge` e `branch.<name>.remote` em linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:196
@@ -6644,10 +5658,7 @@ msgstr "--submodule-prefix=<caminho>"
#: en/fetch-options.txt:200
#, 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 ""
-"Anexe o `<caminho>` para os caminhos impressos nas mensagens informativas "
-"como \"Recolhendo o subm처dulo foo\". Esta op챌찾o 챕 utilizada internamente "
-"quando recorrer as subm처dulos."
+msgstr "Anexe o `<caminho>` para os caminhos impressos nas mensagens informativas como \"Recolhendo o subm처dulo foo\". Esta op챌찾o 챕 utilizada internamente quando recorrer as subm처dulos."
#. type: Labeled list
#: en/fetch-options.txt:201
@@ -6659,12 +5670,7 @@ msgstr "--recurse-submodules-default=[yes|on-demand]"
#: en/fetch-options.txt:208
#, 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 ""
-"Esta op챌찾o 챕 utilizada internamente para prover temporariamente um valor n찾o "
-"negativo da forma predefinida para a op챌찾o `--recurse-submodules`. Todos os "
-"outros m챕todos de configurar a recurs찾o do subm처dulo `fetch` (como as "
-"configura챌천es em linkgit:gitmodules[5] e linkgit:git-config[1]) sobrescreva "
-"esta op챌찾o utilizando `--[no-]recurse-submodules` diretamente."
+msgstr "Esta op챌찾o 챕 utilizada internamente para prover temporariamente um valor n찾o negativo da forma predefinida para a op챌찾o `--recurse-submodules`. Todos os outros m챕todos de configurar a recurs찾o do subm처dulo `fetch` (como as configura챌천es em linkgit:gitmodules[5] e linkgit:git-config[1]) sobrescreva esta op챌찾o utilizando `--[no-]recurse-submodules` diretamente."
#. type: Labeled list
#: en/fetch-options.txt:210
@@ -6676,12 +5682,7 @@ msgstr "--update-head-ok"
#: en/fetch-options.txt:217
#, 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 ""
-"횋 predefinido que o 'git fetch' se recuse a atualizar o cabe챌alho que "
-"corresponde ao ramo atual. Esta flag desativa esta verifica챌찾o. Serve "
-"apenas para a utiliza챌찾o interna do 'git pull' para se comunicar com o 'git "
-"fetch', a menos que esteja implementando a sua pr처pria porcelana, voc챗 n찾o "
-"deve utiliz찼-la."
+msgstr "횋 predefinido que o 'git fetch' se recuse a atualizar o cabe챌alho que corresponde ao ramo atual. Esta flag desativa esta verifica챌찾o. Serve apenas para a utiliza챌찾o interna do 'git pull' para se comunicar com o 'git fetch', a menos que esteja implementando a sua pr처pria porcelana, voc챗 n찾o deve utiliz찼-la."
#. type: Labeled list
#: en/fetch-options.txt:219 en/git-clone.txt:199
@@ -6693,10 +5694,7 @@ msgstr "--upload-pack <pacote-para-envio>"
#: en/fetch-options.txt:224
#, 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 ""
-"Quando o reposit처rio 챕 informado para capturar e que seja manipulado por "
-"'git fetch-pack', o `--exec=<upload-pack>` 챕 passado para o comando utilizar "
-"um caminho alternativo para o comando executado na outra extremidade."
+msgstr "Quando o reposit처rio 챕 informado para capturar e que seja manipulado por 'git fetch-pack', o `--exec=<upload-pack>` 챕 passado para o comando utilizar um caminho alternativo para o comando executado na outra extremidade."
#. type: Labeled list
#: en/fetch-options.txt:226 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:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 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:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 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:146
@@ -6708,10 +5706,7 @@ msgstr "-q"
#: en/fetch-options.txt:231
#, 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 ""
-"Repasse a op챌찾o `--quiet` para o `git-fetch-pack` e silencie qualquer outro "
-"comando git utilizado internamente. O progresso n찾o 챕 relatado para o fluxo "
-"de erro predefinido."
+msgstr "Repasse a op챌찾o `--quiet` para o `git-fetch-pack` e silencie qualquer outro comando git utilizado internamente. O progresso n찾o 챕 relatado para o fluxo de erro predefinido."
#. type: Labeled list
#: en/fetch-options.txt:232 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:125 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:400 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:150
@@ -6741,11 +5736,7 @@ msgstr "--progress"
#: en/fetch-options.txt:242 en/git-bundle.txt:88 en/git-pack-objects.txt:156 en/git-push.txt:376
#, priority:220
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."
-msgstr ""
-"횋 predefinido que a condi챌찾o geral do progresso seja relatada no fluxo de "
-"erros quando estiver conectado em um terminal, a menos que `-q` seja "
-"utilizado. Esta op챌찾o imp천em a condi챌찾o geral do progresso, mesmo que o "
-"fluxo de erro predefinido n찾o seja direcionado para um terminal."
+msgstr "횋 predefinido que a condi챌찾o geral do progresso seja relatada no fluxo de erros quando estiver conectado em um terminal, a menos que `-q` seja utilizado. Esta op챌찾o imp천em a condi챌찾o geral do progresso, mesmo que o fluxo de erro predefinido n찾o seja direcionado para um terminal."
#. type: Labeled list
#: en/fetch-options.txt:243 en/git-ls-remote.txt:75 en/git-push.txt:215
@@ -6763,13 +5754,7 @@ msgstr "--server-option=<op챌찾o>"
#: en/fetch-options.txt:251 en/git-clone.txt:143
#, 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 sequ챗ncia especificada para o servidor ao se comunicar "
-"utilizando o protocolo vers찾o 2. A sequ챗ncia informada n찾o deve conter um "
-"caractere `NUL` ou `LF`. O tratamento das op챌천es do servidor, incluindo os "
-"desconhecidos, 챕 espec챠fico do servidor. Quando a op챌찾o `--server-"
-"option=<op챌찾o>` forem utilizadas v찼rias vezes, todos ser찾o enviados para o "
-"outro lado na ordem listada na linha de comando."
+msgstr "Transmita a sequ챗ncia especificada para o servidor ao se comunicar utilizando o protocolo vers찾o 2. A sequ챗ncia informada n찾o deve conter um caractere `NUL` ou `LF`. O tratamento das op챌천es do servidor, incluindo os desconhecidos, 챕 espec챠fico do servidor. Quando a op챌찾o `--server-option=<op챌찾o>` forem utilizadas v찼rias vezes, todos ser찾o enviados para o outro lado na ordem listada na linha de comando."
#. type: Labeled list
#: en/fetch-options.txt:252
@@ -6781,11 +5766,7 @@ msgstr "--show-forced-updates"
#: en/fetch-options.txt:257
#, 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 ""
-"횋 predefinido que o Git verifique se a atualiza챌찾o do ramo foi imposta "
-"durante uma captura. Pode ser desativado por meio de `fetch."
-"showForcedUpdates`, por챕m a op챌찾o `--show-forced-updates garante que essa "
-"verifica챌찾o ocorra. Consulte linkgit:git-config[1]."
+msgstr "횋 predefinido que o Git verifique se a atualiza챌찾o do ramo foi imposta durante uma captura. Pode ser desativado por meio de `fetch.showForcedUpdates`, por챕m a op챌찾o `--show-forced-updates garante que essa verifica챌찾o ocorra. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:258
@@ -6797,13 +5778,7 @@ msgstr "--no-show-forced-updates"
#: en/fetch-options.txt:264
#, 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 ""
-"횋 predefinido que o Git verifique se a atualiza챌찾o do ramo foi imposta "
-"durante uma captura. Utilize a op챌찾o `--no-show-forced-updates` ou defina "
-"`fetch.showForcedUpdates` como to `false` para ignorar esta verifica챌찾o por "
-"quest천es de desempenho. Se utilizada durante o `git-pull`, a op챌찾o `--ff-"
-"only` ainda verificar찼 quais as atualiza챌천es foram impostas antes de tentar "
-"uma atualiza챌찾o r찼pida. Consulte linkgit:git-config[1]."
+msgstr "횋 predefinido que o Git verifique se a atualiza챌찾o do ramo foi imposta durante uma captura. Utilize a op챌찾o `--no-show-forced-updates` ou defina `fetch.showForcedUpdates` como to `false` para ignorar esta verifica챌찾o por quest천es de desempenho. Se utilizada durante o `git-pull`, a op챌찾o `--ff-only` ainda verificar찼 quais as atualiza챌천es foram impostas antes de tentar uma atualiza챌찾o r찼pida. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:265 en/git-push.txt:398
@@ -6875,11 +5850,9 @@ 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 [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
"\t [--chmod=(+|-)x] [--pathspec-from-file=<arquivo> [--pathspec-file-nul]]\n"
"\t [--] [<pathspec>...]\n"
@@ -6893,64 +5866,37 @@ msgstr "DESCRI횉횄O"
#: en/git-add.txt:25
#, 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 ""
-"Este comando atualiza o 챠ndice utilizando o conte첬do atual encontrado na "
-"찼rvore de trabalho para preparar o conte첬do para o pr처ximo commit. Em geral "
-"ele adiciona o conte첬do atual dos caminhos existentes como um todo, mas com "
-"algumas op챌천es ele tamb챕m pode ser utilizado para adicionar o conte첬do com "
-"apenas a parte das altera챌천es aplicadas nos arquivos da 찼rvore de trabalho "
-"ou remover os caminhos que n찾o existam mais na 찼rvore de trabalho."
+msgstr "Este comando atualiza o 챠ndice utilizando o conte첬do atual encontrado na 찼rvore de trabalho para preparar o conte첬do para o pr처ximo commit. Em geral ele adiciona o conte첬do atual dos caminhos existentes como um todo, mas com algumas op챌천es ele tamb챕m pode ser utilizado para adicionar o conte첬do com apenas a parte das altera챌천es aplicadas nos arquivos da 찼rvore de trabalho ou remover os caminhos que n찾o existam mais na 찼rvore de trabalho."
#. 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 ""
-"O \"챠ndice\" cont챕m um retrato instant창neo do conte첬do da 찼rvore de trabalho "
-"que 챕 tomado como o conte첬do da pr처xim commit. Portanto, depois de fazer "
-"altera챌천es na 찼rvore de trabalho e antes de executar o comando commit, voc챗 "
-"deve utilizar o comando `add` para adicionar qualquer novo arquivo ou "
-"modificado ao 챠ndice."
+msgstr "O \"챠ndice\" cont챕m um retrato instant창neo do conte첬do da 찼rvore de trabalho que 챕 tomado como o conte첬do da pr처xim commit. Portanto, depois de fazer altera챌천es na 찼rvore de trabalho e antes de executar o comando commit, voc챗 deve utilizar o comando `add` para adicionar qualquer novo arquivo ou modificado ao 챠ndice."
#. type: Plain text
#: 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 ""
-"Este comando pode ser executado v찼rias vezes antes de um commit. Ele "
-"adiciona apenas o conte첬do do(s) arquivo(s) informados(s) no momento em que "
-"o comando `add` for executado; caso queira que as altera챌천es subsequentes "
-"sejam inclu챠das no pr처ximo commit, execute o comando `git add` novamente "
-"para adicionar o novo conte첬do ao 챠ndice."
+msgstr "Este comando pode ser executado v찼rias vezes antes de um commit. Ele adiciona apenas o conte첬do do(s) arquivo(s) informados(s) no momento em que o comando `add` for executado; caso queira que as altera챌천es subsequentes sejam inclu챠das no pr처ximo commit, execute o comando `git add` novamente para adicionar o novo conte첬do ao 챠ndice."
#. type: Plain text
#: en/git-add.txt:39
#, priority:300
msgid "The `git status` command can be used to obtain a summary of which files have changes that are staged for the next commit."
-msgstr ""
-"O comando `git status` pode ser utilizado para obter um resumo de quais os "
-"arquivos que possuem as altera챌천es que foram testadas para o pr처ximo commit."
+msgstr "O comando `git status` pode ser utilizado para obter um resumo de quais os arquivos que possuem as altera챌천es que foram testadas para o pr처ximo commit."
#. type: Plain text
#: en/git-add.txt:46
#, priority:300
msgid "The `git add` command will not add ignored files by default. If any ignored files were explicitly specified on the command line, `git add` will fail with a list of ignored files. Ignored files reached by directory recursion or filename globbing performed by Git (quote your globs before the shell) will be silently ignored. The 'git add' command can be used to add ignored files with the `-f` (force) option."
-msgstr ""
-"횋 predefinido que o comando `git add` n찾o adicione os arquivos que foram "
-"ignorados. Caso algum arquivo ignorado seja especificado explicitamente na "
-"linha de comando, o `git add` falhar찼 com uma lista de arquivos ignorados. "
-"Arquivos ignorados alcan챌ados de forma recursiva no diret처rio ou agrupamento "
-"do nome dos arquivos executados pelo Git (cite os seus agrupamentos antes do "
-"shell) ser찾o ignorados silenciosamente. O comando 'git add' pode ser "
-"utilizado para adicionar os arquivos ignorados com a op챌찾o `-f` (impor)."
+msgstr "횋 predefinido que o comando `git add` n찾o adicione os arquivos que foram ignorados. Caso algum arquivo ignorado seja especificado explicitamente na linha de comando, o `git add` falhar찼 com uma lista de arquivos ignorados. Arquivos ignorados alcan챌ados de forma recursiva no diret처rio ou agrupamento do nome dos arquivos executados pelo Git (cite os seus agrupamentos antes do shell) ser찾o ignorados silenciosamente. O comando 'git add' pode ser utilizado para adicionar os arquivos ignorados com a op챌찾o `-f` (impor)."
#. type: Plain text
#: en/git-add.txt:49
#, priority:300
msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a commit."
-msgstr ""
-"Consulte linkgit:git-commit[1] para ver as formas alternativas de adicionar "
-"um conte첬do a um commit."
+msgstr "Consulte linkgit:git-commit[1] para ver as formas alternativas de adicionar um conte첬do a um commit."
#. type: Title -
#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
@@ -6968,27 +5914,13 @@ 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 ""
-"Arquivos que ser찾o adicionados ao conte첬do. Os agrupamento dos arquivos (`*."
-"c` por exemplo) podem ser informados para adicionar todos os arquivos "
-"coincidentes. Tamb챕m um nome do diret처rio principal (`dir` para adicionar `"
-"dir/arquivo1` e `dir/arquivo2` por exemplo) pode ser informado para "
-"atualizar o 챠ndice para corresponder ao estado atual do diret처rio como um "
-"todo (informar o `dir` gravar찼 n찾o apenas um arquivo `dir/arquivo1` "
-"modificado na 찼rvore de trabalho, um arquivo `dir/arquivo2` adicionado 횪 "
-"찼rvore de trabalho, mas tamb챕m um arquivo `dir/arquivo3` ser찼 removido da "
-"찼rvore de trabalho por exemplo). Observe que as vers천es mais antigas do Git "
-"costumavam ignorar os arquivos removidos; utilize a op챌찾o `--no-all` caso "
-"queira adicionar os arquivos novos ou alterados, por챕m ignore os que foram "
-"removidos."
+msgstr "Arquivos que ser찾o adicionados ao conte첬do. Os agrupamento dos arquivos (`*.c` por exemplo) podem ser informados para adicionar todos os arquivos coincidentes. Tamb챕m um nome do diret처rio principal (`dir` para adicionar `dir/arquivo1` e `dir/arquivo2` por exemplo) pode ser informado para atualizar o 챠ndice para corresponder ao estado atual do diret처rio como um todo (informar o `dir` gravar찼 n찾o apenas um arquivo `dir/arquivo1` modificado na 찼rvore de trabalho, um arquivo `dir/arquivo2` adicionado 횪 찼rvore de trabalho, mas tamb챕m um arquivo `dir/arquivo3` ser찼 removido da 찼rvore de trabalho por exemplo). Observe que as vers천es mais antigas do Git costumavam ignorar os arquivos removidos; utilize a op챌찾o `--no-all` caso queira adicionar os arquivos novos ou alterados, por챕m ignore os que foram removidos."
#. type: Plain text
#: en/git-add.txt:68 en/git-grep.txt:334
#, priority:300
msgid "For more details about the <pathspec> syntax, see the 'pathspec' entry in linkgit:gitglossary[7]."
-msgstr ""
-"Para mais detalhes sobre a sintaxe `<pathspec>`, consulte a entrada "
-"'pathspec' em linkgit:gitglossary[7]."
+msgstr "Para mais detalhes sobre a sintaxe `<pathspec>`, consulte a entrada 'pathspec' em linkgit:gitglossary[7]."
#. type: Plain text
#: en/git-add.txt:73
@@ -7018,29 +5950,19 @@ 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 ""
-"Adicione o conte첬do modificado interativamente ao 챠ndice da 찼rvore de "
-"trabalho. Os argumentos opcionais do caminho podem ser utilizados para "
-"limitar a opera챌찾o em um subconjunto da 찼rvore de trabalho. Para mais "
-"detalhes consulte ``modo interativo''."
+msgstr "Adicione o conte첬do modificado interativamente ao 챠ndice da 찼rvore de trabalho. Os argumentos opcionais do caminho podem ser utilizados para limitar a opera챌찾o em um subconjunto da 찼rvore de trabalho. Para mais detalhes consulte ``modo interativo''."
#. 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 ""
-"Escolha interativamente os peda챌os do patch entre o 챠ndice e a 찼rvore de "
-"trabalho para ser adicionado ao 챠ndice. Permite que usu찼rio revise a "
-"diferen챌a antes de adicionar o conte첬do modificado ao 챠ndice."
+msgstr "Escolha interativamente os peda챌os do patch entre o 챠ndice e a 찼rvore de trabalho para ser adicionado ao 챠ndice. Permite que usu찼rio revise a diferen챌a antes de adicionar o conte첬do modificado ao 챠ndice."
#. 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 ""
-"Efetivamente executa o comando `add --interactive` por챕m ignora o menu do "
-"comando inicial e salta diretamente para o subcomando` patch`. Para mais "
-"detalhes consulte ``modo interativo''."
+msgstr "Efetivamente executa o comando `add --interactive` por챕m ignora o menu do comando inicial e salta diretamente para o subcomando` patch`. Para mais detalhes consulte ``modo interativo''."
#. 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:295 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
@@ -7058,21 +5980,13 @@ msgstr "--edit"
#: en/git-add.txt:105
#, 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 ""
-"Abra o diff em conjunto com o 챠ndice em um editor e deixe que o usu찼rio o "
-"edite. Ap처s o fechamento do editor, ajuste os cabe챌alhos dos peda챌os e "
-"aplique o patch no 챠ndice."
+msgstr "Abra o diff em conjunto com o 챠ndice em um editor e deixe que o usu찼rio o edite. Ap처s o fechamento do editor, ajuste os cabe챌alhos dos peda챌os e aplique o patch no 챠ndice."
#. 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 ""
-"O objetivo desta op챌찾o 챕 escolher as linhas do patch que ser찾o aplicadas ou "
-"mesmo para modificar o conte첬do das linhas que ser찾o preparadas. Isso pode "
-"ser mais r찼pido e flex챠vel do que utilizar o seletor interativo de peda챌os. "
-"No entanto, 챕 f찼cil se confundir e criar um patch que n찾o se aplica ao "
-"챠ndice. Consulte a se챌찾o EDI횉횄O DE PATCHES abaixo."
+msgstr "O objetivo desta op챌찾o 챕 escolher as linhas do patch que ser찾o aplicadas ou mesmo para modificar o conte첬do das linhas que ser찾o preparadas. Isso pode ser mais r찼pido e flex챠vel do que utilizar o seletor interativo de peda챌os. No entanto, 챕 f찼cil se confundir e criar um patch que n찾o se aplica ao 챠ndice. Consulte a se챌찾o EDI횉횄O DE PATCHES abaixo."
#. type: Labeled list
#: en/git-add.txt:113
@@ -7084,20 +5998,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 ""
-"Atualize o 챠ndice exatamente onde ele j찼 possua uma entrada que coincida com "
-"o `<pathspec>`. Remove e altera as entradas no 챠ndice para coincidir com a "
-"찼rvore de trabalho sem adicionar novos arquivos."
+msgstr "Atualize o 챠ndice exatamente onde ele j찼 possua uma entrada que coincida com o `<pathspec>`. Remove e altera as entradas no 챠ndice para coincidir com a 찼rvore de trabalho sem adicionar novos arquivos."
#. 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 ""
-"Caso nenhum `<pathspec>` seja informado durante a utiliza챌찾o da op챌찾o `-u`, "
-"todos os arquivos rastreados na 찼rvore de trabalho ser찾o atualizados (as "
-"vers천es antigas do Git costumavam limitar a atualiza챌찾o ao diret처rio atual e "
-"seus subdiret처rios)."
+msgstr "Caso nenhum `<pathspec>` seja informado durante a utiliza챌찾o da op챌찾o `-u`, todos os arquivos rastreados na 찼rvore de trabalho ser찾o atualizados (as vers천es antigas do Git costumavam limitar a atualiza챌찾o ao diret처rio atual e seus subdiret처rios)."
#. type: Labeled list
#: en/git-add.txt:123 en/git-repack.txt:49 en/git-svn.txt:418
@@ -7115,21 +6022,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 ""
-"Atualize o 챠ndice n찾o apenas onde a 찼rvore de trabalho possa um arquivo que "
-"coincida com o `<pathspec>` mas tamb챕m onde o 챠ndice j찼 possua uma entrada. "
-"Adiciona, modifica e remove as entradas do 챠ndice para que coincida com a "
-"찼rvore de trabalho."
+msgstr "Atualize o 챠ndice n찾o apenas onde a 찼rvore de trabalho possa um arquivo que coincida com o `<pathspec>` mas tamb챕m onde o 챠ndice j찼 possua uma entrada. Adiciona, modifica e remove as entradas do 챠ndice para que coincida com a 찼rvore de trabalho."
#. 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 ""
-"Caso nenhum `<pathspec>` seja informado durante a utiliza챌찾o da op챌찾o `-A`, "
-"todos os arquivos na 찼rvore de trabalho ser찾o atualizados (as vers천es "
-"antigas do Git costumavam limitar a atualiza챌찾o ao diret처rio atual e seus "
-"subdiret처rios)."
+msgstr "Caso nenhum `<pathspec>` seja informado durante a utiliza챌찾o da op챌찾o `-A`, todos os arquivos na 찼rvore de trabalho ser찾o atualizados (as vers천es antigas do Git costumavam limitar a atualiza챌찾o ao diret처rio atual e seus subdiret처rios)."
#. type: Labeled list
#: en/git-add.txt:136
@@ -7147,21 +6046,13 @@ 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 ""
-"Atualize o 챠ndice adicionando os novos arquivos que sejam desconhecidos ao "
-"챠ndice e os arquivos modificados na 찼rvore de trabalho, no entanto ignore "
-"aqueles arquivos que foram removidos da 찼rvore de trabalho. Esta op챌찾o n찾o "
-"funciona quando `<pathspec>` n찾o 챕 utilizado."
+msgstr "Atualize o 챠ndice adicionando os novos arquivos que sejam desconhecidos ao 챠ndice e os arquivos modificados na 찼rvore de trabalho, no entanto ignore aqueles arquivos que foram removidos da 찼rvore de trabalho. Esta op챌찾o n찾o funciona quando `<pathspec>` n찾o 챕 utilizado."
#. 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 ""
-"Esta op챌찾o serve principalmente para ajudar os usu찼rios que est찾o "
-"acostumados com as vers천es mais antigas do Git, cujo `git add <pathspec>...` "
-"era um sin척nimo para `git add --no-all <pathspec>...`, isto 챕, ignora a "
-"remo챌찾o dos arquivos."
+msgstr "Esta op챌찾o serve principalmente para ajudar os usu찼rios que est찾o acostumados com as vers천es mais antigas do Git, cujo `git add <pathspec>...` era um sin척nimo para `git add --no-all <pathspec>...`, isto 챕, ignora a remo챌찾o dos arquivos."
#. type: Labeled list
#: en/git-add.txt:147 en/git-format-patch.txt:104 en/git-submodule.txt:351
@@ -7179,12 +6070,7 @@ msgstr "--intent-to-add"
#: en/git-add.txt:154
#, 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 ""
-"Registre apenas o fato de onde caminho ser찼 adicionado posteriormente. Uma "
-"entrada para o caminho 챕 colocada ao 챠ndice sem nenhum conte첬do. 횋 첬til "
-"para, entre outras coisas, para exibir os conte첬dos dos tais arquivos que "
-"n찾o foram preparados com o comando `git diff` e que o commit n찾o foi feito "
-"com `git commit -a`."
+msgstr "Registre apenas o fato de onde caminho ser찼 adicionado posteriormente. Uma entrada para o caminho 챕 colocada ao 챠ndice sem nenhum conte첬do. 횋 첬til para, entre outras coisas, para exibir os conte첬dos dos tais arquivos que n찾o foram preparados com o comando `git diff` e que o commit n찾o foi feito com `git commit -a`."
#. type: Labeled list
#: en/git-add.txt:155 en/git-update-index.txt:55
@@ -7196,9 +6082,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 ""
-"N찾o adicione o(s) arquivo(s), apenas renove as suas informa챌천es stat() no "
-"챠ndice."
+msgstr "N찾o adicione o(s) arquivo(s), apenas renove as suas informa챌천es stat() no 챠ndice."
#. type: Labeled list
#: en/git-add.txt:159
@@ -7210,12 +6094,7 @@ msgstr "--ignore-errors"
#: en/git-add.txt:165
#, priority:300
msgid "If some files could not be added because of errors indexing them, do not abort the operation, but continue adding the others. The command shall still exit with non-zero status. The configuration variable `add.ignoreErrors` can be set to true to make this the default behaviour."
-msgstr ""
-"Caso alguns arquivos n찾o possam ser adicionados por motivos de erros durante "
-"a indexa챌찾o, n찾o interrompa a opera챌찾o e continue a adicionar os outros que "
-"n찾o tenham erros. O comando ainda deve sair com a condi챌찾o diferente de "
-"zero. Para que este comportamento esteja sempre ativado, a vari찼vel da "
-"configura챌찾o `add.ignoreErrors` pode ser definida como \"true\"."
+msgstr "Caso alguns arquivos n찾o possam ser adicionados por motivos de erros durante a indexa챌찾o, n찾o interrompa a opera챌찾o e continue a adicionar os outros que n찾o tenham erros. O comando ainda deve sair com a condi챌찾o diferente de zero. Para que este comportamento esteja sempre ativado, a vari찼vel da configura챌찾o `add.ignoreErrors` pode ser definida como \"true\"."
#. type: Labeled list
#: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:201
@@ -7227,11 +6106,7 @@ msgstr "--ignore-missing"
#: en/git-add.txt:171
#, 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 ""
-"Esta op챌찾o s처 pode ser utilizada em conjunto com a op챌찾o `--dry-run`. Ao "
-"utilizar esta op챌찾o, o usu찼rio pode verificar se algum dos arquivos "
-"informados seria ignorado, independentemente de j찼 estarem presentes na "
-"찼rvore de trabalho."
+msgstr "Esta op챌찾o s처 pode ser utilizada em conjunto com a op챌찾o `--dry-run`. Ao utilizar esta op챌찾o, o usu찼rio pode verificar se algum dos arquivos informados seria ignorado, independentemente de j찼 estarem presentes na 찼rvore de trabalho."
#. type: Labeled list
#: en/git-add.txt:172
@@ -7243,11 +6118,7 @@ msgstr "--no-warn-embedded-repo"
#: en/git-add.txt:178
#, priority:300
msgid "By default, `git add` will warn when adding an embedded repository to the index without using `git submodule add` to create an entry in `.gitmodules`. This option will suppress the warning (e.g., if you are manually performing operations on submodules)."
-msgstr ""
-"횋 predefinido que o comando `git add` avisar찼 ao adicionar um reposit처rio "
-"incorporado ao 챠ndice sem utilizar o comando `git submodule add` para criar "
-"uma entrada no `.gitmodules`. Esta op챌찾o suprimir찼 o alerta (caso esteja "
-"executando as opera챌천es manualmente nos subm처dulos por exemplo)."
+msgstr "횋 predefinido que o comando `git add` avisar찼 ao adicionar um reposit처rio incorporado ao 챠ndice sem utilizar o comando `git submodule add` para criar uma entrada no `.gitmodules`. Esta op챌찾o suprimir찼 o alerta (caso esteja executando as opera챌천es manualmente nos subm처dulos por exemplo)."
#. type: Labeled list
#: en/git-add.txt:179
@@ -7259,12 +6130,7 @@ msgstr "--renormalize"
#: en/git-add.txt:185
#, 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 ""
-"Aplique o processo \"limpo\" em todos os arquivos monitorados para impor a "
-"sua adi챌찾o novamente ao 챠ndice. 횋 첬til ap처s alterar a configura챌찾o da "
-"vari찼vel `core.autocrlf` ou do atributo` text` para corrigir os arquivos que "
-"foram adicionados com caracteres de quebra de linha `CRLF` ou `LF` "
-"incorretas. Implica no uso da op챌찾o `-u`."
+msgstr "Aplique o processo \"limpo\" em todos os arquivos monitorados para impor a sua adi챌찾o novamente ao 챠ndice. 횋 첬til ap처s alterar a configura챌찾o da vari찼vel `core.autocrlf` ou do atributo` text` para corrigir os arquivos que foram adicionados com caracteres de quebra de linha `CRLF` ou `LF` incorretas. Implica no uso da op챌찾o `-u`."
#. type: Labeled list
#: en/git-add.txt:186 en/git-update-index.txt:86
@@ -7276,10 +6142,7 @@ msgstr "--chmod=(+|-)x"
#: en/git-add.txt:190
#, 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 ""
-"Substitua o bit execut찼vel dos arquivos que foram adicionados. Apenas no "
-"챠ndice que o bit execut찼vel 챕 alterado, os arquivos no disco permanecem "
-"inalterados."
+msgstr "Substitua o bit execut찼vel dos arquivos que foram adicionados. Apenas no 챠ndice que o bit execut찼vel 챕 alterado, os arquivos no disco permanecem inalterados."
#. type: Labeled list
#: en/git-add.txt:191 en/git-checkout.txt:311 en/git-commit.txt:282 en/git-reset.txt:112 en/git-restore.txt:125 en/git-rm.txt:78 en/git-stash.txt:198
@@ -7291,14 +6154,7 @@ msgstr "--pathspec-from-file=<arquivo>"
#: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:119 en/git-restore.txt:132 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 ""
-"O \"pathspec\" 챕 passado com `<arquivo>` em vez dos argumentos da linha de "
-"comando. Caso o `<arquivo>` seja exatamente `-`, a entrada predefinida ser찼 "
-"utilizada. Os elementos do \"pathspec\" s찾o separados por caracteres de "
-"t챕rmino de linha `LF` ou `CR/LF`. Os elementos do \"pathspec\" podem ser "
-"citados conforme explicado na vari찼vel da configura챌찾o `core.quotePath` ("
-"consulte linkgit:git-config[1]). Consulte tamb챕m op챌찾o `--pathspec-file-nul` "
-"e o global `--literal-pathspecs`."
+msgstr "O \"pathspec\" 챕 passado com `<arquivo>` em vez dos argumentos da linha de comando. Caso o `<arquivo>` seja exatamente `-`, a entrada predefinida ser찼 utilizada. Os elementos do \"pathspec\" s찾o separados por caracteres de t챕rmino de linha `LF` ou `CR/LF`. Os elementos do \"pathspec\" podem ser citados conforme explicado na vari찼vel da configura챌찾o `core.quotePath` (consulte linkgit:git-config[1]). Consulte tamb챕m op챌찾o `--pathspec-file-nul` e o 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:120 en/git-restore.txt:133 en/git-rm.txt:86 en/git-stash.txt:208
@@ -7310,11 +6166,7 @@ msgstr "--pathspec-file-nul"
#: en/git-add.txt:203 en/git-checkout.txt:323 en/git-commit.txt:294 en/git-reset.txt:124 en/git-restore.txt:137 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 ""
-"S처 faz algum sentido caso seja utilizado junto com a op챌찾o `--pathspec-from-"
-"file`. Os elementos \"pathspec\" s찾o separados com caracteres `NUL` e todos "
-"os outros caracteres s찾o considerados de forma literal (incluindo as novas "
-"linhas e as cita챌천es)."
+msgstr "S처 faz algum sentido caso seja utilizado junto com a op챌찾o `--pathspec-from-file`. Os elementos \"pathspec\" s찾o separados com caracteres `NUL` e todos os outros caracteres s찾o considerados de forma literal (incluindo as novas linhas e as 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:358 en/git-grep.txt:324 en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:138 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
@@ -7326,10 +6178,7 @@ msgstr "\\--"
#: en/git-add.txt:208 en/git-rm.txt:64
#, priority:300
msgid "This option can be used to separate command-line options from the list of files, (useful when filenames might be mistaken for command-line options)."
-msgstr ""
-"Esta op챌찾o pode ser utilizada para separar as op챌천es da linha de comandos da "
-"lista dos arquivos (첬til quando os nomes do arquivo puderem ser confundidos "
-"com as op챌천es da linha de comando)."
+msgstr "Esta op챌찾o pode ser utilizada para separar as op챌천es da linha de comandos da lista dos arquivos (첬til quando os nomes do arquivo puderem ser confundidos com as op챌천es da linha de comando)."
#. type: Title -
#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
@@ -7341,9 +6190,7 @@ msgstr "EXEMPLOS"
#: en/git-add.txt:215
#, priority:300
msgid "Adds content from all `*.txt` files under `Documentation` directory and its subdirectories:"
-msgstr ""
-"Adiciona conte첬do de todos os arquivos `*.txt` sob o diret처rio "
-"`Documentation` com os seus respectivos subdiret처rios:"
+msgstr "Adiciona conte첬do de todos os arquivos `*.txt` sob o diret처rio `Documentation` com os seus respectivos subdiret처rios:"
#. type: delimited block -
#: en/git-add.txt:218
@@ -7355,10 +6202,7 @@ 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 ""
-"Observe que o asterisco `*` neste exemplo 챕 citado do shell; isso permite "
-"que o comando inclua todos os arquivos dos subdiret처rios do diret처rio `"
-"Documentation/`."
+msgstr "Observe que o asterisco `*` neste exemplo 챕 citado do shell; isso permite que o comando inclua todos os arquivos dos subdiret처rios do diret처rio `Documentation/`."
#. type: Plain text
#: en/git-add.txt:225
@@ -7376,10 +6220,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 ""
-"Pelo fato deste exemplo permitir que o shell expanda o asterisco (ou seja, "
-"voc챗 est찼 listando os arquivos de forma explicita), ele desconsidera o `"
-"subdir/git-foo.sh`."
+msgstr "Pelo fato deste exemplo permitir que o shell expanda o asterisco (ou seja, voc챗 est찼 listando os arquivos de forma explicita), ele desconsidera o `subdir/git-foo.sh`."
#. type: Title -
#: en/git-add.txt:235 en/git-rebase.txt:799
@@ -7391,19 +6232,13 @@ msgstr "MODO INTERATIVO"
#: 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 ""
-"Quando o comando entra no modo interativo, ele exibe a sa챠da do subcomando "
-"'status' e entra em seu loop de comando interativo."
+msgstr "Quando o comando entra no modo interativo, ele exibe a sa챠da do subcomando 'status' e entra em seu loop de comando interativo."
#. 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 ""
-"O loop de comando exibe a lista de subcomandos dispon챠veis e fornece o "
-"prompt \"Agora o qu챗>\". Em geral, quando o prompt termina com um 첬nico "
-"'>', 챕 poss챠vel escolher apenas uma das op챌천es informadas e teclar \"Enter\" "
-"para selecion찼-la:"
+msgstr "O loop de comando exibe a lista de subcomandos dispon챠veis e fornece o prompt \"Agora o qu챗>\". Em geral, quando o prompt termina com um 첬nico '>', 챕 poss챠vel escolher apenas uma das op챌천es informadas e teclar \"Enter\" para selecion찼-la:"
#. type: delimited block -
#: en/git-add.txt:250
@@ -7415,8 +6250,7 @@ msgid ""
" What now> 1\n"
msgstr ""
" *** Comandos ***\n"
-" 1: status 2: atualiza 3: reverte 4: adiciona sem "
-"monitoramento\n"
+" 1: status 2: atualiza 3: reverte 4: adiciona sem monitoramento\n"
" 5: patch 6: diff 7: encerra 8: ajuda\n"
" Agora o qu챗> 1\n"
@@ -7424,16 +6258,13 @@ 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 ""
-"Tamb챕m 챕 poss챠vel utilizar `s` ou `sta` ou `status` acima, desde que a "
-"escolha seja 첬nica."
+msgstr "Tamb챕m 챕 poss챠vel utilizar `s` ou `sta` ou `status` acima, desde que a escolha seja 첬nica."
#. type: Plain text
#: en/git-add.txt:256
#, priority:300
msgid "The main command loop has 6 subcommands (plus help and quit)."
-msgstr ""
-"O loop do comando principal tem 6 subcomandos (incluindo a ajuda e encerrar)."
+msgstr "O loop do comando principal tem 6 subcomandos (incluindo a ajuda e encerrar)."
#. type: Labeled list
#: en/git-add.txt:257
@@ -7445,12 +6276,7 @@ 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 ""
-"Exibe a altera챌찾o entre o `HEAD` e o 챠ndice (ou seja, o commit que ser찼 caso "
-"utilize o comando `git commit`) e entre o 챠ndice e os arquivos da 찼rvore de "
-"trabalho (ou seja, o que voc챗 poderia realizar antes do comando `git commit` "
-"utilizando o comando `git add`) para cada caminho. Uma amostra da sa챠da "
-"fica assim:"
+msgstr "Exibe a altera챌찾o entre o `HEAD` e o 챠ndice (ou seja, o commit que ser찼 caso utilize o comando `git commit`) e entre o 챠ndice e os arquivos da 찼rvore de trabalho (ou seja, o que voc챗 poderia realizar antes do comando `git commit` utilizando o comando `git add`) para cada caminho. Uma amostra da sa챠da fica assim:"
#. type: delimited block -
#: en/git-add.txt:269
@@ -7468,16 +6294,7 @@ msgstr ""
#: en/git-add.txt:280
#, priority:300
msgid "It shows that foo.png has differences from HEAD (but that is binary so line count cannot be shown) and there is no difference between indexed copy and the working tree version (if the working tree version were also different, 'binary' would have been shown in place of 'nothing'). The other file, git-add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if you commit what is in the index, but working tree file has further modifications (one addition and one deletion)."
-msgstr ""
-"Demonstra que foo.png tem diferen챌as em rela챌찾o ao `HEAD` (mas por ser "
-"bin찼rio a contagem das linhas n찾o pode ser exibida) e n찾o h찼 diferen챌a entre "
-"a c처pia indexada e a vers찾o na 찼rvore de trabalho (caso a vers찾o na 찼rvore "
-"de trabalho tamb챕m fosse diferente, a informa챌찾o 'binary' (bin찼rio) seria "
-"exibido no lugar de 'nothing' (nada)). O outro arquivo, `git-"
-"add{litdd}interactive.perl`, possui 403 linhas que foram adicionadas e 35 "
-"linhas que foram exclu챠das caso fa챌a o commit do que est찼 no 챠ndice, por챕m o "
-"arquivo na 찼rvore de trabalho possui outras modifica챌천es (uma adi챌찾o e uma "
-"exclus찾o)."
+msgstr "Demonstra que foo.png tem diferen챌as em rela챌찾o ao `HEAD` (mas por ser bin찼rio a contagem das linhas n찾o pode ser exibida) e n찾o h찼 diferen챌a entre a c처pia indexada e a vers찾o na 찼rvore de trabalho (caso a vers찾o na 찼rvore de trabalho tamb챕m fosse diferente, a informa챌찾o 'binary' (bin찼rio) seria exibido no lugar de 'nothing' (nada)). O outro arquivo, `git-add{litdd}interactive.perl`, possui 403 linhas que foram adicionadas e 35 linhas que foram exclu챠das caso fa챌a o commit do que est찼 no 챠ndice, por챕m o arquivo na 찼rvore de trabalho possui outras modifica챌천es (uma adi챌찾o e uma exclus찾o)."
#. type: Labeled list
#: en/git-add.txt:281 en/git-update-ref.txt:102
@@ -7489,14 +6306,7 @@ msgstr "update"
#: en/git-add.txt:290
#, priority:300
msgid "This shows the status information and issues an \"Update>>\" prompt. When the prompt ends with double '>>', you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything."
-msgstr ""
-"Exibe as informa챌천es da condi챌찾o geral e emite um prompt \"Update>>\" "
-"(Atualizar). Quando o prompt termina com duplo '>>', 챕 poss챠vel fazer mais "
-"de uma sele챌찾o concatenada com um espa챌o ou uma v챠rgula. Al챕m disso, voc챗 "
-"pode utilizar os intervalos. Por exemplo, \"2-5 7,9\" para escolher "
-"2,3,4,5,7,9 da lista. Caso o segundo n첬mero de um intervalo seja omitido, "
-"todos os patches restantes ser찾o tomados. Por exemplo. \"7-\" para escolher "
-"7,8,9 da lista. 횋 poss챠vel utilizar '*' para escolher tudo."
+msgstr "Exibe as informa챌천es da condi챌찾o geral e emite um prompt \"Update>>\" (Atualizar). Quando o prompt termina com duplo '>>', 챕 poss챠vel fazer mais de uma sele챌찾o concatenada com um espa챌o ou uma v챠rgula. Al챕m disso, voc챗 pode utilizar os intervalos. Por exemplo, \"2-5 7,9\" para escolher 2,3,4,5,7,9 da lista. Caso o segundo n첬mero de um intervalo seja omitido, todos os patches restantes ser찾o tomados. Por exemplo. \"7-\" para escolher 7,8,9 da lista. 횋 poss챠vel utilizar '*' para escolher tudo."
#. type: Plain text
#: en/git-add.txt:293
@@ -7532,10 +6342,7 @@ 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 ""
-"Depois de fazer a sele챌찾o, responda com uma linha vazia para preparar o "
-"conte첬do dos arquivos na 찼rvore de trabalho para os caminhos selecionados no "
-"챠ndice."
+msgstr "Depois de fazer a sele챌찾o, responda com uma linha vazia para preparar o conte첬do dos arquivos na 찼rvore de trabalho para os caminhos selecionados no 챠ndice."
#. type: Labeled list
#: en/git-add.txt:310
@@ -7547,10 +6354,7 @@ msgstr "revert"
#: 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 ""
-"H찼 uma interface muito semelhante 횪 'update' (atualiza챌찾o) e as informa챌천es "
-"preparadas para os caminhos selecionados s찾o revertidas para a vers찾o do "
-"`HEAD`. A revers찾o dos novos caminhos os torna n찾o rastre찼veis."
+msgstr "H찼 uma interface muito semelhante 횪 'update' (atualiza챌찾o) e as informa챌천es preparadas para os caminhos selecionados s찾o revertidas para a vers찾o do `HEAD`. A revers찾o dos novos caminhos os torna n찾o rastre찼veis."
#. type: Labeled list
#: en/git-add.txt:316
@@ -7562,9 +6366,7 @@ msgstr "add untracked"
#: 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 ""
-"H찼 uma interface do usu찼rio muito semelhante para 'update' (atualizar) e "
-"'revert' (reverter) que permite adicionar caminhos n찾o rastreados ao 챠ndice."
+msgstr "H찼 uma interface do usu찼rio muito semelhante para 'update' (atualizar) e 'revert' (reverter) que permite adicionar caminhos n찾o rastreados ao 챠ndice."
#. type: Labeled list
#: en/git-add.txt:321
@@ -7576,11 +6378,7 @@ 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 ""
-"Permite a escolha de um caminho dentre uma sele챌찾o de 'status'. Depois de "
-"escolher o caminho, 챕 apresentado a diferen챌a entre o 챠ndice e o arquivo na "
-"찼rvore de trabalho, pergunta caso queira preparar a altera챌찾o de cada "
-"peda챌o. Voc챗 pode selecionar uma das seguintes op챌천es e pressional enter:"
+msgstr "Permite a escolha de um caminho dentre uma sele챌찾o de 'status'. Depois de escolher o caminho, 챕 apresentado a diferen챌a entre o 챠ndice e o arquivo na 찼rvore de trabalho, pergunta caso queira preparar a altera챌찾o de cada peda챌o. Voc챗 pode selecionar uma das seguintes op챌천es e pressional enter:"
#. type: Plain text
#: en/git-add.txt:343
@@ -7605,8 +6403,7 @@ msgstr ""
"n - n찾o prepare este peda챌o\n"
"q - saia; n찾o prepare este peda챌o ou qualquer um dos restantes\n"
"a - prepare este peda챌o e todos os peda챌os posteriores no arquivo\n"
-"d - n찾o prepare este peda챌o ou qualquer um dos peda챌os posteriores no "
-"arquivo\n"
+"d - n찾o prepare este peda챌o ou qualquer um dos peda챌os posteriores no arquivo\n"
"g - selecione um peda챌o para ir de encontro com\n"
"/ - procure um peda챌o correspondente ao regex especificado\n"
"j - n찾o decida sobre este peda챌o, veja o pr처ximo peda챌o indeciso\n"
@@ -7621,17 +6418,13 @@ msgstr ""
#: 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 ""
-"Depois de decidir o destino de todos os peda챌os, caso haja algum peda챌o "
-"escolhido, o 챠ndice 챕 atualizado com os peda챌os que foram selecionados."
+msgstr "Depois de decidir o destino de todos os peda챌os, caso haja algum peda챌o escolhido, o 챠ndice 챕 atualizado com os peda챌os que foram selecionados."
#. 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 ""
-"N찾o 챕 necess찼rio pressionar o enter, ao configurar a vari찼vel da "
-"configura챌찾o `interactive.singleKey` para` true`."
+msgstr "N찾o 챕 necess찼rio pressionar o enter, ao configurar a vari찼vel da configura챌찾o `interactive.singleKey` para` true`."
#. type: Labeled list
#: en/git-add.txt:350
@@ -7643,9 +6436,7 @@ 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 ""
-"Permite a revis찾o do commit que ser찼 feito (entre o HEAD e o 챠ndice por "
-"exemplo)."
+msgstr "Permite a revis찾o do commit que ser찼 feito (entre o HEAD e o 챠ndice por exemplo)."
#. type: Title -
#: en/git-add.txt:357
@@ -7657,16 +6448,7 @@ msgstr "EDI횉횄O DE PATCHES"
#: en/git-add.txt:367
#, priority:300
msgid "Invoking `git add -e` or selecting `e` from the interactive hunk selector will open a patch in your editor; after the editor exits, the result is applied to the index. You are free to make arbitrary changes to the patch, but note that some changes may have confusing results, or even result in a patch that cannot be applied. If you want to abort the operation entirely (i.e., stage nothing new in the index), simply delete all lines of the patch. The list below describes some common things you may see in a patch, and which editing operations make sense on them."
-msgstr ""
-"Ao invocar o comando `git add -e` ou selecionando `e` no seletor interativo "
-"de peda챌os, ser찼 aberto um patch no seu editor; ap처s a sa챠da do editor, o "
-"resultado 챕 aplicado ao 챠ndice. Voc챗 챕 livre para fazer altera챌천es "
-"arbitr찼rias no patch, por챕m observe que algumas altera챌천es podem ter "
-"resultados confusos ou at챕 resultar em um patch que n찾o possa ser aplicado. "
-"Caso queira abortar completamente a opera챌찾o (ou seja, n찾o criar nada novo "
-"no 챠ndice), simplesmente exclua todas as linhas do patch. A lista abaixo "
-"descreve algumas coisas comuns que s찾o poss챠veis de visualizar em um patch e "
-"quais as opera챌천es da edi챌찾o fazem sentido nelas."
+msgstr "Ao invocar o comando `git add -e` ou selecionando `e` no seletor interativo de peda챌os, ser찼 aberto um patch no seu editor; ap처s a sa챠da do editor, o resultado 챕 aplicado ao 챠ndice. Voc챗 챕 livre para fazer altera챌천es arbitr찼rias no patch, por챕m observe que algumas altera챌천es podem ter resultados confusos ou at챕 resultar em um patch que n찾o possa ser aplicado. Caso queira abortar completamente a opera챌찾o (ou seja, n찾o criar nada novo no 챠ndice), simplesmente exclua todas as linhas do patch. A lista abaixo descreve algumas coisas comuns que s찾o poss챠veis de visualizar em um patch e quais as opera챌천es da edi챌찾o fazem sentido nelas."
#. type: Labeled list
#: en/git-add.txt:369
@@ -7678,9 +6460,7 @@ msgstr "added content"
#: en/git-add.txt:373
#, priority:300
msgid "Added content is represented by lines beginning with \"{plus}\". You can prevent staging any addition lines by deleting them."
-msgstr ""
-"O conte첬do adicionado 챕 representado por linhas come챌ando com \"{plus}\". "
-"Voc챗 pode impedir a prepara챌찾o de qualquer linha de adi챌찾o excluindo-as."
+msgstr "O conte첬do adicionado 챕 representado por linhas come챌ando com \"{plus}\". Voc챗 pode impedir a prepara챌찾o de qualquer linha de adi챌찾o excluindo-as."
#. type: Labeled list
#: en/git-add.txt:374
@@ -7692,10 +6472,7 @@ msgstr "removed content"
#: en/git-add.txt:378
#, priority:300
msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)."
-msgstr ""
-"O conte첬do removido 챕 representado por linhas que come챌am com \"-\". 횋 "
-"poss챠vel evitar a prepara챌찾o da remo챌찾o convertendo o \"-\" para um \" \" "
-"(espa챌o)."
+msgstr "O conte첬do removido 챕 representado por linhas que come챌am com \"-\". 횋 poss챠vel evitar a prepara챌찾o da remo챌찾o convertendo o \"-\" para um \" \" (espa챌o)."
#. type: Labeled list
#: en/git-add.txt:379
@@ -7707,25 +6484,13 @@ msgstr "modified content"
#: en/git-add.txt:386
#, priority:300
msgid "Modified content is represented by \"-\" lines (removing the old content) followed by \"{plus}\" lines (adding the replacement content). You can prevent staging the modification by converting \"-\" lines to \" \", and removing \"{plus}\" lines. Beware that modifying only half of the pair is likely to introduce confusing changes to the index."
-msgstr ""
-"O conte첬do modificado 챕 representado por linhas \"-\" (removendo o conte첬do "
-"antigo) seguido por linhas \"{plus}\" (adicionando o conte첬do de "
-"substitui챌찾o). Voc챗 pode impedir a prepara챌찾o da modifica챌찾o convertendo as "
-"linhas \"-\" para \" \" e removendo as linhas \"{plus}\". Lembre-se que "
-"alterar apenas a metade do par provavelmente introduzir찼 mudan챌as confusas "
-"ao 챠ndice."
+msgstr "O conte첬do modificado 챕 representado por linhas \"-\" (removendo o conte첬do antigo) seguido por linhas \"{plus}\" (adicionando o conte첬do de substitui챌찾o). Voc챗 pode impedir a prepara챌찾o da modifica챌찾o convertendo as linhas \"-\" para \" \" e removendo as linhas \"{plus}\". Lembre-se que alterar apenas a metade do par provavelmente introduzir찼 mudan챌as confusas ao 챠ndice."
#. type: Plain text
#: en/git-add.txt:394
#, priority:300
msgid "There are also more complex operations that can be performed. But beware that because the patch is applied only to the index and not the working tree, the working tree will appear to \"undo\" the change in the index. For example, introducing a new line into the index that is in neither the HEAD nor the working tree will stage the new line for commit, but the line will appear to be reverted in the working tree."
-msgstr ""
-"Tamb챕m existem opera챌천es mais complexas que podem ser executadas. Mas "
-"cuidado, porque o patch 챕 aplicado apenas ao 챠ndice e n찾o 횪 찼rvore de "
-"trabalho, a 찼rvore de trabalho aparecer찼 para \"desfazer\" a mudan챌a no "
-"챠ndice. A introdu챌찾o de uma nova linha no 챠ndice que n찾o esteja em HEAD nem "
-"na 찼rvore de trabalho por exemplo, organizar찼 a nova linha para o commit, "
-"por챕m a linha parecer찼 ter sido revertida na 찼rvore de trabalho."
+msgstr "Tamb챕m existem opera챌천es mais complexas que podem ser executadas. Mas cuidado, porque o patch 챕 aplicado apenas ao 챠ndice e n찾o 횪 찼rvore de trabalho, a 찼rvore de trabalho aparecer찼 para \"desfazer\" a mudan챌a no 챠ndice. A introdu챌찾o de uma nova linha no 챠ndice que n찾o esteja em HEAD nem na 찼rvore de trabalho por exemplo, organizar찼 a nova linha para o commit, por챕m a linha parecer찼 ter sido revertida na 찼rvore de trabalho."
#. type: Plain text
#: en/git-add.txt:396
@@ -7743,12 +6508,7 @@ msgstr "removendo conte첬do intocado"
#: en/git-add.txt:404
#, priority:300
msgid "Content which does not differ between the index and working tree may be shown on context lines, beginning with a \" \" (space). You can stage context lines for removal by converting the space to a \"-\". The resulting working tree file will appear to re-add the content."
-msgstr ""
-"O conte첬do que n찾o difere entre o 챠ndice e a 찼rvore de trabalho podem ser "
-"exibidas nas linhas do contexto, come챌ando com um \" \" (espa챌o). Voc챗 pode "
-"preparar as linhas de contexto para a remo챌찾o, convertendo o espa챌o em um \"-"
-"\". O arquivo da 찼rvore de trabalho resultante aparecer찼 para ser adicionada "
-"novamente ao conte첬do."
+msgstr "O conte첬do que n찾o difere entre o 챠ndice e a 찼rvore de trabalho podem ser exibidas nas linhas do contexto, come챌ando com um \" \" (espa챌o). Voc챗 pode preparar as linhas de contexto para a remo챌찾o, convertendo o espa챌o em um \"-\". O arquivo da 찼rvore de trabalho resultante aparecer찼 para ser adicionada novamente ao conte첬do."
#. type: Labeled list
#: en/git-add.txt:405
@@ -7760,12 +6520,7 @@ msgstr "modificando o conte첬do existente"
#: en/git-add.txt:412
#, priority:300
msgid "One can also modify context lines by staging them for removal (by converting \" \" to \"-\") and adding a \"{plus}\" line with the new content. Similarly, one can modify \"{plus}\" lines for existing additions or modifications. In all cases, the new modification will appear reverted in the working tree."
-msgstr ""
-"Tamb챕m 챕 poss챠vel modificar as linhas do contexto, preparando-as para a "
-"remo챌찾o (convertendo \" \" para \"-\") e adicionando uma linha \"{plus}\" ("
-"sinal de mais) ao novo conte첬do. Da mesma forma, 챕 poss챠vel modificar as "
-"linhas \"{plus}\" para as adi챌천es ou modifica챌천es existentes. Em todos os "
-"casos, a nova altera챌찾o aparecer찼 de forma reversa na 찼rvore de trabalho."
+msgstr "Tamb챕m 챕 poss챠vel modificar as linhas do contexto, preparando-as para a remo챌찾o (convertendo \" \" para \"-\") e adicionando uma linha \"{plus}\" (sinal de mais) ao novo conte첬do. Da mesma forma, 챕 poss챠vel modificar as linhas \"{plus}\" para as adi챌천es ou modifica챌천es existentes. Em todos os casos, a nova altera챌찾o aparecer찼 de forma reversa na 찼rvore de trabalho."
#. type: Labeled list
#: en/git-add.txt:413
@@ -7777,18 +6532,13 @@ msgstr "novos conte첬dos"
#: 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 ""
-"Voc챗 tamb챕m pode adicionar um novo conte첬do que n찾o existe no patch; basta "
-"adicionar as novas linhas, cada uma come챌ando com \"{plus}\". A adi챌찾o "
-"aparecer찼 de forma reversa na 찼rvore de trabalho."
+msgstr "Voc챗 tamb챕m pode adicionar um novo conte첬do que n찾o existe no patch; basta adicionar as novas linhas, cada uma come챌ando com \"{plus}\". A adi챌찾o aparecer찼 de forma reversa na 찼rvore de trabalho."
#. type: Plain text
#: en/git-add.txt:422
#, priority:300
msgid "There are also several operations which should be avoided entirely, as they will make the patch impossible to apply:"
-msgstr ""
-"Existem tamb챕m v찼rias outras opera챌천es que devem ser totalmente evitadas, "
-"pois elas tornar찾o o patch imposs챠vel de se aplicar:"
+msgstr "Existem tamb챕m v찼rias outras opera챌천es que devem ser totalmente evitadas, pois elas tornar찾o o patch imposs챠vel de se aplicar:"
#. type: Plain text
#: en/git-add.txt:424
@@ -7842,9 +6592,7 @@ msgstr "git-am(1)"
#: en/git-am.txt:7
#, priority:100
msgid "git-am - Apply a series of patches from a mailbox"
-msgstr ""
-"git-am - Aplica uma s챕rie de patches vindas de um mailbox (caixa de correio "
-"unix)"
+msgstr "git-am - Aplica uma s챕rie de patches vindas de um mailbox (caixa de correio unix)"
#. type: Plain text
#: en/git-am.txt:20
@@ -7872,10 +6620,7 @@ msgstr ""
#: en/git-am.txt:26
#, priority:100
msgid "Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the current branch."
-msgstr ""
-"Divide as mensagens de correio em um mailbox dentro das mensagens do "
-"registro log do commit, as informa챌천es de autoria, os patches e as aplica ao "
-"ramo atual."
+msgstr "Divide as mensagens de correio em um mailbox dentro das mensagens do registro log do commit, as informa챌천es de autoria, os patches e as aplica ao ramo atual."
#. type: Labeled list
#: en/git-am.txt:29
@@ -7887,10 +6632,7 @@ msgstr "(<mbox>|<Maildir>)..."
#: en/git-am.txt:33
#, priority:100
msgid "The list of mailbox files to read patches from. If you do not supply this argument, the command reads from the standard input. If you supply directories, they will be treated as Maildirs."
-msgstr ""
-"A lista dos arquivos da caixa de correio para leitura dos patches. Caso voc챗 "
-"n찾o utilize este argumento, o comando l챗 na entrada predefinida. Caso "
-"utilize os diret처rios, eles ser찾o tratados como caixas de correio."
+msgstr "A lista dos arquivos da caixa de correio para leitura dos patches. Caso voc챗 n찾o utilize este argumento, o comando l챗 na entrada predefinida. Caso utilize os diret처rios, eles ser찾o tratados como caixas de correio."
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:121 en/git-rebase.txt:476 en/git-revert.txt:101 en/merge-options.txt:80
@@ -7902,18 +6644,13 @@ msgstr "--signoff"
#: en/git-am.txt:39
#, priority:100
msgid "Add a `Signed-off-by:` line to the commit message, using the committer identity of yourself. See the signoff option in linkgit:git-commit[1] for more information."
-msgstr ""
-"Adicione uma linha `Assinada por:` 횪 mensagem do commit utilizando a sua "
-"identidade. Para mais informa챌천es sobre a assinatura na sa챠da da mensagem, "
-"consulte em linkgit:git-commit[1]."
+msgstr "Adicione uma linha `Assinada por:` 횪 mensagem do commit utilizando a sua identidade. Para mais informa챌천es sobre a assinatura na sa챠da da mensagem, consulte em linkgit:git-commit[1]."
#. type: Plain text
#: en/git-am.txt:43
#, priority:100
msgid "Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])."
-msgstr ""
-"Repasse o comando `-k` para o comando 'git mailinfo' (consulte linkgit:git-"
-"mailinfo[1])."
+msgstr "Repasse o comando `-k` para o comando 'git mailinfo' (consulte linkgit:git-mailinfo[1])."
#. type: Labeled list
#: en/git-am.txt:44 en/git-quiltimport.txt:59
@@ -7925,9 +6662,7 @@ msgstr "--keep-non-patch"
#: en/git-am.txt:46 en/git-quiltimport.txt:61
#, priority:100
msgid "Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])."
-msgstr ""
-"Repasse o comando `-b` para o comando 'git mailinfo' (consulte linkgit:git-"
-"mailinfo[1])."
+msgstr "Repasse o comando `-b` para o comando 'git mailinfo' (consulte linkgit:git-mailinfo[1])."
#. type: Labeled list
#: en/git-am.txt:47
@@ -7939,15 +6674,10 @@ msgstr "--[no-]keep-cr"
#: en/git-am.txt:52
#, priority:100
msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) with the same option, to prevent it from stripping CR at the end of lines. `am.keepcr` configuration variable can be used to specify the default behaviour. `--no-keep-cr` is useful to override `am.keepcr`."
-msgstr ""
-"Com `--keep-cr`, chame o comando 'git mailsplit' (consulte linkgit:git-"
-"mailsplit[1]) com a mesma op챌찾o para evitar que ele retire caractere `CR` do "
-"final das linhas. A vari찼vel da configura챌찾o `am.keepcr` pode ser utilizada "
-"para definir o comportamento predefinido. O comando `--no-keep-cr` 챕 첬til "
-"para substituir a vari찼vel `am.keepcr`."
+msgstr "Com `--keep-cr`, chame o comando 'git mailsplit' (consulte linkgit:git-mailsplit[1]) com a mesma op챌찾o para evitar que ele retire caractere `CR` do final das linhas. A vari찼vel da configura챌찾o `am.keepcr` pode ser utilizada para definir o comportamento predefinido. O comando `--no-keep-cr` 챕 첬til para substituir a vari찼vel `am.keepcr`."
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -7962,10 +6692,7 @@ msgstr "--scissors"
#: en/git-am.txt:58
#, priority:100
msgid "Remove everything in body before a scissors line (see linkgit:git-mailinfo[1]). Can be activated by default using the `mailinfo.scissors` configuration variable."
-msgstr ""
-"Remova tudo no corpo antes de uma linha \"scissors\" (tesouras) (see linkgit"
-":git-mailinfo[1]). Pode ser ativada de fora predefinida ao utilizar a "
-"vari찼vel da configura챌찾o `mailinfo.scissors`."
+msgstr "Remova tudo no corpo antes de uma linha \"scissors\" (tesouras) (see linkgit:git-mailinfo[1]). Pode ser ativada de fora predefinida ao utilizar a vari찼vel da configura챌찾o `mailinfo.scissors`."
#. type: Labeled list
#: en/git-am.txt:59 en/git-mailinfo.txt:90
@@ -7980,7 +6707,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr "Ignore linhas \"scissors\" (tesouras) (veja linkgit:git-mailinfo[1])."
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -7995,11 +6722,7 @@ msgstr "--message-id"
#: en/git-am.txt:68
#, priority:100
msgid "Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]), so that the Message-ID header is added to the commit message. The `am.messageid` configuration variable can be used to specify the default behaviour."
-msgstr ""
-"Encaminha a op챌찾o `-m` para o comando 'git mailinfo' (consulte linkgit:git-"
-"mailinfo[1]), para que o ID do cabe챌alho seja adicionado na mensagem do "
-"commit. A vari찼vel da configura챌찾o `am.messageid` pode ser utilizada para "
-"definir o comportamento predefinido."
+msgstr "Encaminha a op챌찾o `-m` para o comando 'git mailinfo' (consulte linkgit:git-mailinfo[1]), para que o ID do cabe챌alho seja adicionado na mensagem do commit. A vari찼vel da configura챌찾o `am.messageid` pode ser utilizada para definir o comportamento predefinido."
#. type: Labeled list
#: en/git-am.txt:69
@@ -8011,9 +6734,7 @@ msgstr "--no-message-id"
#: en/git-am.txt:72
#, priority:100
msgid "Do not add the Message-ID header to the commit message. `no-message-id` is useful to override `am.messageid`."
-msgstr ""
-"N찾o adicione o ID do cabe챌alho da mensagem 횪 mensagem do commit. A op챌찾o "
-"`--no-message-id` 챕 첬til para substituir a vari찼vel `am.messageid`."
+msgstr "N찾o adicione o ID do cabe챌alho da mensagem 횪 mensagem do commit. A op챌찾o `--no-message-id` 챕 첬til para substituir a vari찼vel `am.messageid`."
#. type: Plain text
#: en/git-am.txt:76
@@ -8031,12 +6752,7 @@ msgstr "--utf8"
#: en/git-am.txt:84
#, priority:100
msgid "Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable `i18n.commitencoding` can be used to specify project's preferred encoding if it is not UTF-8)."
-msgstr ""
-"Repasse o comando `-u` para o comando 'git mailinfo' (consulte linkgit:git-"
-"mailinfo[1]). A mensagem do registro log do proposto commit retirado da "
-"mensagem do e-mail 챕 re-codificada com a codifica챌찾o `UTF-8` (a vari찼vel da "
-"configura챌찾o `i18n.commitencoding` pode ser utilizada para definir a "
-"codifica챌찾o preferida do projeto, caso n찾o seja `UTF-8`)."
+msgstr "Repasse o comando `-u` para o comando 'git mailinfo' (consulte linkgit:git-mailinfo[1]). A mensagem do registro log do proposto commit retirado da mensagem do e-mail 챕 re-codificada com a codifica챌찾o `UTF-8` (a vari찼vel da configura챌찾o `i18n.commitencoding` pode ser utilizada para definir a codifica챌찾o preferida do projeto, caso n찾o seja `UTF-8`)."
#. type: Plain text
#: en/git-am.txt:87
@@ -8046,8 +6762,7 @@ msgid ""
"default. You can use `--no-utf8` to override this.\n"
msgstr ""
"Isso era opcional nas vers천es anteriores do git, agora 챕 a codifica챌찾o\n"
-"predefinida. 횋 poss챠vel utilizar a op챌찾o `--no-utf8` para se sobrepor a "
-"predefini챌찾o.\n"
+"predefinida. 횋 poss챠vel utilizar a op챌찾o `--no-utf8` para se sobrepor a predefini챌찾o.\n"
#. type: Labeled list
#: en/git-am.txt:88
@@ -8059,9 +6774,7 @@ msgstr "--no-utf8"
#: en/git-am.txt:91
#, priority:100
msgid "Pass `-n` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])."
-msgstr ""
-"Repasse o comando `-n` para o comando 'git mailinfo' (consulte linkgit:git-"
-"mailinfo[1])."
+msgstr "Repasse o comando `-n` para o comando 'git mailinfo' (consulte linkgit:git-mailinfo[1])."
#. type: Labeled list
#: en/git-am.txt:92 en/git-apply.txt:85
@@ -8085,12 +6798,7 @@ msgstr "--no-3way"
#: en/git-am.txt:101
#, priority:100
msgid "When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally. `--no-3way` can be used to override am.threeWay configuration variable. For more information, see am.threeWay in linkgit:git-config[1]."
-msgstr ""
-"Quando o patch n찾o for aplicado corretamente, use a mesclagem de 3 vias caso "
-"o patch registre a identidade das bolhas aos quais devem ser aplicadas "
-"disponibilizando-as localmente. A op챌찾o `--no-3way` pode ser utilizada para "
-"substituir uma vari찼vel de configura챌찾o de tr챗s vias. Para mais informa챌천es, "
-"consulte `am.threeWay` em linkgit:git-config[1]."
+msgstr "Quando o patch n찾o for aplicado corretamente, use a mesclagem de 3 vias caso o patch registre a identidade das bolhas aos quais devem ser aplicadas disponibilizando-as localmente. A op챌찾o `--no-3way` pode ser utilizada para substituir uma vari찼vel de configura챌찾o de tr챗s vias. Para mais informa챌천es, consulte `am.threeWay` em linkgit:git-config[1]."
#. type: Labeled list
#: en/git-am.txt:102 en/git-cherry-pick.txt:159 en/git-merge.txt:85 en/git-rebase.txt:382 en/git-revert.txt:115
@@ -8108,9 +6816,7 @@ msgstr "--no-rerere-autoupdate"
#: en/git-am.txt:106 en/git-cherry-pick.txt:163 en/git-merge.txt:89 en/git-rebase.txt:386 en/git-revert.txt:119
#, priority:240
msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
-msgstr ""
-"Permita que o mecanismo de reexame atualize o 챠ndice com o resultado da "
-"resolu챌찾o autom찼tica de conflitos, caso seja poss챠vel."
+msgstr "Permita que o mecanismo de reexame atualize o 챠ndice com o resultado da resolu챌찾o autom찼tica de conflitos, caso seja poss챠vel."
#. type: Plain text
#: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:461 en/git-rebase.txt:613
@@ -8164,9 +6870,7 @@ msgstr "--reject"
#: en/git-am.txt:119
#, priority:100
msgid "These flags are passed to the 'git apply' (see linkgit:git-apply[1]) program that applies the patch."
-msgstr ""
-"Estas op챌천es s찾o repassadas ao comando 'git apply' (conulte linkgit:git-"
-"apply[1]) que aplica o patch."
+msgstr "Estas op챌천es s찾o repassadas ao comando 'git apply' (conulte linkgit:git-apply[1]) que aplica o patch."
#. type: Labeled list
#: en/git-am.txt:120
@@ -8178,11 +6882,7 @@ msgstr "--patch-format"
#: en/git-am.txt:126
#, priority:100
msgid "By default the command will try to detect the patch format automatically. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as. Valid formats are mbox, mboxrd, stgit, stgit-series and hg."
-msgstr ""
-"횋 predefinido que o comando tentar찼 detectar o formato do patch "
-"automaticamente. Esta op챌찾o permite que o usu찼rio ignore a detec챌찾o "
-"autom찼tica e determine como o formato do patch deve ser interpretados. Os "
-"formatos v찼lidos s찾o `mbox`, `mboxrd`, `stgit`, `stgit-series e `hg`."
+msgstr "횋 predefinido que o comando tentar찼 detectar o formato do patch automaticamente. Esta op챌찾o permite que o usu찼rio ignore a detec챌찾o autom찼tica e determine como o formato do patch deve ser interpretados. Os formatos v찼lidos s찾o `mbox`, `mboxrd`, `stgit`, `stgit-series e `hg`."
#. type: Plain text
#: en/git-am.txt:130
@@ -8200,11 +6900,7 @@ msgstr "--committer-date-is-author-date"
#: en/git-am.txt:137
#, priority:100
msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the committer date by using the same value as the author date."
-msgstr ""
-"횋 predefinido que o comando registre a data da mensagem do e-mail como a "
-"data do autor que fez o commit e utilize a hora da cria챌찾o como a data do "
-"commit. Permite que usu찼rio minta sobre a data do commit utilizando o mesmo "
-"valor da data de quem fez o commit."
+msgstr "횋 predefinido que o comando registre a data da mensagem do e-mail como a data do autor que fez o commit e utilize a hora da cria챌찾o como a data do commit. Permite que usu찼rio minta sobre a data do commit utilizando o mesmo valor da data de quem fez o commit."
#. type: Plain text
#: en/git-am.txt:138 en/git-rebase.txt:470 en/git-rebase.txt:612
@@ -8216,11 +6912,7 @@ msgstr "--ignore-date"
#: en/git-am.txt:144
#, priority:100
msgid "By default the command records the date from the e-mail message as the commit author date, and uses the time of commit creation as the committer date. This allows the user to lie about the author date by using the same value as the committer date."
-msgstr ""
-"횋 predefinido que o comando registre a data da mensagem do e-mail como a "
-"data do autor que fez o commit e utilize a hora da cria챌찾o como a data do "
-"commit. Permite que usu찼rio minta sobre a data do autor utilizando o mesmo "
-"valor da data de quem fez o commit."
+msgstr "횋 predefinido que o comando registre a data da mensagem do e-mail como a data do autor que fez o commit e utilize a hora da cria챌찾o como a data do commit. Permite que usu찼rio minta sobre a data do autor utilizando o mesmo valor da data de quem fez o commit."
#. type: Labeled list
#: en/git-am.txt:145 en/git-rebase.txt:335 en/sequencer.txt:6
@@ -8232,9 +6924,7 @@ msgstr "--skip"
#: en/git-am.txt:148
#, priority:100
msgid "Skip the current patch. This is only meaningful when restarting an aborted patch."
-msgstr ""
-"Ignore o patch atual. 횋 justificado apenas quando for reiniciar um patch "
-"que foi abortado."
+msgstr "Ignore o patch atual. 횋 justificado apenas quando for reiniciar um patch que foi abortado."
#. type: Labeled list
#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:349 en/git-rebase.txt:387 en/git-revert.txt:91 en/merge-options.txt:62
@@ -8258,11 +6948,7 @@ msgstr "--no-gpg-sign"
#: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:357 en/git-rebase.txt:395 en/git-revert.txt:99
#, priority:280
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`."
-msgstr ""
-"Commits assinados com o GPG O argumento `keyid` 챕 opcional e padroniza a "
-"identidade de quem fez o commit; se utilizado, deve estar preso 횪 op챌찾o sem "
-"espa챌o. A op챌찾o `--no-gpg-sign` 챕 첬til para revogar a vari찼vel da "
-"configura챌찾o `commit.gpgSign` e a anterior `--gpg-sign`."
+msgstr "Commits assinados com o GPG O argumento `keyid` 챕 opcional e padroniza a identidade de quem fez o commit; se utilizado, deve estar preso 횪 op챌찾o sem espa챌o. A op챌찾o `--no-gpg-sign` 챕 첬til para revogar a vari찼vel da configura챌찾o `commit.gpgSign` e a anterior `--gpg-sign`."
#. type: Labeled list
#: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:246 en/sequencer.txt:1
@@ -8271,7 +6957,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -8286,11 +6972,7 @@ msgstr "--resolved"
#: en/git-am.txt:167
#, priority:100
msgid "After a patch failure (e.g. attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application. Make a commit using the authorship and commit log extracted from the e-mail message and the current index file, and continue."
-msgstr ""
-"Ap처s uma falha no patch (tentando aplicar um patch conflitante por exemplo), "
-"o usu찼rio o aplicou manualmente e o arquivo do 챠ndice armazena o resultado. "
-"Fa챌a um commit utilizando o registro de autori, o registro log do commit "
-"extra챠do da mensagem do e-mail, do arquivo do 챠ndice atual e continue."
+msgstr "Ap처s uma falha no patch (tentando aplicar um patch conflitante por exemplo), o usu찼rio o aplicou manualmente e o arquivo do 챠ndice armazena o resultado. Fa챌a um commit utilizando o registro de autori, o registro log do commit extra챠do da mensagem do e-mail, do arquivo do 챠ndice atual e continue."
#. type: Labeled list
#: en/git-am.txt:168
@@ -8302,11 +6984,7 @@ msgstr "--resolvemsg=<msg>"
#: en/git-am.txt:174
#, priority:100
msgid "When a patch failure occurs, <msg> will be printed to the screen before exiting. This overrides the standard message informing you to use `--continue` or `--skip` to handle the failure. This is solely for internal use between 'git rebase' and 'git am'."
-msgstr ""
-"Quando ocorrer uma falha no patch, a `<msg>` ser찼 exibida na tela antes de "
-"encerrar. Substitui a mensagem predefinida informando que voc챗 deve "
-"utilizar `--continue` ou `--skip` para lidar com a falha. Serve apenas para "
-"a utiliza챌찾o interna entre o comando 'git rebase' e 'git am'."
+msgstr "Quando ocorrer uma falha no patch, a `<msg>` ser찼 exibida na tela antes de encerrar. Substitui a mensagem predefinida informando que voc챗 deve utilizar `--continue` ou `--skip` para lidar com a falha. Serve apenas para a utiliza챌찾o interna entre o comando 'git rebase' e 'git am'."
#. type: Labeled list
#: en/git-am.txt:175 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:249 en/sequencer.txt:15
@@ -8330,8 +7008,7 @@ msgstr "--quit"
#: en/git-am.txt:181
#, priority:100
msgid "Abort the patching operation but keep HEAD and the index untouched."
-msgstr ""
-"Anule a opera챌찾o de corre챌찾o, por챕m mantenha o `HEAD` e o 챠ndice inalterados."
+msgstr "Anule a opera챌찾o de corre챌찾o, por챕m mantenha o `HEAD` e o 챠ndice inalterados."
#. type: Labeled list
#: en/git-am.txt:182
@@ -8343,11 +7020,7 @@ msgstr "--show-current-patch[=(diff|raw)]"
#: en/git-am.txt:187
#, priority:100
msgid "Show the message at which `git am` has stopped due to conflicts. If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`."
-msgstr ""
-"Exiba uma mensagem onde o `git am` tenha parado por causa dos conflitos. "
-"Caso `raw` seja utilizado, exiba o conte첬do bruto da mensagem do e-mail; no "
-"caso do `diff`, exiba apenas a por챌찾o relacionada ao diff. A predefini챌찾o 챕 "
-"\"raw\" (bruto/puro)."
+msgstr "Exiba uma mensagem onde o `git am` tenha parado por causa dos conflitos. Caso `raw` seja utilizado, exiba o conte첬do bruto da mensagem do e-mail; no caso do `diff`, exiba apenas a por챌찾o relacionada ao diff. A predefini챌찾o 챕 \"raw\" (bruto/puro)."
#. type: Title -
#: en/git-am.txt:189 en/git-commit.txt:501 en/git-format-patch.txt:386 en/git-fsck.txt:113 en/git-log.txt:180 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:378 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
@@ -8359,39 +7032,25 @@ msgstr "DISCUSS횄O"
#: en/git-am.txt:197
#, priority:100
msgid "The commit author name is taken from the \"From: \" line of the message, and commit author date is taken from the \"Date: \" line of the message. The \"Subject: \" line is used as the title of the commit, after stripping common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to concisely describe what the commit is about in one line of text."
-msgstr ""
-"Na mensagem, o nome do autor do commit 챕 obtido da linha \"From:\" (De:) e a "
-"data do autor do commit 챕 obtida da linha \"Date:\" (Data:). O t챠tulo do "
-"commit vem da linha \"Subject:\" (Assunto:) ap처s a exclus찾o do prefixo comum "
-"\"[PATCH <alguma-coisa>]\". A linha \"Subject:\" deve descrever de forma "
-"concisa do que se trata o commit em uma linha de texto."
+msgstr "Na mensagem, o nome do autor do commit 챕 obtido da linha \"From:\" (De:) e a data do autor do commit 챕 obtida da linha \"Date:\" (Data:). O t챠tulo do commit vem da linha \"Subject:\" (Assunto:) ap처s a exclus찾o do prefixo comum \"[PATCH <alguma-coisa>]\". A linha \"Subject:\" deve descrever de forma concisa do que se trata o commit em uma linha de texto."
#. type: Plain text
#: en/git-am.txt:200
#, 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 que iniciam com \"From:\" (De:), \"Date:\" (Data) e \"Subject:\" "
-"(Assunto:) no corpo, substituem os respectivos valores do nome e t챠tulo do "
-"autor do commit que foram retirados dos cabe챌alhos."
+msgstr "As linhas que iniciam com \"From:\" (De:), \"Date:\" (Data) e \"Subject:\" (Assunto:) no corpo, substituem os respectivos valores do nome e t챠tulo do autor do commit que foram retirados dos cabe챌alhos."
#. type: Plain text
#: en/git-am.txt:205
#, priority:100
msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins. Excess whitespace at the end of each line is automatically stripped."
-msgstr ""
-"A mensagem do commit 챕 formada pelo t챠tulo obtido do \"Subject:\" (Assunto:)"
-", uma linha em branco e do corpo da mensagem at챕 o in챠cio do patch. O "
-"espa챌o em branco em excesso no final de cada linha 챕 removido "
-"automaticamente."
+msgstr "A mensagem do commit 챕 formada pelo t챠tulo obtido do \"Subject:\" (Assunto:), uma linha em branco e do corpo da mensagem at챕 o in챠cio do patch. O espa챌o em branco em excesso no final de cada linha 챕 removido automaticamente."
#. type: Plain text
#: en/git-am.txt:208
#, priority:100
msgid "The patch is expected to be inline, directly following the message. Any line that is of the form:"
-msgstr ""
-"Espera-se que o patch j찼 esteja embutido ap처s a mensagem. Qualquer linha "
-"que esteja no formato:"
+msgstr "Espera-se que o patch j찼 esteja embutido ap처s a mensagem. Qualquer linha que esteja no formato:"
#. type: Plain text
#: en/git-am.txt:210
@@ -8415,19 +7074,13 @@ msgstr "uma linha que come챌a com \"Index:\""
#: en/git-am.txt:215
#, priority:100
msgid "is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line."
-msgstr ""
-"챕 tomado como o in챠cio de um patch, a mensagem do registro log do commit 챕 "
-"finalizado antes da primeira ocorr챗ncia de tal linha."
+msgstr "챕 tomado como o in챠cio de um patch, a mensagem do registro log do commit 챕 finalizado antes da primeira ocorr챗ncia de tal linha."
#. type: Plain text
#: en/git-am.txt:219
#, priority:100
msgid "When initially invoking `git am`, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:"
-msgstr ""
-"Ao invocar inicialmente o comando `git am`, indique os nomes das caixas do "
-"correio que ser찾o processadas. Ao ver que o primeiro patch que n찾o possa "
-"ser aplicado, o processo 챕 interrompido imediatamente. 횋 poss챠vel se "
-"recuperar deste processo de duas maneiras:"
+msgstr "Ao invocar inicialmente o comando `git am`, indique os nomes das caixas do correio que ser찾o processadas. Ao ver que o primeiro patch que n찾o possa ser aplicado, o processo 챕 interrompido imediatamente. 횋 poss챠vel se recuperar deste processo de duas maneiras:"
#. type: Plain text
#: en/git-am.txt:222
@@ -8439,31 +7092,19 @@ msgstr "pule o patch atual reexecutando o comando com a op챌찾o `--skip`."
#: en/git-am.txt:226
#, priority:100
msgid "hand resolve the conflict in the working directory, and update the index file to bring it into a state that the patch should have produced. Then run the command with the `--continue` option."
-msgstr ""
-"manualmente resolva o conflito no diret처rio de trabalho e atualize o arquivo "
-"do 챠ndice para coloc찼-lo na condi챌찾o onde o patch deveria ter sido "
-"produzido. Em seguida, execute o comando com a op챌찾o `--continue`."
+msgstr "manualmente resolva o conflito no diret처rio de trabalho e atualize o arquivo do 챠ndice para coloc찼-lo na condi챌찾o onde o patch deveria ter sido produzido. Em seguida, execute o comando com a op챌찾o `--continue`."
#. type: Plain text
#: en/git-am.txt:231
#, priority:100
msgid "The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, run `git am --abort` before running the command with mailbox names."
-msgstr ""
-"O comando se recusa a processar as novas caixas de correio at챕 que a "
-"opera챌찾o atual seja conclu챠da, portanto, caso decida recome챌ar do zero, "
-"execute o comando `git am --abort` antes de executar o comando com os nomes "
-"das caixas de correio."
+msgstr "O comando se recusa a processar as novas caixas de correio at챕 que a opera챌찾o atual seja conclu챠da, portanto, caso decida recome챌ar do zero, execute o comando `git am --abort` antes de executar o comando com os nomes das caixas de correio."
#. type: Plain text
#: en/git-am.txt:237
#, priority:100
msgid "Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple commits, like running 'git am' on the wrong branch or an error in the commits that is more easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
-msgstr ""
-"Antes de aplicar quaisquer corre챌천es, o `ORIG_HEAD` 챕 definido na ponta do "
-"ramo atual. 횋 첬til caso tenha problemas com os v찼rios commits como executar "
-"o comando 'git am' na ramifica챌찾o errada ou caso haja um erro nos commits "
-"que s찾o mais facilmente corrigidos alterando a caixa de correio (erros nas "
-"linhas \"From:\" (De:) por exemplo)."
+msgstr "Antes de aplicar quaisquer corre챌천es, o `ORIG_HEAD` 챕 definido na ponta do ramo atual. 횋 첬til caso tenha problemas com os v찼rios commits como executar o comando 'git am' na ramifica챌찾o errada ou caso haja um erro nos commits que s찾o mais facilmente corrigidos alterando a caixa de correio (erros nas linhas \"From:\" (De:) por exemplo)."
#. type: Title -
#: en/git-am.txt:239 en/git-commit.txt:521 en/git-gc.txt:146
@@ -8475,9 +7116,7 @@ msgstr "GANCHOS"
#: en/git-am.txt:243
#, priority:100
msgid "This command can run `applypatch-msg`, `pre-applypatch`, and `post-applypatch` hooks. See linkgit:githooks[5] for more information."
-msgstr ""
-"Este comando pode executar os ganchos `applypatch-msg`, `pre-applypatch` e "
-"`post-applypatch`. Para mais informa챌천es consulte linkgit:githooks[5]."
+msgstr "Este comando pode executar os ganchos `applypatch-msg`, `pre-applypatch` e `post-applypatch`. Para mais informa챌천es consulte linkgit:githooks[5]."
#. type: Plain text
#: en/git-am.txt:247
@@ -8507,20 +7146,13 @@ msgstr "'git annotate' [<op챌천es>] <arquivo> [<revis찾o>]\n"
#: en/git-annotate.txt:17
#, priority:100
msgid "Annotates each line in the given file with information from the commit which introduced the line. Optionally annotates from a given revision."
-msgstr ""
-"Anota cada linha no arquivo informado com as informa챌천es do commit que "
-"introduziu a linha. Anota opcionalmente em uma determinada revis찾o."
+msgstr "Anota cada linha no arquivo informado com as informa챌천es do commit que introduziu a linha. Anota opcionalmente em uma determinada revis찾o."
#. type: Plain text
#: en/git-annotate.txt:22
#, priority:100
msgid "The only difference between this command and linkgit:git-blame[1] is that they use slightly different output formats, and this command exists only for backward compatibility to support existing scripts, and provide a more familiar command name for people coming from other SCM systems."
-msgstr ""
-"A 첬nica diferen챌a entre esse comando e o linkgit:git-blame[1] 챕 que eles "
-"utilizam formatos de sa챠da ligeiramente diferentes, este comando existe "
-"apenas para a compatibilidade com as vers천es anteriores, visando a "
-"compatibilidade dos scripts j찼 existentes e para fornecer um nome do comando "
-"mais familiar para as pessoas vindas de outros sistemas SCM."
+msgstr "A 첬nica diferen챌a entre esse comando e o linkgit:git-blame[1] 챕 que eles utilizam formatos de sa챠da ligeiramente diferentes, este comando existe apenas para a compatibilidade com as vers천es anteriores, visando a compatibilidade dos scripts j찼 existentes e para fornecer um nome do comando mais familiar para as pessoas vindas de outros sistemas SCM."
#. type: Title =
#: en/git-apply.txt:2
@@ -8560,22 +7192,13 @@ msgstr ""
#: en/git-apply.txt:30
#, priority:100
msgid "Reads the supplied diff output (i.e. \"a patch\") and applies it to files. When running from a subdirectory in a repository, patched paths outside the directory are ignored. With the `--index` option the patch is also applied to the index, and with the `--cached` option the patch is only applied to the index. Without these options, the command applies the patch only to files, and does not require them to be in a Git repository."
-msgstr ""
-"L챗 a sa챠da diff informada (ou seja, \"um patch\") e a aplica aos arquivos. "
-"Ao executar a partir de um subdiret처rio em um reposit처rio, os caminhos "
-"corrigidos fora do diret처rio s찾o ignorados. Com a op챌찾o `--index`, o patch "
-"tamb챕m 챕 aplicado ao 챠ndice, com a op챌찾o `--cached` o patch 챕 aplicado "
-"apenas ao 챠ndice. Sem essas op챌천es, o comando aplica o patch apenas aos "
-"arquivos e n찾o exige que eles estejam em um reposit처rio Git."
+msgstr "L챗 a sa챠da diff informada (ou seja, \"um patch\") e a aplica aos arquivos. Ao executar a partir de um subdiret처rio em um reposit처rio, os caminhos corrigidos fora do diret처rio s찾o ignorados. Com a op챌찾o `--index`, o patch tamb챕m 챕 aplicado ao 챠ndice, com a op챌찾o `--cached` o patch 챕 aplicado apenas ao 챠ndice. Sem essas op챌천es, o comando aplica o patch apenas aos arquivos e n찾o exige que eles estejam em um reposit처rio Git."
#. type: Plain text
#: en/git-apply.txt:34
#, priority:100
msgid "This command applies the patch but does not create a commit. Use linkgit:git-am[1] to create commits from patches generated by linkgit:git-format-patch[1] and/or received by email."
-msgstr ""
-"Este comando aplica o patch, mas n찾o cria um commit. Utilize linkgit:git-"
-"am[1] para criar os commits a partir dos patches que foram gerados atrav챕s "
-"do linkgit:git-format-patch[1] ou que tenham sido recebidos por email."
+msgstr "Este comando aplica o patch, mas n찾o cria um commit. Utilize linkgit:git-am[1] para criar os commits a partir dos patches que foram gerados atrav챕s do linkgit:git-format-patch[1] ou que tenham sido recebidos por email."
#. type: Labeled list
#: en/git-apply.txt:37
@@ -8587,9 +7210,7 @@ msgstr "<patch>..."
#: en/git-apply.txt:40
#, priority:100
msgid "The files to read the patch from. '-' can be used to read from the standard input."
-msgstr ""
-"Os arquivos que ser찾o lidos do patch. '-' pode ser utilizado para ler a "
-"entrada predefinida."
+msgstr "Os arquivos que ser찾o lidos do patch. '-' pode ser utilizado para ler a entrada predefinida."
#. type: Labeled list
#: en/git-apply.txt:41 en/git-rebase.txt:404 en/merge-options.txt:91
@@ -8601,37 +7222,25 @@ msgstr "--stat"
#: en/git-apply.txt:44
#, priority:100
msgid "Instead of applying the patch, output diffstat for the input. Turns off \"apply\"."
-msgstr ""
-"Em vez de aplicar o patch, gere o `diffstat` na entrada. Desativa o \"apply"
-"\" (aplicar)."
+msgstr "Em vez de aplicar o patch, gere o `diffstat` na entrada. Desativa o \"apply\" (aplicar)."
#. type: Plain text
#: en/git-apply.txt:51
#, priority:100
msgid "Similar to `--stat`, but shows the number of added and deleted lines in decimal notation and the pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`. Turns off \"apply\"."
-msgstr ""
-"Semelhante ao `--stat` por챕m exibe a quantidade de linhas que foram "
-"adicionadas e exclu챠das na nota챌찾o decimal do nome do caminho sem a "
-"abrevia챌찾o, tornando-o mais amig찼vel 횪 m찼quina. Para arquivos bin찼rios, "
-"gera dois `-` em vez de `0 0`. Desativa o \"apply\" (aplicar)."
+msgstr "Semelhante ao `--stat` por챕m exibe a quantidade de linhas que foram adicionadas e exclu챠das na nota챌찾o decimal do nome do caminho sem a abrevia챌찾o, tornando-o mais amig찼vel 횪 m찼quina. Para arquivos bin찼rios, gera dois `-` em vez de `0 0`. Desativa o \"apply\" (aplicar)."
#. type: Plain text
#: en/git-apply.txt:57
#, priority:100
msgid "Instead of applying the patch, output a condensed summary of information obtained from git diff extended headers, such as creations, renames and mode changes. Turns off \"apply\"."
-msgstr ""
-"Em vez de aplicar o patch, produza um resumo condensado das informa챌천es "
-"obtidas dos cabe챌alhos estendidos do `git diff` como cria챌천es, renomea챌천es e "
-"as altera챌천es do modo. Desativa o \"apply\" (aplicar)."
+msgstr "Em vez de aplicar o patch, produza um resumo condensado das informa챌천es obtidas dos cabe챌alhos estendidos do `git diff` como cria챌천es, renomea챌천es e as altera챌천es do modo. Desativa o \"apply\" (aplicar)."
#. type: Plain text
#: en/git-apply.txt:62
#, priority:100
msgid "Instead of applying the patch, see if the patch is applicable to the current working tree and/or the index file and detects errors. Turns off \"apply\"."
-msgstr ""
-"Em vez de aplicar o patch, verifique se o patch 챕 aplic찼vel 횪 찼rvore de "
-"trabalho atual ou ao arquivo do 챠ndice assim como, detecte os erros. "
-"Desativa o \"apply\" (aplicar)."
+msgstr "Em vez de aplicar o patch, verifique se o patch 챕 aplic찼vel 횪 찼rvore de trabalho atual ou ao arquivo do 챠ndice assim como, detecte os erros. Desativa o \"apply\" (aplicar)."
#. type: Labeled list
#: en/git-apply.txt:63 en/git-checkout-index.txt:26 en/git-stash.txt:168
@@ -8643,13 +7252,7 @@ msgstr "--index"
#: en/git-apply.txt:71
#, priority:100
msgid "When `--check` is in effect, or when applying the patch (which is the default when none of the options that disables it is in effect), make sure the patch is applicable to what the current index file records. If the file to be patched in the working tree is not up to date, it is flagged as an error. This flag also causes the index file to be updated."
-msgstr ""
-"Quando a op챌찾o `--check` estiver em vigor ou durante a aplica챌찾o do patch ("
-"que 챕 a predefini챌찾o quando nenhuma das op챌천es que o desabilita estiver em "
-"vigor), tenha certeza que o patch seja aplic찼vel ao que o arquivo atual do "
-"챠ndice registra. Caso o arquivo que ser찼 corrigido na 찼rvore de trabalho "
-"n찾o esteja atualizado, ser찼 sinalizado como um erro. Essa flag tamb챕m faz "
-"com que o arquivo do 챠ndice seja atualizado."
+msgstr "Quando a op챌찾o `--check` estiver em vigor ou durante a aplica챌찾o do patch (que 챕 a predefini챌찾o quando nenhuma das op챌천es que o desabilita estiver em vigor), tenha certeza que o patch seja aplic찼vel ao que o arquivo atual do 챠ndice registra. Caso o arquivo que ser찼 corrigido na 찼rvore de trabalho n찾o esteja atualizado, ser찼 sinalizado como um erro. Essa flag tamb챕m faz com que o arquivo do 챠ndice seja atualizado."
#. type: Labeled list
#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
@@ -8661,34 +7264,19 @@ msgstr "--cached"
#: en/git-apply.txt:76
#, priority:100
msgid "Apply a patch without touching the working tree. Instead take the cached data, apply the patch, and store the result in the index without using the working tree. This implies `--index`."
-msgstr ""
-"Aplique um patch sem tocar na 찼rvore de trabalho. Em vez disso, pegue os "
-"dados no cache, aplique o patch e armazene o resultado no 챠ndice, sem "
-"utilizar a 찼rvore de trabalho. Implica no uso da op챌찾o `--index`."
+msgstr "Aplique um patch sem tocar na 찼rvore de trabalho. Em vez disso, pegue os dados no cache, aplique o patch e armazene o resultado no 챠ndice, sem utilizar a 찼rvore de trabalho. Implica no uso da op챌찾o `--index`."
#. type: Plain text
#: en/git-apply.txt:84
#, priority:100
msgid "When applying the patch only to the working tree, mark new files to be added to the index later (see `--intent-to-add` option in linkgit:git-add[1]). This option is ignored unless running in a Git repository and `--index` is not specified. Note that `--index` could be implied by other options such as `--cached` or `--3way`."
-msgstr ""
-"Ao aplicar o patch apenas na 찼rvore de trabalho, marque os novos arquivos "
-"que ser찾o adicionados ao 챠ndice posteriormente (consulte a op챌찾o `--intent-"
-"to-add` no linkgit:git-add[1]). Esta op챌찾o 챕 ignorada a menos que seja "
-"executada em um reposit처rio Git e o comando `--index` n찾o seja utilizado. "
-"Observe que o comando `--index` pode estar impl챠cito em outras op챌천es como "
-"`--cached` ou `--3way`."
+msgstr "Ao aplicar o patch apenas na 찼rvore de trabalho, marque os novos arquivos que ser찾o adicionados ao 챠ndice posteriormente (consulte a op챌찾o `--intent-to-add` no linkgit:git-add[1]). Esta op챌찾o 챕 ignorada a menos que seja executada em um reposit처rio Git e o comando `--index` n찾o seja utilizado. Observe que o comando `--index` pode estar impl챠cito em outras op챌천es como `--cached` ou `--3way`."
#. type: Plain text
#: en/git-apply.txt:93
#, priority:100
msgid "When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to, and we have those blobs available locally, possibly leaving the conflict markers in the files in the working tree for the user to resolve. This option implies the `--index` option, and is incompatible with the `--reject` and the `--cached` options."
-msgstr ""
-"Quando o patch n찾o for aplicado corretamente, volte 횪 mesclagem bidirecional "
-"caso o patch registre a identidade das bolhas aos quais ele deve se aplicar "
-"e tivermos estas bolhas dispon챠veis localmente, possivelmente deixando os "
-"marcadores de conflito nos arquivos da 찼rvore de trabalho para que o usu찼rio "
-"possa resolver. Implica no uso da op챌찾o `--index` sendo incompat챠vel com as "
-"op챌천es `--reject` e `--cached`."
+msgstr "Quando o patch n찾o for aplicado corretamente, volte 횪 mesclagem bidirecional caso o patch registre a identidade das bolhas aos quais ele deve se aplicar e tivermos estas bolhas dispon챠veis localmente, possivelmente deixando os marcadores de conflito nos arquivos da 찼rvore de trabalho para que o usu찼rio possa resolver. Implica no uso da op챌찾o `--index` sendo incompat챠vel com as op챌천es `--reject` e `--cached`."
#. type: Labeled list
#: en/git-apply.txt:94
@@ -8700,23 +7288,16 @@ msgstr "--build-fake-ancestor=<arquivo>"
#: en/git-apply.txt:100
#, priority:100
msgid "Newer 'git diff' output has embedded 'index information' for each blob to help identify the original version that the patch applies to. When this flag is given, and if the original versions of the blobs are available locally, builds a temporary index containing those blobs."
-msgstr ""
-"O 'git diff' mais recentemente gerado incorporou 'as informa챌천es do 챠ndice' "
-"para cada bolha para ajudar a identificar qual foi a vers찾o original 횪 qual "
-"o patch se aplica. Quando esse sinalizador for utilizado e caso as vers천es "
-"originais das bolhas estejam dispon챠veis localmente, crie um 챠ndice "
-"tempor찼rio contendo essas bolhas."
+msgstr "O 'git diff' mais recentemente gerado incorporou 'as informa챌천es do 챠ndice' para cada bolha para ajudar a identificar qual foi a vers찾o original 횪 qual o patch se aplica. Quando esse sinalizador for utilizado e caso as vers천es originais das bolhas estejam dispon챠veis localmente, crie um 챠ndice tempor찼rio contendo essas bolhas."
#. type: Plain text
#: en/git-apply.txt:103
#, priority:100
msgid "When a pure mode change is encountered (which has no index information), the information is read from the current index instead."
-msgstr ""
-"Quando uma altera챌찾o do modo puro 챕 encontrado (que n찾o cont챕m as "
-"informa챌천es do 챠ndice), as informa챌천es s찾o lidas a partir do 챠ndice atual."
+msgstr "Quando uma altera챌찾o do modo puro 챕 encontrado (que n찾o cont챕m as informa챌천es do 챠ndice), as informa챌천es s찾o lidas a partir do 챠ndice atual."
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -8731,38 +7312,25 @@ msgstr "Aplique o patch ao contr찼rio."
#: en/git-apply.txt:114
#, priority:100
msgid "For atomicity, 'git apply' by default fails the whole patch and does not touch the working tree when some of the hunks do not apply. This option makes it apply the parts of the patch that are applicable, and leave the rejected hunks in corresponding *.rej files."
-msgstr ""
-"Por atomicidade, a predefini챌찾o do comando 'git apply' falha o patch inteiro "
-"e n찾o toca na 찼rvore de trabalho quando alguns dos peda챌os n찾o se "
-"aplicarem. Essa op챌찾o faz com que se aplique as partes do patch que forem "
-"aplic찼veis e deixe os peda챌os rejeitados nos arquivos * .rej correspondentes."
+msgstr "Por atomicidade, a predefini챌찾o do comando 'git apply' falha o patch inteiro e n찾o toca na 찼rvore de trabalho quando alguns dos peda챌os n찾o se aplicarem. Essa op챌찾o faz com que se aplique as partes do patch que forem aplic찼veis e deixe os peda챌os rejeitados nos arquivos * .rej correspondentes."
#. type: Plain text
#: en/git-apply.txt:118
#, priority:100
msgid "When `--numstat` has been given, do not munge pathnames, but use a NUL-terminated machine-readable format."
-msgstr ""
-"Quando o comando `--numstat` for utilizado, n찾o una os nomes dos caminhos, "
-"por챕m utilize um formato leg챠vel para a m찼quina e utilize caracteres `NUL` "
-"para a termina챌찾o."
+msgstr "Quando o comando `--numstat` for utilizado, n찾o una os nomes dos caminhos, por챕m utilize um formato leg챠vel para a m찼quina e utilize caracteres `NUL` para a termina챌찾o."
#. type: Plain text
#: en/git-apply.txt:128
#, priority:100
msgid "Remove <n> leading path components (separated by slashes) from traditional diff paths. E.g., with `-p2`, a patch against `a/dir/file` will be applied directly to `file`. The default is 1."
-msgstr ""
-"Remova os `<n>` componentes do caminho principal (separados por barras) dos "
-"caminhos diff tradicionais. Com `-p2`, um patch contra` a/dir/file` ser찼 "
-"aplicado diretamente ao `file` por exemplo. A predefini챌찾o 챕 1."
+msgstr "Remova os `<n>` componentes do caminho principal (separados por barras) dos caminhos diff tradicionais. Com `-p2`, um patch contra` a/dir/file` ser찼 aplicado diretamente ao `file` por exemplo. A predefini챌찾o 챕 1."
#. type: Plain text
#: en/git-apply.txt:134
#, 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."
-msgstr ""
-"Assegure que pelo menos `<n>` linhas ao redor do contexto coincidente antes "
-"e depois de cada altera챌찾o. Quando h찼 menos linhas de contexto ao redor, "
-"todas elas devem coincidir. 횋 predefinido que nenhum contexto seja ignorado."
+msgstr "Assegure que pelo menos `<n>` linhas ao redor do contexto coincidente antes e depois de cada altera챌찾o. Quando h찼 menos linhas de contexto ao redor, todas elas devem coincidir. 횋 predefinido que nenhum contexto seja ignorado."
#. type: Labeled list
#: en/git-apply.txt:135
@@ -8774,20 +7342,13 @@ msgstr "--unidiff-zero"
#: en/git-apply.txt:141
#, priority:100
msgid "By default, 'git apply' expects that the patch being applied is a unified diff with at least one line of context. This provides good safety measures, but breaks down when applying a diff generated with `--unified=0`. To bypass these checks use `--unidiff-zero`."
-msgstr ""
-"횋 predefinido que o comando 'git apply' espere que o patch que est찼 sendo "
-"aplicado seja um diff unificado com pelo menos uma linha relacionada ao "
-"contexto. Fornece boas medidas de seguran챌a, por챕m 챕 interrompido ao "
-"aplicar um diff gerado com `--unified=0`. Para ignorar estas verifica챌천es, "
-"utilize `--unidiff-zero`."
+msgstr "횋 predefinido que o comando 'git apply' espere que o patch que est찼 sendo aplicado seja um diff unificado com pelo menos uma linha relacionada ao contexto. Fornece boas medidas de seguran챌a, por챕m 챕 interrompido ao aplicar um diff gerado com `--unified=0`. Para ignorar estas verifica챌천es, utilize `--unidiff-zero`."
#. type: Plain text
#: en/git-apply.txt:144
#, priority:100
msgid "Note, for the reasons stated above usage of context-free patches is discouraged."
-msgstr ""
-"Observe que pelas raz천es expostas acima, a utiliza챌찾o de patches sem "
-"contexto 챕 desencorajado."
+msgstr "Observe que pelas raz천es expostas acima, a utiliza챌찾o de patches sem contexto 챕 desencorajado."
#. type: Plain text
#: en/git-apply.txt:145 en/git-rebase.txt:610
@@ -8799,11 +7360,7 @@ msgstr "--apply"
#: en/git-apply.txt:151
#, priority:100
msgid "If you use any of the options marked \"Turns off 'apply'\" above, 'git apply' reads and outputs the requested information without actually applying the patch. Give this flag after those flags to also apply the patch."
-msgstr ""
-"Caso utilize qualquer uma das op챌천es marcadas \"Desativa o 'apply'\" acima, "
-"o comando 'git apply' l챗 e gera as informa챌천es solicitadas sem realmente "
-"aplicar o patch. Informe essa flag depois destas flags para tamb챕m aplicar "
-"o patch."
+msgstr "Caso utilize qualquer uma das op챌천es marcadas \"Desativa o 'apply'\" acima, o comando 'git apply' l챗 e gera as informa챌천es solicitadas sem realmente aplicar o patch. Informe essa flag depois destas flags para tamb챕m aplicar o patch."
#. type: Labeled list
#: en/git-apply.txt:152
@@ -8815,11 +7372,7 @@ msgstr "--no-add"
#: en/git-apply.txt:158
#, priority:100
msgid "When applying a patch, ignore additions made by the patch. This can be used to extract the common part between two files by first running 'diff' on them and applying the result with this option, which would apply the deletion part but not the addition part."
-msgstr ""
-"Ao aplicar um patch, ignore as adi챌천es feitas pelo patch. Pode ser "
-"utilizado para extrair a parte comum entre os dois arquivos executando o "
-"primeiro 'diff' neles e aplicando o resultado com esta op챌찾o que aplicaria a "
-"parte a ser exclu챠da, mas n찾o a parte da adi챌찾o."
+msgstr "Ao aplicar um patch, ignore as adi챌천es feitas pelo patch. Pode ser utilizado para extrair a parte comum entre os dois arquivos executando o primeiro 'diff' neles e aplicando o resultado com esta op챌찾o que aplicaria a parte a ser exclu챠da, mas n찾o a parte da adi챌찾o."
#. type: Labeled list
#: en/git-apply.txt:159
@@ -8831,11 +7384,7 @@ msgstr "--allow-binary-replacement"
#: en/git-apply.txt:165
#, priority:100
msgid "Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so. Currently we always allow binary patch application, so this is a no-op."
-msgstr ""
-"Historicamente, n찾o permitimos que um patch bin찼rio seja aplicado sem uma "
-"permiss찾o expl챠cita do usu찼rio, este sinalizador era o caminho para faz챗-"
-"lo. Atualmente, n처s sempre permitimos que os patches bin찼rios sejam "
-"aplicados, ent찾o isso 챕 um n찾o operacional."
+msgstr "Historicamente, n찾o permitimos que um patch bin찼rio seja aplicado sem uma permiss찾o expl챠cita do usu찼rio, este sinalizador era o caminho para faz챗-lo. Atualmente, n처s sempre permitimos que os patches bin찼rios sejam aplicados, ent찾o isso 챕 um n찾o operacional."
#. type: Labeled list
#: en/git-apply.txt:166
@@ -8847,10 +7396,7 @@ msgstr "--exclude=<path-pattern>"
#: en/git-apply.txt:170
#, priority:100
msgid "Don't apply changes to files matching the given path pattern. This can be useful when importing patchsets, where you want to exclude certain files or directories."
-msgstr ""
-"N찾o aplique as altera챌천es nos arquivos que coincidam com o padr찾o do caminho "
-"informado. Pode ser 첬til ao importar os conjuntos dos patches onde voc챗 "
-"queira que determinados arquivos ou diret처rios sejam exclu챠dos."
+msgstr "N찾o aplique as altera챌천es nos arquivos que coincidam com o padr찾o do caminho informado. Pode ser 첬til ao importar os conjuntos dos patches onde voc챗 queira que determinados arquivos ou diret처rios sejam exclu챠dos."
#. type: Labeled list
#: en/git-apply.txt:171
@@ -8862,32 +7408,19 @@ msgstr "--include=<path-pattern>"
#: en/git-apply.txt:175
#, priority:100
msgid "Apply changes to files matching the given path pattern. This can be useful when importing patchsets, where you want to include certain files or directories."
-msgstr ""
-"Aplique as altera챌천es nos arquivos que coincidam com padr찾o do caminho "
-"informado. Pode ser 첬til ao importar os conjuntos dos patches, onde voc챗 "
-"queira incluir certos arquivos ou diret처rios."
+msgstr "Aplique as altera챌천es nos arquivos que coincidam com padr찾o do caminho informado. Pode ser 첬til ao importar os conjuntos dos patches, onde voc챗 queira incluir certos arquivos ou diret처rios."
#. type: Plain text
#: en/git-apply.txt:181
#, priority:100
msgid "When `--exclude` and `--include` patterns are used, they are examined in the order they appear on the command line, and the first match determines if a patch to each path is used. A patch to a path that does not match any include/exclude pattern is used by default if there is no include pattern on the command line, and ignored if there is any include pattern."
-msgstr ""
-"Quando os padr천es `--exclude` e `--include` s찾o utilizados, eles s찾o "
-"examinados na ordem em que aparecem na linha de comando, a primeira "
-"correspond챗ncia determina se para cada caminho um patch ser찼 utilizado. 횋 "
-"predefinido que um patch para um caminho que n찾o coincida com nenhum padr찾o "
-"para incluir/excluir seja utilizado caso n찾o haja um padr찾o de inclus찾o na "
-"linha de comandos e ignorado caso haja algum padr찾o para a inclus찾o."
+msgstr "Quando os padr천es `--exclude` e `--include` s찾o utilizados, eles s찾o examinados na ordem em que aparecem na linha de comando, a primeira correspond챗ncia determina se para cada caminho um patch ser찼 utilizado. 횋 predefinido que um patch para um caminho que n찾o coincida com nenhum padr찾o para incluir/excluir seja utilizado caso n찾o haja um padr찾o de inclus찾o na linha de comandos e ignorado caso haja algum padr찾o para a inclus찾o."
#. type: Plain text
#: en/git-apply.txt:189
#, priority:100
msgid "When applying a patch, ignore changes in whitespace in context lines if necessary. Context lines will preserve their whitespace, and they will not undergo whitespace fixing regardless of the value of the `--whitespace` option. New lines will still be fixed, though."
-msgstr ""
-"Ao aplicar um patch, ignore as altera챌천es no espa챌o em branco das linhas do "
-"contexto, se necess찼rio. As linhas do contexto preservam os seus espa챌os em "
-"branco e n찾o ser찾o corrigidas, independentemente do valor da op챌찾o "
-"`--whitespace`. No entanto, as novas linhas ainda ser찾o corrigidas."
+msgstr "Ao aplicar um patch, ignore as altera챌천es no espa챌o em branco das linhas do contexto, se necess찼rio. As linhas do contexto preservam os seus espa챌os em branco e n찾o ser찾o corrigidas, independentemente do valor da op챌찾o `--whitespace`. No entanto, as novas linhas ainda ser찾o corrigidas."
#. type: Labeled list
#: en/git-apply.txt:190
@@ -8899,31 +7432,19 @@ msgstr "--whitespace=<a챌찾o>"
#: en/git-apply.txt:198
#, priority:100
msgid "When applying a patch, detect a new or modified line that has whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that solely consist of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors."
-msgstr ""
-"Ao aplicar um patch, detecte se h찼 erros de espa챌o em branco em uma nova "
-"linha ou em uma linha que foi modificada. A configura챌찾o `core.whitespace` "
-"define o que s찾o considerados erros de espa챌o em branco. 횋 predefinido que "
-"os espa챌os em branco 횪 direita (incluindo as linhas que consistam apenas nos "
-"espa챌os em branco) e um caractere de espa챌o que seja imediatamente seguido "
-"por um caractere de tabula챌찾o dentro do recuo inicial da linha, s찾o "
-"considerados erros do espa챌o em branco."
+msgstr "Ao aplicar um patch, detecte se h찼 erros de espa챌o em branco em uma nova linha ou em uma linha que foi modificada. A configura챌찾o `core.whitespace` define o que s찾o considerados erros de espa챌o em branco. 횋 predefinido que os espa챌os em branco 횪 direita (incluindo as linhas que consistam apenas nos espa챌os em branco) e um caractere de espa챌o que seja imediatamente seguido por um caractere de tabula챌찾o dentro do recuo inicial da linha, s찾o considerados erros do espa챌o em branco."
#. type: Plain text
#: en/git-apply.txt:202
#, priority:100
msgid "By default, the command outputs warning messages but applies the patch. When `git-apply` is used for statistics and not applying a patch, it defaults to `nowarn`."
-msgstr ""
-"횋 predefinido que o comando gere mensagens de aviso, mas continue a aplicar "
-"o patch. Quando o comando `git-apply` 챕 utilizado para gerar as "
-"estat챠sticas e n찾o para aplicar um patch, ele retorna ao valor predefinido "
-"`nowarn`."
+msgstr "횋 predefinido que o comando gere mensagens de aviso, mas continue a aplicar o patch. Quando o comando `git-apply` 챕 utilizado para gerar as estat챠sticas e n찾o para aplicar um patch, ele retorna ao valor predefinido `nowarn`."
#. type: Plain text
#: en/git-apply.txt:205
#, priority:100
msgid "You can use different `<action>` values to control this behavior:"
-msgstr ""
-"Voc챗 pode utilizar valores diferentes valores de controle para `<action>`:"
+msgstr "Voc챗 pode utilizar valores diferentes valores de controle para `<action>`:"
#. type: Plain text
#: en/git-apply.txt:207
@@ -8935,27 +7456,19 @@ msgstr "`nowarn` desativa o aviso de espa챌o em branco 횪 direita."
#: en/git-apply.txt:209
#, priority:100
msgid "`warn` outputs warnings for a few such errors, but applies the patch as-is (default)."
-msgstr ""
-"`warn` envia avisos para alguns desses erros, mas aplica o patch como est찼 "
-"(predefinido)."
+msgstr "`warn` envia avisos para alguns desses erros, mas aplica o patch como est찼 (predefinido)."
#. type: Plain text
#: en/git-apply.txt:213
#, priority:100
msgid "`fix` outputs warnings for a few such errors, and applies the patch after fixing them (`strip` is a synonym --- the tool used to consider only trailing whitespace characters as errors, and the fix involved 'stripping' them, but modern Gits do more)."
-msgstr ""
-"`fix` gera os avisos para alguns destes erros e aplica o patch depois de "
-"corrig챠-los (o `strip` 챕 um sin척nimo --- a ferramenta costumava considerar "
-"apenas os caracteres de espa챌o em branco como erros e a corre챌찾o envolvia em "
-"'remov챗-los', por챕m os Gits mais modernos fazem mais que isso)."
+msgstr "`fix` gera os avisos para alguns destes erros e aplica o patch depois de corrig챠-los (o `strip` 챕 um sin척nimo --- a ferramenta costumava considerar apenas os caracteres de espa챌o em branco como erros e a corre챌찾o envolvia em 'remov챗-los', por챕m os Gits mais modernos fazem mais que isso)."
#. type: Plain text
#: en/git-apply.txt:215
#, priority:100
msgid "`error` outputs warnings for a few such errors, and refuses to apply the patch."
-msgstr ""
-"`error` gera os avisos para alguns destes erros e se recusa a aplicar o "
-"patch."
+msgstr "`error` gera os avisos para alguns destes erros e se recusa a aplicar o patch."
#. type: Plain text
#: en/git-apply.txt:216
@@ -8973,22 +7486,13 @@ msgstr "--inaccurate-eof"
#: en/git-apply.txt:223
#, priority:100
msgid "Under certain circumstances, some versions of 'diff' do not correctly detect a missing new-line at the end of the file. As a result, patches created by such 'diff' programs do not record incomplete lines correctly. This option adds support for applying such patches by working around this bug."
-msgstr ""
-"Em determinadas circunst창ncias, algumas vers천es do 'diff' n찾o detectam "
-"corretamente uma nova linha que esteja ausente no final do arquivo. Como "
-"resultado, os patches criados por estes programas 'diff' n찾o registram as "
-"linhas que estejam incompletas de forma correta. Esta op챌찾o adiciona a "
-"compatibilidade para que seja poss챠vel aplicar tais corre챌천es contornando "
-"este problema."
+msgstr "Em determinadas circunst창ncias, algumas vers천es do 'diff' n찾o detectam corretamente uma nova linha que esteja ausente no final do arquivo. Como resultado, os patches criados por estes programas 'diff' n찾o registram as linhas que estejam incompletas de forma correta. Esta op챌찾o adiciona a compatibilidade para que seja poss챠vel aplicar tais corre챌천es contornando este problema."
#. type: Plain text
#: en/git-apply.txt:229
#, priority:100
msgid "Report progress to stderr. By default, only a message about the current patch being applied will be printed. This option will cause additional information to be reported."
-msgstr ""
-"Relate o progresso para o stderr. 횋 predefinido que apenas seja exibida uma "
-"mensagem do patch que est찼 sendo aplicado atualmente. Esta op챌찾o far찼 com "
-"que as informa챌천es adicionais sejam relatadas."
+msgstr "Relate o progresso para o stderr. 횋 predefinido que apenas seja exibida uma mensagem do patch que est찼 sendo aplicado atualmente. Esta op챌찾o far찼 com que as informa챌천es adicionais sejam relatadas."
#. type: Labeled list
#: en/git-apply.txt:230
@@ -9000,10 +7504,7 @@ msgstr "--recount"
#: en/git-apply.txt:234
#, priority:100
msgid "Do not trust the line counts in the hunk headers, but infer them by inspecting the patch (e.g. after editing the patch without adjusting the hunk headers appropriately)."
-msgstr ""
-"N찾o confie nas contagens da linha nos cabe챌alhos, deduza-as inspecionando o "
-"patch (depois de editar o patch sem ajustar os cabe챌alhos adequadamente por "
-"exemplo)."
+msgstr "N찾o confie nas contagens da linha nos cabe챌alhos, deduza-as inspecionando o patch (depois de editar o patch sem ajustar os cabe챌alhos adequadamente por exemplo)."
#. type: Labeled list
#: en/git-apply.txt:235
@@ -9015,19 +7516,13 @@ msgstr "--directory=<root>"
#: en/git-apply.txt:238
#, priority:100
msgid "Prepend <root> to all filenames. If a \"-p\" argument was also passed, it is applied before prepending the new root."
-msgstr ""
-"Anexe `<root>` (raiz) em todos os nomes dos arquivos. Caso \"-p\" tamb챕m "
-"seja utilizado, ele 챕 aplicado antes de anexar a nova raiz."
+msgstr "Anexe `<root>` (raiz) em todos os nomes dos arquivos. Caso \"-p\" tamb챕m seja utilizado, ele 챕 aplicado antes de anexar a nova raiz."
#. type: Plain text
#: en/git-apply.txt:242
#, priority:100
msgid "For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh` can be applied to the file in the working tree `modules/git-gui/git-gui.sh` by running `git apply --directory=modules/git-gui`."
-msgstr ""
-"Por exemplo, um patch que seja utilizado para a atualiza챌찾o de `a/git-gui.sh`"
-" para `b/git-gui.sh`, pode ser aplicado ao arquivo na 찼rvore de trabalho `"
-"modules/git-gui/git-gui.sh` ao executar o comando `git apply --directory="
-"modules/git-gui`."
+msgstr "Por exemplo, um patch que seja utilizado para a atualiza챌찾o de `a/git-gui.sh` para `b/git-gui.sh`, pode ser aplicado ao arquivo na 찼rvore de trabalho `modules/git-gui/git-gui.sh` ao executar o comando `git apply --directory=modules/git-gui`."
#. type: Labeled list
#: en/git-apply.txt:243
@@ -9039,21 +7534,13 @@ msgstr "--unsafe-paths"
#: en/git-apply.txt:248
#, priority:100
msgid "By default, a patch that affects outside the working area (either a Git controlled working tree, or the current working directory when \"git apply\" is used as a replacement of GNU patch) is rejected as a mistake (or a mischief)."
-msgstr ""
-"횋 predefinido que um patch que tenha efeito fora da 찼rea de trabalho (uma "
-"찼rvore de trabalho controlada pelo Git ou um diret처rio de trabalho atual "
-"quando o \"git apply\" 챕 utilizado como uma substitui챌찾o do patch GNU) seja "
-"rejeitado como um erro (ou um dano)."
+msgstr "횋 predefinido que um patch que tenha efeito fora da 찼rea de trabalho (uma 찼rvore de trabalho controlada pelo Git ou um diret처rio de trabalho atual quando o \"git apply\" 챕 utilizado como uma substitui챌찾o do patch GNU) seja rejeitado como um erro (ou um dano)."
#. type: Plain text
#: en/git-apply.txt:252
#, priority:100
msgid "When `git apply` is used as a \"better GNU patch\", the user can pass the `--unsafe-paths` option to override this safety check. This option has no effect when `--index` or `--cached` is in use."
-msgstr ""
-"Quando o comando `git apply` for utilizado como um \"better GNU patch\" ("
-"patch melhor do que o do GNU), o usu찼rio pode encaminhar a op챌찾o `--unsafe-"
-"paths` para substituir esta verifica챌찾o de seguran챌a. Esta op챌찾o n찾o tem "
-"efeito quando a op챌찾o `--index` ou `--cached` estiver em uso."
+msgstr "Quando o comando `git apply` for utilizado como um \"better GNU patch\" (patch melhor do que o do GNU), o usu찼rio pode encaminhar a op챌찾o `--unsafe-paths` para substituir esta verifica챌찾o de seguran챌a. Esta op챌찾o n찾o tem efeito quando a op챌찾o `--index` ou `--cached` estiver em uso."
#. type: Title -
#: en/git-apply.txt:254 en/git-archive.txt:98 en/git-branch.txt:302 en/git-config.txt:268 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:362 en/git-fsck.txt:108 en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52 en/git-instaweb.txt:70 en/git-log.txt:185 en/git-merge.txt:358 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
@@ -9071,11 +7558,7 @@ msgstr "apply.ignoreWhitespace"
#: en/git-apply.txt:260
#, priority:100
msgid "Set to 'change' if you want changes in whitespace to be ignored by default. Set to one of: no, none, never, false if you want changes in whitespace to be significant."
-msgstr ""
-"Defina como 'change' caso queira que as altera챌천es no espa챌o em branco sejam "
-"sempre ignoradas. Defina com um dos valores entre: `no`, `none`, `never`, "
-"`false` caso queira que as altera챌천es no espa챌o em branco sejam feitas de "
-"forma significativa."
+msgstr "Defina como 'change' caso queira que as altera챌천es no espa챌o em branco sejam sempre ignoradas. Defina com um dos valores entre: `no`, `none`, `never`, `false` caso queira que as altera챌천es no espa챌o em branco sejam feitas de forma significativa."
#. type: Labeled list
#: en/git-apply.txt:260
@@ -9087,9 +7570,7 @@ msgstr "apply.whitespace"
#: en/git-apply.txt:263
#, priority:100
msgid "When no `--whitespace` flag is given from the command line, this configuration item is used as the default."
-msgstr ""
-"Quando nenhum comando `--whitespace` for utilizado na linha de comandos, 챕 "
-"predefinido que este item seja sempre utilizado."
+msgstr "Quando nenhum comando `--whitespace` for utilizado na linha de comandos, 챕 predefinido que este item seja sempre utilizado."
#. type: Title -
#: en/git-apply.txt:265 en/git-mv.txt:48 en/git-rm.txt:145
@@ -9101,29 +7582,19 @@ msgstr "SUBM횙DULOS"
#: en/git-apply.txt:268
#, priority:100
msgid "If the patch contains any changes to submodules then 'git apply' treats these changes as follows."
-msgstr ""
-"Caso um patch contenha alguma altera챌찾o nos subm처dulos, o comando 'git "
-"apply' tratar찼 estas altera챌천es da seguinte maneira."
+msgstr "Caso um patch contenha alguma altera챌찾o nos subm처dulos, o comando 'git apply' tratar찼 estas altera챌천es da seguinte maneira."
#. type: Plain text
#: en/git-apply.txt:274
#, priority:100
msgid "If `--index` is specified (explicitly or implicitly), then the submodule commits must match the index exactly for the patch to apply. If any of the submodules are checked-out, then these check-outs are completely ignored, i.e., they are not required to be up to date or clean and they are not updated."
-msgstr ""
-"Caso `--index` seja utilizado (expl챠cita ou implicitamente), o commit do "
-"subm처dulo dever찼 coincidir de forma exata ao 챠ndice para que o patch possa "
-"ser aplicado. N찾o ser찾o atualizados qualquer um dos subm처dulos que tenha um "
-"check-out, estes check-outs ser찾o completamente ignorados, ou seja, eles n찾o "
-"precisam estar atualizados ou limpos."
+msgstr "Caso `--index` seja utilizado (expl챠cita ou implicitamente), o commit do subm처dulo dever찼 coincidir de forma exata ao 챠ndice para que o patch possa ser aplicado. N찾o ser찾o atualizados qualquer um dos subm처dulos que tenha um check-out, estes check-outs ser찾o completamente ignorados, ou seja, eles n찾o precisam estar atualizados ou limpos."
#. type: Plain text
#: en/git-apply.txt:278
#, priority:100
msgid "If `--index` is not specified, then the submodule commits in the patch are ignored and only the absence or presence of the corresponding subdirectory is checked and (if possible) updated."
-msgstr ""
-"Caso o `--index` n찾o seja utilizado, os commit dos subm처dulos no patch ser찾o "
-"ignorados e somente a aus챗ncia ou a presen챌a do subdiret처rio coincidente "
-"ser찼 verificado e (se poss챠vel) atualizado."
+msgstr "Caso o `--index` n찾o seja utilizado, os commit dos subm처dulos no patch ser찾o ignorados e somente a aus챗ncia ou a presen챌a do subdiret처rio coincidente ser찼 verificado e (se poss챠vel) atualizado."
#. type: Plain text
#: en/git-apply.txt:282
@@ -9150,83 +7621,50 @@ 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 profundidade] [-t tempdir]"
-"\n"
+"'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D profundidade] [-t tempdir]\n"
" <arquivo/ramo>[:<git-branch>] ...\n"
#. type: Plain text
#: en/git-archimport.txt:23
#, priority:100
msgid "Imports a project from one or more GNU Arch repositories. It will follow branches and repositories within the namespaces defined by the <archive/branch> parameters supplied. If it cannot find the remote branch a merge comes from it will just import it as a regular commit. If it can find it, it will mark it as a merge whenever possible (see discussion below)."
-msgstr ""
-"Importa um projeto de um ou mais reposit처rios do GNU Arch. Ele seguir찼 as "
-"ramifica챌천es e reposit처rios dentro dos \"namespaces\" definidos pelos "
-"par창metros <arquivo/ramo> informado. Caso ele n찾o consiga encontrar a "
-"ramifica챌찾o remota, a mesclagem ser찼 importada apenas como um commit normal. "
-"Se puder encontr찼-lo, ser찼 marcado como uma mesclagem sempre que for "
-"poss챠vel (consulte a discuss찾o abaixo)."
+msgstr "Importa um projeto de um ou mais reposit처rios do GNU Arch. Ele seguir찼 as ramifica챌천es e reposit처rios dentro dos \"namespaces\" definidos pelos par창metros <arquivo/ramo> informado. Caso ele n찾o consiga encontrar a ramifica챌찾o remota, a mesclagem ser찼 importada apenas como um commit normal. Se puder encontr찼-lo, ser찼 marcado como uma mesclagem sempre que for poss챠vel (consulte a discuss찾o abaixo)."
#. type: Plain text
#: en/git-archimport.txt:27
#, priority:100
msgid "The script expects you to provide the key roots where it can start the import from an 'initial import' or 'tag' type of Arch commit. It will follow and import new branches within the provided roots."
-msgstr ""
-"O script espera que voc챗 informe as principais ra챠zes nas quais ele possa "
-"iniciar a 'importa챌찾o inicial' ou 'tag' do commit do Arch. Ele seguir찼 e "
-"importar찼 as novas ramifica챌천es dentro das ra챠zes informadas."
+msgstr "O script espera que voc챗 informe as principais ra챠zes nas quais ele possa iniciar a 'importa챌찾o inicial' ou 'tag' do commit do Arch. Ele seguir찼 e importar찼 as novas ramifica챌천es dentro das ra챠zes informadas."
#. type: Plain text
#: en/git-archimport.txt:32
#, priority:100
msgid "It expects to be dealing with one project only. If it sees branches that have different roots, it will refuse to run. In that case, edit your <archive/branch> parameters to define clearly the scope of the import."
-msgstr ""
-"Ele espera lidar apenas com um projeto apenas. Caso veja ramifica챌천es com "
-"ra챠zes diferentes, a execu챌찾o ser찼 impedida de prosseguir. Nesse caso, edite "
-"os par창metros <arquivo/ramo> para definir claramente o escopo da importa챌찾o."
+msgstr "Ele espera lidar apenas com um projeto apenas. Caso veja ramifica챌천es com ra챠zes diferentes, a execu챌찾o ser찼 impedida de prosseguir. Nesse caso, edite os par창metros <arquivo/ramo> para definir claramente o escopo da importa챌찾o."
#. type: Plain text
#: en/git-archimport.txt:37
#, priority:100
msgid "'git archimport' uses `tla` extensively in the background to access the Arch repository. Make sure you have a recent version of `tla` available in the path. `tla` must know about the repositories you pass to 'git archimport'."
-msgstr ""
-"O comando 'git archimport' utiliza o `tla` em segundo plano de forma "
-"exclusiva para acessar o reposit처rio Arch. Verifique se voc챗 tem uma vers찾o "
-"recente do `tla` dispon챠vel no caminho. O `tla` deve saber sobre os "
-"reposit처rios que voc챗 passa ao 'git archimport'."
+msgstr "O comando 'git archimport' utiliza o `tla` em segundo plano de forma exclusiva para acessar o reposit처rio Arch. Verifique se voc챗 tem uma vers찾o recente do `tla` dispon챠vel no caminho. O `tla` deve saber sobre os reposit처rios que voc챗 passa ao 'git archimport'."
#. type: Plain text
#: en/git-archimport.txt:42
#, priority:100
msgid "For the initial import, 'git archimport' expects to find itself in an empty directory. To follow the development of a project that uses Arch, rerun 'git archimport' with the same parameters as the initial import to perform incremental imports."
-msgstr ""
-"Para a importa챌찾o inicial, o comando 'git archimport' espera se encontrar em "
-"um diret처rio vazio. Para acompanhar o desenvolvimento de um projeto que "
-"utilize o Arch, execute novamente o comando 'git archimport' com os mesmos "
-"par창metros que a importa챌찾o inicial para que as importa챌천es incrementais "
-"possam ser executadas."
+msgstr "Para a importa챌찾o inicial, o comando 'git archimport' espera se encontrar em um diret처rio vazio. Para acompanhar o desenvolvimento de um projeto que utilize o Arch, execute novamente o comando 'git archimport' com os mesmos par창metros que a importa챌찾o inicial para que as importa챌천es incrementais possam ser executadas."
#. type: Plain text
#: en/git-archimport.txt:49
#, priority:100
msgid "While 'git archimport' will try to create sensible branch names for the archives that it imports, it is also possible to specify Git branch names manually. To do so, write a Git branch name after each <archive/branch> parameter, separated by a colon. This way, you can shorten the Arch branch names and convert Arch jargon to Git jargon, for example mapping a \"PROJECT{litdd}devo{litdd}VERSION\" branch to \"master\"."
-msgstr ""
-"Enquanto o 'git archimport' tentar찼 criar os nomes exatos das ramifica챌천es "
-"para os arquivos importados, tamb챕m 챕 poss챠vel especificar os nomes das "
-"ramifica챌천es do Git manualmente. Para fazer isso, escreva um nome do ramo "
-"Git ap처s cada par창metro <arquivo/ramo>, separado por dois pontos. Dessa "
-"forma, voc챗 pode encurtar os nomes das ramifica챌천es do Arch e converter o "
-"jarg찾o do Arch para o Git mapeando uma ramifica챌찾o \"PROJECT"
-"{litdd}devo{litdd}VERSION\" para \"master\" por exemplo."
+msgstr "Enquanto o 'git archimport' tentar찼 criar os nomes exatos das ramifica챌천es para os arquivos importados, tamb챕m 챕 poss챠vel especificar os nomes das ramifica챌천es do Git manualmente. Para fazer isso, escreva um nome do ramo Git ap처s cada par창metro <arquivo/ramo>, separado por dois pontos. Dessa forma, voc챗 pode encurtar os nomes das ramifica챌천es do Arch e converter o jarg찾o do Arch para o Git mapeando uma ramifica챌찾o \"PROJECT{litdd}devo{litdd}VERSION\" para \"master\" por exemplo."
#. type: Plain text
#: en/git-archimport.txt:54
#, priority:100
msgid "Associating multiple Arch branches to one Git branch is possible; the result will make the most sense only if no commits are made to the first branch, after the second branch is created. Still, this is useful to convert Arch repositories that had been rotated periodically."
-msgstr ""
-"횋 poss챠vel associar as v찼rias ramifica챌천es do Arch em uma ramifica챌찾o do Git;"
-" o resultado far찼 mais sentido quando nenhum commit for feito na primeira "
-"ramifica챌찾o, depois que o segundo ramo for criado. Ainda assim, 챕 첬til para "
-"converter os reposit처rios do Arch que foram rotacionados periodicamente."
+msgstr "횋 poss챠vel associar as v찼rias ramifica챌천es do Arch em uma ramifica챌찾o do Git; o resultado far찼 mais sentido quando nenhum commit for feito na primeira ramifica챌찾o, depois que o segundo ramo for criado. Ainda assim, 챕 첬til para converter os reposit처rios do Arch que foram rotacionados periodicamente."
#. type: Title -
#: en/git-archimport.txt:57
@@ -9238,23 +7676,13 @@ msgstr "MESCLAGENS"
#: en/git-archimport.txt:63
#, priority:100
msgid "Patch merge data from Arch is used to mark merges in Git as well. Git does not care much about tracking patches, and only considers a merge when a branch incorporates all the commits since the point they forked. The end result is that Git will have a good idea of how far branches have diverged. So the import process does lose some patch-trading metadata."
-msgstr ""
-"Os dados da mesclagem dos patches do Arch tamb챕m s찾o utilizados para marcar "
-"as mesclagens no Git. O Git n찾o se importa muito com o rastreamento do "
-"patches, apenas considera uma mesclagem quando um ramo incorpora todos os "
-"commits desde o ponto em que eles foram bifurcados. O resultado final 챕 que "
-"o Git ter찼 uma boa ideia de qu찾o longe as ramifica챌천es divergem. Portanto, o "
-"processo de importa챌찾o perde alguns metadados durante a negocia챌찾o dos "
-"patches."
+msgstr "Os dados da mesclagem dos patches do Arch tamb챕m s찾o utilizados para marcar as mesclagens no Git. O Git n찾o se importa muito com o rastreamento do patches, apenas considera uma mesclagem quando um ramo incorpora todos os commits desde o ponto em que eles foram bifurcados. O resultado final 챕 que o Git ter찼 uma boa ideia de qu찾o longe as ramifica챌천es divergem. Portanto, o processo de importa챌찾o perde alguns metadados durante a negocia챌찾o dos patches."
#. type: Plain text
#: en/git-archimport.txt:67
#, priority:100
msgid "Fortunately, when you try and merge branches imported from Arch, Git will find a good merge base, and it has a good chance of identifying patches that have been traded out-of-sequence between the branches."
-msgstr ""
-"Felizmente, quando voc챗 tenta mesclar as ramifica챌천es importadas do Arch, o "
-"Git encontrar찼 uma boa base para a mesclagem e tem uma boa chance de "
-"identificar quais os patches foram trocados fora da sequ챗ncia entre os ramos."
+msgstr "Felizmente, quando voc챗 tenta mesclar as ramifica챌천es importadas do Arch, o Git encontrar찼 uma boa base para a mesclagem e tem uma boa chance de identificar quais os patches foram trocados fora da sequ챗ncia entre os ramos."
#. type: Plain text
#: en/git-archimport.txt:73
@@ -9278,19 +7706,13 @@ msgstr "-T"
#: en/git-archimport.txt:80
#, priority:100
msgid "Many tags. Will create a tag for every commit, reflecting the commit name in the Arch repository."
-msgstr ""
-"Muitas tags. Criar찼 uma tag para cada commit, refletindo o nome do commit no "
-"reposit처rio do Arch."
+msgstr "Muitas tags. Criar찼 uma tag para cada commit, refletindo o nome do commit no reposit처rio do Arch."
#. type: Plain text
#: en/git-archimport.txt:85
#, priority:100
msgid "Use the fast patchset import strategy. This can be significantly faster for large trees, but cannot handle directory renames or permissions changes. The default strategy is slow and safe."
-msgstr ""
-"Use a estrat챕gia de importa챌찾o r찼pida no conjunto dos patches. Isso pode "
-"acelerar o processo significativamente em 찼rvores muito grandes, no entanto "
-"n찾o pode lidar com as renomea챌천es dos diret처rios ou das altera챌천es das "
-"permiss천es. A estrat챕gia predefinida 챕 lenta e segura."
+msgstr "Use a estrat챕gia de importa챌찾o r찼pida no conjunto dos patches. Isso pode acelerar o processo significativamente em 찼rvores muito grandes, no entanto n찾o pode lidar com as renomea챌천es dos diret처rios ou das altera챌천es das permiss천es. A estrat챕gia predefinida 챕 lenta e segura."
#. type: Labeled list
#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:214 en/git-ls-files.txt:47 en/git-merge-index.txt:29
@@ -9302,14 +7724,7 @@ msgstr "-o"
#: en/git-archimport.txt:93
#, priority:100
msgid "Use this for compatibility with old-style branch names used by earlier versions of 'git archimport'. Old-style branch names were category{litdd}branch, whereas new-style branch names are archive,category{litdd}branch{litdd}version. In both cases, names given on the command-line will override the automatically-generated ones."
-msgstr ""
-"Use isso para ter a compatibilidade com os nomes das ramifica챌천es do estilo "
-"antigo utilizados pelas vers천es anteriores ao comando 'git archimport'. Os "
-"nomes das ramifica챌천es no estilo antigo foram as ramifica챌천es da categoria "
-"{litdd}, enquanto os nomes das ramifica챌천es no novo estilo s찾o \"archive\", "
-"category{litdd}branch{litdd}version. Nos dois casos, os nomes dos "
-"fornecidos na linha de comando substituir찾o os que forem gerados "
-"automaticamente."
+msgstr "Use isso para ter a compatibilidade com os nomes das ramifica챌천es do estilo antigo utilizados pelas vers천es anteriores ao comando 'git archimport'. Os nomes das ramifica챌천es no estilo antigo foram as ramifica챌천es da categoria {litdd}, enquanto os nomes das ramifica챌천es no novo estilo s찾o \"archive\", category{litdd}branch{litdd}version. Nos dois casos, os nomes dos fornecidos na linha de comando substituir찾o os que forem gerados automaticamente."
#. type: Labeled list
#: en/git-archimport.txt:94
@@ -9321,18 +7736,13 @@ msgstr "-D <profundidade>"
#: en/git-archimport.txt:98
#, priority:100
msgid "Follow merge ancestry and attempt to import trees that have been merged from. Specify a depth greater than 1 if patch logs have been pruned."
-msgstr ""
-"Siga a mesclagem de ascend챗ncia e tente importar as 찼rvores das quais foram "
-"mescladas. Informe uma profundidade maior que 1 caso os registros logs do "
-"patch tenham sido removidos."
+msgstr "Siga a mesclagem de ascend챗ncia e tente importar as 찼rvores das quais foram mescladas. Informe uma profundidade maior que 1 caso os registros logs do patch tenham sido removidos."
#. type: Plain text
#: en/git-archimport.txt:102
#, priority:100
msgid "Attempt to auto-register archives at `http://mirrors.sourcecontrol.net` This is particularly useful with the -D option."
-msgstr ""
-"Tente registrar automaticamente os arquivos em `http://mirrors.sourcecontrol."
-"net` muito 첬til se utilizado com a op챌찾o `-D`."
+msgstr "Tente registrar automaticamente os arquivos em `http://mirrors.sourcecontrol.net` muito 첬til se utilizado com a op챌찾o `-D`."
#. type: Labeled list
#: en/git-archimport.txt:103
@@ -9368,8 +7778,7 @@ msgstr "git-archive(1)"
#: en/git-archive.txt:7
#, priority:100
msgid "git-archive - Create an archive of files from a named tree"
-msgstr ""
-"git-archive - Cria um arquivo dos arquivos vindos de uma determinada 찼rvore"
+msgstr "git-archive - Cria um arquivo dos arquivos vindos de uma determinada 찼rvore"
#. type: Plain text
#: en/git-archive.txt:16
@@ -9389,24 +7798,13 @@ msgstr ""
#: en/git-archive.txt:23
#, priority:100
msgid "Creates an archive of the specified format containing the tree structure for the named tree, and writes it out to the standard output. If <prefix> is specified it is prepended to the filenames in the archive."
-msgstr ""
-"Cria um arquivo no formato informado que contenha uma estrutura de "
-"determinada 찼rvore e grava na sa챠da predefinida. Caso o `<prefixo>` seja "
-"utilizado, ele ser찼 anexado aos nomes dos arquivos no arquivo."
+msgstr "Cria um arquivo no formato informado que contenha uma estrutura de determinada 찼rvore e grava na sa챠da predefinida. Caso o `<prefixo>` seja utilizado, ele ser찼 anexado aos nomes dos arquivos no arquivo."
#. type: Plain text
#: en/git-archive.txt:32
#, priority:100
msgid "'git archive' behaves differently when given a tree ID versus when given a commit ID or tag ID. In the first case the current time is used as the modification time of each file in the archive. In the latter case the commit time as recorded in the referenced commit object is used instead. Additionally the commit ID is stored in a global extended pax header if the tar format is used; it can be extracted using 'git get-tar-commit-id'. In ZIP files it is stored as a file comment."
-msgstr ""
-"O comando 'git archive' se comporta de maneira diferente quando recebe um ID "
-"da 찼rvore e quando recebe um ID do commit ou o ID de uma tag. No primeiro "
-"caso, a hora atual 챕 utilizada como a hora da altera챌찾o de cada arquivo no "
-"arquivo. Neste 첬ltimo caso, a hora que foi registrada no objeto do commit "
-"ser찼 utilizado. Al챕m disso, o ID do commit 챕 armazenado em um cabe챌alho "
-"global estendido pax caso o formato tar seja utilizado; pode ser extra챠do "
-"utilizando o comando 'git get-tar-commit-id'. Nos arquivos ZIP, ele 챕 "
-"armazenado como um coment찼rio do arquivo."
+msgstr "O comando 'git archive' se comporta de maneira diferente quando recebe um ID da 찼rvore e quando recebe um ID do commit ou o ID de uma tag. No primeiro caso, a hora atual 챕 utilizada como a hora da altera챌찾o de cada arquivo no arquivo. Neste 첬ltimo caso, a hora que foi registrada no objeto do commit ser찼 utilizado. Al챕m disso, o ID do commit 챕 armazenado em um cabe챌alho global estendido pax caso o formato tar seja utilizado; pode ser extra챠do utilizando o comando 'git get-tar-commit-id'. Nos arquivos ZIP, ele 챕 armazenado como um coment찼rio do arquivo."
#. type: Labeled list
#: en/git-archive.txt:36
@@ -9418,12 +7816,7 @@ msgstr "--format=<fmt>"
#: en/git-archive.txt:42
#, priority:100
msgid "Format of the resulting archive: 'tar' or 'zip'. If this option is not given, and the output file is specified, the format is inferred from the filename if possible (e.g. writing to \"foo.zip\" makes the output to be in the zip format). Otherwise the output format is `tar`."
-msgstr ""
-"Formato do arquivo resultante: 'tar' ou 'zip'. Caso esta op챌찾o n찾o seja "
-"utilizada e o arquivo na sa챠da for definido, o tipo do formato ser찼 deduzido "
-"atrav챕s do nome do arquivo, quando for poss챠vel (ao gravar como \"foo.zip\" "
-"faz com que a sa챠da esteja no formato zip por exemplo). Caso contr찼rio, o "
-"formato gerado ser찼 `tar`."
+msgstr "Formato do arquivo resultante: 'tar' ou 'zip'. Caso esta op챌찾o n찾o seja utilizada e o arquivo na sa챠da for definido, o tipo do formato ser찼 deduzido atrav챕s do nome do arquivo, quando for poss챠vel (ao gravar como \"foo.zip\" faz com que a sa챠da esteja no formato zip por exemplo). Caso contr찼rio, o formato gerado ser찼 `tar`."
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:165 en/git-show-branch.txt:80 en/git-tag.txt:100
@@ -9477,9 +7870,7 @@ msgstr "--worktree-attributes"
#: en/git-archive.txt:61
#, priority:100
msgid "Look for attributes in .gitattributes files in the working tree as well (see <<ATTRIBUTES>>)."
-msgstr ""
-"Procure pelos atributos nos arquivos `.gitattributes` da 찼rvore de trabalho ("
-"consulte <<ATRIBUTOS>>)."
+msgstr "Procure pelos atributos nos arquivos `.gitattributes` da 찼rvore de trabalho (consulte <<ATRIBUTOS>>)."
#. type: Labeled list
#: en/git-archive.txt:62
@@ -9491,9 +7882,7 @@ msgstr "<extra>"
#: en/git-archive.txt:65
#, priority:100
msgid "This can be any options that the archiver backend understands. See next section."
-msgstr ""
-"Pode ser qualquer op챌찾o que seja compat챠vel com o arquivador. Consulte a "
-"pr처xima se챌찾o."
+msgstr "Pode ser qualquer op챌찾o que seja compat챠vel com o arquivador. Consulte a pr처xima se챌찾o."
#. type: Labeled list
#: en/git-archive.txt:66
@@ -9505,11 +7894,7 @@ msgstr "--remote=<repo>"
#: en/git-archive.txt:72
#, priority:100
msgid "Instead of making a tar archive from the local repository, retrieve a tar archive from a remote repository. Note that the remote repository may place restrictions on which sha1 expressions may be allowed in `<tree-ish>`. See linkgit:git-upload-archive[1] for details."
-msgstr ""
-"Em vez de criar um arquivo tar do reposit처rio local, recupere um arquivo tar "
-"de um reposit처rio remoto. Observe que o reposit처rio remoto pode colocar "
-"restri챌천es sobre quais as express천es sha1 podem ser permitidas no `<tree-"
-"ish>`. Para mais detalhes consulte linkgit:git-upload-archive[1]."
+msgstr "Em vez de criar um arquivo tar do reposit처rio local, recupere um arquivo tar de um reposit처rio remoto. Observe que o reposit처rio remoto pode colocar restri챌천es sobre quais as express천es sha1 podem ser permitidas no `<tree-ish>`. Para mais detalhes consulte linkgit:git-upload-archive[1]."
#. type: Labeled list
#: en/git-archive.txt:73
@@ -9521,9 +7906,7 @@ msgstr "--exec=<git-upload-archive>"
#: en/git-archive.txt:76
#, priority:100
msgid "Used with --remote to specify the path to the 'git-upload-archive' on the remote side."
-msgstr ""
-"Utilizado com `--remote` para informar o caminho para o 'git-upload-archive' "
-"no lado remoto."
+msgstr "Utilizado com `--remote` para informar o caminho para o 'git-upload-archive' no lado remoto."
#. type: Labeled list
#: en/git-archive.txt:77 en/git-checkout.txt:350 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:351
@@ -9547,10 +7930,7 @@ msgstr "<caminho>"
#: en/git-archive.txt:84
#, priority:100
msgid "Without an optional path parameter, all files and subdirectories of the current working directory are included in the archive. If one or more paths are specified, only these are included."
-msgstr ""
-"Sem um par창metro opcional do caminho, todos os arquivos e os subdiret처rios "
-"do diret처rio de trabalho atual ser찾o inclu챠dos no arquivo. Caso um ou mais "
-"caminhos sejam informados, apenas estes, ser찾o inclu챠dos."
+msgstr "Sem um par창metro opcional do caminho, todos os arquivos e os subdiret처rios do diret처rio de trabalho atual ser찾o inclu챠dos no arquivo. Caso um ou mais caminhos sejam informados, apenas estes, ser찾o inclu챠dos."
#. type: Title -
#: en/git-archive.txt:86
@@ -9586,9 +7966,7 @@ msgstr "-9"
#: en/git-archive.txt:95
#, priority:100
msgid "Highest and slowest compression level. You can specify any number from 1 to 9 to adjust compression speed and ratio."
-msgstr ""
-"N챠veis de compress찾o mais altos e baixos. Voc챗 pode utilizar qualquer "
-"n첬mero entre 1 e 9 para ajustar a velocidade e a taxa de compress찾o."
+msgstr "N챠veis de compress찾o mais altos e baixos. Voc챗 pode utilizar qualquer n첬mero entre 1 e 9 para ajustar a velocidade e a taxa de compress찾o."
#. type: Labeled list
#: en/git-archive.txt:100
@@ -9600,13 +7978,7 @@ msgstr "tar.umask"
#: en/git-archive.txt:107
#, priority:100
msgid "This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the world write bit. The special value \"user\" indicates that the archiving user's umask will be used instead. See umask(2) for details. If `--remote` is used then only the configuration of the remote repository takes effect."
-msgstr ""
-"Essa vari찼vel pode ser utilizada para restringir os bits de permiss찾o das "
-"entradas do arquivo tar. A predefini챌찾o 챕 0002, que desliga o bit de "
-"grava챌찾o global. O valor especial \"user\" (usu찼rio) indica que o umask do "
-"arquivo do usu찼rio ser찼 utilizado. Para mais detalhes consulte umask(2). "
-"Caso `--remote` seja utilizado, somente a configura챌찾o do reposit처rio remoto "
-"entrar찼 em vigor."
+msgstr "Essa vari찼vel pode ser utilizada para restringir os bits de permiss찾o das entradas do arquivo tar. A predefini챌찾o 챕 0002, que desliga o bit de grava챌찾o global. O valor especial \"user\" (usu찼rio) indica que o umask do arquivo do usu찼rio ser찼 utilizado. Para mais detalhes consulte umask(2). Caso `--remote` seja utilizado, somente a configura챌찾o do reposit처rio remoto entrar찼 em vigor."
#. type: Labeled list
#: en/git-archive.txt:108
@@ -9618,23 +7990,13 @@ msgstr "tar.<formato>.comando"
#: en/git-archive.txt:117
#, priority:100
msgid "This variable specifies a shell command through which the tar output generated by `git archive` should be piped. The command is executed using the shell with the generated tar file on its standard input, and should produce the final output on its standard output. Any compression-level options will be passed to the command (e.g., \"-9\"). An output file with the same extension as `<format>` will be use this format if no other format is given."
-msgstr ""
-"Esta vari찼vel define um comando shell por onde o tar ser찼 gerado pelo `git "
-"archive` atrav챕s de um \"pipe\". O comando 챕 executado utilizando o shell "
-"com o arquivo tar gerado na sua entrada predefinida e deve produzir a sa챠da "
-"final na sua sa챠da predefinida. Quaisquer op챌천es do n챠vel de compress찾o "
-"ser찾o passadas ao comando (\"-9\" por exemplo). Um arquivo gerado com a "
-"mesma extens찾o que `<formato>`, este ser찼 utilizado caso nenhum outro seja "
-"informado."
+msgstr "Esta vari찼vel define um comando shell por onde o tar ser찼 gerado pelo `git archive` atrav챕s de um \"pipe\". O comando 챕 executado utilizando o shell com o arquivo tar gerado na sua entrada predefinida e deve produzir a sa챠da final na sua sa챠da predefinida. Quaisquer op챌천es do n챠vel de compress찾o ser찾o passadas ao comando (\"-9\" por exemplo). Um arquivo gerado com a mesma extens찾o que `<formato>`, este ser찼 utilizado caso nenhum outro seja informado."
#. type: Plain text
#: en/git-archive.txt:120
#, priority:100
msgid "The \"tar.gz\" and \"tgz\" formats are defined automatically and default to `gzip -cn`. You may override them with custom commands."
-msgstr ""
-"Os formatos \"tar.gz\" e \"tgz\" s찾o definidos automaticamente e "
-"predefinidos para `gzip -cn`. Voc챗 pode substitu챠-los com comandos "
-"personalizados."
+msgstr "Os formatos \"tar.gz\" e \"tgz\" s찾o definidos automaticamente e predefinidos para `gzip -cn`. Voc챗 pode substitu챠-los com comandos personalizados."
#. type: Labeled list
#: en/git-archive.txt:121
@@ -9646,11 +8008,7 @@ msgstr "tar.<formato>.remoto"
#: en/git-archive.txt:126
#, priority:100
msgid "If true, enable `<format>` for use by remote clients via linkgit:git-upload-archive[1]. Defaults to false for user-defined formats, but true for the \"tar.gz\" and \"tgz\" formats."
-msgstr ""
-"Se for \"true\", ative o `<formato>` para que seja utilizado por clientes "
-"remotos atrav챕s do linkgit:git-upload-archive[1]. A predefini챌찾o 챕 \"false\" "
-"para os formatos definidos pelo usu찼rio, mas verdadeiro para os formatos "
-"\"tar.gz\" e \"tgz\"."
+msgstr "Se for \"true\", ative o `<formato>` para que seja utilizado por clientes remotos atrav챕s do linkgit:git-upload-archive[1]. A predefini챌찾o 챕 \"false\" para os formatos definidos pelo usu찼rio, mas verdadeiro para os formatos \"tar.gz\" e \"tgz\"."
#. type: Title -
#: en/git-archive.txt:129
@@ -9668,10 +8026,7 @@ msgstr "export-ignore"
#: en/git-archive.txt:134
#, priority:100
msgid "Files and directories with the attribute export-ignore won't be added to archive files. See linkgit:gitattributes[5] for details."
-msgstr ""
-"Arquivos e os diret처rios com o atributo `export-ignore` n찾o ser찾o "
-"adicionados aos arquivos compactados. Para mais detalhes consulte "
-"linkgit:gitattributes[5]."
+msgstr "Arquivos e os diret처rios com o atributo `export-ignore` n찾o ser찾o adicionados aos arquivos compactados. Para mais detalhes consulte linkgit:gitattributes[5]."
#. type: Labeled list
#: en/git-archive.txt:135
@@ -9683,24 +8038,13 @@ msgstr "export-subst"
#: en/git-archive.txt:139
#, priority:100
msgid "If the attribute export-subst is set for a file then Git will expand several placeholders when adding this file to an archive. See linkgit:gitattributes[5] for details."
-msgstr ""
-"Caso o atributo `export-subst` esteja definido para um arquivo, o Git "
-"expandir찼 os v찼rios espa챌os reservados ao adicionar este arquivo em um "
-"arquivo. Para mais detalhes consulte linkgit:gitattributes[5]."
+msgstr "Caso o atributo `export-subst` esteja definido para um arquivo, o Git expandir찼 os v찼rios espa챌os reservados ao adicionar este arquivo em um arquivo. Para mais detalhes consulte linkgit:gitattributes[5]."
#. type: Plain text
#: en/git-archive.txt:147
#, priority:100
msgid "Note that attributes are by default taken from the `.gitattributes` files in the tree that is being archived. If you want to tweak the way the output is generated after the fact (e.g. you committed without adding an appropriate export-ignore in its `.gitattributes`), adjust the checked out `.gitattributes` file as necessary and use `--worktree-attributes` option. Alternatively you can keep necessary attributes that should apply while archiving any tree in your `$GIT_DIR/info/attributes` file."
-msgstr ""
-"Observe que, por predefini챌찾o, os atributos s찾o obtidos atrav챕s dos arquivos "
-"`.gitattributes` na 찼rvore que est찼 sendo arquivada. Caso queira ajustar a "
-"maneira como a sa챠da 챕 gerada ap처s o fato (voc챗 fez um commit sem adicionar "
-"um `export-ignore` adequado no seus `.gitattributes` por exemplo), ajuste o "
-"arquivo `.gitattributes` conforme seja necess찼rio e utilize a op챌찾o "
-"`--worktree-attributes`. Como alternativa, voc챗 pode manter os atributos "
-"necess찼rios que devem ser aplicados ao arquivar qualquer 찼rvore no seu "
-"arquivo `$GIT_DIR/info/attributes`."
+msgstr "Observe que, por predefini챌찾o, os atributos s찾o obtidos atrav챕s dos arquivos `.gitattributes` na 찼rvore que est찼 sendo arquivada. Caso queira ajustar a maneira como a sa챠da 챕 gerada ap처s o fato (voc챗 fez um commit sem adicionar um `export-ignore` adequado no seus `.gitattributes` por exemplo), ajuste o arquivo `.gitattributes` conforme seja necess찼rio e utilize a op챌찾o `--worktree-attributes`. Como alternativa, voc챗 pode manter os atributos necess찼rios que devem ser aplicados ao arquivar qualquer 찼rvore no seu arquivo `$GIT_DIR/info/attributes`."
#. type: Labeled list
#: en/git-archive.txt:150
@@ -9712,9 +8056,7 @@ msgstr "`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf
#: en/git-archive.txt:155
#, priority:100
msgid "Create a tar archive that contains the contents of the latest commit on the current branch, and extract it in the `/var/tmp/junk` directory."
-msgstr ""
-"Crie um arquivo tar com o conte첬do do commit mais recente no ramo atual e "
-"extraia-o no diret처rio `/var/tmp/junk`."
+msgstr "Crie um arquivo tar com o conte첬do do commit mais recente no ramo atual e extraia-o no diret처rio `/var/tmp/junk`."
#. type: Labeled list
#: en/git-archive.txt:156
@@ -9762,9 +8104,7 @@ msgstr "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git-
#: en/git-archive.txt:172
#, priority:100
msgid "Create a compressed tarball for v1.4.0 release, but without a global extended pax header."
-msgstr ""
-"Crie um tarball compactado para a vers찾o v1.4.0, por챕m sem um cabe챌alho pax "
-"global estendido."
+msgstr "Crie um tarball compactado para a vers찾o v1.4.0, por챕m sem um cabe챌alho pax global estendido."
#. type: Labeled list
#: en/git-archive.txt:173
@@ -9776,9 +8116,7 @@ msgstr "`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1
#: en/git-archive.txt:177
#, priority:100
msgid "Put everything in the current head's Documentation/ directory into 'git-1.4.0-docs.zip', with the prefix 'git-docs/'."
-msgstr ""
-"Coloque tudo no diret처rio Documentation/ do cabe챌alho atual no arquivo 'git-1"
-".4.0-docs.zip', com o prefixo 'git-docs/'."
+msgstr "Coloque tudo no diret처rio Documentation/ do cabe챌alho atual no arquivo 'git-1.4.0-docs.zip', com o prefixo 'git-docs/'."
#. type: Labeled list
#: en/git-archive.txt:178
@@ -9790,10 +8128,7 @@ msgstr "`git archive -o latest.zip HEAD`"
#: en/git-archive.txt:183
#, priority:100
msgid "Create a Zip archive that contains the contents of the latest commit on the current branch. Note that the output format is inferred by the extension of the output file."
-msgstr ""
-"Crie um arquivo Zip com o conte첬do do commit mais recente na ramifica챌찾o "
-"atual. Observe que o formato gerado 챕 deduzido atrav챕s da extens찾o do "
-"arquivo utilizado na sa챠da."
+msgstr "Crie um arquivo Zip com o conte첬do do commit mais recente na ramifica챌찾o atual. Observe que o formato gerado 챕 deduzido atrav챕s da extens찾o do arquivo utilizado na sa챠da."
#. type: Labeled list
#: en/git-archive.txt:184
@@ -9805,10 +8140,7 @@ msgstr "`git config tar.tar.xz.command \"xz -c\"`"
#: en/git-archive.txt:189
#, priority:100
msgid "Configure a \"tar.xz\" format for making LZMA-compressed tarfiles. You can use it specifying `--format=tar.xz`, or by creating an output file like `-o foo.tar.xz`."
-msgstr ""
-"Configure um formato \"tar.xz\" para criar arquivo tarfiles compactados com "
-"LZMA. Voc챗 pode utiliz찼-lo utilizando a op챌찾o `--format=tar.xz` ou criando "
-"um arquivo gerado com `-o foo.tar.xz`."
+msgstr "Configure um formato \"tar.xz\" para criar arquivo tarfiles compactados com LZMA. Voc챗 pode utiliz찼-lo utilizando a op챌찾o `--format=tar.xz` ou criando um arquivo gerado com `-o foo.tar.xz`."
#. type: Plain text
#: en/git-archive.txt:194
@@ -9826,9 +8158,7 @@ msgstr "git-bisect(1)"
#: en/git-bisect.txt:7
#, priority:100
msgid "git-bisect - Use binary search to find the commit that introduced a bug"
-msgstr ""
-"git-bisect - Utilize a pesquisa bin찼ria para localizar o commit que "
-"introduziu um bug"
+msgstr "git-bisect - Utilize a pesquisa bin찼ria para localizar o commit que introduziu um bug"
#. type: Plain text
#: en/git-bisect.txt:13
@@ -9840,9 +8170,7 @@ msgstr "'git bisect' <subcomando> <op챌천es>\n"
#: en/git-bisect.txt:18 en/git-reflog.txt:18
#, priority:100
msgid "The command takes various subcommands, and different options depending on the subcommand:"
-msgstr ""
-"O comando assume v찼rios subcomandos das diferentes op챌천es dependendo do "
-"subcomando:"
+msgstr "O comando assume v찼rios subcomandos das diferentes op챌천es dependendo do subcomando:"
#. type: Plain text
#: en/git-bisect.txt:31
@@ -9878,44 +8206,25 @@ msgstr ""
#: en/git-bisect.txt:40
#, priority:100
msgid "This command uses a binary search algorithm to find which commit in your project's history introduced a bug. You use it by first telling it a \"bad\" commit that is known to contain the bug, and a \"good\" commit that is known to be before the bug was introduced. Then `git bisect` picks a commit between those two endpoints and asks you whether the selected commit is \"good\" or \"bad\". It continues narrowing down the range until it finds the exact commit that introduced the change."
-msgstr ""
-"Este comando utiliza um algoritmo de pesquisa bin찼ria para descobrir qual o "
-"commit no hist처rico do seu projeto introduziu um \"bug\" (problema). Voc챗 o "
-"utiliza informando primeiro a um commit \"bad\" (ruim) que 챕 conhecido por "
-"conter o bug e um commit \"good\" (bom) conhecido antes da introdu챌찾o do "
-"bug. Ent찾o o comando `git bisect` seleciona um commit entre estes dois "
-"pontos extremos e pergunta se o commit selecionado 챕 \"bom\" ou \"ruim\". "
-"Continua estreitando o intervalo at챕 encontrar o commit exato respons찼vel "
-"pela introdu챌찾o da altera챌찾o."
+msgstr "Este comando utiliza um algoritmo de pesquisa bin찼ria para descobrir qual o commit no hist처rico do seu projeto introduziu um \"bug\" (problema). Voc챗 o utiliza informando primeiro a um commit \"bad\" (ruim) que 챕 conhecido por conter o bug e um commit \"good\" (bom) conhecido antes da introdu챌찾o do bug. Ent찾o o comando `git bisect` seleciona um commit entre estes dois pontos extremos e pergunta se o commit selecionado 챕 \"bom\" ou \"ruim\". Continua estreitando o intervalo at챕 encontrar o commit exato respons찼vel pela introdu챌찾o da altera챌찾o."
#. type: Plain text
#: en/git-bisect.txt:47
#, priority:100
msgid "In fact, `git bisect` can be used to find the commit that changed *any* property of your project; e.g., the commit that fixed a bug, or the commit that caused a benchmark's performance to improve. To support this more general usage, the terms \"old\" and \"new\" can be used in place of \"good\" and \"bad\", or you can choose your own terms. See section \"Alternate terms\" below for more information."
-msgstr ""
-"De fato, o comando `git bisect` pode ser utilizado para encontrar o commit "
-"que alterou *qualquer* propriedade do seu projeto; um commit que corrigiu um "
-"problema ou um commit que fez com que o desempenho de um benchmark "
-"melhorasse por exemplo. Para dar apoio a nesta utiliza챌찾o mais gen챕rica, os "
-"termos \"old\" (antigo) e \"new\" (novo) podem ser utilizados no lugar de "
-"\"good\" (bom) e \"bad\" (ruim), ou escolha os seus pr처prios termos. "
-"Consulte a se챌찾o \"Termos alternativos\" abaixo para obter mais informa챌천es."
+msgstr "De fato, o comando `git bisect` pode ser utilizado para encontrar o commit que alterou *qualquer* propriedade do seu projeto; um commit que corrigiu um problema ou um commit que fez com que o desempenho de um benchmark melhorasse por exemplo. Para dar apoio a nesta utiliza챌찾o mais gen챕rica, os termos \"old\" (antigo) e \"new\" (novo) podem ser utilizados no lugar de \"good\" (bom) e \"bad\" (ruim), ou escolha os seus pr처prios termos. Consulte a se챌찾o \"Termos alternativos\" abaixo para obter mais informa챌천es."
#. type: Title ~
#: en/git-bisect.txt:49
#, no-wrap, priority:100
msgid "Basic bisect commands: start, bad, good"
-msgstr ""
-"Comandos \"bisect\" b찼sicos : `start` (come챌ar), `bad` (ruim), `good` (bom)"
+msgstr "Comandos \"bisect\" b찼sicos : `start` (come챌ar), `bad` (ruim), `good` (bom)"
#. type: Plain text
#: en/git-bisect.txt:54
#, priority:100
msgid "As an example, suppose you are trying to find the commit that broke a feature that was known to work in version `v2.6.13-rc2` of your project. You start a bisect session as follows:"
-msgstr ""
-"Como exemplo, suponha que voc챗 esteja tentando encontrar um commit que "
-"estragou um recurso que funcionava na vers찾o `v2.6.13-rc2` do seu projeto. "
-"Voc챗 come챌a uma se챌찾o \"besect\" como demonstrado abaixo:"
+msgstr "Como exemplo, suponha que voc챗 esteja tentando encontrar um commit que estragou um recurso que funcionava na vers찾o `v2.6.13-rc2` do seu projeto. Voc챗 come챌a uma se챌찾o \"besect\" como demonstrado abaixo:"
#. type: delimited block -
#: en/git-bisect.txt:59
@@ -9933,10 +8242,7 @@ msgstr ""
#: en/git-bisect.txt:64
#, priority:100
msgid "Once you have specified at least one bad and one good commit, `git bisect` selects a commit in the middle of that range of history, checks it out, and outputs something similar to the following:"
-msgstr ""
-"Uma vez que voc챗 tenha utilizado pelo menos um commit ruim e um commit bom, "
-"o comando `git bisect` seleciona um commit no meio deste intervalo do "
-"hist처rico, faz o check-out e produz algo como por exemplo:"
+msgstr "Uma vez que voc챗 tenha utilizado pelo menos um commit ruim e um commit bom, o comando `git bisect` seleciona um commit no meio deste intervalo do hist처rico, faz o check-out e produz algo como por exemplo:"
#. type: delimited block -
#: en/git-bisect.txt:67
@@ -9948,9 +8254,7 @@ msgstr "Bisecting: 675 revis천es deixadas para testar depois disso (aproximadame
#: en/git-bisect.txt:71
#, priority:100
msgid "You should now compile the checked-out version and test it. If that version works correctly, type"
-msgstr ""
-"Agora voc챗 deve compilar a vers찾o com check-out e test찼-la. Caso esta vers찾o "
-"n찾o funcione corretamente, digite"
+msgstr "Agora voc챗 deve compilar a vers찾o com check-out e test찼-la. Caso esta vers찾o n찾o funcione corretamente, digite"
#. type: delimited block -
#: en/git-bisect.txt:74
@@ -9986,19 +8290,13 @@ msgstr "Bisecting: 337 revis천es deixadas para testar depois disso (aproximadame
#: en/git-bisect.txt:91
#, priority:100
msgid "Keep repeating the process: compile the tree, test it, and depending on whether it is good or bad run `git bisect good` or `git bisect bad` to ask for the next commit that needs testing."
-msgstr ""
-"Continue repetindo o processo: compile a 찼rvore, teste-a e dependendo se ela "
-"for boa ou ruim, execute o comando `git bisect good` ou ` git bisect bad` "
-"para solicitar o pr처ximo commit que precisa ser testado."
+msgstr "Continue repetindo o processo: compile a 찼rvore, teste-a e dependendo se ela for boa ou ruim, execute o comando `git bisect good` ou ` git bisect bad` para solicitar o pr처ximo commit que precisa ser testado."
#. type: Plain text
#: en/git-bisect.txt:95
#, priority:100
msgid "Eventually there will be no more revisions left to inspect, and the command will print out a description of the first bad commit. The reference `refs/bisect/bad` will be left pointing at that commit."
-msgstr ""
-"Eventualmente, n찾o haver찼 mais revis천es a serem inspecionadas e o comando "
-"exibir찼 uma descri챌찾o do primeiro commit ruim. A refer챗ncia `refs/bisect/bad`"
-" ser찼 deixada apontando para o commit."
+msgstr "Eventualmente, n찾o haver찼 mais revis천es a serem inspecionadas e o comando exibir찼 uma descri챌찾o do primeiro commit ruim. A refer챗ncia `refs/bisect/bad` ser찼 deixada apontando para o commit."
#. type: Title ~
#: en/git-bisect.txt:98
@@ -10010,9 +8308,7 @@ msgstr "Bisect reset"
#: en/git-bisect.txt:102
#, priority:100
msgid "After a bisect session, to clean up the bisection state and return to the original HEAD, issue the following command:"
-msgstr ""
-"Para limpar a condi챌찾o geral bisse챌찾o e retornar ao `HEAD` original, execute "
-"o seguinte comando:"
+msgstr "Para limpar a condi챌찾o geral bisse챌찾o e retornar ao `HEAD` original, execute o seguinte comando:"
#. type: delimited block -
#: en/git-bisect.txt:105
@@ -10024,10 +8320,7 @@ msgstr "$ git bisect reset\n"
#: en/git-bisect.txt:110
#, priority:100
msgid "By default, this will return your tree to the commit that was checked out before `git bisect start`. (A new `git bisect start` will also do that, as it cleans up the old bisection state.)"
-msgstr ""
-"횋 predefinido que isso fa챌a com que a sua 찼rvore retorne para o commit que "
-"foi retirado antes do `git bisect start`. (Um novo `git bisect start` "
-"tamb챕m far찼 isso, pois limpa a condi챌찾o antiga da bisse챌찾o.)"
+msgstr "횋 predefinido que isso fa챌a com que a sua 찼rvore retorne para o commit que foi retirado antes do `git bisect start`. (Um novo `git bisect start` tamb챕m far찼 isso, pois limpa a condi챌찾o antiga da bisse챌찾o.)"
#. type: Plain text
#: en/git-bisect.txt:113
@@ -10045,10 +8338,7 @@ msgstr "$ git bisect reset <commit>\n"
#: en/git-bisect.txt:121
#, priority:100
msgid "For example, `git bisect reset bisect/bad` will check out the first bad revision, while `git bisect reset HEAD` will leave you on the current bisection commit and avoid switching commits at all."
-msgstr ""
-"Por exemplo, `git bisect reset bisect/bad` ir찼 verificar a primeira revis찾o "
-"ruim enquanto o `git bisect reset HEAD` deixar찼 voc챗 no commit atual da "
-"bisse챌찾o evitando a altern창ncia para outros commits."
+msgstr "Por exemplo, `git bisect reset bisect/bad` ir찼 verificar a primeira revis찾o ruim enquanto o `git bisect reset HEAD` deixar찼 voc챗 no commit atual da bisse챌찾o evitando a altern창ncia para outros commits."
#. type: Title ~
#: en/git-bisect.txt:124
@@ -10060,46 +8350,25 @@ msgstr "Termos alternativos"
#: en/git-bisect.txt:132
#, priority:100
msgid "Sometimes you are not looking for the commit that introduced a breakage, but rather for a commit that caused a change between some other \"old\" state and \"new\" state. For example, you might be looking for the commit that introduced a particular fix. Or you might be looking for the first commit in which the source-code filenames were finally all converted to your company's naming standard. Or whatever."
-msgstr ""
-"�s vezes, voc챗 n찾o est찼 procurando por um commit que introduziu um problema, "
-"mas sim um commit que causou uma altera챌찾o \"antiga\" entre alguma condi챌찾o "
-"\"nova\". Voc챗 pode estar procurando por um commit que introduziu uma "
-"corre챌찾o em espec챠fico por exemplo. Ou voc챗 pode estar procurando o primeiro "
-"commit onde os nomes dos arquivos do c처digo-fonte foram finalmente "
-"convertidos para o padr찾o de nomes da sua empresa. Ou algo assim."
+msgstr "�s vezes, voc챗 n찾o est찼 procurando por um commit que introduziu um problema, mas sim um commit que causou uma altera챌찾o \"antiga\" entre alguma condi챌찾o \"nova\". Voc챗 pode estar procurando por um commit que introduziu uma corre챌찾o em espec챠fico por exemplo. Ou voc챗 pode estar procurando o primeiro commit onde os nomes dos arquivos do c처digo-fonte foram finalmente convertidos para o padr찾o de nomes da sua empresa. Ou algo assim."
#. type: Plain text
#: en/git-bisect.txt:138
#, priority:100
msgid "In such cases it can be very confusing to use the terms \"good\" and \"bad\" to refer to \"the state before the change\" and \"the state after the change\". So instead, you can use the terms \"old\" and \"new\", respectively, in place of \"good\" and \"bad\". (But note that you cannot mix \"good\" and \"bad\" with \"old\" and \"new\" in a single session.)"
-msgstr ""
-"Nesses casos, pode ser muito confuso utilizar as op챌천es \"good\" e \"bad\" "
-"para se referir a \"condi챌찾o antes da mudan챌a\" e \"a condi챌찾o ap처s a "
-"mudan챌a\". Portanto, voc챗 pode utilizar os termos \"old\" e \"new\" "
-"respectivamente, no lugar de \"good\" e \"bad\". (Observe que n찾o 챕 poss챠vel "
-"misturar \"good\" e \"bad\" com \"old\" e \"new\" em uma 첬nica sess찾o.)"
+msgstr "Nesses casos, pode ser muito confuso utilizar as op챌천es \"good\" e \"bad\" para se referir a \"condi챌찾o antes da mudan챌a\" e \"a condi챌찾o ap처s a mudan챌a\". Portanto, voc챗 pode utilizar os termos \"old\" e \"new\" respectivamente, no lugar de \"good\" e \"bad\". (Observe que n찾o 챕 poss챠vel misturar \"good\" e \"bad\" com \"old\" e \"new\" em uma 첬nica sess찾o.)"
#. type: Plain text
#: en/git-bisect.txt:145
#, priority:100
msgid "In this more general usage, you provide `git bisect` with a \"new\" commit that has some property and an \"old\" commit that doesn't have that property. Each time `git bisect` checks out a commit, you test if that commit has the property. If it does, mark the commit as \"new\"; otherwise, mark it as \"old\". When the bisection is done, `git bisect` will report which commit introduced the property."
-msgstr ""
-"Neste uso mais geral, voc챗 utiliza o comando `git bisect` com um commit \"new"
-"\" que tem alguma propriedade e um commit \"old\" que n찾o tem nenhuma. Cada "
-"vez que o comando `git bisect` faz a verifica챌찾o de um commit, voc챗 testa se "
-"o commit tem a propriedade. Em caso afirmativo, marque o commit como \"new\";"
-" Caso contr찼rio, marque-o como \"old\". Quando a bisse챌찾o tiver sido "
-"conclu챠da, o comando `git bisect` informar찼 qual o commit que introduziu a "
-"propriedade."
+msgstr "Neste uso mais geral, voc챗 utiliza o comando `git bisect` com um commit \"new\" que tem alguma propriedade e um commit \"old\" que n찾o tem nenhuma. Cada vez que o comando `git bisect` faz a verifica챌찾o de um commit, voc챗 testa se o commit tem a propriedade. Em caso afirmativo, marque o commit como \"new\"; Caso contr찼rio, marque-o como \"old\". Quando a bisse챌찾o tiver sido conclu챠da, o comando `git bisect` informar찼 qual o commit que introduziu a propriedade."
#. type: Plain text
#: en/git-bisect.txt:149
#, priority:100
msgid "To use \"old\" and \"new\" instead of \"good\" and bad, you must run `git bisect start` without commits as argument and then run the following commands to add the commits:"
-msgstr ""
-"Para utilizar \"old\" e \"new\" em vez de \"good\" e \"bad\", voc챗 deve "
-"executar `git bisect start` sem nenhum commit e depois executar os seguintes "
-"comandos para adicionar os commits:"
+msgstr "Para utilizar \"old\" e \"new\" em vez de \"good\" e \"bad\", voc챗 deve executar `git bisect start` sem nenhum commit e depois executar os seguintes comandos para adicionar os commits:"
#. type: delimited block -
#: en/git-bisect.txt:152
@@ -10141,19 +8410,13 @@ msgstr "git bisect terms\n"
#: en/git-bisect.txt:170
#, priority:100
msgid "You can get just the old (respectively new) term with `git bisect terms --term-old` or `git bisect terms --term-good`."
-msgstr ""
-"Voc챗 pode obter apenas o termo antigo (respectivamente novo) com `git bisect "
-"terms --term-old` ou `git bisect terms --term-good`."
+msgstr "Voc챗 pode obter apenas o termo antigo (respectivamente novo) com `git bisect terms --term-old` ou `git bisect terms --term-good`."
#. type: Plain text
#: en/git-bisect.txt:175
#, ignore-ellipsis, priority:100
msgid "If you would like to use your own terms instead of \"bad\"/\"good\" or \"new\"/\"old\", you can choose any names you like (except existing bisect subcommands like `reset`, `start`, ...) by starting the bisection using"
-msgstr ""
-"Caso queira utilizar os seus pr처prios termos em vez de \"bad\"/\"good\" ou "
-"\"new\"/\"old\", escolha qualquer nome que quiser (exceto os subcomandos "
-"bisect j찼 existentes como `reset`, `start`, ...) iniciando uma bisse챌찾o "
-"utilizando"
+msgstr "Caso queira utilizar os seus pr처prios termos em vez de \"bad\"/\"good\" ou \"new\"/\"old\", escolha qualquer nome que quiser (exceto os subcomandos bisect j찼 existentes como `reset`, `start`, ...) iniciando uma bisse챌찾o utilizando"
#. type: delimited block -
#: en/git-bisect.txt:178
@@ -10165,9 +8428,7 @@ msgstr "git bisect start --term-old <termo-antigo> --term-new <novo-termo>\n"
#: en/git-bisect.txt:182
#, priority:100
msgid "For example, if you are looking for a commit that introduced a performance regression, you might use"
-msgstr ""
-"Caso esteja procurando por um commit que introduziu uma regress찾o ao "
-"desempenho, poder찼 utilizar por exemplo"
+msgstr "Caso esteja procurando por um commit que introduziu uma regress찾o ao desempenho, poder찼 utilizar por exemplo"
#. type: delimited block -
#: en/git-bisect.txt:185
@@ -10179,8 +8440,7 @@ msgstr "git bisect start --term-old fast --term-new slow\n"
#: en/git-bisect.txt:188
#, priority:100
msgid "Or if you are looking for the commit that fixed a bug, you might use"
-msgstr ""
-"Ou caso esteja procurando o commit que corrigiu um problema, voc챗 pode usar"
+msgstr "Ou caso esteja procurando o commit que corrigiu um problema, voc챗 pode usar"
#. type: delimited block -
#: en/git-bisect.txt:191
@@ -10192,9 +8452,7 @@ msgstr "git bisect start --term-new fixed --term-old broken\n"
#: en/git-bisect.txt:195
#, priority:100
msgid "Then, use `git bisect <term-old>` and `git bisect <term-new>` instead of `git bisect good` and `git bisect bad` to mark commits."
-msgstr ""
-"Ent찾o, utilize `git bisect <termo-antigo>` e `git bisect <novo-termo>` em "
-"vez de `git bisect good` e `git bisect bad` para marcar os commits."
+msgstr "Ent찾o, utilize `git bisect <termo-antigo>` e `git bisect <novo-termo>` em vez de `git bisect good` e `git bisect bad` para marcar os commits."
#. type: Title ~
#: en/git-bisect.txt:197
@@ -10206,10 +8464,7 @@ msgstr "Visualize/observe do bisect"
#: en/git-bisect.txt:202
#, priority:100
msgid "To see the currently remaining suspects in 'gitk', issue the following command during the bisection process (the subcommand `view` can be used as an alternative to `visualize`):"
-msgstr ""
-"Para ver os suspeitos restantes no 'gitk', utilize o seguinte comando "
-"durante o processo de bisse챌찾o (o `view` do subcomando pode ser utilizado "
-"como uma alternativa ao `visualize`):"
+msgstr "Para ver os suspeitos restantes no 'gitk', utilize o seguinte comando durante o processo de bisse챌찾o (o `view` do subcomando pode ser utilizado como uma alternativa ao `visualize`):"
#. type: delimited block -
#: en/git-bisect.txt:205
@@ -10221,10 +8476,7 @@ msgstr "$ git bisect visualize\n"
#: en/git-bisect.txt:210
#, priority:100
msgid "If the `DISPLAY` environment variable is not set, 'git log' is used instead. You can also give command-line options such as `-p` and `--stat`."
-msgstr ""
-"Caso a vari찼vel de ambiente `DISPLAY` n찾o seja definido, o comando 'git log' "
-"챕 utilizado em seu lugar. Voc챗 tamb챕m pode utilizar as op챌천es `-p` e "
-"`--stat` na linha de comando."
+msgstr "Caso a vari찼vel de ambiente `DISPLAY` n찾o seja definido, o comando 'git log' 챕 utilizado em seu lugar. Voc챗 tamb챕m pode utilizar as op챌천es `-p` e `--stat` na linha de comando."
#. type: delimited block -
#: en/git-bisect.txt:213
@@ -10242,9 +8494,7 @@ msgstr "Bisect log e bisect replay"
#: en/git-bisect.txt:220
#, priority:100
msgid "After having marked revisions as good or bad, issue the following command to show what has been done so far:"
-msgstr ""
-"Depois de ter marcado as revis천es como boas ou ruins, emita o seguinte "
-"comando para exibir o que foi feito at챕 agora:"
+msgstr "Depois de ter marcado as revis천es como boas ou ruins, emita o seguinte comando para exibir o que foi feito at챕 agora:"
#. type: delimited block -
#: en/git-bisect.txt:223
@@ -10256,11 +8506,7 @@ msgstr "$ git bisect log\n"
#: en/git-bisect.txt:229
#, priority:100
msgid "If you discover that you made a mistake in specifying the status of a revision, you can save the output of this command to a file, edit it to remove the incorrect entries, and then issue the following commands to return to a corrected state:"
-msgstr ""
-"Caso descubra que cometeu um erro ao especificar a condi챌찾o de uma revis찾o, "
-"챕 poss챠vel salvar o arquivo gerado em um arquivo, edit찼-lo para remover as "
-"entradas que estiverem incorretas e em seguida, utilizar os seguintes "
-"comandos para corrigir a condi챌찾o de corrigido:"
+msgstr "Caso descubra que cometeu um erro ao especificar a condi챌찾o de uma revis찾o, 챕 poss챠vel salvar o arquivo gerado em um arquivo, edit찼-lo para remover as entradas que estiverem incorretas e em seguida, utilizar os seguintes comandos para corrigir a condi챌찾o de corrigido:"
#. type: delimited block -
#: en/git-bisect.txt:233
@@ -10282,11 +8528,7 @@ msgstr "Evitando o teste de um commit"
#: en/git-bisect.txt:243
#, priority:100
msgid "If, in the middle of a bisect session, you know that the suggested revision is not a good one to test (e.g. it fails to build and you know that the failure does not have anything to do with the bug you are chasing), you can manually select a nearby commit and test that one instead."
-msgstr ""
-"Se no meio de uma sess찾o bisect, voc챗 sabe que a revis찾o sugerida n찾o 챕 boa "
-"para testar (ela falha em construir e voc챗 sabe que a falha n찾o tem nada a "
-"ver com o bug que voc챗 est찼 procurando por exemplo), 챕 poss챠vel selecionar "
-"manualmente um commit pr처ximo e test찼-lo em vez disso."
+msgstr "Se no meio de uma sess찾o bisect, voc챗 sabe que a revis찾o sugerida n찾o 챕 boa para testar (ela falha em construir e voc챗 sabe que a falha n찾o tem nada a ver com o bug que voc챗 est찼 procurando por exemplo), 챕 poss챠vel selecionar manualmente um commit pr처ximo e test찼-lo em vez disso."
#. type: Plain text
#: en/git-bisect.txt:245 en/git-tag.txt:373 en/git-bisect-lk2009.txt:914 en/git-bisect-lk2009.txt:1136 en/git-bisect-lk2009.txt:1152 en/git-bisect-lk2009.txt:1175
@@ -10314,9 +8556,7 @@ msgstr ""
#: en/git-bisect.txt:256
#, priority:100
msgid "Then compile and test the chosen revision, and afterwards mark the revision as good or bad in the usual manner."
-msgstr ""
-"Em seguida, compile, teste a revis찾o escolhida e depois marque a revis찾o da "
-"maneira usual como boa ou ruim."
+msgstr "Em seguida, compile, teste a revis찾o escolhida e depois marque a revis찾o da maneira usual como boa ou ruim."
#. type: Title ~
#: en/git-bisect.txt:258
@@ -10328,9 +8568,7 @@ msgstr "Bisect skip"
#: en/git-bisect.txt:262
#, priority:100
msgid "Instead of choosing a nearby commit by yourself, you can ask Git to do it for you by issuing the command:"
-msgstr ""
-"Em vez de escolher um commit pr처ximo, 챕 poss챠vel pedir ao Git para fazer "
-"isso por voc챗, utilizando o comando:"
+msgstr "Em vez de escolher um commit pr처ximo, 챕 poss챠vel pedir ao Git para fazer isso por voc챗, utilizando o comando:"
#. type: delimited block -
#: en/git-bisect.txt:265
@@ -10342,18 +8580,13 @@ msgstr "$ git bisect skip # A vers찾o atual n찾o pode ser testad
#: en/git-bisect.txt:270
#, priority:100
msgid "However, if you skip a commit adjacent to the one you are looking for, Git will be unable to tell exactly which of those commits was the first bad one."
-msgstr ""
-"No entanto, caso voc챗 pule um commit adjacente ao que voc챗 est찼 procurando, "
-"o Git n찾o saber찼 exatamente qual destes commits foi o primeiro que estava "
-"ruim."
+msgstr "No entanto, caso voc챗 pule um commit adjacente ao que voc챗 est찼 procurando, o Git n찾o saber찼 exatamente qual destes commits foi o primeiro que estava ruim."
#. type: Plain text
#: en/git-bisect.txt:273
#, priority:100
msgid "You can also skip a range of commits, instead of just one commit, using range notation. For example:"
-msgstr ""
-"횋 poss챠vel Voc챗 tamb챕m pular um intervalo de commits em vez de apenas um, "
-"utilizando a nota챌찾o do intervalo. Por exemplo:"
+msgstr "횋 poss챠vel Voc챗 tamb챕m pular um intervalo de commits em vez de apenas um, utilizando a nota챌찾o do intervalo. Por exemplo:"
#. type: delimited block -
#: en/git-bisect.txt:276
@@ -10365,17 +8598,13 @@ msgstr "$ git bisect skip v2.5..v2.6\n"
#: en/git-bisect.txt:280
#, priority:100
msgid "This tells the bisect process that no commit after `v2.5`, up to and including `v2.6`, should be tested."
-msgstr ""
-"Isso diz ao processo \"bisect\" que nenhum commit ap처s a vers찾o `v2.5` e at챕 "
-"a vers찾o `v2.6`, deve ser testada."
+msgstr "Isso diz ao processo \"bisect\" que nenhum commit ap처s a vers찾o `v2.5` e at챕 a vers찾o `v2.6`, deve ser testada."
#. type: Plain text
#: en/git-bisect.txt:283
#, priority:100
msgid "Note that if you also want to skip the first commit of the range you would issue the command:"
-msgstr ""
-"Observe que, caso voc챗 tamb챕m queira pular o primeiro commit do intervalo, "
-"utilize o seguinte comando:"
+msgstr "Observe que, caso voc챗 tamb챕m queira pular o primeiro commit do intervalo, utilize o seguinte comando:"
#. type: delimited block -
#: en/git-bisect.txt:286
@@ -10387,9 +8616,7 @@ msgstr "$ git bisect skip v2.5 v2.5..v2.6\n"
#: en/git-bisect.txt:290
#, priority:100
msgid "This tells the bisect process that the commits between `v2.5` and `v2.6` (inclusive) should be skipped."
-msgstr ""
-"Informa ao processo \"bisect\" que os commits entre as vers천es `v2.5` e `v2."
-"6` (inclusive) devem ser ignorados."
+msgstr "Informa ao processo \"bisect\" que os commits entre as vers천es `v2.5` e `v2.6` (inclusive) devem ser ignorados."
#. type: Title ~
#: en/git-bisect.txt:293
@@ -10401,11 +8628,7 @@ msgstr "Reduza a bisse챌찾o informando mais par창metros para o in챠cio do bisect
#: en/git-bisect.txt:298
#, priority:100
msgid "You can further cut down the number of trials, if you know what part of the tree is involved in the problem you are tracking down, by specifying path parameters when issuing the `bisect start` command:"
-msgstr ""
-"횋 poss챠vel reduzir ainda mais a quantidade de tentativas caso saiba que "
-"parte da 찼rvore est찼 envolvida no problema que voc챗 est찼 procurando ao "
-"informar os par창metros do caminho durante a utiliza챌찾o do comando `bisect "
-"start`:"
+msgstr "횋 poss챠vel reduzir ainda mais a quantidade de tentativas caso saiba que parte da 찼rvore est찼 envolvida no problema que voc챗 est찼 procurando ao informar os par창metros do caminho durante a utiliza챌찾o do comando `bisect start`:"
#. type: delimited block -
#: en/git-bisect.txt:301
@@ -10417,10 +8640,7 @@ msgstr "$ git bisect start -- arch/i386 include/asm-i386\n"
#: en/git-bisect.txt:306
#, priority:100
msgid "If you know beforehand more than one good commit, you can narrow the bisect space down by specifying all of the good commits immediately after the bad commit when issuing the `bisect start` command:"
-msgstr ""
-"Caso saiba de antem찾o se h찼 mais de um commit bom, 챕 poss챠vel restringir o "
-"espa챌o do \"bisect\" ao informar todos os commits bons imediatamente ap처s o "
-"commit com problema quando utilizar o comando `bisect start`:"
+msgstr "Caso saiba de antem찾o se h찼 mais de um commit bom, 챕 poss챠vel restringir o espa챌o do \"bisect\" ao informar todos os commits bons imediatamente ap처s o commit com problema quando utilizar o comando `bisect start`:"
#. type: delimited block -
#: en/git-bisect.txt:311
@@ -10444,9 +8664,7 @@ msgstr "Bisect run"
#: en/git-bisect.txt:318
#, priority:100
msgid "If you have a script that can tell if the current source code is good or bad, you can bisect by issuing the command:"
-msgstr ""
-"Caso tenha um script que possa dizer se o c처digo-fonte atual 챕 bom ou ruim, "
-"챕 poss챠vel fazer o \"bisect\" utilize o seguinte comando:"
+msgstr "Caso tenha um script que possa dizer se o c처digo-fonte atual 챕 bom ou ruim, 챕 poss챠vel fazer o \"bisect\" utilize o seguinte comando:"
#. type: delimited block -
#: en/git-bisect.txt:321
@@ -10458,59 +8676,31 @@ msgstr "$ git bisect run meu_script op챌천es\n"
#: en/git-bisect.txt:327
#, priority:100
msgid "Note that the script (`my_script` in the above example) should exit with code 0 if the current source code is good/old, and exit with a code between 1 and 127 (inclusive), except 125, if the current source code is bad/new."
-msgstr ""
-"Observe que o script (`meu_script` no exemplo acima) deve encerrar com o "
-"c처digo 0 caso o c처digo-fonte atual seja bom/antigo e encerrar com um c처digo "
-"entre 1 e 127 (inclusive), exceto 125, caso o c처digo-fonte atual seja ruim/"
-"novo."
+msgstr "Observe que o script (`meu_script` no exemplo acima) deve encerrar com o c처digo 0 caso o c처digo-fonte atual seja bom/antigo e encerrar com um c처digo entre 1 e 127 (inclusive), exceto 125, caso o c처digo-fonte atual seja ruim/novo."
#. type: Plain text
#: en/git-bisect.txt:331
#, priority:100
msgid "Any other exit code will abort the bisect process. It should be noted that a program that terminates via `exit(-1)` leaves $? = 255, (see the exit(3) manual page), as the value is chopped with `& 0377`."
-msgstr ""
-"Qualquer outro c처digo gerado interromper찼 o processo bisect. Deve ser "
-"observado que um programa que encerra com `exit (-1)` deixa um $? = 255, ("
-"consulte a p찼gina do manual exit(3)), pois o valor 챕 cortado com `& 0377`."
+msgstr "Qualquer outro c처digo gerado interromper찼 o processo bisect. Deve ser observado que um programa que encerra com `exit (-1)` deixa um $? = 255, (consulte a p찼gina do manual exit(3)), pois o valor 챕 cortado com `& 0377`."
#. type: Plain text
#: en/git-bisect.txt:340
#, priority:100
msgid "The special exit code 125 should be used when the current source code cannot be tested. If the script exits with this code, the current revision will be skipped (see `git bisect skip` above). 125 was chosen as the highest sensible value to use for this purpose, because 126 and 127 are used by POSIX shells to signal specific error status (127 is for command not found, 126 is for command found but not executable--these details do not matter, as they are normal errors in the script, as far as `bisect run` is concerned)."
-msgstr ""
-"O c처digo especial 125 da sa챠da deve ser utilizado quando o c처digo-fonte "
-"atual n찾o puder ser testado. Caso o script encerre com este c처digo, a "
-"revis찾o atual ser찼 ignorada (consulte o comando `git bisect skip` acima). O "
-"125 foi escolhido como o maior valor a ser utilizado para esta finalidade, "
-"pois 126 e 127 s찾o utilizandos pelos shells POSIX para sinalizar uma "
-"condi챌찾o de erro espec챠fica (127 챕 utilizado para o comando n찾o encontrado, "
-"126 챕 para o comando que foi encontrado, mas n찾o 챕 execut찼vel - estes "
-"detalhes n찾o s찾o importantes, pois s찾o erros normais do script, no que diz "
-"respeito ao comando `bisect run`)."
+msgstr "O c처digo especial 125 da sa챠da deve ser utilizado quando o c처digo-fonte atual n찾o puder ser testado. Caso o script encerre com este c처digo, a revis찾o atual ser찼 ignorada (consulte o comando `git bisect skip` acima). O 125 foi escolhido como o maior valor a ser utilizado para esta finalidade, pois 126 e 127 s찾o utilizandos pelos shells POSIX para sinalizar uma condi챌찾o de erro espec챠fica (127 챕 utilizado para o comando n찾o encontrado, 126 챕 para o comando que foi encontrado, mas n찾o 챕 execut찼vel - estes detalhes n찾o s찾o importantes, pois s찾o erros normais do script, no que diz respeito ao comando `bisect run`)."
#. type: Plain text
#: en/git-bisect.txt:346
#, priority:100
msgid "You may often find that during a bisect session you want to have temporary modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a header file, or \"revision that does not have this commit needs this patch applied to work around another problem this bisection is not interested in\") applied to the revision being tested."
-msgstr ""
-"Muitas vezes voc챗 pode achar que durante uma sess찾o bisect voc챗 queira ter "
-"altera챌천es tempor찼rias (`s/#define DEBUG 0/#define DEBUG 1/` ao cabe챌alho de "
-"um arquivo, ou \"a revis찾o que n찾o tem este commit e precisa que esta "
-"corre챌찾o seja aplicada como um quebra galho que seja irrelevante para esta "
-"bisse챌찾o por exemplo\") aplicada 횪 revis찾o que est찼 sendo testada."
+msgstr "Muitas vezes voc챗 pode achar que durante uma sess찾o bisect voc챗 queira ter altera챌천es tempor찼rias (`s/#define DEBUG 0/#define DEBUG 1/` ao cabe챌alho de um arquivo, ou \"a revis찾o que n찾o tem este commit e precisa que esta corre챌찾o seja aplicada como um quebra galho que seja irrelevante para esta bisse챌찾o por exemplo\") aplicada 횪 revis찾o que est찼 sendo testada."
#. type: Plain text
#: en/git-bisect.txt:354
#, priority:100
msgid "To cope with such a situation, after the inner 'git bisect' finds the next revision to test, the script can apply the patch before compiling, run the real test, and afterwards decide if the revision (possibly with the needed patch) passed the test and then rewind the tree to the pristine state. Finally the script should exit with the status of the real test to let the `git bisect run` command loop determine the eventual outcome of the bisect session."
-msgstr ""
-"Para lidar com esta situa챌찾o, depois que o comando 'git bisect' encontrar a "
-"pr처xima revis찾o para ser testada, o script poder찼 aplicar o patch antes da "
-"compila챌찾o, executar um teste real e depois decidir se a revis찾o ("
-"possivelmente com a corre챌찾o necess찼ria) passou no teste e depois retornar a "
-"찼rvore para a sua perfeita condi챌찾o. Finalmente, o script deve encerrar com "
-"a condi챌찾o do teste real permitindo que o loop de comando `git bisect run` "
-"determine o resultado final da sess찾o bisect."
+msgstr "Para lidar com esta situa챌찾o, depois que o comando 'git bisect' encontrar a pr처xima revis찾o para ser testada, o script poder찼 aplicar o patch antes da compila챌찾o, executar um teste real e depois decidir se a revis찾o (possivelmente com a corre챌찾o necess찼ria) passou no teste e depois retornar a 찼rvore para a sua perfeita condi챌찾o. Finalmente, o script deve encerrar com a condi챌찾o do teste real permitindo que o loop de comando `git bisect run` determine o resultado final da sess찾o bisect."
#. type: Labeled list
#: en/git-bisect.txt:357 en/git-clone.txt:145
@@ -10522,10 +8712,7 @@ msgstr "--no-checkout"
#: en/git-bisect.txt:362
#, priority:100
msgid "Do not checkout the new working tree at each iteration of the bisection process. Instead just update a special reference named `BISECT_HEAD` to make it point to the commit that should be tested."
-msgstr ""
-"N찾o fa챌a o check-out da nova 찼rvore de trabalho em cada itera챌찾o do processo "
-"de bisse챌찾o. Em vez disso, atualize apenas uma refer챗ncia especial chamada "
-"`BISECT_HEAD` indicando o commit que deve ser testado."
+msgstr "N찾o fa챌a o check-out da nova 찼rvore de trabalho em cada itera챌찾o do processo de bisse챌찾o. Em vez disso, atualize apenas uma refer챗ncia especial chamada `BISECT_HEAD` indicando o commit que deve ser testado."
#. type: Plain text
#: en/git-bisect.txt:365
@@ -10543,8 +8730,7 @@ msgstr "Caso o reposit처rio esteja vazio, se assume a op챌찾o `--no-checkout`."
#: en/git-bisect.txt:372
#, priority:100
msgid "Automatically bisect a broken build between v1.2 and HEAD:"
-msgstr ""
-"Fa챌a o bisect automaticamente uma constru챌찾o quebrada entre v1.2 e HEAD:"
+msgstr "Fa챌a o bisect automaticamente uma constru챌찾o quebrada entre v1.2 e HEAD:"
#. type: delimited block -
#: en/git-bisect.txt:377
@@ -10562,9 +8748,7 @@ msgstr ""
#: en/git-bisect.txt:380
#, priority:100
msgid "Automatically bisect a test failure between origin and HEAD:"
-msgstr ""
-"Fa챌a o bisect automaticamente em um teste que falhou entre a `origin` "
-"(origem) e o `HEAD`:"
+msgstr "Fa챌a o bisect automaticamente em um teste que falhou entre a `origin` (origem) e o `HEAD`:"
#. type: delimited block -
#: en/git-bisect.txt:385
@@ -10608,19 +8792,13 @@ msgstr ""
#: en/git-bisect.txt:403
#, priority:100
msgid "Here we use a `test.sh` custom script. In this script, if `make` fails, we skip the current commit. `check_test_case.sh` should `exit 0` if the test case passes, and `exit 1` otherwise."
-msgstr ""
-"Aqui utilizamos um script personalizado `test.sh`. Neste script, caso o "
-"`make` falhe, ignoramos o commit atual. `check_test_case.sh` deve `exit 0` ("
-"encerrar com 0) ou caso o teste passe e seja `exit 1`."
+msgstr "Aqui utilizamos um script personalizado `test.sh`. Neste script, caso o `make` falhe, ignoramos o commit atual. `check_test_case.sh` deve `exit 0` (encerrar com 0) ou caso o teste passe e seja `exit 1`."
#. type: Plain text
#: en/git-bisect.txt:407
#, priority:100
msgid "It is safer if both `test.sh` and `check_test_case.sh` are outside the repository to prevent interactions between the bisect, make and test processes and the scripts."
-msgstr ""
-"횋 mais seguro se os arquivos `test.sh` e `check_test_case.sh` estiverem fora "
-"do reposit처rio para evitar intera챌천es entre os processos `bisect`, `make`, "
-"`test` e os scripts."
+msgstr "횋 mais seguro se os arquivos `test.sh` e `check_test_case.sh` estiverem fora do reposit처rio para evitar intera챌천es entre os processos `bisect`, `make`, `test` e os scripts."
#. type: Plain text
#: en/git-bisect.txt:409
@@ -10692,14 +8870,7 @@ msgstr ""
#: en/git-bisect.txt:440
#, priority:100
msgid "This applies modifications from a hot-fix branch before each test run, e.g. in case your build or test environment changed so that older revisions may need a fix which newer ones have already. (Make sure the hot-fix branch is based off a commit which is contained in all revisions which you are bisecting, so that the merge does not pull in too much, or use `git cherry-pick` instead of `git merge`.)"
-msgstr ""
-"S찾o aplicadas altera챌천es de um hotfix para ramifica챌찾o antes de cada teste, "
-"caso o seu ambiente de constru챌찾o ou teste tenha sido alterado para que as "
-"revis천es mais antigas precisem de uma corre챌찾o que as mais recentes j찼 "
-"tenham por exemplo. (Certifique-se que o hot-fix do ramo tenha base em um "
-"commit que est찼 contida em todos as revis천es que voc챗 esteja fazendo o "
-"bisect, para que a mesclagem n찾o realize muitos resgates ou utilize o "
-"comando `git cherry-pick` em vez do `git merge`. )"
+msgstr "S찾o aplicadas altera챌천es de um hotfix para ramifica챌찾o antes de cada teste, caso o seu ambiente de constru챌찾o ou teste tenha sido alterado para que as revis천es mais antigas precisem de uma corre챌찾o que as mais recentes j찼 tenham por exemplo. (Certifique-se que o hot-fix do ramo tenha base em um commit que est찼 contida em todos as revis천es que voc챗 esteja fazendo o bisect, para que a mesclagem n찾o realize muitos resgates ou utilize o comando `git cherry-pick` em vez do `git merge`. )"
#. type: delimited block -
#: en/git-bisect.txt:447
@@ -10717,17 +8888,13 @@ msgstr ""
#: en/git-bisect.txt:451
#, priority:100
msgid "This shows that you can do without a run script if you write the test on a single line."
-msgstr ""
-"Isso exibe o que voc챗 pode fazer sem executar um script caso escreva o teste "
-"em uma 첬nica linha."
+msgstr "Isso exibe o que voc챗 pode fazer sem executar um script caso escreva o teste em uma 첬nica linha."
#. type: Plain text
#: en/git-bisect.txt:453
#, priority:100
msgid "Locate a good region of the object graph in a damaged repository"
-msgstr ""
-"Localize uma boa regi찾o do gr찼fico dos objetos em um reposit처rio que foi "
-"danificado"
+msgstr "Localize uma boa regi찾o do gr찼fico dos objetos em um reposit처rio que foi danificado"
#. type: delimited block -
#: en/git-bisect.txt:463
@@ -10761,10 +8928,7 @@ msgstr "$ git bisect reset # encerra a se챌찾o bisect\n"
#: en/git-bisect.txt:470
#, priority:100
msgid "In this case, when 'git bisect run' finishes, bisect/bad will refer to a commit that has at least one parent whose reachable graph is fully traversable in the sense required by 'git pack objects'."
-msgstr ""
-"Neste caso, quando 'git bisect run' encerra, o bisect/bad (ruim) ir찼 apontar "
-"para um commit que tenha pelo menos uma origem cujo gr찼fico seja "
-"completamente cruzado no sentido requerido pelo comando 'git pack objects'."
+msgstr "Neste caso, quando 'git bisect run' encerra, o bisect/bad (ruim) ir찼 apontar para um commit que tenha pelo menos uma origem cujo gr찼fico seja completamente cruzado no sentido requerido pelo comando 'git pack objects'."
#. type: Plain text
#: en/git-bisect.txt:472
@@ -10782,8 +8946,7 @@ msgid ""
msgstr ""
"$ git bisect start\n"
"$ git bisect new HEAD # o commit atual 챕 marcado como novo\n"
-"$ git bisect old HEAD~10 # o d챕cimo commit a partir de agora 챕 marcado como "
-"antigo\n"
+"$ git bisect old HEAD~10 # o d챕cimo commit a partir de agora 챕 marcado como antigo\n"
#. type: Plain text
#: en/git-bisect.txt:480
@@ -10813,18 +8976,13 @@ msgstr "Conseguindo ajuda"
#: en/git-bisect.txt:491
#, priority:100
msgid "Use `git bisect` to get a short usage description, and `git bisect help` or `git bisect -h` to get a long usage description."
-msgstr ""
-"Utilize o comando `git bisect` para obter uma descri챌찾o resumida da sua "
-"utiliza챌찾o e `git bisect help` ou `git bisect -h` para obter uma descri챌찾o "
-"completa."
+msgstr "Utilize o comando `git bisect` para obter uma descri챌찾o resumida da sua utiliza챌찾o e `git bisect help` ou `git bisect -h` para obter uma descri챌찾o completa."
#. type: Plain text
#: en/git-bisect.txt:496
#, priority:100
msgid "link:git-bisect-lk2009.html[Fighting regressions with git bisect], linkgit:git-blame[1]."
-msgstr ""
-"link:git-bisect-lk2009.html[Lutando contra regress천es com git bisect], "
-"linkgit:git-blame[1]."
+msgstr "link:git-bisect-lk2009.html[Lutando contra regress천es com git bisect], linkgit:git-blame[1]."
#. type: Title =
#: en/git-blame.txt:2
@@ -10836,9 +8994,7 @@ msgstr "git-blame(1)"
#: en/git-blame.txt:7
#, priority:100
msgid "git-blame - Show what revision and author last modified each line of a file"
-msgstr ""
-"git-blame - Exiba qual revis찾o e qual foi o autor que alterou cada linha de "
-"um arquivo pela 첬ltima vez"
+msgstr "git-blame - Exiba qual revis찾o e qual foi o autor que alterou cada linha de um arquivo pela 첬ltima vez"
#. type: Plain text
#: en/git-blame.txt:16
@@ -10850,63 +9006,41 @@ msgid ""
"\t [--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>..<rev>]\n"
"\t [--] <file>\n"
msgstr ""
-"'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] "
-"[--incremental]\n"
+"'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]\n"
"\t [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<data>]\n"
"\t [--ignore-rev <rev>] [--ignore-revs-file <arquivo>]\n"
-"\t [--progress] [--abbrev=<n>] [<rev> | --contents <arquivo> | --reverse "
-"<rev>..<rev>]\n"
+"\t [--progress] [--abbrev=<n>] [<rev> | --contents <arquivo> | --reverse <rev>..<rev>]\n"
"\t [--] <arquivo>\n"
#. type: Plain text
#: en/git-blame.txt:22
#, priority:100
msgid "Annotates each line in the given file with information from the revision which last modified the line. Optionally, start annotating from the given revision."
-msgstr ""
-"Anota cada linha no arquivo informado com informa챌천es da revis찾o que "
-"modificou a linha pela 첬ltima vez. Opcionalmente, comece a anotar a partir "
-"da revis찾o informada."
+msgstr "Anota cada linha no arquivo informado com informa챌천es da revis찾o que modificou a linha pela 첬ltima vez. Opcionalmente, comece a anotar a partir da revis찾o informada."
#. type: Plain text
#: en/git-blame.txt:25
#, priority:100
msgid "When specified one or more times, `-L` restricts annotation to the requested lines."
-msgstr ""
-"Quando informado uma ou mais vezes, a op챌찾o `-L` limita a anota챌찾o 횪s linhas "
-"solicitadas."
+msgstr "Quando informado uma ou mais vezes, a op챌찾o `-L` limita a anota챌찾o 횪s linhas solicitadas."
#. type: Plain text
#: en/git-blame.txt:31
#, priority:100
msgid "The origin of lines is automatically followed across whole-file renames (currently there is no option to turn the rename-following off). To follow lines moved from one file to another, or to follow lines that were copied and pasted from another file, etc., see the `-C` and `-M` options."
-msgstr ""
-"A origem das linhas 챕 seguida automaticamente pelas renomea챌천es atrav챕s de "
-"todos os arquivos (atualmente n찾o h찼 uma op챌찾o para desativar a presente "
-"renomea챌찾o). Para seguir as linhas movidas de um arquivo para outro ou para "
-"seguir as linhas que foram copiadas e coladas de um outro arquivo, etc., "
-"consulte as op챌천es `-C` e `-M`."
+msgstr "A origem das linhas 챕 seguida automaticamente pelas renomea챌천es atrav챕s de todos os arquivos (atualmente n찾o h찼 uma op챌찾o para desativar a presente renomea챌찾o). Para seguir as linhas movidas de um arquivo para outro ou para seguir as linhas que foram copiadas e coladas de um outro arquivo, etc., consulte as op챌천es `-C` e `-M`."
#. type: Plain text
#: en/git-blame.txt:35
#, priority:100
msgid "The report does not tell you anything about lines which have been deleted or replaced; you need to use a tool such as 'git diff' or the \"pickaxe\" interface briefly mentioned in the following paragraph."
-msgstr ""
-"O relat처rio n찾o informa nada sobre quais as linhas foram eliminadas ou quais "
-"foram substitu챠das; 챕 necess찼rio utilizar uma ferramenta como \"git diff\" "
-"ou a interface \"pickaxe\" mencionada de forma breve no par찼grafo seguinte."
+msgstr "O relat처rio n찾o informa nada sobre quais as linhas foram eliminadas ou quais foram substitu챠das; 챕 necess찼rio utilizar uma ferramenta como \"git diff\" ou a interface \"pickaxe\" mencionada de forma breve no par찼grafo seguinte."
#. type: Plain text
#: en/git-blame.txt:42
#, priority:100
msgid "Apart from supporting file annotation, Git also supports searching the development history for when a code snippet occurred in a change. This makes it possible to track when a code snippet was added to a file, moved or copied between files, and eventually deleted or replaced. It works by searching for a text string in the diff. A small example of the pickaxe interface that searches for `blame_usage`:"
-msgstr ""
-"Al챕m de oferecer compatibilidade 횪 anota챌찾o do arquivo, o Git tamb챕m 챕 "
-"compat챠vel com a pesquisa no hist처rico do desenvolvimento para quando ocorra "
-"uma altera챌찾o em um trecho do c처digo. Isso torna poss챠vel o monitoramento "
-"quando um trecho do c처digo for adicionado em um arquivo, movido ou copiado "
-"entre os arquivos e eventualmente tenha sido exclu챠do ou substitu챠do. "
-"Funciona pesquisando uma sequ챗ncia de texto no diff. Um pequeno exemplo da "
-"interface \"pickaxe\" que pesquisa por `blame_usage`:"
+msgstr "Al챕m de oferecer compatibilidade 횪 anota챌찾o do arquivo, o Git tamb챕m 챕 compat챠vel com a pesquisa no hist처rico do desenvolvimento para quando ocorra uma altera챌찾o em um trecho do c처digo. Isso torna poss챠vel o monitoramento quando um trecho do c처digo for adicionado em um arquivo, movido ou copiado entre os arquivos e eventualmente tenha sido exclu챠do ou substitu챠do. Funciona pesquisando uma sequ챗ncia de texto no diff. Um pequeno exemplo da interface \"pickaxe\" que pesquisa por `blame_usage`:"
#. type: delimited block -
#: en/git-blame.txt:47
@@ -10924,9 +9058,7 @@ msgstr ""
#: en/git-blame.txt:55
#, priority:100
msgid "Use the same output mode as linkgit:git-annotate[1] (Default: off)."
-msgstr ""
-"Utilize o mesmo modo de sa챠da como o linkgit:git-annotate[1] (Predefini챌찾o: "
-"desligado)."
+msgstr "Utilize o mesmo modo de sa챠da como o linkgit:git-annotate[1] (Predefini챌찾o: desligado)."
#. type: Labeled list
#: en/git-blame.txt:56
@@ -10938,13 +9070,7 @@ msgstr "--score-debug"
#: en/git-blame.txt:64
#, priority:100
msgid "Include debugging information related to the movement of lines between files (see `-C`) and lines moved within a file (see `-M`). The first number listed is the score. This is the number of alphanumeric characters detected as having been moved between or within files. This must be above a certain threshold for 'git blame' to consider those lines of code to have been moved."
-msgstr ""
-"Inclua as informa챌천es de depura챌찾o relacionadas a movimenta챌찾o das linhas "
-"entre os arquivos (consulte `-C`) e as linhas que foram movidas dentro de um "
-"arquivo (consulte `-M`). O primeiro n첬mero listado 챕 a pontua챌찾o. Esta 챕 a "
-"quantidade de caracteres alfanum챕ricos detectados como movidos entre os "
-"arquivos ou dentro deles. Deve estar acima de um certo limite para que o "
-"comando 'git blame' considere que estas linhas do c처digo tenham sido movidas."
+msgstr "Inclua as informa챌천es de depura챌찾o relacionadas a movimenta챌찾o das linhas entre os arquivos (consulte `-C`) e as linhas que foram movidas dentro de um arquivo (consulte `-M`). O primeiro n첬mero listado 챕 a pontua챌찾o. Esta 챕 a quantidade de caracteres alfanum챕ricos detectados como movidos entre os arquivos ou dentro deles. Deve estar acima de um certo limite para que o comando 'git blame' considere que estas linhas do c처digo tenham sido movidas."
#. type: Labeled list
#: en/git-blame.txt:66
@@ -10956,10 +9082,7 @@ msgstr "--show-name"
#: en/git-blame.txt:70
#, priority:100
msgid "Show the filename in the original commit. By default the filename is shown if there is any line that came from a file with a different name, due to rename detection."
-msgstr ""
-"Exiba o nome do arquivo no commit original. 횋 predefinido que o nome do "
-"arquivo seja exibido caso haja alguma linha que tenha vindo de um arquivo "
-"com um nome diferente, devido 횪 detec챌찾o de renomea챌찾o."
+msgstr "Exiba o nome do arquivo no commit original. 횋 predefinido que o nome do arquivo seja exibido caso haja alguma linha que tenha vindo de um arquivo com um nome diferente, devido 횪 detec챌찾o de renomea챌찾o."
#. type: Labeled list
#: en/git-blame.txt:72
@@ -10989,18 +9112,13 @@ msgstr "--show-email"
#: en/git-blame.txt:83
#, priority:100
msgid "Show the author email instead of author name (Default: off). This can also be controlled via the `blame.showEmail` config option."
-msgstr ""
-"Exiba o endere챌o e-mail do autor em vez do se nome (Predefini챌찾o: desligado)"
-". Tamb챕m pode ser controlado atrav챕s da op챌찾o da configura챌찾o `blame."
-"showEmail`."
+msgstr "Exiba o endere챌o e-mail do autor em vez do se nome (Predefini챌찾o: desligado). Tamb챕m pode ser controlado atrav챕s da op챌찾o da configura챌찾o `blame.showEmail`."
#. type: Plain text
#: en/git-blame.txt:87
#, priority:100
msgid "Ignore whitespace when comparing the parent's version and the child's to find where the lines came from."
-msgstr ""
-"Ignore os espa챌os em branco durante a compara챌찾o da vers찾o das origens e "
-"seus herdeiros para descobrir de onde vieram as linhas."
+msgstr "Ignore os espa챌os em branco durante a compara챌찾o da vers찾o das origens e seus herdeiros para descobrir de onde vieram as linhas."
#. type: Labeled list
#: en/git-blame.txt:88 en/git-describe.txt:65
@@ -11012,10 +9130,7 @@ msgstr "--abbrev=<n>"
#: en/git-blame.txt:92
#, priority:100
msgid "Instead of using the default 7+1 hexadecimal digits as the abbreviated object name, use <n>+1 digits. Note that 1 column is used for a caret to mark the boundary commit."
-msgstr ""
-"Em vez de utilizar os d챠gitos 7+1 hexadecimais predefinidos como o nome "
-"abreviado do objeto, utilize <n>+1 d챠gitos. Observe que uma coluna 챕 "
-"utilizada para um sinal de intercala챌찾o para marcar o limite do commit."
+msgstr "Em vez de utilizar os d챠gitos 7+1 hexadecimais predefinidos como o nome abreviado do objeto, utilize <n>+1 d챠gitos. Observe que uma coluna 챕 utilizada para um sinal de intercala챌찾o para marcar o limite do commit."
#. type: Title -
#: en/git-blame.txt:95
@@ -11051,26 +9166,19 @@ msgstr "o n첬mero da linha no arquivo final;"
#: en/git-blame.txt:106
#, priority:100
msgid "on a line that starts a group of lines from a different commit than the previous one, the number of lines in this group. On subsequent lines this field is absent."
-msgstr ""
-"em uma linha que inicie um grupo de linhas a partir de um commit diferente "
-"ao anterior, a quantidade de linhas neste grupo. Nas linhas subsequentes "
-"este campo est찼 ausente."
+msgstr "em uma linha que inicie um grupo de linhas a partir de um commit diferente ao anterior, a quantidade de linhas neste grupo. Nas linhas subsequentes este campo est찼 ausente."
#. type: Plain text
#: en/git-blame.txt:109
#, priority:100
msgid "This header line is followed by the following information at least once for each commit:"
-msgstr ""
-"Esta linha de cabe챌alho 챕 seguida pelas seguintes informa챌천es por pelo menos "
-"uma vez para cada commit:"
+msgstr "Esta linha de cabe챌alho 챕 seguida pelas seguintes informa챌천es por pelo menos uma vez para cada commit:"
#. type: Plain text
#: en/git-blame.txt:113
#, priority:100
msgid "the author name (\"author\"), email (\"author-mail\"), time (\"author-time\"), and time zone (\"author-tz\"); similarly for committer."
-msgstr ""
-"o nome do autor (\"autor\"), email (\"autor-mail\"), tempo (\"author-time\") "
-"e o fuso hor찼rio (\"autor-tz\"); da mesma forma para quem realizou o commit."
+msgstr "o nome do autor (\"autor\"), email (\"autor-mail\"), tempo (\"author-time\") e o fuso hor찼rio (\"autor-tz\"); da mesma forma para quem realizou o commit."
#. type: Plain text
#: en/git-blame.txt:114
@@ -11088,22 +9196,13 @@ msgstr "a primeira linha da mensagem do registro log do commit (\"resumo\")."
#: en/git-blame.txt:119
#, priority:100
msgid "The contents of the actual line is output after the above header, prefixed by a TAB. This is to allow adding more header elements later."
-msgstr ""
-"O conte첬do da linha real 챕 gerado ap처s o cabe챌alho acima, prefixado por um "
-"TAB. Permite adicionar mais elementos de cabe챌alho posteriormente."
+msgstr "O conte첬do da linha real 챕 gerado ap처s o cabe챌alho acima, prefixado por um TAB. Permite adicionar mais elementos de cabe챌alho posteriormente."
#. type: Plain text
#: en/git-blame.txt:127
#, priority:100
msgid "The porcelain format generally suppresses commit information that has already been seen. For example, two lines that are blamed to the same commit will both be shown, but the details for that commit will be shown only once. This is more efficient, but may require more state be kept by the reader. The `--line-porcelain` option can be used to output full commit information for each line, allowing simpler (but less efficient) usage like:"
-msgstr ""
-"O formato porcelana geralmente suprime as informa챌천es dos commits que j찼 "
-"foram vistos. Duas linhas forem atribu챠dos ao mesmo commit ser찾o exibidos, "
-"por챕m os detalhes deste commit ser찾o exibidos apenas uma vez por exemplo. 횋 "
-"mais eficiente por챕m pode exigir que mais condi챌천es sejam mantidos pelo "
-"leitor. A op챌찾o `--line-porcelain` pode ser utilizado para gerar informa챌천es "
-"completas do commit em cada linha, permitindo um uso mais simples (por챕m "
-"menos eficiente), como:"
+msgstr "O formato porcelana geralmente suprime as informa챌천es dos commits que j찼 foram vistos. Duas linhas forem atribu챠dos ao mesmo commit ser찾o exibidos, por챕m os detalhes deste commit ser찾o exibidos apenas uma vez por exemplo. 횋 mais eficiente por챕m pode exigir que mais condi챌천es sejam mantidos pelo leitor. A op챌찾o `--line-porcelain` pode ser utilizado para gerar informa챌천es completas do commit em cada linha, permitindo um uso mais simples (por챕m menos eficiente), como:"
#. type: Plain text
#: en/git-blame.txt:132
@@ -11129,20 +9228,13 @@ msgstr "ESPECIFICANDO OS INTERVALOS"
#: en/git-blame.txt:141
#, priority:100
msgid "Unlike 'git blame' and 'git annotate' in older versions of git, the extent of the annotation can be limited to both line ranges and revision ranges. The `-L` option, which limits annotation to a range of lines, may be specified multiple times."
-msgstr ""
-"Ao contr찼rio do comando 'git blame' e do 'git annotate' nas vers천es mais "
-"antigas do git, a extens찾o da anota챌찾o pode ser limitada a intervalos de "
-"linhas e de revis찾o. A op챌찾o `-L`, que limita a anota챌찾o a um intervalo de "
-"linhas, pode ser utilizada v찼rias vezes."
+msgstr "Ao contr찼rio do comando 'git blame' e do 'git annotate' nas vers천es mais antigas do git, a extens찾o da anota챌찾o pode ser limitada a intervalos de linhas e de revis찾o. A op챌찾o `-L`, que limita a anota챌찾o a um intervalo de linhas, pode ser utilizada v찼rias vezes."
#. type: Plain text
#: en/git-blame.txt:146
#, priority:100
msgid "When you are interested in finding the origin for lines 40-60 for file `foo`, you can use the `-L` option like so (they mean the same thing -- both ask for 21 lines starting at line 40):"
-msgstr ""
-"Quando quiser encontrar a origem para as linhas 40-60 do arquivo `foo`, "
-"utilize a op챌찾o` -L` assim (eles significam a mesma coisa - ambos pedem 21 "
-"linhas iniciando na linha 40):"
+msgstr "Quando quiser encontrar a origem para as linhas 40-60 do arquivo `foo`, utilize a op챌찾o` -L` assim (eles significam a mesma coisa - ambos pedem 21 linhas iniciando na linha 40):"
#. type: Plain text
#: en/git-blame.txt:149
@@ -11158,9 +9250,7 @@ msgstr ""
#: en/git-blame.txt:151
#, priority:100
msgid "Also you can use a regular expression to specify the line range:"
-msgstr ""
-"Voc챗 tambem pode utilizar uma express찾o regular para determinar o intervalo "
-"da linha:"
+msgstr "Voc챗 tambem pode utilizar uma express찾o regular para determinar o intervalo da linha:"
#. type: Plain text
#: en/git-blame.txt:153
@@ -11178,10 +9268,7 @@ msgstr "que limita a anota챌찾o ao corpo da sub-rotina `hello`."
#: en/git-blame.txt:159
#, priority:100
msgid "When you are not interested in changes older than version v2.6.18, or changes older than 3 weeks, you can use revision range specifiers similar to 'git rev-list':"
-msgstr ""
-"Quando n찾o quiser encontrar as altera챌천es mais antigas que a vers찾o v2.6.18 "
-"ou nas altera챌천es anteriores a 3 semanas, utilize especificadores de "
-"intervalo da revis찾o similares ao 'git rev-list':"
+msgstr "Quando n찾o quiser encontrar as altera챌천es mais antigas que a vers찾o v2.6.18 ou nas altera챌천es anteriores a 3 semanas, utilize especificadores de intervalo da revis찾o similares ao 'git rev-list':"
#. type: Plain text
#: en/git-blame.txt:162
@@ -11197,23 +9284,13 @@ msgstr ""
#: en/git-blame.txt:168
#, priority:100
msgid "When revision range specifiers are used to limit the annotation, lines that have not changed since the range boundary (either the commit v2.6.18 or the most recent commit that is more than 3 weeks old in the above example) are blamed for that range boundary commit."
-msgstr ""
-"Quando os especificadores de intervalo da revis찾o forem utilizados para "
-"limitar a anota챌찾o, as linhas que n찾o foram alteradas desde o limite do "
-"intervalo (seja o commit v2.6.18 ou o commit mais recente que seja 3 semanas "
-"mais antigo como no exemplo acima) s찾o responsabilizadas por este limite do "
-"intervalo do commit."
+msgstr "Quando os especificadores de intervalo da revis찾o forem utilizados para limitar a anota챌찾o, as linhas que n찾o foram alteradas desde o limite do intervalo (seja o commit v2.6.18 ou o commit mais recente que seja 3 semanas mais antigo como no exemplo acima) s찾o responsabilizadas por este limite do intervalo do commit."
#. type: Plain text
#: en/git-blame.txt:174
#, priority:100
msgid "A particularly useful way is to see if an added file has lines created by copy-and-paste from existing files. Sometimes this indicates that the developer was being sloppy and did not refactor the code properly. You can first find the commit that introduced the file with:"
-msgstr ""
-"Uma maneira particularmente 첬til 챕 verificar se um arquivo que foi "
-"adicionado possua linhas criadas atrav챕s de um copiar e colar vindos dos "
-"arquivos j찼 existentes. �s vezes isso indica que o desenvolvedor estava "
-"sendo desleixado e n찾o reorganizou o c처digo corretamente. Voc챗 pode "
-"encontrar primeiro o commit que introduziu o arquivo com o comando:"
+msgstr "Uma maneira particularmente 첬til 챕 verificar se um arquivo que foi adicionado possua linhas criadas atrav챕s de um copiar e colar vindos dos arquivos j찼 existentes. �s vezes isso indica que o desenvolvedor estava sendo desleixado e n찾o reorganizou o c처digo corretamente. Voc챗 pode encontrar primeiro o commit que introduziu o arquivo com o comando:"
#. type: Plain text
#: en/git-blame.txt:176
@@ -11225,9 +9302,7 @@ msgstr "\tgit log --diff-filter=A --pretty=short -- foo\n"
#: en/git-blame.txt:179
#, priority:100
msgid "and then annotate the change between the commit and its parents, using `commit^!` notation:"
-msgstr ""
-"e ent찾o anote a altera챌찾o entre o commit e as suas origens, utilizando a "
-"nota챌찾o `commit^!`:"
+msgstr "e ent찾o anote a altera챌찾o entre o commit e as suas origens, utilizando a nota챌찾o `commit^!`:"
#. type: Plain text
#: en/git-blame.txt:181
@@ -11245,19 +9320,13 @@ msgstr "SA횒DA INCREMENTAL"
#: en/git-blame.txt:191
#, priority:100
msgid "When called with `--incremental` option, the command outputs the result as it is built. The output generally will talk about lines touched by more recent commits first (i.e. the lines will be annotated out of order) and is meant to be used by interactive viewers."
-msgstr ""
-"Quando invocado com a op챌찾o `--incremental`, o comando gera o resultado "
-"conforme ele foi constru챠do. A sa챠da geralmente fala sobre as linhas "
-"tocadas pelos commits mais recentes primeiro (ou seja, as linhas ser찾o "
-"anotadas fora de ordem) e deve ser utilizado por visualizadores interativos."
+msgstr "Quando invocado com a op챌찾o `--incremental`, o comando gera o resultado conforme ele foi constru챠do. A sa챠da geralmente fala sobre as linhas tocadas pelos commits mais recentes primeiro (ou seja, as linhas ser찾o anotadas fora de ordem) e deve ser utilizado por visualizadores interativos."
#. type: Plain text
#: en/git-blame.txt:195
#, priority:100
msgid "The output format is similar to the Porcelain format, but it does not contain the actual lines from the file that is being annotated."
-msgstr ""
-"O formato da sa챠da 챕 semelhante ao formato Porcelana, mas n찾o cont챕m as "
-"linhas reais do arquivo que est찼 sendo anotado."
+msgstr "O formato da sa챠da 챕 semelhante ao formato Porcelana, mas n찾o cont챕m as linhas reais do arquivo que est찼 sendo anotado."
#. type: Plain text
#: en/git-blame.txt:197
@@ -11281,49 +9350,31 @@ msgstr "Os n첬meros das linhas come챌am a contagem a partir do 1."
#: en/git-blame.txt:206
#, priority:100
msgid "The first time that a commit shows up in the stream, it has various other information about it printed out with a one-word tag at the beginning of each line describing the extra commit information (author, email, committer, dates, summary, etc.)."
-msgstr ""
-"A primeira vez que um commit 챕 exibido no fluxo, ele cont챕m v찼rias outras "
-"informa챌천es sobre ele impressas com uma tag de uma palavra no in챠cio de cada "
-"linha, descrevendo as informa챌천es adicionais do commit (autor, e-mail, quem "
-"fez o commit, as datas, resumo, etc.)."
+msgstr "A primeira vez que um commit 챕 exibido no fluxo, ele cont챕m v찼rias outras informa챌천es sobre ele impressas com uma tag de uma palavra no in챠cio de cada linha, descrevendo as informa챌천es adicionais do commit (autor, e-mail, quem fez o commit, as datas, resumo, etc.)."
#. type: Plain text
#: en/git-blame.txt:209
#, priority:100
msgid "Unlike the Porcelain format, the filename information is always given and terminates the entry:"
-msgstr ""
-"Ao contr찼rio do formato Porcelana, as informa챌천es do nome do arquivo s찾o "
-"sempre informadas e encerram a entrada:"
+msgstr "Ao contr찼rio do formato Porcelana, as informa챌천es do nome do arquivo s찾o sempre informadas e encerram a entrada:"
#. type: Plain text
#: en/git-blame.txt:211
#, no-wrap, priority:100
msgid "\"filename\" <whitespace-quoted-filename-goes-here>\n"
-msgstr ""
-"\"nome do arquivo\" <cita챌찾o-do-nome-do-arquivo-com-espa챌o-em-branco-vai-"
-"aqui>\n"
+msgstr "\"nome do arquivo\" <cita챌찾o-do-nome-do-arquivo-com-espa챌o-em-branco-vai-aqui>\n"
#. type: Plain text
#: en/git-blame.txt:214
#, priority:100
msgid "and thus it is really quite easy to parse for some line- and word-oriented parser (which should be quite natural for most scripting languages)."
-msgstr ""
-"logo, 챕 realmente muito f찼cil analisar alguma linha algo que seja orientado "
-"por palavra (que deve ser bastante natural para a maioria das linguagens de "
-"script)."
+msgstr "logo, 챕 realmente muito f찼cil analisar alguma linha algo que seja orientado por palavra (que deve ser bastante natural para a maioria das linguagens de script)."
#. type: Plain text
#: en/git-blame.txt:222
#, priority:100
msgid "For people who do parsing: to make it more robust, just ignore any lines between the first and last one (\"<sha1>\" and \"filename\" lines) where you do not recognize the tag words (or care about that particular one) at the beginning of the \"extended information\" lines. That way, if there is ever added information (like the commit encoding or extended commit commentary), a blame viewer will not care."
-msgstr ""
-"Para pessoas que fazem a analise: para torn찼-lo mais robusto, ignore todas "
-"as linhas entre a primeira e a 첬ltima (linhas \"<sha1>\" e \"filename\") nas "
-"quais voc챗 n찾o reconhe챌a as palavras-chave (ou se preocupe com uma em "
-"particular) no in챠cio das linhas com \"informa챌천es estendidas\". Dessa "
-"forma, caso alguma vez haja informa챌천es que foram adicionadas (como a "
-"codifica챌찾o do commit ou o coment찼rio estendido do commit), um \"blame "
-"viewer\" n찾o ir찼 se importar."
+msgstr "Para pessoas que fazem a analise: para torn찼-lo mais robusto, ignore todas as linhas entre a primeira e a 첬ltima (linhas \"<sha1>\" e \"filename\") nas quais voc챗 n찾o reconhe챌a as palavras-chave (ou se preocupe com uma em particular) no in챠cio das linhas com \"informa챌천es estendidas\". Dessa forma, caso alguma vez haja informa챌천es que foram adicionadas (como a codifica챌찾o do commit ou o coment찼rio estendido do commit), um \"blame viewer\" n찾o ir찼 se importar."
#. type: Title -
#: en/git-blame.txt:225 en/git-check-mailmap.txt:40 en/git-shortlog.txt:83
@@ -11371,10 +9422,8 @@ msgstr ""
"\t[--points-at <objeto>] [--format=<formato>]\n"
"\t[(-r | --remotes) | (-a | --all)]\n"
"\t[--list] [<pattern>...]\n"
-"'git branch' [--track | --no-track] [-f] <nome-do-ramo> [<ponto-de-partida>]"
-"\n"
-"'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<nome-do-ramo>]"
-"\n"
+"'git branch' [--track | --no-track] [-f] <nome-do-ramo> [<ponto-de-partida>]\n"
+"'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<nome-do-ramo>]\n"
"'git branch' --unset-upstream [<nome-do-ramo>]\n"
"'git branch' (-m | -M) [<ramo-antigo>] <nome-do-ramo>\n"
"'git branch' (-c | -C) [<ramo-antigo>] <novo-ramo>\n"
@@ -11385,124 +9434,67 @@ msgstr ""
#: en/git-branch.txt:36
#, priority:240
msgid "If `--list` is given, or if there are no non-option arguments, existing branches are listed; the current branch will be highlighted in green and marked with an asterisk. Any branches checked out in linked worktrees will be highlighted in cyan and marked with a plus sign. Option `-r` causes the remote-tracking branches to be listed, and option `-a` shows both local and remote branches."
-msgstr ""
-"Caso a op챌찾o `--list` seja utilizada ou caso n찾o haja argumentos n찾o "
-"opcionais, as ramifica챌천es existentes ser찾o listadas; o ramo atual ser찼 "
-"destacado em verde e marcado com um asterisco. Quaisquer ramifica챌천es "
-"retiradas das 찼reas de trabalho vinculadas, ser찾o destacadas em ciano e "
-"marcadas com um sinal de adi챌찾o. A op챌찾o `-r` faz com que as ramifica챌천es "
-"monitoradas remotamente sejam listadas, a op챌찾o `-a` exibe as ramifica챌천es "
-"locais e as remotas."
+msgstr "Caso a op챌찾o `--list` seja utilizada ou caso n찾o haja argumentos n찾o opcionais, as ramifica챌천es existentes ser찾o listadas; o ramo atual ser찼 destacado em verde e marcado com um asterisco. Quaisquer ramifica챌천es retiradas das 찼reas de trabalho vinculadas, ser찾o destacadas em ciano e marcadas com um sinal de adi챌찾o. A op챌찾o `-r` faz com que as ramifica챌천es monitoradas remotamente sejam listadas, a op챌찾o `-a` exibe as ramifica챌천es locais e as remotas."
#. type: Plain text
#: en/git-branch.txt:41
#, priority:240
msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
-msgstr ""
-"Caso um `<padr찾o>` seja informado, ele ser찼 utilizado como um curinga do "
-"shell para restringir a sa챠da das ramifica챌천es correspondentes. Caso v찼rios "
-"padr천es sejam informados, um ramo ser찼 exibido caso coincida com qualquer um "
-"dos padr천es."
+msgstr "Caso um `<padr찾o>` seja informado, ele ser찼 utilizado como um curinga do shell para restringir a sa챠da das ramifica챌천es correspondentes. Caso v찼rios padr천es sejam informados, um ramo ser찼 exibido caso coincida com qualquer um dos padr천es."
#. type: Plain text
#: en/git-branch.txt:45
#, priority:240
msgid "Note that when providing a `<pattern>`, you must use `--list`; otherwise the command may be interpreted as branch creation."
-msgstr ""
-"Note que ao fornecer um `<padr찾o>` voc챗 deve utilizar `--list`; caso "
-"contr찼rio, o comando pode ser interpretado como uma cria챌찾o do ramo."
+msgstr "Note que ao fornecer um `<padr찾o>` voc챗 deve utilizar `--list`; caso contr찼rio, o comando pode ser interpretado como uma cria챌찾o do ramo."
#. type: Plain text
#: en/git-branch.txt:54
#, priority:240
msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed. With `--no-merged` only branches not merged into the named commit will be listed. If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
-msgstr ""
-"Com a op챌찾o `--contains`, exibe apenas os ramos que contenham o commit "
-"informado (em outras palavras, os ramos cujos commits do topo sejam os "
-"descendentes do commit informado),`--no-contains` funciona ao contr찼rio. Com "
-"a op챌찾o `--merged`, apenas as ramifica챌천es mescladas no commit informado "
-"ser찾o listados (ou seja, os ramos cujos commits do cume estej acess챠vel a "
-"partir do commit informado). Com `--no-merged', ser찾o listados apenas as "
-"ramifica챌천es n찾o mescladas do commit informado. Caso o argumento `<commit>` "
-"esteja ausente, a predefini챌찾o ser찼 `HEAD` (ou seja, o do ramo atual)."
+msgstr "Com a op챌찾o `--contains`, exibe apenas os ramos que contenham o commit informado (em outras palavras, os ramos cujos commits do topo sejam os descendentes do commit informado),`--no-contains` funciona ao contr찼rio. Com a op챌찾o `--merged`, apenas as ramifica챌천es mescladas no commit informado ser찾o listados (ou seja, os ramos cujos commits do cume estej acess챠vel a partir do commit informado). Com `--no-merged', ser찾o listados apenas as ramifica챌천es n찾o mescladas do commit informado. Caso o argumento `<commit>` esteja ausente, a predefini챌찾o ser찼 `HEAD` (ou seja, o do ramo atual)."
#. type: Plain text
#: en/git-branch.txt:61
#, 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 ""
-"O segundo formul찼rio do comando cria um novo cabe챌alho do ramo informado "
-"`<branchname>` (nome do ramo0), que aponta para o `HEAD` atual, ou o `<start-"
-"point>` (ponto de in챠cio) se utilizado. Como um caso especial, para o "
-"`<start-point>`, utilize `\"A...B\"` como um atalho para a base da mesclagem "
-"de `A` e `B` caso sejam exatamente uma base para ser mesclada. Voc챗 pode "
-"deixar de fora no m찼ximo um de `A` e `B`, caso onde a predefini챌찾o 챕 `HEAD`."
+msgstr "O segundo formul찼rio do comando cria um novo cabe챌alho do ramo informado `<branchname>` (nome do ramo0), que aponta para o `HEAD` atual, ou o `<start-point>` (ponto de in챠cio) se utilizado. Como um caso especial, para o `<start-point>`, utilize `\"A...B\"` como um atalho para a base da mesclagem de `A` e `B` caso sejam exatamente uma base para ser mesclada. Voc챗 pode deixar de fora no m찼ximo um de `A` e `B`, caso onde a predefini챌찾o 챕 `HEAD`."
#. type: Plain text
#: en/git-branch.txt:65
#, 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; para alternar para a nova ramifica챌찾o utilize \"git "
-"switch <novo-ramo>\"."
+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 utilize \"git switch <novo-ramo>\"."
#. type: Plain text
#: en/git-branch.txt:73
#, priority:240
msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
-msgstr ""
-"Quando uma ramifica챌찾o local 챕 iniciada em uma ramifica챌찾o remotamente "
-"monitorada, o Git define a ramifica챌찾o (especificamente as entradas da "
-"configura챌찾o `branch.<nome>.remote` e `branch.<nome>.merge`) para que o "
-"comando 'git pull' mescle adequadamente a partir do ramo monitorado "
-"remotamente. Este comportamento pode ser alterado atrav챕s da vari찼vel da "
-"configura챌찾o global `branch.autoSetupMerge`. Esta configura챌찾o pode ser "
-"substitu챠da utilizando as op챌천es `--track` e `--no-track`, podendo ser "
-"alterada posteriormente utilizando o comando `git branch --set-upstream-to`."
+msgstr "Quando uma ramifica챌찾o local 챕 iniciada em uma ramifica챌찾o remotamente monitorada, o Git define a ramifica챌찾o (especificamente as entradas da configura챌찾o `branch.<nome>.remote` e `branch.<nome>.merge`) para que o comando 'git pull' mescle adequadamente a partir do ramo monitorado remotamente. Este comportamento pode ser alterado atrav챕s da vari찼vel da configura챌찾o global `branch.autoSetupMerge`. Esta configura챌찾o pode ser substitu챠da utilizando as op챌천es `--track` e `--no-track`, podendo ser alterada posteriormente utilizando o comando `git branch --set-upstream-to`."
#. type: Plain text
#: en/git-branch.txt:79
#, priority:240
msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
-msgstr ""
-"Com uma op챌찾o `-m` ou `-M`, o ramo antigo `<oldbranch>` ser찼 renomeado para "
-"o novo ramo `<newbranch>`. Caso o `<oldbranch>` tenha um reflog "
-"correspondente, ele ser찼 renomeado para coincidir com o `<newbranch>`, uma "
-"entrada de reflog ser찼 criada para lembrar da renomea챌찾o do ramo. Caso "
-"`<newbranch>` exista, -M deve ser utilizado para impor que a renomea챌찾o "
-"aconte챌a."
+msgstr "Com uma op챌찾o `-m` ou `-M`, o ramo antigo `<oldbranch>` ser찼 renomeado para o novo ramo `<newbranch>`. Caso o `<oldbranch>` tenha um reflog correspondente, ele ser찼 renomeado para coincidir com o `<newbranch>`, uma entrada de reflog ser찼 criada para lembrar da renomea챌찾o do ramo. Caso `<newbranch>` exista, -M deve ser utilizado para impor que a renomea챌찾o aconte챌a."
#. type: Plain text
#: en/git-branch.txt:83
#, priority:240
msgid "The `-c` and `-C` options have the exact same semantics as `-m` and `-M`, except instead of the branch being renamed it along with its config and reflog will be copied to a new name."
-msgstr ""
-"As op챌천es `-c` e `-C` possuem exatamente a mesma sem창ntica que `-m` e `-M`, "
-"exceto que em vez do ramo ser renomeado juntamente com sua configura챌찾o, o "
-"reflog ser찼 copiado para um novo nome."
+msgstr "As op챌천es `-c` e `-C` possuem exatamente a mesma sem창ntica que `-m` e `-M`, exceto que em vez do ramo ser renomeado juntamente com sua configura챌찾o, o reflog ser찼 copiado para um novo nome."
#. type: Plain text
#: en/git-branch.txt:87
#, priority:240
msgid "With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify more than one branch for deletion. If the branch currently has a reflog then the reflog will also be deleted."
-msgstr ""
-"Com uma op챌찾o `-d` ou `-D`, o `<branchname>` ser찼 exclu챠do. Voc챗 pode "
-"informar mais de uma ramifica챌찾o para ser exclu챠do. Caso o ramo tiver "
-"atualmente um reflog, este tamb챕m ser찼 exclu챠do."
+msgstr "Com uma op챌찾o `-d` ou `-D`, o `<branchname>` ser찼 exclu챠do. Voc챗 pode informar mais de uma ramifica챌찾o para ser exclu챠do. Caso o ramo tiver atualmente um reflog, este tamb챕m ser찼 exclu챠do."
#. type: Plain text
#: en/git-branch.txt:93
#, priority:240
msgid "Use `-r` together with `-d` to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist in the remote repository or if 'git fetch' was configured not to fetch them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a way to clean up all obsolete remote-tracking branches."
-msgstr ""
-"Utilize a op챌찾o `-r` junto com `-d` para excluir o monitoramento das "
-"ramifica챌천es remotas. Observe que s처 faz sentido excluir o monitoramento das "
-"ramifica챌천es remotas caso elas n찾o existam mais no reposit처rio remoto ou "
-"caso o comando 'git fetch' tenha sido configurado para n찾o resgat찼-las "
-"novamente. Consulte tamb챕m o subcomando 'prune' linkgit:git-remote[1] para "
-"conhecer uma maneira de limpar todos os monitoramentos obsoletos das "
-"ramifica챌천es remotas."
+msgstr "Utilize a op챌찾o `-r` junto com `-d` para excluir o monitoramento das ramifica챌천es remotas. Observe que s처 faz sentido excluir o monitoramento das ramifica챌천es remotas caso elas n찾o existam mais no reposit처rio remoto ou caso o comando 'git fetch' tenha sido configurado para n찾o resgat찼-las novamente. Consulte tamb챕m o subcomando 'prune' linkgit:git-remote[1] para conhecer uma maneira de limpar todos os monitoramentos obsoletos das ramifica챌천es remotas."
#. type: Labeled list
#: en/git-branch.txt:97 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83
@@ -11520,10 +9512,7 @@ msgstr "--delete"
#: en/git-branch.txt:102
#, priority:240
msgid "Delete a branch. The branch must be fully merged in its upstream branch, or in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
-msgstr ""
-"Exclua uma ramifica챌찾o. A ramifica챌찾o deve ser totalmente mesclada sua "
-"ramifica챌찾o \"upstream\" ou no `HEAD` caso nenhum \"upstream\" tenha sido "
-"definido, utilize `--track` ou `--set-upstream-to`."
+msgstr "Exclua uma ramifica챌찾o. A ramifica챌찾o deve ser totalmente mesclada sua ramifica챌찾o \"upstream\" ou no `HEAD` caso nenhum \"upstream\" tenha sido definido, utilize `--track` ou `--set-upstream-to`."
#. type: Plain text
#: en/git-branch.txt:105
@@ -11541,26 +9530,13 @@ msgstr "--create-reflog"
#: en/git-branch.txt:115
#, priority:240
msgid "Create the branch's reflog. This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option. The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
-msgstr ""
-"Crie o reflog do ramo. Ativa a grava챌찾o de todas as altera챌천es feitas no "
-"\"ref\" do ramo, permitindo a utiliza챌찾o de express천es sha1 baseadas na "
-"data, como `<branchname>@\\{yesterday}`. Observe que nos reposit처rios que "
-"n찾o estiverem vazios, 챕 predefinido que os reflogs geralmente sejam ativados "
-"atrav챕s da vari찼vel da configura챌찾o `core.logAllRefUpdates`. A forma negada "
-"o comando `--no-create-reflog` substitui apenas um `--create-reflog` "
-"anterior, mas atualmente n찾o nega a configura챌찾o do `core.logAllRefUpdates`."
+msgstr "Crie o reflog do ramo. Ativa a grava챌찾o de todas as altera챌천es feitas no \"ref\" do ramo, permitindo a utiliza챌찾o de express천es sha1 baseadas na data, como `<branchname>@\\{yesterday}`. Observe que nos reposit처rios que n찾o estiverem vazios, 챕 predefinido que os reflogs geralmente sejam ativados atrav챕s da vari찼vel da configura챌찾o `core.logAllRefUpdates`. A forma negada o comando `--no-create-reflog` substitui apenas um `--create-reflog` anterior, mas atualmente n찾o nega a configura챌찾o do `core.logAllRefUpdates`."
#. type: Plain text
#: en/git-branch.txt:124
#, priority:240
msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch. In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
-msgstr ""
-"Redefina o `<branchname>` para `<startpoint>`, mesmo se o `<branchname>` j찼 "
-"existir. Sem o `-f`, o comando 'git branch' se recusa a alterar uma "
-"ramifica챌찾o j찼 existente. Em combina챌찾o com `-d` (ou `--delete`), permita "
-"excluir a ramifica챌찾o, independentemente da sua condi챌찾o de mesclagem. Em "
-"combina챌찾o com `-m` (ou `--move`), permita renomear a ramifica챌찾o, mesmo que "
-"o novo nome do ramo j찼 exista, o mesmo se aplica com `-c` (ou `--copy`)."
+msgstr "Redefina o `<branchname>` para `<startpoint>`, mesmo se o `<branchname>` j찼 existir. Sem o `-f`, o comando 'git branch' se recusa a alterar uma ramifica챌찾o j찼 existente. Em combina챌찾o com `-d` (ou `--delete`), permita excluir a ramifica챌찾o, independentemente da sua condi챌찾o de mesclagem. Em combina챌찾o com `-m` (ou `--move`), permita renomear a ramifica챌찾o, mesmo que o novo nome do ramo j찼 exista, o mesmo se aplica com `-c` (ou `--copy`)."
#. type: Labeled list
#: en/git-branch.txt:126
@@ -11614,18 +9590,13 @@ msgstr "Shortcut for `--c처pia --for챌a`."
#: en/git-branch.txt:143
#, priority:240
msgid "Color branches to highlight current, local, and remote-tracking branches. The value must be always (the default), never, or auto."
-msgstr ""
-"Colora as ramifica챌천es para dar destaque nas ramifica챌천es atuais, locais e "
-"monitoradas remotamente. Always (sempre) 챕 o valor predefinido, as outras "
-"op챌천es s찾o \"never\" ou \"auto\"."
+msgstr "Colora as ramifica챌천es para dar destaque nas ramifica챌천es atuais, locais e monitoradas remotamente. Always (sempre) 챕 o valor predefinido, as outras op챌천es s찾o \"never\" ou \"auto\"."
#. type: Plain text
#: en/git-branch.txt:148
#, priority:240
msgid "Turn off branch colors, even when the configuration file gives the default to color output. Same as `--color=never`."
-msgstr ""
-"Desative as cores do ramo, mesmo quando o arquivo de configura챌찾o informar o "
-"valor predefinido para a sa챠da das cores. O mesmo que `--color=never`."
+msgstr "Desative as cores do ramo, mesmo quando o arquivo de configura챌찾o informar o valor predefinido para a sa챠da das cores. O mesmo que `--color=never`."
#. type: Labeled list
#: en/git-branch.txt:150 en/git-for-each-ref.txt:95 en/git-grep.txt:114 en/git-tag.txt:131
@@ -11655,11 +9626,7 @@ msgstr "--no-column"
#: en/git-branch.txt:158
#, priority:240
msgid "Display branch listing in columns. See configuration variable column.branch for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
-msgstr ""
-"Exibir a lista das ramifica챌천es em colunas. Consulte a vari찼vel da "
-"configura챌찾o `column.branch` para conhecer a sintaxe da op챌찾o. As op챌천es "
-"`--column` e `--no-column` sem nenhum argumento s찾o equivalentes a 'always' "
-"e 'never' respectivamente."
+msgstr "Exibir a lista das ramifica챌천es em colunas. Consulte a vari찼vel da configura챌찾o `column.branch` para conhecer a sintaxe da op챌찾o. As op챌천es `--column` e `--no-column` sem nenhum argumento s찾o equivalentes a 'always' e 'never' respectivamente."
#. type: Plain text
#: en/git-branch.txt:160
@@ -11677,27 +9644,19 @@ msgstr "--remotes"
#: en/git-branch.txt:165
#, priority:240
msgid "List or delete (if used with -d) the remote-tracking branches. Combine with `--list` to match the optional pattern(s)."
-msgstr ""
-"Liste ou exclua (se utilizado com -d) as ramifica챌천es rastreadas "
-"remotamente. Combine com a op챌찾o `--list` para coincidir com os padr천es "
-"opcionais."
+msgstr "Liste ou exclua (se utilizado com -d) as ramifica챌천es rastreadas remotamente. Combine com a op챌찾o `--list` para coincidir com os padr천es opcionais."
#. type: Plain text
#: en/git-branch.txt:170
#, priority:240
msgid "List both remote-tracking branches and local branches. Combine with `--list` to match optional pattern(s)."
-msgstr ""
-"Liste ambas as ramifica챌천es rastreadas remotamente e as ramifica챌천es "
-"locais. Combine com a op챌찾o `--list` para que coincida com os padr천es "
-"opcionais."
+msgstr "Liste ambas as ramifica챌천es rastreadas remotamente e as ramifica챌천es locais. Combine com a op챌찾o `--list` para que coincida com os padr천es opcionais."
#. type: Plain text
#: en/git-branch.txt:176
#, ignore-ellipsis, priority:240
msgid "List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-*'`, list only the branches that match the pattern(s)."
-msgstr ""
-"Lista as ramifica챌천es. Com o `<padr찾o>...` opcional, o comando `git branch "
-"--list 'maint-*'`, lista apenas as ramifica챌천es que coincidam com os padr천es."
+msgstr "Lista as ramifica챌천es. Com o `<padr찾o>...` opcional, o comando `git branch --list 'maint-*'`, lista apenas as ramifica챌천es que coincidam com os padr천es."
#. type: Labeled list
#: en/git-branch.txt:177
@@ -11709,9 +9668,7 @@ msgstr "--show-current"
#: en/git-branch.txt:180
#, priority:240
msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
-msgstr ""
-"Exiba o nome do ramo atual. No estado onde `HEAD` seja desanexado, nada 챕 "
-"exibido."
+msgstr "Exiba o nome do ramo atual. No estado onde `HEAD` seja desanexado, nada 챕 exibido."
#. type: Labeled list
#: en/git-branch.txt:182
@@ -11723,22 +9680,13 @@ msgstr "-vv"
#: en/git-branch.txt:191
#, 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 listagem, exiba o sha1 e confirme a linha do "
-"assunto para cada cabe챌alho, juntamente com o relacionamento com o ramo "
-"\"upstream\" (caso haja). Se utilizado duas vezes, exiba a vincula챌찾o do "
-"caminho da 찼rvore de trabalho (caso haja) e o nome do ramo \"upstream\" ("
-"consulte tamb챕m `git remote show <remote>`). Observe que o `HEAD` da 찼rvore "
-"de trabalho atual n찾o ter찼 o seu caminho mostrado (sempre ser찼 seu diret처rio "
-"atual)."
+msgstr "Quando estiver no modo de listagem, exiba o sha1 e confirme a linha do assunto para cada cabe챌alho, juntamente com o relacionamento com o ramo \"upstream\" (caso haja). Se utilizado duas vezes, exiba a vincula챌찾o do caminho da 찼rvore de trabalho (caso haja) e o nome do ramo \"upstream\" (consulte tamb챕m `git remote show <remote>`). Observe que o `HEAD` da 찼rvore de trabalho atual n찾o ter찼 o seu caminho mostrado (sempre ser찼 seu diret처rio atual)."
#. type: Plain text
#: en/git-branch.txt:196
#, priority:240
msgid "Be more quiet when creating or deleting a branch, suppressing non-error messages."
-msgstr ""
-"Seja mais silencioso ao criar ou excluir uma ramifica챌찾o, suprimindo as "
-"mensagens que n찾o sejam de erro."
+msgstr "Seja mais silencioso ao criar ou excluir uma ramifica챌찾o, suprimindo as mensagens que n찾o sejam de erro."
#. type: Labeled list
#: en/git-branch.txt:197
@@ -11750,10 +9698,7 @@ msgstr "--abrev=<comprimento>"
#: en/git-branch.txt:201
#, priority:240
msgid "Alter the sha1's minimum display length in the output listing. The default value is 7 and can be overridden by the `core.abbrev` config option."
-msgstr ""
-"Altere o comprimento m챠nimo da exibi챌찾o do sha1 na listagem de sa챠da. O "
-"valor predefinido 챕 7, pode ser substitu챠do atrav챕s da vari찼vel da "
-"configura챌찾o `core.abbrev`."
+msgstr "Altere o comprimento m챠nimo da exibi챌찾o do sha1 na listagem de sa챠da. O valor predefinido 챕 7, pode ser substitu챠do atrav챕s da vari찼vel da configura챌찾o `core.abbrev`."
#. type: Labeled list
#: en/git-branch.txt:202
@@ -11777,26 +9722,13 @@ msgstr "--track"
#: en/git-branch.txt:214
#, priority:240
msgid "When creating a new branch, set up `branch.<name>.remote` and `branch.<name>.merge` configuration entries to mark the start-point branch as \"upstream\" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, it directs `git pull` without arguments to pull from the upstream when the new branch is checked out."
-msgstr ""
-"Ao criar uma nova ramifica챌찾o, configure as entradas da configura챌찾o "
-"`branch.<nome>.remote` e `branch.<nome>.merge` para marcar a ramifica챌찾o do "
-"ponto do in챠cio como \"upstream\" partindo da nova ramifica챌찾o. Esta "
-"configura챌찾o instruir찼 o git a exibir o relacionamento entre as duas "
-"ramifica챌천es com o `git status` e com o `git branch -v`. Al챕m disso, ele "
-"direciona o `git pull` sem argumentos para extrair do \"upstream\" quando o "
-"novo ramo for retirado."
+msgstr "Ao criar uma nova ramifica챌찾o, configure as entradas da configura챌찾o `branch.<nome>.remote` e `branch.<nome>.merge` para marcar a ramifica챌찾o do ponto do in챠cio como \"upstream\" partindo da nova ramifica챌찾o. Esta configura챌찾o instruir찼 o git a exibir o relacionamento entre as duas ramifica챌천es com o `git status` e com o `git branch -v`. Al챕m disso, ele direciona o `git pull` sem argumentos para extrair do \"upstream\" quando o novo ramo for retirado."
#. type: Plain text
#: en/git-branch.txt:220
#, 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 ""
-"Este 챕 o comportamento predefinido quando o ponto inicial for uma "
-"ramifica챌찾o rastreada remotamente. Defina a vari찼vel da configura챌찾o `branch"
-".autoSetupMerge` como `false` caso queira que o `git switch`, `git checkout` "
-"e o `git branch` sempre se comportem como se a op챌찾o `--no-track` fosse "
-"utilizada. Defina-o como `always` caso queira que este comportamento quando "
-"o ponto de partida for uma ramifica챌찾o local ou rastreada remotamente."
+msgstr "Este 챕 o comportamento predefinido quando o ponto inicial for uma ramifica챌찾o rastreada remotamente. Defina a vari찼vel da configura챌찾o `branch.autoSetupMerge` como `false` caso queira que o `git switch`, `git checkout` e o `git branch` sempre se comportem como se a op챌찾o `--no-track` fosse utilizada. Defina-o como `always` caso queira que este comportamento quando o ponto de partida for uma ramifica챌찾o local ou rastreada remotamente."
#. type: Labeled list
#: en/git-branch.txt:221 en/git-checkout.txt:172 en/git-switch.txt:167
@@ -11808,17 +9740,13 @@ msgstr "--no-track"
#: en/git-branch.txt:224
#, priority:240
msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
-msgstr ""
-"N찾o configure o \"upstream\", ainda que a vari찼vel da configura챌찾o `branch."
-"autoSetupMerge` seja verdadeira."
+msgstr "N찾o configure o \"upstream\", ainda que a vari찼vel da configura챌찾o `branch.autoSetupMerge` seja verdadeira."
#. type: Plain text
#: en/git-branch.txt:228
#, priority:240
msgid "As this option had confusing syntax, it is no longer supported. Please use `--track` or `--set-upstream-to` instead."
-msgstr ""
-"Como esta op챌찾o tinha a sintaxe confusa, agora ela 챕 obsoleta. Utilize "
-"`--track` ou `--set-upstream-to`."
+msgstr "Como esta op챌찾o tinha a sintaxe confusa, agora ela 챕 obsoleta. Utilize `--track` ou `--set-upstream-to`."
#. type: Labeled list
#: en/git-branch.txt:229
@@ -11836,10 +9764,7 @@ msgstr "--set-upstream-to=<upstream>"
#: en/git-branch.txt:234
#, priority:240
msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
-msgstr ""
-"Configure as informa챌천es do monitoramento do `<branchname>` para que o "
-"`<upstream>` seja considerado o ramo \"upstream\" do `<branchname>`. Caso "
-"nenhum `<branchname>` seja utilizado, a predefini챌찾o ser찼 o ramo atual."
+msgstr "Configure as informa챌천es do monitoramento do `<branchname>` para que o `<upstream>` seja considerado o ramo \"upstream\" do `<branchname>`. Caso nenhum `<branchname>` seja utilizado, a predefini챌찾o ser찼 o ramo atual."
#. type: Labeled list
#: en/git-branch.txt:235
@@ -11851,9 +9776,7 @@ msgstr "--unset-upstream"
#: en/git-branch.txt:238
#, priority:240
msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
-msgstr ""
-"Remova as informa챌천es \"upstream\" para o `<branchname>`. Caso nenhuma "
-"ramifica챌찾o seja utilizada, a predefini챌찾o ser찼 a ramifica챌찾o atual."
+msgstr "Remova as informa챌천es \"upstream\" para o `<branchname>`. Caso nenhuma ramifica챌찾o seja utilizada, a predefini챌찾o ser찼 a ramifica챌찾o atual."
#. type: Labeled list
#: en/git-branch.txt:239
@@ -11865,11 +9788,7 @@ msgstr "--edit-description"
#: en/git-branch.txt:244
#, priority:240
msgid "Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `format-patch`, `request-pull`, and `merge` (if enabled)). Multi-line explanations may be used."
-msgstr ""
-"Abra um editor e edite o texto para explicar para que serve a ramifica챌찾o, "
-"para ser utilizado por outros comandos (`format-patch`, `request-pull` e "
-"`merge` por exemplo (se ativado)). Podem ser utilizadas as explica챌천es em "
-"mais de uma linha."
+msgstr "Abra um editor e edite o texto para explicar para que serve a ramifica챌찾o, para ser utilizado por outros comandos (`format-patch`, `request-pull` e `merge` por exemplo (se ativado)). Podem ser utilizadas as explica챌천es em mais de uma linha."
#. type: Labeled list
#: en/git-branch.txt:245 en/git-tag.txt:142
@@ -11881,9 +9800,7 @@ msgstr "--contains [<commit>]"
#: en/git-branch.txt:248
#, priority:240
msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
-msgstr ""
-"Listar apenas as ramifica챌천es que contenham o commit informado (`HEAD`, caso "
-"nenhum seja informado). Implica no uso da op챌찾o `--list`."
+msgstr "Listar apenas as ramifica챌천es que contenham o commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da op챌찾o `--list`."
#. type: Labeled list
#: en/git-branch.txt:249 en/git-tag.txt:146
@@ -11895,9 +9812,7 @@ msgstr "--no-contains [<commit>]"
#: en/git-branch.txt:252
#, priority:240
msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
-msgstr ""
-"Liste apenas as ramifica챌천es que n찾o contenha o commit informado (`HEAD`, "
-"caso nenhum seja informado). Implica no uso da op챌찾o `--list`."
+msgstr "Liste apenas as ramifica챌천es que n찾o contenha o commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da op챌찾o `--list`."
#. type: Labeled list
#: en/git-branch.txt:253 en/git-tag.txt:150
@@ -11909,10 +9824,7 @@ msgstr "--merged [<commit>]"
#: en/git-branch.txt:257
#, priority:240
msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--no-merged`."
-msgstr ""
-"Liste apenas as ramifica챌천es cujas dicas s찾o acess챠veis a partir do commit "
-"informado (`HEAD`, caso nenhum seja informado). Implica no uso da op챌찾o "
-"`--list`, 챕 incompat챠vel com a op챌찾o `--no-merged`."
+msgstr "Liste apenas as ramifica챌천es cujas dicas s찾o acess챠veis a partir do commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da op챌찾o `--list`, 챕 incompat챠vel com a op챌찾o `--no-merged`."
#. type: Labeled list
#: en/git-branch.txt:258 en/git-tag.txt:154
@@ -11924,10 +9836,7 @@ msgstr "--no-merged [<commit>]"
#: en/git-branch.txt:262
#, priority:240
msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--merged`."
-msgstr ""
-"Liste apenas as ramifica챌천es cujas dicas n찾o possam ser acessadas a partir "
-"do commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da "
-"op챌찾o `--list`, 챕 incompat챠vel com `--merged`."
+msgstr "Liste apenas as ramifica챌천es cujas dicas n찾o possam ser acessadas a partir do commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da op챌찾o `--list`, 챕 incompat챠vel com `--merged`."
#. type: Labeled list
#: en/git-branch.txt:263
@@ -11939,11 +9848,7 @@ msgstr "<branchname>"
#: en/git-branch.txt:268
#, priority:240
msgid "The name of the branch to create or delete. The new branch name must pass all checks defined by linkgit:git-check-ref-format[1]. Some of these checks may restrict the characters allowed in a branch name."
-msgstr ""
-"O nome do ramo que ser찼 criada ou exclu챠da. O nome da nova ramifica챌찾o deve "
-"passar em todas as verifica챌천es definidas pelo linkgit:git-check-ref-"
-"format[1]. Algumas dessas verifica챌천es podem restringir os caracteres "
-"permitidos no nome de uma ramifica챌찾o."
+msgstr "O nome do ramo que ser찼 criada ou exclu챠da. O nome da nova ramifica챌찾o deve passar em todas as verifica챌천es definidas pelo linkgit:git-check-ref-format[1]. Algumas dessas verifica챌천es podem restringir os caracteres permitidos no nome de uma ramifica챌찾o."
#. type: Labeled list
#: en/git-branch.txt:269 en/git-switch.txt:42
@@ -11955,10 +9860,7 @@ msgstr "<start-point>"
#: en/git-branch.txt:273
#, priority:240
msgid "The new branch head will point to this commit. It may be given as a branch name, a commit-id, or a tag. If this option is omitted, the current HEAD will be used instead."
-msgstr ""
-"O cabe챌alho da nova ramifica챌찾o apontar찼 para este commit. Pode ser "
-"utilizado como um nome do ramo, um ID do commit ou uma tag. Caso esta op챌찾o "
-"seja omitida, o `HEAD` atual ser찼 utilizado."
+msgstr "O cabe챌alho da nova ramifica챌찾o apontar찼 para este commit. Pode ser utilizado como um nome do ramo, um ID do commit ou uma tag. Caso esta op챌찾o seja omitida, o `HEAD` atual ser찼 utilizado."
#. type: Labeled list
#: en/git-branch.txt:274
@@ -11982,9 +9884,7 @@ msgstr "<newbranch>"
#: en/git-branch.txt:280
#, priority:240
msgid "The new name for an existing branch. The same restrictions as for <branchname> apply."
-msgstr ""
-"Um novo nome para um ramo j찼 existente. Se aplicam as mesmas restri챌천es para "
-"`<branchname>`."
+msgstr "Um novo nome para um ramo j찼 existente. Se aplicam as mesmas restri챌천es para `<branchname>`."
#. type: Labeled list
#: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:65 en/git-tag.txt:112
@@ -11996,16 +9896,7 @@ msgstr "--sort=<chave>"
#: en/git-branch.txt:291
#, ignore-ellipsis, 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. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `branch.sort` variable if exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See linkgit:git-config[1]."
-msgstr ""
-"Classifique com base na chave informada. O prefixo `-` 챕 utilizado para "
-"classificar em ordem decrescente. Voc챗 pode utilizar a op챌찾o `--sort=<chave>`"
-" mais de uma vez; nesse caso, a 첬ltima chave se torna a chave prim찼ria. As "
-"chaves compat챠veis s찾o as mesmas que as do `git for-each-ref`. A "
-"predefini챌찾o da ordem da classifica챌찾o 챕 o valor configurado para a vari찼vel "
-"`branch.sort`, caso exista ou a classifica챌찾o com base no nome completo da "
-"\"ref\" (incluindo o prefixo `refs/...`). Isso lista primeiro o `HEAD` "
-"desanexado (se presente), depois as ramifica챌천es locais e finalmente as "
-"ramifica챌천es monitorada remotamente. Consulte linkgit:git-config[1]."
+msgstr "Classifique com base na chave informada. O prefixo `-` 챕 utilizado para classificar em ordem decrescente. Voc챗 pode utilizar a op챌찾o `--sort=<chave>` mais de uma vez; nesse caso, a 첬ltima chave se torna a chave prim찼ria. As chaves compat챠veis s찾o as mesmas que as do `git for-each-ref`. A predefini챌찾o da ordem da classifica챌찾o 챕 o valor configurado para a vari찼vel `branch.sort`, caso exista ou a classifica챌찾o com base no nome completo da \"ref\" (incluindo o prefixo `refs/...`). Isso lista primeiro o `HEAD` desanexado (se presente), depois as ramifica챌천es locais e finalmente as ramifica챌천es monitorada remotamente. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/git-branch.txt:293 en/git-tag.txt:158
@@ -12029,19 +9920,13 @@ msgstr "--format <formato>"
#: 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 cadeia de caracteres que interpola `%(fieldname)` de uma tag \"ref\" que "
-"est찼 sendo exibida e o objeto para o qual ele aponta. O formato 챕 o mesmo "
-"do linkgit:git-for-each-ref[1]."
+msgstr "Uma cadeia de caracteres que interpola `%(fieldname)` de uma tag \"ref\" que est찼 sendo exibida e o objeto para o qual ele aponta. O formato 챕 o mesmo do linkgit:git-for-each-ref[1]."
#. type: Plain text
#: en/git-branch.txt:306
#, priority:240
msgid "`pager.branch` is only respected when listing branches, i.e., when `--list` is used or implied. The default is to use a pager. See linkgit:git-config[1]."
-msgstr ""
-"O `pager.branch` 챕 respeitado apenas ao listar as ramifica챌천es, ou seja, "
-"quando a op챌찾o `--list` 챕 utilizado ou impl챠cito. A predefini챌찾o 챕 utilizar "
-"um pager. Consulte linkgit:git-config[1]."
+msgstr "O `pager.branch` 챕 respeitado apenas ao listar as ramifica챌천es, ou seja, quando a op챌찾o `--list` 챕 utilizado ou impl챠cito. A predefini챌찾o 챕 utilizar um pager. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/git-branch.txt:310
@@ -12093,18 +9978,13 @@ msgstr ""
#: en/git-branch.txt:334
#, priority:240
msgid "Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next 'fetch' or 'pull' will create them again unless you configure them not to. See linkgit:git-fetch[1]."
-msgstr ""
-"Exclua as ramifica챌천es rastreadas remotamente \"todo\", \"html\" e \"man\". "
-"O pr처ximo 'fetch' (resgate) ou 'pull' (captura) os criar찼 novamente a menos "
-"que voc챗 os configure para n찾o faz챗-lo. Consulte linkgit:git-fetch[1]."
+msgstr "Exclua as ramifica챌천es rastreadas remotamente \"todo\", \"html\" e \"man\". O pr처ximo 'fetch' (resgate) ou 'pull' (captura) os criar찼 novamente a menos que voc챗 os configure para n찾o faz챗-lo. Consulte linkgit:git-fetch[1]."
#. type: Plain text
#: en/git-branch.txt:336
#, priority:240
msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
-msgstr ""
-"Exclua o ramo \"teste\", mesmo que o ramo \"principal\" (ou o ramo que est찼 "
-"com o check-out no momento) n찾o tenha todos os commits do ramo do teste."
+msgstr "Exclua o ramo \"teste\", mesmo que o ramo \"principal\" (ou o ramo que est찼 com o check-out no momento) n찾o tenha todos os commits do ramo do teste."
#. type: Labeled list
#: en/git-branch.txt:337
@@ -12126,17 +10006,13 @@ msgstr ""
#: 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 ""
-"Utilizando a op챌찾o `-a` entraria em conflito com `<remote>` em quaisquer "
-"ramifica챌천es locais que foram prefixadas com o mesmo padr찾o `<remote>`."
+msgstr "Utilizando a op챌찾o `-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] Consulte 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] Consulte linkgit:git-for-each-ref[1]"
#. type: Plain text
#: en/git-branch.txt:349
@@ -12154,10 +10030,7 @@ msgstr "OBSERVA횉횛ES"
#: en/git-branch.txt:356
#, 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 ""
-"Caso esteja criando uma nova ramifica챌찾o para o qual deseja alternar "
-"imediatamente 챕 mais f찼cil usar o comando \"git switch\" com a sua op챌찾o `-c`"
-" para fazer a mesma coisa utilizando apenas 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 a sua op챌찾o `-c` para fazer a mesma coisa utilizando apenas um 첬nico comando."
#. type: Plain text
#: en/git-branch.txt:359
@@ -12169,45 +10042,31 @@ msgstr "As op챌천es `--contains`, `--no-contains`, `--merged` e `--no-merged` se
#: 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>` 챕 utilizado 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>` informato."
+msgstr "`--contains <commit>` 챕 utilizado 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>` informato."
#. 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 ""
-"`--no-contains <commit>` 챕 o inverso, isto 챕, as ramifica챌천es que n찾o cont챗m "
-"o `<commit>` informado."
+msgstr "`--no-contains <commit>` 챕 o inverso, isto 챕, as ramifica챌천es que n찾o cont챗m o `<commit>` informado."
#. 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` 챕 utilizado 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` 챕 utilizado 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 ""
-"`--no-merged` 챕 utilizado 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`."
+msgstr "`--no-merged` 챕 utilizado 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-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 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 Git."
#. type: Title =
#: en/git-bugreport.txt:2
@@ -12219,28 +10078,19 @@ msgstr "git-bugreport(1)"
#: en/git-bugreport.txt:7
#, priority:100
msgid "git-bugreport - Collect information for user to file a bug report"
-msgstr ""
-"git-bugreport - Colete informa챌천es para que o usu찼rio arquive um relat처rio "
-"de erro"
+msgstr "git-bugreport - Colete informa챌천es para que o usu찼rio arquive um relat처rio de erro"
#. type: Plain text
#: en/git-bugreport.txt:12
#, no-wrap, priority:100
msgid "'git bugreport' [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"
-msgstr ""
-"'git bugreport' [(-o | --output-directory) <caminho>] [(-s | --suffix) "
-"<formato>]\n"
+msgstr "'git bugreport' [(-o | --output-directory) <caminho>] [(-s | --suffix) <formato>]\n"
#. type: Plain text
#: en/git-bugreport.txt:19
#, priority:100
msgid "Captures information about the user's machine, Git client, and repository state, as well as a form requesting information about the behavior the user observed, into a single text file which the user can then share, for example to the Git mailing list, in order to report an observed bug."
-msgstr ""
-"Capture as informa챌천es sobre a m찼quina do usu찼rio, o cliente Git e a "
-"condi챌찾o geral do reposit처rio, bem como um formul찼rio solicitando as "
-"informa챌천es sobre o comportamento observado pelo usu찼rio em um 첬nico arquivo "
-"do texto que o usu찼rio pode compartilhar, na lista de correspond챗ncia Git, "
-"para relatar um bug observado por exemplo."
+msgstr "Capture as informa챌천es sobre a m찼quina do usu찼rio, o cliente Git e a condi챌찾o geral do reposit처rio, bem como um formul찼rio solicitando as informa챌천es sobre o comportamento observado pelo usu찼rio em um 첬nico arquivo do texto que o usu찼rio pode compartilhar, na lista de correspond챗ncia Git, para relatar um bug observado por exemplo."
#. type: Plain text
#: en/git-bugreport.txt:21
@@ -12300,12 +10150,7 @@ msgstr "Uma lista com ganchos ativos"
#: en/git-bugreport.txt:37
#, priority:100
msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
-msgstr ""
-"Essa ferramenta 챕 chamada atrav챕s do processo de configura챌찾o t챠pica do Git "
-"que significa que, em alguns casos, talvez n찾o seja poss챠vel iniciar caso um "
-"arquivo de configura챌찾o relevante estiver ileg챠vel por exemplo. Nesse tipo "
-"de cen찼rio, pode ser 첬til reunir manualmente o tipo de informa챌찾o listado "
-"acima ao pedir ajuda manualmente."
+msgstr "Essa ferramenta 챕 chamada atrav챕s do processo de configura챌찾o t챠pica do Git que significa que, em alguns casos, talvez n찾o seja poss챠vel iniciar caso um arquivo de configura챌찾o relevante estiver ileg챠vel por exemplo. Nesse tipo de cen찼rio, pode ser 첬til reunir manualmente o tipo de informa챌찾o listado acima ao pedir ajuda manualmente."
#. type: Labeled list
#: en/git-bugreport.txt:40
@@ -12323,9 +10168,7 @@ msgstr "--output-directory <caminho>"
#: en/git-bugreport.txt:44
#, priority:100
msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
-msgstr ""
-"Coloque o arquivo do relat처rio dos erros resultantes em `<caminho>` em vez "
-"da raiz do reposit처rio Git."
+msgstr "Coloque o arquivo do relat처rio dos erros resultantes em `<caminho>` em vez da raiz do reposit처rio Git."
#. type: Labeled list
#: en/git-bugreport.txt:45
@@ -12341,13 +10184,10 @@ msgstr "--suffix <formato>"
#. type: Plain text
#: en/git-bugreport.txt:50
-#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
-msgstr ""
-"Defina um sufixo alternativo para o nome do relat처rio de erros, para criar "
-"um arquivo com o nome de 'git-bugreport-<formatted suffix>'. Isso deve "
-"assumir a forma de um formato da cadeia de caracteres link:strftime[3]; a "
-"hora local ser찼 utilizada."
+#, fuzzy, priority:100
+#| msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
+msgstr "Defina um sufixo alternativo para o nome do relat처rio de erros, para criar um arquivo com o nome de 'git-bugreport-<formatted suffix>'. Isso deve assumir a forma de um formato da cadeia de caracteres link:strftime[3]; a hora local ser찼 utilizada."
#. type: Title =
#: en/git-bundle.txt:2
@@ -12370,8 +10210,7 @@ msgid ""
"'git bundle' list-heads <file> [<refname>...]\n"
"'git bundle' unbundle <file> [<refname>...]\n"
msgstr ""
-"'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-"
-"progress-implied] <arquivo> <git-rev-list-args>\n"
+"'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied] <arquivo> <git-rev-list-args>\n"
"'git bundle' verify [-q | --quiet] <arquivo>\n"
"'git bundle' list-heads <arquivo> [<refname>...]\n"
"'git bundle' unbundle <arquivo> [<refname>...]\n"
@@ -12380,30 +10219,19 @@ msgstr ""
#: en/git-bundle.txt:24
#, priority:100
msgid "Some workflows require that one or more branches of development on one machine be replicated on another machine, but the two machines cannot be directly connected, and therefore the interactive Git protocols (git, ssh, http) cannot be used."
-msgstr ""
-"Alguns fluxos de trabalho requerem que um ou mais ramifica챌천es do "
-"desenvolvimento em uma m찼quina sejam replicadas em uma outra m찼quina, por챕m "
-"as duas m찼quinas n찾o podem ser conectadas diretamente, portanto, os "
-"protocolos interativos do Git (git, ssh, http) n찾o podem ser utilizados."
+msgstr "Alguns fluxos de trabalho requerem que um ou mais ramifica챌천es do desenvolvimento em uma m찼quina sejam replicadas em uma outra m찼quina, por챕m as duas m찼quinas n찾o podem ser conectadas diretamente, portanto, os protocolos interativos do Git (git, ssh, http) n찾o podem ser utilizados."
#. type: Plain text
#: en/git-bundle.txt:29
#, priority:100
msgid "The 'git bundle' command packages objects and references in an archive at the originating machine, which can then be imported into another repository using 'git fetch', 'git pull', or 'git clone', after moving the archive by some means (e.g., by sneakernet)."
-msgstr ""
-"O comando 'git bundle' empacota os objetos e as refer챗ncias em um arquivo na "
-"m찼quina de origem, que pode ser importado para um outro reposit처rio "
-"utilizando o comando 'git fetch', 'git pull' ou 'git clone', depois de mover "
-"o arquivo de alguma maneira (atrav챕s do \"sneakernet\" por exemplo)."
+msgstr "O comando 'git bundle' empacota os objetos e as refer챗ncias em um arquivo na m찼quina de origem, que pode ser importado para um outro reposit처rio utilizando o comando 'git fetch', 'git pull' ou 'git clone', depois de mover o arquivo de alguma maneira (atrav챕s do \"sneakernet\" por exemplo)."
#. type: Plain text
#: en/git-bundle.txt:35
#, priority:100
msgid "As no direct connection between the repositories exists, the user must specify a basis for the bundle that is held by the destination repository: the bundle assumes that all objects in the basis are already in the destination repository."
-msgstr ""
-"Como n찾o existe conex찾o direta entre os reposit처rios o usu찼rio deve informar "
-"uma base para o pacote que 챕 mantido pelo reposit처rio no destino: o pacote "
-"assume que todos os objetos na base j찼 est찾o no reposit처rio no destino."
+msgstr "Como n찾o existe conex찾o direta entre os reposit처rios o usu찼rio deve informar uma base para o pacote que 챕 mantido pelo reposit처rio no destino: o pacote assume que todos os objetos na base j찼 est찾o no reposit처rio no destino."
#. type: Labeled list
#: en/git-bundle.txt:39
@@ -12415,10 +10243,7 @@ msgstr "create [options] <arquivo> <git-rev-list-args>"
#: en/git-bundle.txt:44
#, 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 ""
-"Utilize para criar um pacote chamado 'arquivo'. Isso requer a utiliza챌찾o "
-"dos 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'."
+msgstr "Utilize para criar um pacote chamado 'arquivo'. Isso requer a utiliza챌찾o dos 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
@@ -12430,13 +10255,7 @@ msgstr "verify <arquivo>"
#: en/git-bundle.txt:52
#, priority:100
msgid "Used to check that a bundle file is valid and will apply cleanly to the current repository. This includes checks on the bundle format itself as well as checking that the prerequisite commits exist and are fully linked in the current repository. 'git bundle' prints a list of missing commits, if any, and exits with a non-zero status."
-msgstr ""
-"Utilizado para verificar se um arquivo do pacote 챕 v찼lido e se ser찼 aplicado "
-"de forma limpa ao reposit처rio atual. Isso inclu챠 as verifica챌천es no formato "
-"do pacote e tamb챕m a que verifica챌찾o dos pr챕-requisitos dos commits existam "
-"e estejam totalmente vinculados ao reposit처rio atual. O comando 'git "
-"bundle' exibe uma lista dos commits que faltam, caso haja, e encerra com uma "
-"condi챌찾o diferente de zero."
+msgstr "Utilizado para verificar se um arquivo do pacote 챕 v찼lido e se ser찼 aplicado de forma limpa ao reposit처rio atual. Isso inclu챠 as verifica챌천es no formato do pacote e tamb챕m a que verifica챌찾o dos pr챕-requisitos dos commits existam e estejam totalmente vinculados ao reposit처rio atual. O comando 'git bundle' exibe uma lista dos commits que faltam, caso haja, e encerra com uma condi챌찾o diferente de zero."
#. type: Labeled list
#: en/git-bundle.txt:53
@@ -12448,10 +10267,7 @@ msgstr "list-heads <arquivo>"
#: en/git-bundle.txt:57
#, priority:100
msgid "Lists the references defined in the bundle. If followed by a list of references, only references matching those given are printed out."
-msgstr ""
-"Lista as refer챗ncias definidas no pacote. Caso seja seguido por uma lista "
-"de refer챗ncias, apenas as refer챗ncias que coincidam com as informadas s찾o "
-"exibidas."
+msgstr "Lista as refer챗ncias definidas no pacote. Caso seja seguido por uma lista de refer챗ncias, apenas as refer챗ncias que coincidam com as informadas s찾o exibidas."
#. type: Labeled list
#: en/git-bundle.txt:58
@@ -12463,12 +10279,7 @@ msgstr "unbundle <arquivo>"
#: en/git-bundle.txt:64
#, priority:100
msgid "Passes the objects in the bundle to 'git index-pack' for storage in the repository, then prints the names of all defined references. If a list of references is given, only references matching those in the list are printed. This command is really plumbing, intended to be called only by 'git fetch'."
-msgstr ""
-"Passa os objetos no pacote para o para armazenamento no reposit처rio com o "
-"comando 'git index-pack' e depois imprime os nomes de todas as refer챗ncias "
-"que foram definidas. Se uma lista de refer챗ncias for informada, apenas as "
-"refer챗ncias que coincidam 횪s da lista ser찾o exibidas. Este comando 챕 "
-"realmente \"plumbing\", feito para ser chamado apenas atrav챕s do 'git fetch'."
+msgstr "Passa os objetos no pacote para o para armazenamento no reposit처rio com o comando 'git index-pack' e depois imprime os nomes de todas as refer챗ncias que foram definidas. Se uma lista de refer챗ncias for informada, apenas as refer챗ncias que coincidam 횪s da lista ser찾o exibidas. Este comando 챕 realmente \"plumbing\", feito para ser chamado apenas atrav챕s do 'git fetch'."
#. type: Labeled list
#: en/git-bundle.txt:65
@@ -12480,15 +10291,7 @@ msgstr "<git-rev-list-args>"
#: en/git-bundle.txt:74
#, priority:100
msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list' (and containing a named ref, see SPECIFYING REFERENCES below), that specifies the specific objects and references to transport. For example, `master~10..master` causes the current master reference to be packaged along with all objects added since its 10th ancestor commit. There is no explicit limit to the number of references and objects that may be packaged."
-msgstr ""
-"Uma lista de argumentos aceit찼veis para o comando 'git rev-parse' e 'git rev-"
-"list' (contendo uma determinada refer챗ncia, consulte ESPECIFICANDO AS "
-"REFER횎NCIAS logo abaixo), que determina quais os objetos e as refer챗ncias "
-"espec챠ficas que ser찾o transportados. Por exemplo, `master~10..master` faz "
-"com que a refer챗ncia principal seja empacotada juntamente com todos os "
-"objetos que foram adicionados desde o seu d챕cimo commit ancestral. N찾o h찼 "
-"um limite expl챠cito para a quantidade de refer챗ncias e dos objetos que podem "
-"ser empacotados."
+msgstr "Uma lista de argumentos aceit찼veis para o comando 'git rev-parse' e 'git rev-list' (contendo uma determinada refer챗ncia, consulte ESPECIFICANDO AS REFER횎NCIAS logo abaixo), que determina quais os objetos e as refer챗ncias espec챠ficas que ser찾o transportados. Por exemplo, `master~10..master` faz com que a refer챗ncia principal seja empacotada juntamente com todos os objetos que foram adicionados desde o seu d챕cimo commit ancestral. N찾o h찼 um limite expl챠cito para a quantidade de refer챗ncias e dos objetos que podem ser empacotados."
#. type: Labeled list
#: en/git-bundle.txt:76
@@ -12500,11 +10303,7 @@ msgstr "[<refname>...]"
#: en/git-bundle.txt:82
#, priority:100
msgid "A list of references used to limit the references reported as available. This is principally of use to 'git fetch', which expects to receive only those references asked for and not necessarily everything in the pack (in this case, 'git bundle' acts like 'git fetch-pack')."
-msgstr ""
-"Uma lista de refer챗ncias utilizadas para limitar as refer챗ncias relatadas "
-"como dispon챠veis. 횋 muito 첬til para ser utilizado com o 'git fetch' que "
-"espera receber apenas as refer챗ncias solicitadas e n찾o necessariamente tudo "
-"no pacote (nesse caso, 'git bundle' age como 'git fetch-pack')."
+msgstr "Uma lista de refer챗ncias utilizadas para limitar as refer챗ncias relatadas como dispon챠veis. 횋 muito 첬til para ser utilizado com o 'git fetch' que espera receber apenas as refer챗ncias solicitadas e n찾o necessariamente tudo no pacote (nesse caso, 'git bundle' age como 'git fetch-pack')."
#. type: Labeled list
#: en/git-bundle.txt:89 en/git-pack-objects.txt:157
@@ -12516,15 +10315,7 @@ msgstr "--all-progress"
#: en/git-bundle.txt:99 en/git-pack-objects.txt:167
#, priority:100
msgid "When --stdout is specified then progress report is displayed during the object count and compression phases but inhibited during the write-out phase. The reason is that in some cases the output stream is directly linked to another command which may wish to display progress status of its own as it processes incoming pack data. This flag is like --progress except that it forces progress report for the write-out phase as well even if --stdout is used."
-msgstr ""
-"Quando o `--stdout` 챕 utilizado, o relat처rio do progresso 챕 exibido durante "
-"as fases da contagem e da compacta챌찾o dos objetos, por챕m inibido durante a "
-"fase de grava챌찾o. A raz찾o 챕 que em alguns casos, o fluxo da sa챠da est찼 "
-"diretamente vinculada a um outro comando que possa querer exibir a sua "
-"pr처pria condi챌찾o do progresso 횪 medida que os dados do pacote v찾o sendo "
-"processados. Esta op챌찾o 챕 semelhante ao `--progress`, exceto que imp천em "
-"tamb챕m que um relat처rio do progresso seja feito na fase de grava챌찾o, mesmo "
-"que a op챌찾o `--stdout` seja utilizado."
+msgstr "Quando o `--stdout` 챕 utilizado, o relat처rio do progresso 챕 exibido durante as fases da contagem e da compacta챌찾o dos objetos, por챕m inibido durante a fase de grava챌찾o. A raz찾o 챕 que em alguns casos, o fluxo da sa챠da est찼 diretamente vinculada a um outro comando que possa querer exibir a sua pr처pria condi챌찾o do progresso 횪 medida que os dados do pacote v찾o sendo processados. Esta op챌찾o 챕 semelhante ao `--progress`, exceto que imp천em tamb챕m que um relat처rio do progresso seja feito na fase de grava챌찾o, mesmo que a op챌찾o `--stdout` seja utilizado."
#. type: Labeled list
#: en/git-bundle.txt:100 en/git-pack-objects.txt:168
@@ -12536,18 +10327,13 @@ msgstr "--all-progress-implied"
#: en/git-bundle.txt:104 en/git-pack-objects.txt:172
#, priority:100
msgid "This is used to imply --all-progress whenever progress display is activated. Unlike --all-progress this flag doesn't actually force any progress display by itself."
-msgstr ""
-"Isso 챕 utilizado para impor a op챌찾o `--all-progress` sempre que a exibi챌찾o "
-"do progresso estiver ativo. Ao contr찼rio da op챌찾o `--all-progress`, esta "
-"op챌찾o por si s처 n찾o imp천em que a exibi챌찾o do progresso seja exibida."
+msgstr "Isso 챕 utilizado para impor a op챌찾o `--all-progress` sempre que a exibi챌찾o do progresso estiver ativo. Ao contr찼rio da op챌찾o `--all-progress`, esta op챌찾o por si s처 n찾o imp천em que a exibi챌찾o do progresso seja exibida."
#. type: Plain text
#: en/git-bundle.txt:109 en/git-pack-objects.txt:176
#, priority:100
msgid "This flag makes the command not to report its progress on the standard error stream."
-msgstr ""
-"Esta op챌찾o faz com que o comando n찾o relate o seu progresso em meio ao fluxo "
-"de erros j찼 predefinido."
+msgstr "Esta op챌찾o faz com que o comando n찾o relate o seu progresso em meio ao fluxo de erros j찼 predefinido."
#. type: Title -
#: en/git-bundle.txt:111
@@ -12559,59 +10345,31 @@ msgstr "ESPECIFICANDO AS REFER횎NCIAS"
#: en/git-bundle.txt:121
#, priority:100
msgid "'git bundle' will only package references that are shown by 'git show-ref': this includes heads, tags, and remote heads. References such as `master~1` cannot be packaged, but are perfectly suitable for defining the basis. More than one reference may be packaged, and more than one basis can be specified. The objects packaged are those not contained in the union of the given bases. Each basis can be specified explicitly (e.g. `^master~10`), or implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)."
-msgstr ""
-"O comando 'git bundle' apenas empacotar찼 as refer챗ncias que s찾o exibidas "
-"atrav챕s do comando 'git show-ref': isso inclui os cabe챌alhos, tags e "
-"cabe챌alhos remotos. As refer챗ncias como `master~1' n찾o podem ser "
-"empacotadas por챕m s찾o perfeitamente adequadas para definir a base. Mais de "
-"uma refer챗ncia pode ser empacotada assim como mais de uma base pode ser "
-"definida. Os objetos empacotados s찾o aqueles que n찾o est찾o contidos na "
-"uni찾o das bases informadas. Cada base pode ser definida de forma explicita ("
-", `^master~10` por exemplo) ou de forma impl챠cita (`master~10..master`, `--"
-"since=10.days.ago master` por exemplo)."
+msgstr "O comando 'git bundle' apenas empacotar찼 as refer챗ncias que s찾o exibidas atrav챕s do comando 'git show-ref': isso inclui os cabe챌alhos, tags e cabe챌alhos remotos. As refer챗ncias como `master~1' n찾o podem ser empacotadas por챕m s찾o perfeitamente adequadas para definir a base. Mais de uma refer챗ncia pode ser empacotada assim como mais de uma base pode ser definida. Os objetos empacotados s찾o aqueles que n찾o est찾o contidos na uni찾o das bases informadas. Cada base pode ser definida de forma explicita (, `^master~10` por exemplo) ou de forma impl챠cita (`master~10..master`, `--since=10.days.ago master` por exemplo)."
#. type: Plain text
#: en/git-bundle.txt:126
#, priority:100
msgid "It is very important that the basis used be held by the destination. It is okay to err on the side of caution, causing the bundle file to contain objects already in the destination, as these are ignored when unpacking at the destination."
-msgstr ""
-"횋 muito importante que a base utilizada seja mantida pelo destino. 횋 bom "
-"errar pelo excesso de zelo, fazendo com que o arquivo do pacote contenha os "
-"objetos j찼 no destino, pois eles s찾o ignorados durante a descompacta챌찾o no "
-"destino."
+msgstr "횋 muito importante que a base utilizada seja mantida pelo destino. 횋 bom errar pelo excesso de zelo, fazendo com que o arquivo do pacote contenha os objetos j찼 no destino, pois eles s찾o ignorados durante a descompacta챌찾o no destino."
#. type: Plain text
#: en/git-bundle.txt:134
#, priority:100
msgid "`git clone` can use any bundle created without negative refspecs (e.g., `new`, but not `old..new`). If you want to match `git clone --mirror`, which would include your refs such as `refs/remotes/*`, use `--all`. If you want to provide the same set of refs that a clone directly from the source repository would get, use `--branches --tags` for the `<git-rev-list-args>`."
-msgstr ""
-"O comando `git clone` pode utilizar qualquer pacote criado sem os \"refespecs"
-"\" negativos (`new`, mas n찾o `old..new` por exemplo). Caso queira combinar "
-"o comando `git clone --mirror`, que incluiria os seus \"refs\" como `refs/"
-"remotes/*`, utilize `--all`. Caso queira informar o mesmo conjunto de "
-"refer챗ncias que um clone vindo direto do reposit처rio da origem teria, "
-"utilize `--branches --tags` para o `<git-rev-list-args>`."
+msgstr "O comando `git clone` pode utilizar qualquer pacote criado sem os \"refespecs\" negativos (`new`, mas n찾o `old..new` por exemplo). Caso queira combinar o comando `git clone --mirror`, que incluiria os seus \"refs\" como `refs/remotes/*`, utilize `--all`. Caso queira informar o mesmo conjunto de refer챗ncias que um clone vindo direto do reposit처rio da origem teria, utilize `--branches --tags` para o `<git-rev-list-args>`."
#. type: Plain text
#: en/git-bundle.txt:143
#, priority:100
msgid "Assume you want to transfer the history from a repository R1 on machine A to another repository R2 on machine B. For whatever reason, direct connection between A and B is not allowed, but we can move data from A to B via some mechanism (CD, email, etc.). We want to update R2 with development made on the branch master in R1."
-msgstr ""
-"Suponha que voc챗 queira transferir o hist처rico de um reposit처rio R1 na "
-"m찼quina A para outro reposit처rio R2 na m찼quina B. Por algum motivo, a "
-"conex찾o direta entre A e B n찾o 챕 permitida, mas podemos mover os dados de A "
-"para B atrav챕s de algum mecanismo (CD , e-mail, etc.). Por챕m queremos "
-"atualizar o R2 com o desenvolvimento feito na ramifica챌찾o master em R1."
+msgstr "Suponha que voc챗 queira transferir o hist처rico de um reposit처rio R1 na m찼quina A para outro reposit처rio R2 na m찼quina B. Por algum motivo, a conex찾o direta entre A e B n찾o 챕 permitida, mas podemos mover os dados de A para B atrav챕s de algum mecanismo (CD , e-mail, etc.). Por챕m queremos atualizar o R2 com o desenvolvimento feito na ramifica챌찾o master em R1."
#. type: Plain text
#: en/git-bundle.txt:148
#, priority:100
msgid "To bootstrap the process, you can first create a bundle that does not have any basis. You can use a tag to remember up to what commit you last processed, in order to make it easy to later update the other repository with an incremental bundle:"
-msgstr ""
-"Para inicializar o processo, voc챗 pode primeiro criar um pacote que n찾o "
-"exista qualquer base. Voc챗 pode usar uma tag para ser lembrado at챕 o 첬ltimo "
-"commit que for processado, serve para facilitar a atualiza챌찾o posterior do "
-"outro reposit처rio com um pacote incremental:"
+msgstr "Para inicializar o processo, voc챗 pode primeiro criar um pacote que n찾o exista qualquer base. Voc챗 pode usar uma tag para ser lembrado at챕 o 첬ltimo commit que for processado, serve para facilitar a atualiza챌찾o posterior do outro reposit처rio com um pacote incremental:"
#. type: delimited block -
#: en/git-bundle.txt:153
@@ -12629,10 +10387,7 @@ msgstr ""
#: en/git-bundle.txt:158
#, priority:100
msgid "Then you transfer file.bundle to the target machine B. Because this bundle does not require any existing object to be extracted, you can create a new repository on machine B by cloning from it:"
-msgstr ""
-"Em seguida, voc챗 transfere `file.bundle` para a m찼quina no destino B. Como "
-"esse pacote n찾o requer que nenhum objeto existente seja extra챠do, voc챗 pode "
-"criar um novo reposit처rio na m찼quina B clonando a partir dele:"
+msgstr "Em seguida, voc챗 transfere `file.bundle` para a m찼quina no destino B. Como esse pacote n찾o requer que nenhum objeto existente seja extra챠do, voc챗 pode criar um novo reposit처rio na m찼quina B clonando a partir dele:"
#. type: delimited block -
#: en/git-bundle.txt:161
@@ -12644,10 +10399,7 @@ msgstr "machineB$ git clone -b master /home/me/tmp/file.bundle R2\n"
#: en/git-bundle.txt:166
#, priority:100
msgid "This will define a remote called \"origin\" in the resulting repository that lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will have an entry like this:"
-msgstr ""
-"Isso ir찼 definir um ponto remoto chamado \"origin\" (origem) no reposit처rio "
-"que permite que voc챗 capture e extraia do pacote. O arquivo `$GIT_DIR/config`"
-" no R2 ter찼 uma entrada como esta:"
+msgstr "Isso ir찼 definir um ponto remoto chamado \"origin\" (origem) no reposit처rio que permite que voc챗 capture e extraia do pacote. O arquivo `$GIT_DIR/config` no R2 ter찼 uma entrada como esta:"
#. type: delimited block -
#: en/git-bundle.txt:171
@@ -12665,18 +10417,13 @@ msgstr ""
#: en/git-bundle.txt:176
#, priority:100
msgid "To update the resulting mine.git repository, you can fetch or pull after replacing the bundle stored at /home/me/tmp/file.bundle with incremental updates."
-msgstr ""
-"Para atualizar o reposit처rio `mine.git`, voc챗 pode capturar ou extrair ap처s "
-"a substitui챌찾o do pacote armazenado em `/home/me/tmp/file.bundle` com as "
-"atualiza챌천es incrementais."
+msgstr "Para atualizar o reposit처rio `mine.git`, voc챗 pode capturar ou extrair ap처s a substitui챌찾o do pacote armazenado em `/home/me/tmp/file.bundle` com as atualiza챌천es incrementais."
#. type: Plain text
#: en/git-bundle.txt:179
#, priority:100
msgid "After working some more in the original repository, you can create an incremental bundle to update the other repository:"
-msgstr ""
-"Depois de trabalhar um pouco mais no reposit처rio original, voc챗 pode criar "
-"um pacote incremental para atualizar um outro reposit처rio:"
+msgstr "Depois de trabalhar um pouco mais no reposit처rio original, voc챗 pode criar um pacote incremental para atualizar um outro reposit처rio:"
#. type: delimited block -
#: en/git-bundle.txt:184
@@ -12694,9 +10441,7 @@ msgstr ""
#: en/git-bundle.txt:188
#, priority:100
msgid "You then transfer the bundle to the other machine to replace /home/me/tmp/file.bundle, and pull from it."
-msgstr ""
-"Em seguida, voc챗 transfere o pacote para uma outra m찼quina para substituir o "
-"`/home/me/tmp/file.bundle` e captura dele."
+msgstr "Em seguida, voc챗 transfere o pacote para uma outra m찼quina para substituir o `/home/me/tmp/file.bundle` e captura dele."
#. type: delimited block -
#: en/git-bundle.txt:192
@@ -12712,13 +10457,7 @@ msgstr ""
#: en/git-bundle.txt:200
#, priority:100
msgid "If you know up to what commit the intended recipient repository should have the necessary objects, you can use that knowledge to specify the basis, giving a cut-off point to limit the revisions and objects that go in the resulting bundle. The previous example used the lastR2bundle tag for this purpose, but you can use any other options that you would give to the linkgit:git-log[1] command. Here are more examples:"
-msgstr ""
-"Caso saiba at챕 qual commit do reposit처rio nos destinat찼rios pretendidos "
-"devem ter os objetos necess찼rios, voc챗 poder찼 utilizar este conhecimento "
-"para definir a base, informando um ponto de corte para limitar as revis천es e "
-"os objetos inclusos no pacote. O exemplo anterior utilizou a tag "
-"`lastR2bundle` para essa finalidade, por챕m 챕 poss챠vel utilizar outras op챌천es "
-"que voc챗 daria ao comando linkgit:git-log[1]. Aqui mais alguns exemplos:"
+msgstr "Caso saiba at챕 qual commit do reposit처rio nos destinat찼rios pretendidos devem ter os objetos necess찼rios, voc챗 poder찼 utilizar este conhecimento para definir a base, informando um ponto de corte para limitar as revis천es e os objetos inclusos no pacote. O exemplo anterior utilizou a tag `lastR2bundle` para essa finalidade, por챕m 챕 poss챠vel utilizar outras op챌천es que voc챗 daria ao comando linkgit:git-log[1]. Aqui mais alguns exemplos:"
#. type: Plain text
#: en/git-bundle.txt:202
@@ -12760,9 +10499,7 @@ msgstr "$ git bundle create mybundle -10 master\n"
#: en/git-bundle.txt:221
#, priority:100
msgid "You can run `git-bundle verify` to see if you can extract from a bundle that was created with a basis:"
-msgstr ""
-"Voc챗 pode executar o comando `git-bundle verify` para ver se voc챗 consegue "
-"extrair de um pacote que criado com um fundamento:"
+msgstr "Voc챗 pode executar o comando `git-bundle verify` para ver se voc챗 consegue extrair de um pacote que criado com um fundamento:"
#. type: delimited block -
#: en/git-bundle.txt:224
@@ -12774,18 +10511,13 @@ msgstr "$ git bundle verify mybundle\n"
#: en/git-bundle.txt:228
#, priority:100
msgid "This will list what commits you must have in order to extract from the bundle and will error out if you do not have them."
-msgstr ""
-"Isso listar찼 quais os commits voc챗 deve ter para extrair do pacote e "
-"encerrar찼 com um erro caso voc챗 n찾o os tenha."
+msgstr "Isso listar찼 quais os commits voc챗 deve ter para extrair do pacote e encerrar찼 com um erro caso voc챗 n찾o os tenha."
#. type: Plain text
#: en/git-bundle.txt:232
#, priority:100
msgid "A bundle from a recipient repository's point of view is just like a regular repository which it fetches or pulls from. You can, for example, map references when fetching:"
-msgstr ""
-"Um pacote do ponto de vista de um reposit처rio do destinat찼rio 챕 como um "
-"reposit처rio regular do qual ele captura ou extrai. Voc챗 pode, por exemplo, "
-"durante a captura 챕 poss챠vel mapear quais s찾o as refer챗ncias:"
+msgstr "Um pacote do ponto de vista de um reposit처rio do destinat찼rio 챕 como um reposit처rio regular do qual ele captura ou extrai. Voc챗 pode, por exemplo, durante a captura 챕 poss챠vel mapear quais s찾o as refer챗ncias:"
#. type: delimited block -
#: en/git-bundle.txt:235
@@ -12815,9 +10547,7 @@ msgstr "git-cat-file(1)"
#: en/git-cat-file.txt:7
#, priority:100
msgid "git-cat-file - Provide content or type and size information for repository objects"
-msgstr ""
-"git-cat-file - Forne챌a as informa챌천es do conte첬do, tipo e do tamanho para os "
-"objetos do reposit처rio"
+msgstr "git-cat-file - Forne챌a as informa챌천es do conte첬do, tipo e do tamanho para os objetos do reposit처rio"
#. type: Plain text
#: en/git-cat-file.txt:14
@@ -12833,25 +10563,13 @@ msgstr ""
#: en/git-cat-file.txt:21
#, priority:100
msgid "In its first form, the command provides the content or the type of an object in the repository. The type is required unless `-t` or `-p` is used to find the object type, or `-s` is used to find the object size, or `--textconv` or `--filters` is used (which imply type \"blob\")."
-msgstr ""
-"Em sua primeira forma, o comando fornece o conte첬do ou o tipo de um objeto "
-"no reposit처rio. O tipo 챕 necess찼rio, a menos que a op챌찾o `-t` ou `-p` seja "
-"utilizado para encontrar o tipo de objeto, ou `-s` seja utilizado para "
-"encontrar seu tamanho, ou a op챌찾o `--textconv` ou `--filters` seja utilizado "
-"(que implica no tipo \"blob\" (bolha))."
+msgstr "Em sua primeira forma, o comando fornece o conte첬do ou o tipo de um objeto no reposit처rio. O tipo 챕 necess찼rio, a menos que a op챌찾o `-t` ou `-p` seja utilizado para encontrar o tipo de objeto, ou `-s` seja utilizado para encontrar seu tamanho, ou a op챌찾o `--textconv` ou `--filters` seja utilizado (que implica no tipo \"blob\" (bolha))."
#. type: Plain text
#: en/git-cat-file.txt:28
#, priority:100
msgid "In the second form, a list of objects (separated by linefeeds) is provided on stdin, and the SHA-1, type, and size of each object is printed on stdout. The output format can be overridden using the optional `<format>` argument. If either `--textconv` or `--filters` was specified, the input is expected to list the object names followed by the path name, separated by a single whitespace, so that the appropriate drivers can be determined."
-msgstr ""
-"Em sua segunda forma, 챕 oferecida uma lista de objetos (separados por linhas "
-"de alimenta챌찾o) no \"stdin\", o SHA-1, o tipo e seu tamanho de cada objeto "
-"exibidos no \"stdout\". O formato de sa챠da pode ser substitu챠do utilizando a "
-"op챌찾o opcional `<formato>`. Caso a op챌찾o `--textconv` ou` --filters` foram "
-"sejam utilizados, espera-se que a entrada liste os nomes dos objetos "
-"seguidos pelo nome do caminho, separados por um 첬nico espa챌o em branco, para "
-"que os devidos controladores ser determinados."
+msgstr "Em sua segunda forma, 챕 oferecida uma lista de objetos (separados por linhas de alimenta챌찾o) no \"stdin\", o SHA-1, o tipo e seu tamanho de cada objeto exibidos no \"stdout\". O formato de sa챠da pode ser substitu챠do utilizando a op챌찾o opcional `<formato>`. Caso a op챌찾o `--textconv` ou` --filters` foram sejam utilizados, espera-se que a entrada liste os nomes dos objetos seguidos pelo nome do caminho, separados por um 첬nico espa챌o em branco, para que os devidos controladores ser determinados."
#. type: Labeled list
#: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
@@ -12863,10 +10581,7 @@ msgstr "<objeto>"
#: en/git-cat-file.txt:35
#, priority:100
msgid "The name of the object to show. For a more complete list of ways to spell object names, see the \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
-msgstr ""
-"O nome do objeto que ser찼 exibido. Para uma lista mais completa de maneiras "
-"de escrever os nomes dos objetos, consulte a se챌찾o \"DEFININDO AS REVIS횛ES\" "
-"no linkgit:gitrevisions[7]."
+msgstr "O nome do objeto que ser찼 exibido. Para uma lista mais completa de maneiras de escrever os nomes dos objetos, consulte a se챌찾o \"DEFININDO AS REVIS횛ES\" no linkgit:gitrevisions[7]."
#. type: Plain text
#: en/git-cat-file.txt:39
@@ -12878,24 +10593,19 @@ msgstr "Em vez do conte첬do, exiba o tipo do objeto identificado por `<objeto>`.
#: en/git-cat-file.txt:43
#, priority:100
msgid "Instead of the content, show the object size identified by <object>."
-msgstr ""
-"Em vez do conte첬do, exiba o tamanho do objeto identificado por `<objeto>`."
+msgstr "Em vez do conte첬do, exiba o tamanho do objeto identificado por `<objeto>`."
#. type: Plain text
#: en/git-cat-file.txt:48
#, priority:100
msgid "Exit with zero status if <object> exists and is a valid object. If <object> is of an invalid format exit with non-zero and emits an error on stderr."
-msgstr ""
-"Encerre com a condi챌찾o zero caso o `<objeto>` exista e seja um objeto "
-"v찼lido. Caso o `<object>` tenha um formato inv찼lido, encerre com um valor "
-"diferente de zero e emita uma mensagem de erro no \"stderr\"."
+msgstr "Encerre com a condi챌찾o zero caso o `<objeto>` exista e seja um objeto v찼lido. Caso o `<object>` tenha um formato inv찼lido, encerre com um valor diferente de zero e emita uma mensagem de erro no \"stderr\"."
#. type: Plain text
#: en/git-cat-file.txt:51
#, priority:100
msgid "Pretty-print the contents of <object> based on its type."
-msgstr ""
-"Fa챌a uma impress찾o bonita do conte첬do do `<objeto>` com base no seu tipo."
+msgstr "Fa챌a uma impress찾o bonita do conte첬do do `<objeto>` com base no seu tipo."
#. type: Labeled list
#: en/git-cat-file.txt:52 en/git.txt:363
@@ -12907,21 +10617,13 @@ msgstr "<tipo>"
#: en/git-cat-file.txt:59
#, priority:100
msgid "Typically this matches the real type of <object> but asking for a type that can trivially be dereferenced from the given <object> is also permitted. An example is to ask for a \"tree\" with <object> being a commit object that contains it, or to ask for a \"blob\" with <object> being a tag object that points at it."
-msgstr ""
-"Normalmente, isso coincide com tipo real do <objeto>, mas solicitar um tipo "
-"sem refer챗ncia de um determinado <objeto> tamb챕m 챕 permitido. Um exemplo 챕 "
-"pedir uma \"찼rvore\" com o `<objeto>` sendo um objeto commit que o cont챕m, "
-"ou pedir uma \"bolha\" com o `<objeto>` sendo uma tag que aponte para ela."
+msgstr "Normalmente, isso coincide com tipo real do <objeto>, mas solicitar um tipo sem refer챗ncia de um determinado <objeto> tamb챕m 챕 permitido. Um exemplo 챕 pedir uma \"찼rvore\" com o `<objeto>` sendo um objeto commit que o cont챕m, ou pedir uma \"bolha\" com o `<objeto>` sendo uma tag que aponte para ela."
#. type: Plain text
#: en/git-cat-file.txt:65
#, priority:100
msgid "Show the content as transformed by a textconv filter. In this case, <object> has to be of the form <tree-ish>:<path>, or :<path> in order to apply the filter to the content recorded in the index at <path>."
-msgstr ""
-"Exiba o conte첬do da maneira que foi transformado por um filtro textconv. "
-"Nesse caso, o `<objeto>` deve estar no formato `<tree-ish>:<caminho>` ou "
-"`:<caminho>` para aplicar o filtro ao conte첬do registrado no 챠ndice do "
-"`<caminho>`."
+msgstr "Exiba o conte첬do da maneira que foi transformado por um filtro textconv. Nesse caso, o `<objeto>` deve estar no formato `<tree-ish>:<caminho>` ou `:<caminho>` para aplicar o filtro ao conte첬do registrado no 챠ndice do `<caminho>`."
#. type: Labeled list
#: en/git-cat-file.txt:66
@@ -12933,11 +10635,7 @@ msgstr "--filters"
#: en/git-cat-file.txt:71
#, priority:100
msgid "Show the content as converted by the filters configured in the current working tree for the given <path> (i.e. smudge filters, end-of-line conversion, etc). In this case, <object> has to be of the form <tree-ish>:<path>, or :<path>."
-msgstr ""
-"Exiba o conte첬do conforme foi convertido pelos filtros configurados na "
-"찼rvore de trabalho atual para o `<caminho>` informado (por exemplo, filtros "
-"de manchas, convers찾o da quebra de linha, etc.). Nesse caso, o `<objeto>` "
-"deve estar no formato `<tree-ish>:<caminho>` ou `:<caminho>`."
+msgstr "Exiba o conte첬do conforme foi convertido pelos filtros configurados na 찼rvore de trabalho atual para o `<caminho>` informado (por exemplo, filtros de manchas, convers찾o da quebra de linha, etc.). Nesse caso, o `<objeto>` deve estar no formato `<tree-ish>:<caminho>` ou `:<caminho>`."
#. type: Labeled list
#: en/git-cat-file.txt:72
@@ -12949,10 +10647,7 @@ msgstr "--path=<caminho>"
#: en/git-cat-file.txt:76
#, priority:100
msgid "For use with --textconv or --filters, to allow specifying an object name and a path separately, e.g. when it is difficult to figure out the revision from which the blob came."
-msgstr ""
-"Para a utiliza챌찾o com o comando `--textconv` ou `--filters`, permitindo a "
-"defini챌찾o de um nome do objeto e um caminho separadamente, quando for "
-"dif챠cil descobrir a revis찾o de onde a bolha veio por exemplo."
+msgstr "Para a utiliza챌찾o com o comando `--textconv` ou `--filters`, permitindo a defini챌찾o de um nome do objeto e um caminho separadamente, quando for dif챠cil descobrir a revis찾o de onde a bolha veio por exemplo."
#. type: Labeled list
#: en/git-cat-file.txt:77 en/git-mktree.txt:32
@@ -12970,12 +10665,7 @@ msgstr "--batch=<formato>"
#: en/git-cat-file.txt:84
#, priority:100
msgid "Print object information and contents for each object provided on stdin. May not be combined with any other options or arguments except `--textconv` or `--filters`, in which case the input lines also need to specify the path, separated by whitespace. See the section `BATCH OUTPUT` below for details."
-msgstr ""
-"Exiba a informa챌찾o do objeto e seu conte첬do para cada objeto informado no "
-"stdin. Talvez n찾o possa ser combinado com nenhuma outra op챌찾o exceto "
-"`--textconv` ou `--filters`, neste caso, as linhas da entrada tamb챕m "
-"precisam informar o caminho, separado por espa챌os. Para mais detalhes "
-"consulte a se챌찾o `SA횒DA DO LOTE` abaixo."
+msgstr "Exiba a informa챌찾o do objeto e seu conte첬do para cada objeto informado no stdin. Talvez n찾o possa ser combinado com nenhuma outra op챌찾o exceto `--textconv` ou `--filters`, neste caso, as linhas da entrada tamb챕m precisam informar o caminho, separado por espa챌os. Para mais detalhes consulte a se챌찾o `SA횒DA DO LOTE` abaixo."
#. type: Labeled list
#: en/git-cat-file.txt:85
@@ -12993,12 +10683,7 @@ msgstr "--batch-check=<formato>"
#: en/git-cat-file.txt:92
#, priority:100
msgid "Print object information for each object provided on stdin. May not be combined with any other options or arguments except `--textconv` or `--filters`, in which case the input lines also need to specify the path, separated by whitespace. See the section `BATCH OUTPUT` below for details."
-msgstr ""
-"Exiba as informa챌천es do objeto para cada objeto informado no stdin. Talvez "
-"n찾o possa ser combinado com nenhuma outra op챌찾o exceto `--textconv` ou "
-"`--filters`, neste caso, as linhas da entrada tamb챕m precisam informar o "
-"caminho, separado por espa챌os. Para mais detalhes consulte a se챌찾o `SA횒DA "
-"DO LOTE` abaixo."
+msgstr "Exiba as informa챌천es do objeto para cada objeto informado no stdin. Talvez n찾o possa ser combinado com nenhuma outra op챌찾o exceto `--textconv` ou `--filters`, neste caso, as linhas da entrada tamb챕m precisam informar o caminho, separado por espa챌os. Para mais detalhes consulte a se챌찾o `SA횒DA DO LOTE` abaixo."
#. type: Labeled list
#: en/git-cat-file.txt:93
@@ -13010,13 +10695,7 @@ msgstr "--batch-all-objects"
#: en/git-cat-file.txt:99
#, priority:100
msgid "Instead of reading a list of objects on stdin, perform the requested batch operation on all objects in the repository and any alternate object stores (not just reachable objects). Requires `--batch` or `--batch-check` be specified. Note that the objects are visited in order sorted by their hashes."
-msgstr ""
-"Em vez de ler uma lista dos objetos no stdin, execute a opera챌찾o em lote "
-"solicitada em todos os objetos no reposit처rio e em quaisquer outros "
-"armazenamentos alternativos dos objetos (n찾o apenas nos objetos que forem "
-"alcan챌찼veis). Requer que o comando `--batch` ou `--batch-check` seja "
-"utilizado. Observe que os objetos s찾o capturados atrav챕s da ordem dos seus "
-"hashes."
+msgstr "Em vez de ler uma lista dos objetos no stdin, execute a opera챌찾o em lote solicitada em todos os objetos no reposit처rio e em quaisquer outros armazenamentos alternativos dos objetos (n찾o apenas nos objetos que forem alcan챌찼veis). Requer que o comando `--batch` ou `--batch-check` seja utilizado. Observe que os objetos s찾o capturados atrav챕s da ordem dos seus hashes."
#. type: Labeled list
#: en/git-cat-file.txt:100
@@ -13028,12 +10707,7 @@ msgstr "--buffer"
#: en/git-cat-file.txt:106
#, priority:100
msgid "Normally batch output is flushed after each object is output, so that a process can interactively read and write from `cat-file`. With this option, the output uses normal stdio buffering; this is much more efficient when invoking `--batch-check` on a large number of objects."
-msgstr ""
-"Normalmente, a sa챠da em lote 챕 liberada ap처s a sa챠da de cada objeto, para "
-"que um processo possa ler e gravar de forma interativa a partir do `cat-file`"
-". Com esta op챌찾o, a sa챠da utiliza uma mem처ria interm챕dia normal no stdio; "
-"por ser muito mais eficiente ao invocar comando `--batch-check` em uma "
-"grande quantidade de objetos."
+msgstr "Normalmente, a sa챠da em lote 챕 liberada ap처s a sa챠da de cada objeto, para que um processo possa ler e gravar de forma interativa a partir do `cat-file`. Com esta op챌찾o, a sa챠da utiliza uma mem처ria interm챕dia normal no stdio; por ser muito mais eficiente ao invocar comando `--batch-check` em uma grande quantidade de objetos."
#. type: Labeled list
#: en/git-cat-file.txt:107
@@ -13045,14 +10719,7 @@ msgstr "--unordered"
#: en/git-cat-file.txt:116
#, priority:100
msgid "When `--batch-all-objects` is in use, visit objects in an order which may be more efficient for accessing the object contents than hash order. The exact details of the order are unspecified, but if you do not require a specific order, this should generally result in faster output, especially with `--batch`. Note that `cat-file` will still show each object only once, even if it is stored multiple times in the repository."
-msgstr ""
-"Quando o comando `--batch-all-objects` estiver em uso, visite os objetos em "
-"uma ordem que possa ser mais eficiente para acessar o conte첬do do objeto do "
-"que pela ordem do hash. Os detalhes exatos do pedido n찾o s찾o especificados, "
-"por챕m caso n찾o precise de um pedido espec챠fico, em geral isso resultar찼 em "
-"uma sa챠da mais r찼pida, especialmente com a op챌찾o `--batch`. Observe que "
-"`cat-file` ainda exibir찼 cada objeto apenas uma vez, mesmo que ele seja "
-"armazenado v찼rias vezes no reposit처rio."
+msgstr "Quando o comando `--batch-all-objects` estiver em uso, visite os objetos em uma ordem que possa ser mais eficiente para acessar o conte첬do do objeto do que pela ordem do hash. Os detalhes exatos do pedido n찾o s찾o especificados, por챕m caso n찾o precise de um pedido espec챠fico, em geral isso resultar찼 em uma sa챠da mais r찼pida, especialmente com a op챌찾o `--batch`. Observe que `cat-file` ainda exibir찼 cada objeto apenas uma vez, mesmo que ele seja armazenado v찼rias vezes no reposit처rio."
#. type: Labeled list
#: en/git-cat-file.txt:117
@@ -13064,9 +10731,7 @@ msgstr "--allow-unknown-type"
#: en/git-cat-file.txt:119
#, priority:100
msgid "Allow -s or -t to query broken/corrupt objects of unknown type."
-msgstr ""
-"Permita que `-s` ou `-t` consultem os objetos quebrados/corrompidos de um "
-"tipo desconhecido."
+msgstr "Permita que `-s` ou `-t` consultem os objetos quebrados/corrompidos de um tipo desconhecido."
#. type: Labeled list
#: en/git-cat-file.txt:120
@@ -13078,31 +10743,19 @@ msgstr "--follow-symlinks"
#: en/git-cat-file.txt:129
#, priority:100
msgid "With --batch or --batch-check, follow symlinks inside the repository when requesting objects with extended SHA-1 expressions of the form tree-ish:path-in-tree. Instead of providing output about the link itself, provide output about the linked-to object. If a symlink points outside the tree-ish (e.g. a link to /foo or a root-level link to ../foo), the portion of the link which is outside the tree will be printed."
-msgstr ""
-"Com a op챌찾o `--batch` ou `--batch-check`, siga os links simb처licos dentro do "
-"reposit처rio durante a solicita챌찾o dos objetos das express천es SHA-1 "
-"estendidas no formato `tree-ish: path-in-tree`. Em vez de providenciar a "
-"gera챌찾o sobre o pr처prio link, gere uma sa챠da sobre o objeto que for "
-"vinculado. Caso um link simb처lico aponte para fora da 찼rvore (um link para /"
-"foo ou um link na raiz para ../foo por exemplo), a parte do link que est찼 "
-"fora da 찼rvore ser찼 exibida."
+msgstr "Com a op챌찾o `--batch` ou `--batch-check`, siga os links simb처licos dentro do reposit처rio durante a solicita챌찾o dos objetos das express천es SHA-1 estendidas no formato `tree-ish: path-in-tree`. Em vez de providenciar a gera챌찾o sobre o pr처prio link, gere uma sa챠da sobre o objeto que for vinculado. Caso um link simb처lico aponte para fora da 찼rvore (um link para /foo ou um link na raiz para ../foo por exemplo), a parte do link que est찼 fora da 찼rvore ser찼 exibida."
#. type: Plain text
#: en/git-cat-file.txt:133
#, priority:100
msgid "This option does not (currently) work correctly when an object in the index is specified (e.g. `:link` instead of `HEAD:link`) rather than one in the tree."
-msgstr ""
-"Esta op챌찾o (atualmente) n찾o funciona corretamente quando um objeto no 챠ndice "
-"seja definido (`:link` em vez do `HEAD:link` por exemplo) em vez de um na "
-"찼rvore."
+msgstr "Esta op챌찾o (atualmente) n찾o funciona corretamente quando um objeto no 챠ndice seja definido (`:link` em vez do `HEAD:link` por exemplo) em vez de um na 찼rvore."
#. type: Plain text
#: en/git-cat-file.txt:136
#, priority:100
msgid "This option cannot (currently) be used unless `--batch` or `--batch-check` is used."
-msgstr ""
-"Esta op챌찾o (atualmente) n찾o pode ser utilizada, a menos que a op챌찾o `--batch`"
-" ou `--batch-check` seja utilizado."
+msgstr "Esta op챌찾o (atualmente) n찾o pode ser utilizada, a menos que a op챌찾o `--batch` ou `--batch-check` seja utilizado."
#. type: Plain text
#: en/git-cat-file.txt:138
@@ -13120,8 +10773,7 @@ msgid ""
"\tplink: a symlink to ../f\n"
"\talink: a symlink to /etc/passwd\n"
msgstr ""
-"\tf: a file containing \"hello\\n"
-"\"\n"
+"\tf: a file containing \"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"
@@ -13143,17 +10795,13 @@ msgstr "\tce013625030ba8dba906f756967f9e9ca394464a blob 6\n"
#: en/git-cat-file.txt:156
#, priority:100
msgid "And `echo HEAD:link | git cat-file --batch --follow-symlinks` would print the same thing, as would `HEAD:dir/link`, as they both point at `HEAD:f`."
-msgstr ""
-"E `echo HEAD:link | git cat-file --batch --follow-symlinks` exibiria a mesma "
-"coisa, assim como `HEAD:dir/link`, como ambos apontam para `HEAD:f`."
+msgstr "E `echo HEAD:link | git cat-file --batch --follow-symlinks` exibiria a mesma coisa, assim como `HEAD:dir/link`, como ambos apontam para `HEAD:f`."
#. type: Plain text
#: en/git-cat-file.txt:159
#, priority:100
msgid "Without `--follow-symlinks`, these would print data about the symlink itself. In the case of `HEAD:link`, you would see"
-msgstr ""
-"Sem a op챌찾o `--follow-symlinks`, ir찾o exibir os dados sobre o pr처prio link "
-"simb처lico. No caso de `HEAD: link`, voc챗 veria"
+msgstr "Sem a op챌찾o `--follow-symlinks`, ir찾o exibir os dados sobre o pr처prio link simb처lico. No caso de `HEAD: link`, voc챗 veria"
#. type: Plain text
#: en/git-cat-file.txt:162
@@ -13165,9 +10813,7 @@ msgstr "\t4d1ae35ba2c8ec712fa2a379db44ad639ca277bd blob 1\n"
#: en/git-cat-file.txt:166
#, priority:100
msgid "Both `plink` and `alink` point outside the tree, so they would respectively print:"
-msgstr ""
-"Ambos `plink` e `alink` apontam para fora da 찼rvore, ent찾o eles imprimiriam "
-"respectivamente:"
+msgstr "Ambos `plink` e `alink` apontam para fora da 찼rvore, ent찾o eles imprimiriam respectivamente:"
#. type: Plain text
#: en/git-cat-file.txt:170
@@ -13211,24 +10857,19 @@ msgstr "Caso a op챌찾o `-s` seja utilizada, o tamanho do <objeto> em bytes."
#: en/git-cat-file.txt:183
#, priority:100
msgid "If `-e` is specified, no output, unless the <object> is malformed."
-msgstr ""
-"Caso a op챌찾o `-e` seja utilizada, nenhuma sa챠da, a menos que o <objeto> "
-"esteja malformado."
+msgstr "Caso a op챌찾o `-e` seja utilizada, nenhuma sa챠da, a menos que o <objeto> esteja malformado."
#. type: Plain text
#: en/git-cat-file.txt:185
#, priority:100
msgid "If `-p` is specified, the contents of <object> are pretty-printed."
-msgstr ""
-"Caso a op챌찾o `-p` seja utilizada, o conte첬do de <object> ser찼 bem impresso."
+msgstr "Caso a op챌찾o `-p` seja utilizada, o conte첬do de <object> ser찼 bem impresso."
#. type: Plain text
#: en/git-cat-file.txt:188
#, priority:100
msgid "If <type> is specified, the raw (though uncompressed) contents of the <object> will be returned."
-msgstr ""
-"Caso um <tipo> seja utilizada, o conte첬do bruto (embora n찾o compactado) do "
-"<objeto> ser찼 retornado."
+msgstr "Caso um <tipo> seja utilizada, o conte첬do bruto (embora n찾o compactado) do <objeto> ser찼 retornado."
#. type: Title -
#: en/git-cat-file.txt:190
@@ -13240,21 +10881,13 @@ msgstr "SA횒DA DO LOTE"
#: en/git-cat-file.txt:196
#, priority:100
msgid "If `--batch` or `--batch-check` is given, `cat-file` will read objects from stdin, one per line, and print information about them. By default, the whole line is considered as an object, as if it were fed to linkgit:git-rev-parse[1]."
-msgstr ""
-"Caso o comando `--batch` ou `--batch-check` seja utilizado, o `cat-file` "
-"ler찼 os objetos vindos do stdin, um por linha, imprimindo as informa챌천es "
-"sobre eles. 횋 predefinido que a linha inteira seja considerada como um "
-"objeto, como se fosse alimentada para o linkgit:git-rev-parse[1]."
+msgstr "Caso o comando `--batch` ou `--batch-check` seja utilizado, o `cat-file` ler찼 os objetos vindos do stdin, um por linha, imprimindo as informa챌천es sobre eles. 횋 predefinido que a linha inteira seja considerada como um objeto, como se fosse alimentada para o linkgit:git-rev-parse[1]."
#. type: Plain text
#: en/git-cat-file.txt:201
#, priority:100
msgid "You can specify the information shown for each object by using a custom `<format>`. The `<format>` is copied literally to stdout for each object, with placeholders of the form `%(atom)` expanded, followed by a newline. The available atoms are:"
-msgstr ""
-"Voc챗 pode definir as informa챌천es exibidas para cada objeto utilizando um "
-"`<formato>` personalizado. O `<formato>` 챕 copiado de forma literal para "
-"cada objeto no stdout, com espa챌os reservados no formato `%(atom)` "
-"expandidos, seguidos por uma nova linha. Os 찼tomos que est찾o dispon챠veis s찾o:"
+msgstr "Voc챗 pode definir as informa챌천es exibidas para cada objeto utilizando um `<formato>` personalizado. O `<formato>` 챕 copiado de forma literal para cada objeto no stdout, com espa챌os reservados no formato `%(atom)` expandidos, seguidos por uma nova linha. Os 찼tomos que est찾o dispon챠veis s찾o:"
#. type: Labeled list
#: en/git-cat-file.txt:202
@@ -13302,9 +10935,7 @@ msgstr "`objectsize:disk`"
#: en/git-cat-file.txt:215
#, priority:100
msgid "The size, in bytes, that the object takes up on disk. See the note about on-disk sizes in the `CAVEATS` section below."
-msgstr ""
-"O tamanho, em bytes, que o objeto ocupa no disco. Consulte a nota sobre os "
-"tamanhos do disco na se챌찾o `RESSALVAS` abaixo."
+msgstr "O tamanho, em bytes, que o objeto ocupa no disco. Consulte a nota sobre os tamanhos do disco na se챌찾o `RESSALVAS` abaixo."
#. type: Labeled list
#: en/git-cat-file.txt:216
@@ -13316,10 +10947,7 @@ msgstr "`deltabase`"
#: en/git-cat-file.txt:220
#, priority:100
msgid "If the object is stored as a delta on-disk, this expands to the 40-hex sha1 of the delta base object. Otherwise, expands to the null sha1 (40 zeroes). See `CAVEATS` below."
-msgstr ""
-"Se o objeto estiver armazenado como um delta no disco, ele se expandir찼 para "
-"SHA-1 com 40 hexadecimais do objeto base delta. Caso contr찼rio, expande para "
-"um SHA-1 nulo (40 zeros). Consulte `RESSALVAS` abaixo."
+msgstr "Se o objeto estiver armazenado como um delta no disco, ele se expandir찼 para SHA-1 com 40 hexadecimais do objeto base delta. Caso contr찼rio, expande para um SHA-1 nulo (40 zeros). Consulte `RESSALVAS` abaixo."
#. type: Labeled list
#: en/git-cat-file.txt:221
@@ -13331,36 +10959,25 @@ msgstr "`rest`"
#: en/git-cat-file.txt:227
#, priority:100
msgid "If this atom is used in the output string, input lines are split at the first whitespace boundary. All characters before that whitespace are considered to be the object name; characters after that first run of whitespace (i.e., the \"rest\" of the line) are output in place of the `%(rest)` atom."
-msgstr ""
-"Caso este 찼tomo seja utilizado na cadeia da sa챠da, as linhas de entrada "
-"ser찾o divididas no primeiro limite de espa챌o. Todos os caracteres anteriores "
-"a esse espa챌o s찾o considerados como o nome do objeto; caracteres ap처s a "
-"primeira execu챌찾o do espa챌o (ou seja, o \"resto\" da linha) s찾o exibidos no "
-"lugar do 찼tomo `%(rest)`."
+msgstr "Caso este 찼tomo seja utilizado na cadeia da sa챠da, as linhas de entrada ser찾o divididas no primeiro limite de espa챌o. Todos os caracteres anteriores a esse espa챌o s찾o considerados como o nome do objeto; caracteres ap처s a primeira execu챌찾o do espa챌o (ou seja, o \"resto\" da linha) s찾o exibidos no lugar do 찼tomo `%(rest)`."
#. type: Plain text
#: en/git-cat-file.txt:230
#, priority:100
msgid "If no format is specified, the default format is `%(objectname) %(objecttype) %(objectsize)`."
-msgstr ""
-"Caso nenhum formato seja definido, o formato predefinido 챕 `%(objectname) "
-"%(objecttype) %(objectsize)`."
+msgstr "Caso nenhum formato seja definido, o formato predefinido 챕 `%(objectname) %(objecttype) %(objectsize)`."
#. type: Plain text
#: en/git-cat-file.txt:234
#, priority:100
msgid "If `--batch` is specified, the object information is followed by the object contents (consisting of `%(objectsize)` bytes), followed by a newline."
-msgstr ""
-"Caso `--batch` seja utilizado, as informa챌천es do objeto s찾o seguidas pelo "
-"conte첬do do objeto (consistindo em `%(objectsize)` bytes), seguido por uma "
-"nova linha."
+msgstr "Caso `--batch` seja utilizado, as informa챌천es do objeto s찾o seguidas pelo conte첬do do objeto (consistindo em `%(objectsize)` bytes), seguido por uma nova linha."
#. type: Plain text
#: en/git-cat-file.txt:236
#, priority:100
msgid "For example, `--batch` without a custom format would produce:"
-msgstr ""
-"Por exemplo, o comando `--batch` sem um formato personalizado produziria:"
+msgstr "Por exemplo, o comando `--batch` sem um formato personalizado produziria:"
#. type: delimited block -
#: en/git-cat-file.txt:240
@@ -13388,10 +11005,7 @@ msgstr "<sha1> SP <tipo> LF\n"
#: en/git-cat-file.txt:250
#, priority:100
msgid "If a name is specified on stdin that cannot be resolved to an object in the repository, then `cat-file` will ignore any custom format and print:"
-msgstr ""
-"Caso um nome seja utilizado no stdin que n찾o possa ser resolvido como um "
-"objeto no reposit처rio, ent찾o o `cat-file` ir찼 ignorar qualquer outro formato "
-"customizado e exibir찼:"
+msgstr "Caso um nome seja utilizado no stdin que n찾o possa ser resolvido como um objeto no reposit처rio, ent찾o o `cat-file` ir찼 ignorar qualquer outro formato customizado e exibir찼:"
#. type: delimited block -
#: en/git-cat-file.txt:253 en/git-cat-file.txt:279
@@ -13403,10 +11017,7 @@ msgstr "<objeto> SP faltando LF\n"
#: en/git-cat-file.txt:256
#, priority:100
msgid "If a name is specified that might refer to more than one object (an ambiguous short sha), then `cat-file` will ignore any custom format and print:"
-msgstr ""
-"Caso seja utilizado um nome que possa se referir a mais de um objeto (um SHA-"
-"1 curto e amb챠guo), ent찾o o `cat-file` ignorar찼 qualquer formato "
-"personalizado e exibir찼:"
+msgstr "Caso seja utilizado um nome que possa se referir a mais de um objeto (um SHA-1 curto e amb챠guo), ent찾o o `cat-file` ignorar찼 qualquer formato personalizado e exibir찼:"
#. type: delimited block -
#: en/git-cat-file.txt:259
@@ -13418,10 +11029,7 @@ msgstr "<objeto> SP amb챠guo LF\n"
#: en/git-cat-file.txt:264
#, priority:100
msgid "If --follow-symlinks is used, and a symlink in the repository points outside the repository, then `cat-file` will ignore any custom format and print:"
-msgstr ""
-"Caso a op챌찾o `--follow-symlinks` seja utilizado e um link-simb처lico no "
-"reposit처rio apontar para fora do reposit처rio, ent찾o o `cat-file` ir찼 ignorar "
-"qualquer outro formato customizado e exibir찼:"
+msgstr "Caso a op챌찾o `--follow-symlinks` seja utilizado e um link-simb처lico no reposit처rio apontar para fora do reposit처rio, ent찾o o `cat-file` ir찼 ignorar qualquer outro formato customizado e exibir찼:"
#. type: delimited block -
#: en/git-cat-file.txt:268
@@ -13437,18 +11045,13 @@ msgstr ""
#: en/git-cat-file.txt:273
#, priority:100
msgid "The symlink will either be absolute (beginning with a /), or relative to the tree root. For instance, if dir/link points to ../../foo, then <symlink> will be ../foo. <size> is the size of the symlink in bytes."
-msgstr ""
-"O link simb처lico ou ser찼 absoluto (come챌ando com um /) ou relativo 횪 raiz da "
-"찼rvore. Por exemplo, caso o dir/link aponte para ../../foo, ent찾o o "
-"`<symlink>` ser찼 ../foo. <tamanho> 챕 o tamanho do link simb처lico em bytes."
+msgstr "O link simb처lico ou ser찼 absoluto (come챌ando com um /) ou relativo 횪 raiz da 찼rvore. Por exemplo, caso o dir/link aponte para ../../foo, ent찾o o `<symlink>` ser찼 ../foo. <tamanho> 챕 o tamanho do link simb처lico em bytes."
#. type: Plain text
#: en/git-cat-file.txt:276
#, priority:100
msgid "If --follow-symlinks is used, the following error messages will be displayed:"
-msgstr ""
-"Caso a op챌찾o `--follow-symlinks` seja utilizado, as seguintes mensagens de "
-"erro ser찾o exibidas:"
+msgstr "Caso a op챌찾o `--follow-symlinks` seja utilizado, as seguintes mensagens de erro ser찾o exibidas:"
#. type: Plain text
#: en/git-cat-file.txt:281
@@ -13470,9 +11073,7 @@ msgstr ""
#: en/git-cat-file.txt:288
#, priority:100
msgid "is printed when the initial symlink exists, but something that it (transitive-of) points to does not."
-msgstr ""
-"챕 impresso quando o link-simb처lico inicial existe, mas algo que ele ("
-"transitivo de ) aponte o contr찼rio."
+msgstr "챕 impresso quando o link-simb처lico inicial existe, mas algo que ele (transitivo de ) aponte o contr찼rio."
#. type: delimited block -
#: en/git-cat-file.txt:292
@@ -13488,9 +11089,7 @@ msgstr ""
#: en/git-cat-file.txt:295
#, priority:100
msgid "is printed for symlink loops (or any symlinks that require more than 40 link resolutions to resolve)."
-msgstr ""
-"챕 impresso para os loops dos links simb처licos (ou quaisquer links simb처licos "
-"onde exijam mais de 40 resolu챌천es de link para serem resolvidos)."
+msgstr "챕 impresso para os loops dos links simb처licos (ou quaisquer links simb처licos onde exijam mais de 40 resolu챌천es de link para serem resolvidos)."
#. type: delimited block -
#: en/git-cat-file.txt:299
@@ -13506,9 +11105,7 @@ msgstr ""
#: en/git-cat-file.txt:302
#, priority:100
msgid "is printed when, during symlink resolution, a file is used as a directory name."
-msgstr ""
-"챕 impresso quando, durante a resolu챌찾o do link-simb처lico, um arquivo 챕 "
-"utilizado como um nome do diret처rio."
+msgstr "챕 impresso quando, durante a resolu챌찾o do link-simb처lico, um arquivo 챕 utilizado como um nome do diret처rio."
#. type: Title -
#: en/git-cat-file.txt:304 en/git-for-each-ref.txt:375 en/git-svn.txt:999
@@ -13520,22 +11117,13 @@ msgstr "RESSALVAS"
#: en/git-cat-file.txt:312 en/git-for-each-ref.txt:383
#, priority:100
msgid "Note that the sizes of objects on disk are reported accurately, but care should be taken in drawing conclusions about which refs or objects are responsible for disk usage. The size of a packed non-delta object may be much larger than the size of objects which delta against it, but the choice of which object is the base and which is the delta is arbitrary and is subject to change during a repack."
-msgstr ""
-"Observe que os tamanhos dos objetos no disco s찾o relatados com precis찾o, "
-"por챕m 챕 preciso ter cuidado ao tirar conclus천es sobre quais os \"refs\" ou "
-"os objetos s찾o respons찼veis pela utiliza챌찾o do disco. O tamanho de um objeto "
-"n찾o delta compactado, pode ser muito maior do que o tamanho dos objetos onde "
-"o delta seja contra ele, por챕m a escolha de qual objeto 챕 a base e qual 챕 o "
-"delta 챕 arbitr찼ria e est찼 sujeita a altera챌천es durante uma re-embalagem."
+msgstr "Observe que os tamanhos dos objetos no disco s찾o relatados com precis찾o, por챕m 챕 preciso ter cuidado ao tirar conclus천es sobre quais os \"refs\" ou os objetos s찾o respons찼veis pela utiliza챌찾o do disco. O tamanho de um objeto n찾o delta compactado, pode ser muito maior do que o tamanho dos objetos onde o delta seja contra ele, por챕m a escolha de qual objeto 챕 a base e qual 챕 o delta 챕 arbitr찼ria e est찼 sujeita a altera챌천es durante uma re-embalagem."
#. type: Plain text
#: en/git-cat-file.txt:316 en/git-for-each-ref.txt:387
#, priority:100
msgid "Note also that multiple copies of an object may be present in the object database; in this case, it is undefined which copy's size or delta base will be reported."
-msgstr ""
-"Observe tamb챕m que as v찼rias c처pias de um objeto podem estar presentes no "
-"banco de dados dos objetos; neste caso, 챕 indefinido qual o tamanho da c처pia "
-"ou da base delta que ser찼 relatada."
+msgstr "Observe tamb챕m que as v찼rias c처pias de um objeto podem estar presentes no banco de dados dos objetos; neste caso, 챕 indefinido qual o tamanho da c처pia ou da base delta que ser찼 relatada."
#. type: Title =
#: en/git-check-attr.txt:2
@@ -13563,10 +11151,7 @@ msgstr ""
#: en/git-check-attr.txt:19
#, priority:100
msgid "For every pathname, this command will list if each attribute is 'unspecified', 'set', or 'unset' as a gitattribute on that pathname."
-msgstr ""
-"Para cada nome do caminho, este comando listar찼 se cada atributo 챕 "
-"`unspecified` (n찾o especificado), `set` (definido) ou `unset` (n찾o definido) "
-"como um gitattribute neste nome do caminho."
+msgstr "Para cada nome do caminho, este comando listar찼 se cada atributo 챕 `unspecified` (n찾o especificado), `set` (definido) ou `unset` (n찾o definido) como um gitattribute neste nome do caminho."
#. type: Labeled list
#: en/git-check-attr.txt:22
@@ -13578,18 +11163,13 @@ msgstr "-a, --all"
#: en/git-check-attr.txt:26
#, priority:100
msgid "List all attributes that are associated with the specified paths. If this option is used, then 'unspecified' attributes will not be included in the output."
-msgstr ""
-"Liste todos os atributos que est찾o associados com os caminhos definidos. "
-"Caso esra op챌찾o seja utilizada, os atributos 'unspecified' n찾o ser찾o "
-"inclusos na sa챠da."
+msgstr "Liste todos os atributos que est찾o associados com os caminhos definidos. Caso esra op챌찾o seja utilizada, os atributos 'unspecified' n찾o ser찾o inclusos na sa챠da."
#. type: Plain text
#: en/git-check-attr.txt:29
#, priority:100
msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
-msgstr ""
-"Considere o `.gitattributos` apenas no 챠ndice, ignorando a 찼rvore de "
-"trabalho."
+msgstr "Considere o `.gitattributos` apenas no 챠ndice, ignorando a 찼rvore de trabalho."
#. type: Labeled list
#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:213
@@ -13601,58 +11181,43 @@ msgstr "--stdin"
#: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
#, priority:100
msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
-msgstr ""
-"Leia os nomes do caminho na entrada predefinida, um por linha, em vez da "
-"linha de comando."
+msgstr "Leia os nomes do caminho na entrada predefinida, um por linha, em vez da linha de comando."
#. type: Plain text
#: en/git-check-attr.txt:38
#, 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 da sa챠da 챕 modificado para ser analis찼vel por uma m찼quina. Caso o "
-"`--stdin` tamb챕m seja informado, os caminhos da entrada ser찾o separados por "
-"um caractere `NUL` em vez de um caractere de avan챌o de linha."
+msgstr "O formato da sa챠da 챕 modificado para ser analis찼vel por uma m찼quina. Caso o `--stdin` tamb챕m seja informado, os caminhos da 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
#, priority:100
msgid "Interpret all preceding arguments as attributes and all following arguments as path names."
-msgstr ""
-"Interprete todas as op챌천es anteriores como atributos e todos as op챌천es a "
-"seguir como nomes do caminho."
+msgstr "Interprete todas as op챌천es anteriores como atributos e todos as op챌천es a seguir como nomes do caminho."
#. type: Plain text
#: en/git-check-attr.txt:46
#, priority:100
msgid "If none of `--stdin`, `--all`, or `--` is used, the first argument will be treated as an attribute and the rest of the arguments as pathnames."
-msgstr ""
-"Caso nenhuma op챌찾o `--stdin`, `--all` ou `--` seja utilizado, a primeira "
-"ser찼 tratada como um atributo e o restante das op챌천es como os nomes do "
-"caminho."
+msgstr "Caso nenhuma op챌찾o `--stdin`, `--all` ou `--` seja utilizado, a primeira ser찼 tratada como um atributo e o restante das op챌천es como os nomes do caminho."
#. type: Plain text
#: en/git-check-attr.txt:52
#, priority:100
msgid "The output is of the form: <path> COLON SP <attribute> COLON SP <info> LF"
-msgstr ""
-"A sa챠da assume a forma: <caminho> COLON SP <atributo> COLON SP <info> LF"
+msgstr "A sa챠da assume a forma: <caminho> COLON SP <atributo> COLON SP <info> LF"
#. type: Plain text
#: en/git-check-attr.txt:55
#, priority:100
msgid "unless `-z` is in effect, in which case NUL is used as delimiter: <path> NUL <attribute> NUL <info> NUL"
-msgstr ""
-"a menos que `-z` esteja em vigor, no caso onde `NUL` 챕 utilizado como um "
-"delimitador: <caminho> NUL <atributo> NUL <info> NUL"
+msgstr "a menos que `-z` esteja em vigor, no caso onde `NUL` 챕 utilizado como um delimitador: <caminho> NUL <atributo> NUL <info> NUL"
#. type: Plain text
#: en/git-check-attr.txt:59
#, priority:100
msgid "<path> is the path of a file being queried, <attribute> is an attribute being queried and <info> can be either:"
-msgstr ""
-"`<path>` 챕 o caminho de um arquivo sendo consultado, `<attribute>` 챕 um "
-"atributo sendo consultado e <info> pode ser:"
+msgstr "`<path>` 챕 o caminho de um arquivo sendo consultado, `<attribute>` 챕 um atributo sendo consultado e <info> pode ser:"
#. type: Labeled list
#: en/git-check-attr.txt:60
@@ -13706,12 +11271,7 @@ msgstr "quando um valor foi atribu챠do ao atributo."
#: en/git-check-attr.txt:69 en/git-check-ignore.txt:105
#, priority:100
msgid "Buffering happens as documented under the `GIT_FLUSH` option in linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by overfilling an input buffer or reading from an empty output buffer."
-msgstr ""
-"A carga da mem처ria interm챕dia (buffering) ocorre como foi documentada na "
-"op챌찾o `GIT_FLUSH` em linkgit:git[1]. O respons찼vel pela chamada 챕 aquele "
-"que evita que os bloqueios causados pelo preenchimento excessivo de uma "
-"mem처ria interm챕dia na entrada ou pela leitura de uma mem처ria interm챕dia "
-"vazia na sa챠da."
+msgstr "A carga da mem처ria interm챕dia (buffering) ocorre como foi documentada na op챌찾o `GIT_FLUSH` em linkgit:git[1]. O respons찼vel pela chamada 챕 aquele que evita que os bloqueios causados pelo preenchimento excessivo de uma mem처ria interm챕dia na entrada ou pela leitura de uma mem처ria interm챕dia vazia na sa챠da."
#. type: Plain text
#: en/git-check-attr.txt:74
@@ -13851,11 +11411,7 @@ msgstr ""
#: en/git-check-ignore.txt:22
#, priority:100
msgid "For each pathname given via the command-line or from a file via `--stdin`, check whether the file is excluded by .gitignore (or other input files to the exclude mechanism) and output the path if it is excluded."
-msgstr ""
-"Para cada nome do caminho informado atrav챕s da linha de comando ou de um "
-"arquivo via `--stdin`, verifique se o arquivo foi exclu챠do por .gitignorar ("
-"ou outros arquivos de entrada para o mecanismo de exclus찾o) e imprima o "
-"caminho se ele for exclu챠do."
+msgstr "Para cada nome do caminho informado atrav챕s da linha de comando ou de um arquivo via `--stdin`, verifique se o arquivo foi exclu챠do por .gitignorar (ou outros arquivos de entrada para o mecanismo de exclus찾o) e imprima o caminho se ele for exclu챠do."
#. type: Plain text
#: en/git-check-ignore.txt:25
@@ -13873,9 +11429,7 @@ msgstr "-q, --quieto"
#: en/git-check-ignore.txt:31
#, priority:100
msgid "Don't output anything, just set exit status. This is only valid with a single pathname."
-msgstr ""
-"N찾o produza nada, apenas defina a condi챌찾o do encerramento. 횋 v찼lido apenas "
-"com um 첬nico nome do caminho."
+msgstr "N찾o produza nada, apenas defina a condi챌찾o do encerramento. 횋 v찼lido apenas com um 첬nico nome do caminho."
#. type: Labeled list
#: en/git-check-ignore.txt:32
@@ -13887,29 +11441,19 @@ msgstr "-v, --verbose"
#: en/git-check-ignore.txt:39
#, priority:100
msgid "Instead of printing the paths that are excluded, for each path that matches an exclude pattern, print the exclude pattern together with the path. (Matching an exclude pattern usually means the path is excluded, but if the pattern begins with '!' then it is a negated pattern and matching it means the path is NOT excluded.)"
-msgstr ""
-"Em vez de imprimir quais os caminhos foram exclu챠dos, para cada caminho que "
-"coincida a um padr찾o de exclus찾o, imprima o padr찾o de exclus찾o junto com o "
-"caminho. (A correspond챗ncia da exclus찾o de um padr찾o geralmente significa "
-"que o caminho foi exclu챠do, por챕m caso o padr찾o comece com '!', ent찾o 챕 um "
-"padr찾o negado e a coincid챗ncia significa que o caminho N횄O 챕 exclu챠do.)"
+msgstr "Em vez de imprimir quais os caminhos foram exclu챠dos, para cada caminho que coincida a um padr찾o de exclus찾o, imprima o padr찾o de exclus찾o junto com o caminho. (A correspond챗ncia da exclus찾o de um padr찾o geralmente significa que o caminho foi exclu챠do, por챕m caso o padr찾o comece com '!', ent찾o 챕 um padr찾o negado e a coincid챗ncia significa que o caminho N횄O 챕 exclu챠do.)"
#. type: Plain text
#: en/git-check-ignore.txt:42
#, priority:100
msgid "For precedence rules within and between exclude sources, see linkgit:gitignore[5]."
-msgstr ""
-"Para as regras da preced챗ncia dentro e entre as fontes eliminadas, consulte "
-"linkgit:gitignorar[5]."
+msgstr "Para as regras da preced챗ncia dentro e entre as fontes eliminadas, consulte linkgit:gitignorar[5]."
#. type: Plain text
#: en/git-check-ignore.txt:51
#, 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 gerado 챕 modificado para ser analis찼vel pela m찼quina (veja abaixo)"
-". Caso o `--stdin` tamb챕m seja informado, os caminhos da entrada ser찾o "
-"separados por um caractere `NUL` em vez de um caractere de avan챌o de linha."
+msgstr "O formato gerado 챕 modificado para ser analis찼vel pela m찼quina (veja abaixo). Caso o `--stdin` tamb챕m seja informado, os caminhos da 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
@@ -13921,10 +11465,7 @@ msgstr "-n, --non-matching"
#: en/git-check-ignore.txt:57
#, priority:100
msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
-msgstr ""
-"Exiba os caminhos informados que n찾o coincidam com qualquer padr찾o.\t S처 faz "
-"sentido quando a op챌찾o `--verbose` est찼 ativa, caso contr찼rio n찾o seria "
-"poss챠vel distinguir entre os caminhos que coincidem ou n찾o com um padr찾o."
+msgstr "Exiba os caminhos informados que n찾o coincidam com qualquer padr찾o.\t S처 faz sentido quando a op챌찾o `--verbose` est찼 ativa, caso contr찼rio n찾o seria poss챠vel distinguir entre os caminhos que coincidem ou n찾o com um padr찾o."
#. type: Labeled list
#: en/git-check-ignore.txt:58 en/git-grep.txt:79
@@ -13936,30 +11477,19 @@ msgstr "--no-index"
#: en/git-check-ignore.txt:64
#, priority:100
msgid "Don't look in the index when undertaking the checks. This can be used to debug why a path became tracked by e.g. `git add .` and was not ignored by the rules as expected by the user or when developing patterns including negation to match a path previously added with `git add -f`."
-msgstr ""
-"N찾o procure no 챠ndice ao realizar as verifica챌천es. Pode ser utilizado para "
-"depurar o motivo de um caminho ter sido rastreado por ex. `git add .` e n찾o "
-"foi ignorado pelas regras conforme o esperado pelo usu찼rio ou ao desenvolver "
-"padr천es incluindo a nega챌찾o da coincid챗ncia a um caminho adicionado "
-"anteriormente com` git add -f`."
+msgstr "N찾o procure no 챠ndice ao realizar as verifica챌천es. Pode ser utilizado para depurar o motivo de um caminho ter sido rastreado por ex. `git add .` e n찾o foi ignorado pelas regras conforme o esperado pelo usu찼rio ou ao desenvolver padr천es incluindo a nega챌찾o da coincid챗ncia a um caminho adicionado anteriormente com` git add -f`."
#. type: Plain text
#: en/git-check-ignore.txt:72
#, priority:100
msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line. If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
-msgstr ""
-"횋 predefinido que ser찼 gerado qualquer um dos nomes do caminho informados "
-"que coincidam com um padr찾o para ser ignorado, um por linha. Caso nenhum "
-"padr찾o coincida com um determinado caminho, nada ser찼 gerado; significa que "
-"o caminho n찾o ser찼 ignorado."
+msgstr "횋 predefinido que ser찼 gerado qualquer um dos nomes do caminho informados que coincidam com um padr찾o para ser ignorado, um por linha. Caso nenhum padr찾o coincida com um determinado caminho, nada ser찼 gerado; significa que o caminho n찾o ser찼 ignorado."
#. type: Plain text
#: en/git-check-ignore.txt:74
#, priority:100
msgid "If `--verbose` is specified, the output is a series of lines of the form:"
-msgstr ""
-"Caso a op챌찾o `--verbose` seja utilizada, a sa챠da ser찼 uma s챕rie de linhas "
-"desta forma:"
+msgstr "Caso a op챌찾o `--verbose` seja utilizada, a sa챠da ser찼 uma s챕rie de linhas desta forma:"
#. type: Plain text
#: en/git-check-ignore.txt:76
@@ -13971,23 +11501,13 @@ msgstr "<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname>"
#: en/git-check-ignore.txt:84
#, priority:100
msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source. If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output. <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
-msgstr ""
-"<pathname> 챕 o caminho de um arquivo que est찼 sendo consultado, <pattern> 챕 "
-"o padr찾o que ser찼 coincidido, <source> 챕 o arquivo de origem do padr찾o e "
-"<linenum> 챕 o n첬mero da linha do padr찾o nesta origem. Caso o padr찾o "
-"contenha um prefixo `!` Ou um sufixo `/`, ele ser찼 preservado na sa챠da. "
-"<source> ser찼 um caminho absoluto ao se referir ao arquivo configurado por "
-"`core.excludesFile`, ou relativo 횪 raiz do reposit처rio ao se referir a um `."
-"git/info/exclude` ou a exclus찾o de um arquivo por diret처rio."
+msgstr "<pathname> 챕 o caminho de um arquivo que est찼 sendo consultado, <pattern> 챕 o padr찾o que ser찼 coincidido, <source> 챕 o arquivo de origem do padr찾o e <linenum> 챕 o n첬mero da linha do padr찾o nesta origem. Caso o padr찾o contenha um prefixo `!` Ou um sufixo `/`, ele ser찼 preservado na sa챠da. <source> ser찼 um caminho absoluto ao se referir ao arquivo configurado por `core.excludesFile`, ou relativo 횪 raiz do reposit처rio ao se referir a um `.git/info/exclude` ou a exclus찾o de um arquivo por diret처rio."
#. type: Plain text
#: en/git-check-ignore.txt:88
#, priority:100
msgid "If `-z` is specified, the pathnames in the output are delimited by the null character; if `--verbose` is also specified then null characters are also used instead of colons and hard tabs:"
-msgstr ""
-"Caso `-z` seja utilizado, os nomes do caminho gerado s찾o delimitados pelo "
-"caractere nulo; caso `--verbose` tamb챕m seja utilizado, ent찾o os caracteres "
-"nulos tamb챕m ser찾o utilizados em vez das v챠rgulas e das guias r챠gidas:"
+msgstr "Caso `-z` seja utilizado, os nomes do caminho gerado s찾o delimitados pelo caractere nulo; caso `--verbose` tamb챕m seja utilizado, ent찾o os caracteres nulos tamb챕m ser찾o utilizados em vez das v챠rgulas e das guias r챠gidas:"
#. type: Plain text
#: en/git-check-ignore.txt:90
@@ -13999,17 +11519,7 @@ msgstr "<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL>"
#: en/git-check-ignore.txt:100
#, priority:100
msgid "If `-n` or `--non-matching` are specified, non-matching pathnames will also be output, in which case all fields in each output record except for <pathname> will be empty. This can be useful when running non-interactively, so that files can be incrementally streamed to STDIN of a long-running check-ignore process, and for each of these files, STDOUT will indicate whether that file matched a pattern or not. (Without this option, it would be impossible to tell whether the absence of output for a given file meant that it didn't match any pattern, or that the output hadn't been generated yet.)"
-msgstr ""
-"Caso `-n` ou `--nonnon-matching` sejam utilizados, os nomes do caminho que "
-"n찾o coincidam tamb챕m ser찾o gerados; nesse caso, todos os campos de cada "
-"registro da sa챠da, exceto o `<pathname>` que estar찼 vazio. Pode ser 첬til ao "
-"ser executado de forma n찾o interativa, para que os arquivos possam ser "
-"transmitidos incrementalmente para o `STDIN` de um longo processo de "
-"verificar/ignorar para cada um destes arquivos, o `STDOUT` indicar찼 caso "
-"esse arquivo coincida ou n찾o com um padr찾o. (Sem essa op챌찾o, seria "
-"imposs챠vel dizer se a aus챗ncia da sa챠da para um determinado arquivo "
-"significava que n찾o h찼 coincid챗ncia com nenhum padr찾o ou que a sa챠da ainda "
-"n찾o havia sido gerada.)"
+msgstr "Caso `-n` ou `--nonnon-matching` sejam utilizados, os nomes do caminho que n찾o coincidam tamb챕m ser찾o gerados; nesse caso, todos os campos de cada registro da sa챠da, exceto o `<pathname>` que estar찼 vazio. Pode ser 첬til ao ser executado de forma n찾o interativa, para que os arquivos possam ser transmitidos incrementalmente para o `STDIN` de um longo processo de verificar/ignorar para cada um destes arquivos, o `STDOUT` indicar찼 caso esse arquivo coincida ou n찾o com um padr찾o. (Sem essa op챌찾o, seria imposs챠vel dizer se a aus챗ncia da sa챠da para um determinado arquivo significava que n찾o h찼 coincid챗ncia com nenhum padr찾o ou que a sa챠da ainda n찾o havia sido gerada.)"
#. type: Title -
#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
@@ -14069,9 +11579,7 @@ msgstr "git-check-mailmap(1)"
#: en/git-check-mailmap.txt:7
#, priority:100
msgid "git-check-mailmap - Show canonical names and email addresses of contacts"
-msgstr ""
-"git-check-mailmap - Exiba os nomes can척nicos e os endere챌os de e-mail dos "
-"contatos"
+msgstr "git-check-mailmap - Exiba os nomes can척nicos e os endere챌os de e-mail dos contatos"
#. type: Plain text
#: en/git-check-mailmap.txt:13
@@ -14083,30 +11591,19 @@ msgstr "'git check-mailmap' [<op챌천es>] <contato>...\n"
#: en/git-check-mailmap.txt:22
#, priority:100
msgid "For each ``Name $$<user@host>$$'' or ``$$<user@host>$$'' from the command-line or standard input (when using `--stdin`), look up the person's canonical name and email address (see \"Mapping Authors\" below). If found, print them; otherwise print the input as-is."
-msgstr ""
-"Para cada ``Name $$<user@host>$$'' ou ``$$<user@host>$$'' na linha de "
-"comando ou na entrada predefinida (ao utilizar o `--stdin`), procure o nome "
-"can척nico e o endere챌o do e-mail da pessoa (consulte \"Mapeando os autores\" "
-"logo abaixo). Se encontrado, exiba-os; caso contr찼rio, exiba a entrada como "
-"estiver."
+msgstr "Para cada ``Name $$<user@host>$$'' ou ``$$<user@host>$$'' na linha de comando ou na entrada predefinida (ao utilizar o `--stdin`), procure o nome can척nico e o endere챌o do e-mail da pessoa (consulte \"Mapeando os autores\" logo abaixo). Se encontrado, exiba-os; caso contr찼rio, exiba a entrada como estiver."
#. type: Plain text
#: en/git-check-mailmap.txt:29
#, priority:100
msgid "Read contacts, one per line, from the standard input after exhausting contacts provided on the command-line."
-msgstr ""
-"Leia os contatos, um por linha, a partir da entrada predefinida depois de "
-"esgotar os contatos informados na linha de comando."
+msgstr "Leia os contatos, um por linha, a partir da entrada predefinida depois de esgotar os contatos informados na linha de comando."
#. type: Plain text
#: en/git-check-mailmap.txt:37
#, priority:100
msgid "For each contact, a single line is output, terminated by a newline. If the name is provided or known to the 'mailmap', ``Name $$<user@host>$$'' is printed; otherwise only ``$$<user@host>$$'' is printed."
-msgstr ""
-"Para cada contato, uma 첬nica linha 챕 emitida, finalizada por uma nova "
-"linha. Caso o nome seja informado ou desconhecido ao 'mailmap', ``Name "
-"$$<user@host>$$'' 챕 exibido; caso contr찼rio ser찼 exibido apenas "
-"``$$<user@host>$$''."
+msgstr "Para cada contato, uma 첬nica linha 챕 emitida, finalizada por uma nova linha. Caso o nome seja informado ou desconhecido ao 'mailmap', ``Name $$<user@host>$$'' 챕 exibido; caso contr찼rio ser찼 exibido apenas ``$$<user@host>$$''."
#. type: Title =
#: en/git-checkout-index.txt:2
@@ -14118,8 +11615,7 @@ msgstr "git-checkout-index(1)"
#: en/git-checkout-index.txt:7
#, priority:100
msgid "git-checkout-index - Copy files from the index to the working tree"
-msgstr ""
-"git-checkout-index - Copie os arquivos do 챠ndice para a 찼rvore de trabalho"
+msgstr "git-checkout-index - Copie os arquivos do 챠ndice para a 찼rvore de trabalho"
#. type: Plain text
#: en/git-checkout-index.txt:17
@@ -14141,24 +11637,19 @@ msgstr ""
#: en/git-checkout-index.txt:22
#, priority:100
msgid "Will copy all files listed from the index to the working directory (not overwriting existing files)."
-msgstr ""
-"Copiar찼 todos os arquivos listados no 챠ndice para o diret처rio de trabalho ("
-"n찾o sobrescrevendo os arquivos j찼 existentes)."
+msgstr "Copiar찼 todos os arquivos listados no 챠ndice para o diret처rio de trabalho (n찾o sobrescrevendo os arquivos j찼 existentes)."
#. type: Plain text
#: en/git-checkout-index.txt:29
#, priority:100
msgid "update stat information for the checked out entries in the index file."
-msgstr ""
-"atualiza as informa챌천es das estat챠sticas para as entradas com check-out no "
-"arquivo do 챠ndice."
+msgstr "atualiza as informa챌천es das estat챠sticas para as entradas com check-out no arquivo do 챠ndice."
#. type: Plain text
#: en/git-checkout-index.txt:33
#, priority:100
msgid "be quiet if files exist or are not in the index"
-msgstr ""
-"fique em sil챗ncio caso os arquivos j찼 existirem ou n찾o estiverem no 챠ndice"
+msgstr "fique em sil챗ncio caso os arquivos j찼 existirem ou n찾o estiverem no 챠ndice"
#. type: Plain text
#: en/git-checkout-index.txt:37
@@ -14170,9 +11661,7 @@ msgstr "imp천em que os arquivos existentes sejam sobrescritos"
#: en/git-checkout-index.txt:42
#, priority:100
msgid "checks out all files in the index. Cannot be used together with explicit filenames."
-msgstr ""
-"faz a verifica챌찾o de todos os arquivos no 챠ndice. N찾o pode ser utilizado "
-"junto com os nomes dos arquivos expl챠citos."
+msgstr "faz a verifica챌찾o de todos os arquivos no 챠ndice. N찾o pode ser utilizado junto com os nomes dos arquivos expl챠citos."
#. type: Labeled list
#: en/git-checkout-index.txt:44
@@ -14184,9 +11673,7 @@ msgstr "--no-create"
#: en/git-checkout-index.txt:47
#, priority:100
msgid "Don't checkout new files, only refresh files already checked out."
-msgstr ""
-"N찾o fa챌a a verifica챌찾o dos novos arquivos, apenas renove os arquivos j찼 "
-"verificados."
+msgstr "N찾o fa챌a a verifica챌찾o dos novos arquivos, apenas renove os arquivos j찼 verificados."
#. type: Labeled list
#: en/git-checkout-index.txt:48
@@ -14198,9 +11685,7 @@ msgstr "--prefix=<string>"
#: en/git-checkout-index.txt:51
#, priority:100
msgid "When creating files, prepend <string> (usually a directory including a trailing /)"
-msgstr ""
-"Ao criar os arquivos, anexe uma `<string>쨈 (geralmente um diret처rio "
-"incluindo uma barra `/`)"
+msgstr "Ao criar os arquivos, anexe uma `<string>쨈 (geralmente um diret처rio incluindo uma barra `/`)"
#. type: Labeled list
#: en/git-checkout-index.txt:52
@@ -14212,10 +11697,7 @@ msgstr "--stage=<number>|all"
#: en/git-checkout-index.txt:56
#, priority:100
msgid "Instead of checking out unmerged entries, copy out the files from named stage. <number> must be between 1 and 3. Note: --stage=all automatically implies --temp."
-msgstr ""
-"Em vez de fazer a verifica챌찾o das entradas que n찾o foram mescladas, copie os "
-"arquivos do est찼gio informado. <number> deve ser entre 1 e 3. Observa챌찾o: "
-"`--stage=all` automaticamente implica no uso da op챌찾o `--temp`."
+msgstr "Em vez de fazer a verifica챌찾o das entradas que n찾o foram mescladas, copie os arquivos do est찼gio informado. <number> deve ser entre 1 e 3. Observa챌찾o: `--stage=all` automaticamente implica no uso da op챌찾o `--temp`."
#. type: Labeled list
#: en/git-checkout-index.txt:57
@@ -14227,27 +11709,19 @@ msgstr "--temp"
#: en/git-checkout-index.txt:61
#, priority:100
msgid "Instead of copying the files to the working directory write the content to temporary files. The temporary name associations will be written to stdout."
-msgstr ""
-"Em vez de copiar os arquivos para o diret처rio de trabalho, grave o conte첬do "
-"em arquivos tempor찼rios. As associa챌천es do nome tempor찼rio ser찾o gravadas "
-"no stdout."
+msgstr "Em vez de copiar os arquivos para o diret처rio de trabalho, grave o conte첬do em arquivos tempor찼rios. As associa챌천es do nome tempor찼rio ser찾o gravadas no stdout."
#. type: Plain text
#: en/git-checkout-index.txt:66 en/git-update-index.txt:158
#, priority:100
msgid "Instead of taking list of paths from the command line, read list of paths from the standard input. Paths are separated by LF (i.e. one path per line) by default."
-msgstr ""
-"Em vez de pegar a lista dos caminhos da linha de comando, leia a lista dos "
-"caminhos na entrada predefinida. 횋 predefinido que os caminhos sejam "
-"separados por LF (ou seja, um caminho por linha)."
+msgstr "Em vez de pegar a lista dos caminhos da linha de comando, leia a lista dos caminhos na entrada predefinida. 횋 predefinido que os caminhos sejam separados por LF (ou seja, um caminho por linha)."
#. type: Plain text
#: en/git-checkout-index.txt:70
#, priority:100
msgid "Only meaningful with `--stdin`; paths are separated with NUL character instead of LF."
-msgstr ""
-"Somente faz sentido se utilizado junto com a op챌찾o `--stdin`; os caminhos "
-"s찾o separados com caracteres `NUL` em vez de `LF`."
+msgstr "Somente faz sentido se utilizado junto com a op챌찾o `--stdin`; os caminhos s찾o separados com caracteres `NUL` em vez de `LF`."
#. type: Plain text
#: en/git-checkout-index.txt:73 en/git-checkout.txt:356 en/git-commit.txt:360 en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-reset.txt:127 en/git-restore.txt:140 en/git-update-index.txt:229 en/git-verify-pack.txt:38
@@ -14265,19 +11739,13 @@ msgstr "A ordem das op챌천es costumava importar, agora n찾o mais."
#: en/git-checkout-index.txt:79
#, priority:100
msgid "Just doing `git checkout-index` does nothing. You probably meant `git checkout-index -a`. And if you want to force it, you want `git checkout-index -f -a`."
-msgstr ""
-"Agora ao executar o comando `git checkout-index`, ele n찾o faz nada. Voc챗 "
-"provavelmente quis utilizar `git checkout-index -a`. E caso queira impor a "
-"sua utiliza챌찾o, utilize `git checkout-index -f -a`."
+msgstr "Agora ao executar o comando `git checkout-index`, ele n찾o faz nada. Voc챗 provavelmente quis utilizar `git checkout-index -a`. E caso queira impor a sua utiliza챌찾o, utilize `git checkout-index -f -a`."
#. type: Plain text
#: en/git-checkout-index.txt:83
#, priority:100
msgid "Intuitiveness is not the goal here. Repeatability is. The reason for the \"no arguments means no work\" behavior is that from scripts you are supposed to be able to do:"
-msgstr ""
-"A intui챌찾o n찾o 챕 o objetivo aqui. A repetibilidade 챕. A raz찾o para o "
-"comportamento \"sem argumentos significa que n찾o h찼 trabalho\" 챕 que, a "
-"partir dos scripts que voc챗 deve ser capaz de executar:"
+msgstr "A intui챌찾o n찾o 챕 o objetivo aqui. A repetibilidade 챕. A raz찾o para o comportamento \"sem argumentos significa que n찾o h찼 trabalho\" 챕 que, a partir dos scripts que voc챗 deve ser capaz de executar:"
#. type: delimited block -
#: en/git-checkout-index.txt:86
@@ -14289,11 +11757,7 @@ msgstr "$ find . -name '*.h' -print0 | xargs -0 git checkout-index -f --\n"
#: 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 ir찼 impor a substitui챌찾o de todos os arquivos `* .h` pelas suas c처pias "
-"no cache. Uma linha de comando vazia implica em \"all\", isso imp천em que a "
-"renova챌찾o ocorra em tudo o que estava no 챠ndice, o que n찾o era o caso. Mas "
-"como 'git checkout-index' aceita `--stdin`, seria muito mais r찼pido utilizar:"
+msgstr "o que ir찼 impor a substitui챌찾o de todos os arquivos `* .h` pelas suas c처pias no cache. Uma linha de comando vazia implica em \"all\", isso imp천em que a renova챌찾o ocorra em tudo o que estava no 챠ndice, o que n찾o era o caso. Mas como 'git checkout-index' aceita `--stdin`, seria muito mais r찼pido utilizar:"
#. type: delimited block -
#: en/git-checkout-index.txt:95
@@ -14305,10 +11769,7 @@ msgstr "$ find . -name '*.h' -print0 | git checkout-index -f -z --stdin\n"
#: 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 resto ser찼 um nome do "
-"arquivo; isso evitar찼 problemas com um nome do arquivo de, por exemplo, `-a`"
-". Utilizar `--` provavelmente 챕 uma boa pol챠tica nos scripts."
+msgstr "O `--` apenas 챕 uma boa ideia quando voc챗 sabe que o resto ser찼 um nome do arquivo; isso evitar찼 problemas com um nome do arquivo de, por exemplo, `-a`. Utilizar `--` provavelmente 챕 uma boa pol챠tica nos scripts."
#. type: Title -
#: en/git-checkout-index.txt:103
@@ -14320,14 +11781,7 @@ msgstr "Utilizando `--temp` ou `--stage=all`"
#: en/git-checkout-index.txt:110
#, priority:100
msgid "When `--temp` is used (or implied by `--stage=all`) 'git checkout-index' will create a temporary file for each index entry being checked out. The index will not be updated with stat information. These options can be useful if the caller needs all stages of all unmerged entries so that the unmerged files can be processed by an external merge tool."
-msgstr ""
-"Quando o `--temp` 챕 utilizado (ou de forma impl챠cita por `--stage=all`), o "
-"comando 'git checkout-index' cria um arquivo tempor찼rio para cada entrada do "
-"챠ndice que est찼 sendo retirado. O 챠ndice n찾o ser찼 atualizado com as "
-"informa챌천es das estat챠sticas. Estas op챌천es podem ser 첬teis caso quem chame, "
-"precise de todos os est찼gios, de todas as entradas n찾o mescladas para que os "
-"arquivos n찾o mesclados possam ser processados por uma ferramenta de "
-"mesclagem externa."
+msgstr "Quando o `--temp` 챕 utilizado (ou de forma impl챠cita por `--stage=all`), o comando 'git checkout-index' cria um arquivo tempor찼rio para cada entrada do 챠ndice que est찼 sendo retirado. O 챠ndice n찾o ser찼 atualizado com as informa챌천es das estat챠sticas. Estas op챌천es podem ser 첬teis caso quem chame, precise de todos os est찼gios, de todas as entradas n찾o mescladas para que os arquivos n찾o mesclados possam ser processados por uma ferramenta de mesclagem externa."
#. type: Plain text
#: en/git-checkout-index.txt:114
@@ -14345,13 +11799,7 @@ msgstr "tempname TAB path RS"
#: en/git-checkout-index.txt:121
#, priority:100
msgid "The first format is what gets used when `--stage` is omitted or is not `--stage=all`. The field tempname is the temporary file name holding the file content and path is the tracked path name in the index. Only the requested entries are output."
-msgstr ""
-"O primeiro formato 챕 o que 챕 utilizado quando o `--stage` for omitido ou n찾o "
-"seja um `stage=all`. O campo `tempname` 챕 o nome do arquivo tempor찼rio que "
-"contenha o conte첬do do arquivo e `path` 챕 o nome do caminho monitorado no "
-"챠ndice. O campo `tempname` 챕 o arquivo com o nome tempor찼rio que armazena o "
-"conte첬do do arquivo, o `path` e o nome do caminho monitorado no 챠ndice. "
-"Apenas as entradas solicitadas s찾o produzidas."
+msgstr "O primeiro formato 챕 o que 챕 utilizado quando o `--stage` for omitido ou n찾o seja um `stage=all`. O campo `tempname` 챕 o nome do arquivo tempor찼rio que contenha o conte첬do do arquivo e `path` 챕 o nome do caminho monitorado no 챠ndice. O campo `tempname` 챕 o arquivo com o nome tempor찼rio que armazena o conte첬do do arquivo, o `path` e o nome do caminho monitorado no 챠ndice. Apenas as entradas solicitadas s찾o produzidas."
#. type: Plain text
#: en/git-checkout-index.txt:123
@@ -14363,35 +11811,19 @@ msgstr "stage1temp SP stage2temp SP stage3tmp TAB path RS"
#: en/git-checkout-index.txt:129
#, priority:100
msgid "The second format is what gets used when `--stage=all`. The three stage temporary fields (stage1temp, stage2temp, stage3temp) list the name of the temporary file if there is a stage entry in the index or `.` if there is no stage entry. Paths which only have a stage 0 entry will always be omitted from the output."
-msgstr ""
-"O segundo formato 챕 o que 챕 utilizado quando a op챌찾o for `--stage=all`. Os "
-"campos tempor찼rios dos tr챗s est찼gios (stage1temp, stage2temp, stage3temp) "
-"listam o nome do arquivo tempor찼rio caso haja uma entrada no est찼gio, no "
-"챠ndice ou em `.`, caso n찾o haja uma entrada do est찼gio. Os caminhos que "
-"possuem apenas uma entrada do est찼gio 0 sempre ser찾o omitidos da sa챠da."
+msgstr "O segundo formato 챕 o que 챕 utilizado quando a op챌찾o for `--stage=all`. Os campos tempor찼rios dos tr챗s est찼gios (stage1temp, stage2temp, stage3temp) listam o nome do arquivo tempor찼rio caso haja uma entrada no est찼gio, no 챠ndice ou em `.`, caso n찾o haja uma entrada do est찼gio. Os caminhos que possuem apenas uma entrada do est찼gio 0 sempre ser찾o omitidos da sa챠da."
#. type: Plain text
#: en/git-checkout-index.txt:136
#, priority:100
msgid "In both formats RS (the record separator) is newline by default but will be the null byte if -z was passed on the command line. The temporary file names are always safe strings; they will never contain directory separators or whitespace characters. The path field is always relative to the current directory and the temporary file names are always relative to the top level directory."
-msgstr ""
-"Nos dois formatos, o RS (separador de registros) por predefini챌찾o 챕 a nova "
-"linha, mas ser찼 o byte nulo caso `-z` seja utilizado na linha de comando. "
-"Os nomes dos arquivos tempor찼rios s찾o sempre gerados de forma segura com uma "
-"cadeia de caracteres; eles nunca conter찾o separadores de diret처rio ou "
-"caracteres de espa챌o. O campo do caminho 챕 sempre relativo ao diret처rio "
-"atual e os nomes dos arquivos tempor찼rios s찾o sempre relativos ao cume do "
-"diret처rio."
+msgstr "Nos dois formatos, o RS (separador de registros) por predefini챌찾o 챕 a nova linha, mas ser찼 o byte nulo caso `-z` seja utilizado na linha de comando. Os nomes dos arquivos tempor찼rios s찾o sempre gerados de forma segura com uma cadeia de caracteres; eles nunca conter찾o separadores de diret처rio ou caracteres de espa챌o. O campo do caminho 챕 sempre relativo ao diret처rio atual e os nomes dos arquivos tempor찼rios s찾o sempre relativos ao cume do diret처rio."
#. type: Plain text
#: en/git-checkout-index.txt:140
#, priority:100
msgid "If the object being copied out to a temporary file is a symbolic link the content of the link will be written to a normal file. It is up to the end-user or the Porcelain to make use of this information."
-msgstr ""
-"Caso o objeto que est찼 sendo copiado para um arquivo tempor찼rio seja um link "
-"simb처lico, o conte첬do do link ser찼 registrado em um arquivo normal. Cabe ao "
-"usu찼rio final ou a Porcelana a responsabilidade do que fazer com essa "
-"informa챌찾o."
+msgstr "Caso o objeto que est찼 sendo copiado para um arquivo tempor찼rio seja um link simb처lico, o conte첬do do link ser찼 registrado em um arquivo normal. Cabe ao usu찼rio final ou a Porcelana a responsabilidade do que fazer com essa informa챌찾o."
#. type: Labeled list
#: en/git-checkout-index.txt:144
@@ -14403,9 +11835,7 @@ msgstr "Para atualizar e renovar somente os arquivos j찼 verificados"
#: en/git-checkout-index.txt:148 en/git-update-index.txt:362
#, no-wrap, priority:100
msgid "$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh\n"
-msgstr ""
-"$ git checkout-index -n -f -a && git update-index --ignore-missing --"
-"refresh\n"
+msgstr "$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh\n"
#. type: Labeled list
#: en/git-checkout-index.txt:150
@@ -14417,10 +11847,7 @@ msgstr "Utilizando 'git checkout-index' para \"exportar uma 찼rvore inteira\""
#: en/git-checkout-index.txt:154
#, priority:100
msgid "The prefix ability basically makes it trivial to use 'git checkout-index' as an \"export as tree\" function. Just read the desired tree into the index, and do:"
-msgstr ""
-"A habilidade do prefixo basicamente torna trivial a utiliza챌찾o do comando "
-"'git checkout-index' como uma fun챌찾o \"exportar como 찼rvore\". Leia apenas "
-"a 찼rvore desejada no 챠ndice e fa챌a:"
+msgstr "A habilidade do prefixo basicamente torna trivial a utiliza챌찾o do comando 'git checkout-index' como uma fun챌찾o \"exportar como 찼rvore\". Leia apenas a 찼rvore desejada no 챠ndice e fa챌a:"
#. type: delimited block -
#: en/git-checkout-index.txt:157
@@ -14432,18 +11859,13 @@ msgstr "$ git checkout-index --prefix=git-export-dir/ -a\n"
#: en/git-checkout-index.txt:161
#, priority:100
msgid "`git checkout-index` will \"export\" the index into the specified directory."
-msgstr ""
-"O comando `git checkout-index` ir찼 \"exportar\" o 챠ndice para um determinado "
-"diret처rio."
+msgstr "O comando `git checkout-index` ir찼 \"exportar\" o 챠ndice para um determinado diret처rio."
#. type: Plain text
#: en/git-checkout-index.txt:165
#, priority:100
msgid "The final \"/\" is important. The exported name is literally just prefixed with the specified string. Contrast this with the following example."
-msgstr ""
-"O \"/\" no final 챕 importante. O nome que foi exportado 챕 literalmente "
-"prefixado com a cadeia de caracteres definida. Fa챌a o contraste disso com o "
-"seguinte exemplo."
+msgstr "O \"/\" no final 챕 importante. O nome que foi exportado 챕 literalmente prefixado com a cadeia de caracteres definida. Fa챌a o contraste disso com o seguinte exemplo."
#. type: Labeled list
#: en/git-checkout-index.txt:166
@@ -14461,9 +11883,7 @@ msgstr "$ git checkout-index --prefix=.merged- Makefile\n"
#: en/git-checkout-index.txt:174
#, priority:100
msgid "This will check out the currently cached copy of `Makefile` into the file `.merged-Makefile`."
-msgstr ""
-"Verifica se a c처pia dispon챠vel no cache do `Makefile` est찼 no arquivo "
-"`.merged-Makefile`."
+msgstr "Verifica se a c처pia dispon챠vel no cache do `Makefile` est찼 no arquivo `.merged-Makefile`."
#. type: Title =
#: en/git-checkout.txt:2
@@ -14475,9 +11895,7 @@ 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 entre os ramos ou restaure os arquivos da 찼rvore de "
-"trabalho"
+msgstr "git-checkout - Alterne entre os ramos ou restaure os arquivos da 찼rvore de trabalho"
#. type: Plain text
#: en/git-checkout.txt:18
@@ -14494,23 +11912,16 @@ msgstr ""
"'git checkout' [-q] [-f] [-m] [<ramo>]\n"
"'git checkout' [-q] [-f] [-m] --detach [<ramo>]\n"
"'git checkout' [-q] [-f] [-m] [--detach] <commit>\n"
-"'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <novo_ramo>] "
-"[<ponto_de_inicio>]\n"
-"'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<tree-ish>] [--] "
-"<pathspec>...\n"
-"'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<tree-ish>] "
-"--pathspec-from-file=<arquivo> [--pathspec-file-nul]\n"
+"'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <novo_ramo>] [<ponto_de_inicio>]\n"
+"'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<tree-ish>] [--] <pathspec>...\n"
+"'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<tree-ish>] --pathspec-from-file=<arquivo> [--pathspec-file-nul]\n"
"'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]\n"
#. type: Plain text
#: en/git-checkout.txt:25
#, 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 os arquivos na 찼rvore de trabalho para coincidir com a vers찾o no "
-"챠ndice ou na 찼rvore informada. Se nenhum \"pathspec\" seja utilizado, o "
-"comando 'git checkout' tamb챕m atualizar찼 o `HEAD` para definir o ramo "
-"informado como o ramo atual."
+msgstr "Atualiza os arquivos na 찼rvore de trabalho para coincidir com a vers찾o no 챠ndice ou na 찼rvore informada. Se nenhum \"pathspec\" seja utilizado, o comando 'git checkout' tamb챕m atualizar찼 o `HEAD` para definir o ramo informado como o ramo atual."
#. type: Labeled list
#: en/git-checkout.txt:26
@@ -14522,20 +11933,13 @@ msgstr "'git checkout' [<ramo>]"
#: en/git-checkout.txt:32
#, 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 um `<ramo>`, alterne para ele atualizando "
-"o 챠ndice, os arquivos na 찼rvore de trabalho e apontando para o `HEAD` do "
-"ramo. As modifica챌천es locais s찾o mantidas nos arquivos da 찼rvore de "
-"trabalho, para que o commit possa ser no `<ramo>`."
+msgstr "Para se preparar para trabalhar em um `<ramo>`, alterne para ele atualizando o 챠ndice, os arquivos na 찼rvore de trabalho e apontando para o `HEAD` do ramo. As modifica챌천es locais s찾o mantidas nos arquivos da 찼rvore de trabalho, para que o commit possa ser no `<ramo>`."
#. type: Plain text
#: en/git-checkout.txt:36
#, 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 ""
-"Caso o `<ramifica챌찾o>` n찾o seja encontrada mas exista uma monitorada "
-"remotamente (chame-o de `<remoto>`) com um nome que coincida e quando `--no-"
-"guess` n찾o seja utilizado, trate-o como um equivalente a"
+msgstr "Caso o `<ramifica챌찾o>` n찾o seja encontrada mas exista uma monitorada remotamente (chame-o de `<remoto>`) com um nome que coincida e quando `--no-guess` n찾o seja utilizado, trate-o como um equivalente a"
#. type: delimited block -
#: en/git-checkout.txt:39 en/git-checkout.txt:184
@@ -14547,11 +11951,7 @@ msgstr "$ git checkout -b <ramo> --track <remote>/<ramo>\n"
#: en/git-checkout.txt:45
#, 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 o `<ramo>` no caso em que o comando se degenera para "
-"\"verificar o branch atual\", que 챕 um glorificado n찾o-op com efeitos "
-"colaterais bastante dispendiosos para exibir apenas as informa챌천es de "
-"rastreamento, caso existam, para o ramo atual."
+msgstr "Voc챗 pode omitir o `<ramo>` no caso em que o comando se degenera para \"verificar o branch atual\", que 챕 um glorificado n찾o-op com efeitos colaterais bastante dispendiosos para exibir apenas as informa챌천es de rastreamento, caso existam, para o ramo atual."
#. type: Labeled list
#: en/git-checkout.txt:46
@@ -14609,10 +12009,7 @@ msgstr "Prepare-se para trabalhar em cima de `<commit>`, desanexando o `HEAD` ne
#: en/git-checkout.txt:79
#, 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 `--detach` "
-"pode ser utilizada para desanexar o `HEAD` na ponta do ramo (` git checkout "
-"<branch>` verificaria aquela ramifica챌찾o sem desanexar o `HEAD`)."
+msgstr "Quando o argumento `<commit>` 챕 um nome de ramifica챌찾o a op챌찾o `--detach` pode ser utilizada para desanexar o `HEAD` na ponta do ramo (` git checkout <branch>` verificaria aquela ramifica챌찾o sem desanexar o `HEAD`)."
#. type: Plain text
#: en/git-checkout.txt:81
@@ -14636,11 +12033,7 @@ msgstr "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] -
#: en/git-checkout.txt:90
#, priority:240
msgid "Overwrite the contents of the files that match the pathspec. When the `<tree-ish>` (most often a commit) is not given, overwrite working tree with the contents in the index. When the `<tree-ish>` is given, overwrite both the index and the working tree with the contents at the `<tree-ish>`."
-msgstr ""
-"Substitua o conte첬do dos arquivos que correspondem ao `pathspec`. Quando o "
-"`<tree-ish>` (na maioria das vezes um commit) n찾o for informado, substitua a "
-"찼rvore de trabalho pelo conte첬do do 챠ndice. Quando o `` for informado, "
-"substitua o 챠ndice e a 찼rvore de trabalho pelo conte첬do em `<tree-ish>`."
+msgstr "Substitua o conte첬do dos arquivos que correspondem ao `pathspec`. Quando o `<tree-ish>` (na maioria das vezes um commit) n찾o for informado, substitua a 찼rvore de trabalho pelo conte첬do do 챠ndice. Quando o `` for informado, substitua o 챠ndice e a 찼rvore de trabalho pelo conte첬do em `<tree-ish>`."
#. type: Plain text
#: en/git-checkout.txt:98
@@ -14712,26 +12105,13 @@ msgstr "Ao verificar os caminhos do 챠ndice, confira o est찼gio #2 ('nosso') ou
#: en/git-checkout.txt:136
#, priority:240
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."
-msgstr ""
-"Observe que durante o `git rebase` e o `git pull --rebase`, o 'ours' (nosso) "
-"e o 'theirs' (deles) podem aparecer trocados; `--ours` informa a vers찾o do "
-"ramo onde as altera챌천es s찾o feitas, enquanto `--theirs` informa a vers찾o do "
-"ramo que cont챕m o seu trabalho que est찼 sendo feito o \"rebase\"."
+msgstr "Observe que durante o `git rebase` e o `git pull --rebase`, o 'ours' (nosso) e o 'theirs' (deles) podem aparecer trocados; `--ours` informa a vers찾o do ramo onde as altera챌천es s찾o feitas, enquanto `--theirs` informa a vers찾o do ramo que cont챕m o seu trabalho que est찼 sendo feito o \"rebase\"."
#. type: Plain text
#: en/git-checkout.txt:146
#, priority:240
msgid "This is because `rebase` is used in a workflow that treats the history at the remote as the shared canonical one, and treats the work done on the branch you are rebasing as the third-party work to be integrated, and you are temporarily assuming the role of the keeper of the canonical history during the rebase. As the keeper of the canonical history, you need to view the history from the remote as `ours` (i.e. \"our shared canonical history\"), while what you did on your side branch as `theirs` (i.e. \"one contributor's work on top of it\")."
-msgstr ""
-"Isso ocorre porque o `rebase` 챕 utilizado em um fluxo de trabalho que trata "
-"o hist처rico no ramo remoto como o can척nico compartilhado e trata o trabalho "
-"realizado no ramo que voc챗 est찼 fazendo o \"rebase\" como o trabalho de "
-"terceiros que ser찼 integrado, voc챗 est찼 temporariamente assumindo o papel do "
-"guardi찾o da hist처ria can척nica durante o rebase. Como o guardi찾o da hist처ria "
-"can척nica, voc챗 precisa ver a hist처ria do ramo remoto como \"nosso\" (isto 챕, "
-"\"nossa hist처ria can척nica compartilhada\"), enquanto o que voc챗 fez no seu "
-"ramo lateral como \"seu\" (isto 챕, \"um trabalho de colaborador\" em cima "
-"dele \")."
+msgstr "Isso ocorre porque o `rebase` 챕 utilizado em um fluxo de trabalho que trata o hist처rico no ramo remoto como o can척nico compartilhado e trata o trabalho realizado no ramo que voc챗 est찼 fazendo o \"rebase\" como o trabalho de terceiros que ser찼 integrado, voc챗 est찼 temporariamente assumindo o papel do guardi찾o da hist처ria can척nica durante o rebase. Como o guardi찾o da hist처ria can척nica, voc챗 precisa ver a hist처ria do ramo remoto como \"nosso\" (isto 챕, \"nossa hist처ria can척nica compartilhada\"), enquanto o que voc챗 fez no seu ramo lateral como \"seu\" (isto 챕, \"um trabalho de colaborador\" em cima dele \")."
#. type: Labeled list
#: en/git-checkout.txt:147
@@ -14773,9 +12153,7 @@ msgstr "Se nenhuma op챌찾o `-b` for dada o nome da nova ramifica챌찾o ser찼 deri
#: en/git-checkout.txt:175 en/git-switch.txt:170
#, 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 da configura챌찾o `branch."
-"autoSetupMerge` seja verdadeira."
+msgstr "N찾o configure \"upstream\" mesmo que a vari찼vel da configura챌찾o `branch.autoSetupMerge` seja verdadeira."
#. type: Labeled list
#: en/git-checkout.txt:176 en/git-switch.txt:87
@@ -14835,11 +12213,7 @@ msgstr "--orf찾o <novo_branch>"
#: en/git-checkout.txt:214
#, 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 '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찼 as origens e ser찼 a raiz de uma nova hist처ria "
-"totalmente desconectada de todas os outros ramos 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찼 as origens e ser찼 a raiz de uma nova hist처ria totalmente desconectada de todas os outros ramos e commits."
#. type: Plain text
#: en/git-checkout.txt:219
@@ -14869,11 +12243,7 @@ msgstr "--ignore-skip-worktree-bits"
#: en/git-checkout.txt:238
#, 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 ""
-"횋 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>`."
+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: Labeled list
#: en/git-checkout.txt:240 en/git-rebase.txt:347 en/git-rebase.txt:619 en/git-reset.txt:74 en/git-restore.txt:83 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
@@ -14927,11 +12297,7 @@ msgstr "Selecione interativamente os peda챌os na diferen챌a entre o `<tree-ish>`
#: en/git-checkout.txt:277
#, priority:240
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."
-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 "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`."
#. type: Plain text
#: en/git-checkout.txt:280
@@ -14979,14 +12345,7 @@ msgstr "--recurse-submodules"
#: en/git-checkout.txt:302
#, priority:240
msgid "Using `--recurse-submodules` will update the content of all active 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, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule."
-msgstr ""
-"Usando `--recurse-submodules` ir찼 atualizar o conte첬do de todos os "
-"subm처dulos ativados 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 utilizado, os subm처dulos das 찼rvores de trabalho n찾o "
-"ser찾o atualizados. Assim como o linkgit:git-submodule[1], isso desanexar찼 os "
-"subm처dulos do `HEAD`."
+msgstr "Usando `--recurse-submodules` ir찼 atualizar o conte첬do de todos os subm처dulos ativados 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 utilizado, os subm처dulos das 찼rvores de trabalho n찾o ser찾o atualizados. 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:118
@@ -15022,20 +12381,13 @@ msgstr "Ramifica챌찾o que ser찼 extra챠da; se refere a um ramo (ou seja, um nome
#: en/git-checkout.txt:334
#, 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 ao 첬ltimo ramo/commit "
-"finalizado utilizando o comando \"git checkout\". Tamb챕m 챕 poss챠vel utilizar "
-"`-` que 챕 um sin척nimo para `@{-1}`."
+msgstr "Voc챗 pode usar a sintaxe `@{- N}` para se referir ao 첬ltimo ramo/commit finalizado utilizando o comando \"git checkout\". Tamb챕m 챕 poss챠vel utilizar `-` que 챕 um sin척nimo para `@{-1}`."
#. type: Plain text
#: en/git-checkout.txt:338 en/git-switch.txt:58
#, 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 "
-"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`, no caso, a "
-"predefini챌찾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`, no caso, a predefini챌찾o 챕 `HEAD`."
#. type: Labeled list
#: en/git-checkout.txt:339
@@ -15065,11 +12417,7 @@ msgstr "O nome do commit na qual deve se iniciar uma nova ramifica챌찾o; para ma
#: en/git-checkout.txt:349
#, 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, 챕 poss챠vel utilizar `\"A...B\"` como um atalho como "
-"uma base para a mesclagem de `A` e `B` caso exista exatamente uma base de "
-"merge. Voc챗 pode deixar de fora, no m찼ximo, um de `A` e` B`, caso em que a "
-"predefini챌찾o 챕 `HEAD`."
+msgstr "Como um caso especial, 챕 poss챠vel utilizar `\"A...B\"` como um atalho como uma base para a mesclagem de `A` e `B` caso exista exatamente uma base de merge. Voc챗 pode deixar de fora, no m찼ximo, um de `A` e` B`, caso em que a predefini챌찾o 챕 `HEAD`."
#. type: Plain text
#: en/git-checkout.txt:353
@@ -15125,12 +12473,7 @@ msgstr ""
#: en/git-checkout.txt:383
#, 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 nesta condi챌찾o a ramifica챌찾o 챕 atualizada "
-"com refer챗ncia ao novo commit. Especificamente, o comando 'git commit' cria "
-"um novo commit `d`, cuja origem seja 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`:"
+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 origem seja 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
@@ -15198,12 +12541,7 @@ msgstr ""
#: en/git-checkout.txt:418
#, 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, independente do comando \"checkout\" utilizado o `HEAD` agora "
-"se refere diretamente ao commit `b`. Isso 챕 conhecido como uma condi챌찾o em "
-"desanexo (detached ) do `HEAD`. Simplesmente significa que o `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:"
+msgstr "Observe que, independente do comando \"checkout\" utilizado o `HEAD` agora se refere diretamente ao commit `b`. Isso 챕 conhecido como uma condi챌찾o em desanexo (detached ) do `HEAD`. Simplesmente significa que o `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
@@ -15233,9 +12571,7 @@ msgstr ""
#: en/git-checkout.txt:435
#, 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 ""
-"Agora existe um novo commit `e`, por챕m a sua refer챗ncia existe apenas no "
-"`HEAD`. Nessa condi챌찾o fica claro que podemos adicionar mais um commit:"
+msgstr "Agora existe um novo commit `e`, por챕m a sua refer챗ncia existe apenas no `HEAD`. Nessa condi챌찾o fica claro que podemos adicionar mais um commit:"
#. type: delimited block -
#: en/git-checkout.txt:448
@@ -15333,11 +12669,7 @@ msgstr "cria uma nova tag `foo`com refer챗ncia ao commit `f` deixando HEAD desan
#: en/git-checkout.txt:491
#, 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`, primeiro precisamos recuperar o nome do "
-"objeto (normalmente utilizando `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:"
+msgstr "Se nos afastamos do commit `f`, primeiro precisamos recuperar o nome do objeto (normalmente utilizando `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
@@ -15359,24 +12691,13 @@ msgstr "DISAMBIGUA횉횄O DE ARGUMENTOS"
#: en/git-checkout.txt:508
#, 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 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>`. Utilize `git checkout -- <pathspec>` caso "
-"queira eliminar estes caminhos de dentro 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>`. Utilize `git checkout -- <pathspec>` caso queira eliminar estes caminhos de dentro do 챠ndice."
#. type: Plain text
#: en/git-checkout.txt:515
#, 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 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."
+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
@@ -15414,9 +12735,7 @@ msgstr "restaura do 챠ndice o arquivo `hello.c`"
#: en/git-checkout.txt:529
#, priority:240
msgid "If you want to check out _all_ C source files out of the index, you can say"
-msgstr ""
-"Caso queira verificar _todos_ os arquivos \"*.c\" do c처digo-fonte "
-"diretamente do 챠ndice, voc챗 pode utilizar"
+msgstr "Caso queira verificar _todos_ os arquivos \"*.c\" do c처digo-fonte diretamente do 챠ndice, voc챗 pode utilizar"
#. type: delimited block -
#: en/git-checkout.txt:532
@@ -15428,11 +12747,7 @@ msgstr "$ git verificar -- '*.c'\n"
#: en/git-checkout.txt:538
#, priority:240
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)."
-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 dos arquivos 챕 utilizado para coincidir com as 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찼 retirado, mesmo que n찾o esteja mais na 찼rvore de trabalho, porque o agrupamento dos arquivos 챕 utilizado para coincidir com as entradas no 챠ndice (n찾o na 찼rvore de trabalho pelo shell)."
#. type: Plain text
#: en/git-checkout.txt:542
@@ -15450,9 +12765,7 @@ msgstr "$ git verificar -- hello.c\n"
#: en/git-checkout.txt:549 en/git-switch.txt:201
#, priority:240
msgid "After working in the wrong branch, switching to the correct branch would be done using:"
-msgstr ""
-"Depois de trabalhar no ramo errado, mudar para o ramo correto seria feito "
-"utilizando:"
+msgstr "Depois de trabalhar no ramo errado, mudar para o ramo correto seria feito utilizando:"
#. type: delimited block -
#: en/git-checkout.txt:552
@@ -15464,10 +12777,7 @@ msgstr "$ git checkout meu t처pico\n"
#: en/git-checkout.txt:557
#, 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, o seu ramo \"errado\" e o correto \"mytopic\" podem diferir nos "
-"arquivos modificados localmente por voc챗. Que dessa maneira, a verifica챌찾o "
-"acima falhar찼 assim:"
+msgstr "No entanto, o seu ramo \"errado\" e o correto \"mytopic\" podem diferir nos arquivos modificados localmente por voc챗. Que dessa maneira, a verifica챌찾o acima falhar찼 assim:"
#. type: delimited block -
#: en/git-checkout.txt:561
@@ -15499,10 +12809,7 @@ msgstr ""
#: en/git-checkout.txt:574 en/git-switch.txt:226
#, priority:240
msgid "After this three-way merge, the local modifications are _not_ registered in your index file, so `git diff` would show you what changes you made since the tip of the new branch."
-msgstr ""
-"Ap처s esta mesclagem de tr챗s vias, as altera챌천es locais n찾o ser찾o registradas "
-"no seu arquivo do 챠ndice, portanto, o `git diff` exibir찼 quais foram as "
-"altera챌천es feitas desde o cume do novo ramo."
+msgstr "Ap처s esta mesclagem de tr챗s vias, as altera챌천es locais n찾o ser찾o registradas no seu arquivo do 챠ndice, portanto, o `git diff` exibir찼 quais foram as altera챌천es feitas desde o cume do novo ramo."
#. type: Plain text
#: en/git-checkout.txt:577
@@ -15528,10 +12835,7 @@ msgstr ""
#: en/git-checkout.txt:589
#, priority:240
msgid "At this point, `git diff` shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files. Edit and resolve the conflict and mark it resolved with `git add` as usual:"
-msgstr ""
-"Neste ponto, o `git diff` mostra as mudan챌as mescladas como no exemplo "
-"anterior, bem como as mudan챌as nos arquivos conflitantes. Editar, resolver "
-"o conflito e marc찼-lo como resolvido com o comando `git add` como de costume:"
+msgstr "Neste ponto, o `git diff` mostra as mudan챌as mescladas como no exemplo anterior, bem como as mudan챌as nos arquivos conflitantes. Editar, resolver o conflito e marc찼-lo como resolvido com o comando `git add` como de costume:"
#. type: delimited block -
#: en/git-checkout.txt:593
@@ -15597,10 +12901,7 @@ msgstr "O Git imp천e as seguintes regras sobre como as refer챗ncias s찾o nomeada
#: en/git-check-ref-format.txt:33
#, priority:100
msgid "They can include slash `/` for hierarchical (directory) grouping, but no slash-separated component can begin with a dot `.` or end with the sequence `.lock`."
-msgstr ""
-"Eles podem incluir slash `/` para agrupamento hier찼rquico (diret처rio), "
-"nenhum componente separado por barras pode come챌ar com um ponto `.` ou "
-"terminar com a sequ챗ncia `.lock`."
+msgstr "Eles podem incluir slash `/` para agrupamento hier찼rquico (diret처rio), nenhum componente separado por barras pode come챌ar com um ponto `.` ou terminar com a sequ챗ncia `.lock`."
#. type: Plain text
#: en/git-check-ref-format.txt:38
@@ -15660,29 +12961,19 @@ msgstr "Eles n찾o podem conter um `\\`."
#: en/git-check-ref-format.txt:65
#, priority:100
msgid "These rules make it easy for shell script based tools to parse reference names, pathname expansion by the shell when a reference name is used unquoted (by mistake), and also avoid ambiguities in certain reference name expressions (see linkgit:gitrevisions[7]):"
-msgstr ""
-"Estas regras facilitam para as ferramentas com base em script shell a "
-"analise das refer챗ncias dos nomes, a expans찾o de um nome do caminho pelo "
-"shell quando um nome de refer챗ncia 챕 utilizado sem aspas (por engano) e "
-"tamb챕m para evitar as ambiguidades em certas express천es dos nomes das "
-"refer챗ncias (consulte linkgit:gitrevisions[7]) :"
+msgstr "Estas regras facilitam para as ferramentas com base em script shell a analise das refer챗ncias dos nomes, a expans찾o de um nome do caminho pelo shell quando um nome de refer챗ncia 챕 utilizado sem aspas (por engano) e tamb챕m para evitar as ambiguidades em certas express천es dos nomes das refer챗ncias (consulte linkgit:gitrevisions[7]) :"
#. type: Plain text
#: 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 utilizado 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 utilizado 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
#, priority:100
msgid "A tilde `~` and caret `^` are used to introduce the postfix 'nth parent' and 'peel onion' operation."
-msgstr ""
-"Um til `~` e um caractere circunflexo `^` s찾o utilizados para introduzir a "
-"opera챌찾o do postfix 'nth parent' e 'peel onion'."
+msgstr "Um til `~` e um caractere circunflexo `^` s찾o utilizados para introduzir a opera챌찾o do postfix 'nth parent' e 'peel onion'."
#. type: Plain text
#: en/git-check-ref-format.txt:77
@@ -15694,31 +12985,13 @@ msgstr "Um ponto-e-v챠rgula `:` 챕 usado como `srcref: dstref` para significar\"
#: en/git-check-ref-format.txt:79
#, priority:100
msgid "at-open-brace `@{` is used as a notation to access a reflog entry."
-msgstr ""
-"at-open-brace `@{` 챕 utilizado como uma nota챌찾o para acessar uma entrada de "
-"reflog."
+msgstr "at-open-brace `@{` 챕 utilizado como uma nota챌찾o para acessar uma entrada de reflog."
#. type: Plain text
#: en/git-check-ref-format.txt:98
#, 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 pega um nome e verifica se ele pode ser "
-"utilizado 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 utilizando a opera챌찾o \"git switch\" ou \"git checkout\". Essa "
-"op챌찾o deve ser utilizada 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."
+msgstr "Com a op챌찾o `--branch`, o comando pega um nome e verifica se ele pode ser utilizado 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 utilizando a opera챌찾o \"git switch\" ou \"git checkout\". Essa op챌찾o deve ser utilizada 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
@@ -15772,8 +13045,7 @@ msgstr "$ git verifique-o-formato-ref --branch @{-1}\n"
#: en/git-check-ref-format.txt:132
#, priority:100
msgid "Determine the reference name to use for a new branch:"
-msgstr ""
-"Determine o nome de refer챗ncia a ser utilizado para uma nova ramifica챌찾o:"
+msgstr "Determine o nome de refer챗ncia a ser utilizado para uma nova ramifica챌찾o:"
#. type: delimited block -
#: en/git-check-ref-format.txt:136
@@ -15783,8 +13055,7 @@ msgid ""
"{ echo \"we do not like '$newbranch' as a branch name.\" >&2 ; exit 1 ; }\n"
msgstr ""
"$ ref=$(git check-ref-format --normalize \"refs/heads/$newbranch\")||\n"
-"{ echo \"n처s n찾o gostamos do '$newbranch' como um nome do ramo.\" >&2 ; exit "
-"1 ; }\n"
+"{ echo \"n처s n찾o gostamos do '$newbranch' como um nome do ramo.\" >&2 ; exit 1 ; }\n"
#. type: Title =
#: en/git-cherry-pick.txt:2
@@ -15922,12 +13193,7 @@ msgstr "--mainline n첬mero-pai"
#: en/git-cherry-pick.txt:91
#, priority:100
msgid "Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline. This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent."
-msgstr ""
-"Normalmente voc챗 n찾o pode selecionar uma mesclagem porque n찾o sabe qual o "
-"lado da mesclagem deve ser considerado como a linha principal. Esta op챌찾o "
-"determina o n첬mero da origem (a partir de 1) da linha principal e permite "
-"que o \"cherry-pick\" repita a altera챌찾o em rela챌찾o a origem que foi "
-"informada."
+msgstr "Normalmente voc챗 n찾o pode selecionar uma mesclagem porque n찾o sabe qual o lado da mesclagem deve ser considerado como a linha principal. Esta op챌찾o determina o n첬mero da origem (a partir de 1) da linha principal e permite que o \"cherry-pick\" repita a altera챌찾o em rela챌찾o a origem que foi informada."
#. type: Labeled list
#: en/git-cherry-pick.txt:93 en/git-revert.txt:78 en/merge-options.txt:2
@@ -15951,9 +13217,7 @@ msgstr "Isso 챕 첬til quando voc챗 seleciona mais de um efeito de commit para se
#: en/git-cherry-pick.txt:109 en/git-revert.txt:104
#, priority:100
msgid "Add Signed-off-by line at the end of the commit message. See the signoff option in linkgit:git-commit[1] for more information."
-msgstr ""
-"Adicione uma linha de assinatura no final da mensagem do commit. Para mais "
-"informa챌천es, consulte a op챌찾o 'signoff' em linkgit:git-commit[1]."
+msgstr "Adicione uma linha de assinatura no final da mensagem do commit. Para mais informa챌천es, consulte a op챌찾o 'signoff' em linkgit:git-commit[1]."
#. type: Labeled list
#: en/git-cherry-pick.txt:119 en/merge-options.txt:42
@@ -15989,10 +13253,7 @@ msgstr "--allow-empty-message"
#: en/git-cherry-pick.txt:141
#, 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."
-msgstr ""
-"횋 predefinido que o \"cherry-picking\" de um commit com uma mensagem vazia "
-"falhar찼. Esta op챌찾o substitui este comportamento, permitindo que os commits "
-"das mensagens vazias sejam selecionadas."
+msgstr "횋 predefinido que o \"cherry-picking\" de um commit com uma mensagem vazia falhar찼. Esta op챌찾o substitui este comportamento, permitindo que os commits das mensagens vazias sejam selecionadas."
#. type: Labeled list
#: en/git-cherry-pick.txt:142
@@ -16034,9 +13295,7 @@ msgstr "--strategy-op챌찾o=<op챌찾o>"
#: en/git-cherry-pick.txt:158 en/git-revert.txt:114
#, priority:100
msgid "Pass the merge strategy-specific option through to the merge strategy. See linkgit:git-merge[1] for details."
-msgstr ""
-"Encaminhe a um op챌찾o espec챠fica at챕 a estrat챕gia de mesclagem. Para mais "
-"detalhes, consulte linkgit:git-merge[1]."
+msgstr "Encaminhe a um op챌찾o espec챠fica at챕 a estrat챕gia de mesclagem. Para mais detalhes, consulte linkgit:git-merge[1]."
#. type: Title -
#: en/git-cherry-pick.txt:165 en/git-revert.txt:121
@@ -16206,9 +13465,7 @@ msgstr "'git cherry' [-v] [<upstream> [<head> [<limite>]]]\n"
#: en/git-cherry.txt:17
#, priority:100
msgid "Determine whether there are commits in `<head>..<upstream>` that are equivalent to those in the range `<limit>..<head>`."
-msgstr ""
-"Determine se h찼 commits em `<head>..<upstream>` que s찾o equivalentes 횪queles "
-"no intervalo `<limite>..<head>`."
+msgstr "Determine se h찼 commits em `<head>..<upstream>` que s찾o equivalentes 횪queles no intervalo `<limite>..<head>`."
#. type: Plain text
#: en/git-cherry.txt:22
@@ -16220,10 +13477,7 @@ msgstr "O teste de equival챗ncia 챕 baseado no diff, depois de remover os espa챌
#: en/git-cherry.txt:26
#, priority:100
msgid "Outputs the SHA1 of every commit in `<limit>..<head>`, prefixed with `-` for commits that have an equivalent in <upstream>, and `+` for commits that do not."
-msgstr ""
-"Gera o SHA1 de cada commit em `<limite>..<head>`, prefixado com `-` para os "
-"commits que possuam um equivalente no `<upstream>` e `+` para os commits que "
-"n찾o tiverem."
+msgstr "Gera o SHA1 de cada commit em `<limite>..<head>`, prefixado com `-` para os commits que possuam um equivalente no `<upstream>` e `+` para os commits que n찾o tiverem."
#. type: Plain text
#: en/git-cherry.txt:31
@@ -16347,9 +13601,7 @@ msgstr ""
#: en/git-cherry.txt:90
#, priority:100
msgid "In such cases, git-cherry shows a concise summary of what has yet to be applied:"
-msgstr ""
-"Nesses casos, o git-cherry exibe um resumo conciso do que ainda precisa ser "
-"aplicado:"
+msgstr "Nesses casos, o git-cherry exibe um resumo conciso do que ainda precisa ser aplicado:"
#. type: delimited block -
#: en/git-cherry.txt:96
@@ -16513,20 +13765,13 @@ msgstr ""
#: en/git-clean.txt:43
#, 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 da 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 utilizado 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."
+msgstr "Se a vari찼vel da 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 utilizado 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
#, priority:100
msgid "Show what would be done and clean files interactively. See ``Interactive mode'' for details."
-msgstr ""
-"Exibe o que seria feito e exclua os arquivos interativamente. Para mais "
-"detalhes consulte ``modo interativo''."
+msgstr "Exibe o que seria feito e exclua os arquivos interativamente. Para mais detalhes consulte ``modo interativo''."
#. type: Plain text
#: en/git-clean.txt:52
@@ -16556,21 +13801,13 @@ msgstr "--excluir=<pattern>"
#: en/git-clean.txt:62
#, priority:100
msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
-msgstr ""
-"Utilize o padr찾o de exclus찾o informado al챕m das regras de exclus찾o "
-"predefinidas (consulte linkgit:gitignore[5])."
+msgstr "Utilize o padr찾o de exclus찾o informado al챕m das regras de exclus찾o predefinidas (consulte linkgit:gitignore[5])."
#. type: Plain text
#: en/git-clean.txt:70
#, 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 utilize as regras de exclus찾o predefinidas (see linkgit:gitignore[5]), "
-"por챕m continue a usar as regras de exclus찾o informadas 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 utilizado (possivelmente em "
-"conjunto com 'git restore' ou 'git reset') para criar um novo diret처rio de "
-"trabalho para testar uma compila챌찾o limpa."
+msgstr "N찾o utilize as regras de exclus찾o predefinidas (see linkgit:gitignore[5]), por챕m continue a usar as regras de exclus찾o informadas 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 utilizado (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
@@ -16594,9 +13831,7 @@ msgstr "Modo interativo"
#: en/git-clean.txt:80
#, priority:100
msgid "When the command enters the interactive mode, it shows the files and directories to be cleaned, and goes into its interactive command loop."
-msgstr ""
-"Quando o comando entra no modo interativo, ele exibe os arquivos e os "
-"diret처rios que ser찾o limpos entrando em seu loop de comando interativo."
+msgstr "Quando o comando entra no modo interativo, ele exibe os arquivos e os diret처rios que ser찾o limpos entrando em seu loop de comando interativo."
#. type: delimited block -
#: en/git-clean.txt:91
@@ -16658,16 +13893,7 @@ msgstr "selecione por n첬meros"
#: en/git-clean.txt:121
#, priority:100
msgid "This shows the files and directories to be deleted and issues an \"Select items to delete>>\" prompt. When the prompt ends with double '>>' like this, you can make more than one selection, concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range is omitted, all remaining items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say '*' to choose everything. Also when you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
-msgstr ""
-"Exibe os arquivos e os diret처rios que ser찾o exclu챠dos e emite um prompt "
-"\"Selecione os itens para serem exclu챠dos>>\". Quando o prompt terminar com "
-"'>>' duplo, ser찼 poss챠vel fazer mais de uma sele챌찾o concatenada com espa챌o "
-"ou v챠rgula. Al챕m disso, voc챗 pode utilizar intervalos. Por exemplo. \"2-5 "
-"7,9\" para escolher o 2,3,4,5,7,9 na lista. Caso o segundo n첬mero de um "
-"intervalo seja omitido, todos os itens restantes ser찾o selecionados. Por "
-"exemplo. \"7-\" para escolher o 7,8,9 na lista. Voc챗 pode utilizar '*' para "
-"escolher tudo. Al챕m disso, quando estiver satisfeito com o resultado que "
-"foi filtrado, pressione ENTER para retornar ao menu principal."
+msgstr "Exibe os arquivos e os diret처rios que ser찾o exclu챠dos e emite um prompt \"Selecione os itens para serem exclu챠dos>>\". Quando o prompt terminar com '>>' duplo, ser찼 poss챠vel fazer mais de uma sele챌찾o concatenada com espa챌o ou v챠rgula. Al챕m disso, voc챗 pode utilizar intervalos. Por exemplo. \"2-5 7,9\" para escolher o 2,3,4,5,7,9 na lista. Caso o segundo n첬mero de um intervalo seja omitido, todos os itens restantes ser찾o selecionados. Por exemplo. \"7-\" para escolher o 7,8,9 na lista. Voc챗 pode utilizar '*' para escolher tudo. Al챕m disso, quando estiver satisfeito com o resultado que foi filtrado, pressione ENTER para retornar ao menu principal."
#. type: Labeled list
#: en/git-clean.txt:122
@@ -16751,30 +13977,19 @@ msgstr ""
#: en/git-clone.txt:30
#, 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 o monitoramento "
-"remoto dos ramos para cada ramo no reposit처rio clonado (vis챠vel utilizando `"
-"git branch --remotes`), cria e verifica um ramo inicial que 챕 bifurcado do "
-"ramo ativo atualmente do reposit처rio clonado ."
+msgstr "Clona um reposit처rio em um diret처rio rec챕m-criado, cria o monitoramento remoto dos ramos para cada ramo no reposit처rio clonado (vis챠vel utilizando `git branch --remotes`), cria e verifica um ramo inicial que 챕 bifurcado do ramo ativo atualmente do reposit처rio clonado ."
#. type: Plain text
#: en/git-clone.txt:36
#, 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 ""
-"Ap처s a clonagem, um simples `git fetch` sem argumentos atualizar찼 todas os "
-"ramos remotos e um `git pull` sem argumentos ir찼 al챕m disso, far찼 a "
-"mesclagem do ramo 'master' (mestre) remoto no ramo atual caso haja (isso n찾o "
-"se torna verdadeiro quando \"--single-branch\" 챕 utilizado; veja abaixo)."
+msgstr "Ap처s a clonagem, um simples `git fetch` sem argumentos atualizar찼 todas os ramos remotos e um `git pull` sem argumentos ir찼 al챕m disso, far찼 a mesclagem do ramo 'master' (mestre) remoto no ramo atual caso haja (isso n찾o se torna verdadeiro quando \"--single-branch\" 챕 utilizado; veja abaixo)."
#. type: Plain text
#: en/git-clone.txt:41
#, 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 ""
-"Esta configura챌찾o predefinida 챕 obtida atrav챕s da cria챌찾o de refer챗ncias nos "
-"cabe챌alhos das ramifica챌천es remotas em `refs/remotos/origem` e inicializando "
-"as vari찼veis de configura챌찾o `remote.origin.url` e `remote.origin.fetch`."
+msgstr "Esta configura챌찾o predefinida 챕 obtida atrav챕s da cria챌찾o de refer챗ncias nos cabe챌alhos das ramifica챌천es remotas em `refs/remotos/origem` e inicializando as vari찼veis de configura챌찾o `remote.origin.url` e `remote.origin.fetch`."
#. type: Labeled list
#: en/git-clone.txt:46 en/git-config.txt:127 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
@@ -16892,27 +14107,19 @@ msgstr "Emprestar os objetos dos reposit처rios de refer챗ncia especificados com
#: en/git-clone.txt:124
#, priority:300
msgid "Operate quietly. Progress is not reported to the standard error stream."
-msgstr ""
-"Operate quietly. O progresso n찾o 챕 relatado para o fluxo de erro "
-"predefinido."
+msgstr "Operate quietly. O progresso n찾o 챕 relatado para o fluxo de erro predefinido."
#. type: Plain text
#: en/git-clone.txt:129
#, priority:300
msgid "Run verbosely. Does not affect the reporting of progress status to the standard error stream."
-msgstr ""
-"Executa em modo loquaz. N찾o afera o relat처rio da condi챌찾o geral do progresso "
-"para o fluxo de erro padr찾o."
+msgstr "Executa em modo loquaz. N찾o afera o relat처rio da condi챌찾o geral do progresso para o fluxo de erro padr찾o."
#. type: Plain text
#: en/git-clone.txt:135
#, 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 ""
-"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 utilizado. "
-"Esta sinaliza챌찾o imp천e a condi챌찾o geral de progresso mesmo que o fluxo de "
-"erro predefinido n찾o seja 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 utilizado. Esta sinaliza챌찾o imp천e a condi챌찾o geral de progresso mesmo que o fluxo de erro predefinido n찾o seja direcionado para um terminal."
#. type: Plain text
#: en/git-clone.txt:147
@@ -16945,7 +14152,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
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:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr "--filter=<filter-spec>"
@@ -16984,9 +14191,7 @@ msgstr "--origem <nome>"
#: en/git-clone.txt:188
#, priority:300
msgid "Instead of using the remote name `origin` to keep track of the upstream repository, use `<name>`."
-msgstr ""
-"Em vez de utilizar o nome remoto `origin` para acompanhar o reposit처rio "
-"\"upstream\" utilize o `<nome> `."
+msgstr "Em vez de utilizar o nome remoto `origin` para acompanhar o reposit처rio \"upstream\" utilize o `<nome> `."
#. type: Labeled list
#: en/git-clone.txt:189
@@ -17028,9 +14233,7 @@ msgstr "--template=<template_directory>"
#: en/git-clone.txt:207
#, 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 utilizados; (Consulte a se챌찾o "
-"\"DIRET횙RIO MODELO\" do linkgit:git-init[1].)"
+msgstr "Informe o diret처rio de onde os modelos ser찾o utilizados; (Consulte a se챌찾o \"DIRET횙RIO MODELO\" do linkgit:git-init[1].)"
#. type: Labeled list
#: en/git-clone.txt:208
@@ -17048,25 +14251,13 @@ msgstr "--config <key>=<value>"
#: en/git-clone.txt:218
#, 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, antes da captura "
-"remota do hist처rico ou do check-out 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 informados 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."
+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, antes da captura remota do hist처rico ou do check-out 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 informados 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:224
#, 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, utilize as "
-"op챌천es correspondentes `--mirror` e `--no-tags`."
+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, utilize as op챌천es correspondentes `--mirror` e `--no-tags`."
#. type: Labeled list
#: en/git-clone.txt:225
@@ -17078,12 +14269,7 @@ msgstr "--depth <depth>"
#: en/git-clone.txt:231
#, 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 utilizado para resgatar os hist처ricos pr처ximos "
-"횪s pontas de todos os ramos. Caso queira clonar os subm처dulos "
-"superficialmente, utilize tamb챕m `--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 utilizado para resgatar os hist처ricos pr처ximos 횪s pontas de todos os ramos. Caso queira clonar os subm처dulos superficialmente, utilize tamb챕m `--shallow-submodules`."
#. type: Plain text
#: en/git-clone.txt:234
@@ -17095,10 +14281,7 @@ msgstr "Crie um clone superficial com um hist처rico ap처s o tempo especificado."
#: en/git-clone.txt:239
#, 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 "
-"utilizada v찼rias vezes."
+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 utilizada v찼rias vezes."
#. type: Labeled list
#: en/git-clone.txt:240 en/git-submodule.txt:433
@@ -17110,14 +14293,7 @@ msgstr "--[no-]single-branch"
#: en/git-clone.txt:249
#, 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 ""
-"Clone apenas o hist처rico que leva 횪 ponta de uma 첬nica ramifica챌찾o, "
-"especificada pela op챌찾o `--branch` ou pelo ramo prim찼rio remoto onde `HEAD` "
-"aponta. As outras capturas feitas no reposit처rio resultante, atualizar찾o "
-"apenas as ramifica챌천es monitoradas remotamente onde esta op챌찾o foi "
-"utilizada para a clonagem inicial. Caso o `HEAD` remoto n찾o aponte para "
-"nenhuma ramifica챌찾o quando o clone `--single-branch` foi feito, nenhuma "
-"ramifica챌찾o de rastreamento remoto 챕 criado."
+msgstr "Clone apenas o hist처rico que leva 횪 ponta de uma 첬nica ramifica챌찾o, especificada pela op챌찾o `--branch` ou pelo ramo prim찼rio remoto onde `HEAD` aponta. As outras capturas feitas no reposit처rio resultante, atualizar찾o apenas as ramifica챌천es monitoradas remotamente onde esta op챌찾o foi utilizada para a clonagem inicial. Caso o `HEAD` remoto n찾o aponte para nenhuma ramifica챌찾o quando o clone `--single-branch` foi feito, nenhuma ramifica챌찾o de rastreamento remoto 챕 criado."
#. type: Plain text
#: en/git-clone.txt:256
@@ -17129,11 +14305,7 @@ msgstr "N찾o clone quaisquer tags e defina `remote.<remote>.tagOpt=--no-tags` na
#: en/git-clone.txt:261
#, 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 ""
-"Pode ser utilizado em conjunto com o `--single-branch` para clonar e manter "
-"um ramo sem refer챗ncias al챕m de um 첬nico ramo clonado. 횋 첬til para manter "
-"uma quantidade m챠nima dos clones do ramo predefinido de algum reposit처rio "
-"para a indexa챌찾o da pesquisa por exemplo."
+msgstr "Pode ser utilizado em conjunto com o `--single-branch` para clonar e manter um ramo sem refer챗ncias al챕m de um 첬nico ramo clonado. 횋 첬til para manter uma quantidade m챠nima dos clones do ramo predefinido de algum reposit처rio para a indexa챌찾o da pesquisa por exemplo."
#. type: Labeled list
#: en/git-clone.txt:262
@@ -17145,13 +14317,7 @@ msgstr "--recurse-submodules[=<pathspec]"
#: en/git-clone.txt:270
#, 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 ""
-"Depois que o clone 챕 criado, inicialize e clone os subm처dulos com base no "
-"`pathspec` informado. Caso nenhum `pathspec` seja informado, todos ser찾o "
-"inicializados e clonados. Esta op챌찾o pode ser utilizada v찼rias vezes para a "
-"consulta de diversas entradas `pathspec`. O clone resultante de `submodule."
-"active` define o pathspec informado ou \".\" (significa todos os subm처dulos) "
-"caso nenhum pathspec seja informado."
+msgstr "Depois que o clone 챕 criado, inicialize e clone os subm처dulos com base no `pathspec` informado. Caso nenhum `pathspec` seja informado, todos ser찾o inicializados e clonados. Esta op챌찾o pode ser utilizada v찼rias vezes para a consulta de diversas entradas `pathspec`. O clone resultante de `submodule.active` define o pathspec informado ou \".\" (significa todos os subm처dulos) caso nenhum pathspec seja informado."
#. type: Plain text
#: en/git-clone.txt:277
@@ -17235,12 +14401,7 @@ msgstr "<diret처rio>"
#: en/git-clone.txt:310
#, 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 챕 utilizada 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."
+msgstr "O nome de um novo diret처rio que ser찼 clonado. A parte \"human챠stica\" do reposit처rio de origem 챕 utilizada 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:318
@@ -17282,9 +14443,7 @@ msgstr ""
#: en/git-clone.txt:336
#, 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:"
+msgstr "Clone do \"upstream\" enquanto pega emprestado de um diret처rio local j찼 existente:"
#. type: delimited block -
#: en/git-clone.txt:342
@@ -17338,11 +14497,7 @@ msgstr ""
#: en/git-column.txt:20
#, priority:100
msgid "This command formats the lines of its standard input into a table with multiple columns. Each input line occupies one cell of the table. It is used internally by other git commands to format output into columns."
-msgstr ""
-"Este comando formata as linhas de sua entrada padr찾o em uma tabela com "
-"v찼rias colunas. Cada linha de entrada ocupa uma c챕lula na tabela. 횋 "
-"utilizado internamente por outros comandos git para formatar a sa챠da em "
-"colunas."
+msgstr "Este comando formata as linhas de sua entrada padr찾o em uma tabela com v찼rias colunas. Cada linha de entrada ocupa uma c챕lula na tabela. 횋 utilizado internamente por outros comandos git para formatar a sa챠da em colunas."
#. type: Labeled list
#: en/git-column.txt:23
@@ -17354,9 +14509,7 @@ msgstr "--command=<nome>"
#: en/git-column.txt:26
#, priority:100
msgid "Look up layout mode using configuration variable column.<name> and column.ui."
-msgstr ""
-"Consulta o modo de layout utilizando a coluna da vari찼vel da configura챌찾o "
-"column.<name> e column.ui."
+msgstr "Consulta o modo de layout utilizando a coluna da vari찼vel da configura챌찾o column.<name> e column.ui."
#. type: Labeled list
#: en/git-column.txt:27
@@ -17368,9 +14521,7 @@ msgstr "--mode=<modo>"
#: en/git-column.txt:30
#, priority:100
msgid "Specify layout mode. See configuration variable column.ui for option syntax in linkgit:git-config[1]."
-msgstr ""
-"Especifica o modo de layout. Veja a vari찼vel da configura챌찾o `column.ui` "
-"para a sintaxe da op챌찾o em linkgit:git-config[1]."
+msgstr "Especifica o modo de layout. Veja a vari찼vel da configura챌찾o `column.ui` para a sintaxe da op챌찾o em linkgit:git-config[1]."
#. type: Labeled list
#: en/git-column.txt:31
@@ -17382,10 +14533,7 @@ msgstr "--raw-mode=<n>"
#: en/git-column.txt:34
#, priority:100
msgid "Same as --mode but take mode encoded as a number. This is mainly used by other commands that have already parsed layout mode."
-msgstr ""
-"O mesmo que `--mode`, por챕m usa o modo codificado como um n첬mero. Isso 챕 "
-"utilizado principalmente por outros comandos que j찼 analisaram o modo de "
-"layout."
+msgstr "O mesmo que `--mode`, por챕m usa o modo codificado como um n첬mero. Isso 챕 utilizado principalmente por outros comandos que j찼 analisaram o modo de layout."
#. type: Labeled list
#: en/git-column.txt:35
@@ -17537,20 +14685,13 @@ msgstr "Cria um novo objeto commit com base no objeto da 찼rvore fornecida e emi
#: en/git-commit-tree.txt:29
#, priority:100
msgid "The `-m` and `-F` options can be given any number of times, in any order. The commit log message will be composed in the order in which the options are given."
-msgstr ""
-"As op챌천es `m` e` F` podem ser informadas v찼rias vezes e em qualquer ordem. A "
-"mensagem do registro log do commit ser찼 composta na ordem em que as op챌천es "
-"forem utilizadas."
+msgstr "As op챌천es `m` e` F` podem ser informadas v찼rias vezes e em qualquer ordem. A mensagem do registro log do commit ser찼 composta na ordem em que as op챌천es forem utilizadas."
#. type: Plain text
#: en/git-commit-tree.txt:34
#, 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 de origens. Um commit comum 챕 "
-"aquele tem exatamente uma origem. Ter mais de uma origem faz com que o "
-"commit seja mesclado entre as v찼rias linhas da hist처ria. Os commits iniciais "
-"(root) n찾o possuem origens."
+msgstr "Um objeto commit pode ter qualquer quantidade de origens. Um commit comum 챕 aquele tem exatamente uma origem. Ter mais de uma origem faz com que o commit seja mesclado entre as v찼rias linhas da hist처ria. Os commits iniciais (root) n찾o possuem origens."
#. type: Plain text
#: en/git-commit-tree.txt:38
@@ -17610,20 +14751,13 @@ msgstr "-F <arquivo>"
#: en/git-commit-tree.txt:61
#, priority:100
msgid "Read the commit log message from the given file. Use `-` to read from the standard input. This can be given more than once and the content of each file becomes its own paragraph."
-msgstr ""
-"Leia a mensagem do registro log do commit de um arquivo informado. Utilize "
-"`-` para ler a entrada predefinida. Isso pode ser dado mais de uma vez e o "
-"conte첬do de cada arquivo se torna seu pr처prio par찼grafo."
+msgstr "Leia a mensagem do registro log do commit de um arquivo informado. Utilize `-` para ler a entrada predefinida. Isso pode ser dado mais de uma vez e o conte첬do de cada arquivo se torna seu pr처prio par찼grafo."
#. type: Plain text
#: en/git-commit-tree.txt:69
#, priority:100
msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand a `--gpg-sign` option given earlier on the command line."
-msgstr ""
-"Commits assinados com o GPG O argumento `keyid` 챕 opcional e padroniza a "
-"identidade de quem fez o commit; se utilizado, deve estar preso 횪 op챌찾o sem "
-"espa챌o. `--no-gpg-sign` is useful to countermand a `--gpg-sign` option given "
-"earlier on the command line."
+msgstr "Commits assinados com o GPG O argumento `keyid` 챕 opcional e padroniza a identidade de quem fez o commit; se utilizado, deve estar preso 횪 op챌찾o sem espa챌o. `--no-gpg-sign` is useful to countermand a `--gpg-sign` option given earlier on the command line."
#. type: Title -
#: en/git-commit-tree.txt:71
@@ -17763,10 +14897,7 @@ msgstr "ao usar as op챌천es --interactive ou --patch com o comando 'commit' para
#: 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 utilizada 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)."
+msgstr "A op챌찾o `--dry-run` pode ser utilizada 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
@@ -17802,10 +14933,7 @@ msgstr "--reuse-message=<commit>"
#: en/git-commit.txt:82
#, priority:280
msgid "Take an existing commit object, and reuse the log message and the authorship information (including the timestamp) when creating the commit."
-msgstr ""
-"Pega um objeto commit existente e o reutiliza na mensagem do registro log, "
-"assim como as informa챌천es da autoria (incluindo o registro de data e hora) "
-"durante a cria챌찾o de um commit."
+msgstr "Pega um objeto commit existente e o reutiliza na mensagem do registro log, assim como as informa챌천es da autoria (incluindo o registro de data e hora) durante a cria챌찾o de um commit."
#. type: Labeled list
#: en/git-commit.txt:83
@@ -17925,9 +15053,7 @@ msgstr "--file=<arquivo>"
#: en/git-commit.txt:136
#, priority:280
msgid "Take the commit message from the given file. Use '-' to read the message from the standard input."
-msgstr ""
-"Pega a mensagem de commit vindo de um determinado arquivo. Utilize '-' para "
-"ler a mensagem da entrada predefinida."
+msgstr "Pega a mensagem de commit vindo de um determinado arquivo. Utilize '-' para ler a mensagem da entrada predefinida."
#. type: Labeled list
#: en/git-commit.txt:137
@@ -17939,13 +15065,7 @@ msgstr "--author=<autor>"
#: en/git-commit.txt:143
#, 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 ""
-"Sobrescreva o commit do autor. Determina o autor de forma explicita "
-"utilizando 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 (ou seja, rev-list --all -i "
-"--author=<author>); o commit do autor 챕 ent찾o copiado do primeiro commit que "
-"for encontrado."
+msgstr "Sobrescreva o commit do autor. Determina o autor de forma explicita utilizando 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 (ou seja, 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
@@ -17981,8 +15101,7 @@ msgstr "Usa a <msg> como a mensagem de commit. Caso m첬ltiplas op챌천es `-m` se
#: en/git-commit.txt:154
#, priority:280
msgid "The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`."
-msgstr ""
-"A op챌찾o `-m` 챕 utilizado em conjunto exclusivamente com `-c`, `-C` e `-F`."
+msgstr "A op챌찾o `-m` 챕 utilizado em conjunto exclusivamente com `-c`, `-C` e `-F`."
#. type: Labeled list
#: en/git-commit.txt:155
@@ -18000,15 +15119,7 @@ msgstr "--template=<file>"
#: en/git-commit.txt:165
#, priority:280
msgid "When editing the commit message, start the editor with the contents in the given file. The `commit.template` configuration variable is often used to give this option implicitly to the command. This mechanism can be used by projects that want to guide participants with some hints on what to write in the message in what order. If the user exits the editor without editing the message, the commit is aborted. This has no effect when a message is given by other means, e.g. with the `-m` or `-F` options."
-msgstr ""
-"Ao editar a mensagem do commit, inicie o editor com o conte첬do do arquivo "
-"informado. A vari찼vel da configura챌찾o `commit.template` 챕 frequentemente "
-"utilizada para fornecer esta op챌찾o de forma impl챠cita ao comando. Esse "
-"mecanismo pode ser utilizado por projetos que desejam orientar os "
-"participantes com algumas dicas sobre o que escrever na mensagem e em qual "
-"ordem. Aborte o commit caso o usu찼rio saia do editor sem editar a "
-"mensagem. N찾o qualquer efeito quando uma mensagem 챕 dada por outros meios, "
-"por exemplo, com as op챌천es `-m` ou `-F`."
+msgstr "Ao editar a mensagem do commit, inicie o editor com o conte첬do do arquivo informado. A vari찼vel da configura챌찾o `commit.template` 챕 frequentemente utilizada para fornecer esta op챌찾o de forma impl챠cita ao comando. Esse mecanismo pode ser utilizado por projetos que desejam orientar os participantes com algumas dicas sobre o que escrever na mensagem e em qual ordem. Aborte o commit caso o usu찼rio saia do editor sem editar a mensagem. N찾o qualquer efeito quando uma mensagem 챕 dada por outros meios, por exemplo, com as op챌천es `-m` ou `-F`."
#. type: Plain text
#: en/git-commit.txt:174 en/merge-options.txt:88
@@ -18032,11 +15143,7 @@ msgstr "Esta op챌찾o ignora os ganchos dos commits anteriores e os ganchos das m
#: en/git-commit.txt:185
#, priority:280
msgid "Usually recording a commit that has the exact same tree as its sole parent commit is a mistake, and the command prevents you from making such a commit. This option bypasses the safety, and is primarily for use by foreign SCM interface scripts."
-msgstr ""
-"Geralmente, gravar um commit que tem exatamente a mesma 찼rvore como se fosse "
-"a sua origem 챕 errado, o comando impede que voc챗 fa챌a um commit desta "
-"natureza. Esta op챌찾o ignora a seguran챌a e deve ser utilizada principalmente "
-"por scripts de interface SCM externos."
+msgstr "Geralmente, gravar um commit que tem exatamente a mesma 찼rvore como se fosse a sua origem 챕 errado, o comando impede que voc챗 fa챌a um commit desta natureza. Esta op챌찾o ignora a seguran챌a e deve ser utilizada principalmente por scripts de interface SCM externos."
#. type: Plain text
#: en/git-commit.txt:191
@@ -18048,10 +15155,7 @@ msgstr "Como a op챌찾o `--allow-empty`, este comando 챕 principalmente para uso
#: en/git-commit.txt:196
#, priority:280
msgid "This option determines how the supplied commit message should be cleaned up before committing. The '<mode>' can be `strip`, `whitespace`, `verbatim`, `scissors` or `default`."
-msgstr ""
-"Esta op챌찾o determina como a mensagem que foi informada ao commit deve ser "
-"limpa antes do commit ser feito. O '<modo>' pode ser `strip`, `whitespace`, "
-"`verbatim`, `scissors` ou `default`."
+msgstr "Esta op챌찾o determina como a mensagem que foi informada ao commit deve ser limpa antes do commit ser feito. O '<modo>' pode ser `strip`, `whitespace`, `verbatim`, `scissors` ou `default`."
#. type: Labeled list
#: en/git-commit.txt:198
@@ -18099,10 +15203,7 @@ msgstr "scissors (tesouras)"
#: en/git-commit.txt:209
#, priority:280
msgid "Same as `whitespace` except that everything from (and including) the line found below is truncated, if the message is to be edited. \"`#`\" can be customized with core.commentChar."
-msgstr ""
-"O mesmo que `whitespace` (espa챌o em branco), exceto que tudo incluindo a "
-"linha encontrada abaixo seja truncada caso a mensagem precise ser editada. "
-"\"`#`\" pode ser personalizada com `core.commentChar`."
+msgstr "O mesmo que `whitespace` (espa챌o em branco), exceto que tudo incluindo a linha encontrada abaixo seja truncada caso a mensagem precise ser editada. \"`#`\" pode ser personalizada com `core.commentChar`."
#. type: Plain text
#: en/git-commit.txt:211
@@ -18120,19 +15221,13 @@ msgstr "O mesmo que `strip` caso a mensagem esteja para ser editada. Caso contr
#: en/git-commit.txt:219
#, 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 da configura챌찾o `commit."
-"cleanup` (consulte linkgit:git-config[1])."
+msgstr "A predefini챌찾o pode ser alterada atrav챕s da vari찼vel da configura챌찾o `commit.cleanup` (consulte linkgit:git-config[1])."
#. type: Plain text
#: en/git-commit.txt:226
#, priority:280
msgid "The message taken from file with `-F`, command line with `-m`, and from commit object with `-C` are usually used as the commit log message unmodified. This option lets you further edit the message taken from these sources."
-msgstr ""
-"A mensagem obtida do arquivo com a op챌찾o `-F`, da linha de comando com a "
-"op챌찾o `-m` e do objeto commit com `C` 챕 normalmente utilizada como a "
-"mensagem de registro log do commit n찾o modificado. Esta op챌찾o permite editar "
-"ainda mais a mensagem retirada destas fontes."
+msgstr "A mensagem obtida do arquivo com a op챌찾o `-F`, da linha de comando com a op챌찾o `-m` e do objeto commit com `C` 챕 normalmente utilizada como a mensagem de registro log do commit n찾o modificado. Esta op챌찾o permite editar ainda mais a mensagem retirada destas fontes."
#. type: Labeled list
#: en/git-commit.txt:227 en/git-revert.txt:66 en/merge-options.txt:17
@@ -18144,10 +15239,7 @@ msgstr "--no-edit"
#: en/git-commit.txt:231
#, priority:280
msgid "Use the selected commit message without launching an editor. For example, `git commit --amend --no-edit` amends a commit without changing its commit message."
-msgstr ""
-"Utilize a mensagem do commit selecionado sem rodar um editor. Por exemplo, `"
-"git commit --amend --no-edit` altera um commit sem alterar o conte첬do da "
-"mensagem do mesmo."
+msgstr "Utilize a mensagem do commit selecionado sem rodar um editor. Por exemplo, `git commit --amend --no-edit` altera um commit sem alterar o conte첬do da mensagem do mesmo."
#. type: Labeled list
#: en/git-commit.txt:232
@@ -18159,14 +15251,7 @@ msgstr "--amend"
#: en/git-commit.txt:242
#, priority:280
msgid "Replace the tip of the current branch by creating a new commit. The recorded tree is prepared as usual (including the effect of the `-i` and `-o` options and explicit pathspec), and the message from the original commit is used as the starting point, instead of an empty message, when no other message is specified from the command line via options such as `-m`, `-F`, `-c`, etc. The new commit has the same parents and author as the current one (the `--reset-author` option can countermand this)."
-msgstr ""
-"Substitua o cume do ramo atual criando um novo commit. A 찼rvore gravada 챕 "
-"preparada como de costume (incluindo a aplica챌찾o das op챌천es `-i` e `-o`; e "
-"`pathspec` explicitamente), a mensagem do commit original 챕 utilizada como "
-"um ponto de partida, em vez de uma mensagem vazia. Quando nenhuma outra "
-"mensagem 챕 utilizada na linha de comando atrav챕s de op챌천es como `-m`, `-F`, "
-"`-c`, etc. O novo commit possuir찼 as mesmas origens e seu respectivo autor "
-"como o atual (a op챌찾o `--reset-author` pode ser utilizada para mudar isso)."
+msgstr "Substitua o cume do ramo atual criando um novo commit. A 찼rvore gravada 챕 preparada como de costume (incluindo a aplica챌찾o das op챌천es `-i` e `-o`; e `pathspec` explicitamente), a mensagem do commit original 챕 utilizada como um ponto de partida, em vez de uma mensagem vazia. Quando nenhuma outra mensagem 챕 utilizada na linha de comando atrav챕s de op챌천es como `-m`, `-F`, `-c`, etc. O novo commit possuir찼 as mesmas origens e seu respectivo autor como o atual (a op챌찾o `--reset-author` pode ser utilizada para mudar isso)."
#. type: Plain text
#: en/git-commit.txt:245
@@ -18220,11 +15305,7 @@ msgstr "--include"
#: en/git-commit.txt:267
#, priority:280
msgid "Before making a commit out of staged contents so far, stage the contents of paths given on the command line as well. This is usually not what you want unless you are concluding a conflicted merge."
-msgstr ""
-"Antes de fazer um commit dos conte첬dos preparados at챕 o momento, prepare "
-"tamb챕m o conte첬do dos caminhos utilizados na linha de comando. Isso "
-"geralmente n찾o 챕 o que voc챗 quer, a menos que esteja concluindo um mesclagem "
-"conflitante."
+msgstr "Antes de fazer um commit dos conte첬dos preparados at챕 o momento, prepare tamb챕m o conte첬do dos caminhos utilizados na linha de comando. Isso geralmente n찾o 챕 o que voc챗 quer, a menos que esteja concluindo um mesclagem conflitante."
#. type: Labeled list
#: en/git-commit.txt:269
@@ -18236,17 +15317,7 @@ msgstr "--only"
#: en/git-commit.txt:281
#, priority:280
msgid "Make a commit by taking the updated working tree contents of the paths specified on the command line, disregarding any contents that have been staged for other paths. This is the default mode of operation of 'git commit' if any paths are given on the command line, in which case this option can be omitted. If this option is specified together with `--amend`, then no paths need to be specified, which can be used to amend the last commit without committing changes that have already been staged. If used together with `--allow-empty` paths are also not required, and an empty commit will be created."
-msgstr ""
-"Fa챌a um commit utilizando o conte첬do atualizado da 찼rvore de trabalho dos "
-"caminhos informados na linha de comando, desconsiderando qualquer outro "
-"conte첬do que tenha sido preparado para os outros caminhos. Essa 챕 a maneira "
-"predefinida de opera챌찾o do comando `git commit` caso algum outro caminho "
-"tenha sido informado na linha de comando; nesse caso, essa op챌찾o poder찼 ser "
-"omitida. Caso esta op챌찾o seja utilizada junto com `--amend`, nenhum outro "
-"caminho precisar찼 ser informado, o que pode ser utilizado para alterar o "
-"첬ltimo commit sem confirmar as altera챌천es que j찼 foram preparadas. Se "
-"utilizado junto com a op챌찾o`--allow empty` tamb챕m n찾o s찾o necess찼rios e uma "
-"confirma챌찾o vazia ser찼 criada."
+msgstr "Fa챌a um commit utilizando o conte첬do atualizado da 찼rvore de trabalho dos caminhos informados na linha de comando, desconsiderando qualquer outro conte첬do que tenha sido preparado para os outros caminhos. Essa 챕 a maneira predefinida de opera챌찾o do comando `git commit` caso algum outro caminho tenha sido informado na linha de comando; nesse caso, essa op챌찾o poder찼 ser omitida. Caso esta op챌찾o seja utilizada junto com `--amend`, nenhum outro caminho precisar찼 ser informado, o que pode ser utilizado para alterar o 첬ltimo commit sem confirmar as altera챌천es que j찼 foram preparadas. Se utilizado junto com a op챌찾o`--allow empty` tamb챕m n찾o s찾o necess찼rios e uma confirma챌찾o vazia ser찼 criada."
#. type: Labeled list
#: en/git-commit.txt:295 en/git-status.txt:58
@@ -18270,11 +15341,7 @@ msgstr "Exibe arquivos sem rastreamento."
#: en/git-commit.txt:303
#, priority:280
msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
-msgstr ""
-"O par창metro `<modo>` 챕 opcional, a predefini챌찾o 챕 `all` (todos), sendo "
-"utilizado para determinar a manipula챌찾o dos arquivos que n찾o foram "
-"rastreados; quando a op챌찾o `-u` n찾o 챕 utilizada a predefini챌찾o 챕 `normal`, "
-"ou seja, exibe os arquivos e diret처rios que n찾o foram rastreados."
+msgstr "O par창metro `<modo>` 챕 opcional, a predefini챌찾o 챕 `all` (todos), sendo utilizado para determinar a manipula챌찾o dos arquivos que n찾o foram rastreados; quando a op챌찾o `-u` n찾o 챕 utilizada a predefini챌찾o 챕 `normal`, ou seja, exibe os arquivos e diret처rios que n찾o foram rastreados."
#. type: Plain text
#: en/git-commit.txt:305 en/git-status.txt:68 en/git-status.txt:110
@@ -18304,9 +15371,7 @@ msgstr "'all' - Exibe todos os arquivos individualmente nos diret처rios n찾o
#: en/git-commit.txt:312 en/git-status.txt:85
#, priority:280
msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
-msgstr ""
-"A predefini챌찾o pode ser alterada utilizando a vari찼vel da configura챌찾o "
-"`status.showUntrackedFiles` documentada em linkgit:git-config[1]."
+msgstr "A predefini챌찾o pode ser alterada utilizando a vari찼vel da configura챌찾o `status.showUntrackedFiles` documentada em linkgit:git-config[1]."
#. type: Plain text
#: en/git-commit.txt:324
@@ -18342,11 +15407,7 @@ msgstr "--status"
#: en/git-commit.txt:343
#, priority:280
msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message. Defaults to on, but can be used to override configuration variable commit.status."
-msgstr ""
-"Inclua a sa챠da do linkgit:git-status[1] na mensagem do commit ao usar um "
-"editor para preparar a mensagem do commit. A predefini챌찾o 챕 \"ligado\", "
-"por챕m pode ser utilizado para substituir a vari찼vel da configura챌찾o `commit."
-"status`."
+msgstr "Inclua a sa챠da do linkgit:git-status[1] na mensagem do commit ao usar um editor para preparar a mensagem do commit. A predefini챌찾o 챕 \"ligado\", por챕m pode ser utilizado para substituir a vari찼vel da configura챌찾o `commit.status`."
#. type: Labeled list
#: en/git-commit.txt:344
@@ -18364,26 +15425,13 @@ msgstr "N찾o inclua a sa챠da do linkgit:git-status[1] no modelo da mensagem do c
#: en/git-commit.txt:366
#, priority:280
msgid "When pathspec is given on the command line, commit the contents of the files that match the pathspec without recording the changes already added to the index. The contents of these files are also staged for the next commit on top of what have been staged before."
-msgstr ""
-"Quando o `pathspec` 챕 utilizado na linha de comando, fa챌a o commit do "
-"conte첬do dos arquivos que correspondem ao `pathspec` sem registrar as "
-"altera챌천es j찼 adicionadas ao 챠ndice. O conte첬do desses arquivos tamb챕m 챕 "
-"preparado para o pr처ximo commit, al챕m do que j찼 foi preparado anteriormente."
+msgstr "Quando o `pathspec` 챕 utilizado na linha de comando, fa챌a o commit do conte첬do dos arquivos que correspondem ao `pathspec` sem registrar as altera챌천es j찼 adicionadas ao 챠ndice. O conte첬do desses arquivos tamb챕m 챕 preparado para o pr처ximo commit, al챕m do que j찼 foi preparado anteriormente."
#. type: Plain text
#: en/git-commit.txt:382
#, priority:280
msgid "When recording your own work, the contents of modified files in your working tree are temporarily stored to a staging area called the \"index\" with 'git add'. A file can be reverted back, only in the index but not in the working tree, to that of the last commit with `git restore --staged <file>`, which effectively reverts 'git add' and prevents the changes to this file from participating in the next commit. After building the state to be committed incrementally with these commands, `git commit` (without any pathname parameter) is used to record what has been staged so far. This is the most basic form of the command. An example:"
-msgstr ""
-"Ao gravar o seu pr처prio trabalho, o conte첬do dos arquivos modificados na sua "
-"찼rvore de trabalho 챕 temporariamente armazenado em uma 찼rea intermedi찼ria "
-"chamada \"챠ndice\" com `git add`. Um arquivo pode ser revertido para o "
-"첬ltimo commit com `git restore staged` apenas no 챠ndice mas n찾o na 찼rvore de "
-"trabalho, que reverte efetivamente o `git add` e impede que as altera챌천es "
-"nesse arquivo fa챌am parte do pr처ximo commit. Ap처s criar a condi챌찾o a ser "
-"feito o commit incrementalmente com esses comandos, o `git commit` (sem "
-"nenhum par창metro `pathname`) 챕 utilizado para registrar o que foi preparado "
-"at챕 o momento. Essa 챕 a forma mais b찼sica do comando. Um exemplo:"
+msgstr "Ao gravar o seu pr처prio trabalho, o conte첬do dos arquivos modificados na sua 찼rvore de trabalho 챕 temporariamente armazenado em uma 찼rea intermedi찼ria chamada \"챠ndice\" com `git add`. Um arquivo pode ser revertido para o 첬ltimo commit com `git restore staged` apenas no 챠ndice mas n찾o na 찼rvore de trabalho, que reverte efetivamente o `git add` e impede que as altera챌천es nesse arquivo fa챌am parte do pr처ximo commit. Ap처s criar a condi챌찾o a ser feito o commit incrementalmente com esses comandos, o `git commit` (sem nenhum par창metro `pathname`) 챕 utilizado para registrar o que foi preparado at챕 o momento. Essa 챕 a forma mais b찼sica do comando. Um exemplo:"
#. type: delimited block -
#: en/git-commit.txt:388
@@ -18427,11 +15475,7 @@ msgstr "O comando `git commit -a` primeiro olha para a sua 찼rvore de trabalho,
#: en/git-commit.txt:411
#, priority:280
msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`. When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
-msgstr ""
-"Ap처s preparar as mudan챌as em muitos arquivos, voc챗 pode alterar a ordem em "
-"que as altera챌천es s찾o registradas ao encaminhar `pathnames` para `git commit`"
-". Quando `pathnames` s찾o utilizados, o comando faz um commit que registra "
-"apenas as altera챌천es feitas nos caminhos informados:"
+msgstr "Ap처s preparar as mudan챌as em muitos arquivos, voc챗 pode alterar a ordem em que as altera챌천es s찾o registradas ao encaminhar `pathnames` para `git commit`. Quando `pathnames` s찾o utilizados, o comando faz um commit que registra apenas as altera챌천es feitas nos caminhos informados:"
#. type: delimited block -
#: en/git-commit.txt:417
@@ -18495,13 +15539,7 @@ msgstr "Ap처s resolver os conflitos e organizar o resultado, o `git ls-files -u`
#: en/git-commit.txt:461
#, priority:280
msgid "As with the case to record your own changes, you can use `-a` option to save typing. One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit. In fact, the command refuses to run when given pathnames (but see `-i` option)."
-msgstr ""
-"Como no caso de registrar as suas pr처prias altera챌천es, voc챗 pode usar a "
-"op챌찾o `-a` para salvar a digita챌찾o. Uma diferen챌a 챕 que durante uma "
-"resolu챌찾o de mesclagem, voc챗 n찾o pode usar `git commit` com `pathnames` para "
-"alterar a ordem em que as altera챌천es dos commits s찾o realizados porque a "
-"mesclagem deve ser registrada como um commit. De fato, o comando se recusa "
-"a executar quando recebem nomes do caminho (consulte a op챌찾o `i`)."
+msgstr "Como no caso de registrar as suas pr처prias altera챌천es, voc챗 pode usar a op챌찾o `-a` para salvar a digita챌찾o. Uma diferen챌a 챕 que durante uma resolu챌찾o de mesclagem, voc챗 n찾o pode usar `git commit` com `pathnames` para alterar a ordem em que as altera챌천es dos commits s찾o realizados porque a mesclagem deve ser registrada como um commit. De fato, o comando se recusa a executar quando recebem nomes do caminho (consulte a op챌찾o `i`)."
#. type: Title -
#: en/git-commit.txt:463
@@ -18549,13 +15587,7 @@ msgstr "횋 de praxe usar um nome pessoa como os nomes dos autores e de quem fez
#: en/git-commit.txt:489
#, priority:280
msgid "In case (some of) these environment variables are not set, the information is taken from the configuration items `user.name` and `user.email`, or, if not present, the environment variable EMAIL, or, if that is not set, system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist)."
-msgstr ""
-"Caso (algumas dessas) vari찼veis de ambiente n찾o sejam definidas, as "
-"informa챌천es s찾o obtidas dos itens da configura챌찾o `user.name` e `user.email` "
-"ou caso n찾o haja, na vari찼vel de ambiente `EMAIL` ou se tamb챕m n찾o existir "
-"ou tenha sido definida, o nome de usu찼rio do sistema e nome do host "
-"(hostname) utilizado pelo email enviado (extra챠do de `/etc/mailname` e "
-"retornando ao nome completo do host quando esse arquivo n찾o existir)."
+msgstr "Caso (algumas dessas) vari찼veis de ambiente n찾o sejam definidas, as informa챌천es s찾o obtidas dos itens da configura챌찾o `user.name` e `user.email` ou caso n찾o haja, na vari찼vel de ambiente `EMAIL` ou se tamb챕m n찾o existir ou tenha sido definida, o nome de usu찼rio do sistema e nome do host (hostname) utilizado pelo email enviado (extra챠do de `/etc/mailname` e retornando ao nome completo do host quando esse arquivo n찾o existir)."
#. type: Plain text
#: en/git-commit.txt:493
@@ -18567,23 +15599,13 @@ msgstr "O `author.name` e `committer.name` e suas respectivas op챌천es de email
#: en/git-commit.txt:496
#, priority:280
msgid "The typical usage is to set just the `user.name` and `user.email` variables; the other options are provided for more complex use cases."
-msgstr ""
-"O uso t챠pico 챕 definir apenas as vari찼veis `user.name` e `user.email`; as "
-"outras op챌천es s찾o informadas para casos de uso mais complexos."
+msgstr "O uso t챠pico 챕 definir apenas as vari찼veis `user.name` e `user.email`; as outras op챌천es s찾o informadas para casos de uso mais complexos."
#. type: Plain text
#: en/git-commit.txt:510
#, priority:280
msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
-msgstr ""
-"Embora n찾o seja obrigat처rio, 챕 uma boa ideia iniciar a mensagem do commit "
-"com uma 첬nica linha curta (com menos de 50 caracteres) resumindo a "
-"altera챌찾o, seguida por uma linha em branco e em seguida, uma descri챌찾o mais "
-"completa. O texto at챕 a primeira linha em branco em uma mensagem de "
-"confirma챌찾o 챕 tratado como o t챠tulo de confirma챌찾o e esse t챠tulo 챕 utilizado "
-"atrav챕s de todo o Git. Por exemplo, o linkgit:git-format-patch[1] "
-"transforma um commit em um email e usa o t챠tulo na linha de assunto e o "
-"restante do commit no corpo da mensagem."
+msgstr "Embora n찾o seja obrigat처rio, 챕 uma boa ideia iniciar a mensagem do commit com uma 첬nica linha curta (com menos de 50 caracteres) resumindo a altera챌찾o, seguida por uma linha em branco e em seguida, uma descri챌찾o mais completa. O texto at챕 a primeira linha em branco em uma mensagem de confirma챌찾o 챕 tratado como o t챠tulo de confirma챌찾o e esse t챠tulo 챕 utilizado atrav챕s de todo o Git. Por exemplo, o linkgit:git-format-patch[1] transforma um commit em um email e usa o t챠tulo na linha de assunto e o restante do commit no corpo da mensagem."
#. type: Title -
#: en/git-commit.txt:514
@@ -18613,12 +15635,7 @@ msgstr "`$GIT_DIR/COMMIT_EDITMSG`"
#: en/git-commit.txt:535
#, priority:280
msgid "This file contains the commit message of a commit in progress. If `git commit` exits due to an error before creating a commit, any commit message that has been provided by the user (e.g., in an editor session) will be available in this file, but will be overwritten by the next invocation of `git commit`."
-msgstr ""
-"Este arquivo cont챕m a mensagem do commit de um commit em andamento. Caso o `"
-"git commit` encerre devido a um erro antes da cria챌찾o do commit, qualquer "
-"mensagem do commit que tenha sido utilizada pelo usu찼rio (por exemplo, em "
-"uma sess찾o do editor) estar찼 dispon챠vel neste arquivo, mas ser찼 substitu챠da "
-"pela pr처xima invoca챌찾o do comando `git commit`."
+msgstr "Este arquivo cont챕m a mensagem do commit de um commit em andamento. Caso o `git commit` encerre devido a um erro antes da cria챌찾o do commit, qualquer mensagem do commit que tenha sido utilizada pelo usu찼rio (por exemplo, em uma sess찾o do editor) estar찼 dispon챠vel neste arquivo, mas ser찼 substitu챠da pela pr처xima invoca챌찾o do comando `git commit`."
#. type: Plain text
#: en/git-commit.txt:543
@@ -18684,45 +15701,25 @@ msgstr "Voc챗 pode consultar, definir, substituir e remover op챌천es com este co
#: en/git-config.txt:40
#, priority:100
msgid "Multiple lines can be added to an option by using the `--add` option. If you want to update or unset an option which can occur on multiple lines, a POSIX regexp `value_regex` needs to be given. Only the existing values that match the regexp are updated or unset. If you want to handle the lines that do *not* match the regex, just prepend a single exclamation mark in front (see also <<EXAMPLES>>)."
-msgstr ""
-"V찼rias linhas podem ser adicionadas a uma op챌찾o utilizando a op챌찾o `--add`. "
-"Caso queira atualizar ou remover alguma op챌찾o que pode ocorrer em v찼rias "
-"linhas, 챕 necess찼rio usar um POSIX regexp `value_regex`. Apenas os valores "
-"existentes que correspondam 횪 um regexp s찾o atualizados ou n찾o definidos. "
-"Caso queira manipular as linhas que *n찾o* correspondam ao regex, basta "
-"colocar um 첬nico ponto de exclama챌찾o na frente (consulte tamb챕m "
-"<<EXEMPLOS>>)."
+msgstr "V찼rias linhas podem ser adicionadas a uma op챌찾o utilizando a op챌찾o `--add`. Caso queira atualizar ou remover alguma op챌찾o que pode ocorrer em v찼rias linhas, 챕 necess찼rio usar um POSIX regexp `value_regex`. Apenas os valores existentes que correspondam 횪 um regexp s찾o atualizados ou n찾o definidos. Caso queira manipular as linhas que *n찾o* correspondam ao regex, basta colocar um 첬nico ponto de exclama챌찾o na frente (consulte tamb챕m <<EXEMPLOS>>)."
#. type: Plain text
#: en/git-config.txt:45
#, priority:100
msgid "The `--type=<type>` option instructs 'git config' to ensure that incoming and outgoing values are canonicalize-able under the given <type>. If no `--type=<type>` is given, no canonicalization will be performed. Callers may unset an existing `--type` specifier with `--no-type`."
-msgstr ""
-"A op챌찾o `--type=<tipo>` instrui o 'git config' para garantir que os valores "
-"que chegam e os que saem sejam canonicamente compat챠veis com o <tipo>. Caso "
-"nenhum `--type=<tipo>` seja utilizado, nenhuma canoniza챌찾o ser찼 realizada. "
-"Os autores dos chamados podem desconfigurar um `--type` existente com a "
-"op챌찾o `--no-type`."
+msgstr "A op챌찾o `--type=<tipo>` instrui o 'git config' para garantir que os valores que chegam e os que saem sejam canonicamente compat챠veis com o <tipo>. Caso nenhum `--type=<tipo>` seja utilizado, nenhuma canoniza챌찾o ser찼 realizada. Os autores dos chamados podem desconfigurar um `--type` existente com a op챌찾o `--no-type`."
#. type: Plain text
#: en/git-config.txt:51
#, priority:100
msgid "When reading, the values are read from the system, global and repository local configuration files by default, and options `--system`, `--global`, `--local`, `--worktree` and `--file <filename>` can be used to tell the command to read from only that location (see <<FILES>>)."
-msgstr ""
-"A leitura destes valores s찾o lidos do sistema nos arquivos de configura챌찾o "
-"global local e do reposit처rio, 챕 predefinido que as op챌천es `system`, `global`"
-", `local`, `worktree` e `file` possam ser utilizadas para dizer ao comando "
-"para ler somente deste local (consulte <<ARQUIVOS>>)."
+msgstr "A leitura destes valores s찾o lidos do sistema nos arquivos de configura챌찾o global local e do reposit처rio, 챕 predefinido que as op챌천es `system`, `global`, `local`, `worktree` e `file` possam ser utilizadas para dizer ao comando para ler somente deste local (consulte <<ARQUIVOS>>)."
#. type: Plain text
#: en/git-config.txt:57
#, priority:100
msgid "When writing, the new value is written to the repository local configuration file by default, and options `--system`, `--global`, `--worktree`, `--file <filename>` can be used to tell the command to write to that location (you can say `--local` but that is the default)."
-msgstr ""
-"Durante a escrita, 챕 predefinido que o novo valor 챕 gravado no arquivo de "
-"configura챌찾o local do reposit처rio e as op챌천es `system`, `global`, `worktree`"
-", `file` possam ser utilizadas para dizer ao comando para gravar nesse local "
-"(voc챗 pode dizer `--local`, por챕m esta 챕 a predefini챌찾o)."
+msgstr "Durante a escrita, 챕 predefinido que o novo valor 챕 gravado no arquivo de configura챌찾o local do reposit처rio e as op챌천es `system`, `global`, `worktree`, `file` possam ser utilizadas para dizer ao comando para gravar nesse local (voc챗 pode dizer `--local`, por챕m esta 챕 a predefini챌찾o)."
#. type: Plain text
#: en/git-config.txt:60
@@ -18836,12 +15833,7 @@ msgstr "--get-regexp"
#: en/git-config.txt:97
#, priority:100
msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names. Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
-msgstr ""
-"Como `--get-all`, por챕m interpreta o nome como uma express찾o regular e "
-"escreve os nomes das chaves. A correspond챗ncia de express찾o regular 챕 "
-"sens챠vel a mai첬sculas e min첬sculas, 챕 feita contra uma vers찾o canonicalizada "
-"da chave na qual a se챌찾o e os nomes de vari찼veis s찾o min첬sculos, mas os "
-"nomes das subse챌천es n찾o s찾o."
+msgstr "Como `--get-all`, por챕m interpreta o nome como uma express찾o regular e escreve os nomes das chaves. A correspond챗ncia de express찾o regular 챕 sens챠vel a mai첬sculas e min첬sculas, 챕 feita contra uma vers찾o canonicalizada da chave na qual a se챌찾o e os nomes de vari찼veis s찾o min첬sculos, mas os nomes das subse챌천es n찾o s찾o."
#. type: Labeled list
#: en/git-config.txt:98
@@ -18901,17 +15893,13 @@ msgstr "Para op챌천es de leitura: leia somente do `$(prefixo)/etc/gitconfig` em
#: en/git-config.txt:130
#, priority:100
msgid "For writing options: write to the repository `.git/config` file. This is the default behavior."
-msgstr ""
-"Para as op챌천es de escrita: escreva no arquivo do reposit처rio `.git/config`. "
-"Este 챕 o comportamento predefinido."
+msgstr "Para as op챌천es de escrita: escreva no arquivo do reposit처rio `.git/config`. Este 챕 o comportamento predefinido."
#. 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 as op챌천es da leitura: leia somente no reposit처rio `.git/config` em vez "
-"de todos os arquivos dispon챠veis."
+msgstr "Para as op챌천es da leitura: leia somente no reposit처rio `.git/config` em vez de todos os arquivos dispon챠veis."
#. type: Labeled list
#: en/git-config.txt:136 en/git-restore.txt:55
@@ -18941,9 +15929,7 @@ msgstr "--arquivo config-arquivo"
#: en/git-config.txt:144
#, priority:100
msgid "Use the given config file instead of the one specified by GIT_CONFIG."
-msgstr ""
-"Utilize o arquivo de configura챌찾o informado em vez daquele especificado por "
-"GIT_CONFIG."
+msgstr "Utilize o arquivo de configura챌찾o informado em vez daquele especificado por GIT_CONFIG."
#. type: Labeled list
#: en/git-config.txt:145
@@ -19159,14 +16145,7 @@ msgstr "--get-colorbool nome [stdout-챕-tty]"
#: en/git-config.txt:240
#, priority:100
msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\". If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise. When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
-msgstr ""
-"Encontre a configura챌찾o de cor para `nome` (por exemplo,`color.diff`) e a "
-"sa챠da \"true\" ou \"false\". `stdout-챕-tty` deve ser \"true\" ou \"false\", "
-"챕 levado em conta quando a configura챌찾o diz \"auto\". Caso `stdout-is-tty` "
-"esteja faltando, ent찾o verifica a sa챠da predefinida do pr처prio comando e sai "
-"com a condi챌찾o 0 caso a cor seja utilizada ou com a condi챌찾o 1 caso n찾o "
-"seja. Quando a configura챌찾o da cor para `nome` estiver indefinido, o "
-"comando utiliza `color.ui` como fallback."
+msgstr "Encontre a configura챌찾o de cor para `nome` (por exemplo,`color.diff`) e a sa챠da \"true\" ou \"false\". `stdout-챕-tty` deve ser \"true\" ou \"false\", 챕 levado em conta quando a configura챌찾o diz \"auto\". Caso `stdout-is-tty` esteja faltando, ent찾o verifica a sa챠da predefinida do pr처prio comando e sai com a condi챌찾o 0 caso a cor seja utilizada ou com a condi챌찾o 1 caso n찾o seja. Quando a configura챌찾o da cor para `nome` estiver indefinido, o comando utiliza `color.ui` como fallback."
#. type: Labeled list
#: en/git-config.txt:241
@@ -19220,18 +16199,13 @@ msgstr "Ao usar `--get` e a vari찼vel solicitada n찾o for encontrada, comportar-
#: en/git-config.txt:272
#, priority:100
msgid "`pager.config` is only respected when listing configuration, i.e., when using `--list` or any of the `--get-*` which may return multiple results. The default is to use a pager."
-msgstr ""
-"O `pager.config` somente 챕 respeitado durante a listagem da configura챌찾o, ou "
-"seja, ao utilizar a op챌찾o `--list` ou qualquer um dos `--get-*` que podem "
-"retornar diversos resultados. A predefini챌찾o 챕 utilizar um pager."
+msgstr "O `pager.config` somente 챕 respeitado durante a listagem da configura챌찾o, ou seja, ao utilizar a op챌찾o `--list` ou qualquer um dos `--get-*` que podem retornar diversos resultados. A predefini챌찾o 챕 utilizar um pager."
#. type: Plain text
#: en/git-config.txt:279
#, priority:100
msgid "If not set explicitly with `--file`, there are four files where 'git config' will search for configuration options:"
-msgstr ""
-"Caso n찾o seja definido de forma explicita com a op챌찾o `--file`, existem "
-"quatro arquivos onde o 'git config' ir찼 procurar as op챌천es de configura챌찾o:"
+msgstr "Caso n찾o seja definido de forma explicita com a op챌찾o `--file`, existem quatro arquivos onde o 'git config' ir찼 procurar as op챌천es de configura챌찾o:"
#. type: Labeled list
#: en/git-config.txt:280
@@ -19339,10 +16313,7 @@ msgstr "GIT_CONFIG"
#: en/git-config.txt:333
#, priority:100
msgid "Take the configuration from the given file instead of .git/config. Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
-msgstr ""
-"Pegue a configura챌찾o do arquivo informado em vez de .git/config. Usar a "
-"op챌찾o \"--global\" for챌a isso para ~/.gitconfig. Usar a op챌찾o \"--system\" "
-"for챌a isso para $(prefixo)/etc/gitconfig."
+msgstr "Pegue a configura챌찾o do arquivo informado em vez de .git/config. Usar a op챌찾o \"--global\" for챌a isso para ~/.gitconfig. Usar a op챌찾o \"--system\" for챌a isso para $(prefixo)/etc/gitconfig."
#. type: Labeled list
#: en/git-config.txt:334
@@ -19559,9 +16530,7 @@ msgstr "% git config section.key value '[!]'\n"
#: en/git-config.txt:447
#, priority:100
msgid "To add a new proxy, without altering any of the existing ones, use"
-msgstr ""
-"Para adicionar um novo proxy, sem alterar qualquer outro j찼 existente, "
-"utilize"
+msgstr "Para adicionar um novo proxy, sem alterar qualquer outro j찼 existente, utilize"
#. type: delimited block -
#: en/git-config.txt:450
@@ -19607,11 +16576,9 @@ msgid ""
"http.cookieFile /tmp/cookie.txt\n"
"http.sslverify false\n"
msgstr ""
-"% git config --type=bool --get-urlmatch http.sslverify https://good.example."
-"com\n"
+"% git config --type=bool --get-urlmatch http.sslverify https://good.example.com\n"
"true\n"
-"% git config --type=bool --get-urlmatch http.sslverify https://weak.example."
-"com\n"
+"% git config --type=bool --get-urlmatch http.sslverify https://weak.example.com\n"
"false\n"
"% git config --get-urlmatch http https://weak.example.com\n"
"http.cookieFile /tmp/cookie.txt\n"
@@ -19627,11 +16594,7 @@ msgstr "BUGS"
#: en/git-config.txt:483
#, priority:100
msgid "When using the deprecated `[section.subsection]` syntax, changing a value will result in adding a multi-line key instead of a change, if the subsection is given with at least one uppercase character. For example when the config looks like"
-msgstr ""
-"Ao utilizar a sintaxe j찼 obsoleta `[section.subsection]`, alterando um "
-"valor, resultar찼 na adi챌찾o de uma chave com v찼rias linhas em vez de uma "
-"altera챌찾o apenas, caso a subse챌찾o seja informada com pelo menos um caractere "
-"em mai첬sculo. Por exemplo, quando a configura챌찾o se parece"
+msgstr "Ao utilizar a sintaxe j찼 obsoleta `[section.subsection]`, alterando um valor, resultar찼 na adi챌찾o de uma chave com v찼rias linhas em vez de uma altera챌찾o apenas, caso a subse챌찾o seja informada com pelo menos um caractere em mai첬sculo. Por exemplo, quando a configura챌찾o se parece"
#. type: delimited block -
#: en/git-config.txt:487
@@ -19701,9 +16664,7 @@ msgstr "count: a quantidade de objetos soltos"
#: en/git-count-objects.txt:28
#, priority:100
msgid "size: disk space consumed by loose objects, in KiB (unless -H is specified)"
-msgstr ""
-"size: espa챌o em disco consumido por pacotes soltos, em KiB (a menos que -H "
-"seja utilizado)"
+msgstr "size: espa챌o em disco consumido por pacotes soltos, em KiB (a menos que -H seja utilizado)"
#. type: Plain text
#: en/git-count-objects.txt:30
@@ -19715,18 +16676,13 @@ msgstr "in-pack: a quantidade de objetos no pacote"
#: en/git-count-objects.txt:32
#, priority:100
msgid "size-pack: disk space consumed by the packs, in KiB (unless -H is specified)"
-msgstr ""
-"size-pack: espa챌o em disco consumido pelos pacotes, em KiB (a menos que -H "
-"seja utilizado)"
+msgstr "size-pack: espa챌o em disco consumido pelos pacotes, em KiB (a menos que -H seja utilizado)"
#. type: Plain text
#: en/git-count-objects.txt:35
#, priority:100
msgid "prune-packable: the number of loose objects that are also present in the packs. These objects could be pruned using `git prune-packed`."
-msgstr ""
-"prune-packable: a quantidade de objetos soltos que tamb챕m est찾o presentes "
-"nos pacotes. Esses objetos podem ser cortados utilizando o `git ameixa-"
-"embalada`."
+msgstr "prune-packable: a quantidade de objetos soltos que tamb챕m est찾o presentes nos pacotes. Esses objetos podem ser cortados utilizando o `git ameixa-embalada`."
#. type: Plain text
#: en/git-count-objects.txt:38
@@ -19738,9 +16694,7 @@ msgstr "garbage: a quantidade dos arquivos no banco de dados do objeto que n찾o
#: en/git-count-objects.txt:41
#, priority:100
msgid "size-garbage: disk space consumed by garbage files, in KiB (unless -H is specified)"
-msgstr ""
-"size-garbage: espa챌o em disco consumido por arquivos lixo, em KiB (a menos "
-"que -H seja utilizado)"
+msgstr "size-garbage: espa챌o em disco consumido por arquivos lixo, em KiB (a menos que -H seja utilizado)"
#. type: Plain text
#: en/git-count-objects.txt:46
@@ -19800,10 +16754,7 @@ msgstr "Este comando escuta no \"socket\" do dom챠nio Unix determinado por `<soc
#: en/git-credential-cache--daemon.txt:27
#, priority:100
msgid "If the `--debug` option is specified, the daemon does not close its stderr stream, and may output extra diagnostics to it even after it has begun listening for clients."
-msgstr ""
-"Caso a op챌찾o `--debug` seja utilizada, o daemon n찾o fechar찼 o fluxo `stderr` "
-"e poder찼 gerar diagn처sticos extras, mesmo depois de come챌ar a ouvir os "
-"clientes."
+msgstr "Caso a op챌찾o `--debug` seja utilizada, o daemon n찾o fechar찼 o fluxo `stderr` e poder찼 gerar diagn처sticos extras, mesmo depois de come챌ar a ouvir os clientes."
#. type: Title =
#: en/git-credential-cache.txt:2
@@ -19833,10 +16784,7 @@ msgstr "Este comando armazena em cache as credenciais na mem처ria para uso futur
#: en/git-credential-cache.txt:25
#, 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 utilizado pelas outras partes como um auxiliar da credencial do Git. See "
-"linkgit:gitcredentials[7] or `EXAMPLES` below."
+msgstr "Provavelmente voc챗 n찾o vai querer invocar este comando diretamente; Ele deve ser utilizado pelas outras partes como um auxiliar da credencial do Git. See linkgit:gitcredentials[7] or `EXAMPLES` below."
#. type: Labeled list
#: en/git-credential-cache.txt:29
@@ -19860,14 +16808,7 @@ msgstr "--socket <caminho>"
#: en/git-credential-cache.txt:43
#, priority:100
msgid "Use `<path>` to contact a running cache daemon (or start a new cache daemon if one is not started). Defaults to `$XDG_CACHE_HOME/git/credential/socket` unless `~/.git-credential-cache/` exists in which case `~/.git-credential-cache/socket` is used instead. If your home directory is on a network-mounted filesystem, you may need to change this to a local filesystem. You must specify an absolute path."
-msgstr ""
-"Utilize o `<caminho>` para entrar em contato com um daemon de cache em "
-"execu챌찾o (ou inicie um novo, cache daemon caso nenhum tenha sido iniciado). "
-"횋 predefinido para `$XDG_CACHE_HOME/git/credential/socket` a menos que "
-"`~/.git-credential-cache/` exista, neste caso `~/.git-credential-cache/"
-"socket` 챕 utilizado. Se o diret처rio inicial estiver em um sistema de "
-"arquivos montado via rede, pode ser necess찼rio alter찼-lo para um sistema de "
-"arquivos local. Voc챗 deve usar um caminho absoluto."
+msgstr "Utilize o `<caminho>` para entrar em contato com um daemon de cache em execu챌찾o (ou inicie um novo, cache daemon caso nenhum tenha sido iniciado). 횋 predefinido para `$XDG_CACHE_HOME/git/credential/socket` a menos que `~/.git-credential-cache/` exista, neste caso `~/.git-credential-cache/socket` 챕 utilizado. Se o diret처rio inicial estiver em um sistema de arquivos montado via rede, pode ser necess찼rio alter찼-lo para um sistema de arquivos local. Voc챗 deve usar um caminho absoluto."
#. type: Title -
#: en/git-credential-cache.txt:45
@@ -19923,9 +16864,7 @@ msgstr ""
#: en/git-credential-cache.txt:73
#, priority:100
msgid "You can provide options via the credential.helper configuration variable (this example drops the cache time to 5 minutes):"
-msgstr ""
-"Voc챗 pode utilizar as op챌천es atrav챕s da vari찼vel de configura챌찾o `credential."
-"helper` (este exemplo descarta o cache a cada 5 minutos):"
+msgstr "Voc챗 pode utilizar as op챌천es atrav챕s da vari찼vel de configura챌찾o `credential.helper` (este exemplo descarta o cache a cada 5 minutos):"
#. type: delimited block -
#: en/git-credential-cache.txt:76
@@ -19955,12 +16894,7 @@ msgstr "git config credential.helper 'store [<op챌천es>]'\n"
#: en/git-credential-store.txt:21
#, priority:100
msgid "Using this helper will store your passwords unencrypted on disk, protected only by filesystem permissions. If this is not an acceptable security tradeoff, try linkgit:git-credential-cache[1], or find a helper that integrates with secure storage provided by your operating system."
-msgstr ""
-"Ao usar este auxiliar as suas senhas s찾o armazenadas de forma criptografada "
-"no disco, protegida apenas pelas permiss천es do sistema de arquivos. Caso "
-"essa n찾o seja uma troca aceit찼vel de seguran챌a, tente o linkgit:git-"
-"credential-cache[1] ou encontre um auxiliar que se integre ao armazenamento "
-"seguro informado pelo seu sistema operacional."
+msgstr "Ao usar este auxiliar as suas senhas s찾o armazenadas de forma criptografada no disco, protegida apenas pelas permiss천es do sistema de arquivos. Caso essa n찾o seja uma troca aceit찼vel de seguran챌a, tente o linkgit:git-credential-cache[1] ou encontre um auxiliar que se integre ao armazenamento seguro informado pelo seu sistema operacional."
#. type: Plain text
#: en/git-credential-store.txt:24
@@ -19972,10 +16906,7 @@ msgstr "Este comando armazena as credenciais indefinidamente no disco para uso f
#: en/git-credential-store.txt:28
#, 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 utilizado pelas outras partes como um auxiliar da credencial do git. See "
-"linkgit:gitcredentials[7] or `EXAMPLES` below."
+msgstr "Provavelmente voc챗 n찾o vai querer invocar este comando diretamente; Ele deve ser utilizado pelas outras partes como um auxiliar da credencial do git. See linkgit:gitcredentials[7] or `EXAMPLES` below."
#. type: Labeled list
#: en/git-credential-store.txt:32
@@ -19987,14 +16918,7 @@ msgstr "--file=<caminho>"
#: en/git-credential-store.txt:42
#, priority:100
msgid "Use `<path>` to lookup and store credentials. The file will have its filesystem permissions set to prevent other users on the system from reading it, but will not be encrypted or otherwise protected. If not specified, credentials will be searched for from `~/.git-credentials` and `$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to `~/.git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if it exists and the former does not. See also <<FILES>>."
-msgstr ""
-"Utilize `<path>` para localizar e armazenar as credenciais. O arquivo ter찼 "
-"suas as permiss천es do sistema de arquivos definidos para impedir que os "
-"outros usu찼rios no sistema o leiam, mas n찾o ser찾o criptografados ou "
-"protegidos. Caso n찾o seja utilizado, as credenciais ser찾o pesquisadas em "
-"`~/.git-credentials` e `$XDG_CONFIG_HOME/git/credentials`, as credenciais "
-"ser찾o salvas em `~/.git-credentials` caso exista, ou `$XDG_CONFIG_HOME/git/"
-"credentials` caso exista e o primeiro n찾o. Consulte tamb챕m <<ARQUIVOS>>."
+msgstr "Utilize `<path>` para localizar e armazenar as credenciais. O arquivo ter찼 suas as permiss천es do sistema de arquivos definidos para impedir que os outros usu찼rios no sistema o leiam, mas n찾o ser찾o criptografados ou protegidos. Caso n찾o seja utilizado, as credenciais ser찾o pesquisadas em `~/.git-credentials` e `$XDG_CONFIG_HOME/git/credentials`, as credenciais ser찾o salvas em `~/.git-credentials` caso exista, ou `$XDG_CONFIG_HOME/git/credentials` caso exista e o primeiro n찾o. Consulte tamb챕m <<ARQUIVOS>>."
#. type: Plain text
#: en/git-credential-store.txt:49
@@ -20024,13 +16948,7 @@ msgstr "$XDG_CONFIG_HOME/git/credentials"
#: en/git-credential-store.txt:59
#, priority:100
msgid "Second user-specific credentials file. If '$XDG_CONFIG_HOME' is not set or empty, `$HOME/.config/git/credentials` will be used. Any credentials stored in this file will not be used if `~/.git-credentials` has a matching credential as well. It is a good idea not to create this file if you sometimes use older versions of Git that do not support it."
-msgstr ""
-"Arquivo de credenciais secund찼rio espec챠ficas do usu찼rio. Caso '$"
-"XDG_CONFIG_HOME' n찾o seja utilizado ou esteja vazio, o `$HOME/.config/git/"
-"credentials` ser찼 utilizado. Quaisquer credenciais armazenadas neste arquivo "
-"n찾o ser찾o utilizadas caso `~/.git-credentials` tamb챕m tiver uma credencial "
-"coincidente. 횋 uma boa pratica n찾o criar este arquivo caso voc챗 횪s vezes "
-"utilize vers천es mais antigas do Git que n찾o s찾o compat챠veis."
+msgstr "Arquivo de credenciais secund찼rio espec챠ficas do usu찼rio. Caso '$XDG_CONFIG_HOME' n찾o seja utilizado ou esteja vazio, o `$HOME/.config/git/credentials` ser찼 utilizado. Quaisquer credenciais armazenadas neste arquivo n찾o ser찾o utilizadas caso `~/.git-credentials` tamb챕m tiver uma credencial coincidente. 횋 uma boa pratica n찾o criar este arquivo caso voc챗 횪s vezes utilize vers천es mais antigas do Git que n찾o s찾o compat챠veis."
#. type: Plain text
#: en/git-credential-store.txt:63
@@ -20140,12 +17058,7 @@ msgstr "O `git-credential` usa uma \"a챌찾o\" como op챌찾o na linha de comando (
#: en/git-credential.txt:35
#, priority:100
msgid "If the action is `fill`, git-credential will attempt to add \"username\" and \"password\" attributes to the description by reading config files, by contacting any configured credential helpers, or by prompting the user. The username and password attributes of the credential description are then printed to stdout together with the attributes already provided."
-msgstr ""
-"Caso a a챌찾o seja `fill`, o comando tentar찼 adicionar os atributos \"username"
-"\" e \"password\" 횪 descri챌찾o lendo os arquivos de configura챌찾o ao contactar "
-"qualquer auxiliar de credencial configurado ou solicitando ao usu찼rio. Os "
-"atributos de nome de usu찼rio e senha da descri챌찾o da credencial s찾o "
-"impressos para \"stdout\" junto com os atributos j찼 informados."
+msgstr "Caso a a챌찾o seja `fill`, o comando tentar찼 adicionar os atributos \"username\" e \"password\" 횪 descri챌찾o lendo os arquivos de configura챌찾o ao contactar qualquer auxiliar de credencial configurado ou solicitando ao usu찼rio. Os atributos de nome de usu찼rio e senha da descri챌찾o da credencial s찾o impressos para \"stdout\" junto com os atributos j찼 informados."
#. type: Plain text
#: en/git-credential.txt:39
@@ -20175,9 +17088,7 @@ msgstr "UTILIZA횉횄O T횒PICA DO GIT CREDENTIAL"
#: en/git-credential.txt:51
#, priority:100
msgid "An application using git-credential will typically use `git credential` following these steps:"
-msgstr ""
-"Um aplicativo que utilize o comando `git-credential` normalmente usa `git "
-"credential` seguindo estas etapas:"
+msgstr "Um aplicativo que utilize o comando `git-credential` normalmente usa `git credential` seguindo estas etapas:"
#. type: Plain text
#: en/git-credential.txt:53
@@ -20227,11 +17138,7 @@ msgstr ""
#: en/git-credential.txt:79
#, priority:100
msgid "In most cases, this means the attributes given in the input will be repeated in the output, but Git may also modify the credential description, for example by removing the `path` attribute when the protocol is HTTP(s) and `credential.useHttpPath` is false."
-msgstr ""
-"Na maioria dos casos, isso significa que os atributos informados na entrada "
-"ser찾o repetidos na sa챠da, mas o Git tamb챕m poder찼 modificar a descri챌찾o da "
-"credencial, por exemplo, removendo o atributo `path` quando o protocolo for "
-"HTTP(s) e a vari찼vel `credential.useHttpPath` seja falsa."
+msgstr "Na maioria dos casos, isso significa que os atributos informados na entrada ser찾o repetidos na sa챠da, mas o Git tamb챕m poder찼 modificar a descri챌찾o da credencial, por exemplo, removendo o atributo `path` quando o protocolo for HTTP(s) e a vari찼vel `credential.useHttpPath` seja falsa."
#. type: Plain text
#: en/git-credential.txt:85
@@ -20243,23 +17150,13 @@ msgstr "Caso o comando `git credential` saiba sobre a senha, esta etapa pode n찾
#: en/git-credential.txt:88
#, priority:100
msgid "Use the credential (e.g., access the URL with the username and password from step (2)), and see if it's accepted."
-msgstr ""
-"Utilize a credencial (por exemplo, acesse a URL com o nome de usu찼rio e a "
-"senha da etapa (2)) e verifique se ela 챕 aceita."
+msgstr "Utilize a credencial (por exemplo, acesse a URL com o nome de usu찼rio e a senha da etapa (2)) e verifique se ela 챕 aceita."
#. type: Plain text
#: en/git-credential.txt:98
#, priority:100
msgid "Report on the success or failure of the password. If the credential allowed the operation to complete successfully, then it can be marked with an \"approve\" action to tell `git credential` to reuse it in its next invocation. If the credential was rejected during the operation, use the \"reject\" action so that `git credential` will ask for a new password in its next invocation. In either case, `git credential` should be fed with the credential description obtained from step (2) (which also contain the ones provided in step (1))."
-msgstr ""
-"Relate o sucesso ou falha da senha. Caso a credencial permita que a opera챌찾o "
-"seja conclu챠da com sucesso, ela pode ser marcada com uma a챌찾o \"approve\" "
-"para passar ao `git credential` para ser reutilizada na pr처xima invoca챌찾o. "
-"Caso a credencial seja rejeitada durante a opera챌찾o, utilize a a챌찾o \"reject"
-"\" para que o comando `git credential` solicite uma nova senha na pr처xima "
-"invoca챌찾o. Em qualquer um dos casos, o comando `git credential` deve ser "
-"alimentado com o descritivo da credencial obtida na etapa (2) (que tamb챕m "
-"cont챕m aquelas informada na etapa (1))."
+msgstr "Relate o sucesso ou falha da senha. Caso a credencial permita que a opera챌찾o seja conclu챠da com sucesso, ela pode ser marcada com uma a챌찾o \"approve\" para passar ao `git credential` para ser reutilizada na pr처xima invoca챌찾o. Caso a credencial seja rejeitada durante a opera챌찾o, utilize a a챌찾o \"reject\" para que o comando `git credential` solicite uma nova senha na pr처xima invoca챌찾o. Em qualquer um dos casos, o comando `git credential` deve ser alimentado com o descritivo da credencial obtida na etapa (2) (que tamb챕m cont챕m aquelas informada na etapa (1))."
#. type: Title -
#: en/git-credential.txt:101
@@ -20271,39 +17168,25 @@ msgstr "FORMATO DE ENTRADA/SA횒DA"
#: en/git-credential.txt:108
#, priority:100
msgid "`git credential` reads and/or writes (depending on the action used) credential information in its standard input/output. This information can correspond either to keys for which `git credential` will obtain the login information (e.g. host, protocol, path), or to the actual credential data to be obtained (username/password)."
-msgstr ""
-"O comando `git credential` l챗 ou grava (dependendo da a챌찾o utilizada) as "
-"informa챌천es da credencial na sua entrada e sa챠da predefinida. Esta "
-"informa챌찾o pode corresponder 횪s chaves pelas quais o comando `git credential`"
-" obter찼 as informa챌천es de login e senha (por exemplo, host, protocolo, "
-"caminho) ou aos dados da credencial real a serem obtidos (login e senha)."
+msgstr "O comando `git credential` l챗 ou grava (dependendo da a챌찾o utilizada) as informa챌천es da credencial na sua entrada e sa챠da predefinida. Esta informa챌찾o pode corresponder 횪s chaves pelas quais o comando `git credential` obter찼 as informa챌천es de login e senha (por exemplo, host, protocolo, caminho) ou aos dados da credencial real a serem obtidos (login e senha)."
#. type: Plain text
#: en/git-credential.txt:112
#, priority:100
msgid "The credential is split into a set of named attributes, with one attribute per line. Each attribute is specified by a key-value pair, separated by an `=` (equals) sign, followed by a newline."
-msgstr ""
-"A credencial 챕 dividida em um conjunto de atributos informados, com um "
-"atributo por linha. Cada atributo 챕 especificado por um par de valores-"
-"chave, separado por um sinal de `=` (igual), seguido por uma nova linha."
+msgstr "A credencial 챕 dividida em um conjunto de atributos informados, com um atributo por linha. Cada atributo 챕 especificado por um par de valores-chave, separado por um sinal de `=` (igual), seguido por uma nova linha."
#. type: Plain text
#: en/git-credential.txt:115
#, priority:100
msgid "The key may contain any bytes except `=`, newline, or NUL. The value may contain any bytes except newline or NUL."
-msgstr ""
-"A chave pode conter quaisquer bytes, exceto `=`, nova linha ou NUL. O valor "
-"pode conter quaisquer bytes, exceto uma nova linha ou NUL."
+msgstr "A chave pode conter quaisquer bytes, exceto `=`, nova linha ou NUL. O valor pode conter quaisquer bytes, exceto uma nova linha ou NUL."
#. type: Plain text
#: en/git-credential.txt:119
#, priority:100
msgid "In both cases, all bytes are treated as-is (i.e., there is no quoting, and one cannot transmit a value with newline or NUL in it). The list of attributes is terminated by a blank line or end-of-file."
-msgstr ""
-"Nos dois casos, todos os bytes s찾o tratados como est찾o (ou seja, n찾o h찼 "
-"aspas e n찾o 챕 poss챠vel transmitir um valor com nova linha ou NUL nela). A "
-"lista de atributos 챕 finalizada por uma linha em branco ou no final do "
-"arquivo."
+msgstr "Nos dois casos, todos os bytes s찾o tratados como est찾o (ou seja, n찾o h찼 aspas e n찾o 챕 poss챠vel transmitir um valor com nova linha ou NUL nela). A lista de atributos 챕 finalizada por uma linha em branco ou no final do arquivo."
#. type: Plain text
#: en/git-credential.txt:121
@@ -20321,8 +17204,7 @@ msgstr "`protocol`"
#: en/git-credential.txt:126
#, priority:100
msgid "The protocol over which the credential will be used (e.g., `https`)."
-msgstr ""
-"O protocolo sobre o qual a credencial ser찼 utilizada (por exemplo, `https`)."
+msgstr "O protocolo sobre o qual a credencial ser찼 utilizada (por exemplo, `https`)."
#. type: Labeled list
#: en/git-credential.txt:127
@@ -20334,9 +17216,7 @@ msgstr "`host`"
#: en/git-credential.txt:131
#, priority:100
msgid "The remote hostname for a network credential. This includes the port number if one was specified (e.g., \"example.com:8088\")."
-msgstr ""
-"O nome do host remoto para uma credencial de rede. This includes the port "
-"number if one was specified (e.g., \"example.com:8088\")."
+msgstr "O nome do host remoto para uma credencial de rede. This includes the port number if one was specified (e.g., \"example.com:8088\")."
#. type: Labeled list
#: en/git-credential.txt:132
@@ -20348,9 +17228,7 @@ msgstr "`path`"
#: en/git-credential.txt:137
#, priority:100
msgid "The path with which the credential will be used. E.g., for accessing a remote https repository, this will be the repository's path on the server."
-msgstr ""
-"O caminho com o qual a credencial ser찼 utilizada. Por exemplo, para acessar "
-"um reposit처rio https remoto, este ser찼 o caminho do reposit처rio no servidor."
+msgstr "O caminho com o qual a credencial ser찼 utilizada. Por exemplo, para acessar um reposit처rio https remoto, este ser찼 o caminho do reposit처rio no servidor."
#. type: Labeled list
#: en/git-credential.txt:138
@@ -20362,9 +17240,7 @@ msgstr "`username`"
#: en/git-credential.txt:142
#, priority:100
msgid "The credential's username, if we already have one (e.g., from a URL, the configuration, the user, or from a previously run helper)."
-msgstr ""
-"O nome de usu찼rio da credencial, caso j찼 tenhamos um (por exemplo, de uma "
-"URL, da configura챌찾o do usu찼rio ou de um auxiliar executado anteriormente)."
+msgstr "O nome de usu찼rio da credencial, caso j찼 tenhamos um (por exemplo, de uma URL, da configura챌찾o do usu찼rio ou de um auxiliar executado anteriormente)."
#. type: Labeled list
#: en/git-credential.txt:143
@@ -20388,12 +17264,7 @@ msgstr "`url`"
#: en/git-credential.txt:154
#, priority:100
msgid "When this special attribute is read by `git credential`, the value is parsed as a URL and treated as if its constituent parts were read (e.g., `url=https://example.com` would behave as if `protocol=https` and `host=example.com` had been provided). This can help callers avoid parsing URLs themselves."
-msgstr ""
-"When this special attribute is read by `git credential`, the value is parsed "
-"as a URL and treated as if its constituent parts were read (e.g., "
-"`url=https://example.com` would behave as if `protocol=https` and "
-"`host=example.com` had been provided). Isso pode ajudar a evitar que eles "
-"mesmos (quem chama) de analisar as URLs."
+msgstr "When this special attribute is read by `git credential`, the value is parsed as a URL and treated as if its constituent parts were read (e.g., `url=https://example.com` would behave as if `protocol=https` and `host=example.com` had been provided). Isso pode ajudar a evitar que eles mesmos (quem chama) de analisar as URLs."
#. type: Plain text
#: en/git-credential.txt:159
@@ -20439,10 +17310,7 @@ msgstr "Exporta um commit do Git para um checkout do CVS, facilitando a mesclage
#: en/git-cvsexportcommit.txt:24
#, priority:100
msgid "Specify the name of a CVS checkout using the -w switch or execute it from the root of the CVS working copy. In the latter case GIT_DIR must be defined. See examples below."
-msgstr ""
-"Especifique o nome de uma verifica챌찾o geral do CVS utilizando a op챌찾o `-w` "
-"ou execute uma c처pia do trabalho a partir da raiz do CVS. No 첬ltimo caso, o "
-"`GIT_DIR` deve ser definido. Veja os exemplos abaixo."
+msgstr "Especifique o nome de uma verifica챌찾o geral do CVS utilizando a op챌찾o `-w` ou execute uma c처pia do trabalho a partir da raiz do CVS. No 첬ltimo caso, o `GIT_DIR` deve ser definido. Veja os exemplos abaixo."
#. type: Plain text
#: en/git-cvsexportcommit.txt:28
@@ -20460,9 +17328,7 @@ msgstr "Oferece suporte a adi챌천es, remo챌천es e commits que afetem os arquivos
#: en/git-cvsexportcommit.txt:33
#, priority:100
msgid "If the commit is a merge commit, you must tell 'git cvsexportcommit' what parent the changeset should be done against."
-msgstr ""
-"Caso o commit seja um commit mesclado, informe ao `git cvsexportcommit` de "
-"qual origem o \"changeset\" deve ser feito."
+msgstr "Caso o commit seja um commit mesclado, informe ao `git cvsexportcommit` de qual origem o \"changeset\" deve ser feito."
#. type: Plain text
#: en/git-cvsexportcommit.txt:40
@@ -20486,10 +17352,7 @@ msgstr "Adicionar informa챌천es de autoria. Adiciona a linha do autor e de quem
#: en/git-cvsexportcommit.txt:53
#, priority:100
msgid "Set an alternative CVSROOT to use. This corresponds to the CVS -d parameter. Usually users will not want to set this, except if using CVS in an asymmetric fashion."
-msgstr ""
-"Defina um CVSROOT alternativo para ser utilizado. Isso corresponde ao "
-"par창metro CVS `-d`. Geralmente, os usu찼rios n찾o v찾o querer definir isso, "
-"exceto caso utilize o CVS de maneira assim챕trica."
+msgstr "Defina um CVSROOT alternativo para ser utilizado. Isso corresponde ao par창metro CVS `-d`. Geralmente, os usu찼rios n찾o v찾o querer definir isso, exceto caso utilize o CVS de maneira assim챕trica."
#. type: Plain text
#: en/git-cvsexportcommit.txt:56
@@ -20507,9 +17370,7 @@ msgstr "Imponha o commit da origem, ainda que n찾o seja direto dela."
#: en/git-cvsexportcommit.txt:63
#, priority:100
msgid "Prepend the commit message with the provided prefix. Useful for patch series and the like."
-msgstr ""
-"Anexe a mensagem do commit com o prefixo informado. 횣til para patches em "
-"s챕rie e similares."
+msgstr "Anexe a mensagem do commit com o prefixo informado. 횣til para patches em s챕rie e similares."
#. type: Plain text
#: en/git-cvsexportcommit.txt:66
@@ -20527,20 +17388,13 @@ msgstr "Reverta a expans찾o das palavras-chave do CVS (por exemplo, $Revision: 1
#: en/git-cvsexportcommit.txt:76
#, priority:100
msgid "Specify the location of the CVS checkout to use for the export. This option does not require GIT_DIR to be set before execution if the current directory is within a Git repository. The default is the value of 'cvsexportcommit.cvsdir'."
-msgstr ""
-"Especifique o local do checkout do CVS a ser utilizado para a exporta챌찾o. "
-"Esta op챌찾o n찾o requer que `GIT_DIR` seja definido antes da execu챌찾o caso o "
-"diret처rio atual esteja dentro de um reposit처rio Git. O valor predefinido 챕 "
-"o que est찼 na vari찼vel `cvsexportcommit.cvsdir`."
+msgstr "Especifique o local do checkout do CVS a ser utilizado para a exporta챌찾o. Esta op챌찾o n찾o requer que `GIT_DIR` seja definido antes da execu챌찾o caso o diret처rio atual esteja dentro de um reposit처rio Git. O valor predefinido 챕 o que est찼 na vari찼vel `cvsexportcommit.cvsdir`."
#. type: Plain text
#: en/git-cvsexportcommit.txt:81
#, priority:100
msgid "Tell cvsexportcommit that the current working directory is not only a Git checkout, but also the CVS checkout. Therefore, Git will reset the working directory to the parent commit before proceeding."
-msgstr ""
-"Diga ao `cvsexportcommit` que o diret처rio de trabalho atual n찾o 챕 apenas um "
-"checkout do Git, mas tamb챕m o checkout do CVS. Portanto, o Git redefinir찼 o "
-"diret처rio de trabalho para o commit da origem antes de continuar."
+msgstr "Diga ao `cvsexportcommit` que o diret처rio de trabalho atual n찾o 챕 apenas um checkout do Git, mas tamb챕m o checkout do CVS. Portanto, o Git redefinir찼 o diret처rio de trabalho para o commit da origem antes de continuar."
#. type: Plain text
#: en/git-cvsexportcommit.txt:84
@@ -20680,26 +17534,13 @@ msgstr ""
#: en/git-cvsimport.txt:42
#, priority:100
msgid "You should *never* do any work of your own on the branches that are created by 'git cvsimport'. By default initial import will create and populate a \"master\" branch from the CVS repository's main branch which you're free to work with; after that, you need to 'git merge' incremental imports, or any CVS branches, yourself. It is advisable to specify a named remote via -r to separate and protect the incoming branches."
-msgstr ""
-"Voc챗 nunca *deve* fazer qualquer trabalho seu nos ramos criados pelo `git "
-"cvsimport`. 횋 predefinido que a importa챌찾o inicial criar찼 e ir찼 preencher "
-"uma ramifica챌찾o \"master\" a partir do ramo principal do reposit처rio CVS, "
-"com a qual voc챗 poder찼 trabalhar livremente; depois disso, voc챗 precisar찼 "
-"fazer uma importa챌찾o incremental com o comando `git merge` ou quaisquer "
-"outras ramifica챌천es do CVS voc챗 mesmo. 횋 aconselh찼vel determinar um nome "
-"remoto atrav챕s de `-r` para separar e proteger as ramifica챌천es recebidas."
+msgstr "Voc챗 nunca *deve* fazer qualquer trabalho seu nos ramos criados pelo `git cvsimport`. 횋 predefinido que a importa챌찾o inicial criar찼 e ir찼 preencher uma ramifica챌찾o \"master\" a partir do ramo principal do reposit처rio CVS, com a qual voc챗 poder찼 trabalhar livremente; depois disso, voc챗 precisar찼 fazer uma importa챌찾o incremental com o comando `git merge` ou quaisquer outras ramifica챌천es do CVS voc챗 mesmo. 횋 aconselh찼vel determinar um nome remoto atrav챕s de `-r` para separar e proteger as ramifica챌천es recebidas."
#. type: Plain text
#: en/git-cvsimport.txt:48
#, 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 utilizar o linkgit:git-cvsserver[1], ent찾o 챕 prefer챠vel que "
-"voc챗 crie um clone simples do seu reposit처rio importado para que seja "
-"utilizado como um reposit처rio compartilhado. Consulte 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 utilizar o linkgit:git-cvsserver[1], ent찾o 챕 prefer챠vel que voc챗 crie um clone simples do seu reposit처rio importado para que seja utilizado como um reposit처rio compartilhado. Consulte linkgit:gitcvs-migration[7]."
#. type: Plain text
#: en/git-cvsimport.txt:54
@@ -20717,12 +17558,7 @@ msgstr "-d <CVSROOT>"
#: en/git-cvsimport.txt:61
#, priority:100
msgid "The root of the CVS archive. May be local (a simple path) or remote; currently, only the :local:, :ext: and :pserver: access methods are supported. If not given, 'git cvsimport' will try to read it from `CVS/Root`. If no such file exists, it checks for the `CVSROOT` environment variable."
-msgstr ""
-"A raiz do arquivo CVS. Pode ser local (um caminho simples) ou remoto; "
-"atualmente, s찾o compat챠veis apenas o :local:, :ext: e :pserver: access. Caso "
-"n찾o seja utilizado, o comando `git cvsimport` tentar찼 a ler do `CVS/Root`. "
-"No caso de tal arquivo n찾o existir, verifica a exist챗ncia da vari찼vel de "
-"ambiente `CVSROOT`."
+msgstr "A raiz do arquivo CVS. Pode ser local (um caminho simples) ou remoto; atualmente, s찾o compat챠veis apenas o :local:, :ext: e :pserver: access. Caso n찾o seja utilizado, o comando `git cvsimport` tentar찼 a ler do `CVS/Root`. No caso de tal arquivo n찾o existir, verifica a exist챗ncia da vari찼vel de ambiente `CVSROOT`."
#. type: Labeled list
#: en/git-cvsimport.txt:62
@@ -20734,9 +17570,7 @@ msgstr "<CVS_module>"
#: en/git-cvsimport.txt:66
#, priority:100
msgid "The CVS module you want to import. Relative to <CVSROOT>. If not given, 'git cvsimport' tries to read it from `CVS/Repository`."
-msgstr ""
-"O m처dulo CVS que deseja importar. Relativo ao <CVSROOT>. Caso n찾o seja "
-"utilizado, o comando `git cvsimport` tenta ler do `CVS/Repository`."
+msgstr "O m처dulo CVS que deseja importar. Relativo ao <CVSROOT>. Caso n찾o seja utilizado, o comando `git cvsimport` tenta ler do `CVS/Repository`."
#. type: Labeled list
#: en/git-cvsimport.txt:67
@@ -20778,21 +17612,13 @@ msgstr "-o <ramo-para-o-HEAD>"
#: en/git-cvsimport.txt:84
#, priority:100
msgid "When no remote is specified (via -r) the `HEAD` branch from CVS is imported to the 'origin' branch within the Git repository, as `HEAD` already has a special meaning for Git. When a remote is specified the `HEAD` branch is named remotes/<remote>/master mirroring 'git clone' behaviour. Use this option if you want to import into a different branch."
-msgstr ""
-"Quando nenhum ponto remoto definido (via `-r`), o ramo `HEAD` do CVS 챕 "
-"importado para o ramo 'origin' dentro do reposit처rio Git, pois o` HEAD` j찼 "
-"possui um significado especial para o Git. Quando um ponto remoto 챕 "
-"especificado, o ramo `HEAD` 챕 chamado de remotes/<remote>/master espelhando-"
-"se no comportamento do comando `git clone`. Utilize esta op챌찾o caso queira "
-"importar para uma ramifica챌찾o diferente."
+msgstr "Quando nenhum ponto remoto definido (via `-r`), o ramo `HEAD` do CVS 챕 importado para o ramo 'origin' dentro do reposit처rio Git, pois o` HEAD` j찼 possui um significado especial para o Git. Quando um ponto remoto 챕 especificado, o ramo `HEAD` 챕 chamado de remotes/<remote>/master espelhando-se no comportamento do comando `git clone`. Utilize esta op챌찾o caso queira importar para uma ramifica챌찾o diferente."
#. type: Plain text
#: en/git-cvsimport.txt:87
#, priority:100
msgid "Use '-o master' for continuing an import that was initially done by the old cvs2git tool."
-msgstr ""
-"Utilize `-o master` para continuar uma importa챌찾o que foi inicialmente feita "
-"pela antiga ferramenta `cvs2git`."
+msgstr "Utilize `-o master` para continuar uma importa챌찾o que foi inicialmente feita pela antiga ferramenta `cvs2git`."
#. type: Plain text
#: en/git-cvsimport.txt:92
@@ -20834,9 +17660,7 @@ msgstr "-p <op챌천es-para-o-cvsps>"
#: en/git-cvsimport.txt:107
#, priority:100
msgid "Additional options for cvsps. The options `-u` and '-A' are implicit and should not be used here."
-msgstr ""
-"Op챌천es adicionais para o cvsps. As op챌천es `-u` e `-A` est찾o impl챠citas e "
-"n찾o devem ser utilizadas aqui."
+msgstr "Op챌천es adicionais para o cvsps. As op챌천es `-u` e `-A` est찾o impl챠citas e n찾o devem ser utilizadas aqui."
#. type: Plain text
#: en/git-cvsimport.txt:109
@@ -20872,10 +17696,7 @@ msgstr "Em vez de chamar o cvsps, leia o arquivo de sa챠da cvsps informado. 횣ti
#: en/git-cvsimport.txt:122
#, priority:100
msgid "Attempt to detect merges based on the commit message. This option will enable default regexes that try to capture the source branch name from the commit message."
-msgstr ""
-"Tente detectar as mesclagens com base na mensagem do commit. Esta op챌찾o "
-"ativar찼 as express천es regulares que tentam capturar o nome da origem do ramo "
-"na mensagem do commit."
+msgstr "Tente detectar as mesclagens com base na mensagem do commit. Esta op챌찾o ativar찼 as express천es regulares que tentam capturar o nome da origem do ramo na mensagem do commit."
#. type: Labeled list
#: en/git-cvsimport.txt:123
@@ -20887,10 +17708,7 @@ msgstr "-M <regex>"
#: en/git-cvsimport.txt:127
#, priority:100
msgid "Attempt to detect merges based on the commit message with a custom regex. It can be used with `-m` to enable the default regexes as well. You must escape forward slashes."
-msgstr ""
-"Tenta detectar as mesclagens com base na mensagem do commit com um regex "
-"personalizado. Ele pode ser utilizado com a op챌찾o `-m` para ativar os "
-"regexes j찼 predefinidos. Voc챗 deve escapar as barras inclinadas."
+msgstr "Tenta detectar as mesclagens com base na mensagem do commit com um regex personalizado. Ele pode ser utilizado com a op챌찾o `-m` para ativar os regexes j찼 predefinidos. Voc챗 deve escapar as barras inclinadas."
#. type: Plain text
#: en/git-cvsimport.txt:129
@@ -20902,9 +17720,7 @@ msgstr "O regex deve capturar o nome da origem do ramo em $1."
#: en/git-cvsimport.txt:131
#, priority:100
msgid "This option can be used several times to provide several detection regexes."
-msgstr ""
-"Esta op챌찾o pode ser utilizada v찼rias vezes para fornecer v찼rios regexes de "
-"detec챌찾o."
+msgstr "Esta op챌찾o pode ser utilizada v찼rias vezes para fornecer v찼rios regexes de detec챌찾o."
#. type: Labeled list
#: en/git-cvsimport.txt:132
@@ -20962,21 +17778,13 @@ msgstr ""
#: en/git-cvsimport.txt:159
#, priority:100
msgid "'git cvsimport' will make it appear as those authors had their GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. If a time zone is specified, GIT_AUTHOR_DATE will have the corresponding offset applied."
-msgstr ""
-"O `git cvsimport` far찼 com que estes autores apare챌am como se sempre "
-"tivessem as vari찼veis `GIT_AUTHOR_NAME` e `GIT_AUTHOR_EMAIL` corretamente "
-"definidas o tempo todo. Se um fuso hor찼rio for utilizado, a vari찼vel "
-"`GIT_AUTHOR_DATE` ter찼 a corre챌찾o do fuso hor찼rio correspondente devidamente "
-"ajustado."
+msgstr "O `git cvsimport` far찼 com que estes autores apare챌am como se sempre tivessem as vari찼veis `GIT_AUTHOR_NAME` e `GIT_AUTHOR_EMAIL` corretamente definidas o tempo todo. Se um fuso hor찼rio for utilizado, a vari찼vel `GIT_AUTHOR_DATE` ter찼 a corre챌찾o do fuso hor찼rio correspondente devidamente ajustado."
#. type: Plain text
#: en/git-cvsimport.txt:163
#, priority:100
msgid "For convenience, this data is saved to `$GIT_DIR/cvs-authors` each time the '-A' option is provided and read from that same file each time 'git cvsimport' is run."
-msgstr ""
-"Por conveni챗ncia, esses dados s찾o salvos em `$GIT_DIR/cvs-authors` sempre "
-"que a op챌찾o `-A` for utilizada e lidos deste mesmo arquivo sempre que o "
-"comando `git cvsimport` for executado."
+msgstr "Por conveni챗ncia, esses dados s찾o salvos em `$GIT_DIR/cvs-authors` sempre que a op챌찾o `-A` for utilizada e lidos deste mesmo arquivo sempre que o comando `git cvsimport` for executado."
#. type: Plain text
#: en/git-cvsimport.txt:167
@@ -21042,10 +17850,7 @@ msgstr "Problemas relacionados aos registro de data e hora:"
#: en/git-cvsimport.txt:202
#, priority:100
msgid "If timestamps of commits in the CVS repository are not stable enough to be used for ordering commits changes may show up in the wrong order."
-msgstr ""
-"Caso os registro de data e hora dos commits no reposit처rio CVS n찾o forem "
-"est찼veis o suficiente para serem utilizados para ordenar os commits, estes "
-"poder찾o aparecer na ordem errada."
+msgstr "Caso os registro de data e hora dos commits no reposit처rio CVS n찾o forem est찼veis o suficiente para serem utilizados para ordenar os commits, estes poder찾o aparecer na ordem errada."
#. type: Plain text
#: en/git-cvsimport.txt:204
@@ -21235,12 +18040,7 @@ msgstr "Imprima a informa챌찾o de uso e encerre"
#: en/git-cvsserver.txt:58
#, priority:100
msgid "You can specify a list of allowed directories. If no directories are given, all are allowed. This is an additional restriction, gitcvs access still needs to be enabled by the `gitcvs.enabled` config option unless `--export-all` was given, too."
-msgstr ""
-"Voc챗 pode especificar uma lista de diret처rios permitidos. Caso nenhum "
-"diret처rio seja informado, todos ser찾o permitidos. Esta 챕 uma restri챌찾o "
-"adicional, o acesso ao `gitcvs` ainda precisa ser ativado pela op챌찾o da "
-"configura챌찾o do `gitcvs.enabled`, a menos que o `--export=all` tamb챕m tenha "
-"sido utilizado."
+msgstr "Voc챗 pode especificar uma lista de diret처rios permitidos. Caso nenhum diret처rio seja informado, todos ser찾o permitidos. Esta 챕 uma restri챌찾o adicional, o acesso ao `gitcvs` ainda precisa ser ativado pela op챌찾o da configura챌찾o do `gitcvs.enabled`, a menos que o `--export=all` tamb챕m tenha sido utilizado."
#. type: Plain text
#: en/git-cvsserver.txt:64
@@ -21258,9 +18058,7 @@ msgstr "횋 altamente funcional. No entanto, nem todos os m챕todos s찾o implement
#: en/git-cvsserver.txt:71
#, priority:100
msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS plugin. Most functionality works fine with both of these clients."
-msgstr ""
-"O teste foi realizado utilizando o cliente CLI CVS e o plug-in Eclipse CVS. "
-"A maioria das funcionalidades funciona bem com esses dois clientes."
+msgstr "O teste foi realizado utilizando o cliente CLI CVS e o plug-in Eclipse CVS. A maioria das funcionalidades funciona bem com esses dois clientes."
#. type: Title -
#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
@@ -21346,11 +18144,7 @@ msgstr ""
#: en/git-cvsserver.txt:123
#, priority:100
msgid "You can use the 'htpasswd' facility that comes with Apache to make these files, but Apache's MD5 crypt method differs from the one used by most C library's crypt() function, so don't use the -m option."
-msgstr ""
-"Voc챗 pode usar o recurso `htpasswd` que acompanha o Apache para criar estes "
-"arquivos, mas o m챕todo MD5 de criptografia do Apache difere daquele "
-"utilizado pela maioria das fun챌천es `crypt()` da biblioteca C, portanto, n찾o "
-"utilize a op챌찾o `-m`."
+msgstr "Voc챗 pode usar o recurso `htpasswd` que acompanha o Apache para criar estes arquivos, mas o m챕todo MD5 de criptografia do Apache difere daquele utilizado pela maioria das fun챌천es `crypt()` da biblioteca C, portanto, n찾o utilize a op챌찾o `-m`."
#. type: Plain text
#: en/git-cvsserver.txt:125
@@ -21362,9 +18156,7 @@ msgstr "Como alternativa, voc챗 pode produzir a senha com o operador `crypt()` d
#: en/git-cvsserver.txt:127
#, no-wrap, priority:100
msgid " perl -e 'my ($user, $pass) = @ARGV; printf \"%s:%s\\n\", $user, crypt($user, $pass)' $USER password\n"
-msgstr ""
-" perl -e 'my ($user, $pass) = @ARGV; printf \"%s:%s\\n"
-"\", $user, crypt($user, $pass)' $USER password\n"
+msgstr " perl -e 'my ($user, $pass) = @ARGV; printf \"%s:%s\\n\", $user, crypt($user, $pass)' $USER password\n"
#. type: Plain text
#: en/git-cvsserver.txt:130
@@ -21438,11 +18230,7 @@ msgstr "Voc챗 tamb챕m precisa garantir que cada reposit처rio esteja \"nu\" (sem
#: en/git-cvsserver.txt:173
#, priority:100
msgid "All configuration variables can also be overridden for a specific method of access. Valid method names are \"ext\" (for SSH access) and \"pserver\". The following example configuration would disable pserver access while still allowing access over SSH."
-msgstr ""
-"Todas as vari찼veis de configura챌찾o tamb챕m podem ser substitu챠das por um "
-"m챕todo espec챠fico de acesso. Os nomes para os m챕todos v찼lidos s찾o `ext` ("
-"para acesso SSH) e `pserver`. O exemplo da configura챌찾o a seguir "
-"desabilitaria o acesso ao `pserver` enquanto ainda permita o acesso pelo SSH."
+msgstr "Todas as vari찼veis de configura챌찾o tamb챕m podem ser substitu챠das por um m챕todo espec챠fico de acesso. Os nomes para os m챕todos v찼lidos s찾o `ext` (para acesso SSH) e `pserver`. O exemplo da configura챌찾o a seguir desabilitaria o acesso ao `pserver` enquanto ainda permita o acesso pelo SSH."
#. type: delimited block -
#: en/git-cvsserver.txt:176
@@ -21490,14 +18278,7 @@ msgstr "Para clientes SSH que efetuam commits, verifique se os arquivos `.ssh/en
#: en/git-cvsserver.txt:204
#, priority:100
msgid "Clients should now be able to check out the project. Use the CVS 'module' name to indicate what Git 'head' you want to check out. This also sets the name of your newly checked-out directory, unless you tell it otherwise with `-d <dir_name>`. For example, this checks out 'master' branch to the `project-master` directory:"
-msgstr ""
-"Os clientes agora devem conseguir fazer o check-out no projeto. Utilize o "
-"nome do 'module' do CVS para indicar qual 'head' do Git voc챗 deseja fazer o "
-"check-out. Isso tamb챕m define o nome do diret처rio que foi feito o check-out "
-"recentemente, a menos que voc챗 diga o contr찼rio com a op챌찾o `-d`. Por "
-"exemplo, isso faz check-out do ramo 'master' no diret처rio `master do "
-"projeto`: Por exemplo, 챕 verificado o ramo 'master' no diret처rio `project-"
-"master`:"
+msgstr "Os clientes agora devem conseguir fazer o check-out no projeto. Utilize o nome do 'module' do CVS para indicar qual 'head' do Git voc챗 deseja fazer o check-out. Isso tamb챕m define o nome do diret처rio que foi feito o check-out recentemente, a menos que voc챗 diga o contr찼rio com a op챌찾o `-d`. Por exemplo, isso faz check-out do ramo 'master' no diret처rio `master do projeto`: Por exemplo, 챕 verificado o ramo 'master' no diret처rio `project-master`:"
#. type: delimited block -
#: en/git-cvsserver.txt:207
@@ -21521,22 +18302,13 @@ msgstr "O comando `git-cvsserver` utiliza um banco de dados por cabe챌alho Git (
#: en/git-cvsserver.txt:222
#, priority:100
msgid "If the commit is done directly by using `git` (as opposed to using 'git-cvsserver') the update will need to happen on the next repository access by 'git-cvsserver', independent of access method and requested operation."
-msgstr ""
-"Caso o commit seja feito diretamente utilizando o `git` (em vez de usar o "
-"`git-cvsserver`), a atualiza챌찾o precisar찼 ocorrer no pr처ximo acesso ao "
-"reposit처rio pelo `git-cvsserver`, independentemente do m챕todo de acesso e da "
-"opera챌찾o solicitada."
+msgstr "Caso o commit seja feito diretamente utilizando o `git` (em vez de usar o `git-cvsserver`), a atualiza챌찾o precisar찼 ocorrer no pr처ximo acesso ao reposit처rio pelo `git-cvsserver`, independentemente do m챕todo de acesso e da opera챌찾o solicitada."
#. type: Plain text
#: en/git-cvsserver.txt:227
#, priority:100
msgid "That means that even if you offer only read access (e.g. by using the pserver method), 'git-cvsserver' should have write access to the database to work reliably (otherwise you need to make sure that the database is up to date any time 'git-cvsserver' is executed)."
-msgstr ""
-"Isso significa que, mesmo que voc챗 ofere챌a apenas o acesso de leitura ("
-"utilizando o m챕todo `pserver` por exemplo), o comando `git-cvsserver` deve "
-"ter acesso de grava챌찾o ao banco de dados para funcionar de maneira correta ("
-"caso contr찼rio, voc챗 precisa garantir que o banco de dados esteja atualizado "
-"a qualquer momento quando o `git-cvsserver` for executado)."
+msgstr "Isso significa que, mesmo que voc챗 ofere챌a apenas o acesso de leitura (utilizando o m챕todo `pserver` por exemplo), o comando `git-cvsserver` deve ter acesso de grava챌찾o ao banco de dados para funcionar de maneira correta (caso contr찼rio, voc챗 precisa garantir que o banco de dados esteja atualizado a qualquer momento quando o `git-cvsserver` for executado)."
#. type: Plain text
#: en/git-cvsserver.txt:234
@@ -21590,12 +18362,7 @@ msgstr "gitcvs.dbDriver"
#: en/git-cvsserver.txt:272
#, priority:100
msgid "Used DBI driver. You can specify any available driver for this here, but it might not work. cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard this as an experimental feature. May not contain colons (`:`). Default: 'SQLite'"
-msgstr ""
-"Driver DBI utilizado. Voc챗 pode especificar qualquer driver dispon챠vel, mas "
-"pode n찾o funcionar. O `cvsserver` 챕 testado com 'DBD::SQLite', foi informado "
-"que funciona com 'DBD::Pg' mas *n찾o* com 'DBD::mysql'. Considere isso como "
-"um recurso experimental. N찾o pode conter ponto e v챠rgula (`;`). "
-"Predefini챌찾o: 'SQLite'"
+msgstr "Driver DBI utilizado. Voc챗 pode especificar qualquer driver dispon챠vel, mas pode n찾o funcionar. O `cvsserver` 챕 testado com 'DBD::SQLite', foi informado que funciona com 'DBD::Pg' mas *n찾o* com 'DBD::mysql'. Considere isso como um recurso experimental. N찾o pode conter ponto e v챠rgula (`;`). Predefini챌찾o: 'SQLite'"
#. type: Labeled list
#: en/git-cvsserver.txt:273
@@ -21607,10 +18374,7 @@ msgstr "gitcvs.dbuser"
#: en/git-cvsserver.txt:277
#, priority:100
msgid "Database user. Only useful if setting `dbDriver`, since SQLite has no concept of database users. Supports variable substitution (see below)."
-msgstr ""
-"O banco de dados do usu찼rio. 횣til apenas caso o `dbDriver` esteja "
-"configurando, pois o banco de dados SQLite n찾o trabalha com usu찼rios. 횋 "
-"compat챠vel com a substitui챌찾o da vari찼vel (veja abaixo)."
+msgstr "O banco de dados do usu찼rio. 횣til apenas caso o `dbDriver` esteja configurando, pois o banco de dados SQLite n찾o trabalha com usu찼rios. 횋 compat챠vel com a substitui챌찾o da vari찼vel (veja abaixo)."
#. type: Labeled list
#: en/git-cvsserver.txt:278
@@ -21736,9 +18500,7 @@ msgstr "GIT_CVSSERVER_ROOT especifica uma lista branca de diret처rios 첬nicos. O
#: en/git-cvsserver.txt:323
#, priority:100
msgid "When these environment variables are set, the corresponding command-line arguments may not be used."
-msgstr ""
-"Quando essas vari찼veis do ambiente s찾o definidas, os argumentos "
-"correspondentes da linha de comando n찾o podem ser utilizados."
+msgstr "Quando essas vari찼veis do ambiente s찾o definidas, os argumentos correspondentes da linha de comando n찾o podem ser utilizados."
#. type: Title -
#: en/git-cvsserver.txt:325
@@ -21780,13 +18542,7 @@ msgstr "Escolha `HEAD` quando perguntar qual o ramo/tag deve ser verificado. Des
#: en/git-cvsserver.txt:343
#, priority:100
msgid "Protocol notes: If you are using anonymous access via pserver, just select that. Those using SSH access should choose the 'ext' protocol, and configure 'ext' access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to \"`git cvsserver`\". Note that password support is not good when using 'ext', you will definitely want to have SSH keys setup."
-msgstr ""
-"Notas sobre o protocolo: Selecione isso caso esteja utilizando o acesso "
-"an척nimo via pserver. Aqueles que usam o acesso SSH devem escolher o "
-"protocolo 'ext' e configurar o acesso 'ext' no painel \"Prefer챗ncias> "
-"Equipe> CVS> ExtConnection\". Defina o `CVS_SERVER` para \"`git cvsserver`\""
-". Observe que o suporte 횪 senha n찾o 챕 bom quando usar o 'ext'; voc챗 "
-"definitivamente vai preferir usar e ter as chaves SSH configuradas."
+msgstr "Notas sobre o protocolo: Selecione isso caso esteja utilizando o acesso an척nimo via pserver. Aqueles que usam o acesso SSH devem escolher o protocolo 'ext' e configurar o acesso 'ext' no painel \"Prefer챗ncias> Equipe> CVS> ExtConnection\". Defina o `CVS_SERVER` para \"`git cvsserver`\". Observe que o suporte 횪 senha n찾o 챕 bom quando usar o 'ext'; voc챗 definitivamente vai preferir usar e ter as chaves SSH configuradas."
#. type: Plain text
#: en/git-cvsserver.txt:348
@@ -21840,36 +18596,13 @@ msgstr "Todas as opera챌천es necess찼rias para o uso normal s찾o compat챠veis, i
#: en/git-cvsserver.txt:371
#, priority:100
msgid "Most CVS command arguments that read CVS tags or revision numbers (typically -r) work, and also support any git refspec (tag, branch, commit ID, etc). However, CVS revision numbers for non-default branches are not well emulated, and cvs log does not show tags or branches at all. (Non-main-branch CVS revision numbers superficially resemble CVS revision numbers, but they actually encode a git commit ID directly, rather than represent the number of revisions since the branch point.)"
-msgstr ""
-"A maioria dos argumentos dos comandos do CVS que leem as tags CVS ou os "
-"n첬meros da revis찾o (normalmente `-r`) funcionam, e tamb챕m s찾o compat챠veis "
-"com qualquer git \"refspec\" (\"tag\", \"branch\", ID do commit, etc). No "
-"entanto, os n첬meros de revis찾o do CVS para as ramifica챌천es fora do padr찾o "
-"n찾o s찾o bem emuladas e o registro log do cvs n찾o exibe as tags ou quaisquer "
-"ramifica챌천es. (Os n첬meros de revis찾o do CVS que n찾o s찾o do ramo principal "
-"se assemelham superficialmente aos n첬meros da revis찾o do CVS, mas na verdade "
-"codificam um ID do commit diretamente, em vez de representar a quantidade de "
-"revis천es desde o ponto do ramo inicial.)"
+msgstr "A maioria dos argumentos dos comandos do CVS que leem as tags CVS ou os n첬meros da revis찾o (normalmente `-r`) funcionam, e tamb챕m s찾o compat챠veis com qualquer git \"refspec\" (\"tag\", \"branch\", ID do commit, etc). No entanto, os n첬meros de revis찾o do CVS para as ramifica챌천es fora do padr찾o n찾o s찾o bem emuladas e o registro log do cvs n찾o exibe as tags ou quaisquer ramifica챌천es. (Os n첬meros de revis찾o do CVS que n찾o s찾o do ramo principal se assemelham superficialmente aos n첬meros da revis찾o do CVS, mas na verdade codificam um ID do commit diretamente, em vez de representar a quantidade de revis천es desde o ponto do ramo inicial.)"
#. type: Plain text
#: en/git-cvsserver.txt:385
#, priority:100
msgid "Note that there are two ways to checkout a particular branch. As described elsewhere on this page, the \"module\" parameter of cvs checkout is interpreted as a branch name, and it becomes the main branch. It remains the main branch for a given sandbox even if you temporarily make another branch sticky with cvs update -r. Alternatively, the -r argument can indicate some other branch to actually checkout, even though the module is still the \"main\" branch. Tradeoffs (as currently implemented): Each new \"module\" creates a new database on disk with a history for the given module, and after the database is created, operations against that main branch are fast. Or alternatively, -r doesn't take any extra disk space, but may be significantly slower for many operations, like cvs update."
-msgstr ""
-"Observe que existem duas maneiras de fazer check-out de um determinado "
-"ramo. Conforme descrito em outra parte desta p찼gina, o par창metro \"module\" "
-"do \"cvs checkout\" 챕 interpretado como um nome do ramo e se torna o ramo "
-"principal. Ele permanece o ramo principal de uma determinada caixa de "
-"areia, mesmo que voc챗 temporariamente torne outro ramo persistente com o "
-"comando \"cvs update -r\". Como alternativa, o argumento `-r` pode indicar "
-"alguma outra ramifica챌찾o para realmente efetuar o checkout, mesmo que o "
-"m처dulo ainda seja a ramifica챌찾o \"main\" (principal). Dilemas (conforme "
-"implementadas atualmente): Cada novo \"module\" cria um novo banco de dados "
-"em disco com um hist처rico para determinado m처dulo, ap처s a cria챌찾o do banco "
-"de dados, as opera챌천es nesse ramo principal s찾o r찼pidas. Ou, como "
-"alternativa, o argumento `-r` n찾o ocupa espa챌o extra em disco, mas pode ser "
-"significativamente mais lento em muitas opera챌천es, como o comando `cvs "
-"update`."
+msgstr "Observe que existem duas maneiras de fazer check-out de um determinado ramo. Conforme descrito em outra parte desta p찼gina, o par창metro \"module\" do \"cvs checkout\" 챕 interpretado como um nome do ramo e se torna o ramo principal. Ele permanece o ramo principal de uma determinada caixa de areia, mesmo que voc챗 temporariamente torne outro ramo persistente com o comando \"cvs update -r\". Como alternativa, o argumento `-r` pode indicar alguma outra ramifica챌찾o para realmente efetuar o checkout, mesmo que o m처dulo ainda seja a ramifica챌찾o \"main\" (principal). Dilemas (conforme implementadas atualmente): Cada novo \"module\" cria um novo banco de dados em disco com um hist처rico para determinado m처dulo, ap처s a cria챌찾o do banco de dados, as opera챌천es nesse ramo principal s찾o r찼pidas. Ou, como alternativa, o argumento `-r` n찾o ocupa espa챌o extra em disco, mas pode ser significativamente mais lento em muitas opera챌천es, como o comando `cvs update`."
#. type: Plain text
#: en/git-cvsserver.txt:398
@@ -21893,20 +18626,13 @@ msgstr "Convers천es de termino de linha CRLF"
#: en/git-cvsserver.txt:408
#, priority:100
msgid "By default the server leaves the `-k` mode blank for all files, which causes the CVS client to treat them as a text files, subject to end-of-line conversion on some platforms."
-msgstr ""
-"Por predefini챌찾o o servidor deixa o modo `-k` em branco para todos os "
-"arquivos, o que faz com que o cliente CVS os trate como arquivos de texto, "
-"sujeitos 횪 convers찾o da quebra de linha em algumas plataformas."
+msgstr "Por predefini챌찾o o servidor deixa o modo `-k` em branco para todos os arquivos, o que faz com que o cliente CVS os trate como arquivos de texto, sujeitos 횪 convers찾o da quebra de linha em algumas plataformas."
#. type: Plain text
#: en/git-cvsserver.txt:413
#, 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 ""
-"횋 poss챠vel fazer com que o servidor utilize os atributos de quebra de linha "
-"nos arquivos utilizando o modos `-k` ou definindo a vari찼vel de configura챌찾o`"
-" gitcvs.usecrlfattr`. Para mais informa챌천es sobre a convers찾o da quebra de "
-"linha de um arquivo, consulte linkgit:gitattributes[5]."
+msgstr "횋 poss챠vel fazer com que o servidor utilize os atributos de quebra de linha nos arquivos utilizando o modos `-k` ou definindo a vari찼vel de configura챌찾o` gitcvs.usecrlfattr`. Para mais informa챌천es sobre a convers찾o da quebra de linha de um arquivo, consulte linkgit:gitattributes[5]."
#. type: Plain text
#: en/git-cvsserver.txt:422
@@ -21988,13 +18714,7 @@ msgstr "Um daemon TCP Git realmente simples e que normalmente escuta na porta \"
#: en/git-daemon.txt:37
#, priority:100
msgid "It verifies that the directory has the magic file \"git-daemon-export-ok\", and it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the `--export-all` parameter is specified). If you pass some directory paths as 'git daemon' arguments, you can further restrict the offers to a whitelist comprising of those."
-msgstr ""
-"Ele verifica se o diret처rio possui o arquivo m찼gico \"git-daemon-export-ok\" "
-"e se recusar찼 a exportar qualquer diret처rio Git que n찾o tenha sido "
-"explicitamente marcado para exporta챌찾o dessa maneira (a menos que o "
-"par창metro `--export-all` seja utilizado). Caso passe alguns caminhos de "
-"diret처rios como argumentos par ao 'git daemon', 챕 poss챠vel restringir ainda "
-"mais as ofertas a uma lista de permiss천es composta por eles."
+msgstr "Ele verifica se o diret처rio possui o arquivo m찼gico \"git-daemon-export-ok\" e se recusar찼 a exportar qualquer diret처rio Git que n찾o tenha sido explicitamente marcado para exporta챌찾o dessa maneira (a menos que o par창metro `--export-all` seja utilizado). Caso passe alguns caminhos de diret처rios como argumentos par ao 'git daemon', 챕 poss챠vel restringir ainda mais as ofertas a uma lista de permiss천es composta por eles."
#. type: Plain text
#: en/git-daemon.txt:41
@@ -22054,14 +18774,7 @@ msgstr "--interpolated-path=<modelo-de-caminho>"
#: en/git-daemon.txt:77
#, priority:100
msgid "To support virtual hosting, an interpolated path template can be used to dynamically construct alternate paths. The template supports %H for the target hostname as supplied by the client but converted to all lowercase, %CH for the canonical hostname, %IP for the server's IP address, %P for the port number, and %D for the absolute path of the named repository. After interpolation, the path is validated against the directory whitelist."
-msgstr ""
-"Para dar suporte 횪 hospedagem virtual, um modelo de caminho interpolado pode "
-"ser utilizado para construir dinamicamente os caminhos alternativos. O "
-"modelo 챕 compat챠vel com `%H` para o nome de host do destino, informado pelo "
-"cliente, por챕m 챕 convertido min첬sculas, `%CH` para o nome do host can척nico, "
-"`%IP` para o endere챌o IP do servidor, `%P` para o n첬mero da porta e `%D` "
-"para o caminho absoluto do nome do reposit처rio. Ap처s a interpola챌찾o, o "
-"caminho 챕 validado na lista branca de permiss천es do diret처rio."
+msgstr "Para dar suporte 횪 hospedagem virtual, um modelo de caminho interpolado pode ser utilizado para construir dinamicamente os caminhos alternativos. O modelo 챕 compat챠vel com `%H` para o nome de host do destino, informado pelo cliente, por챕m 챕 convertido min첬sculas, `%CH` para o nome do host can척nico, `%IP` para o endere챌o IP do servidor, `%P` para o n첬mero da porta e `%D` para o caminho absoluto do nome do reposit처rio. Ap처s a interpola챌찾o, o caminho 챕 validado na lista branca de permiss천es do diret처rio."
#. type: Plain text
#: en/git-daemon.txt:82
@@ -22175,10 +18888,7 @@ msgstr "stderr"
#: en/git-daemon.txt:129
#, priority:100
msgid "Write to standard error. Note that if `--detach` is specified, the process disconnects from the real standard error, making this destination effectively equivalent to `none`."
-msgstr ""
-"Escreva para erro predefinido. Observe que caso `--detach` seja utilizado, "
-"o processo ser찼 desconectado do erro real predefinido, tornando esse destino "
-"efetivamente equivalente a `none` (nenhum)."
+msgstr "Escreva para erro predefinido. Observe que caso `--detach` seja utilizado, o processo ser찼 desconectado do erro real predefinido, tornando esse destino efetivamente equivalente a `none` (nenhum)."
#. type: Labeled list
#: en/git-daemon.txt:129
@@ -22202,9 +18912,7 @@ msgstr "Desativa todos os registros logs."
#: en/git-daemon.txt:137
#, priority:100
msgid "The default destination is `syslog` if `--inetd` or `--detach` is specified, otherwise `stderr`."
-msgstr ""
-"A predefini챌찾o para o destino 챕 `syslog` caso `--inetd` ou `--detach` seja "
-"utilizado, caso contr찼rio ser찼 o `stderr`."
+msgstr "A predefini챌찾o para o destino 챕 `syslog` caso `--inetd` ou `--detach` seja utilizado, caso contr찼rio ser찼 o `stderr`."
#. type: Labeled list
#: en/git-daemon.txt:138
@@ -22222,13 +18930,7 @@ msgstr "--user-path=<caminho>"
#: en/git-daemon.txt:147
#, priority:100
msgid "Allow {tilde}user notation to be used in requests. When specified with no parameter, requests to git://host/{tilde}alice/foo is taken as a request to access 'foo' repository in the home directory of user `alice`. If `--user-path=path` is specified, the same request is taken as a request to access `path/foo` repository in the home directory of user `alice`."
-msgstr ""
-"Permita que a nota챌찾o do usu찼rio{tilde) seja utilizada nas solicita챌천es. "
-"Quando especificado sem qualquer par창metro, os pedidos para `git://host/"
-"{tilde}alice/foo` s찾o tomados como pedidos para acessar o reposit처rio `foo` "
-"no diret처rio inicial do usu찼rio `alice`. Caso `--user-path=path` seja "
-"utilizado, a mesma solicita챌찾o ser찼 aceita como a de uma solicita챌찾o para "
-"acessar o reposit처rio `path/foo` no diret처rio inicial do usu찼rio `alice`."
+msgstr "Permita que a nota챌찾o do usu찼rio{tilde) seja utilizada nas solicita챌천es. Quando especificado sem qualquer par창metro, os pedidos para `git://host/{tilde}alice/foo` s찾o tomados como pedidos para acessar o reposit처rio `foo` no diret처rio inicial do usu찼rio `alice`. Caso `--user-path=path` seja utilizado, a mesma solicita챌찾o ser찼 aceita como a de uma solicita챌찾o para acessar o reposit처rio `path/foo` no diret처rio inicial do usu찼rio `alice`."
#. type: Plain text
#: en/git-daemon.txt:150
@@ -22246,9 +18948,7 @@ msgstr "--reuseaddr"
#: en/git-daemon.txt:155
#, priority:100
msgid "Use SO_REUSEADDR when binding the listening socket. This allows the server to restart without waiting for old connections to time out."
-msgstr ""
-"Utilize `SO_REUSEADDR` ao ligar o soquete de escuta. Isso permite que o "
-"servidor reinicie sem aguardar o tempo limite das conex천es antigas."
+msgstr "Utilize `SO_REUSEADDR` ao ligar o soquete de escuta. Isso permite que o servidor reinicie sem aguardar o tempo limite das conex천es antigas."
#. type: Plain text
#: en/git-daemon.txt:158
@@ -22284,32 +18984,19 @@ msgstr "--group=<grupo>"
#: en/git-daemon.txt:170
#, priority:100
msgid "Change daemon's uid and gid before entering the service loop. When only `--user` is given without `--group`, the primary group ID for the user is used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)` and numeric IDs are not supported."
-msgstr ""
-"Altere o uid e o gid do daemon antes de entrar no loop de servi챌o. Quando "
-"apenas o `--user` 챕 informado sem o `--group`, o ID do grupo prim찼rio para o "
-"usu찼rio 챕 utilizado. Os valores da op챌찾o s찾o informados para `getpwnam(3)` "
-"e `getgrnam(3)` e os IDs num챕ricos n찾o s찾o compat챠veis."
+msgstr "Altere o uid e o gid do daemon antes de entrar no loop de servi챌o. Quando apenas o `--user` 챕 informado sem o `--group`, o ID do grupo prim찼rio para o usu찼rio 챕 utilizado. Os valores da op챌찾o s찾o informados para `getpwnam(3)` e `getgrnam(3)` e os IDs num챕ricos n찾o s찾o compat챠veis."
#. type: Plain text
#: en/git-daemon.txt:174
#, priority:100
msgid "Giving these options is an error when used with `--inetd`; use the facility of inet daemon to achieve the same before spawning 'git daemon' if needed."
-msgstr ""
-"Usar estas op챌천es 챕 um erro quando utilizado em conjunto com `--inetd`; "
-"utilize o recurso do inet daemon para obter o mesmo efeito antes de gerar o "
-"'git daemon', caso seja necess찼rio."
+msgstr "Usar estas op챌천es 챕 um erro quando utilizado em conjunto com `--inetd`; utilize o recurso do inet daemon para obter o mesmo efeito antes de gerar o 'git daemon', caso seja necess찼rio."
#. type: Plain text
#: en/git-daemon.txt:181
#, priority:100
msgid "Like many programs that switch user id, the daemon does not reset environment variables such as `$HOME` when it runs git programs, e.g. `upload-pack` and `receive-pack`. When using this option, you may also want to set and export `HOME` to point at the home directory of `<user>` before starting the daemon, and make sure any Git configuration files in that directory are readable by `<user>`."
-msgstr ""
-"Como muitos programas que alternam o ID do usu찼rio, o daemon n찾o redefine as "
-"vari찼veis de ambiente como `$ HOME` quando executa programas como o git, por "
-"exemplo, o `upload-pack` e `receive-pack`. Ao usar esta op챌찾o, voc챗 tamb챕m "
-"pode definir e exportar `HOME` para apontar para o diret처rio inicial do "
-"`<usu찼rio>` antes de iniciar o daemon e verifique se todos os arquivos da "
-"configura챌찾o do Git nesse diret처rio s찾o leg챠veis pelo `<usu찼rio>`."
+msgstr "Como muitos programas que alternam o ID do usu찼rio, o daemon n찾o redefine as vari찼veis de ambiente como `$ HOME` quando executa programas como o git, por exemplo, o `upload-pack` e `receive-pack`. Ao usar esta op챌찾o, voc챗 tamb챕m pode definir e exportar `HOME` para apontar para o diret처rio inicial do `<usu찼rio>` antes de iniciar o daemon e verifique se todos os arquivos da configura챌찾o do Git nesse diret처rio s찾o leg챠veis pelo `<usu찼rio>`."
#. type: Labeled list
#: en/git-daemon.txt:182
@@ -22381,10 +19068,7 @@ msgstr "O comando externo pode, opcionalmente, gravar uma 첬nica linha em sua sa
#: en/git-daemon.txt:224
#, priority:100
msgid "A directory to add to the whitelist of allowed directories. Unless --strict-paths is specified this will also include subdirectories of each named directory."
-msgstr ""
-"Um diret처rio a ser adicionado 횪 lista branca dos diret처rios permitidos. A "
-"menos que `--strict-paths` seja especificado, isso tamb챕m incluir찼 "
-"subdiret처rios de cada diret처rio informado."
+msgstr "Um diret처rio a ser adicionado 횪 lista branca dos diret처rios permitidos. A menos que `--strict-paths` seja especificado, isso tamb챕m incluir찼 subdiret처rios de cada diret처rio informado."
#. type: Title -
#: en/git-daemon.txt:226 en/git-http-backend.txt:33
@@ -22396,12 +19080,7 @@ msgstr "SERVI횉OS"
#: en/git-daemon.txt:234
#, priority:100
msgid "These services can be globally enabled/disabled using the command-line options of this command. If finer-grained control is desired (e.g. to allow 'git archive' to be run against only in a few selected repositories the daemon serves), the per-repository configuration file can be used to enable or disable them."
-msgstr ""
-"Estes servi챌os podem ser ativados ou n찾o globalmente utilizando as op챌천es da "
-"linha de comando deste comando. Caso um controle mais refinado seja "
-"necess찼rio (para permitir que o 'git archive' seja executado apenas em "
-"alguns reposit처rios selecionados que o daemon serve por exemplo), o arquivo "
-"da configura챌찾o por reposit처rio pode ser utilizado para ativ찼-los ou n찾o."
+msgstr "Estes servi챌os podem ser ativados ou n찾o globalmente utilizando as op챌천es da linha de comando deste comando. Caso um controle mais refinado seja necess찼rio (para permitir que o 'git archive' seja executado apenas em alguns reposit처rios selecionados que o daemon serve por exemplo), o arquivo da configura챌찾o por reposit처rio pode ser utilizado para ativ찼-los ou n찾o."
#. type: Labeled list
#: en/git-daemon.txt:235
@@ -22413,10 +19092,7 @@ msgstr "upload-pack"
#: en/git-daemon.txt:240
#, priority:100
msgid "This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by default, but a repository can disable it by setting `daemon.uploadpack` configuration item to `false`."
-msgstr ""
-"Isso serve aos clientes 'git fetch-pack' e 'git ls-remote'. A predefini챌찾o "
-"챕 estar sempre ativo, por챕m um reposit처rio pode desativ찼-lo definindo o item "
-"da configura챌찾o `daemon.uploadpack` como `false`."
+msgstr "Isso serve aos clientes 'git fetch-pack' e 'git ls-remote'. A predefini챌찾o 챕 estar sempre ativo, por챕m um reposit처rio pode desativ찼-lo definindo o item da configura챌찾o `daemon.uploadpack` como `false`."
#. type: Labeled list
#: en/git-daemon.txt:241
@@ -22428,10 +19104,7 @@ msgstr "upload-archive"
#: en/git-daemon.txt:245
#, priority:100
msgid "This serves 'git archive --remote'. It is disabled by default, but a repository can enable it by setting `daemon.uploadarch` configuration item to `true`."
-msgstr ""
-"Isso serve ao 'git archive --remote'. A predefini챌찾o 챕 estar desativado, "
-"por챕m um reposit처rio pode ativ찼-lo definindo o item da configura챌찾o `daemon."
-"uploadarch` como `true`."
+msgstr "Isso serve ao 'git archive --remote'. A predefini챌찾o 챕 estar desativado, por챕m um reposit처rio pode ativ찼-lo definindo o item da configura챌찾o `daemon.uploadarch` como `true`."
#. type: Labeled list
#: en/git-daemon.txt:246
@@ -22443,14 +19116,7 @@ msgstr "receive-pack"
#: en/git-daemon.txt:255
#, priority:100
msgid "This serves 'git send-pack' clients, allowing anonymous push. It is disabled by default, as there is _no_ authentication in the protocol (in other words, anybody can push anything into the repository, including removal of refs). This is solely meant for a closed LAN setting where everybody is friendly. This service can be enabled by setting `daemon.receivepack` configuration item to `true`."
-msgstr ""
-"Serve aos clientes 'git send-pack, permitindo um impulsionamento (push) "
-"an척nimo. A predefini챌찾o 챕 estar desativado, pois n찾o h찼 autentica챌찾o no "
-"protocolo (em outras palavras, qualquer pessoa pode enviar algo para o "
-"reposit처rio, incluindo fazer a remo챌찾o de refer챗ncias). Isso serve apenas "
-"para uma configura챌찾o LAN fechada, onde todos s찾o amig찼veis. Este servi챌o "
-"pode ser ativado definindo o item da configura챌찾o `daemon.receivepack` como "
-"`true`."
+msgstr "Serve aos clientes 'git send-pack, permitindo um impulsionamento (push) an척nimo. A predefini챌찾o 챕 estar desativado, pois n찾o h찼 autentica챌찾o no protocolo (em outras palavras, qualquer pessoa pode enviar algo para o reposit처rio, incluindo fazer a remo챌찾o de refer챗ncias). Isso serve apenas para uma configura챌찾o LAN fechada, onde todos s찾o amig찼veis. Este servi챌o pode ser ativado definindo o item da configura챌찾o `daemon.receivepack` como `true`."
#. type: Labeled list
#: en/git-daemon.txt:258
@@ -22570,10 +19236,7 @@ msgstr "ativar ou desativar seletivamente os servi챌os por reposit처rio"
#: en/git-daemon.txt:323
#, priority:100
msgid "To enable 'git archive --remote' and disable 'git fetch' against a repository, have the following in the configuration file in the repository (that is the file 'config' next to `HEAD`, 'refs' and 'objects')."
-msgstr ""
-"Para ativar fa챌a `git archive --remote` e desative o `git fetch` em um "
-"reposit처rio, fa챌a o seguinte no arquivo de configura챌찾o no reposit처rio (que "
-"챕 o arquivo 'config' pr처ximo ao `HEAD`, 'refs' e 'objects ')."
+msgstr "Para ativar fa챌a `git archive --remote` e desative o `git fetch` em um reposit처rio, fa챌a o seguinte no arquivo de configura챌찾o no reposit처rio (que 챕 o arquivo 'config' pr처ximo ao `HEAD`, 'refs' e 'objects ')."
#. type: delimited block -
#: en/git-daemon.txt:328
@@ -22621,23 +19284,13 @@ msgstr ""
#: en/git-describe.txt:24
#, priority:260
msgid "The command finds the most recent tag that is reachable from a commit. If the tag points to the commit, then only the tag is shown. Otherwise, it suffixes the tag name with the number of additional commits on top of the tagged object and the abbreviated object name of the most recent commit. The result is a \"human-readable\" object name which can also be used to identify the commit to other git commands."
-msgstr ""
-"O comando localiza a tag mais recente que seja alcan챌찼vel a partir de um "
-"commit. Caso a tag aponte para o commit, somente a tag ser찼 exibida. Caso "
-"contr찼rio, 챕 adicionado um sufixo ao nome da tag com a quantidade adicionais "
-"de commits na parte superior do objeto marcado e o nome abreviado do objeto "
-"commit mais recente. O resultado 챕 um nome do objeto que 챕 \"leg챠vel para "
-"humanos\" que tamb챕m pode ser utilizado para identificar o commit para "
-"outros comandos do git."
+msgstr "O comando localiza a tag mais recente que seja alcan챌찼vel a partir de um commit. Caso a tag aponte para o commit, somente a tag ser찼 exibida. Caso contr찼rio, 챕 adicionado um sufixo ao nome da tag com a quantidade adicionais de commits na parte superior do objeto marcado e o nome abreviado do objeto commit mais recente. O resultado 챕 um nome do objeto que 챕 \"leg챠vel para humanos\" que tamb챕m pode ser utilizado para identificar o commit para outros comandos do git."
#. type: Plain text
#: en/git-describe.txt:28
#, priority:260
msgid "By default (without --all or --tags) `git describe` only shows annotated tags. For more information about creating annotated tags see the -a and -s options to linkgit:git-tag[1]."
-msgstr ""
-"횋 predefinido que o comando `git description` exiba apenas as tags com "
-"anota챌천es (sem --all ou --tags). Para mais informa챌천es sobre a cria챌찾o das "
-"anota챌천es das tags, consulte as op챌천es `-a` e `-s` em linkgit:git-tag[1]."
+msgstr "횋 predefinido que o comando `git description` exiba apenas as tags com anota챌천es (sem --all ou --tags). Para mais informa챌천es sobre a cria챌찾o das anota챌천es das tags, consulte as op챌천es `-a` e `-s` em linkgit:git-tag[1]."
#. type: Plain text
#: en/git-describe.txt:34
@@ -22655,9 +19308,7 @@ msgstr "<commit-ish>..."
#: en/git-describe.txt:39
#, priority:260
msgid "Commit-ish object names to describe. Defaults to HEAD if omitted."
-msgstr ""
-"Descrevendo os nomes dos objetos commit. Se omitido, a predefini챌찾o 챕 que "
-"`HEAD` seja utilizado."
+msgstr "Descrevendo os nomes dos objetos commit. Se omitido, a predefini챌찾o 챕 que `HEAD` seja utilizado."
#. type: Labeled list
#: en/git-describe.txt:40
@@ -22675,32 +19326,19 @@ msgstr "--broken[=<mark>]"
#: en/git-describe.txt:49
#, priority:260
msgid "Describe the state of the working tree. When the working tree matches HEAD, the output is the same as \"git describe HEAD\". If the working tree has local modification \"-dirty\" is appended to it. If a repository is corrupt and Git cannot determine if there is local modification, Git will error out, unless `--broken' is given, which appends the suffix \"-broken\" instead."
-msgstr ""
-"Descreve a condi챌찾o da 찼rvore de trabalho. Quando a 찼rvore de trabalho "
-"corresponder a um `HEAD`, a sa챠da 챕 a mesma que `git describe HEAD`. Caso a "
-"찼rvore de trabalho tenha sido modificada localmente, um \"-dirty\" ser찼 "
-"anexado a ela. Caso um reposit처rio tenha sido corrompido e o Git n찾o puder "
-"determinar se h찼 uma modifica챌찾o local, o Git exibir찼 uma mensagem de erro, "
-"a menos que a op챌찾o `--broken` seja utilizada."
+msgstr "Descreve a condi챌찾o da 찼rvore de trabalho. Quando a 찼rvore de trabalho corresponder a um `HEAD`, a sa챠da 챕 a mesma que `git describe HEAD`. Caso a 찼rvore de trabalho tenha sido modificada localmente, um \"-dirty\" ser찼 anexado a ela. Caso um reposit처rio tenha sido corrompido e o Git n찾o puder determinar se h찼 uma modifica챌찾o local, o Git exibir찼 uma mensagem de erro, a menos que a op챌찾o `--broken` seja utilizada."
#. type: Plain text
#: en/git-describe.txt:54
#, priority:260
msgid "Instead of using only the annotated tags, use any ref found in `refs/` namespace. This option enables matching any known branch, remote-tracking branch, or lightweight tag."
-msgstr ""
-"Em vez de usar apenas as anota챌천es das tags, utilize qualquer \"ref\" "
-"encontrada no espa챌o de nomes `refs/`. Essa op챌찾o permite fazer a "
-"coincid챗ncia com qualquer ramifica챌찾o que seja conhecida, rastreamento "
-"remoto do ramo ou uma tag \"lightweight\"."
+msgstr "Em vez de usar apenas as anota챌천es das tags, utilize qualquer \"ref\" encontrada no espa챌o de nomes `refs/`. Essa op챌찾o permite fazer a coincid챗ncia com qualquer ramifica챌찾o que seja conhecida, rastreamento remoto do ramo ou uma tag \"lightweight\"."
#. type: Plain text
#: en/git-describe.txt:59
#, priority:260
msgid "Instead of using only the annotated tags, use any tag found in `refs/tags` namespace. This option enables matching a lightweight (non-annotated) tag."
-msgstr ""
-"Em vez de usar apenas as anota챌천es das tags, utilize qualquer tag que for "
-"encontrada no `namespace` `refs/tags`. Essa op챌찾o permite fazer a "
-"coincid챗ncia com uma tag \"lightweight\" (n찾o anotada)."
+msgstr "Em vez de usar apenas as anota챌천es das tags, utilize qualquer tag que for encontrada no `namespace` `refs/tags`. Essa op챌찾o permite fazer a coincid챗ncia com uma tag \"lightweight\" (n찾o anotada)."
#. type: Labeled list
#: en/git-describe.txt:60
@@ -22718,11 +19356,7 @@ msgstr "Em vez de encontrar a tag que anteceda um commit, localize a tag que vem
#: 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 ""
-"Em vez de usar os 7 d챠gitos hexadecimais predefinidos como o nome abreviado "
-"do objeto, utilize `<n>` d챠gitos ou quantos d챠gitos forem necess찼rios para "
-"formar um nome do objeto que seja 첬nico. Um `<n>` que seja 0, suprime o "
-"formato longo exibindo apenas a tag mais pr처xima."
+msgstr "Em vez de usar os 7 d챠gitos hexadecimais predefinidos como o nome abreviado do objeto, utilize `<n>` d챠gitos ou quantos d챠gitos forem necess찼rios para formar um nome do objeto que seja 첬nico. Um `<n>` que seja 0, suprime o formato longo exibindo apenas a tag mais pr처xima."
#. type: Labeled list
#: en/git-describe.txt:71
@@ -22734,12 +19368,7 @@ msgstr "--candidates=<n>"
#: en/git-describe.txt:77
#, priority:260
msgid "Instead of considering only the 10 most recent tags as candidates to describe the input commit-ish consider up to <n> candidates. Increasing <n> above 10 will take slightly longer but may produce a more accurate result. An <n> of 0 will cause only exact matches to be output."
-msgstr ""
-"Em vez de considerar apenas as 10 tags mais recentes como candidatas para "
-"descrever o commit de entrada, considere at챕 `<n>` candidatos. Aumentando "
-"`<n>` para acima de 10 haver찼 um consumo um pouco maior de tempo, no "
-"entanto, poder찼 produzir um resultado mais preciso. Um `<n>` que seja 0 "
-"far찼 com que apenas as coincid챗ncias exatas sejam exibidas."
+msgstr "Em vez de considerar apenas as 10 tags mais recentes como candidatas para descrever o commit de entrada, considere at챕 `<n>` candidatos. Aumentando `<n>` para acima de 10 haver찼 um consumo um pouco maior de tempo, no entanto, poder찼 produzir um resultado mais preciso. Um `<n>` que seja 0 far찼 com que apenas as coincid챗ncias exatas sejam exibidas."
#. type: Labeled list
#: en/git-describe.txt:78
@@ -22763,10 +19392,7 @@ msgstr "--debug"
#: en/git-describe.txt:86
#, priority:260
msgid "Verbosely display information about the searching strategy being employed to standard error. The tag name will still be printed to standard out."
-msgstr ""
-"Exibe de forma detalhada as informa챌천es sobre a estrat챕gia de pesquisa que "
-"est찼 sendo empregada para o erro predefinido. predefinida. O nome da tag "
-"ainda ser찼 impresso para a sa챠da."
+msgstr "Exibe de forma detalhada as informa챌천es sobre a estrat챕gia de pesquisa que est찼 sendo empregada para o erro predefinido. predefinida. O nome da tag ainda ser찼 impresso para a sa챠da."
#. type: Plain text
#: en/git-describe.txt:95
@@ -22784,15 +19410,7 @@ msgstr "--match <pattern>"
#: en/git-describe.txt:105
#, priority:260
msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers 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 considered. Use `--no-match` to clear and reset the list of patterns."
-msgstr ""
-"Considere apenas as tags que coincidam ao padr찾o `glob (7)`, excluindo o "
-"prefixo \"refs/tags/\". Se utilizado com `--all`, tamb챕m considera as "
-"ramifica챌천es locais e as refer챗ncias do rastreamento remoto coincidentes ao "
-"padr찾o, excluindo respectivamente o prefixo \"refs/heads/\" e \"refs/remotes/"
-"\"; as refer챗ncias de outros tipos nunca s찾o consideradas. Caso seja "
-"utilizado v찼rias vezes, uma lista de padr천es ser찼 acumulada e as tags que "
-"coincidam a qualquer um dos padr천es ser찾o consideradas. Utilize `--no-match`"
-" para limpar e redefinir a lista dos padr천es."
+msgstr "Considere apenas as tags que coincidam ao padr찾o `glob (7)`, excluindo o prefixo \"refs/tags/\". Se utilizado com `--all`, tamb챕m considera as ramifica챌천es locais e as refer챗ncias do rastreamento remoto coincidentes ao padr찾o, excluindo respectivamente o prefixo \"refs/heads/\" e \"refs/remotes/\"; as refer챗ncias de outros tipos nunca s찾o consideradas. Caso seja utilizado v찼rias vezes, uma lista de padr천es ser찼 acumulada e as tags que coincidam a qualquer um dos padr천es ser찾o consideradas. Utilize `--no-match` para limpar e redefinir a lista dos padr천es."
#. type: Labeled list
#: en/git-describe.txt:106
@@ -22804,17 +19422,7 @@ msgstr "--exclude <pattern>"
#: 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 ""
-"N찾o considere as tags que coincidam com padr찾o `glob (7)`, excluindo o "
-"prefixo \"refs/tags/\". Se utilizado com `--all`, tamb챕m n찾o considera as "
-"ramifica챌천es locais e as refer챗ncias do rastreamento remoto coincidentes ao "
-"padr찾o, excluindo respectivamente o prefixo \"refs/heads/\" e \"refs/remotes/"
-"\"; as refer챗ncias de outros tipos nunca s찾o consideradas. Caso seja "
-"utilizado v찼rias vezes, uma lista de padr천es ser찼 acumulada e as tags que "
-"coincidam a qualquer um dos padr천es ser찾o exclu챠das. Quando combinada com "
-"`--match`, uma tag ser찼 considerada quando coincidir a pelo menos um padr찾o "
-"`--match` e n찾o corresponder a nenhum dos padr천es `--exclude`. Utilize `--no-"
-"exclude` para limpar e redefinir a lista dos padr천es."
+msgstr "N찾o considere as tags que coincidam com padr찾o `glob (7)`, excluindo o prefixo \"refs/tags/\". Se utilizado com `--all`, tamb챕m n찾o considera as ramifica챌천es locais e as refer챗ncias do rastreamento remoto coincidentes ao padr찾o, excluindo respectivamente o prefixo \"refs/heads/\" e \"refs/remotes/\"; as refer챗ncias de outros tipos nunca s찾o consideradas. Caso seja utilizado v찼rias vezes, uma lista de padr천es ser찼 acumulada e as tags que coincidam a qualquer um dos padr천es ser찾o exclu챠das. Quando combinada com `--match`, uma tag ser찼 considerada quando coincidir a pelo menos um padr찾o `--match` e n찾o corresponder a nenhum dos padr천es `--exclude`. Utilize `--no-exclude` para limpar e redefinir a lista dos padr천es."
#. type: Labeled list
#: en/git-describe.txt:118 en/git-diff-tree.txt:115 en/git-name-rev.txt:61
@@ -22826,8 +19434,7 @@ msgstr "--always"
#: en/git-describe.txt:120 en/git-name-rev.txt:63
#, priority:260
msgid "Show uniquely abbreviated commit object as fallback."
-msgstr ""
-"Exiba o objeto commit abreviado exclusivamente como \"fallback\" (retirada)."
+msgstr "Exiba o objeto commit abreviado exclusivamente como \"fallback\" (retirada)."
#. type: Labeled list
#: en/git-describe.txt:121 en/rev-list-options.txt:124
@@ -22839,10 +19446,7 @@ msgstr "--first-parent"
#: en/git-describe.txt:125
#, priority:260
msgid "Follow only the first parent commit upon seeing a merge commit. This is useful when you wish to not match tags on branches merged in the history of the target commit."
-msgstr ""
-"Siga apenas o primeiro commit da origem ao ver um commit de mesclagem. Isso "
-"챕 첬til quando voc챗 quer que as tags n찾o coincidam nos ramos mesclados do "
-"hist처rico do commit de destino."
+msgstr "Siga apenas o primeiro commit da origem ao ver um commit de mesclagem. Isso 챕 첬til quando voc챗 quer que as tags n찾o coincidam nos ramos mesclados do hist처rico do commit de destino."
#. type: Plain text
#: en/git-describe.txt:130
@@ -22864,24 +19468,13 @@ msgstr ""
#: en/git-describe.txt:139
#, priority:260
msgid "i.e. the current head of my \"parent\" branch is based on v1.0.4, but since it has a few commits on top of that, describe has added the number of additional commits (\"14\") and an abbreviated object name for the commit itself (\"2414721\") at the end."
-msgstr ""
-"ou seja, o cabe챌alho atual do meu ramo \"original\" tem base na vers찾o `v1.0."
-"4`, mas como ele tem alguns commits a mais, o description adicionou a "
-"quantidade de commits adicionais (\"14\") e um nome do objeto abreviado para "
-"o pr처prio commit (\"2414721\") no final."
+msgstr "ou seja, o cabe챌alho atual do meu ramo \"original\" tem base na vers찾o `v1.0.4`, mas como ele tem alguns commits a mais, o description adicionou a quantidade de commits adicionais (\"14\") e um nome do objeto abreviado para o pr처prio commit (\"2414721\") no final."
#. type: Plain text
#: en/git-describe.txt:147
#, priority:260
msgid "The number of additional commits is the number of commits which would be displayed by \"git log v1.0.4..parent\". The hash suffix is \"-g\" + unambiguous abbreviation for the tip commit of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The \"g\" prefix stands for \"git\" and is used to allow describing the version of a software depending on the SCM the software is managed with. This is useful in an environment where people may use different SCMs."
-msgstr ""
-"A quantidade de commits adicionais 챕 a quantidade de commits que seriam "
-"exibidas com \"git log v1.0.4..parent\". O sufixo hash 챕 \"-g\" + "
-"abrevia챌찾o inequ챠voca para o commit como uma dica da origem (que era "
-"`2414721b194453f058079d897d13c4e377f92dc6`). O prefixo \"g\" significa \"git"
-"\" e 챕 utilizado para permitir a descri챌찾o da vers찾o de um software, "
-"dependendo do SCM com o qual o software 챕 gerenciado. Isso 챕 첬til em um "
-"ambiente onde as pessoas podem usar diferentes SCMs."
+msgstr "A quantidade de commits adicionais 챕 a quantidade de commits que seriam exibidas com \"git log v1.0.4..parent\". O sufixo hash 챕 \"-g\" + abrevia챌찾o inequ챠voca para o commit como uma dica da origem (que era `2414721b194453f058079d897d13c4e377f92dc6`). O prefixo \"g\" significa \"git\" e 챕 utilizado para permitir a descri챌찾o da vers찾o de um software, dependendo do SCM com o qual o software 챕 gerenciado. Isso 챕 첬til em um ambiente onde as pessoas podem usar diferentes SCMs."
#. type: Plain text
#: en/git-describe.txt:149
@@ -22903,9 +19496,7 @@ msgstr ""
#: en/git-describe.txt:155
#, priority:260
msgid "With --all, the command can use branch heads as references, so the output shows the reference path as well:"
-msgstr ""
-"Com a op챌찾o `--all`, o comando pode utilizar os `heads` (cabe챌alhos) do ramo "
-"como refer챗ncia, portanto a sa챠da exibe tamb챕m o caminho de refer챗ncia:"
+msgstr "Com a op챌찾o `--all`, o comando pode utilizar os `heads` (cabe챌alhos) do ramo como refer챗ncia, portanto a sa챠da exibe tamb챕m o caminho de refer챗ncia:"
#. type: Plain text
#: en/git-describe.txt:158
@@ -22931,9 +19522,7 @@ msgstr ""
#: en/git-describe.txt:164
#, priority:260
msgid "With --abbrev set to 0, the command can be used to find the closest tagname without any suffix:"
-msgstr ""
-"Com a op챌찾o `--abbrev` definido como 0, o comando pode ser utilizado para "
-"encontrar o nome da tag mais pr처ximo sem nenhum sufixo:"
+msgstr "Com a op챌찾o `--abbrev` definido como 0, o comando pode ser utilizado para encontrar o nome da tag mais pr처ximo sem nenhum sufixo:"
#. type: Plain text
#: en/git-describe.txt:167
@@ -22967,13 +19556,7 @@ msgstr "Para cada \"commit-ish\" usado, o comando `git description` procurar찼 p
#: en/git-describe.txt:190
#, priority:260
msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged. The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
-msgstr ""
-"Caso nenhuma correspond챗ncia exata tenha sido encontrada, o comando `git "
-"description` retornar찼 ao hist처rico do commit para localizar um commit mais "
-"antigo que foi marcado. O tag do commit mais antigo ser찼 gerado juntamente "
-"com uma abrevia챌찾o do SHA-1 do \"commit-ish\" de entrada. Caso a op챌찾o "
-"`--first-parent` seja utilizada, ent찾o o passo a ser considerado ser찼 apenas "
-"a primeira origem de cada commit."
+msgstr "Caso nenhuma correspond챗ncia exata tenha sido encontrada, o comando `git description` retornar찼 ao hist처rico do commit para localizar um commit mais antigo que foi marcado. O tag do commit mais antigo ser찼 gerado juntamente com uma abrevia챌찾o do SHA-1 do \"commit-ish\" de entrada. Caso a op챌찾o `--first-parent` seja utilizada, ent찾o o passo a ser considerado ser찼 apenas a primeira origem de cada commit."
#. type: Plain text
#: en/git-describe.txt:196
@@ -23009,11 +19592,7 @@ msgstr "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<ca
#: en/git-diff-files.txt:20
#, priority:100
msgid "Compares the files in the working tree and the index. When paths are specified, compares only those named paths. Otherwise all entries in the index are compared. The output format is the same as for 'git diff-index' and 'git diff-tree'."
-msgstr ""
-"Compara os arquivos na 찼rvore de trabalho e no 챠ndice. Quando os caminhos "
-"s찾o utilizados, compara apenas os caminhos informados. Caso contr찼rio, "
-"todas as entradas no 챠ndice ser찾o comparadas. O formato de sa챠da 챕 o mesmo "
-"que para `git diff-index` e `git diff-tree`."
+msgstr "Compara os arquivos na 찼rvore de trabalho e no 챠ndice. Quando os caminhos s찾o utilizados, compara apenas os caminhos informados. Caso contr찼rio, todas as entradas no 챠ndice ser찾o comparadas. O formato de sa챠da 챕 o mesmo que para `git diff-index` e `git diff-tree`."
#. type: Labeled list
#: en/git-diff-files.txt:25 en/git-diff.txt:100
@@ -23043,14 +19622,10 @@ msgstr "O \"diff\" contra a vers찾o na \"base\", a \"nossa ramifica챌찾o\" ou \"
#: en/git-diff-files.txt:36
#, priority:100
msgid "The default is to diff against our branch (-2) and the cleanly resolved paths. The option -0 can be given to omit diff output for unmerged entries and just show \"Unmerged\"."
-msgstr ""
-"횋 predefinido fazer o \"diff\" contra a nossa ramifica챌찾o (-2) e os caminhos "
-"resolvidos de maneira limpa. A op챌찾o `-0` pode ser utilizada para omitir a "
-"sa챠da do \"diff\" para as entradas que n찾o tenham sido mescladas e exibir "
-"apenas os \"N찾o mesclados\"."
+msgstr "횋 predefinido fazer o \"diff\" contra a nossa ramifica챌찾o (-2) e os caminhos resolvidos de maneira limpa. A op챌찾o `-0` pode ser utilizada para omitir a sa챠da do \"diff\" para as entradas que n찾o tenham sido mescladas e exibir apenas os \"N찾o mesclados\"."
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -23119,11 +19694,7 @@ msgstr "MODOS DE OPERA횉횄O"
#: en/git-diff-index.txt:46
#, priority:100
msgid "You can choose whether you want to trust the index file entirely (using the `--cached` flag) or ask the diff logic to show any files that don't match the stat state as being \"tentatively changed\". Both of these operations are very useful indeed."
-msgstr ""
-"Voc챗 pode escolher se deseja confiar inteiramente no arquivo do 챠ndice ("
-"utilizando o sinalizador `--cached`) ou pedir 횪 l처gica \"diff\" para exibir "
-"todos os arquivos que n찾o coincidam a condi챌찾o de \"provisoriamente "
-"alterado\". Ambas as opera챌천es s찾o realmente muito 첬teis."
+msgstr "Voc챗 pode escolher se deseja confiar inteiramente no arquivo do 챠ndice (utilizando o sinalizador `--cached`) ou pedir 횪 l처gica \"diff\" para exibir todos os arquivos que n찾o coincidam a condi챌찾o de \"provisoriamente alterado\". Ambas as opera챌천es s찾o realmente muito 첬teis."
#. type: Title -
#: en/git-diff-index.txt:48
@@ -23163,11 +19734,7 @@ msgstr "\tgit diff-index --cached HEAD\n"
#: en/git-diff-index.txt:65
#, priority:100
msgid "Example: let's say I had renamed `commit.c` to `git-commit.c`, and I had done an `update-index` to make that effective in the index file. `git diff-files` wouldn't show anything at all, since the index file matches my working directory. But doing a 'git diff-index' does:"
-msgstr ""
-"Digamos que eu renomeei o arquivo `commit.c` para `git-commit.c` por exemplo "
-"e fiz um `update-index` para torn찼-lo efetivo no arquivo do 챠ndice. O `git "
-"diff-files` n찾o exibiria nada, pois o arquivo do 챠ndice coincide com o meu "
-"diret처rio de trabalho. Por챕m ao fazer um 'git diff-index':"
+msgstr "Digamos que eu renomeei o arquivo `commit.c` para `git-commit.c` por exemplo e fiz um `update-index` para torn찼-lo efetivo no arquivo do 챠ndice. O `git diff-files` n찾o exibiria nada, pois o arquivo do 챠ndice coincide com o meu diret처rio de trabalho. Por챕m ao fazer um 'git diff-index':"
#. type: Plain text
#: en/git-diff-index.txt:69
@@ -23231,12 +19798,7 @@ msgstr "o que obviamente tamb챕m 챕 uma pergunta muito 첬til, pois isso indica q
#: en/git-diff-index.txt:99
#, priority:100
msgid "The twist is that if some file doesn't match the index, we don't have a backing store thing for it, and we use the magic \"all-zero\" sha1 to show that. So let's say that you have edited `kernel/sched.c`, but have not actually done a 'git update-index' on it yet - there is no \"object\" associated with the new state, and you get:"
-msgstr ""
-"A desvantagem 챕 que, caso algum arquivo n찾o coincida com o 챠ndice, n처s n찾o "
-"temos uma uma estrutura de armazenamento para tanto e utilizamos a m찼gica do "
-"sha1 \"zerado\" para exibi-los. Ent찾o, digamos que voc챗 editou o arquivo `"
-"kernel/sched.c`, mas ainda n찾o fez um `git update-index` nele - ainda n찾o h찼 "
-"um \"objeto\" associado a nova condi챌찾o obtendo:"
+msgstr "A desvantagem 챕 que, caso algum arquivo n찾o coincida com o 챠ndice, n처s n찾o temos uma uma estrutura de armazenamento para tanto e utilizamos a m찼gica do sha1 \"zerado\" para exibi-los. Ent찾o, digamos que voc챗 editou o arquivo `kernel/sched.c`, mas ainda n찾o fez um `git update-index` nele - ainda n찾o h찼 um \"objeto\" associado a nova condi챌찾o obtendo:"
#. type: Plain text
#: en/git-diff-index.txt:102
@@ -23252,11 +19814,7 @@ msgstr ""
#: en/git-diff-index.txt:107
#, priority:100
msgid "i.e., it shows that the tree has changed, and that `kernel/sched.c` is not up to date and may contain new stuff. The all-zero sha1 means that to get the real diff, you need to look at the object in the working directory directly rather than do an object-to-object diff."
-msgstr ""
-"isto 챕, exiba que a 찼rvore mudou, que o `kernel/sched.c` n찾o est찼 atualizado "
-"e pode haver novas coisas. O sha1 zerado significa que, para obter um \"diff"
-"\" real, 챕 necess찼rio olhar diretamente para o objeto no diret처rio de "
-"trabalho, em vez de um \"diff\" de objeto para objeto."
+msgstr "isto 챕, exiba que a 찼rvore mudou, que o `kernel/sched.c` n찾o est찼 atualizado e pode haver novas coisas. O sha1 zerado significa que, para obter um \"diff\" real, 챕 necess찼rio olhar diretamente para o objeto no diret처rio de trabalho, em vez de um \"diff\" de objeto para objeto."
#. type: Plain text
#: en/git-diff-index.txt:113
@@ -23268,12 +19826,7 @@ msgstr "Como em outros comandos desse tipo, o 'git diff-index' n찾o analisa de f
#: en/git-diff-index.txt:119
#, priority:100
msgid "You can have a mixture of files show up as \"has been updated\" and \"is still dirty in the working directory\" together. You can always tell which file is in which state, since the \"has been updated\" ones show a valid sha1, and the \"not in sync with the index\" ones will always have the special all-zero sha1."
-msgstr ""
-"Voc챗 pode exibir junto uma mistura de arquivos como \"foi atualizado\" e "
-"\"ainda est찼 sujo no diret처rio de trabalho\". Voc챗 sempre pode dizer qual o "
-"arquivo est찼 em que condi챌찾o, uma vez que os que \"foram atualizados\" "
-"exibam um sha1 v찼lido e os \"que n찾o est찾o sincronizados com o 챠ndice\" "
-"sempre ter찾o o sha1 especial zerados."
+msgstr "Voc챗 pode exibir junto uma mistura de arquivos como \"foi atualizado\" e \"ainda est찼 sujo no diret처rio de trabalho\". Voc챗 sempre pode dizer qual o arquivo est찼 em que condi챌찾o, uma vez que os que \"foram atualizados\" exibam um sha1 v찼lido e os \"que n찾o est찾o sincronizados com o 챠ndice\" sempre ter찾o o sha1 especial zerados."
#. type: Title =
#: en/git-difftool.txt:2
@@ -23285,8 +19838,7 @@ msgstr "git-difftool(1)"
#: en/git-difftool.txt:7
#, priority:100
msgid "git-difftool - Show changes using common diff tools"
-msgstr ""
-"git-difftool - Exiba as altera챌천es utilizando as ferramentas comuns do diff"
+msgstr "git-difftool - Exiba as altera챌천es utilizando as ferramentas comuns do diff"
#. type: Plain text
#: en/git-difftool.txt:12
@@ -23298,11 +19850,7 @@ msgstr "'git difftool' [<op챌천es>] [<commit> [<commit>]] [--] [<caminho>...]\n"
#: en/git-difftool.txt:19
#, 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 utilizando 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]."
+msgstr "O 'git difftool' 챕 um comando Git que permite comparar e editar os arquivos entre revis천es utilizando 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
@@ -23344,10 +19892,7 @@ msgstr "--prompt"
#: en/git-difftool.txt:36
#, 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 ""
-"D챗 um alerta antes de cada invoca챌찾o da ferramenta diff. Este 챕 o "
-"comportamento predefinido; a op챌찾o est찼 dispon챠vel para sobrescrever "
-"quaisquer configura챌천es."
+msgstr "D챗 um alerta antes de cada invoca챌찾o da ferramenta diff. Este 챕 o comportamento predefinido; a op챌찾o est찼 dispon챠vel para sobrescrever quaisquer configura챌천es."
#. type: Labeled list
#: en/git-difftool.txt:37 en/git-mergetool.txt:27
@@ -23365,55 +19910,31 @@ msgstr "--tool=<ferramenta>"
#: en/git-difftool.txt:42
#, priority:100
msgid "Use the diff tool specified by <tool>. Valid values include emerge, kompare, meld, and vimdiff. Run `git difftool --tool-help` for the list of valid <tool> settings."
-msgstr ""
-"Utilize a ferramenta diff especificada por <ferramenta>. Os valores v찼lidos "
-"incluem `emerge`, `kompare`, `meld` e `vimdiff`. Execute o `git difftool "
-"--tool-help` para ver uma lista de configura챌천es v찼lidas para <ferramenta>."
+msgstr "Utilize a ferramenta diff especificada por <ferramenta>. Os valores v찼lidos incluem `emerge`, `kompare`, `meld` e `vimdiff`. Execute o `git difftool --tool-help` para ver uma lista de configura챌천es v찼lidas para <ferramenta>."
#. type: Plain text
#: en/git-difftool.txt:47
#, priority:100
msgid "If a diff tool is not specified, 'git difftool' will use the configuration variable `diff.tool`. If the configuration variable `diff.tool` is not set, 'git difftool' will pick a suitable default."
-msgstr ""
-"Caso uma ferramenta diff n찾o seja especificada, `git difftool` utilizar찼 a "
-"vari찼vel da configura챌찾o `diff.tool`. Caso a vari찼vel da configura챌찾o `diff."
-"tool` n찾o esteja definida, o 'git difftool' escolher찼 um padr찾o adequado."
+msgstr "Caso uma ferramenta diff n찾o seja especificada, `git difftool` utilizar찼 a vari찼vel da configura챌찾o `diff.tool`. Caso a vari찼vel da configura챌찾o `diff.tool` n찾o esteja definida, o 'git difftool' escolher찼 um padr찾o adequado."
#. type: Plain text
#: en/git-difftool.txt:53
#, priority:100
msgid "You can explicitly provide a full path to the tool by setting the configuration variable `difftool.<tool>.path`. For example, you can configure the absolute path to kdiff3 by setting `difftool.kdiff3.path`. Otherwise, 'git difftool' assumes the tool is available in PATH."
-msgstr ""
-"Voc챗 pode fornecer explicitamente um caminho completo para a ferramenta "
-"definindo a vari찼vel da configura챌찾o `difftool.<ferramenta>.path`. Por "
-"exemplo, voc챗 pode configurar o caminho absoluto para o kdiff3 configurando "
-"`difftool.kdiff3.path`. Caso contr찼rio, o 'git difftool' assume que a "
-"ferramenta est찼 dispon챠vel no `PATH`."
+msgstr "Voc챗 pode fornecer explicitamente um caminho completo para a ferramenta definindo a vari찼vel da configura챌찾o `difftool.<ferramenta>.path`. Por exemplo, voc챗 pode configurar o caminho absoluto para o kdiff3 configurando `difftool.kdiff3.path`. Caso contr찼rio, o 'git difftool' assume que a ferramenta est찼 dispon챠vel no `PATH`."
#. type: Plain text
#: en/git-difftool.txt:58
#, priority:100
msgid "Instead of running one of the known diff tools, 'git difftool' can be customized to run an alternative program by specifying the command line to invoke in a configuration variable `difftool.<tool>.cmd`."
-msgstr ""
-"Em vez de executar uma das ferramentas \"diff\" conhecidas, o 'git difftool' "
-"pode ser customizado para executar um programa alternativo, utilizando a "
-"linha de comando para chamar uma vari찼vel da configura챌찾o "
-"`difftool.<ferramenta>.cmd`."
+msgstr "Em vez de executar uma das ferramentas \"diff\" conhecidas, o 'git difftool' pode ser customizado para executar um programa alternativo, utilizando a linha de comando para chamar uma vari찼vel da configura챌찾o `difftool.<ferramenta>.cmd`."
#. type: Plain text
#: en/git-difftool.txt:68
#, priority:100
msgid "When 'git difftool' is invoked with this tool (either through the `-t` or `--tool` option or the `diff.tool` configuration variable) the configured command line will be invoked with the following variables available: `$LOCAL` is set to the name of the temporary file containing the contents of the diff pre-image and `$REMOTE` is set to the name of the temporary file containing the contents of the diff post-image. `$MERGED` is the name of the file which is being compared. `$BASE` is provided for compatibility with custom merge tool commands and has the same value as `$MERGED`."
-msgstr ""
-"Quando o 'git difftool' 챕 chamado com esta ferramenta (atrav챕s da op챌찾o `-t`"
-", `--tool` ou da vari찼vel da configura챌찾o `diff.tool`), a linha de comando "
-"configurada ser찼 chamada com as seguintes vari찼veis dispon챠veis: `$LOCAL` 챕 "
-"definido como o nome do arquivo tempor찼rio que contenha o conte첬do da pr챕-"
-"imagem \"diff\" e `$REMOTE` 챕 definido como o nome do arquivo tempor찼rio que "
-"contenha o conte첬do \"diff\" da p처s-imagem diff. `$MERGED` 챕 o nome do "
-"arquivo que est찼 sendo comparado. `$BASE` 챕 disponibilizado para "
-"compatibilidade com comandos personalizados da ferramenta de mesclagem e tem "
-"o mesmo valor que `$MERGED`."
+msgstr "Quando o 'git difftool' 챕 chamado com esta ferramenta (atrav챕s da op챌찾o `-t`, `--tool` ou da vari찼vel da configura챌찾o `diff.tool`), a linha de comando configurada ser찼 chamada com as seguintes vari찼veis dispon챠veis: `$LOCAL` 챕 definido como o nome do arquivo tempor찼rio que contenha o conte첬do da pr챕-imagem \"diff\" e `$REMOTE` 챕 definido como o nome do arquivo tempor찼rio que contenha o conte첬do \"diff\" da p처s-imagem diff. `$MERGED` 챕 o nome do arquivo que est찼 sendo comparado. `$BASE` 챕 disponibilizado para compatibilidade com comandos personalizados da ferramenta de mesclagem e tem o mesmo valor que `$MERGED`."
#. type: Labeled list
#: en/git-difftool.txt:69 en/git-mergetool.txt:67
@@ -23425,9 +19946,7 @@ msgstr "--tool-help"
#: en/git-difftool.txt:71
#, priority:100
msgid "Print a list of diff tools that may be used with `--tool`."
-msgstr ""
-"Imprima uma lista de ferramentas \"diff\" que podem ser utilizadas com "
-"`--tool`."
+msgstr "Imprima uma lista de ferramentas \"diff\" que podem ser utilizadas com `--tool`."
#. type: Labeled list
#: en/git-difftool.txt:72
@@ -23463,11 +19982,7 @@ msgstr "--extcmd = <comando>"
#: en/git-difftool.txt:87
#, priority:100
msgid "Specify a custom command for viewing diffs. 'git-difftool' ignores the configured defaults and runs `$command $LOCAL $REMOTE` when this option is specified. Additionally, `$BASE` is set in the environment."
-msgstr ""
-"Especifique um comando personalizado para exibir os \"diffs\". 'git-"
-"difftool' executa `$command $LOCAL $REMOTE` e ignora as predefini챌천es "
-"configuradas quando esta op챌찾o 챕 utilizada. A vari찼vel `$BASE` 챕 definido "
-"no ambiente."
+msgstr "Especifique um comando personalizado para exibir os \"diffs\". 'git-difftool' executa `$command $LOCAL $REMOTE` e ignora as predefini챌천es configuradas quando esta op챌찾o 챕 utilizada. A vari찼vel `$BASE` 챕 definido no ambiente."
#. type: Labeled list
#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:128 en/rev-list-options.txt:264
@@ -23497,19 +20012,13 @@ msgstr "--[no-]trust-exit-code"
#: en/git-difftool.txt:102
#, priority:100
msgid "'git-difftool' invokes a diff tool individually on each file. Errors reported by the diff tool are ignored by default. Use `--trust-exit-code` to make 'git-difftool' exit when an invoked diff tool returns a non-zero exit code."
-msgstr ""
-"'git-difftool' invoca uma ferramenta \"diff\" individualmente em cada "
-"arquivo. Os erros relatados pela ferramenta \"diff\" s찾o ignorados. "
-"Utilize `--trust-exit-code` para fazer 'git-difftool' encerrar quando uma "
-"ferramenta \"diff\" retornar um c처digo de sa챠da diferente de zero."
+msgstr "'git-difftool' invoca uma ferramenta \"diff\" individualmente em cada arquivo. Os erros relatados pela ferramenta \"diff\" s찾o ignorados. Utilize `--trust-exit-code` para fazer 'git-difftool' encerrar quando uma ferramenta \"diff\" retornar um c처digo de sa챠da diferente de zero."
#. type: Plain text
#: en/git-difftool.txt:105
#, priority:100
msgid "'git-difftool' will forward the exit code of the invoked tool when `--trust-exit-code` is used."
-msgstr ""
-"'git-difftool' encaminhar찼 o c처digo de encerramento da ferramenta chamada "
-"quando `--trust-exit-code` for utilizado."
+msgstr "'git-difftool' encaminhar찼 o c처digo de encerramento da ferramenta chamada quando `--trust-exit-code` for utilizado."
#. type: Plain text
#: en/git-difftool.txt:107
@@ -23527,9 +20036,7 @@ msgstr "CONFIGURA횉횄O DE VARI횁VEIS"
#: en/git-difftool.txt:112
#, priority:100
msgid "'git difftool' falls back to 'git mergetool' config variables when the difftool equivalents have not been defined."
-msgstr ""
-"O 'git difftool' retorna 횪s vari찼veis da configura챌찾o do 'git mergetool' "
-"quando os equivalentes \"difftool\" n찾o estiverem definidos."
+msgstr "O 'git difftool' retorna 횪s vari찼veis da configura챌찾o do 'git mergetool' quando os equivalentes \"difftool\" n찾o estiverem definidos."
#. type: Labeled list
#: en/git-difftool.txt:113
@@ -23553,8 +20060,7 @@ msgstr "diff.guitool"
#: en/git-difftool.txt:118
#, priority:100
msgid "The default diff tool to use when `--gui` is specified."
-msgstr ""
-"A ferramenta diff predefinida a ser utilizada quando `--gui` for utilizado."
+msgstr "A ferramenta diff predefinida a ser utilizada quando `--gui` for utilizado."
#. type: Labeled list
#: en/git-difftool.txt:119
@@ -23566,9 +20072,7 @@ msgstr "difftool.<ferramenta>.path"
#: en/git-difftool.txt:122
#, priority:100
msgid "Override the path for the given tool. This is useful in case your tool is not in the PATH."
-msgstr ""
-"Substitua o caminho para a ferramenta informada. 횋 첬til caso a sua "
-"ferramenta n찾o esteja no `PATH`."
+msgstr "Substitua o caminho para a ferramenta informada. 횋 첬til caso a sua ferramenta n찾o esteja no `PATH`."
#. type: Labeled list
#: en/git-difftool.txt:123
@@ -23691,9 +20195,7 @@ msgstr "<caminho>..."
#: en/git-diff-tree.txt:35
#, priority:100
msgid "If provided, the results are limited to a subset of files matching one of the provided pathspecs."
-msgstr ""
-"Caso seja utilizado, os resultados ser찾o limitados a um subconjunto de "
-"arquivos que coincidam a um dos `pathspecs` utilizados."
+msgstr "Caso seja utilizado, os resultados ser찾o limitados a um subconjunto de arquivos que coincidam a um dos `pathspecs` utilizados."
#. type: Plain text
#: en/git-diff-tree.txt:38
@@ -23711,29 +20213,19 @@ msgstr "exiba a pr처pria entrada da 찼rvore e suas sub찼rvores. Implica no uso
#: en/git-diff-tree.txt:45
#, priority:100
msgid "When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree."
-msgstr ""
-"Quando `--root` 챕 utilizado o commit inicial ser찼 exibido como um grande "
-"evento de cria챌찾o. Isso 챕 o equivalente a um `diff` na 찼rvore `NULL`."
+msgstr "Quando `--root` 챕 utilizado o commit inicial ser찼 exibido como um grande evento de cria챌찾o. Isso 챕 o equivalente a um `diff` na 찼rvore `NULL`."
#. type: Plain text
#: en/git-diff-tree.txt:52
#, priority:100
msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input. (Use a single space as separator.)"
-msgstr ""
-"Quando `--stdin` 챕 utilizado o comando n찾o obt챕m os argumentos `<tree-ish>` "
-"da linha de comando. Em vez disso ele l챗 as linhas contendo duas `<찼rvores>`"
-", um `<commit>` ou uma lista de `<commit>` da sua entrada predefinida. ("
-"Utilize um 첬nico espa챌o como separador.)"
+msgstr "Quando `--stdin` 챕 utilizado o comando n찾o obt챕m os argumentos `<tree-ish>` da linha de comando. Em vez disso ele l챗 as linhas contendo duas `<찼rvores>`, um `<commit>` ou uma lista de `<commit>` da sua entrada predefinida. (Utilize um 첬nico espa챌o como separador.)"
#. type: Plain text
#: en/git-diff-tree.txt:57
#, priority:100
msgid "When two trees are given, it compares the first tree with the second. When a single commit is given, it compares the commit with its parents. The remaining commits, when given, are used as if they are parents of the first commit."
-msgstr ""
-"Quando duas 찼rvores s찾o informadas, 챕 feita uma compara챌찾o entre a primeira "
-"e a segunda. Quando um 첬nico commit 챕 dado, ele compara o commit com as "
-"suas origens. Os commits restantes, quando informados, s찾o utilizados como "
-"se fossem as origens do primeiro commit."
+msgstr "Quando duas 찼rvores s찾o informadas, 챕 feita uma compara챌찾o entre a primeira e a segunda. Quando um 첬nico commit 챕 dado, ele compara o commit com as suas origens. Os commits restantes, quando informados, s찾o utilizados como se fossem as origens do primeiro commit."
#. type: Plain text
#: en/git-diff-tree.txt:62
@@ -23751,10 +20243,7 @@ msgstr "Os seguintes sinalizadores afetam ainda mais o comportamento ao comparar
#: en/git-diff-tree.txt:71
#, priority:100
msgid "By default, 'git diff-tree --stdin' does not show differences for merge commits. With this flag, it shows differences to that commit from all of its parents. See also `-c`."
-msgstr ""
-"횋 predefinido que `git diff-tree --stdin` n찾o exiba as diferen챌as para os "
-"commits que forem mesclados. Com esta op챌찾o as diferen챌as s찾o exibidas no "
-"commit de todas as suas origens. Consulte tamb챕m `-c`."
+msgstr "횋 predefinido que `git diff-tree --stdin` n찾o exiba as diferen챌as para os commits que forem mesclados. Com esta op챌찾o as diferen챌as s찾o exibidas no commit de todas as suas origens. Consulte tamb챕m `-c`."
#. type: Plain text
#: en/git-diff-tree.txt:77
@@ -23784,45 +20273,25 @@ msgstr "o `git diff-tree` gera uma linha com o ID do commit, quando for aplic찼v
#: en/git-diff-tree.txt:97
#, priority:100
msgid "This flag changes the way a merge commit is displayed (which means it is useful only when the command is given one <tree-ish>, or `--stdin`). It shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time (which is what the `-m` option does). Furthermore, it lists only files which were modified from all parents."
-msgstr ""
-"Esta op챌찾o altera a maneira como um commit mesclado 챕 exibido (o que "
-"significa que 챕 첬til apenas quando o comando recebe um <tree-ish>, ou "
-"`--stdin`). Exibe as diferen챌as de cada um das origens simultaneamente para "
-"o resultado da mesclagem em vez de exibir a diferen챌a dos pares entre as "
-"origens e o resultado, um de cada vez (que 챕 o que a op챌찾o `-m` faz). Al챕m "
-"disso, lista apenas os arquivos que foram modificados vindo de todas as "
-"origens."
+msgstr "Esta op챌찾o altera a maneira como um commit mesclado 챕 exibido (o que significa que 챕 첬til apenas quando o comando recebe um <tree-ish>, ou `--stdin`). Exibe as diferen챌as de cada um das origens simultaneamente para o resultado da mesclagem em vez de exibir a diferen챌a dos pares entre as origens e o resultado, um de cada vez (que 챕 o que a op챌찾o `-m` faz). Al챕m disso, lista apenas os arquivos que foram modificados vindo de todas as origens."
#. type: Plain text
#: en/git-diff-tree.txt:107
#, priority:100
msgid "This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output by omitting uninteresting hunks whose the contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other \"empty diff\" case."
-msgstr ""
-"Esta op챌찾o altera a maneira como um patch para a mesclagem de um commit 챕 "
-"exibido, de uma maneira semelhante 횪 op챌찾o `-c`. Implica na utiliza챌찾o das "
-"op챌천es `-c` e `-p`, comprime ainda mais o patch gerado ao omitir os peda챌os "
-"que n찾o interessam, cujo conte첬do nas origens tenham apenas duas variantes e "
-"o resultado da mesclagem escolha uma delas sem qualquer modifica챌찾o. Quando "
-"n찾o h찼 interesse em todos os blocos, o pr처prio commit e a mensagem do "
-"registro log n찾o s찾o exibidas, como em qualquer outro caso de um \"diff "
-"vazio\"."
+msgstr "Esta op챌찾o altera a maneira como um patch para a mesclagem de um commit 챕 exibido, de uma maneira semelhante 횪 op챌찾o `-c`. Implica na utiliza챌찾o das op챌천es `-c` e `-p`, comprime ainda mais o patch gerado ao omitir os peda챌os que n찾o interessam, cujo conte첬do nas origens tenham apenas duas variantes e o resultado da mesclagem escolha uma delas sem qualquer modifica챌찾o. Quando n찾o h찼 interesse em todos os blocos, o pr처prio commit e a mensagem do registro log n찾o s찾o exibidas, como em qualquer outro caso de um \"diff vazio\"."
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
-msgstr ""
-"Esta op챌찾o faz com que os \"diffs\" combinados (usados para a mesclagem dos "
-"commits) listem o nome do arquivo de todos as origens. Portanto, ele s처 tem "
-"efeito quando `-c` ou `--cc` s찾o utilizados e provavelmente 챕 첬til apenas "
-"caso as altera챌천es no nome do arquivo sejam detectadas (ou seja, quando a "
-"renomea챌찾o ou a detec챌찾o de c처pia foram solicitadas)."
+msgstr "Esta op챌찾o faz com que os \"diffs\" combinados (usados para a mesclagem dos commits) listem o nome do arquivo de todos as origens. Portanto, ele s처 tem efeito quando `-c` ou `--cc` s찾o utilizados e provavelmente 챕 첬til apenas caso as altera챌천es no nome do arquivo sejam detectadas (ou seja, quando a renomea챌찾o ou a detec챌찾o de c처pia foram solicitadas)."
#. type: Plain text
#: en/git-diff-tree.txt:118
@@ -23874,12 +20343,7 @@ msgstr "'git diff' [<op챌천es>] [--] [<path>...]"
#: en/git-diff.txt:31
#, priority:280
msgid "This form is to view the changes you made relative to the index (staging area for the next commit). In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]."
-msgstr ""
-"Este formul찼rio serve para exibir as altera챌천es feitas em rela챌찾o ao 챠ndice ("
-"찼rea de prepara챌찾o para o pr처ximo commit). Em outras palavras, as "
-"diferen챌as s찾o as que voc챗 _pode_ informar ao Git para adicionar ao 챠ndice, "
-"mas ainda n찾o o fez. Voc챗 pode preparar essas altera챌천es utilizando linkgit"
-":git-add[1]."
+msgstr "Este formul찼rio serve para exibir as altera챌천es feitas em rela챌찾o ao 챠ndice (찼rea de prepara챌찾o para o pr처ximo commit). Em outras palavras, as diferen챌as s찾o as que voc챗 _pode_ informar ao Git para adicionar ao 챠ndice, mas ainda n찾o o fez. Voc챗 pode preparar essas altera챌천es utilizando linkgit:git-add[1]."
#. type: Labeled list
#: en/git-diff.txt:32
@@ -23891,13 +20355,7 @@ msgstr "'git diff' [<op챌천es>] --no-index [--] <caminho> <caminho>"
#: en/git-diff.txt:40
#, priority:280
msgid "This form is to compare the given two paths on the filesystem. You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
-msgstr ""
-"Este formul찼rio serve para comparar os dois caminhos utilizados no sistema "
-"de arquivos. Voc챗 pode omitir a op챌찾o `--no-index` durante a execu챌찾o do "
-"comando em uma 찼rvore de trabalho controlado pelo Git e pelo menos um dos "
-"pontos dos caminhos fora da 찼rvore de trabalho ou ao executar o comando fora "
-"de uma 찼rvore de trabalho que 챕 controlado pelo Git. Este formul찼rio implica "
-"no uso da op챌찾o `--exit-code`."
+msgstr "Este formul찼rio serve para comparar os dois caminhos utilizados no sistema de arquivos. Voc챗 pode omitir a op챌찾o `--no-index` durante a execu챌찾o do comando em uma 찼rvore de trabalho controlado pelo Git e pelo menos um dos pontos dos caminhos fora da 찼rvore de trabalho ou ao executar o comando fora de uma 찼rvore de trabalho que 챕 controlado pelo Git. Este formul찼rio implica no uso da op챌찾o `--exit-code`."
#. type: Labeled list
#: en/git-diff.txt:41
@@ -23909,13 +20367,7 @@ msgstr "'git diff' [<op챌천es>] --cached [<commit>] [--] [<caminho>...]"
#: en/git-diff.txt:50
#, priority:280
msgid "This form is to view the changes you staged for the next commit relative to the named <commit>. Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD. If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes. --staged is a synonym of --cached."
-msgstr ""
-"Este formul찼rio serve para exibir as altera챌천es feitas em rela챌찾o ao pr처ximo "
-"commit relativo ao `<commit>` informado. Geralmente voc챗 vai querer uma "
-"compara챌찾o com o commit mais recente, portanto, se n찾o fizer o `<commit>` a "
-"predefini챌찾o 챕 `HEAD`. Se `HEAD` n찾o existir (por exemplo, galhos que ainda "
-"v찾o aparecer) e um `<commit>` n찾o tenha sido feito, exibe todas as "
-"altera챌천es em etapas. --staged 챕 um sin척nimo de --cached."
+msgstr "Este formul찼rio serve para exibir as altera챌천es feitas em rela챌찾o ao pr처ximo commit relativo ao `<commit>` informado. Geralmente voc챗 vai querer uma compara챌찾o com o commit mais recente, portanto, se n찾o fizer o `<commit>` a predefini챌찾o 챕 `HEAD`. Se `HEAD` n찾o existir (por exemplo, galhos que ainda v찾o aparecer) e um `<commit>` n찾o tenha sido feito, exibe todas as altera챌천es em etapas. --staged 챕 um sin척nimo de --cached."
#. type: Labeled list
#: en/git-diff.txt:51
@@ -23927,11 +20379,7 @@ msgstr "'git diff' [<op챌천es>] <commit> [--] [<caminho>...]"
#: en/git-diff.txt:58
#, priority:280
msgid "This form is to view the changes you have in your working tree relative to the named <commit>. You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
-msgstr ""
-"Este formul찼rio exibe as modifica챌천es feitas por voc챗 na sua 찼rvore de "
-"trabalho relativo ao nome do `<commit>`. 횋 poss챠vel utilizar o `HEAD` para "
-"compar찼-lo com o commit mais recente ou para comparar com o cume de um ramo "
-"diferente."
+msgstr "Este formul찼rio exibe as modifica챌천es feitas por voc챗 na sua 찼rvore de trabalho relativo ao nome do `<commit>`. 횋 poss챠vel utilizar o `HEAD` para compar찼-lo com o commit mais recente ou para comparar com o cume de um ramo diferente."
#. type: Labeled list
#: en/git-diff.txt:59
@@ -23955,9 +20403,7 @@ msgstr "'git diff' [<op챌천es>] <commit>..<commit> [--] [<caminho>...]"
#: en/git-diff.txt:69
#, priority:280
msgid "This is synonymous to the previous form. If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
-msgstr ""
-"Isso 챕 um sin척nimo do formul찼rio anterior. Caso o <commitir> de um lado "
-"seja omitido, ele ter찼 o mesmo efeito que usar `HEAD`."
+msgstr "Isso 챕 um sin척nimo do formul찼rio anterior. Caso o <commitir> de um lado seja omitido, ele ter찼 o mesmo efeito que usar `HEAD`."
#. type: Labeled list
#: en/git-diff.txt:70
@@ -23981,13 +20427,7 @@ msgstr "No caso de voc챗 estar fazendo algo ex처tico, deve-se notar que todos os
#: en/git-diff.txt:89
#, ignore-ellipsis, priority:280
msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
-msgstr ""
-"Para obter uma lista mais completa de maneiras de soletrar um `<commit>`, "
-"consulte a se챌찾o \"DEFININDO AS REVIS횛ES\" em linkgit:gitrevisions[7]. No "
-"entanto, `diff` 챕 sobre comparar dois _endpoints_, e n찾o os intervalos, as "
-"nota챌천es de intervalo (\"<commit>.. <commit>\" e \"<commit>\\... <commit>\") "
-"n찾o significam um intervalo definido na se챌찾o \"DEFININDO AS REVIS횛ES\" em "
-"linkgit:gitrevisions[7]."
+msgstr "Para obter uma lista mais completa de maneiras de soletrar um `<commit>`, consulte a se챌찾o \"DEFININDO AS REVIS횛ES\" em linkgit:gitrevisions[7]. No entanto, `diff` 챕 sobre comparar dois _endpoints_, e n찾o os intervalos, as nota챌천es de intervalo (\"<commit>.. <commit>\" e \"<commit>\\... <commit>\") n찾o significam um intervalo definido na se챌찾o \"DEFININDO AS REVIS횛ES\" em linkgit:gitrevisions[7]."
#. type: Labeled list
#: en/git-diff.txt:90
@@ -24011,19 +20451,13 @@ msgstr "Compare a 찼rvore de trabalho com a vers찾o \"base\" (stage #1), \"o nos
#: en/git-diff.txt:113
#, priority:280
msgid "Omit diff output for unmerged entries and just show \"Unmerged\". Can be used only when comparing the working tree with the index."
-msgstr ""
-"Omita a sa챠da diff para as entradas que n찾o tenham sido mescladas e exiba "
-"\"Unmergedd\". S처 pode ser utilizado quando comparamos a 찼rvore de trabalho "
-"com o 챠ndice."
+msgstr "Omita a sa챠da diff para as entradas que n찾o tenham sido mescladas e exiba \"Unmergedd\". S처 pode ser utilizado quando comparamos a 찼rvore de trabalho com o 챠ndice."
#. type: Plain text
#: en/git-diff.txt:118
#, priority:280
msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
-msgstr ""
-"Os par창metros `<paths>`, quando utilizados, s찾o para limitar o `diff` quanto "
-"aos nomes dos caminhos (voc챗 pode dar nomes de diret처rios e obter um `diff` "
-"para todos os arquivos sob eles)."
+msgstr "Os par창metros `<paths>`, quando utilizados, s찾o para limitar o `diff` quanto aos nomes dos caminhos (voc챗 pode dar nomes de diret처rios e obter um `diff` para todos os arquivos sob eles)."
#. type: Labeled list
#: en/git-diff.txt:125
@@ -24083,17 +20517,13 @@ msgstr ""
#: en/git-diff.txt:149
#, priority:280
msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
-msgstr ""
-"Em vez de utilizar o cume do ramo atual, compare com o cume do ramo \"teste\""
-"."
+msgstr "Em vez de utilizar o cume do ramo atual, compare com o cume do ramo \"teste\"."
#. type: Plain text
#: en/git-diff.txt:152
#, priority:280
msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
-msgstr ""
-"Em vez de comparar com o cume do ramo \"teste\", compare com o cume do ramo "
-"atual, limitando-se a compara챌찾o com o arquivo \"teste\"."
+msgstr "Em vez de comparar com o cume do ramo \"teste\", compare com o cume do ramo atual, limitando-se a compara챌찾o com o arquivo \"teste\"."
#. type: Plain text
#: en/git-diff.txt:153
@@ -24229,9 +20659,7 @@ msgstr "'git fast-export [<op챌천es>]' | 'git fast-import'\n"
#: en/git-fast-export.txt:18
#, priority:100
msgid "This program dumps the given revisions in a form suitable to be piped into 'git fast-import'."
-msgstr ""
-"Este programa despeja as revis천es informadas em um formato adequado para ser "
-"canalizado para o 'git fast-import'."
+msgstr "Este programa despeja as revis천es informadas em um formato adequado para ser canalizado para o 'git fast-import'."
#. type: Plain text
#: en/git-fast-export.txt:23
@@ -24285,12 +20713,7 @@ msgstr "Determina como manipular as tags cujo objeto marcado seja filtrado. Com
#: en/git-fast-export.txt:52
#, 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 predefinido), este programa ser찼 "
-"terminado ao encontrar tal tag. Com 'drop' estas op챌천es 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 "
-"origem; consulte linkgit:git-rev-list[1])"
+msgstr "Ao pedir para abortar 'abort' (que 챕 o predefinido), este programa ser찼 terminado ao encontrar tal tag. Com 'drop' estas op챌천es 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 origem; consulte linkgit:git-rev-list[1])"
#. type: Plain text
#: en/git-fast-export.txt:58
@@ -24302,9 +20725,7 @@ msgstr "Detecta a a챌찾o de copiar e mover como descrito na p찼gina do manual li
#: en/git-fast-export.txt:61
#, priority:100
msgid "Note that earlier versions of this command did not complain and produced incorrect results if you gave these options."
-msgstr ""
-"Observe que as vers천es anteriores deste comando n찾o reclamavam e produziam "
-"resultados incorretos caso essas op챌천es fossem utilizadas."
+msgstr "Observe que as vers천es anteriores deste comando n찾o reclamavam e produziam resultados incorretos caso essas op챌천es fossem utilizadas."
#. type: Labeled list
#: en/git-fast-export.txt:62 en/git-fast-import.txt:93
@@ -24382,12 +20803,7 @@ msgstr "--no-data"
#: en/git-fast-export.txt:110
#, priority:100
msgid "Skip output of blob objects and instead refer to blobs via their original SHA-1 hash. This is useful when rewriting the directory structure or history of a repository without touching the contents of individual files. Note that the resulting stream can only be used by a repository which already contains the necessary objects."
-msgstr ""
-"Ignore a sa챠da dos objetos bolha e, em vez disso, consulte as bolhas por "
-"meio do hash SHA-1 original. Isso 챕 첬til durante a reescrita da estrutura "
-"dos diret처rios ou do hist처rico de um reposit처rio sem tocar no conte첬do "
-"individual dos arquivos. Observe que o fluxo resultante pode ser utilizado "
-"apenas por um reposit처rio que j찼 contenha os objetos necess찼rios."
+msgstr "Ignore a sa챠da dos objetos bolha e, em vez disso, consulte as bolhas por meio do hash SHA-1 original. Isso 챕 첬til durante a reescrita da estrutura dos diret처rios ou do hist처rico de um reposit처rio sem tocar no conte첬do individual dos arquivos. Observe que o fluxo resultante pode ser utilizado apenas por um reposit처rio que j찼 contenha os objetos necess찼rios."
#. type: Labeled list
#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
@@ -24519,13 +20935,7 @@ msgstr "ANONIMIZANDO"
#: en/git-fast-export.txt:195
#, priority:100
msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
-msgstr ""
-"Caso a op챌찾o `--anonymize` seja utilizada, o git tentar찼 remover todas as "
-"informa챌천es de identifica챌찾o do reposit처rio, mantendo ainda o suficiente da "
-"찼rvore original e dos padr천es do hist처rico para reproduzir alguns bugs. O "
-"objetivo 챕 que um bug do git encontrado em um reposit처rio privado persista "
-"no reposit처rio anonimizado e este 첬ltimo pode ser compartilhado com os "
-"desenvolvedores do git para ajudar na resolu챌찾o do problema."
+msgstr "Caso a op챌찾o `--anonymize` seja utilizada, o git tentar찼 remover todas as informa챌천es de identifica챌찾o do reposit처rio, mantendo ainda o suficiente da 찼rvore original e dos padr천es do hist처rico para reproduzir alguns bugs. O objetivo 챕 que um bug do git encontrado em um reposit처rio privado persista no reposit처rio anonimizado e este 첬ltimo pode ser compartilhado com os desenvolvedores do git para ajudar na resolu챌찾o do problema."
#. type: Plain text
#: en/git-fast-export.txt:207
@@ -24581,11 +20991,7 @@ msgstr "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
#: en/git-fast-export.txt:240
#, priority:100
msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
-msgstr ""
-"que exiba todas as linhas exclusivas (com n첬meros convertidos em \"X\", para "
-"recolher o \"Usu찼rio 0\", \"Usu찼rio 1\" etc. em \"Usu찼rio X\"). Isso produz "
-"uma sa챠da muito menor e geralmente 챕 de r찼pida confirma챌찾o j찼 que n찾o h찼 "
-"dados privados no fluxo."
+msgstr "que exiba todas as linhas exclusivas (com n첬meros convertidos em \"X\", para recolher o \"Usu찼rio 0\", \"Usu찼rio 1\" etc. em \"Usu찼rio X\"). Isso produz uma sa챠da muito menor e geralmente 챕 de r찼pida confirma챌찾o j찼 que n찾o h찼 dados privados no fluxo."
#. type: Plain text
#: en/git-fast-export.txt:248
@@ -24627,12 +21033,7 @@ msgstr "O `fast-import` l챗 um fluxo misto de comandos e dados na entrada predef
#: en/git-fast-import.txt:32
#, priority:100
msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository. Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
-msgstr ""
-"O back-end `fast-import` em si pode importar para um reposit처rio vazio (um "
-"que j찼 foi inicializado por 'git init') ou atualizar de forma incremental em "
-"um reposit처rio preenchido j찼 existente. Caso as importa챌천es incrementais "
-"sejam ou n찾o compat챠veis com determinada fonte estrangeira espec챠fica, isso "
-"vai depender do programa de front-end utilizado."
+msgstr "O back-end `fast-import` em si pode importar para um reposit처rio vazio (um que j찼 foi inicializado por 'git init') ou atualizar de forma incremental em um reposit처rio preenchido j찼 existente. Caso as importa챌천es incrementais sejam ou n찾o compat챠veis com determinada fonte estrangeira espec챠fica, isso vai depender do programa de front-end utilizado."
#. type: Plain text
#: en/git-fast-import.txt:41
@@ -24644,11 +21045,7 @@ msgstr "For챌ar a atualiza챌찾o das ramifica챌천es modificadas, mesmo que isso f
#: en/git-fast-import.txt:47
#, priority:100
msgid "Disable the output shown by --stats, making fast-import usually be silent when it is successful. However, if the import stream has directives intended to show user output (e.g. `progress` directives), the corresponding messages will still be shown."
-msgstr ""
-"Desative a sa챠da exibida por `--stats`, fazendo com que o `fast-import` seja "
-"silenciado quando for bem-sucedido. No entanto, caso o fluxo de importa챌찾o "
-"tenha diretivas destinadas a exibir a sa챠da do usu찼rio (diretivas `progress` "
-"por exemplo), as mensagens coincidentes ainda ser찾o exibidas."
+msgstr "Desative a sa챠da exibida por `--stats`, fazendo com que o `fast-import` seja silenciado quando for bem-sucedido. No entanto, caso o fluxo de importa챌찾o tenha diretivas destinadas a exibir a sa챠da do usu찼rio (diretivas `progress` por exemplo), as mensagens coincidentes ainda ser찾o exibidas."
#. type: Labeled list
#: en/git-fast-import.txt:48
@@ -24660,11 +21057,7 @@ msgstr "--stats"
#: en/git-fast-import.txt:53
#, priority:100
msgid "Display some basic statistics about the objects fast-import has created, the packfiles they were stored into, and the memory used by fast-import during this run. Showing this output is currently the default, but can be disabled with --quiet."
-msgstr ""
-"Exiba algumas estat챠sticas b찼sicas sobre os objetos que a importa챌찾o r찼pida "
-"criou, os arquivos do pacote em que foram armazenados e a mem처ria utilizado "
-"por `fast-import` durante essa execu챌찾o. 횋 predefinido que esta sa챠da seja "
-"exibida, mas pode ser desativado com `--quiet`."
+msgstr "Exiba algumas estat챠sticas b찼sicas sobre os objetos que a importa챌찾o r찼pida criou, os arquivos do pacote em que foram armazenados e a mem처ria utilizado por `fast-import` durante essa execu챌찾o. 횋 predefinido que esta sa챠da seja exibida, mas pode ser desativado com `--quiet`."
#. type: Labeled list
#: en/git-fast-import.txt:54
@@ -24742,12 +21135,7 @@ msgstr "Despeja a tabela de marca챌천es internas em <arquivo> quando conclu챠da.
#: en/git-fast-import.txt:109
#, priority:100
msgid "Before processing any input, load the marks specified in <file>. The input file must exist, must be readable, and must use the same format as produced by --export-marks. Multiple options may be supplied to import more than one set of marks. If a mark is defined to different values, the last file wins."
-msgstr ""
-"Antes de processar qualquer entrada, carregue as marca챌천es especificadas no "
-"<arquivo>. O arquivo de entrada deve existir, ser leg챠vel e usar o mesmo "
-"formato produzido por `--export-marks`. As m첬ltiplas op챌천es podem ser "
-"informadas para importar mais de um conjunto de marcas. Caso uma marca챌찾o "
-"seja definida com valores diferentes, o 첬ltimo arquivo vence."
+msgstr "Antes de processar qualquer entrada, carregue as marca챌천es especificadas no <arquivo>. O arquivo de entrada deve existir, ser leg챠vel e usar o mesmo formato produzido por `--export-marks`. As m첬ltiplas op챌천es podem ser informadas para importar mais de um conjunto de marcas. Caso uma marca챌찾o seja definida com valores diferentes, o 첬ltimo arquivo vence."
#. type: Labeled list
#: en/git-fast-import.txt:110
@@ -24861,9 +21249,7 @@ msgstr "--depth=<n>"
#: en/git-fast-import.txt:161
#, priority:100
msgid "Maximum delta depth, for blob and tree deltification. Default is 50."
-msgstr ""
-"Profundidade delta m찼xima, para a \"deltifica챌찾o\" da bolha e da 찼rvore. A "
-"predefini챌찾o 챕 50."
+msgstr "Profundidade delta m찼xima, para a \"deltifica챌찾o\" da bolha e da 찼rvore. A predefini챌찾o 챕 50."
#. type: Labeled list
#: en/git-fast-import.txt:162
@@ -24875,13 +21261,7 @@ msgstr "--export-pack-edges=<arquivo>"
#: en/git-fast-import.txt:170
#, priority:100
msgid "After creating a packfile, print a line of data to <file> listing the filename of the packfile and the last commit on each branch that was written to that packfile. This information may be useful after importing projects whose total object set exceeds the 4 GiB packfile limit, as these commits can be used as edge points during calls to 'git pack-objects'."
-msgstr ""
-"Depois de criar um pacote de arquivo, imprima uma linha de dados em "
-"`<arquivo>`, listando o nome do arquivo e o 첬ltimo commit em cada ramo que "
-"foi gravado neste pacote. Estas informa챌천es podem ser 첬teis ap처s a "
-"importa챌찾o de projetos cujo conjunto total de objetos exceda o limite de 4 "
-"GiB, pois estes commits podem ser utilizados como pontos de extremidade "
-"durante as chamadas para o 'git pack-objects'."
+msgstr "Depois de criar um pacote de arquivo, imprima uma linha de dados em `<arquivo>`, listando o nome do arquivo e o 첬ltimo commit em cada ramo que foi gravado neste pacote. Estas informa챌천es podem ser 첬teis ap처s a importa챌찾o de projetos cujo conjunto total de objetos exceda o limite de 4 GiB, pois estes commits podem ser utilizados como pontos de extremidade durante as chamadas para o 'git pack-objects'."
#. type: Labeled list
#: en/git-fast-import.txt:171 en/git-pack-objects.txt:114 en/git-repack.txt:118
@@ -24935,13 +21315,7 @@ msgstr "CUSTO DE DESENVOLVIMENTO"
#: en/git-fast-import.txt:202
#, priority:100
msgid "A typical frontend for fast-import tends to weigh in at approximately 200 lines of Perl/Python/Ruby code. Most developers have been able to create working importers in just a couple of hours, even though it is their first exposure to fast-import, and sometimes even to Git. This is an ideal situation, given that most conversion tools are throw-away (use once, and never look back)."
-msgstr ""
-"Um front-end t챠pico para `fast-import` tende a pesar aproximadamente 200 "
-"linhas de c처digo Perl/Python/Ruby. A maioria dos desenvolvedores conseguiu "
-"criar importadores ativos em apenas algumas horas, mesmo que seja a sua "
-"primeira exposi챌찾o ao `fast-import` e 횪s vezes, at챕 ao Git. Esta 챕 uma "
-"situa챌찾o ideal, j찼 que a maioria das ferramentas de convers찾o 챕 descart찼vel ("
-"utilize uma vez e nunca mais se preocupe)."
+msgstr "Um front-end t챠pico para `fast-import` tende a pesar aproximadamente 200 linhas de c처digo Perl/Python/Ruby. A maioria dos desenvolvedores conseguiu criar importadores ativos em apenas algumas horas, mesmo que seja a sua primeira exposi챌찾o ao `fast-import` e 횪s vezes, at챕 ao Git. Esta 챕 uma situa챌찾o ideal, j찼 que a maioria das ferramentas de convers찾o 챕 descart찼vel (utilize uma vez e nunca mais se preocupe)."
#. type: Title -
#: en/git-fast-import.txt:205
@@ -24953,11 +21327,7 @@ msgstr "OPERA횉횄O EM PARALELO"
#: en/git-fast-import.txt:210
#, priority:100
msgid "Like 'git push' or 'git fetch', imports handled by fast-import are safe to run alongside parallel `git repack -a -d` or `git gc` invocations, or any other Git operation (including 'git prune', as loose objects are never used by fast-import)."
-msgstr ""
-"Como `git push` ou `git fetch`, as importa챌천es manipuladas pelo `fast-import`"
-" s찾o seguras para serem executadas juntamente com as invoca챌천es paralelas `"
-"git repack -a -d` ou `git gc` ou qualquer outra opera챌찾o Git (incluindo `git "
-"prune`, objetos soltos nunca s찾o utilizados por `fast-import`)."
+msgstr "Como `git push` ou `git fetch`, as importa챌천es manipuladas pelo `fast-import` s찾o seguras para serem executadas juntamente com as invoca챌천es paralelas `git repack -a -d` ou `git gc` ou qualquer outra opera챌찾o Git (incluindo `git prune`, objetos soltos nunca s찾o utilizados por `fast-import`)."
#. type: Plain text
#: en/git-fast-import.txt:219
@@ -24969,11 +21339,7 @@ msgstr "O `fast-import` n찾o bloqueia a ramifica챌찾o ou \"tag refs\" que est찼
#: en/git-fast-import.txt:223
#, priority:100
msgid "Branch updates can be forced with --force, but it's recommended that this only be used on an otherwise quiet repository. Using --force is not necessary for an initial import into an empty repository."
-msgstr ""
-"As atualiza챌천es das ramifica챌천es podem ser impostas com a op챌찾o `--force`, "
-"mas 챕 recomend찼vel que isso seja utilizado apenas em um reposit처rio "
-"silencioso. O uso da op챌찾o `--force` n찾o 챕 necess찼rio para uma importa챌찾o "
-"inicial para um reposit처rio vazio."
+msgstr "As atualiza챌천es das ramifica챌천es podem ser impostas com a op챌찾o `--force`, mas 챕 recomend찼vel que isso seja utilizado apenas em um reposit처rio silencioso. O uso da op챌찾o `--force` n찾o 챕 necess찼rio para uma importa챌찾o inicial para um reposit처rio vazio."
#. type: Title -
#: en/git-fast-import.txt:226
@@ -25003,12 +21369,7 @@ msgstr "FORMATO DE ENTRADA"
#: en/git-fast-import.txt:250
#, priority:100
msgid "With the exception of raw file data (which Git does not interpret) the fast-import input format is text (ASCII) based. This text based format simplifies development and debugging of frontend programs, especially when a higher level language such as Perl, Python or Ruby is being used."
-msgstr ""
-"Com exce챌찾o dos dados brutos do arquivo (que o Git n찾o interpreta), o "
-"formato de entrada do `fast-import` 챕 baseado em texto (ASCII). Esse "
-"formato baseado em texto simplifica o desenvolvimento e a depura챌찾o dos "
-"programas front-end, especialmente quando uma linguagem de n챠vel superior, "
-"como o Perl, Python ou Ruby, est찼 sendo utilizado."
+msgstr "Com exce챌찾o dos dados brutos do arquivo (que o Git n찾o interpreta), o formato de entrada do `fast-import` 챕 baseado em texto (ASCII). Esse formato baseado em texto simplifica o desenvolvimento e a depura챌찾o dos programas front-end, especialmente quando uma linguagem de n챠vel superior, como o Perl, Python ou Ruby, est찼 sendo utilizado."
#. type: Plain text
#: en/git-fast-import.txt:258
@@ -25026,13 +21387,7 @@ msgstr "Coment찼rios do fluxo"
#: en/git-fast-import.txt:267
#, priority:100
msgid "To aid in debugging frontends fast-import ignores any line that begins with `#` (ASCII pound/hash) up to and including the line ending `LF`. A comment line may contain any sequence of bytes that does not contain an LF and therefore may be used to include any detailed debugging information that might be specific to the frontend and useful when inspecting a fast-import data stream."
-msgstr ""
-"Para ajudar na depura챌찾o de front-ends, o `fast-import` ignora qualquer "
-"linha que comece com `#` (ASCII libra/hash) at챕, e incluindo, a linha que "
-"termina com `LF`. Uma linha de coment찼rio pode conter qualquer sequ챗ncia de "
-"bytes que n찾o contenha um `LF` e, portanto, pode ser utilizado para incluir "
-"qualquer informa챌찾o detalhada de depura챌찾o que possa ser espec챠fica do front-"
-"end e 첬til ao inspecionar um fluxo de dados do `fast-import`."
+msgstr "Para ajudar na depura챌찾o de front-ends, o `fast-import` ignora qualquer linha que comece com `#` (ASCII libra/hash) at챕, e incluindo, a linha que termina com `LF`. Uma linha de coment찼rio pode conter qualquer sequ챗ncia de bytes que n찾o contenha um `LF` e, portanto, pode ser utilizado para incluir qualquer informa챌찾o detalhada de depura챌찾o que possa ser espec챠fica do front-end e 첬til ao inspecionar um fluxo de dados do `fast-import`."
#. type: Title ~
#: en/git-fast-import.txt:269
@@ -25044,10 +21399,7 @@ msgstr "Formatos de data"
#: en/git-fast-import.txt:273
#, priority:100
msgid "The following date formats are supported. A frontend should select the format it will use for this import by passing the format name in the --date-format=<fmt> command-line option."
-msgstr ""
-"Os seguintes formatos s찾o compat챠veis. Um front-end deve selecionar o "
-"formato que ser찼 utilizado para essa importa챌찾o, passando o nome do formato "
-"na op챌찾o da linha de comando `--date-format=<fmt>`."
+msgstr "Os seguintes formatos s찾o compat챠veis. Um front-end deve selecionar o formato que ser찼 utilizado para essa importa챌찾o, passando o nome do formato na op챌찾o da linha de comando `--date-format=<fmt>`."
#. type: Labeled list
#: en/git-fast-import.txt:274
@@ -25059,10 +21411,7 @@ msgstr "`raw`"
#: en/git-fast-import.txt:278
#, priority:100
msgid "This is the Git native format and is `<time> SP <offutc>`. It is also fast-import's default format, if --date-format was not specified."
-msgstr ""
-"Este 챕 o formato nativo do Git que 챕 `<tempo> SP <offutc>`. Tamb챕m 챕 o "
-"formato predefinido do `fast-import`, caso `--date-format` n찾o seja "
-"utilizado."
+msgstr "Este 챕 o formato nativo do Git que 챕 `<tempo> SP <offutc>`. Tamb챕m 챕 o formato predefinido do `fast-import`, caso `--date-format` n찾o seja utilizado."
#. type: Plain text
#: en/git-fast-import.txt:282
@@ -25104,10 +21453,7 @@ msgstr "Este 챕 o formato de email padr찾o, conforme est찼 descrito pela RFC 282
#: en/git-fast-import.txt:305
#, priority:100
msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git parser is accurate, but a little on the lenient side. It is the same parser used by 'git am' when applying patches received from email."
-msgstr ""
-"Um valor de exemplo 챕 ``Ter 6 de fevereiro 11:22:18 2007 -0500''. O "
-"analisador do Git 챕 preciso, por챕m um pouco tolerante. 횋 o mesmo analisador "
-"utilizado pelo 'git am' ao aplicar os patches recebidos de email."
+msgstr "Um valor de exemplo 챕 ``Ter 6 de fevereiro 11:22:18 2007 -0500''. O analisador do Git 챕 preciso, por챕m um pouco tolerante. 횋 o mesmo analisador utilizado pelo 'git am' ao aplicar os patches recebidos de email."
#. type: Plain text
#: en/git-fast-import.txt:311
@@ -25119,11 +21465,7 @@ msgstr "Algumas cadeias de caracteres (strings) malformadas podem ser aceitas co
#: en/git-fast-import.txt:316
#, priority:100
msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage. Therefore it is important that this information be as accurate as possible."
-msgstr ""
-"Diferentemente do formato `bruto` acima, as informa챌천es de compensa챌찾o do "
-"fuso hor찼rio/UTC contidas em uma sequ챗ncia de datas RFC 2822, s찾o utilizadas "
-"para ajustar o valor da data para UTC antes do armazenamento. Portanto, 챕 "
-"importante que essas informa챌천es sejam as mais precisas poss챠veis."
+msgstr "Diferentemente do formato `bruto` acima, as informa챌천es de compensa챌찾o do fuso hor찼rio/UTC contidas em uma sequ챗ncia de datas RFC 2822, s찾o utilizadas para ajustar o valor da data para UTC antes do armazenamento. Portanto, 챕 importante que essas informa챌천es sejam as mais precisas poss챠veis."
#. type: Plain text
#: en/git-fast-import.txt:321
@@ -25147,9 +21489,7 @@ msgstr "`now`"
#: en/git-fast-import.txt:330
#, priority:100
msgid "Always use the current time and time zone. The literal `now` must always be supplied for `<when>`."
-msgstr ""
-"Sempre utilize a hora e o fuso hor찼rio atual. O literal `now` sempre deve "
-"ser informado em `<quando>`."
+msgstr "Sempre utilize a hora e o fuso hor찼rio atual. O literal `now` sempre deve ser informado em `<quando>`."
#. type: Plain text
#: en/git-fast-import.txt:335
@@ -25161,22 +21501,13 @@ msgstr "Este 챕 um formato de brinquedo. A hora e o fuso hor찼rio atual deste s
#: en/git-fast-import.txt:340
#, priority:100
msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
-msgstr ""
-"Esse formato em particular 챕 informado para implementa챌찾o curta e pode ser "
-"첬til para um processo onde se deseja criar um novo commit imediatamente, sem "
-"a necessidade de usar um diret처rio ativo ou `git update-index`."
+msgstr "Esse formato em particular 챕 informado para implementa챌찾o curta e pode ser 첬til para um processo onde se deseja criar um novo commit imediatamente, sem a necessidade de usar um diret처rio ativo ou `git update-index`."
#. type: Plain text
#: en/git-fast-import.txt:347
#, priority:100
msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command). The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
-msgstr ""
-"Caso o `autor` e o `committer` sejam utilizados de forma separadas em um "
-"`commit`, os registro de data e hora podem n찾o coincidir, pois o rel처gio do "
-"sistema ser찼 pesquisado duas vezes (uma vez para cada comando). A 첬nica "
-"maneira de garantir que as informa챌천es de identidade do autor e de quem fez "
-"o commit tenham o mesmo registro de data e hora 챕 omitir o `autor` (copiando "
-"assim do `committer`) ou usar um formato de data diferente de `now`."
+msgstr "Caso o `autor` e o `committer` sejam utilizados de forma separadas em um `commit`, os registro de data e hora podem n찾o coincidir, pois o rel처gio do sistema ser찼 pesquisado duas vezes (uma vez para cada comando). A 첬nica maneira de garantir que as informa챌천es de identidade do autor e de quem fez o commit tenham o mesmo registro de data e hora 챕 omitir o `autor` (copiando assim do `committer`) ou usar um formato de data diferente de `now`."
#. type: Title ~
#: en/git-fast-import.txt:349
@@ -25224,10 +21555,7 @@ msgstr "`reset`"
#: en/git-fast-import.txt:369
#, priority:100
msgid "Reset an existing branch (or a new branch) to a specific revision. This command must be used to change a branch to a specific revision without making a commit on it."
-msgstr ""
-"Redefina uma ramifica챌찾o existente (ou uma nova ramifica챌찾o) para "
-"determinada revis찾o. Este comando deve ser utilizado para alterar uma "
-"ramifica챌찾o para uma revis찾o espec챠fica sem fazer um commit nela."
+msgstr "Redefina uma ramifica챌찾o existente (ou uma nova ramifica챌찾o) para determinada revis찾o. Este comando deve ser utilizado para alterar uma ramifica챌찾o para uma revis찾o espec챠fica sem fazer um commit nela."
#. type: Title ~
#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
@@ -25287,10 +21615,7 @@ msgstr "`done`"
#: en/git-fast-import.txt:397
#, priority:100
msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
-msgstr ""
-"Faz a marca챌찾o do fim do fluxo. Este comando 챕 opcional, a menos que o "
-"recurso `done` tenha sido solicitado utilizando a op챌찾o de linha de comando` "
-"--done` ou o comando `feature done`."
+msgstr "Faz a marca챌찾o do fim do fluxo. Este comando 챕 opcional, a menos que o recurso `done` tenha sido solicitado utilizando a op챌찾o de linha de comando` --done` ou o comando `feature done`."
#. type: Title ~
#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
@@ -25390,13 +21715,7 @@ msgstr ""
#: en/git-fast-import.txt:447
#, priority:100
msgid "where `<ref>` is the name of the branch to make the commit on. Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`. The value of `<ref>` must be a valid refname in Git. As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
-msgstr ""
-"onde `<ref>` 챕 o nome do ramo no qual o commit deve ser feito. Normalmente, "
-"os nomes dos ramos s찾o prefixados com `refs/heads/` no Git, portanto, a "
-"importa챌찾o do s챠mbolo do ramo CVS `RELENG-1_0` utilizaria `refs/heads/"
-"RELENG-1_0` como o valor de `<ref>`. O valor de `<ref>` deve ser um "
-"\"refname\" v찼lido no Git. Como `LF` n찾o 챕 v찼lido em um \"refname\" do Git, "
-"nenhuma sintaxe de aspas ou de escape 챕 compat챠vel aqui."
+msgstr "onde `<ref>` 챕 o nome do ramo no qual o commit deve ser feito. Normalmente, os nomes dos ramos s찾o prefixados com `refs/heads/` no Git, portanto, a importa챌찾o do s챠mbolo do ramo CVS `RELENG-1_0` utilizaria `refs/heads/RELENG-1_0` como o valor de `<ref>`. O valor de `<ref>` deve ser um \"refname\" v찼lido no Git. Como `LF` n찾o 챕 v찼lido em um \"refname\" do Git, nenhuma sintaxe de aspas ou de escape 챕 compat챠vel aqui."
#. type: Plain text
#: en/git-fast-import.txt:453
@@ -25408,38 +21727,19 @@ msgstr "Um comando de marca챌찾o `mark` pode aparecer opcionalmente, solicitando
#: en/git-fast-import.txt:459
#, priority:100
msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax). To import an empty commit message use a 0 length data. Commit messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
-msgstr ""
-"O comando `data` ap처s o `committer` deve suprir a mensagem do commit (veja "
-"abaixo a sintaxe do comando `data`). Para importar uma mensagem vazia de "
-"commit, utilize os dados com 0 de comprimento. As mensagens do commit s찾o "
-"de livre formato e n찾o s찾o interpretadas pelo Git. Atualmente, elas devem "
-"ser codificadas em UTF-8, pois o `fast-import` n찾o permite que outras "
-"codifica챌천es sejam utilizadas."
+msgstr "O comando `data` ap처s o `committer` deve suprir a mensagem do commit (veja abaixo a sintaxe do comando `data`). Para importar uma mensagem vazia de commit, utilize os dados com 0 de comprimento. As mensagens do commit s찾o de livre formato e n찾o s찾o interpretadas pelo Git. Atualmente, elas devem ser codificadas em UTF-8, pois o `fast-import` n찾o permite que outras codifica챌천es sejam utilizadas."
#. type: Plain text
#: en/git-fast-import.txt:467
#, priority:100
msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit. These commands may be supplied in any order. However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
-msgstr ""
-"Zero ou mais comandos como `filemodify`, `filedelete`, `filecopy`, "
-"`filerename`, `filedeleteall` e `notemodify` podem ser inclu챠dos para "
-"atualizar o conte첬do do ramo antes de criar o commit. Estes comandos podem "
-"ser utilizados em qualquer ordem. No entanto, 챕 recomendado que um comando "
-"`filedeleteall` preceda todos os comandos `filemodify`, `filecopy`, "
-"`filerename` e `notemodify` no mesmo commit, j찼 que `filedeleteall` limpa a "
-"ramifica챌찾o (veja abaixo)."
+msgstr "Zero ou mais comandos como `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` e `notemodify` podem ser inclu챠dos para atualizar o conte첬do do ramo antes de criar o commit. Estes comandos podem ser utilizados em qualquer ordem. No entanto, 챕 recomendado que um comando `filedeleteall` preceda todos os comandos `filemodify`, `filecopy`, `filerename` e `notemodify` no mesmo commit, j찼 que `filedeleteall` limpa a ramifica챌찾o (veja abaixo)."
#. type: Plain text
#: en/git-fast-import.txt:474
#, 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 retrocompatibilidade, 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."
+msgstr "O 'LF' ap처s o comando 챕 opcional (costumava ser obrigat처rio). Observe que por raz천es de retrocompatibilidade, 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:476
@@ -25475,11 +21775,7 @@ msgstr "Aqui `<name>` 챕 o nome de exibi챌찾o da pessoa (``Com M Itter'' por exe
#: en/git-fast-import.txt:500
#, priority:100
msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option. See ``Date Formats'' above for the set of supported formats, and their syntax."
-msgstr ""
-"A hora da altera챌찾o 챕 especificada por `<quando>` utilizando o formato de "
-"data selecionado pela op챌찾o da linha de comando `--date-format=<fmt>`. "
-"Consulte ``Formatos de data'' acima para obter o conjunto de formatos "
-"compat챠veis e a sua sintaxe."
+msgstr "A hora da altera챌찾o 챕 especificada por `<quando>` utilizando o formato de data selecionado pela op챌찾o da linha de comando `--date-format=<fmt>`. Consulte ``Formatos de data'' acima para obter o conjunto de formatos compat챠veis e a sua sintaxe."
#. type: Title ^
#: en/git-fast-import.txt:502
@@ -25509,15 +21805,7 @@ msgstr "O comando `from` 챕 utilizado para especificar o commit para inicializar
#: en/git-fast-import.txt:524
#, priority:100
msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project. If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree. Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
-msgstr ""
-"Omitir o comando `from` no primeiro commit de uma nova ramifica챌찾o far찼 com "
-"que o `fast-import` crie este commit sem antecessor. Isso tende a ser "
-"desejado apenas para o commit inicial de um projeto. Caso o front-end crie "
-"todos os arquivos do zero ao criar uma nova ramifica챌찾o, um comando `merge` "
-"poder찼 ser utilizado em vez de `from` para iniciar o commit com uma 찼rvore "
-"vazia. Omitir o comando `from` em ramifica챌천es existentes 챕 geralmente "
-"desejado, pois o commit atual neste ramo 챕 automaticamente assumido como o "
-"primeiro antecessor do novo commit."
+msgstr "Omitir o comando `from` no primeiro commit de uma nova ramifica챌찾o far찼 com que o `fast-import` crie este commit sem antecessor. Isso tende a ser desejado apenas para o commit inicial de um projeto. Caso o front-end crie todos os arquivos do zero ao criar uma nova ramifica챌찾o, um comando `merge` poder찼 ser utilizado em vez de `from` para iniciar o commit com uma 찼rvore vazia. Omitir o comando `from` em ramifica챌천es existentes 챕 geralmente desejado, pois o commit atual neste ramo 챕 automaticamente assumido como o primeiro antecessor do novo commit."
#. type: Plain text
#: en/git-fast-import.txt:527
@@ -25547,20 +21835,13 @@ msgstr "A marca챌찾o de refer챗ncia, `:<idnum>`, onde `<idnum>` seja o n첬mero d
#: en/git-fast-import.txt:541
#, priority:100
msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name. The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
-msgstr ""
-"O motivo do `fast-import` utilizar `:` para indicar uma marca챌찾o de "
-"refer챗ncia, este caractere n찾o 챕 legal com um nome do ramo do Git. O `:` "
-"principal facilita a distin챌찾o entre a marca챌찾o 42 (`:42`) e a ramifica챌찾o "
-"42 (`42` ou `refs/heads/42`), ou um SHA-1 abreviado que passou a consistir "
-"apenas em d챠gitos com base 10."
+msgstr "O motivo do `fast-import` utilizar `:` para indicar uma marca챌찾o de refer챗ncia, este caractere n찾o 챕 legal com um nome do ramo do Git. O `:` principal facilita a distin챌찾o entre a marca챌찾o 42 (`:42`) e a ramifica챌찾o 42 (`42` ou `refs/heads/42`), ou um SHA-1 abreviado que passou a consistir apenas em d챠gitos com base 10."
#. type: Plain text
#: en/git-fast-import.txt:543
#, priority:100
msgid "Marks must be declared (via `mark`) before they can be used."
-msgstr ""
-"As marca챌천es devem ser declaradas (atrav챕s de `mark`) antes de poderem ser "
-"utilizadas."
+msgstr "As marca챌천es devem ser declaradas (atrav챕s de `mark`) antes de poderem ser utilizadas."
#. type: Plain text
#: en/git-fast-import.txt:545
@@ -25572,9 +21853,7 @@ msgstr "Um commit completo com 40 bytes ou um SHA-1 abreviado em hexadecimal."
#: en/git-fast-import.txt:548
#, priority:100
msgid "Any valid Git SHA-1 expression that resolves to a commit. See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
-msgstr ""
-"Qualquer express찾o Git SHA-1 v찼lido que resolva para um commit. Consulte ``"
-"DEFININDO AS REVIS횛ES'' em linkgit:gitrevisions[7] para mais detalhes."
+msgstr "Qualquer express찾o Git SHA-1 v찼lido que resolva para um commit. Consulte ``DEFININDO AS REVIS횛ES'' em linkgit:gitrevisions[7] para mais detalhes."
#. type: Plain text
#: en/git-fast-import.txt:551
@@ -25586,9 +21865,7 @@ msgstr "O SHA-1 nulo especial (40 zeros) especifica que a ramifica챌찾o deve ser
#: en/git-fast-import.txt:554
#, priority:100
msgid "The special case of restarting an incremental import from the current branch value should be written as:"
-msgstr ""
-"O caso especial de reiniciar uma importa챌찾o incremental do valor atual do "
-"ramo deve ser escrito como:"
+msgstr "O caso especial de reiniciar uma importa챌찾o incremental do valor atual do ramo deve ser escrito como:"
#. type: delimited block -
#: en/git-fast-import.txt:556
@@ -25600,13 +21877,7 @@ msgstr "\tfrom refs/heads/branch^0\n"
#: en/git-fast-import.txt:563
#, priority:100
msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input. Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
-msgstr ""
-"O sufixo `^0` 챕 necess찼rio, pois a importa챌찾o r찼pida n찾o permite que uma "
-"ramifica챌찾o inicie por si mesma e a ramifica챌찾o 챕 criada na mem처ria antes "
-"que o comando `from` seja lido pela entrada. Adicionar o `^0` ir찼 impor que "
-"o `fast-import` resolva o commit atrav챕s da biblioteca de an찼lise de revis찾o "
-"do Git, em vez de sua tabela de ramifica챌찾o interna, carregando assim o "
-"valor existente do ramo."
+msgstr "O sufixo `^0` 챕 necess찼rio, pois a importa챌찾o r찼pida n찾o permite que uma ramifica챌찾o inicie por si mesma e a ramifica챌찾o 챕 criada na mem처ria antes que o comando `from` seja lido pela entrada. Adicionar o `^0` ir찼 impor que o `fast-import` resolva o commit atrav챕s da biblioteca de an찼lise de revis찾o do Git, em vez de sua tabela de ramifica챌찾o interna, carregando assim o valor existente do ramo."
#. type: Title ^
#: en/git-fast-import.txt:565
@@ -25648,9 +21919,7 @@ msgstr "Formato de dados externos"
#: en/git-fast-import.txt:586
#, priority:100
msgid "The data content for the file was already supplied by a prior `blob` command. The frontend just needs to connect it."
-msgstr ""
-"O conte첬do dos dados para o arquivo j찼 foi informado por um comando `blob` "
-"anterior. O front-end s처 precisa conect찼-lo."
+msgstr "O conte첬do dos dados para o arquivo j찼 foi informado por um comando `blob` anterior. O front-end s처 precisa conect찼-lo."
#. type: delimited block .
#: en/git-fast-import.txt:589
@@ -25674,9 +21943,7 @@ msgstr "Formato de dados em linha"
#: en/git-fast-import.txt:601
#, priority:100
msgid "The data content for the file has not been supplied yet. The frontend wants to supply it as part of this modify command."
-msgstr ""
-"O conte첬do dos dados para o arquivo ainda n찾o foi informado. O front-end "
-"deseja fornec챗-lo como parte deste comando de modifica챌찾o."
+msgstr "O conte첬do dos dados para o arquivo ainda n찾o foi informado. O front-end deseja fornec챗-lo como parte deste comando de modifica챌찾o."
#. type: delimited block .
#: en/git-fast-import.txt:605
@@ -25704,10 +21971,7 @@ msgstr "Nos dois formatos o `<modo>` 챕 o tipo de entrada do arquivo em formato
#: en/git-fast-import.txt:615
#, priority:100
msgid "`100644` or `644`: A normal (not-executable) file. The majority of files in most projects use this mode. If in doubt, this is what you want."
-msgstr ""
-"`100644` ou `644`: um arquivo normal (n찾o execut찼vel). A maioria dos "
-"arquivos na maioria dos projetos utiliza este modo. Em caso de d첬vida, 챕 "
-"isso mesmo que deve ser utilizado."
+msgstr "`100644` ou `644`: um arquivo normal (n찾o execut찼vel). A maioria dos arquivos na maioria dos projetos utiliza este modo. Em caso de d첬vida, 챕 isso mesmo que deve ser utilizado."
#. type: Plain text
#: en/git-fast-import.txt:616
@@ -25725,11 +21989,7 @@ msgstr "`120000`: um link simb처lico, o conte첬do do arquivo ser찼 o destino do
#: en/git-fast-import.txt:620
#, priority:100
msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
-msgstr ""
-"`160000`: Um gitlink SHA-1 do objeto referindo-se a um commit em outro "
-"reposit처rio. Os links Git podem ser especificados apenas pelo SHA ou por "
-"meio de uma marca챌찾o do commit. Eles s찾o utilizados para implementar os "
-"subm처dulos."
+msgstr "`160000`: Um gitlink SHA-1 do objeto referindo-se a um commit em outro reposit처rio. Os links Git podem ser especificados apenas pelo SHA ou por meio de uma marca챌찾o do commit. Eles s찾o utilizados para implementar os subm처dulos."
#. type: Plain text
#: en/git-fast-import.txt:622
@@ -25795,8 +22055,7 @@ msgstr "A raiz da 찼rvore pode ser representada por uma cadeia de caracteres vaz
#: en/git-fast-import.txt:648
#, priority:100
msgid "It is recommended that `<path>` always be encoded using UTF-8."
-msgstr ""
-"횋 recomend찼vel que o `<caminho>` seja sempre codificado utilizando UTF-8."
+msgstr "횋 recomend찼vel que o `<caminho>` seja sempre codificado utilizando UTF-8."
#. type: Title ^
#: en/git-fast-import.txt:650
@@ -25808,12 +22067,7 @@ msgstr "`filedelete`"
#: en/git-fast-import.txt:656
#, priority:100
msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch. If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too. This cascades up the tree until the first non-empty directory or the root is reached."
-msgstr ""
-"Inclu챠do no comando `commit` para remover um arquivo ou excluir "
-"recursivamente um diret처rio inteiro do ramo. Caso a remo챌찾o do arquivo ou "
-"diret처rio deixar o seu diret처rio de origem vazio, o diret처rio de origem "
-"tamb챕m ser찼 automaticamente removido. Isso faz segue na 찼rvore at챕 que o "
-"primeiro diret처rio n찾o vazio ou at챕 que chegue at챕 a raiz."
+msgstr "Inclu챠do no comando `commit` para remover um arquivo ou excluir recursivamente um diret처rio inteiro do ramo. Caso a remo챌찾o do arquivo ou diret처rio deixar o seu diret처rio de origem vazio, o diret처rio de origem tamb챕m ser찼 automaticamente removido. Isso faz segue na 찼rvore at챕 que o primeiro diret처rio n찾o vazio ou at챕 que chegue at챕 a raiz."
#. type: delimited block .
#: en/git-fast-import.txt:659
@@ -25825,10 +22079,7 @@ msgstr "\t'D' SP <caminho> LF\n"
#: en/git-fast-import.txt:664
#, 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 o '<path>' 챕 o caminho completo do arquivo ou subdiret처rio que ser찼 "
-"removido do ramo. Consulte `filemodify` acima para obter uma descri챌찾o mais "
-"detalhada sobre `<path>`."
+msgstr "aqui o '<path>' 챕 o caminho completo do arquivo ou subdiret처rio que ser찼 removido do ramo. Consulte `filemodify` acima para obter uma descri챌찾o mais detalhada sobre `<path>`."
#. type: Title ^
#: en/git-fast-import.txt:666
@@ -25840,11 +22091,7 @@ msgstr "`filecopy`"
#: en/git-fast-import.txt:671
#, priority:100
msgid "Recursively copies an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be completely replaced by the content copied from the source."
-msgstr ""
-"Recursivamente copie um arquivo ou subdiret처rio existente para um local "
-"diferente dentro do ramo. O arquivo ou diret처rio existente deve existir. "
-"Caso o destino exista, ele ser찼 completamente substitu챠do pelo conte첬do "
-"copiado da fonte."
+msgstr "Recursivamente copie um arquivo ou subdiret처rio existente para um local diferente dentro do ramo. O arquivo ou diret처rio existente deve existir. Caso o destino exista, ele ser찼 completamente substitu챠do pelo conte첬do copiado da fonte."
#. type: delimited block .
#: en/git-fast-import.txt:674
@@ -25874,10 +22121,7 @@ msgstr "`filerename`"
#: en/git-fast-import.txt:691
#, priority:100
msgid "Renames an existing file or subdirectory to a different location within the branch. The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
-msgstr ""
-"Renomeia um arquivo ou subdiret처rio existente para um local diferente dentro "
-"do ramo. O arquivo ou diret처rio existente deve existir. Caso o destino "
-"exista, ele ser찼 substitu챠do pelo diret처rio de origem."
+msgstr "Renomeia um arquivo ou subdiret처rio existente para um local diferente dentro do ramo. O arquivo ou diret처rio existente deve existir. Caso o destino exista, ele ser찼 substitu챠do pelo diret처rio de origem."
#. type: delimited block .
#: en/git-fast-import.txt:694
@@ -25895,14 +22139,7 @@ msgstr "Um comando `filerename` entra em vigor imediatamente. Depois que o loca
#: en/git-fast-import.txt:714
#, priority:100
msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location. There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import. This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
-msgstr ""
-"Observe que um `filename` 챕 o mesmo que um` filecopy` seguido de um "
-"`filedelete` do local de origem. H찼 uma pequena vantagem de desempenho em "
-"usar o `filename`, mas a vantagem 챕 t찾o pequena que nunca vale a pena tentar "
-"converter um par de exclus찾o/adi챌찾o no material de origem em uma renomea챌찾o "
-"para o `fast-import`. Este comando `filerename` 챕 informado apenas para "
-"simplificar os front-ends que j찼 possuam informa챌천es de renomea챌찾o e n찾o "
-"querem se decompor em um `filecopy` seguido de um `filedelete`."
+msgstr "Observe que um `filename` 챕 o mesmo que um` filecopy` seguido de um `filedelete` do local de origem. H찼 uma pequena vantagem de desempenho em usar o `filename`, mas a vantagem 챕 t찾o pequena que nunca vale a pena tentar converter um par de exclus찾o/adi챌찾o no material de origem em uma renomea챌찾o para o `fast-import`. Este comando `filerename` 챕 informado apenas para simplificar os front-ends que j찼 possuam informa챌천es de renomea챌찾o e n찾o querem se decompor em um `filecopy` seguido de um `filedelete`."
#. type: Title ^
#: en/git-fast-import.txt:716
@@ -25914,11 +22151,7 @@ msgstr "`filedeleteall`"
#: en/git-fast-import.txt:721
#, priority:100
msgid "Included in a `commit` command to remove all files (and also all directories) from the branch. This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
-msgstr ""
-"Inclu챠do no comando `commit` para remover todos os arquivos (e tamb챕m todos "
-"os diret처rios) do ramo. Este comando redefine a estrutura interna do ramo "
-"para que exista nenhum arquivo nele, permitindo que o \"front-end\" adicione "
-"posteriormente todos os arquivos interessantes do zero."
+msgstr "Inclu챠do no comando `commit` para remover todos os arquivos (e tamb챕m todos os diret처rios) do ramo. Este comando redefine a estrutura interna do ramo para que exista nenhum arquivo nele, permitindo que o \"front-end\" adicione posteriormente todos os arquivos interessantes do zero."
#. type: delimited block .
#: en/git-fast-import.txt:724
@@ -25954,9 +22187,7 @@ msgstr "Inclu챠do em um comando `commit` `<notes_ref>` para adicionar uma nova n
#: en/git-fast-import.txt:754
#, priority:100
msgid "The data content for the note was already supplied by a prior `blob` command. The frontend just needs to connect it to the commit that is to be annotated."
-msgstr ""
-"O conte첬do dos dados para a anota챌찾o j찼 foi informado por um comando `blob` "
-"anterior. O front-end s처 precisa conect찼-lo ao commit que deve ser anotado."
+msgstr "O conte첬do dos dados para a anota챌찾o j찼 foi informado por um comando `blob` anterior. O front-end s처 precisa conect찼-lo ao commit que deve ser anotado."
#. type: delimited block .
#: en/git-fast-import.txt:757
@@ -25974,9 +22205,7 @@ msgstr "Aqui `<dataref>` pode ser uma marca챌찾o de refer챗ncia (`:<idnum>`) def
#: en/git-fast-import.txt:767
#, priority:100
msgid "The data content for the note has not been supplied yet. The frontend wants to supply it as part of this modify command."
-msgstr ""
-"O conte첬do dos dados da anota챌찾o ainda n찾o foi informado. O front-end "
-"deseja fornec챗-lo como parte deste comando de modifica챌찾o."
+msgstr "O conte첬do dos dados da anota챌찾o ainda n찾o foi informado. O front-end deseja fornec챗-lo como parte deste comando de modifica챌찾o."
#. type: delimited block .
#: en/git-fast-import.txt:771
@@ -26016,11 +22245,7 @@ msgstr "\t'mark' SP ':' <idnum> LF\n"
#: en/git-fast-import.txt:794
#, priority:100
msgid "where `<idnum>` is the number assigned by the frontend to this mark. The value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is reserved and cannot be used as a mark. Only values greater than or equal to 1 may be used as marks."
-msgstr ""
-"onde `<idnum>` 챕 o n첬mero atribu챠do pelo front-end a esta marca챌찾o. O valor "
-"de `<idnum>` 챕 expresso como um n첬mero ASCII decimal inteiro. O valor 0 챕 "
-"reservado e n찾o pode ser utilizado como uma marca챌찾o. Somente os valores "
-"maiores ou iguais a 1 podem ser utilizados como marca챌찾o."
+msgstr "onde `<idnum>` 챕 o n첬mero atribu챠do pelo front-end a esta marca챌찾o. O valor de `<idnum>` 챕 expresso como um n첬mero ASCII decimal inteiro. O valor 0 챕 reservado e n찾o pode ser utilizado como uma marca챌찾o. Somente os valores maiores ou iguais a 1 podem ser utilizados como marca챌찾o."
#. type: Plain text
#: en/git-fast-import.txt:798
@@ -26104,13 +22329,7 @@ msgstr "O comando `tagger` usa o mesmo formato que `committer` dentro de `commit
#: en/git-fast-import.txt:848
#, priority:100
msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax). To import an empty tag message use a 0 length data. Tag messages are free-form and are not interpreted by Git. Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
-msgstr ""
-"O comando `data` ap처s o `tagger` deve fornecer a mensagem anotada do tag ("
-"veja abaixo a sintaxe do comando `data`). Para importar uma mensagem de tag "
-"vazia, utilize dados com 0 de comprimento. As mensagens de tag s찾o de "
-"forma livre e n찾o s찾o interpretados pelo Git. Atualmente, elas devem ser "
-"codificadas em UTF-8, pois o `fast-import` n찾o permite que outras "
-"codifica챌천es sejam utilizadas."
+msgstr "O comando `data` ap처s o `tagger` deve fornecer a mensagem anotada do tag (veja abaixo a sintaxe do comando `data`). Para importar uma mensagem de tag vazia, utilize dados com 0 de comprimento. As mensagens de tag s찾o de forma livre e n찾o s찾o interpretados pelo Git. Atualmente, elas devem ser codificadas em UTF-8, pois o `fast-import` n찾o permite que outras codifica챌천es sejam utilizadas."
#. type: Plain text
#: en/git-fast-import.txt:856
@@ -26206,14 +22425,7 @@ msgstr "`data`"
#: en/git-fast-import.txt:913
#, priority:100
msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import. Data can be supplied using an exact byte count or delimited with a terminating line. Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better. The delimited format is intended primarily for testing fast-import."
-msgstr ""
-"Fornece os dados brutos (para uso como o conte첬do bolha/arquivo, as "
-"mensagens do commit ou as mensagens de anota챌찾o das tags) para o `fast-"
-"import`. Os dados podem ser informados utilizando uma contagem exata de "
-"bytes ou delimitados por uma linha final. Os front-ends reais destinados "
-"para convers천es de qualidade de produ챌찾o devem sempre usar o formato exato "
-"de contagem de bytes, pois s찾o mais robustos e t챗m um melhor desempenho. O "
-"formato delimitado destina-se principalmente ao teste de importa챌찾o r찼pida."
+msgstr "Fornece os dados brutos (para uso como o conte첬do bolha/arquivo, as mensagens do commit ou as mensagens de anota챌찾o das tags) para o `fast-import`. Os dados podem ser informados utilizando uma contagem exata de bytes ou delimitados por uma linha final. Os front-ends reais destinados para convers천es de qualidade de produ챌찾o devem sempre usar o formato exato de contagem de bytes, pois s찾o mais robustos e t챗m um melhor desempenho. O formato delimitado destina-se principalmente ao teste de importa챌찾o r찼pida."
#. type: Plain text
#: en/git-fast-import.txt:918
@@ -26265,11 +22477,7 @@ msgstr "Formato delimitado"
#: en/git-fast-import.txt:942
#, priority:100
msgid "A delimiter string is used to mark the end of the data. fast-import will compute the length by searching for the delimiter. This format is primarily useful for testing and is not recommended for real data."
-msgstr ""
-"Uma cadeia de caracteres delimitadora 챕 utilizada para marcar o final dos "
-"dados. O `fast-import` calcular찼 o comprimento pesquisando pelo "
-"delimitador. Esse formato 챕 첬til principalmente para testes e n찾o 챕 "
-"recomendado para dados reais."
+msgstr "Uma cadeia de caracteres delimitadora 챕 utilizada para marcar o final dos dados. O `fast-import` calcular찼 o comprimento pesquisando pelo delimitador. Esse formato 챕 첬til principalmente para testes e n찾o 챕 recomendado para dados reais."
#. type: delimited block .
#: en/git-fast-import.txt:948
@@ -26339,11 +22547,7 @@ msgstr ""
#: en/git-fast-import.txt:988
#, priority:100
msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller. During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
-msgstr ""
-"Observe que o `fast-import` alterna automaticamente os arquivos do pacote "
-"quando o arquivo do pacote atual alcance `--max-pack-size` ou 4 GiB, o que "
-"for menor. Durante uma troca autom찼tica do pacote de arquivos `fast-import "
-"n찾o atualiza os `refs`, tags ou marca챌천es do ramo."
+msgstr "Observe que o `fast-import` alterna automaticamente os arquivos do pacote quando o arquivo do pacote atual alcance `--max-pack-size` ou 4 GiB, o que for menor. Durante uma troca autom찼tica do pacote de arquivos `fast-import n찾o atualiza os `refs`, tags ou marca챌천es do ramo."
#. type: Plain text
#: en/git-fast-import.txt:993
@@ -26471,10 +22675,7 @@ msgstr "Lendo a partir do commit ativo"
#: en/git-fast-import.txt:1088
#, priority:100
msgid "This form can only be used in the middle of a `commit`. The path names a directory entry within fast-import's active commit. The path must be quoted in this case."
-msgstr ""
-"Este formul찼rio pode ser utilizado apenas no meio de um `commit`. O caminho "
-"nomeia uma entrada do diret처rio no commit ativo do `fast-import`. O caminho "
-"deve ser citado neste caso."
+msgstr "Este formul찼rio pode ser utilizado apenas no meio de um `commit`. O caminho nomeia uma entrada do diret처rio no commit ativo do `fast-import`. O caminho deve ser citado neste caso."
#. type: delimited block .
#: en/git-fast-import.txt:1091
@@ -26492,11 +22693,7 @@ msgstr "Lendo de uma 찼rvore nomeada"
#: en/git-fast-import.txt:1099
#, priority:100
msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written. The path is relative to the top level of the tree named by `<dataref>`."
-msgstr ""
-"O `<dataref>` pode ser uma marca챌찾o de refer챗ncia (`:<idnum>`) ou o SHA-1 "
-"completo com 40 bytes de uma tag, commit ou objeto da 찼rvore Git pr챕-"
-"existente ou aguardando para ser gravado. O caminho 챕 relativo ao cume da "
-"찼rvore informada atrav챕s do `<dataref>`."
+msgstr "O `<dataref>` pode ser uma marca챌찾o de refer챗ncia (`:<idnum>`) ou o SHA-1 completo com 40 bytes de uma tag, commit ou objeto da 찼rvore Git pr챕-existente ou aguardando para ser gravado. O caminho 챕 relativo ao cume da 찼rvore informada atrav챕s do `<dataref>`."
#. type: delimited block .
#: en/git-fast-import.txt:1102
@@ -26526,10 +22723,7 @@ msgstr "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <caminho> LF\n"
#: en/git-fast-import.txt:1115
#, priority:100
msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
-msgstr ""
-"O <dataref> representa o objeto bolha, 찼rvore ou commit em <caminho> e pode "
-"ser utilizado nos comandos posteriores `get-mark`, `cat-blob`, `filemodify` "
-"ou `ls`."
+msgstr "O <dataref> representa o objeto bolha, 찼rvore ou commit em <caminho> e pode ser utilizado nos comandos posteriores `get-mark`, `cat-blob`, `filemodify` ou `ls`."
#. type: Plain text
#: en/git-fast-import.txt:1118
@@ -26637,13 +22831,7 @@ msgstr "ls"
#: en/git-fast-import.txt:1166
#, priority:100
msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively. Versions of fast-import not supporting the specified command will exit with a message indicating so. This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
-msgstr ""
-"Exija que o back-end seja compat챠vel com os comandos `get-mark`, `cat-blob` "
-"ou `ls` respectivamente. As vers천es do `fast-import` que n찾o sejam "
-"compat챠veis com o comando utilizado ser찾o encerradas com uma mensagem. Isso "
-"permite que o erro de importa챌찾o encerre com uma mensagem clara, em vez de "
-"perder tempo na parte inicial de uma importa챌찾o antes que o comando que n찾o "
-"seja compat챠vel seja detectado."
+msgstr "Exija que o back-end seja compat챠vel com os comandos `get-mark`, `cat-blob` ou `ls` respectivamente. As vers천es do `fast-import` que n찾o sejam compat챠veis com o comando utilizado ser찾o encerradas com uma mensagem. Isso permite que o erro de importa챌찾o encerre com uma mensagem clara, em vez de perder tempo na parte inicial de uma importa챌찾o antes que o comando que n찾o seja compat챠vel seja detectado."
#. type: Labeled list
#: en/git-fast-import.txt:1167
@@ -26673,11 +22861,7 @@ msgstr "Indique um erro caso o fluxo termine sem um comando 'done'. Sem este re
#: en/git-fast-import.txt:1187
#, priority:100
msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs. Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
-msgstr ""
-"Processa a op챌찾o utilizada para que o `fast-import` do git se comporte de "
-"maneira que atenda 횪s necessidades do front-end. Observe que as op챌천es "
-"utilizadas pelo front-end s찾o substitu챠das por quaisquer op챌천es que o "
-"usu찼rio possa especificar para obter o pr처prio `fast-import`."
+msgstr "Processa a op챌찾o utilizada para que o `fast-import` do git se comporte de maneira que atenda 횪s necessidades do front-end. Observe que as op챌천es utilizadas pelo front-end s찾o substitu챠das por quaisquer op챌천es que o usu찼rio possa especificar para obter o pr처prio `fast-import`."
#. type: delimited block .
#: en/git-fast-import.txt:1190
@@ -26713,10 +22897,7 @@ msgstr "cat-blob-fd"
#: en/git-fast-import.txt:1213
#, priority:100
msgid "If the `done` feature is not in use, treated as if EOF was read. This can be used to tell fast-import to finish early."
-msgstr ""
-"Se o recurso `done` n찾o estiver em uso, ser찼 tratado como se o `EOF` fosse "
-"lido. Isso pode ser utilizado para dizer 횪 importa챌찾o r찼pida para terminar "
-"mais cedo."
+msgstr "Se o recurso `done` n찾o estiver em uso, ser찼 tratado como se o `EOF` fosse lido. Isso pode ser utilizado para dizer 횪 importa챌찾o r찼pida para terminar mais cedo."
#. type: Plain text
#: en/git-fast-import.txt:1217
@@ -26776,12 +22957,7 @@ msgstr "RELAT횙RIOS DE CRASH"
#: en/git-fast-import.txt:1254
#, priority:100
msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into. Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
-msgstr ""
-"Caso uma entrada inv찼lida seja utilizada na entrada do `fast-import`, ele "
-"terminar찼 com um status de sa챠da diferente de zero e criar찼 um relat처rio de "
-"falha no topo do reposit처rio Git de onde estava sendo importado. Os "
-"relat처rios de falha cont챗m um instant창neo da condi챌찾o interna do `fast-"
-"import`, bem como os comandos mais recentes que levaram 횪 falha."
+msgstr "Caso uma entrada inv찼lida seja utilizada na entrada do `fast-import`, ele terminar찼 com um status de sa챠da diferente de zero e criar찼 um relat처rio de falha no topo do reposit처rio Git de onde estava sendo importado. Os relat처rios de falha cont챗m um instant창neo da condi챌찾o interna do `fast-import`, bem como os comandos mais recentes que levaram 횪 falha."
#. type: Plain text
#: en/git-fast-import.txt:1261
@@ -26793,14 +22969,7 @@ msgstr "Todos os comandos recentes (incluindo os coment찼rios do fluxo, altera챌
#: en/git-fast-import.txt:1269
#, priority:100
msgid "After writing a crash report fast-import will close the current packfile and export the marks table. This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed. The modified branches and tags are not updated during a crash, as the import did not complete successfully. Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
-msgstr ""
-"Depois de escrever um relat처rio, o `fast-import` fechar찼 o pacote atual e "
-"exportar찼 a tabela de marca챌찾o. Isso permite que o desenvolvedor front-end "
-"inspecione a condi챌찾o do reposit처rio e retome a importa챌찾o a partir do ponto "
-"em que ele travou. As ramifica챌천es e tags modificadas n찾o s찾o atualizados "
-"durante uma falha, pois a importa챌찾o n찾o foi conclu챠da com 챗xito. As "
-"informa챌천es do ramo e marca챌찾o podem ser encontrados no relat처rio da falha e "
-"devem ser aplicadas manualmente caso a atualiza챌찾o seja necess찼ria."
+msgstr "Depois de escrever um relat처rio, o `fast-import` fechar찼 o pacote atual e exportar찼 a tabela de marca챌찾o. Isso permite que o desenvolvedor front-end inspecione a condi챌찾o do reposit처rio e retome a importa챌찾o a partir do ponto em que ele travou. As ramifica챌천es e tags modificadas n찾o s찾o atualizados durante uma falha, pois a importa챌찾o n찾o foi conclu챠da com 챗xito. As informa챌천es do ramo e marca챌찾o podem ser encontrados no relat처rio da falha e devem ser aplicadas manualmente caso a atualiza챌찾o seja necess찼ria."
#. type: Plain text
#: en/git-fast-import.txt:1271
@@ -26992,13 +23161,7 @@ msgstr "Utilize uma Marca챌찾o por Commit"
#: en/git-fast-import.txt:1348
#, priority:100
msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line. fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it. If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
-msgstr ""
-"Ao fazer uma convers찾o de reposit처rio, utilize uma marca챌찾o 첬nica por commit "
-"(`mark :<n>`) e forne챌a a op챌찾o `--export-marks` na linha de comando. O "
-"`fast-import` despeja um arquivo que lista todas as marca챌천es e o objeto Git "
-"SHA-1 que coincida com ela. Se o front-end puder vincular as marca챌천es ao "
-"reposit처rio de origem, 챕 f찼cil verificar a precis찾o e a integridade da "
-"importa챌찾o comparando cada commit do Git com a revis찾o de origem coincidente."
+msgstr "Ao fazer uma convers찾o de reposit처rio, utilize uma marca챌찾o 첬nica por commit (`mark :<n>`) e forne챌a a op챌찾o `--export-marks` na linha de comando. O `fast-import` despeja um arquivo que lista todas as marca챌천es e o objeto Git SHA-1 que coincida com ela. Se o front-end puder vincular as marca챌천es ao reposit처rio de origem, 챕 f찼cil verificar a precis찾o e a integridade da importa챌찾o comparando cada commit do Git com a revis찾o de origem coincidente."
#. type: Plain text
#: en/git-fast-import.txt:1352
@@ -27052,24 +23215,13 @@ msgstr "Alguns outros sistemas SCM permitem ao usu찼rio criar uma tag a partir d
#: en/git-fast-import.txt:1383
#, priority:100
msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag. Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
-msgstr ""
-"A importa챌찾o dessas tags como est찼 no Git 챕 imposs챠vel sem qe seja feito "
-"pelo menos um commit que ``corrija'' os arquivos para coincidir com o "
-"conte첬do da tag. Utilize o comando `reset` do `fast-import` para redefinir "
-"uma ramifica챌찾o fantasia fora do seu ramo normal para um commit base para a "
-"tag, depois confirme um ou mais corre챌천es dos arquivos de commits e por fim, "
-"identifique a ramifica챌찾o fantasia."
+msgstr "A importa챌찾o dessas tags como est찼 no Git 챕 imposs챠vel sem qe seja feito pelo menos um commit que ``corrija'' os arquivos para coincidir com o conte첬do da tag. Utilize o comando `reset` do `fast-import` para redefinir uma ramifica챌찾o fantasia fora do seu ramo normal para um commit base para a tag, depois confirme um ou mais corre챌천es dos arquivos de commits e por fim, identifique a ramifica챌찾o fantasia."
#. type: Plain text
#: en/git-fast-import.txt:1389
#, priority:100
msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
-msgstr ""
-"Uma vez que todas as ramifica챌천es normais s찾o armazenadas em `refs/heads/`, "
-"nomeie a tag de manuten챌찾o como `TAG_FIXUP` por exemplo. Dessa forma, 챕 "
-"imposs챠vel que a ramifica챌찾o de corre챌찾o utilizada pelo importador tenha os "
-"conflitos de \"namespace\" com as ramifica챌천es reais importadas da origem (o "
-"nome `TAG_FIXUP` n찾o 챕 `refs/heads/TAG_FIXUP`)."
+msgstr "Uma vez que todas as ramifica챌천es normais s찾o armazenadas em `refs/heads/`, nomeie a tag de manuten챌찾o como `TAG_FIXUP` por exemplo. Dessa forma, 챕 imposs챠vel que a ramifica챌찾o de corre챌찾o utilizada pelo importador tenha os conflitos de \"namespace\" com as ramifica챌천es reais importadas da origem (o nome `TAG_FIXUP` n찾o 챕 `refs/heads/TAG_FIXUP`)."
#. type: Plain text
#: en/git-fast-import.txt:1395
@@ -27099,13 +23251,7 @@ msgstr "Logo que o `fast-import` conclua, o reposit처rio Git estar찼 completamen
#: en/git-fast-import.txt:1411
#, priority:100
msgid "However repacking the repository is necessary to improve data locality and access performance. It can also take hours on extremely large projects (especially if -f and a large --window parameter is used). Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes. There is no reason to wait to explore your new Git project!"
-msgstr ""
-"No entanto, 챕 necess찼rio reembalar o reposit처rio para melhorar a localidade "
-"dos dados e melhorar o desempenho. Projetos extremamente grandes pode levar "
-"horas (especialmente se `-f` e um par창metro `--window` grande for utilizado)"
-". Como a reembalagem 챕 segura para ser executada ao lado de leitores e "
-"escritores, execute a re-embalagem em segundo plano e deixe acabar quando "
-"finalizar. N찾o h찼 motivo para esperar a explora챌찾o do seu novo projeto Git!"
+msgstr "No entanto, 챕 necess찼rio reembalar o reposit처rio para melhorar a localidade dos dados e melhorar o desempenho. Projetos extremamente grandes pode levar horas (especialmente se `-f` e um par창metro `--window` grande for utilizado). Como a reembalagem 챕 segura para ser executada ao lado de leitores e escritores, execute a re-embalagem em segundo plano e deixe acabar quando finalizar. N찾o h찼 motivo para esperar a explora챌찾o do seu novo projeto Git!"
#. type: Plain text
#: en/git-fast-import.txt:1416
@@ -27153,27 +23299,13 @@ msgstr "Ao compactar uma bolha, o `fast-import` sempre tenta \"deltificar\" a 첬
#: en/git-fast-import.txt:1451
#, priority:100
msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands. This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile. Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
-msgstr ""
-"Os front-ends que t챗m acesso eficiente a todas as revis천es de um 첬nico "
-"arquivo (lendo um arquivo RCS/CVS, v por exemplo) podem optar por fornecer "
-"todas as revis천es desse arquivo como uma sequ챗ncia de comandos consecutivos "
-"do `blob` (bolha). Isso permite que o `fast-import` \"deltifique\" as "
-"diferentes revis천es dos arquivos, economizando espa챌o no arquivo do pacote "
-"final. As Marca챌천es podem ser utilizadas para posterior identifica챌찾o das "
-"revis천es individuais dos arquivos durante uma sequ챗ncia de comandos `commit`."
+msgstr "Os front-ends que t챗m acesso eficiente a todas as revis천es de um 첬nico arquivo (lendo um arquivo RCS/CVS, v por exemplo) podem optar por fornecer todas as revis천es desse arquivo como uma sequ챗ncia de comandos consecutivos do `blob` (bolha). Isso permite que o `fast-import` \"deltifique\" as diferentes revis천es dos arquivos, economizando espa챌o no arquivo do pacote final. As Marca챌천es podem ser utilizadas para posterior identifica챌찾o das revis천es individuais dos arquivos durante uma sequ챗ncia de comandos `commit`."
#. type: Plain text
#: en/git-fast-import.txt:1458
#, priority:100
msgid "The packfile(s) created by fast-import do not encourage good disk access patterns. This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data. Git also clusters commits together, speeding up revision traversal through better cache locality."
-msgstr ""
-"Os arquivos de pacotes criados pelo `fast-import` n찾o incentivam bons "
-"padr천es de acesso ao disco. Isso 챕 cautilizado pela grava챌찾o dos dados do "
-"`fast-import` na ordem em que s찾o recebidos na entrada predefinida, enquanto "
-"o Git normalmente organiza os dados nos pacotes dos arquivos para fazer com "
-"que os dados mais recentes (dica atual) apare챌am antes dos dados "
-"hist처ricos. O Git tamb챕m agrupa os commits acelerando o percurso de revis찾o "
-"atrav챕s de uma melhor localidade do cache."
+msgstr "Os arquivos de pacotes criados pelo `fast-import` n찾o incentivam bons padr천es de acesso ao disco. Isso 챕 cautilizado pela grava챌찾o dos dados do `fast-import` na ordem em que s찾o recebidos na entrada predefinida, enquanto o Git normalmente organiza os dados nos pacotes dos arquivos para fazer com que os dados mais recentes (dica atual) apare챌am antes dos dados hist처ricos. O Git tamb챕m agrupa os commits acelerando o percurso de revis찾o atrav챕s de uma melhor localidade do cache."
#. type: Plain text
#: en/git-fast-import.txt:1465
@@ -27215,13 +23347,7 @@ msgstr "O `fast-import` mant챕m uma estrutura na mem처ria para todos os objetos
#: en/git-fast-import.txt:1496
#, priority:100
msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1). This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile. Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
-msgstr ""
-"A tabela de objetos 챕 na verdade uma \"hashtable\" (tabela hash) codificada "
-"no nome do objeto com o SHA-1. Essa configura챌찾o de armazenamento permite "
-"que o `fast-import` reutilize um objeto existente ou j찼 gravado e evite "
-"gravar duplicatas no sa챠da do arquivo de pacote. Em uma importa챌찾o, as "
-"bolhas duplicadas s찾o muito comuns, geralmente devido 횪 mesclagem do ramo na "
-"origem."
+msgstr "A tabela de objetos 챕 na verdade uma \"hashtable\" (tabela hash) codificada no nome do objeto com o SHA-1. Essa configura챌찾o de armazenamento permite que o `fast-import` reutilize um objeto existente ou j찼 gravado e evite gravar duplicatas no sa챠da do arquivo de pacote. Em uma importa챌찾o, as bolhas duplicadas s찾o muito comuns, geralmente devido 횪 mesclagem do ramo na origem."
#. type: Title ~
#: en/git-fast-import.txt:1498
@@ -27233,12 +23359,7 @@ msgstr "por marca챌찾o"
#: en/git-fast-import.txt:1504
#, priority:100
msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark. Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
-msgstr ""
-"As marca챌천es s찾o armazenadas em uma origem esparsa, utilizando 1 ponteiro (4 "
-"bytes ou 8 bytes, dependendo do tamanho do ponteiro) por marca챌찾o. Embora a "
-"origem seja escassa, os front-end ainda s찾o fortemente incentivados a usar "
-"marcas entre 1 e n, onde n 챕 a quantidade total de marca챌천es necess찼rias "
-"para essa importa챌찾o."
+msgstr "As marca챌천es s찾o armazenadas em uma origem esparsa, utilizando 1 ponteiro (4 bytes ou 8 bytes, dependendo do tamanho do ponteiro) por marca챌찾o. Embora a origem seja escassa, os front-end ainda s찾o fortemente incentivados a usar marcas entre 1 e n, onde n 챕 a quantidade total de marca챌천es necess찼rias para essa importa챌찾o."
#. type: Title ~
#: en/git-fast-import.txt:1506
@@ -27256,12 +23377,7 @@ msgstr "Os ramos s찾o classificados como ativos e inativos. O uso de mem처ria d
#: en/git-fast-import.txt:1515
#, priority:100
msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch. fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
-msgstr ""
-"As ramifica챌천es inativas s찾o armazenadas em uma estrutura que usa entre 96 "
-"ou 120 bytes (sistemas de 32 ou 64 bits, respectivamente), mais o "
-"comprimento do nome do ramo (normalmente com menos de 200 bytes), por "
-"ramifica챌찾o. O `fast-import` processa facilmente at챕 10.000 ramifica챌천es "
-"inativas com menos de 2 MiB de mem처ria."
+msgstr "As ramifica챌천es inativas s찾o armazenadas em uma estrutura que usa entre 96 ou 120 bytes (sistemas de 32 ou 64 bits, respectivamente), mais o comprimento do nome do ramo (normalmente com menos de 200 bytes), por ramifica챌찾o. O `fast-import` processa facilmente at챕 10.000 ramifica챌천es inativas com menos de 2 MiB de mem처ria."
#. type: Plain text
#: en/git-fast-import.txt:1522
@@ -27279,12 +23395,7 @@ msgstr "� medida que as ramifica챌천es ativas armazenam metadados sobre os arqu
#: en/git-fast-import.txt:1531
#, priority:100
msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm. The LRU chain is updated on each `commit` command. The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
-msgstr ""
-"Com base num algoritmo simples, o `fast-import` move automaticamente as "
-"ramifica챌천es ativas para a condi챌찾o inativa utilizando um algor챠timo "
-"simples. A cadeia LRU 챕 atualizada a cada comando `commit`. A quantidade "
-"m찼xima de ramifica챌천es ativas pode se aumentado ou diminu챠do na linha de "
-"comando com a op챌찾o `--active-branches=`."
+msgstr "Com base num algoritmo simples, o `fast-import` move automaticamente as ramifica챌천es ativas para a condi챌찾o inativa utilizando um algor챠timo simples. A cadeia LRU 챕 atualizada a cada comando `commit`. A quantidade m찼xima de ramifica챌천es ativas pode se aumentado ou diminu챠do na linha de comando com a op챌찾o `--active-branches=`."
#. type: Title ~
#: en/git-fast-import.txt:1533
@@ -27308,24 +23419,13 @@ msgstr "por entrada de arquivo ativa"
#: en/git-fast-import.txt:1546
#, priority:100
msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry. To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
-msgstr ""
-"Os arquivos (e os ponteiros para as sub찼rvores) nas 찼rvores ativas requerem "
-"52 ou 64 bytes (plataformas de 32/64 bits) por entrada. Para economizar "
-"espa챌o, os nomes dos arquivos e as 찼rvores s찾o agrupados em uma tabela de "
-"cadeias comuns, permitindo que o nome do arquivo ``Makefile'' utilize apenas "
-"16 bytes (depois de incluir a sobrecarga do cabe챌alho da cadeia), n찾o "
-"importa quantas vezes isso ocorra no projeto."
+msgstr "Os arquivos (e os ponteiros para as sub찼rvores) nas 찼rvores ativas requerem 52 ou 64 bytes (plataformas de 32/64 bits) por entrada. Para economizar espa챌o, os nomes dos arquivos e as 찼rvores s찾o agrupados em uma tabela de cadeias comuns, permitindo que o nome do arquivo ``Makefile'' utilize apenas 16 bytes (depois de incluir a sobrecarga do cabe챌alho da cadeia), n찾o importa quantas vezes isso ocorra no projeto."
#. type: Plain text
#: en/git-fast-import.txt:1551
#, priority:100
msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
-msgstr ""
-"O LRU do ramo ativo, quando associado ao conjunto da cadeia de caracteres do "
-"nome do arquivo e ao carregamento lento das sub찼rvores, permite que a "
-"efici챗ncia da importa챌찾o r찼pida dos projetos com mais de 2.000 ramifica챌천es "
-"e mais de 45.114 arquivos em um espa챌o de mem처ria muito limitado (menos de "
-"2,7 MiB por ramo ativo)."
+msgstr "O LRU do ramo ativo, quando associado ao conjunto da cadeia de caracteres do nome do arquivo e ao carregamento lento das sub찼rvores, permite que a efici챗ncia da importa챌찾o r찼pida dos projetos com mais de 2.000 ramifica챌천es e mais de 45.114 arquivos em um espa챌o de mem처ria muito limitado (menos de 2,7 MiB por ramo ativo)."
#. type: Title -
#: en/git-fast-import.txt:1553
@@ -27349,8 +23449,7 @@ msgstr "git-fetch-pack(1)"
#: en/git-fetch-pack.txt:7
#, priority:100
msgid "git-fetch-pack - Receive missing objects from another repository"
-msgstr ""
-"git-fetch-pack - Recebe os objetos ausentes vindos de um outro reposit처rio"
+msgstr "git-fetch-pack - Recebe os objetos ausentes vindos de um outro reposit처rio"
#. type: Plain text
#: en/git-fetch-pack.txt:16
@@ -27370,20 +23469,13 @@ msgstr ""
#: en/git-fetch-pack.txt:21
#, priority:100
msgid "Usually you would want to use 'git fetch', which is a higher level wrapper of this command, instead."
-msgstr ""
-"No lugar utilize 'git fetch' que 챕 um wrapper de maior hierarquia deste "
-"comando."
+msgstr "No lugar utilize 'git fetch' que 챕 um wrapper de maior hierarquia deste comando."
#. type: Plain text
#: en/git-fetch-pack.txt:27
#, priority:100
msgid "Invokes 'git-upload-pack' on a possibly remote repository and asks it to send objects missing from this repository, to update the named heads. The list of commits available locally is found out by scanning the local refs/ hierarchy and sent to 'git-upload-pack' running on the other end."
-msgstr ""
-"Invoca o 'git-upload-pack' em um reposit처rio possivelmente remoto e solicita "
-"que ele envie os objetos autilizentes deste reposit처rio, para atualizar "
-"determinados `heads`. A lista dos commits dispon챠veis localmente 챕 "
-"descoberta examinando os 'refs/' da hierarquia local e enviada para o 'git-"
-"upload-pack' durante a execu챌찾o na outra extremidade."
+msgstr "Invoca o 'git-upload-pack' em um reposit처rio possivelmente remoto e solicita que ele envie os objetos autilizentes deste reposit처rio, para atualizar determinados `heads`. A lista dos commits dispon챠veis localmente 챕 descoberta examinando os 'refs/' da hierarquia local e enviada para o 'git-upload-pack' durante a execu챌찾o na outra extremidade."
#. type: Plain text
#: en/git-fetch-pack.txt:31
@@ -27401,19 +23493,13 @@ msgstr "Busque todas os `refs` remotos."
#: en/git-fetch-pack.txt:43 en/git-send-pack.txt:46
#, priority:100
msgid "Take the list of refs from stdin, one per line. If there are refs specified on the command line in addition to this option, then the refs from stdin are processed after those on the command line."
-msgstr ""
-"Pegue a lista dos `refs` do stdin, um por linha. Caso haja `refs` utilizados "
-"na linha de comando, al챕m desta op챌찾o, os `refs` do stdin ser찾o processados "
-"ap처s as da linha de comando."
+msgstr "Pegue a lista dos `refs` do stdin, um por linha. Caso haja `refs` utilizados na linha de comando, al챕m desta op챌찾o, os `refs` do stdin ser찾o processados ap처s as da linha de comando."
#. type: Plain text
#: en/git-fetch-pack.txt:47 en/git-send-pack.txt:50
#, priority:100
msgid "If `--stateless-rpc` is specified together with this option then the list of refs must be in packet format (pkt-line). Each ref must be in a separate packet, and the list must end with a flush packet."
-msgstr ""
-"Caso `--stateless-rpc` seja utilizado junto com esta op챌찾o, a lista de "
-"refer챗ncias dever찼 estar no formato do pacote (linha-pkt). Cada `ref` deve "
-"estar em um pacote separado e a lista deve terminar com um pacote liberado."
+msgstr "Caso `--stateless-rpc` seja utilizado junto com esta op챌찾o, a lista de refer챗ncias dever찼 estar no formato do pacote (linha-pkt). Cada `ref` deve estar em um pacote separado e a lista deve terminar com um pacote liberado."
#. type: Plain text
#: en/git-fetch-pack.txt:52
@@ -27425,10 +23511,7 @@ msgstr "Passe o flag `-q` para o 'git unpack-objects'; isso torna o processo de
#: en/git-fetch-pack.txt:59
#, priority:100
msgid "Do not invoke 'git unpack-objects' on received data, but create a single packfile out of it instead, and store it in the object database. If provided twice then the pack is locked against repacking."
-msgstr ""
-"N찾o invoque o 'git unpack-objects' nos dados recebidos, por챕m crie um 첬nico "
-"arquivo do pacote a partir dele e armazene-o no banco de dados do objeto. "
-"Caso seja utilizado duas vezes, o pacote ser찼 bloqueado contra a reembalagem."
+msgstr "N찾o invoque o 'git unpack-objects' nos dados recebidos, por챕m crie um 첬nico arquivo do pacote a partir dele e armazene-o no banco de dados do objeto. Caso seja utilizado duas vezes, o pacote ser찼 bloqueado contra a reembalagem."
#. type: Labeled list
#: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:210 en/git-send-pack.txt:64
@@ -27464,15 +23547,7 @@ msgstr "--upload-pack=<git-upload-pack>"
#: en/git-fetch-pack.txt:81
#, priority:100
msgid "Use this to specify the path to 'git-upload-pack' on the remote side, if is not found on your $PATH. Installations of sshd ignores the user's environment setup scripts for login shells (e.g. .bash_profile) and your privately installed git may not be found on the system default $PATH. Another workaround suggested is to set up your $PATH in \".bashrc\", but this flag is for people who do not want to pay the overhead for non-interactive shells by having a lean .bashrc file (they set most of the things up in .bash_profile)."
-msgstr ""
-"Utilize para informar o caminho para 'git-upload-pack' no lado remoto, caso "
-"n찾o seja encontrado no seu $PATH. As instala챌천es do sshd ignoram os scripts "
-"de configura챌찾o do ambiente do usu찼rio para logins nas shells (.bash_profile "
-"por exemplo) e o a instala챌찾o do seu git pode n찾o ser encontrado no $PATH "
-"predefinido do sistema. A outra solu챌찾o sugerida 챕 configurar o seu $PATH "
-"em \".bashrc\", mas este flag s찾o para pessoas que n찾o desejam pagar o pre챌o "
-"da sobrecarga em shells n찾o interativos com um arquivo \".bashrc\" enxuto ("
-"eles definem a maioria das coisas em .bash_profile)."
+msgstr "Utilize para informar o caminho para 'git-upload-pack' no lado remoto, caso n찾o seja encontrado no seu $PATH. As instala챌천es do sshd ignoram os scripts de configura챌찾o do ambiente do usu찼rio para logins nas shells (.bash_profile por exemplo) e o a instala챌찾o do seu git pode n찾o ser encontrado no $PATH predefinido do sistema. A outra solu챌찾o sugerida 챕 configurar o seu $PATH em \".bashrc\", mas este flag s찾o para pessoas que n찾o desejam pagar o pre챌o da sobrecarga em shells n찾o interativos com um arquivo \".bashrc\" enxuto (eles definem a maioria das coisas em .bash_profile)."
#. type: Labeled list
#: en/git-fetch-pack.txt:82
@@ -27490,10 +23565,7 @@ msgstr "O mesmo que --upload-pack=<git-upload-pack>."
#: en/git-fetch-pack.txt:89
#, priority:100
msgid "Limit fetching to ancestor-chains not longer than n. 'git-upload-pack' treats the special depth 2147483647 as infinite even if there is an ancestor-chain that long."
-msgstr ""
-"Limite a captura para as cadeias de ancestrais n찾o maiores que n. O 'git-"
-"upload-pack' trata a profundidade especial \"2147483647\" como infinita, "
-"mesmo que exista uma cadeia de ancestrais t찾o antiga."
+msgstr "Limite a captura para as cadeias de ancestrais n찾o maiores que n. O 'git-upload-pack' trata a profundidade especial \"2147483647\" como infinita, mesmo que exista uma cadeia de ancestrais t찾o antiga."
#. type: Labeled list
#: en/git-fetch-pack.txt:99
@@ -27505,9 +23577,7 @@ msgstr "--deepen-relative"
#: en/git-fetch-pack.txt:103
#, priority:100
msgid "Argument --depth specifies the number of commits from the current shallow boundary instead of from the tip of each remote branch history."
-msgstr ""
-"O argumento `--depth` determina a quantidade limite dos commits atual da "
-"superf챠cie em vez do cume de cada hist처rico do ramo remoto."
+msgstr "O argumento `--depth` determina a quantidade limite dos commits atual da superf챠cie em vez do cume de cada hist처rico do ramo remoto."
#. type: Plain text
#: en/git-fetch-pack.txt:106
@@ -27593,42 +23663,25 @@ msgstr "Busque as ramifica챌천es ou as tags (coletivamente, \"refs\") de um ou m
#: 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 ""
-"횋 predefinido que qualquer tag que aponte para os hist처ricos que est찾o sendo "
-"capturados tamb챕m sejam capturados; o efeito 챕 capturar as tags que apontem "
-"para os ramos nos quais voc챗 est찼 interessado. Este comportamento "
-"predefinido pode ser alterado utilizando as op챌천es `--tags`, `--no-tags` ou "
-"configurando `remote.<nome>.tagOpt`. Utilizando um `refspec` de forma "
-"explicita, 챕 poss챠vel que voc챗 busque as tags que n찾o apontam para as "
-"ramifica챌천es nas quais voc챗 tamb챕m est찼 interessado."
+msgstr "횋 predefinido que qualquer tag que aponte para os hist처ricos que est찾o sendo capturados tamb챕m sejam capturados; o efeito 챕 capturar as tags que apontem para os ramos nos quais voc챗 est찼 interessado. Este comportamento predefinido pode ser alterado utilizando as op챌천es `--tags`, `--no-tags` ou configurando `remote.<nome>.tagOpt`. Utilizando um `refspec` de forma explicita, 챕 poss챠vel que voc챗 busque as tags que n찾o apontam para as ramifica챌천es nas quais voc챗 tamb챕m est찼 interessado."
#. 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 ""
-"O 'git fetch' pode capturar em um 첬nico reposit처rio ou em uma determinada "
-"URL assim como em v찼rios reposit처rios de uma vez caso `<group>` seja "
-"utilizado e exista um entrada `remotes.<group>` no arquivo de configura챌찾o. "
-"(Consulte linkgit:git-config[1])."
+msgstr "O 'git fetch' pode capturar em um 첬nico reposit처rio ou em uma determinada URL assim como em v찼rios reposit처rios de uma vez caso `<group>` seja utilizado e exista um entrada `remotes.<group>` no arquivo de configura챌찾o. (Consulte 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 ""
-"Por predefini챌찾o quando nenhum ponto remoto 챕 utilizado, o `origin` ser찼 "
-"utilizado, a menos que haja um ramo `upstream` configurado para o ramo atual."
+msgstr "Por predefini챌찾o quando nenhum ponto remoto 챕 utilizado, o `origin` ser찼 utilizado, a menos que haja um ramo `upstream` configurado para o ramo atual."
#. 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 ""
-"Os nomes dos `refs` que s찾o capturados, juntamente com os nomes dos objetos "
-"para os quais eles apontam, s찾o gravados em `.git/FETCH_HEAD`. Essa "
-"informa챌찾o pode ser utilizada por scripts ou outros comandos git, como "
-"linkgit:git-pull[1]."
+msgstr "Os nomes dos `refs` que s찾o capturados, juntamente com os nomes dos objetos para os quais eles apontam, s찾o gravados em `.git/FETCH_HEAD`. Essa informa챌찾o pode ser utilizada por scripts ou outros comandos git, como linkgit:git-pull[1]."
#. type: Title -
#: en/git-fetch.txt:55
@@ -27640,11 +23693,7 @@ msgstr "RAMOS COM RASTREAMENTO REMOTO CONFIGURADO [[CRTB]]"
#: 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 ""
-"Voc챗 costuma interagir com o mesmo reposit처rio remoto, capturando-o "
-"regularmente e de forma repetida. Para acompanhar o progresso de um "
-"reposit처rio remoto, o `git fetch` permite que voc챗 configure vari찼veis da "
-"configura챌찾o `remote.<reposit처rio>.fetch`."
+msgstr "Voc챗 costuma interagir com o mesmo reposit처rio remoto, capturando-o regularmente e de forma repetida. Para acompanhar o progresso de um reposit처rio remoto, o `git fetch` permite que voc챗 configure vari찼veis da configura챌찾o `remote.<reposit처rio>.fetch`."
#. type: Plain text
#: en/git-fetch.txt:63
@@ -27672,34 +23721,13 @@ msgstr "Essa configura챌찾o 챕 utilizada de duas maneiras:"
#: 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 ""
-"Quando o `git fetch` 챕 executado sem informar quais as ramifica챌천es ou tags "
-"capturar na linha de comando, por exemplo. Os valores `git fetch origin` ou `"
-"git fetch`, `remote.<reposit처rio>.fetch` s찾o utilizados como `refspecs` eles "
-"especificam quais os `refs` capturar e quais as `refs` locais atualizar. O "
-"exemplo acima capturar찼 todas as ramifica챌천es que existem em `origin` (ou "
-"seja, qualquer `ref` que coincida ao lado esquerdo do valor, `refs/heads/*`) "
-"e atualizar찼 as ramifica챌천es de rastreamento remoto correspondentes na "
-"hierarquia `refs/remotes/origem/*`."
+msgstr "Quando o `git fetch` 챕 executado sem informar quais as ramifica챌천es ou tags capturar na linha de comando, por exemplo. Os valores `git fetch origin` ou `git fetch`, `remote.<reposit처rio>.fetch` s찾o utilizados como `refspecs` eles especificam quais os `refs` capturar e quais as `refs` locais atualizar. O exemplo acima capturar찼 todas as ramifica챌천es que existem em `origin` (ou seja, qualquer `ref` que coincida ao lado esquerdo do valor, `refs/heads/*`) e atualizar찼 as ramifica챌천es de rastreamento remoto correspondentes na hierarquia `refs/remotes/origem/*`."
#. 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 ""
-"Quando o `git fetch` 챕 executado especificamente com as ramifica챌천es ou tags "
-"utilizando a linha de comando como `git fetch origin master` por exemplo, os "
-"`<refspec>` utilizados determinam uma ordem de capturar, o qu챗 deve ser "
-"capturado (o `master` no exemplo 챕 uma abrevia챌찾o de `master:`, que por sua "
-"vez significa \"capture a ramifica챌찾o 'master', por exemplo), assim o "
-"comando no exemplo capturar찼 _apenas_ a ramifica챌찾o 'master'. Os valores "
-"`remote.<reposit처rio>.fetch` determinam qual a ramifica챌찾o remota rastreada, "
-"caso exista, ser찼 atualizada. Quando utilizados desta maneira, os valores "
-"`remote.<repository>.fetch` n찾o t챗m nenhum efeito na decis찾o do _qu챗_ 챕 "
-"capturado (ou seja, os valores n찾o s찾o utilizados como `refspecs` quando a "
-"linha de comando lista `refspecs`); eles s찾o utilizados apenas para decidir "
-"_onde_ os `refs` que est찾o sendo capturados est찾o sendo armazenados e agem "
-"como um mapeamento."
+msgstr "Quando o `git fetch` 챕 executado especificamente com as ramifica챌천es ou tags utilizando a linha de comando como `git fetch origin master` por exemplo, os `<refspec>` utilizados determinam uma ordem de capturar, o qu챗 deve ser capturado (o `master` no exemplo 챕 uma abrevia챌찾o de `master:`, que por sua vez significa \"capture a ramifica챌찾o 'master', por exemplo), assim o comando no exemplo capturar찼 _apenas_ a ramifica챌찾o 'master'. Os valores `remote.<reposit처rio>.fetch` determinam qual a ramifica챌찾o remota rastreada, caso exista, ser찼 atualizada. Quando utilizados desta maneira, os valores `remote.<repository>.fetch` n찾o t챗m nenhum efeito na decis찾o do _qu챗_ 챕 capturado (ou seja, os valores n찾o s찾o utilizados como `refspecs` quando a linha de comando lista `refspecs`); eles s찾o utilizados apenas para decidir _onde_ os `refs` que est찾o sendo capturados est찾o sendo armazenados e agem como um mapeamento."
#. type: Plain text
#: en/git-fetch.txt:101
@@ -27723,12 +23751,7 @@ msgstr "A disposi챌찾o predefinida do Git se organiza de forma a manter os dados
#: 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 ""
-"Se desassistidas, essas refer챗ncias obsoletas podem piorar o desempenho em "
-"reposit처rios grandes e ocupados aonde apresentam muita rotatividade e por "
-"exemplo, fa챌am uso de comandos como `git branch -a --contains <commit>` cuja "
-"sa챠da 챕 desnecessariamente detalhada, cautilizando impacto de desempenho em "
-"qualquer outra refer챗ncia de trabalho conhecida."
+msgstr "Se desassistidas, essas refer챗ncias obsoletas podem piorar o desempenho em reposit처rios grandes e ocupados aonde apresentam muita rotatividade e por exemplo, fa챌am uso de comandos como `git branch -a --contains <commit>` cuja sa챠da 챕 desnecessariamente detalhada, cautilizando impacto de desempenho em qualquer outra refer챗ncia de trabalho conhecida."
#. type: Plain text
#: en/git-fetch.txt:117
@@ -27778,11 +23801,7 @@ msgstr "Portanto, caso o `refspec` remoto inclua `refs/tags/*:refs/tags/*` por e
#: 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 ""
-"Sen찾o for o que voc챗 deseja, caso queira remover remotamente o `<name>` por "
-"exemplo e tamb챕m capturar explicitamente as tags a partir dele; "
-"primeiramente, ao recolher dele voc챗 exclui todas as tags locais, a maioria "
-"das quais podem n찾o terem vindo do `<nome>` remoto."
+msgstr "Sen찾o for o que voc챗 deseja, caso queira remover remotamente o `<name>` por exemplo e tamb챕m capturar explicitamente as tags a partir dele; primeiramente, ao recolher dele voc챗 exclui todas as tags locais, a maioria das quais podem n찾o terem vindo do `<nome>` remoto."
#. type: Plain text
#: en/git-fetch.txt:150
@@ -27794,13 +23813,7 @@ msgstr "Assim, tenha cuidado ao utilizar isso com um `refspec` como `refs/tags/*
#: 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 ""
-"Como manter-se atualizado com as ramifica챌천es e as tags remotamente 챕 um "
-"caso de uso comum, a op챌찾o `--prune-tags` pode ser utilizada 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]."
+msgstr "Como manter-se atualizado com as ramifica챌천es e as tags remotamente 챕 um caso de uso comum, a op챌찾o `--prune-tags` pode ser utilizada 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
@@ -27824,11 +23837,7 @@ msgstr ""
#: 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 ""
-"O motivo pelo qual n찾o ocorre um erro durante o uso sem a op챌찾o `--prune` ou "
-"as suas vers천es de configura챌찾o, 챕 a flexibilidade das vers천es configuradas, "
-"para manter um mapeamento 1=1 entre as op챌천es da linha de comando e o que as "
-"vers천es das configura챌찾o fazem."
+msgstr "O motivo pelo qual n찾o ocorre um erro durante o uso sem a op챌찾o `--prune` ou as suas vers천es de configura챌찾o, 챕 a flexibilidade das vers천es configuradas, para manter um mapeamento 1=1 entre as op챌천es da linha de comando e o que as vers천es das configura챌찾o fazem."
#. type: Plain text
#: en/git-fetch.txt:177
@@ -27860,20 +23869,13 @@ msgstr ""
#: 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 ""
-"A sa챠da do comando \"git fetch\" depende do m챕todo de transporte utilizado; "
-"Esta se챌찾o descreve a sa챠da durante a utiliza챌찾o da captura ao utilizar o "
-"protocolo Git (localmente ou via ssh) e o protocolo inteligente \"Smart "
-"HTTP\"."
+msgstr "A sa챠da do comando \"git fetch\" depende do m챕todo de transporte utilizado; Esta se챌찾o descreve a sa챠da durante a utiliza챌찾o da captura ao utilizar o protocolo Git (localmente ou via ssh) e o protocolo inteligente \"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 ""
-"A condi챌찾o da sa챠da durante a captura 챕 produzida em forma de tabela, com "
-"cada linha representando a condi챌찾o de uma 첬nica refer챗ncia. Cada linha 챕 "
-"uma forma de:"
+msgstr "A condi챌찾o da sa챠da durante a captura 챕 produzida em forma de tabela, com cada linha representando a condi챌찾o de uma 첬nica refer챗ncia. Cada linha 챕 uma forma de:"
#. type: delimited block -
#: en/git-fetch.txt:201
@@ -27987,8 +23989,7 @@ msgstr "`=`"
#: en/git-fetch.txt:220
#, priority:220
msgid "for a ref that was up to date and did not need fetching."
-msgstr ""
-"para uma refer챗ncia que estava atualizada e n찾o precisou de nenhuma captura."
+msgstr "para uma refer챗ncia que estava atualizada e n찾o precisou de nenhuma captura."
#. type: Labeled list
#: en/git-fetch.txt:221 en/git-push.txt:440
@@ -28000,11 +24001,7 @@ msgstr "resumo"
#: en/git-fetch.txt:226
#, 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 ""
-"Para a a captura de uma refer챗ncia bem sucedida, o resumo exibe os valores "
-"antigos e novos em um formato adequado para a utiliza챌찾o como argumento para "
-"o comando `git log` (`<antigo>..<novo>` na maioria dos casos, e "
-"`<antigo>...<novo>` para atualiza챌천es de avan챌o r찼pido que forem impostas)."
+msgstr "Para a a captura de uma refer챗ncia bem sucedida, o resumo exibe os valores antigos e novos em um formato adequado para a utiliza챌찾o como argumento para o comando `git log` (`<antigo>..<novo>` na maioria dos casos, e `<antigo>...<novo>` para atualiza챌천es de avan챌o r찼pido que forem impostas)."
#. type: Labeled list
#: en/git-fetch.txt:227 en/git-push.txt:468
@@ -28040,10 +24037,7 @@ msgstr "motivo"
#: en/git-fetch.txt:240
#, 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 ""
-"Uma explica챌찾o leg챠vel para humanos. No caso de refer챗ncias capturadas com "
-"sucesso, nenhuma explica챌찾o 챕 necess찼ria. Para uma refer챗ncia com falha, o "
-"motivo ser찼 explanado."
+msgstr "Uma explica챌찾o leg챠vel para humanos. No caso de refer챗ncias capturadas com sucesso, nenhuma explica챌찾o 챕 necess찼ria. Para uma refer챗ncia com falha, o motivo ser찼 explanado."
#. type: Plain text
#: en/git-fetch.txt:245
@@ -28079,10 +24073,7 @@ msgstr "$ git fetch origin +pu:pu maint:tmp\n"
#: en/git-fetch.txt:264
#, 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 ""
-"Faz a atualiza챌찾o (ou cria, conforme seja necess찼rio) as ramifica챌천es `pu` e`"
-" tmp` no reposit처rio local, capturando as ramifica챌천es (respectivamente) `pu`"
-" e` maint` no reposit처rio remoto."
+msgstr "Faz a atualiza챌찾o (ou cria, conforme seja necess찼rio) as ramifica챌천es `pu` e` tmp` no reposit처rio local, capturando as ramifica챌천es (respectivamente) `pu` e` maint` no reposit처rio remoto."
#. type: Plain text
#: en/git-fetch.txt:267
@@ -28110,12 +24101,7 @@ msgstr ""
#: 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 ""
-"O primeiro comando captura 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 capturados ser찾o "
-"eventualmente removidos pelo servi챌o de limpeza interno do git (consulte "
-"linkgit:git-gc[1])."
+msgstr "O primeiro comando captura 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 capturados 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:248
@@ -28165,17 +24151,7 @@ msgstr "ATEN횉횄O"
#: 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. Utilize 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찼."
+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. Utilize 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
@@ -28200,8 +24176,7 @@ msgid ""
msgstr ""
"*OBSERVA횉횄O*: Este comando honra o arquivo `.git/info/grafts` e os\n"
"\"refs\" no `refs/replace/` namespace.\n"
-"Caso voc챗 tenha quaisquer enxertos ou refer챗ncias de substitui챌찾o definidos,"
-"\n"
+"Caso voc챗 tenha quaisquer enxertos ou refer챗ncias de substitui챌찾o definidos,\n"
"executando este comando os far찼 permanente.\n"
#. type: Plain text
@@ -28217,16 +24192,11 @@ 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 para "
-"todos\n"
-"os objetos e n찾o convergir찼 com a ramifica챌찾o original. Voc챗 n찾o "
-"conseguir찼\n"
-"fazer um impulsionamento (push) de forma f찼cil e redistribuir o ramo "
-"alterado no cume do\n"
-"ramo original. N찾o utilize este comando se voc챗 n찾o souber todas as "
-"implica챌천es do seu uso e\n"
-"ainda assim evite us찼-lo, caso um 첬nico commit simples seja suficiente para "
-"resolver o seu problema.\n"
+"*ATEN횉횄O*! O hist처rico de reescrita ter찼 nomes de objetos diferentes para todos\n"
+"os objetos e n찾o convergir찼 com a ramifica챌찾o original. Voc챗 n찾o conseguir찼\n"
+"fazer um impulsionamento (push) de forma f찼cil e redistribuir o ramo alterado no cume do\n"
+"ramo original. N찾o utilize este comando se voc챗 n찾o souber todas as implica챌천es do seu uso e\n"
+"ainda assim evite us찼-lo, caso um 첬nico commit simples seja suficiente para resolver o seu problema.\n"
"(Consulte a se챌찾o \"RECUPERANDO DO UPSTREAM REBASE\"\n"
"na se챌찾o em linkgit:git-rebase[1] para obter mais informa챌천es\n"
"sobre reescrever no hist처rico de publicado.)\n"
@@ -28301,11 +24271,7 @@ msgstr "--env-filter <comando>"
#: en/git-filter-branch.txt:115
#, 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 pode ser utilizado apenas quando precisar alterar o ambiente "
-"onde o commit foi realizado. Especificamente, voc챗 pode reescrever as "
-"vari찼veis de ambiente do autor/nome respons찼vel pelo commit/email/data na "
-"vari찼vel do ambiente (para mais detalhes consulte linkgit:git-commit-tree[1]."
+msgstr "Este filtro pode ser utilizado apenas quando precisar alterar o ambiente onde o commit foi realizado. Especificamente, voc챗 pode reescrever as vari찼veis de ambiente do autor/nome respons찼vel pelo commit/email/data na vari찼vel do ambiente (para mais detalhes consulte linkgit:git-commit-tree[1]."
#. type: Labeled list
#: en/git-filter-branch.txt:116
@@ -28329,12 +24295,7 @@ msgstr "--index-filter <comando>"
#: en/git-filter-branch.txt:130
#, 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 utilizado 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]."
+msgstr "Este 챕 o filtro utilizado 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
@@ -28346,13 +24307,7 @@ msgstr "--parent-filter <comando>"
#: en/git-filter-branch.txt:138
#, ignore-ellipsis, priority:100
msgid "This is the filter for rewriting the commit's parent list. It will receive the parent string on stdin and shall output the new parent string on stdout. The parent string is in the format described in linkgit:git-commit-tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
-msgstr ""
-"Este filtro serve para reescrever a lista das origens de quem fez o commit. "
-"Ele receber찼 um texto da origem no stdin e produzir찼 a um novo texto de "
-"origem no stdout. O texto de origem est찼 no formato descrito em linkgit:git-"
-"commit-tree[1]: o commit inicial 챕 vazio, \"-p parent\" para um commit "
-"normal e \"-p parent1 -p parent2 -p parent3 ...\" para os commits "
-"consolidados."
+msgstr "Este filtro serve para reescrever a lista das origens de quem fez o commit. Ele receber찼 um texto da origem no stdin e produzir찼 a um novo texto de origem no stdout. O texto de origem est찼 no formato descrito em linkgit:git-commit-tree[1]: o commit inicial 챕 vazio, \"-p parent\" para um commit normal e \"-p parent1 -p parent2 -p parent3 ...\" para os commits consolidados."
#. type: Labeled list
#: en/git-filter-branch.txt:139
@@ -28382,10 +24337,7 @@ msgstr "Este filtro serve para apresentar o commit. Caso este filtro seja utili
#: en/git-filter-branch.txt:155
#, priority:100
msgid "As a special extension, the commit filter may emit multiple commit ids; in that case, the rewritten children of the original commit will have all of them as parents."
-msgstr ""
-"Como uma extens찾o especial, o filtro do commit pode emitir v찼rios IDs para "
-"estes commits; nesse caso, os herdeiros do commit original que foram "
-"reescritos, todos ter찾o eles como origem."
+msgstr "Como uma extens찾o especial, o filtro do commit pode emitir v찼rios IDs para estes commits; nesse caso, os herdeiros do commit original que foram reescritos, todos ter찾o eles como origem."
#. type: Plain text
#: en/git-filter-branch.txt:160
@@ -28397,10 +24349,7 @@ msgstr "Voc챗 pode utilizar a fun챌찾o 'map' como uma conveni챗ncia neste filtro
#: en/git-filter-branch.txt:164
#, priority:100
msgid "You can also use the `git_commit_non_empty_tree \"$@\"` instead of `git commit-tree \"$@\"` if you don't wish to keep commits with a single parent and that makes no change to the tree."
-msgstr ""
-"횋 poss챠vel tamb챕m utilizar `git_commit_non_empty_tree \"$@\"` em vez de `git "
-"commit-tree \"$@\"` caso n찾o queira mais manter os commit com uma 첬nica "
-"origem, isso n찾o faz qualquer altera챌찾o na 찼rvore."
+msgstr "횋 poss챠vel tamb챕m utilizar `git_commit_non_empty_tree \"$@\"` em vez de `git commit-tree \"$@\"` caso n찾o queira mais manter os commit com uma 첬nica origem, isso n찾o faz qualquer altera챌찾o na 찼rvore."
#. type: Labeled list
#: en/git-filter-branch.txt:165
@@ -28418,11 +24367,7 @@ msgstr "Este filtro serve para reescrever os nomes das tags. Quando aprovada, se
#: en/git-filter-branch.txt:176
#, priority:100
msgid "The original tags are not deleted, but can be overwritten; use \"--tag-name-filter cat\" to simply update the tags. In this case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul."
-msgstr ""
-"As tags originais n찾o s찾o exclu챠das, mas podem ser substitu챠das; utilize a "
-"op챌찾o \"--tag-name-filter cat\" para atualizar as tags. Nesse caso, tenha "
-"muito cuidado e certifique-se de fazer o backup das tags antigas, caso "
-"ocorra algum problema durante a convers찾o."
+msgstr "As tags originais n찾o s찾o exclu챠das, mas podem ser substitu챠das; utilize a op챌찾o \"--tag-name-filter cat\" para atualizar as tags. Nesse caso, tenha muito cuidado e certifique-se de fazer o backup das tags antigas, caso ocorra algum problema durante a convers찾o."
#. type: Plain text
#: en/git-filter-branch.txt:187
@@ -28440,13 +24385,7 @@ msgstr "--prune-empty"
#: en/git-filter-branch.txt:195
#, priority:100
msgid "Some filters will generate empty commits that leave the tree untouched. This option instructs git-filter-branch to remove such commits if they have exactly one or zero non-pruned parents; merge commits will therefore remain intact. This option cannot be used together with `--commit-filter`, though the same effect can be achieved by using the provided `git_commit_non_empty_tree` function in a commit filter."
-msgstr ""
-"Alguns filtros geram commits vazios que deixam a 찼rvore intocada. Essa "
-"op챌찾o instrui o comando `git-filter-branch` para remover tais commits caso "
-"elas tenham exatamente um ou zero origens sem poda; os commits mesclados "
-"permanecer찾o intactos. Esta op챌찾o n찾o pode ser utilizada em conjunto com "
-"`--commit-filter`, embora o mesmo efeito possa ser alcan챌ado utilizando a "
-"fun챌찾o `git_commit_non_empty_tree` em um filtro do commit."
+msgstr "Alguns filtros geram commits vazios que deixam a 찼rvore intocada. Essa op챌찾o instrui o comando `git-filter-branch` para remover tais commits caso elas tenham exatamente um ou zero origens sem poda; os commits mesclados permanecer찾o intactos. Esta op챌찾o n찾o pode ser utilizada em conjunto com `--commit-filter`, embora o mesmo efeito possa ser alcan챌ado utilizando a fun챌찾o `git_commit_non_empty_tree` em um filtro do commit."
#. type: Labeled list
#: en/git-filter-branch.txt:196
@@ -28458,9 +24397,7 @@ msgstr "--original <namespace>"
#: en/git-filter-branch.txt:199
#, priority:100
msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
-msgstr ""
-"Utilize esta op챌찾o para definir o `namespace` em que os commits originais "
-"ser찾o armazenados. O valor predefinido 챕 'refs/original'."
+msgstr "Utilize esta op챌찾o para definir o `namespace` em que os commits originais ser찾o armazenados. O valor predefinido 챕 'refs/original'."
#. type: Labeled list
#: en/git-filter-branch.txt:200
@@ -28490,11 +24427,7 @@ msgstr "--state-branch <ramo>"
#: en/git-filter-branch.txt:219
#, priority:100
msgid "This option will cause the mapping from old to new objects to be loaded from named branch upon startup and saved as a new commit to that branch upon exit, enabling incremental of large trees. If '<branch>' does not exist it will be created."
-msgstr ""
-"Esta op챌찾o far찼 com que o mapeamento dos objetos antigos para os novos sejam "
-"carregados do ramo chamado na inicializa챌찾o e salvo como um novo commit at챕 "
-"a sua conclus찾o, permitindo o incremento das grandes 찼rvores. Se o '<ramo>' "
-"n찾o existir, ele ser찼 criado."
+msgstr "Esta op챌찾o far찼 com que o mapeamento dos objetos antigos para os novos sejam carregados do ramo chamado na inicializa챌찾o e salvo como um novo commit at챕 a sua conclus찾o, permitindo o incremento das grandes 찼rvores. Se o '<ramo>' n찾o existir, ele ser찼 criado."
#. type: Labeled list
#: en/git-filter-branch.txt:220
@@ -28554,9 +24487,7 @@ msgstr "Usar a op챌찾o `--index-filter` com 'git rm' gera uma vers찾o significat
#: en/git-filter-branch.txt:268
#, no-wrap, priority:100
msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
-msgstr ""
-"git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' "
-"HEAD\n"
+msgstr "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
#. type: Plain text
#: en/git-filter-branch.txt:271
@@ -28586,10 +24517,7 @@ msgstr "Assim, voc챗 pode, transformar um subdiret처rio da biblioteca em um repo
#: en/git-filter-branch.txt:286
#, priority:100
msgid "To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:"
-msgstr ""
-"Para definir um commit (que normalmente esteja na ponta de outro hist처rico) "
-"para ser a atual origem inicial do commit e para colar o outro hist처rico "
-"atr찼s do hist처rico atual:"
+msgstr "Para definir um commit (que normalmente esteja na ponta de outro hist처rico) para ser a atual origem inicial do commit e para colar o outro hist처rico atr찼s do hist처rico atual:"
#. type: delimited block -
#: en/git-filter-branch.txt:289
@@ -28601,11 +24529,7 @@ msgstr "git filter-branch --parent-filter 'sed \"s/^\\$/-p <graft-id>/\"' HEAD\n
#: en/git-filter-branch.txt:295
#, priority:100
msgid "(if the parent string is empty - which happens when we are dealing with the initial commit - add graftcommit as a parent). Note that this assumes history with a single root (that is, no merge without common ancestors happened). If this is not the case, use:"
-msgstr ""
-"(caso o texto da origem esteja vazio - o mesmo que acontece quando estamos "
-"lidando com o commit inicial - `add graftcommit` como origem). Observe que "
-"isso assume o hist처rico com uma 첬nica raiz (ou seja, sem nenhuma mesclagem "
-"com ancestrais comuns). Se n찾o for esse o caso, utilize:"
+msgstr "(caso o texto da origem esteja vazio - o mesmo que acontece quando estamos lidando com o commit inicial - `add graftcommit` como origem). Observe que isso assume o hist처rico com uma 첬nica raiz (ou seja, sem nenhuma mesclagem com ancestrais comuns). Se n찾o for esse o caso, utilize:"
#. type: delimited block -
#: en/git-filter-branch.txt:299
@@ -28695,12 +24619,7 @@ msgstr ""
#: en/git-filter-branch.txt:340
#, priority:100
msgid "The shift magic first throws away the tree id and then the -p parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit."
-msgstr ""
-"A m찼gica do deslocamento primeiro joga fora o ID da 찼rvore e depois os "
-"par창metros `-p`. Observe que isso manipula a mesclagem de forma adequada! "
-"No caso de Darl ter feito um commit mesclando entre P1 e P2, ela ser찼 "
-"propagada corretamente e todos os herdeiros desta mesclagem se tornar찾o "
-"commits P1,P2 como as suas origens em vez do commit de mesclagem."
+msgstr "A m찼gica do deslocamento primeiro joga fora o ID da 찼rvore e depois os par창metros `-p`. Observe que isso manipula a mesclagem de forma adequada! No caso de Darl ter feito um commit mesclando entre P1 e P2, ela ser찼 propagada corretamente e todos os herdeiros desta mesclagem se tornar찾o commits P1,P2 como as suas origens em vez do commit de mesclagem."
#. type: Plain text
#: en/git-filter-branch.txt:345
@@ -28738,10 +24657,7 @@ msgstr ""
#: en/git-filter-branch.txt:358
#, priority:100
msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
-msgstr ""
-"Caso precise adicionar as linhas 'Acked-by' (Reconhecido por) aos 첬ltimos 10 "
-"commits por exemplo (nenhum dos quais seja uma mesclagem), utilize este "
-"comando:"
+msgstr "Caso precise adicionar as linhas 'Acked-by' (Reconhecido por) aos 첬ltimos 10 commits por exemplo (nenhum dos quais seja uma mesclagem), utilize este comando:"
#. type: delimited block -
#: en/git-filter-branch.txt:364
@@ -28761,11 +24677,7 @@ msgstr ""
#: en/git-filter-branch.txt:370
#, priority:100
msgid "The `--env-filter` option can be used to modify committer and/or author identity. For example, if you found out that your commits have the wrong identity due to a misconfigured user.email, you can make a correction, before publishing the project, like this:"
-msgstr ""
-"A op챌찾o `--env-filter` pode ser utilizada para modificar a identidade do "
-"autor de quem fez o commit. Caso descubra que os seus commits t챗m a "
-"identidade errada devido a um `user.email` configurado de forma errada por "
-"exemplo, 챕 poss챠vel fazer uma corre챌찾o antes de publicar o projeto, assim:"
+msgstr "A op챌찾o `--env-filter` pode ser utilizada para modificar a identidade do autor de quem fez o commit. Caso descubra que os seus commits t챗m a identidade errada devido a um `user.email` configurado de forma errada por exemplo, 챕 poss챠vel fazer uma corre챌찾o antes de publicar o projeto, assim:"
#. type: delimited block -
#: en/git-filter-branch.txt:382
@@ -28797,11 +24709,7 @@ msgstr ""
#: en/git-filter-branch.txt:388
#, priority:100
msgid "To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range will print."
-msgstr ""
-"Para restringir a reescrita a apenas na parte do hist처rico, determine um "
-"intervalo da revis찾o al챕m do novo nome do ramo. O novo nome do ramo "
-"apontar찼 para o topo da revis찾o mais recente deste intervalo que um 'git rev-"
-"list' dessa faixa imprimir찼."
+msgstr "Para restringir a reescrita a apenas na parte do hist처rico, determine um intervalo da revis찾o al챕m do novo nome do ramo. O novo nome do ramo apontar찼 para o topo da revis찾o mais recente deste intervalo que um 'git rev-list' dessa faixa imprimir찼."
#. type: Plain text
#: en/git-filter-branch.txt:390
@@ -28825,9 +24733,7 @@ msgstr ""
#: en/git-filter-branch.txt:398
#, priority:100
msgid "To rewrite only commits D,E,F,G,H, but leave A, B and C alone, use:"
-msgstr ""
-"Para reescrever apenas os commits D, E, F, G, H, mas deixe A, B e C "
-"intactos, utilize:"
+msgstr "Para reescrever apenas os commits D, E, F, G, H, mas deixe A, B e C intactos, utilize:"
#. type: delimited block -
#: en/git-filter-branch.txt:401
@@ -28883,13 +24789,7 @@ msgstr "LISTA DE VERIFICA횉횄O PARA REDUZIR DE UM REPOSIT횙RIO"
#: en/git-filter-branch.txt:431
#, priority:100
msgid "git-filter-branch can be used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that:"
-msgstr ""
-"O comando `git-filter-branch` pode ser utilizado para se livrar de um "
-"subconjunto de arquivos, geralmente com alguma combina챌찾o das op챌천es "
-"`--index-filter` e `--subdirectory-filter`. As pessoas esperam que o "
-"reposit처rio resultante seja menor que o original, por챕m s찾o necess찼rios mais "
-"algumas etapas para torn찼-lo menor porque o Git se esfor챌a para n찾o perder "
-"os seus objetos at챕 que voc챗 assim o solicite. Primeiro, verifique se:"
+msgstr "O comando `git-filter-branch` pode ser utilizado para se livrar de um subconjunto de arquivos, geralmente com alguma combina챌찾o das op챌천es `--index-filter` e `--subdirectory-filter`. As pessoas esperam que o reposit처rio resultante seja menor que o original, por챕m s찾o necess찼rios mais algumas etapas para torn찼-lo menor porque o Git se esfor챌a para n찾o perder os seus objetos at챕 que voc챗 assim o solicite. Primeiro, verifique se:"
#. type: Plain text
#: en/git-filter-branch.txt:435
@@ -28901,9 +24801,7 @@ msgstr "Voc챗 realmente removeu todas as variantes de um nome do arquivo, se um
#: en/git-filter-branch.txt:438
#, priority:100
msgid "You really filtered all refs: use `--tag-name-filter cat -- --all` when calling git-filter-branch."
-msgstr ""
-"Voc챗 realmente filtrou todas as refer챗ncias: utilize as op챌천es `--tag-name-"
-"filter cat -- --all` ao invocar o comando 'git-filter-branch'."
+msgstr "Voc챗 realmente filtrou todas as refer챗ncias: utilize as op챌천es `--tag-name-filter cat -- --all` ao invocar o comando 'git-filter-branch'."
#. type: Plain text
#: en/git-filter-branch.txt:441
@@ -28915,11 +24813,7 @@ msgstr "Depois, existem duas outras maneiras de se obter um reposit처rio ainda m
#: en/git-filter-branch.txt:445
#, 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!)"
+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
@@ -28931,28 +24825,19 @@ msgstr "Caso realmente n찾o queira clon찼-lo, independente do motivo, verifique
#: en/git-filter-branch.txt:454
#, priority:100
msgid "Remove the original refs backed up by git-filter-branch: say `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
-msgstr ""
-"Remova os refs originais com o backup do git-filter-branch utilizando: `git "
-"for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-"
-"ref -d`."
+msgstr "Remova os refs originais com o backup do git-filter-branch utilizando: `git for-each-ref --format=\"%(refname)\" refs/original/ | xargs -n 1 git update-ref -d`."
#. type: Plain text
#: en/git-filter-branch.txt:456
#, priority:100
msgid "Expire all reflogs with `git reflog expire --expire=now --all`."
-msgstr ""
-"Expire todos os `reflogs` utilizando o comando `git reflog expire --"
-"expire=now --all`."
+msgstr "Expire todos os `reflogs` utilizando o comando `git reflog expire --expire=now --all`."
#. type: Plain text
#: en/git-filter-branch.txt:460
#, priority:100
msgid "Garbage collect all unreferenced objects with `git gc --prune=now` (or if your git-gc is not new enough to support arguments to `--prune`, use `git repack -ad; git prune` instead)."
-msgstr ""
-"O lixo 챕 coletado de todos os objetos sem refer챗ncias utilizando o comando `"
-"git gc --prune=now` (ou caso o seu `git-gc` n찾o seja novo o suficiente para "
-"suportar os argumentos para a op챌찾o `--prune`, utilize `git repack -ad; git "
-"prune`)."
+msgstr "O lixo 챕 coletado de todos os objetos sem refer챗ncias utilizando o comando `git gc --prune=now` (ou caso o seu `git-gc` n찾o seja novo o suficiente para suportar os argumentos para a op챌찾o `--prune`, utilize `git repack -ad; git prune`)."
#. type: Plain text
#: en/git-filter-branch.txt:467
@@ -29196,10 +25081,7 @@ msgstr ""
#: en/git-fmt-merge-msg.txt:20
#, priority:100
msgid "Takes the list of merged objects on stdin and produces a suitable commit message to be used for the merge commit, usually to be passed as the '<merge-message>' argument of 'git merge'."
-msgstr ""
-"Pega a lista de objetos mesclados no stdin e gera uma mensagem adequada para "
-"o commit, que foi mesclado, geralmente ser utilizada como '<mensagem-da-"
-"mesclagem>' que 챕 um argumento do comando 'git merge'."
+msgstr "Pega a lista de objetos mesclados no stdin e gera uma mensagem adequada para o commit, que foi mesclado, geralmente ser utilizada como '<mensagem-da-mesclagem>' que 챕 um argumento do comando 'git merge'."
#. type: Plain text
#: en/git-fmt-merge-msg.txt:23
@@ -29217,12 +25099,7 @@ msgstr "--log[=<n>]"
#: en/git-fmt-merge-msg.txt:33
#, priority:100
msgid "In addition to branch names, populate the log message with one-line descriptions from the actual commits that are being merged. At most <n> commits from each merge parent will be used (20 if <n> is omitted). This overrides the `merge.log` configuration variable."
-msgstr ""
-"Al챕m dos nomes das ramifica챌천es, preencha a mensagem do registro log com "
-"descri챌천es de uma linha dos commits que est찾o sendo mesclados atualmente. "
-"Ser찾o utilizadas no m찼ximo <n> mesclagens dos commits de cada origem (20 "
-"caso <n> seja omitido). Isso substitui a vari찼vel da configura챌찾o `merge."
-"log`."
+msgstr "Al챕m dos nomes das ramifica챌천es, preencha a mensagem do registro log com descri챌천es de uma linha dos commits que est찾o sendo mesclados atualmente. Ser찾o utilizadas no m찼ximo <n> mesclagens dos commits de cada origem (20 caso <n> seja omitido). Isso substitui a vari찼vel da configura챌찾o `merge.log`."
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:72
@@ -29258,9 +25135,7 @@ msgstr "--message <mensagem>"
#: en/git-fmt-merge-msg.txt:46
#, priority:100
msgid "Use <message> instead of the branch names for the first line of the log message. For use with `--log`."
-msgstr ""
-"Para a primeira linha da mensagem do registro log utilize `<mensagem>` em "
-"vez dos nomes das ramifica챌천es. Para usar com `--log`."
+msgstr "Para a primeira linha da mensagem do registro log utilize `<mensagem>` em vez dos nomes das ramifica챌천es. Para usar com `--log`."
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:48
@@ -29300,9 +25175,7 @@ msgstr ""
#: en/git-fmt-merge-msg.txt:70
#, priority:100
msgid "Print a log message describing a merge of the \"master\" branch from the \"origin\" remote."
-msgstr ""
-"Imprima uma mensagem do registro log descrevendo uma mesclagem do ramo "
-"\"master\" no ramo remoto \"origin\"."
+msgstr "Imprima uma mensagem do registro log descrevendo uma mesclagem do ramo \"master\" no ramo remoto \"origin\"."
#. type: Title =
#: en/git-for-each-ref.txt:2
@@ -29336,13 +25209,7 @@ msgstr ""
#: en/git-for-each-ref.txt:26
#, priority:100
msgid "Iterate over all refs that match `<pattern>` and show them according to the given `<format>`, after sorting them according to the given set of `<key>`. If `<count>` is given, stop after showing that many refs. The interpolated values in `<format>` can optionally be quoted as string literals in the specified host language allowing their direct evaluation in that language."
-msgstr ""
-"Reitere todos as refer챗ncias que coincidam com `<pattern>` e mostre-os de "
-"acordo com o `<formato>` utilizado depois de classific찼-los de acordo com o "
-"conjunto informado por `<chave>`. Caso `<count>` seja utilizado, pare "
-"depois de exibir refer챗ncias demais. Os valores interpolados no `<formato>` "
-"podem opcionalmente ser citados como literais de uma cadeia de caracteres no "
-"idioma do host utilizado, permitindo a sua avalia챌찾o direta neste idioma."
+msgstr "Reitere todos as refer챗ncias que coincidam com `<pattern>` e mostre-os de acordo com o `<formato>` utilizado depois de classific찼-los de acordo com o conjunto informado por `<chave>`. Caso `<count>` seja utilizado, pare depois de exibir refer챗ncias demais. Os valores interpolados no `<formato>` podem opcionalmente ser citados como literais de uma cadeia de caracteres no idioma do host utilizado, permitindo a sua avalia챌찾o direta neste idioma."
#. type: Labeled list
#: en/git-for-each-ref.txt:29 en/git-show-ref.txt:88
@@ -29354,11 +25221,7 @@ msgstr "<pattern>..."
#: en/git-for-each-ref.txt:34
#, priority:100
msgid "If one or more patterns are given, only refs are shown that match against at least one pattern, either using fnmatch(3) or literally, in the latter case matching completely or from the beginning up to a slash."
-msgstr ""
-"Caso uma ou mais padr천es sejam utilizados, ser찾o exibidos apenas as "
-"refer챗ncias que coincidam com um dos padr천es apresentados utilizando "
-"fnmatch(3) ou literal, neste 첬ltimo caso, apenas caso coincida completamente "
-"seja desde o in챠cio ou at챕 uma barra."
+msgstr "Caso uma ou mais padr천es sejam utilizados, ser찾o exibidos apenas as refer챗ncias que coincidam com um dos padr천es apresentados utilizando fnmatch(3) ou literal, neste 첬ltimo caso, apenas caso coincida completamente seja desde o in챠cio ou at챕 uma barra."
#. type: Labeled list
#: en/git-for-each-ref.txt:35
@@ -29376,11 +25239,7 @@ msgstr "횋 predefinido que o comando exiba todos as refer챗ncias que coincidam c
#: en/git-for-each-ref.txt:46
#, priority:100
msgid "A field name to sort on. Prefix `-` to sort in descending order of the value. When unspecified, `refname` is used. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key."
-msgstr ""
-"A field name to sort on. O prefixo `-` 챕 utilizado para classificar em "
-"ordem decrescente. When unspecified, `refname` is used. Voc챗 pode utilizar "
-"a op챌찾o `--sort=<chave>` mais de uma vez; nesse caso, a 첬ltima chave se "
-"torna a chave prim찼ria."
+msgstr "A field name to sort on. O prefixo `-` 챕 utilizado para classificar em ordem decrescente. When unspecified, `refname` is used. Voc챗 pode utilizar a op챌찾o `--sort=<chave>` mais de uma vez; nesse caso, a 첬ltima chave se torna a chave prim찼ria."
#. type: Labeled list
#: en/git-for-each-ref.txt:47 en/git-replace.txt:106 en/git-tag.txt:197 en/pretty-options.txt:2
@@ -29392,18 +25251,7 @@ msgstr "--format=<formato>"
#: en/git-for-each-ref.txt:59
#, priority:100
msgid "A string that interpolates `%(fieldname)` from a ref being shown and the object it points at. If `fieldname` is prefixed with an asterisk (`*`) and the ref points at a tag object, use the value for the field in the object which the tag object refers to (instead of the field in the tag object). When unspecified, `<format>` defaults to `%(objectname) SPC %(objecttype) TAB %(refname)`. It also interpolates `%%` to `%`, and `%xx` where `xx` are hex digits interpolates to character with hex code `xx`; for example `%00` interpolates to `\\0` (NUL), `%09` to `\\t` (TAB) and `%0a` to `\\n` (LF)."
-msgstr ""
-"Uma cadeia de caracteres que interpola `%(fieldname)` vindo de uma "
-"refer챗ncia sendo exibida e o objeto para o qual aponta. Caso `fieldname` "
-"seja prefixada com um asterisco (`*`) e a refer챗ncia aponte para um objeto "
-"tag, utilize o valor do campo no objeto ao qual o objeto tag se refere (em "
-"vez do campo no objeto tag). Quando n찾o especificado, o `<formato>` assume "
-"a predefini챌찾o `%(objectname) SPC %(objecttype) TAB %(refname)`. Tamb챕m "
-"interpola `%%` para `%` e `% xx` onde `xx` s찾o d챠gitos hexadecimais "
-"interpolados com caracteres que tenha um c처digo hexadecimal `xx`; `% 00` "
-"interpola para `\\0` (NUL) por exemplo, `%09` para `\\t` (TAB) e `%0a` para `"
-"\\n"
-"` (LF)."
+msgstr "Uma cadeia de caracteres que interpola `%(fieldname)` vindo de uma refer챗ncia sendo exibida e o objeto para o qual aponta. Caso `fieldname` seja prefixada com um asterisco (`*`) e a refer챗ncia aponte para um objeto tag, utilize o valor do campo no objeto ao qual o objeto tag se refere (em vez do campo no objeto tag). Quando n찾o especificado, o `<formato>` assume a predefini챌찾o `%(objectname) SPC %(objecttype) TAB %(refname)`. Tamb챕m interpola `%%` para `%` e `% xx` onde `xx` s찾o d챠gitos hexadecimais interpolados com caracteres que tenha um c처digo hexadecimal `xx`; `% 00` interpola para `\\0` (NUL) por exemplo, `%09` para `\\t` (TAB) e `%0a` para `\\n` (LF)."
#. type: Plain text
#: en/git-for-each-ref.txt:64 en/git-tag.txt:129
@@ -29439,11 +25287,7 @@ msgstr "--tcl"
#: en/git-for-each-ref.txt:73
#, priority:100
msgid "If given, strings that substitute `%(fieldname)` placeholders are quoted as string literals suitable for the specified host language. This is meant to produce a scriptlet that can directly be `eval`ed."
-msgstr ""
-"Se informado, as strings que substituem os espa챌os reservados `% (fieldname)`"
-" s찾o citadas como literais de strings adequadas para o idioma do host "
-"especificado. Isso tem a inten챌찾o de produzir um \"scriptlet\" que possa "
-"ser diretamente \"avaliado\"."
+msgstr "Se informado, as strings que substituem os espa챌os reservados `% (fieldname)` s찾o citadas como literais de strings adequadas para o idioma do host especificado. Isso tem a inten챌찾o de produzir um \"scriptlet\" que possa ser diretamente \"avaliado\"."
#. type: Labeled list
#: en/git-for-each-ref.txt:74
@@ -29521,10 +25365,7 @@ msgstr "NOME DOS CAMPOS"
#: en/git-for-each-ref.txt:104
#, priority:100
msgid "Various values from structured fields in referenced objects can be used to interpolate into the resulting output, or as sort keys."
-msgstr ""
-"H찼 v찼rios valores dos campos estruturados nas refer챗ncias dos objetos que "
-"podem ser utilizados para interpola챌찾o da sa챠da resultante ou como chaves de "
-"classifica챌찾o."
+msgstr "H찼 v찼rios valores dos campos estruturados nas refer챗ncias dos objetos que podem ser utilizados para interpola챌찾o da sa챠da resultante ou como chaves de classifica챌찾o."
#. type: Plain text
#: en/git-for-each-ref.txt:106
@@ -29542,22 +25383,7 @@ msgstr "refname"
#: en/git-for-each-ref.txt:123
#, priority:100
msgid "The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short name of the ref append `:short`. The option core.warnAmbiguousRefs is used to select the strict abbreviation mode. If `lstrip=<N>` (`rstrip=<N>`) is appended, strips `<N>` slash-separated path components from the front (back) of the refname (e.g. `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo` and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). If `<N>` is a negative number, strip as many path components as necessary from the specified end to leave `-<N>` path components (e.g. `%(refname:lstrip=-2)` turns `refs/tags/foo` into `tags/foo` and `%(refname:rstrip=-1)` turns `refs/tags/foo` into `refs`). When the ref does not have enough components, the result becomes an empty string if stripping with positive <N>, or it becomes the full refname if stripping with negative <N>. Neither is an error."
-msgstr ""
-"O nome da refer챗ncia \"ref\" (a parte ap처s $GIT_DIR/). Para um nome "
-"abreviado n찾o amb챠guo do ref, acrescente `: short`. A op챌찾o `core."
-"warnAmbiguousRefs` 챕 utilizada para selecionar o modo estrito de abrevia챌찾o. "
-"Caso `lstrip=<N>` (`rstrip=<N>`) for anexado, retira `<N>` dos componentes "
-"de caminho separados por barra da frente (traseira) do refname "
-"(`%(refname:lstrip=2)` por exemplo, transforma `refs/tags/foo` em `foo` "
-"e`%(refname:rstrip=2)` transforma `refs/tags/foo` em `refs`). Caso `<N>` "
-"seja um n첬mero negativo, retire quantos componentes do caminho forem "
-"necess찼rios do final especificado, deixando os componentes do caminho `-<N>`"
-", por exemplo (`%(refname:lstrip=-2)` transforma `refs/tags/foo` em `tags/"
-"foo` e `%(refname:rstrip=-1)` transforma `refs/tags/foo` em `refs`). Quando "
-"uma ref n찾o possui componentes suficientes, o resultado se torna uma cadeia "
-"de caracteres vazia caso seja removida com <N> positivo, ou se torna o "
-"refname completo caso seja removida com um <N> negativo. Nenhum dos dois 챕 "
-"um erro."
+msgstr "O nome da refer챗ncia \"ref\" (a parte ap처s $GIT_DIR/). Para um nome abreviado n찾o amb챠guo do ref, acrescente `: short`. A op챌찾o `core.warnAmbiguousRefs` 챕 utilizada para selecionar o modo estrito de abrevia챌찾o. Caso `lstrip=<N>` (`rstrip=<N>`) for anexado, retira `<N>` dos componentes de caminho separados por barra da frente (traseira) do refname (`%(refname:lstrip=2)` por exemplo, transforma `refs/tags/foo` em `foo` e`%(refname:rstrip=2)` transforma `refs/tags/foo` em `refs`). Caso `<N>` seja um n첬mero negativo, retire quantos componentes do caminho forem necess찼rios do final especificado, deixando os componentes do caminho `-<N>`, por exemplo (`%(refname:lstrip=-2)` transforma `refs/tags/foo` em `tags/foo` e `%(refname:rstrip=-1)` transforma `refs/tags/foo` em `refs`). Quando uma ref n찾o possui componentes suficientes, o resultado se torna uma cadeia de caracteres vazia caso seja removida com <N> positivo, ou se torna o refname completo caso seja removida com um <N> negativo. Nenhum dos dois 챕 um erro."
#. type: Plain text
#: en/git-for-each-ref.txt:125
@@ -29587,10 +25413,7 @@ msgstr "objectsize"
#: en/git-for-each-ref.txt:133
#, priority:100
msgid "The size of the object (the same as 'git cat-file -s' reports). Append `:disk` to get the size, in bytes, that the object takes up on disk. See the note about on-disk sizes in the `CAVEATS` section below."
-msgstr ""
-"횋 o tamanho do objeto (o mesmo que relat처rios 'git cat-file -s') Acrescente "
-"`: disk` para saber o quanto o objeto ocupa no disco, em bytes. Consulte a "
-"nota sobre os tamanhos do disco na se챌찾o `RESSALVAS` abaixo."
+msgstr "횋 o tamanho do objeto (o mesmo que relat처rios 'git cat-file -s') Acrescente `: disk` para saber o quanto o objeto ocupa no disco, em bytes. Consulte a nota sobre os tamanhos do disco na se챌찾o `RESSALVAS` abaixo."
#. type: Labeled list
#: en/git-for-each-ref.txt:133
@@ -29626,29 +25449,13 @@ msgstr "upstream"
#: en/git-for-each-ref.txt:154
#, priority:100
msgid "The name of a local ref which can be considered ``upstream'' from the displayed ref. Respects `:short`, `:lstrip` and `:rstrip` in the same way as `refname` above. Additionally respects `:track` to show \"[ahead N, behind M]\" and `:trackshort` to show the terse version: \">\" (ahead), \"<\" (behind), \"<>\" (ahead and behind), or \"=\" (in sync). `:track` also prints \"[gone]\" whenever unknown upstream ref is encountered. Append `:track,nobracket` to show tracking information without brackets (i.e \"ahead N, behind M\")."
-msgstr ""
-"횋 o nome de um \"ref\" local que pode ser considerado ``upstream'' do \"ref\""
-" que est찼 sendo exibido. Respeita `:short`, `:lstrip` and `:rstrip` da mesma "
-"maneira que o `refname` acima. Al챕m disso, respeita tamb챕m `:track` para "
-"exibir \"[횪 frente N, atr찼s M]\"e `:trackshort` para exibir a vers찾o concisa:"
-" \">\" (횪 frente), \"<\" (atr찼s), \"<>\" (횪 frente e atr찼s) ou \"=\" (em "
-"sincronia). `:track` tamb챕m imprime \"[gone]\" sempre que um \"ref\" "
-"\"upstream\" desconhecido for encontrado. Acrescente `:track,nobracket` para "
-"exibir as informa챌천es de rastreamento sem colchetes (ou seja, \"횪 frente de "
-"N, atr찼s de M\")."
+msgstr "횋 o nome de um \"ref\" local que pode ser considerado ``upstream'' do \"ref\" que est찼 sendo exibido. Respeita `:short`, `:lstrip` and `:rstrip` da mesma maneira que o `refname` acima. Al챕m disso, respeita tamb챕m `:track` para exibir \"[횪 frente N, atr찼s M]\"e `:trackshort` para exibir a vers찾o concisa: \">\" (횪 frente), \"<\" (atr찼s), \"<>\" (횪 frente e atr찼s) ou \"=\" (em sincronia). `:track` tamb챕m imprime \"[gone]\" sempre que um \"ref\" \"upstream\" desconhecido for encontrado. Acrescente `:track,nobracket` para exibir as informa챌천es de rastreamento sem colchetes (ou seja, \"횪 frente de N, atr찼s de M\")."
#. type: Plain text
#: en/git-for-each-ref.txt:161
#, priority:100
msgid "For any remote-tracking branch `%(upstream)`, `%(upstream:remotename)` and `%(upstream:remoteref)` refer to the name of the remote and the name of the tracked remote ref, respectively. In other words, the remote-tracking branch can be updated explicitly and individually by using the refspec `%(upstream:remoteref):%(upstream)` to fetch from `%(upstream:remotename)`."
-msgstr ""
-"Para qualquer ramifica챌찾o monitorada remotamente como `%(upstream)`, "
-"`%(upstream:nomeremoto)` e `%(upstream:remoteref)` consulte o nome remoto e "
-"o nome \"ref\" monitorado remotamente e assim sucessivamente. Em outras "
-"palavras, o ramo monitorado remotamente pode ser atualizado de forma "
-"explicita ou individualmente utilizando o \"refspec\" "
-"`%(upstream:remoteref):%(upstream)` para que seja capturado em "
-"`%(upstream:remotename)`."
+msgstr "Para qualquer ramifica챌찾o monitorada remotamente como `%(upstream)`, `%(upstream:nomeremoto)` e `%(upstream:remoteref)` consulte o nome remoto e o nome \"ref\" monitorado remotamente e assim sucessivamente. Em outras palavras, o ramo monitorado remotamente pode ser atualizado de forma explicita ou individualmente utilizando o \"refspec\" `%(upstream:remoteref):%(upstream)` para que seja capturado em `%(upstream:remotename)`."
#. type: Plain text
#: en/git-for-each-ref.txt:165
@@ -29696,18 +25503,7 @@ msgstr "align"
#: en/git-for-each-ref.txt:197
#, ignore-ellipsis, priority:100
msgid "Left-, middle-, or right-align the content between %(align:...) and %(end). The \"align:\" is followed by `width=<width>` and `position=<position>` in any order separated by a comma, where the `<position>` is either left, right or middle, default being left and `<width>` is the total length of the content with alignment. For brevity, the \"width=\" and/or \"position=\" prefixes may be omitted, and bare <width> and <position> used instead. For instance, `%(align:<width>,<position>)`. If the contents length is more than the width then no alignment is performed. If used with `--quote` everything in between %(align:...) and %(end) is quoted, but if nested then only the topmost level performs quoting."
-msgstr ""
-"Alinhe o conte첬do 횪 esquerda (Left-), ao meio (Middle-) ou 횪 direita entre "
-"%(align:...) e %(end). O \"align:\" 챕 seguido por `width=<largura>` e "
-"`position=<posi챌찾o>` em qualquer ordem separado por v챠rgula, onde a "
-"`<posi챌찾o>` 챕 esquerda, direita ou meio, a predefini챌찾o 챕 esquerda e "
-"`<largura>` 챕 o comprimento total do conte첬do com alinhamento. Por quest천es "
-"de brevidade, os prefixos \"width=\" ou \"position=\" podem ser omitidos, "
-"podendo ser utilizados <largura> e <posi챌찾o> apenas. Por exemplo, "
-"`%(align:<largura>,<posi챌찾o>)`. Caso o comprimento do conte첬do seja maior "
-"que a largura, nenhum alinhamento ser찼 realizado. Se utilizado com `--quote`"
-", tudo entre %(align:...) e %(end) ser찼 citado, por챕m se aninhado, a cita챌찾o "
-"ocorrer찼 apenas no n챠vel mais alto."
+msgstr "Alinhe o conte첬do 횪 esquerda (Left-), ao meio (Middle-) ou 횪 direita entre %(align:...) e %(end). O \"align:\" 챕 seguido por `width=<largura>` e `position=<posi챌찾o>` em qualquer ordem separado por v챠rgula, onde a `<posi챌찾o>` 챕 esquerda, direita ou meio, a predefini챌찾o 챕 esquerda e `<largura>` 챕 o comprimento total do conte첬do com alinhamento. Por quest천es de brevidade, os prefixos \"width=\" ou \"position=\" podem ser omitidos, podendo ser utilizados <largura> e <posi챌찾o> apenas. Por exemplo, `%(align:<largura>,<posi챌찾o>)`. Caso o comprimento do conte첬do seja maior que a largura, nenhum alinhamento ser찼 realizado. Se utilizado com `--quote`, tudo entre %(align:...) e %(end) ser찼 citado, por챕m se aninhado, a cita챌찾o ocorrer찼 apenas no n챠vel mais alto."
#. type: Labeled list
#: en/git-for-each-ref.txt:198
@@ -29719,16 +25515,7 @@ msgstr "if"
#: en/git-for-each-ref.txt:210
#, ignore-ellipsis, priority:100
msgid "Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If there is an atom with value or string literal after the %(if) then everything after the %(then) is printed, else if the %(else) atom is used, then everything after %(else) is printed. We ignore space when evaluating the string before %(then), this is useful when we use the %(HEAD) atom which prints either \"*\" or \" \" and we want to apply the 'if' condition only on the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" to compare the value between the %(if:...) and %(then) atoms with the given string."
-msgstr ""
-"Utilizado como %(if)...%(then)...%(end) ou %(if)...%(then)...%(else)...%(end)"
-". Caso haja um 찼tomo com um valor ou uma cadeia de caracteres literal ap처s "
-"o %(if), tudo ap처s o %(then) ser찼 impresso; caso contr찼rio, caso o 찼tomo em "
-"%(else) seja utilizado, tudo ser찼 impresso ap처s o %(else). Ignoramos o "
-"espa챌o ao avaliar uma cadeia de caracteres antes de %(then), isso 챕 첬til "
-"quando usamos o 찼tomo %(HEAD) que imprime \"*\" ou \" \" e queremos aplicar "
-"a condi챌찾o 'if' apenas no ref 'HEAD'. Anexar \":equals=<string>\" ou \""
-":notequals=<string>\" para comparar o valor entre os 찼tomos de %(if:...) e "
-"%(then) com a sequ챗ncia especificada."
+msgstr "Utilizado como %(if)...%(then)...%(end) ou %(if)...%(then)...%(else)...%(end). Caso haja um 찼tomo com um valor ou uma cadeia de caracteres literal ap처s o %(if), tudo ap처s o %(then) ser찼 impresso; caso contr찼rio, caso o 찼tomo em %(else) seja utilizado, tudo ser찼 impresso ap처s o %(else). Ignoramos o espa챌o ao avaliar uma cadeia de caracteres antes de %(then), isso 챕 첬til quando usamos o 찼tomo %(HEAD) que imprime \"*\" ou \" \" e queremos aplicar a condi챌찾o 'if' apenas no ref 'HEAD'. Anexar \":equals=<string>\" ou \":notequals=<string>\" para comparar o valor entre os 찼tomos de %(if:...) e %(then) com a sequ챗ncia especificada."
#. type: Labeled list
#: en/git-for-each-ref.txt:211
@@ -29758,10 +25545,7 @@ msgstr ""
#: en/git-for-each-ref.txt:225
#, priority:100
msgid "In addition to the above, for commit and tag objects, the header field names (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the value in the header field."
-msgstr ""
-"Al챕m do que foi dito acima para os objetos commit e tag, os nomes dos campos "
-"do cabe챌alho (`tree`, `parent`, `object`, `type`, e `tag`) podem ser "
-"utilizados para especificar o valor no campo do cabe챌alho."
+msgstr "Al챕m do que foi dito acima para os objetos commit e tag, os nomes dos campos do cabe챌alho (`tree`, `parent`, `object`, `type`, e `tag`) podem ser utilizados para especificar o valor no campo do cabe챌alho."
#. type: Plain text
#: en/git-for-each-ref.txt:230
@@ -29773,48 +25557,25 @@ msgstr "Para os objetos commit e tag, os campos especiais `creatordate` e `creat
#: en/git-for-each-ref.txt:234
#, priority:100
msgid "Fields that have name-email-date tuple as its value (`author`, `committer`, and `tagger`) can be suffixed with `name`, `email`, and `date` to extract the named component."
-msgstr ""
-"Os campos que possuam um termo ordenado nome-email-data como o valor (`autor`"
-", `committer` e `tagger`) podem ser sufixados com `nome`, `email` e `data` "
-"para extrair o componente informado."
+msgstr "Os campos que possuam um termo ordenado nome-email-data como o valor (`autor`, `committer` e `tagger`) podem ser sufixados com `nome`, `email` e `data` para extrair o componente informado."
#. type: Plain text
#: en/git-for-each-ref.txt:247
#, priority:100
msgid "The complete message in a commit and tag object is `contents`. Its first line is `contents:subject`, where subject is the concatenation of all lines of the commit message up to the first blank line. The next line is `contents:body`, where body is all of the lines after the first blank line. The optional GPG signature is `contents:signature`. The first `N` lines of the message is obtained using `contents:lines=N`. Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as `trailers` (or by using the historical alias `contents:trailers`). Non-trailer lines from the trailer block can be omitted with `trailers:only`. Whitespace-continuations can be removed from trailers so that each trailer appears on a line by itself with its full content with `trailers:unfold`. Both can be used together as `trailers:unfold,only`."
-msgstr ""
-"A mensagem completa em um objeto commit e tag 챕 `contents`. A sua primeira "
-"linha 챕 `contents:subject` onde \"subject\" (assunto) 챕 a concatena챌찾o de "
-"todas as linhas da mensagem do commit at챕 a primeira linha em branco. A "
-"pr처xima linha 챕 `contents:body`, onde \"body\" (corpo da mensagem) s찾o todas "
-"as linhas ap처s a primeira linha em branco. A assinatura opcional GPG 챕 "
-"`contents:signature`. As primeiras `N` linhas da mensagem s찾o obtidas "
-"utilizando `contents:lines=N`. Al챕m disso, os trailers interpretados por "
-"linkgit:git-interpret-trailers[1] s찾o obtidos como `trailers` (ou utilizando "
-"o alias do hist처rico `contents:trailers`). As linhas que n찾o forem "
-"\"trailers\" do bloco \"trailer\" podem ser omitidos com `trailers:only`. As "
-"continua챌천es dos espa챌os em branco podem ser removidos dos \"trailers\", "
-"para que cada \"trailer\" apare챌a em uma linha por si s처 e com o seu "
-"conte첬do completo utilizando `trailers:unfold`. Ambos podem ser utilizados "
-"juntos como `trailers:unfold,only`."
+msgstr "A mensagem completa em um objeto commit e tag 챕 `contents`. A sua primeira linha 챕 `contents:subject` onde \"subject\" (assunto) 챕 a concatena챌찾o de todas as linhas da mensagem do commit at챕 a primeira linha em branco. A pr처xima linha 챕 `contents:body`, onde \"body\" (corpo da mensagem) s찾o todas as linhas ap처s a primeira linha em branco. A assinatura opcional GPG 챕 `contents:signature`. As primeiras `N` linhas da mensagem s찾o obtidas utilizando `contents:lines=N`. Al챕m disso, os trailers interpretados por linkgit:git-interpret-trailers[1] s찾o obtidos como `trailers` (ou utilizando o alias do hist처rico `contents:trailers`). As linhas que n찾o forem \"trailers\" do bloco \"trailer\" podem ser omitidos com `trailers:only`. As continua챌천es dos espa챌os em branco podem ser removidos dos \"trailers\", para que cada \"trailer\" apare챌a em uma linha por si s처 e com o seu conte첬do completo utilizando `trailers:unfold`. Ambos podem ser utilizados juntos como `trailers:unfold,only`."
#. type: Plain text
#: en/git-for-each-ref.txt:251
#, priority:100
msgid "For sorting purposes, fields with numeric values sort in numeric order (`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`). All other fields are used to sort in their byte-value order."
-msgstr ""
-"Para fins de classifica챌찾o, os campos com os valores num챕ricos s찾o "
-"classificados em ordem num챕rica (`objectsize`, `authordate`, `committerdate`"
-", `creatordate`, `taggerdate`). Todos os outros campos s찾o utilizados para "
-"classificar a sua ordem em valor de bytes."
+msgstr "Para fins de classifica챌찾o, os campos com os valores num챕ricos s찾o classificados em ordem num챕rica (`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`). Todos os outros campos s찾o utilizados para classificar a sua ordem em valor de bytes."
#. type: Plain text
#: en/git-for-each-ref.txt:254
#, priority:100
msgid "There is also an option to sort by versions, this can be done by using the fieldname `version:refname` or its alias `v:refname`."
-msgstr ""
-"Tamb챕m existe uma op챌찾o de classifica챌찾o por vers천es utilizando o nome do "
-"campo `version:refnamee` ou o seu apelido `v:refname`."
+msgstr "Tamb챕m existe uma op챌찾o de classifica챌찾o por vers천es utilizando o nome do campo `version:refnamee` ou o seu apelido `v:refname`."
#. type: Plain text
#: en/git-for-each-ref.txt:258
@@ -29838,11 +25599,7 @@ msgstr "Alguns 찼tomos como %(align) e %(if) sempre exige que um %(end) coincida
#: en/git-for-each-ref.txt:270
#, priority:100
msgid "When a scripting language specific quoting is in effect, everything between a top-level opening atom and its matching %(end) is evaluated according to the semantics of the opening atom and only its result from the top-level is quoted."
-msgstr ""
-"Quando uma cita챌찾o espec챠fica da linguagem de script est찼 em vigor, tudo "
-"entre um 찼tomo de abertura no topo do n챠vel e o seu %(end) correspondente 챕 "
-"avaliado de acordo com a sem창ntica do 찼tomo de abertura e apenas o resultado "
-"do topo seja citado."
+msgstr "Quando uma cita챌찾o espec챠fica da linguagem de script est찼 em vigor, tudo entre um 찼tomo de abertura no topo do n챠vel e o seu %(end) correspondente 챕 avaliado de acordo com a sem창ntica do 찼tomo de abertura e apenas o resultado do topo seja citado."
#. type: Plain text
#: en/git-for-each-ref.txt:277
@@ -29886,10 +25643,7 @@ msgstr ""
#: en/git-for-each-ref.txt:294
#, priority:100
msgid "A simple example showing the use of shell eval on the output, demonstrating the use of --shell. List the prefixes of all heads:"
-msgstr ""
-"Um exemplo simples exibindo a utiliza챌찾o da sa챠da do \"eval\" no shell, "
-"demonstrando a utiliza챌찾o da op챌찾o `--shell`. Liste os prefixos de todos os "
-"\"heads\":"
+msgstr "Um exemplo simples exibindo a utiliza챌찾o da sa챠da do \"eval\" no shell, demonstrando a utiliza챌찾o da op챌찾o `--shell`. Liste os prefixos de todos os \"heads\":"
#. type: delimited block -
#: en/git-for-each-ref.txt:303
@@ -30109,41 +25863,25 @@ msgstr "Existem duas maneiras de especificar em quais commits operar."
#: en/git-format-patch.txt:48
#, priority:100
msgid "A single commit, <since>, specifies that the commits leading to the tip of the current branch that are not in the history that leads to the <since> to be output."
-msgstr ""
-"Um 첬nico commit, `<since>`, determina que os commits que levem ao cume do "
-"ramo atual que n찾o est찾o no hist처rico que levem ao `<since>` para ser gerado."
+msgstr "Um 첬nico commit, `<since>`, determina que os commits que levem ao cume do ramo atual que n찾o est찾o no hist처rico que levem ao `<since>` para ser gerado."
#. type: Plain text
#: en/git-format-patch.txt:52
#, priority:100
msgid "Generic <revision range> expression (see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]) means the commits in the specified range."
-msgstr ""
-"Express찾o gen챕rica do <intervalo da revis찾o> (consulte a se챌찾o \"DEFININDO "
-"AS REVIS횛ES\" no linkgit:gitrevisions[7]) define os commits no intervalo "
-"especificado."
+msgstr "Express찾o gen챕rica do <intervalo da revis찾o> (consulte a se챌찾o \"DEFININDO AS REVIS횛ES\" no linkgit:gitrevisions[7]) define os commits no intervalo especificado."
#. type: Plain text
#: en/git-format-patch.txt:58
#, priority:100
msgid "The first rule takes precedence in the case of a single <commit>. To apply the second rule, i.e., format everything since the beginning of history up until <commit>, use the `--root` option: `git format-patch --root <commit>`. If you want to format only <commit> itself, you can do this with `git format-patch -1 <commit>`."
-msgstr ""
-"A primeira regra tem preced챗ncia no caso de um 첬nico `<commit>`. Para "
-"aplicar a segunda regra, formate tudo desde o in챠cio do hist처rico at챕 "
-"`<commit>`, utilize a op챌찾o `--root`, por exemplo: `git format-patch --root "
-"<commit>`. Caso queira formatar apenas o `<commit>` em si, fa챌a com `git "
-"format-patch -1 <commit>`."
+msgstr "A primeira regra tem preced챗ncia no caso de um 첬nico `<commit>`. Para aplicar a segunda regra, formate tudo desde o in챠cio do hist처rico at챕 `<commit>`, utilize a op챌찾o `--root`, por exemplo: `git format-patch --root <commit>`. Caso queira formatar apenas o `<commit>` em si, fa챌a com `git format-patch -1 <commit>`."
#. type: Plain text
#: en/git-format-patch.txt:65
#, priority:100
msgid "By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as the filename. With the `--numbered-files` option, the output file names will only be numbers, without the first line of the commit appended. The names of the output files are printed to standard output, unless the `--stdout` option is specified."
-msgstr ""
-"횋 predefinido que cada arquivo de sa챠da seja numerado sequencialmente 횪 "
-"partir de 1 e usa a primeira linha da mensagem do commit (trabalhada para a "
-"seguran챌a do pathname) como o pathname. Com a op챌찾o `--numbered-files`, os "
-"nomes dos arquivos na sa챠da ser찾o apenas n첬meros, sem a primeira linha "
-"anexada do commit. Os nomes dos arquivos na sa챠da s찾o impressos na sa챠da "
-"predefinida a menos que a op챌찾o `--stdout` seja utilizada."
+msgstr "횋 predefinido que cada arquivo de sa챠da seja numerado sequencialmente 횪 partir de 1 e usa a primeira linha da mensagem do commit (trabalhada para a seguran챌a do pathname) como o pathname. Com a op챌찾o `--numbered-files`, os nomes dos arquivos na sa챠da ser찾o apenas n첬meros, sem a primeira linha anexada do commit. Os nomes dos arquivos na sa챠da s찾o impressos na sa챠da predefinida a menos que a op챌찾o `--stdout` seja utilizada."
#. type: Plain text
#: en/git-format-patch.txt:73
@@ -30161,21 +25899,13 @@ msgstr "횋 predefinido que o assunto de um 첬nico patch seja \"[PATCH]\" seguido
#: en/git-format-patch.txt:81
#, priority:100
msgid "When multiple patches are output, the subject prefix will instead be \"[PATCH n/m] \". To force 1/1 to be added for a single patch, use `-n`. To omit patch numbers from the subject, use `-N`."
-msgstr ""
-"Quando v찼rios patches s찾o produzidos, o prefixo do assunto ser찼 \"[PATCH n/m]"
-" \". Para for챌ar a adi챌찾o 1/1 para um 첬nico patch, utilize `-n`. Para "
-"omitir os n첬meros do assunto, utilize `-N`."
+msgstr "Quando v찼rios patches s찾o produzidos, o prefixo do assunto ser찼 \"[PATCH n/m] \". Para for챌ar a adi챌찾o 1/1 para um 첬nico patch, utilize `-n`. Para omitir os n첬meros do assunto, utilize `-N`."
#. type: Plain text
#: en/git-format-patch.txt:86
#, priority:100
msgid "If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear as replies to the first mail; this also generates a `Message-Id` header to reference."
-msgstr ""
-"Caso a op챌찾o `--thread` seja utilizada, o ` git-format-patch` ir찼 gerar "
-"cabe챌alhos `In-Reply-To` (Em-Resposta-Para) e `References` para fazer com "
-"que o e-mail do segundo e subsequentes patches apare챌am como resposta ao "
-"primeiro e-mail; isso tamb챕m gera um cabe챌alho `Message-Id` para a "
-"refer챗ncia."
+msgstr "Caso a op챌찾o `--thread` seja utilizada, o ` git-format-patch` ir찼 gerar cabe챌alhos `In-Reply-To` (Em-Resposta-Para) e `References` para fazer com que o e-mail do segundo e subsequentes patches apare챌am como resposta ao primeiro e-mail; isso tamb챕m gera um cabe챌alho `Message-Id` para a refer챗ncia."
#. type: Labeled list
#: en/git-format-patch.txt:92
@@ -30205,9 +25935,7 @@ msgstr "--output-directory <dir>"
#: en/git-format-patch.txt:99
#, priority:100
msgid "Use <dir> to store the resulting files, instead of the current working directory."
-msgstr ""
-"Utilize `<dir>` para armazenar os arquivos resultantes em vez do diret처rio "
-"de trabalho atual."
+msgstr "Utilize `<dir>` para armazenar os arquivos resultantes em vez do diret처rio de trabalho atual."
#. type: Labeled list
#: en/git-format-patch.txt:101 en/git-shortlog.txt:30
@@ -30297,10 +26025,7 @@ msgstr "--attach[=<divisa>]"
#: en/git-format-patch.txt:134
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: attachment`."
-msgstr ""
-"Crie anexos com diversas partes/misto onde a primeira parte 챕 a mensagem do "
-"commit e o pr처prio patch na segunda parte utilizando `Content-Disposition: "
-"attachment`."
+msgstr "Crie anexos com diversas partes/misto onde a primeira parte 챕 a mensagem do commit e o pr처prio patch na segunda parte utilizando `Content-Disposition: attachment`."
#. type: Labeled list
#: en/git-format-patch.txt:135
@@ -30324,10 +26049,7 @@ msgstr "--inline[=<divisa>]"
#: en/git-format-patch.txt:143
#, priority:100
msgid "Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with `Content-Disposition: inline`."
-msgstr ""
-"Crie um anexo com diversas partes/misto onde a primeira parte 챕 a mensagem "
-"do commit e o pr처prio patch na segunda parte utilizando `Content-Disposition:"
-" inline`."
+msgstr "Crie um anexo com diversas partes/misto onde a primeira parte 챕 a mensagem do commit e o pr처prio patch na segunda parte utilizando `Content-Disposition: inline`."
#. type: Labeled list
#: en/git-format-patch.txt:144
@@ -30399,38 +26121,25 @@ msgstr "--cover-from-description=<mode>"
#: en/git-format-patch.txt:180
#, priority:100
msgid "Controls which parts of the cover letter will be automatically populated using the branch's description."
-msgstr ""
-"Controla quais as partes da carta de apresenta챌찾o ser찾o preenchidas "
-"automaticamente utilizando ao descritivo do ramo."
+msgstr "Controla quais as partes da carta de apresenta챌찾o ser찾o preenchidas automaticamente utilizando ao descritivo do ramo."
#. type: Plain text
#: en/git-format-patch.txt:185
#, priority:100
msgid "If `<mode>` is `message` or `default`, the cover letter subject will be populated with placeholder text. The body of the cover letter will be populated with the branch's description. This is the default mode when no configuration nor command line option is specified."
-msgstr ""
-"Caso `<modo>` seja `message` ou `default`, o assunto da carta de "
-"apresenta챌찾o ser찼 preenchido com um texto em um espa챌o reservado. O corpo da "
-"carta de apresenta챌찾o ser찼 preenchido com a descri챌찾o do ramo. Este 챕 o modo "
-"predefinido quando nenhuma configura챌찾o ou op챌찾o na linha de comando for "
-"utilizada."
+msgstr "Caso `<modo>` seja `message` ou `default`, o assunto da carta de apresenta챌찾o ser찼 preenchido com um texto em um espa챌o reservado. O corpo da carta de apresenta챌찾o ser찼 preenchido com a descri챌찾o do ramo. Este 챕 o modo predefinido quando nenhuma configura챌찾o ou op챌찾o na linha de comando for utilizada."
#. type: Plain text
#: en/git-format-patch.txt:189
#, priority:100
msgid "If `<mode>` is `subject`, the first paragraph of the branch description will populate the cover letter subject. The remainder of the description will populate the body of the cover letter."
-msgstr ""
-"Caso o `<modo>` seja `subject`, o primeiro par찼grafo do descritivo do ramo "
-"preencher찼 o assunto da carta de apresenta챌찾o. O restante do descritivo "
-"preencher찼 o corpo da carta de apresenta챌찾o."
+msgstr "Caso o `<modo>` seja `subject`, o primeiro par찼grafo do descritivo do ramo preencher찼 o assunto da carta de apresenta챌찾o. O restante do descritivo preencher찼 o corpo da carta de apresenta챌찾o."
#. type: Plain text
#: en/git-format-patch.txt:193
#, priority:100
msgid "If `<mode>` is `auto`, if the first paragraph of the branch description is greater than 100 bytes, then the mode will be `message`, otherwise `subject` will be used."
-msgstr ""
-"Caso `<modo>` seja `auto` e se o primeiro par찼grafo do descritivo do ramo "
-"for maior que 100 bytes, o modo ser찼 `message`, caso contr찼rio, o `subject` "
-"ser찼 utilizado."
+msgstr "Caso `<modo>` seja `auto` e se o primeiro par찼grafo do descritivo do ramo for maior que 100 bytes, o modo ser찼 `message`, caso contr찼rio, o `subject` ser찼 utilizado."
#. type: Plain text
#: en/git-format-patch.txt:196
@@ -30460,10 +26169,7 @@ msgstr "--rfc"
#: en/git-format-patch.txt:207
#, priority:100
msgid "Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments\"; use this when sending an experimental patch for discussion rather than application."
-msgstr ""
-"횋 um atalho `--subject-prefix=\"RFC PATCH\"`. O RFC significa \"Solicita챌찾o "
-"de Coment찼rios\"; utilize isso ao enviar um patch experimental para que ele "
-"seja discutido em vez de um patch definitivo."
+msgstr "횋 um atalho `--subject-prefix=\"RFC PATCH\"`. O RFC significa \"Solicita챌찾o de Coment찼rios\"; utilize isso ao enviar um patch experimental para que ele seja discutido em vez de um patch definitivo."
#. type: Labeled list
#: en/git-format-patch.txt:208
@@ -30493,11 +26199,7 @@ msgstr "--to=<email>"
#: en/git-format-patch.txt:222
#, priority:100
msgid "Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-to` discards all `To:` headers added so far (from config or command line)."
-msgstr ""
-"Adicione um cabe챌alho `Para:` nos cabe챌alhos do email. 횋 um acr챕scimo a "
-"qualquer cabe챌alho configurado e pode ser utilizado v찼rias vezes. A forma "
-"negada da op챌찾o `--no-to` descarta todos os cabe챌alhos `Para:` que foram "
-"adicionados at챕 agora (seja da configura챌찾o ou da linha de comando)."
+msgstr "Adicione um cabe챌alho `Para:` nos cabe챌alhos do email. 횋 um acr챕scimo a qualquer cabe챌alho configurado e pode ser utilizado v찼rias vezes. A forma negada da op챌찾o `--no-to` descarta todos os cabe챌alhos `Para:` que foram adicionados at챕 agora (seja da configura챌찾o ou da linha de comando)."
#. type: Labeled list
#: en/git-format-patch.txt:223
@@ -30509,12 +26211,7 @@ msgstr "--cc=<email>"
#: en/git-format-patch.txt:228
#, priority:100
msgid "Add a `Cc:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. The negated form `--no-cc` discards all `Cc:` headers added so far (from config or command line)."
-msgstr ""
-"Adicione um cabe챌alho `Cc:` (Com C처pia Para) aos cabe챌alhos do email. 횋 um "
-"acr챕scimo a qualquer cabe챌alho configurado e pode ser utilizado v찼rias "
-"vezes. A forma negada da op챌찾o `--no-cc` descarta todos os cabe챌alhos `Cc:` "
-"que foram adicionados at챕 agora (seja da configura챌찾o ou da linha de "
-"comando)."
+msgstr "Adicione um cabe챌alho `Cc:` (Com C처pia Para) aos cabe챌alhos do email. 횋 um acr챕scimo a qualquer cabe챌alho configurado e pode ser utilizado v찼rias vezes. A forma negada da op챌찾o `--no-cc` descarta todos os cabe챌alhos `Cc:` que foram adicionados at챕 agora (seja da configura챌찾o ou da linha de comando)."
#. type: Labeled list
#: en/git-format-patch.txt:229
@@ -30532,12 +26229,7 @@ msgstr "--from=<ident>"
#: en/git-format-patch.txt:236
#, priority:100
msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
-msgstr ""
-"Utilize `ident` (identidade) no cabe챌alho `De:` de cada email do commit. "
-"Caso o `ident` do autor do commit n찾o seja textualmente id챗ntica ao `ident` "
-"informado, coloque um cabe챌alho `De:` no corpo da mensagem com o autor "
-"original. Caso nenhum `ident` seja informado, utilize o `ident` de quem fez "
-"o commit."
+msgstr "Utilize `ident` (identidade) no cabe챌alho `De:` de cada email do commit. Caso o `ident` do autor do commit n찾o seja textualmente id챗ntica ao `ident` informado, coloque um cabe챌alho `De:` no corpo da mensagem com o autor original. Caso nenhum `ident` seja informado, utilize o `ident` de quem fez o commit."
#. type: Plain text
#: en/git-format-patch.txt:243
@@ -30555,12 +26247,7 @@ msgstr "--add-header=<cabe챌alho>"
#: en/git-format-patch.txt:251
#, priority:100
msgid "Add an arbitrary header to the email headers. This is in addition to any configured headers, and may be used multiple times. For example, `--add-header=\"Organization: git-foo\"`. The negated form `--no-add-header` discards *all* (`To:`, `Cc:`, and custom) headers added so far from config or command line."
-msgstr ""
-"Adicione um cabe챌alho arbitr찼rio aos cabe챌alhos do e-mail. 횋 um acr챕scimo a "
-"qualquer cabe챌alho configurado e pode ser utilizado v찼rias vezes. Por "
-"exemplo, `--add-header=\"Organization: git-foo\"`. O formul찼rio negado "
-"`--no-add-header` descarta *todos* os cabe챌alhos (`Para:`, `Cc:` e "
-"customizado) adicionados at챕 agora na configura챌찾o ou na linha de comando."
+msgstr "Adicione um cabe챌alho arbitr찼rio aos cabe챌alhos do e-mail. 횋 um acr챕scimo a qualquer cabe챌alho configurado e pode ser utilizado v찼rias vezes. Por exemplo, `--add-header=\"Organization: git-foo\"`. O formul찼rio negado `--no-add-header` descarta *todos* os cabe챌alhos (`Para:`, `Cc:` e customizado) adicionados at챕 agora na configura챌찾o ou na linha de comando."
#. type: Labeled list
#: en/git-format-patch.txt:252
@@ -30632,11 +26319,7 @@ msgstr "--creation-factor=<percent>"
#: en/git-format-patch.txt:295
#, 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 utilizado 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])."
+msgstr "Ao ser utilizado 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:296 en/pretty-options.txt:60
@@ -30660,15 +26343,7 @@ msgstr "Adiciona as anota챌천es (consulte linkgit:git-notes[1]) para o commit de
#: en/git-format-patch.txt:308
#, priority:100
msgid "The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow)."
-msgstr ""
-"횋 esperado que seja utilizado para escrever uma explica챌찾o de suporte para o "
-"commit que n찾o perten챌a 횪 mensagem do registro log do commit e seja inclu챠da "
-"no envio do patch. Embora seja poss챠vel simplesmente escrever essas "
-"explica챌천es ap처s a execu챌찾o do `format-patch`, antes do envio, mant챗-las "
-"como notas do Git permite que elas sejam mantidas entre as vers천es da s챕rie "
-"de patches (ainda assim consulte a discuss찾o das op챌천es de configura챌찾o do "
-"`notes.rewrite` em linkgit:git-notes[1] para compreender este fluxo de "
-"trabalho)."
+msgstr "횋 esperado que seja utilizado para escrever uma explica챌찾o de suporte para o commit que n찾o perten챌a 횪 mensagem do registro log do commit e seja inclu챠da no envio do patch. Embora seja poss챠vel simplesmente escrever essas explica챌천es ap처s a execu챌찾o do `format-patch`, antes do envio, mant챗-las como notas do Git permite que elas sejam mantidas entre as vers천es da s챕rie de patches (ainda assim consulte a discuss찾o das op챌천es de configura챌찾o do `notes.rewrite` em linkgit:git-notes[1] para compreender este fluxo de trabalho)."
#. type: Plain text
#: en/git-format-patch.txt:311
@@ -30710,18 +26385,13 @@ msgstr "--suffix=.<sfx>"
#: en/git-format-patch.txt:326
#, priority:100
msgid "Instead of using `.patch` as the suffix for generated filenames, use specified suffix. A common alternative is `--suffix=.txt`. Leaving this empty will remove the `.patch` suffix."
-msgstr ""
-"Em vez de usar `.patch` como o sufixo dos nomes dos arquivos gerados, "
-"utilize o sufixo especificado. Uma alternativa comum 챕 `--suffix=.txt`. "
-"Deixando este campo vazio remove o sufixo `.patch`."
+msgstr "Em vez de usar `.patch` como o sufixo dos nomes dos arquivos gerados, utilize o sufixo especificado. Uma alternativa comum 챕 `--suffix=.txt`. Deixando este campo vazio remove o sufixo `.patch`."
#. type: Plain text
#: en/git-format-patch.txt:329
#, priority:100
msgid "Note that the leading character does not have to be a dot; for example, you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`."
-msgstr ""
-"Observe que o caractere principal n찾o precisa ser um ponto; voc챗 pode usar "
-"`suffix=patch` para obter `0001-description-of-my-change-patch` por exemplo."
+msgstr "Observe que o caractere principal n찾o precisa ser um ponto; voc챗 pode usar `suffix=patch` para obter `0001-description-of-my-change-patch` por exemplo."
#. type: Plain text
#: en/git-format-patch.txt:333
@@ -30739,11 +26409,7 @@ msgstr "--no-binary"
#: en/git-format-patch.txt:339
#, priority:100
msgid "Do not output contents of changes in binary files, instead display a notice that those files changed. Patches generated using this option cannot be applied properly, but they are still useful for code review."
-msgstr ""
-"N찾o reproduza o conte첬do das altera챌천es em arquivos bin찼rios; em vez disso, "
-"exiba um aviso que estes arquivos foram alterados. Os patches gerados "
-"utilizando esta op챌찾o n찾o podem ser aplicados de forma adequada, por챕m ainda "
-"s찾o 첬teis para a revis찾o do c처digo."
+msgstr "N찾o reproduza o conte첬do das altera챌천es em arquivos bin찼rios; em vez disso, exiba um aviso que estes arquivos foram alterados. Os patches gerados utilizando esta op챌찾o n찾o podem ser aplicados de forma adequada, por챕m ainda s찾o 첬teis para a revis찾o do c처digo."
#. type: Labeled list
#: en/git-format-patch.txt:340
@@ -30755,9 +26421,7 @@ msgstr "--zero-commit"
#: en/git-format-patch.txt:343
#, priority:100
msgid "Output an all-zero hash in each patch's From header instead of the hash of the commit."
-msgstr ""
-"Gere um hash zerado no cabe챌alho \"From\" de cada patch em vez do hash do "
-"commit."
+msgstr "Gere um hash zerado no cabe챌alho \"From\" de cada patch em vez do hash do commit."
#. type: Labeled list
#: en/git-format-patch.txt:344
@@ -30769,30 +26433,19 @@ msgstr "--[no-]base[=<commit>]"
#: en/git-format-patch.txt:350
#, priority:100
msgid "Record the base tree information to identify the state the patch series applies to. See the BASE TREE INFORMATION section below for details. If <commit> is \"auto\", a base commit is automatically chosen. The `--no-base` option overrides a `format.useAutoBase` configuration."
-msgstr ""
-"Registre as informa챌천es da base da 찼rvore que identifique a condi챌찾o na qual "
-"a s챕rie de patches se aplica. Consulte a se챌찾o INFORMA횉횄O BASE DA 횁RVORE "
-"abaixo para obter detalhes. If <commit> is \"auto\", a base commit is "
-"automatically chosen. The `--no-base` option overrides a `format.useAutoBase`"
-" configuration."
+msgstr "Registre as informa챌천es da base da 찼rvore que identifique a condi챌찾o na qual a s챕rie de patches se aplica. Consulte a se챌찾o INFORMA횉횄O BASE DA 횁RVORE abaixo para obter detalhes. If <commit> is \"auto\", a base commit is automatically chosen. The `--no-base` option overrides a `format.useAutoBase` configuration."
#. type: Plain text
#: en/git-format-patch.txt:357
#, priority:100
msgid "Treat the revision argument as a <revision range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently of this flag."
-msgstr ""
-"Trate o argumento revis찾o como um <intervalo de revis천es>, mesmo que seja "
-"apenas um 첬nico commit (que normalmente seria tratado como um <since> "
-"(desde)). Observe que os commits raiz inclu챠dos no intervalo especificado "
-"s찾o sempre formatadas como patches de cria챌찾o, independentemente dessa flag."
+msgstr "Trate o argumento revis찾o como um <intervalo de revis천es>, mesmo que seja apenas um 첬nico commit (que normalmente seria tratado como um <since> (desde)). Observe que os commits raiz inclu챠dos no intervalo especificado s찾o sempre formatadas como patches de cria챌찾o, independentemente dessa flag."
#. type: Plain text
#: en/git-format-patch.txt:360
#, priority:100
msgid "Show progress reports on stderr as patches are generated."
-msgstr ""
-"Exiba o progresso dos relat처rios no stderr 횪 medida que os patches s찾o "
-"gerados."
+msgstr "Exiba o progresso dos relat처rios no stderr 횪 medida que os patches s찾o gerados."
#. type: Plain text
#: en/git-format-patch.txt:368
@@ -30822,10 +26475,7 @@ msgstr ""
#: en/git-format-patch.txt:391
#, priority:100
msgid "The patch produced by 'git format-patch' is in UNIX mailbox format, with a fixed \"magic\" time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so:"
-msgstr ""
-"O patch produzido pelo 'git format-patch' est찼 em formato mailbox (caixa de "
-"correio) UNIX, fixado com uma estampa \"m찼gica\" indicando que o arquivo foi "
-"gerado pelo patch em vez de um mailbox real, exemplo:"
+msgstr "O patch produzido pelo 'git format-patch' est찼 em formato mailbox (caixa de correio) UNIX, fixado com uma estampa \"m찼gica\" indicando que o arquivo foi gerado pelo patch em vez de um mailbox real, exemplo:"
#. type: delimited block -
#: en/git-format-patch.txt:401
@@ -30843,8 +26493,7 @@ msgstr ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
"From: Tony Luck <tony.luck@intel.com>\n"
"Date: Tue, 13 Jul 2010 11:42:54 -0700\n"
-"Subject: [PATCH] "
-"=?UTF-8?q?[IA64]=20Put=20ia64=20config=20files=20on=20the=20?=\n"
+"Subject: [PATCH] =?UTF-8?q?[IA64]=20Put=20ia64=20config=20files=20on=20the=20?=\n"
" =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig=20diet?=\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30857,8 +26506,7 @@ msgid ""
"arch/arm config files were slimmed down using a python script\n"
"(See commit c2330e286f68f1c408b4aa6515ba49d57f05beae comment)\n"
msgstr ""
-"Os arquivos da configura챌찾o arch/arm foram reduzidos utilizando um script "
-"python\n"
+"Os arquivos da configura챌찾o arch/arm foram reduzidos utilizando um script python\n"
"(Veja o coment찼rio c2330e286f68f1c408b4aa6515ba49d57f05beae do commit)\n"
#. type: delimited block -
@@ -30868,32 +26516,20 @@ msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
"...\n"
msgstr ""
-"Fa챌a o mesmo com o ia64, para que possamos ter uma apar챗ncia elegante e "
-"ornamentada\n"
+"Fa챌a o mesmo com o ia64, para que possamos ter uma apar챗ncia elegante e ornamentada\n"
"...\n"
#. type: Plain text
#: en/git-format-patch.txt:415
#, ignore-ellipsis, priority:100
msgid "Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three dashes, and then sent as a message whose body, in our example, starts with \"arch/arm config files were...\". On the receiving end, readers can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]."
-msgstr ""
-"Normalmente, ele 챕 colocado na pasta de rascunhos do MUA, editado para "
-"adicionar os coment찼rios oportunos que n찾o devem entrar no changelog ap처s os "
-"tr챗s h챠fens e enviado como uma mensagem onde o corpo, no nosso exemplo, "
-"come챌a com \"arquivos da configura챌찾o arch/arm onde...\". No lado do "
-"recebimento, os leitores podem salvar os patches interessantes em um mailbox "
-"UNIX e aplic찼-los com linkgit:git-am[1]."
+msgstr "Normalmente, ele 챕 colocado na pasta de rascunhos do MUA, editado para adicionar os coment찼rios oportunos que n찾o devem entrar no changelog ap처s os tr챗s h챠fens e enviado como uma mensagem onde o corpo, no nosso exemplo, come챌a com \"arquivos da configura챌찾o arch/arm onde...\". No lado do recebimento, os leitores podem salvar os patches interessantes em um mailbox UNIX e aplic찼-los com linkgit:git-am[1]."
#. type: Plain text
#: en/git-format-patch.txt:421
#, priority:100
msgid "When a patch is part of an ongoing discussion, the patch generated by 'git format-patch' can be tweaked to take advantage of the 'git am --scissors' feature. After your response to the discussion comes a line that consists solely of \"`-- >8 --`\" (scissors and perforation), followed by the patch with unnecessary header fields removed:"
-msgstr ""
-"Quando um patch faz parte de uma discuss찾o em andamento, o patch gerado pelo "
-"'git format-patch' pode ser ajustado para aproveitar o recurso 'git am --"
-"scissors'. Ap처s a sua resposta na discuss찾o, surge uma linha que consiste "
-"apenas em \"`-- >8 --`\"(tesoura e perfura챌찾o), seguida pelo patch com "
-"campos desnecess찼rios do cabe챌alho que foram removidos:"
+msgstr "Quando um patch faz parte de uma discuss찾o em andamento, o patch gerado pelo 'git format-patch' pode ser ajustado para aproveitar o recurso 'git am --scissors'. Ap처s a sua resposta na discuss찾o, surge uma linha que consiste apenas em \"`-- >8 --`\"(tesoura e perfura챌찾o), seguida pelo patch com campos desnecess찼rios do cabe챌alho que foram removidos:"
#. type: delimited block -
#: en/git-format-patch.txt:425
@@ -30919,8 +26555,7 @@ msgid ""
"Subject: [IA64] Put ia64 config files on the Uwe Kleine-K철nig diet\n"
msgstr ""
"-> 8 -\n"
-"Assunto: [IA64] Coloque os arquivos da configura챌찾o do ia64 na dieta Uwe "
-"Kleine-K철nig\n"
+"Assunto: [IA64] Coloque os arquivos da configura챌찾o do ia64 na dieta Uwe Kleine-K철nig\n"
#. type: delimited block -
#: en/git-format-patch.txt:433
@@ -30929,21 +26564,14 @@ msgid ""
"arch/arm config files were slimmed down using a python script\n"
"...\n"
msgstr ""
-"Os arquivos da configura챌찾o arch/arm foram reduzidos utilizando um script "
-"python\n"
+"Os arquivos da configura챌찾o arch/arm foram reduzidos utilizando um script python\n"
"...\n"
#. type: Plain text
#: en/git-format-patch.txt:441
#, priority:100
msgid "When sending a patch this way, most often you are sending your own patch, so in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit `From:` and `Date:` lines from the patch file. The patch title is likely to be different from the subject of the discussion the patch is in response to, so it is likely that you would want to keep the Subject: line, like the example above."
-msgstr ""
-"Ao enviar um patch dessa forma, na maioria das vezes voc챗 est찼 enviando o "
-"seu pr처prio patch, portanto, al챕m do marcador \"`From $SHA1 $magic_timestamp`"
-"\", voc챗 deve omitir as linhas `From:` e `Date:` do arquivo patch. 횋 "
-"prov찼vel que o t챠tulo do patch seja diferente do assunto da discuss찾o onde o "
-"patch 챕 uma resposta, portanto, 챕 prov찼vel que voc챗 queira manter a linha "
-"\"Subject:\", como no exemplo acima."
+msgstr "Ao enviar um patch dessa forma, na maioria das vezes voc챗 est찼 enviando o seu pr처prio patch, portanto, al챕m do marcador \"`From $SHA1 $magic_timestamp`\", voc챗 deve omitir as linhas `From:` e `Date:` do arquivo patch. 횋 prov찼vel que o t챠tulo do patch seja diferente do assunto da discuss찾o onde o patch 챕 uma resposta, portanto, 챕 prov찼vel que voc챗 queira manter a linha \"Subject:\", como no exemplo acima."
#. type: Title ~
#: en/git-format-patch.txt:443
@@ -30955,49 +26583,37 @@ msgstr "Verificando o corrompimento dos patches"
#: en/git-format-patch.txt:446
#, priority:100
msgid "Many mailers if not set up properly will corrupt whitespace. Here are two common types of corruption:"
-msgstr ""
-"Muitos clientes de e-mail se n찾o configurados corretamente ir찾o corromper os "
-"espa챌os em branco. Aqui est찾o dois tipos comuns de corrompimento:"
+msgstr "Muitos clientes de e-mail se n찾o configurados corretamente ir찾o corromper os espa챌os em branco. Aqui est찾o dois tipos comuns de corrompimento:"
#. type: Plain text
#: en/git-format-patch.txt:448
#, priority:100
msgid "Empty context lines that do not have _any_ whitespace."
-msgstr ""
-"As linhas de contexto vazias que n찾o possuem _qualquer_ espa챌o em branco."
+msgstr "As linhas de contexto vazias que n찾o possuem _qualquer_ espa챌o em branco."
#. type: Plain text
#: en/git-format-patch.txt:451
#, priority:100
msgid "Non-empty context lines that have one extra whitespace at the beginning."
-msgstr ""
-"As linhas de contexto n찾o vazias que possuam um espa챌o em branco extra no "
-"in챠cio."
+msgstr "As linhas de contexto n찾o vazias que possuam um espa챌o em branco extra no in챠cio."
#. type: Plain text
#: en/git-format-patch.txt:453
#, priority:100
msgid "One way to test if your MUA is set up correctly is:"
-msgstr ""
-"Uma maneira de testar se o seu cliente de e-mail est찼 configurado "
-"corretamente 챕 fazendo o seguinte:"
+msgstr "Uma maneira de testar se o seu cliente de e-mail est찼 configurado corretamente 챕 fazendo o seguinte:"
#. type: Plain text
#: en/git-format-patch.txt:457
#, priority:100
msgid "Send the patch to yourself, exactly the way you would, except with To: and Cc: lines that do not contain the list and maintainer address."
-msgstr ""
-"Envie o patch para voc챗 mesmo exatamente como voc챗 faria se fosse enviar "
-"para algu챕m sem adicionar a lista e o endere챌o do mantenedor em \"To:\" "
-"(Para:) e \"Cc:\"."
+msgstr "Envie o patch para voc챗 mesmo exatamente como voc챗 faria se fosse enviar para algu챕m sem adicionar a lista e o endere챌o do mantenedor em \"To:\" (Para:) e \"Cc:\"."
#. type: Plain text
#: en/git-format-patch.txt:460
#, priority:100
msgid "Save that patch to a file in UNIX mailbox format. Call it a.patch, say."
-msgstr ""
-"Salve esse patch em um arquivo no formato mailbox do UNIX. Chame-o de \"a."
-"patch\"."
+msgstr "Salve esse patch em um arquivo no formato mailbox do UNIX. Chame-o de \"a.patch\"."
#. type: Plain text
#: en/git-format-patch.txt:462
@@ -31025,33 +26641,19 @@ msgstr "Pode haver v찼rios motivos caso o patch n찾o seja aplicado corretamente.
#: en/git-format-patch.txt:474
#, priority:100
msgid "The patch itself does not apply cleanly. That is _bad_ but does not have much to do with your MUA. You might want to rebase the patch with linkgit:git-rebase[1] before regenerating it in this case."
-msgstr ""
-"O patch em si n찾o est찼 correto. Isso 챕 _ruim_, mas n찾o tem muito a ver com "
-"o seu cliente de e-mail. Voc챗 pode querer refazer o patch neste caso com "
-"linkgit:git-rebase[1] antes de regener찼-lo."
+msgstr "O patch em si n찾o est찼 correto. Isso 챕 _ruim_, mas n찾o tem muito a ver com o seu cliente de e-mail. Voc챗 pode querer refazer o patch neste caso com linkgit:git-rebase[1] antes de regener찼-lo."
#. type: Plain text
#: en/git-format-patch.txt:479
#, priority:100
msgid "The MUA corrupted your patch; \"am\" would complain that the patch does not apply. Look in the .git/rebase-apply/ subdirectory and see what 'patch' file contains and check for the common corruption patterns mentioned above."
-msgstr ""
-"O seu cliente de e-mail corrompeu o seu patch; o \"am\" reclamaria que o "
-"patch n찾o pode ser aplicado. Procure no subdiret처rio `.git/rebase-apply/` e "
-"veja o conte첬do do arquivo 'patch', verifique se os padr천es mais comuns de "
-"corrup챌찾o mencionados acima se aplicam."
+msgstr "O seu cliente de e-mail corrompeu o seu patch; o \"am\" reclamaria que o patch n찾o pode ser aplicado. Procure no subdiret처rio `.git/rebase-apply/` e veja o conte첬do do arquivo 'patch', verifique se os padr천es mais comuns de corrup챌찾o mencionados acima se aplicam."
#. type: Plain text
#: en/git-format-patch.txt:487
#, priority:100
msgid "While at it, check the 'info' and 'final-commit' files as well. If what is in 'final-commit' is not exactly what you would want to see in the commit log message, it is very likely that the receiver would end up hand editing the log message when applying your patch. Things like \"Hi, this is my first patch.\\n\" in the patch e-mail should come after the three-dash line that signals the end of the commit message."
-msgstr ""
-"Enquanto isso, verifique os arquivos 'info' e 'final-commit' tamb챕m. Caso o "
-"que estiver em 'final-commit' n찾o seja exatamente o que voc챗 quer ver na "
-"mensagem do registro log do commit, 챕 muito prov찼vel que o destinat찼rio "
-"acabe editando manualmente a mensagem do registro log durante a aplica챌찾o do "
-"seu patch. Coisas como \"Ol찼, este 챕 o meu primeiro patch.\\n"
-"\" no e-mail do patch deve vir ap처s a linha de tr챗s tra챌os que sinaliza o "
-"final da mensagem do commit."
+msgstr "Enquanto isso, verifique os arquivos 'info' e 'final-commit' tamb챕m. Caso o que estiver em 'final-commit' n찾o seja exatamente o que voc챗 quer ver na mensagem do registro log do commit, 챕 muito prov찼vel que o destinat찼rio acabe editando manualmente a mensagem do registro log durante a aplica챌찾o do seu patch. Coisas como \"Ol찼, este 챕 o meu primeiro patch.\\n\" no e-mail do patch deve vir ap처s a linha de tr챗s tra챌os que sinaliza o final da mensagem do commit."
#. type: Title -
#: en/git-format-patch.txt:489
@@ -31063,9 +26665,7 @@ msgstr "DICAS ESPEC횒FICAS PARA CLIENTES DE E-MAIL"
#: en/git-format-patch.txt:492
#, priority:100
msgid "Here are some hints on how to successfully submit patches inline using various mailers."
-msgstr ""
-"Aqui est찾o algumas dicas sobre como enviar os patches com sucesso utilizando "
-"diferentes clientes de e-mail."
+msgstr "Aqui est찾o algumas dicas sobre como enviar os patches com sucesso utilizando diferentes clientes de e-mail."
#. type: Title ~
#: en/git-format-patch.txt:494
@@ -31077,29 +26677,19 @@ msgstr "GMail"
#: en/git-format-patch.txt:500
#, priority:100
msgid "GMail does not have any way to turn off line wrapping in the web interface, so it will mangle any emails that you send. You can however use \"git send-email\" and send your patches through the GMail SMTP server, or use any IMAP email client to connect to the google IMAP server and forward the emails through that."
-msgstr ""
-"O GMail n찾o tem como desativar a quebra de linha na interface da Web; "
-"portanto, ele altera os e-mails que voc챗 envia. Voc챗 pode entanto usar o "
-"\"git send-email\" e enviar os seus patches atrav챕s do servidor SMTP do "
-"GMail ou usar qualquer cliente de email IMAP para conectar-se ao servidor "
-"IMAP do google e encaminhar os e-mails dessa maneira."
+msgstr "O GMail n찾o tem como desativar a quebra de linha na interface da Web; portanto, ele altera os e-mails que voc챗 envia. Voc챗 pode entanto usar o \"git send-email\" e enviar os seus patches atrav챕s do servidor SMTP do GMail ou usar qualquer cliente de email IMAP para conectar-se ao servidor IMAP do google e encaminhar os e-mails dessa maneira."
#. type: Plain text
#: en/git-format-patch.txt:503
#, priority:100
msgid "For hints on using 'git send-email' to send your patches through the GMail SMTP server, see the EXAMPLE section of linkgit:git-send-email[1]."
-msgstr ""
-"Para obter dicas sobre o uso do 'git send-email' para enviar os seus patches "
-"atrav챕s do servidor SMTP do GMail, consulte a se챌찾o EXEMPLO do linkgit:git-"
-"send-email[1]."
+msgstr "Para obter dicas sobre o uso do 'git send-email' para enviar os seus patches atrav챕s do servidor SMTP do GMail, consulte a se챌찾o EXEMPLO do linkgit:git-send-email[1]."
#. type: Plain text
#: en/git-format-patch.txt:506
#, priority:100
msgid "For hints on submission using the IMAP interface, see the EXAMPLE section of linkgit:git-imap-send[1]."
-msgstr ""
-"Para obter dicas sobre o envio utilizando a interface IMAP, consulte a se챌찾o "
-"EXEMPLO do linkgit:git-send-email[1]."
+msgstr "Para obter dicas sobre o envio utilizando a interface IMAP, consulte a se챌찾o EXEMPLO do linkgit:git-send-email[1]."
#. type: Title ~
#: en/git-format-patch.txt:508
@@ -31111,18 +26701,13 @@ msgstr "Thunderbird"
#: en/git-format-patch.txt:512
#, priority:100
msgid "By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the resulting email unusable by Git."
-msgstr ""
-"횋 predefinido que o Thunderbird agrupe os e-mails e sinalize-os como "
-"'format=flowed', o que tornar찼 o e-mail resultante inutiliz찼vel pelo Git."
+msgstr "횋 predefinido que o Thunderbird agrupe os e-mails e sinalize-os como 'format=flowed', o que tornar찼 o e-mail resultante inutiliz찼vel pelo Git."
#. type: Plain text
#: en/git-format-patch.txt:516
#, priority:100
msgid "There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use an external editor to keep Thunderbird from mangling the patches."
-msgstr ""
-"Existem tr챗s abordagens diferentes: utilize um complemento para desativar a "
-"quebra de linha, configure o Thunderbird para n찾o alterar os patches ou "
-"utilize um editor externo para impedir que o Thunderbird manipule os patches."
+msgstr "Existem tr챗s abordagens diferentes: utilize um complemento para desativar a quebra de linha, configure o Thunderbird para n찾o alterar os patches ou utilize um editor externo para impedir que o Thunderbird manipule os patches."
#. type: Title ^
#: en/git-format-patch.txt:518
@@ -31134,15 +26719,7 @@ msgstr "Abordagem n쨘 1 (complemento)"
#: en/git-format-patch.txt:526
#, priority:100
msgid "Install the Toggle Word Wrap add-on that is available from https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick off. Now you can compose the message as you otherwise do (cut + paste, 'git format-patch' | 'git imap-send', etc), but you have to insert line breaks manually in any text that you type."
-msgstr ""
-"Instale o complemento \"Toggle Word Wrap\" que est찼 dispon챠vel em "
-"https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/. 횋 adicionado "
-"uma entrada chamada \"Enable Word Wrap Alt+W\" (Ativar a quebra autom찼tica "
-"de linha Alt+W) na aba \"Op챌천es\" do compositor que voc챗 pode de-selecionar. "
-"Agora voc챗 pode compor a mensagem da mesma maneira que voc챗 sempre fez ("
-"recortar + colar, 'git format-patch' | 'git imap-send', etc), por챕m 챕 "
-"necess찼rio inserir as quebras das linhas manualmente em qualquer texto que "
-"for digitado."
+msgstr "Instale o complemento \"Toggle Word Wrap\" que est찼 dispon챠vel em https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/. 횋 adicionado uma entrada chamada \"Enable Word Wrap Alt+W\" (Ativar a quebra autom찼tica de linha Alt+W) na aba \"Op챌천es\" do compositor que voc챗 pode de-selecionar. Agora voc챗 pode compor a mensagem da mesma maneira que voc챗 sempre fez (recortar + colar, 'git format-patch' | 'git imap-send', etc), por챕m 챕 necess찼rio inserir as quebras das linhas manualmente em qualquer texto que for digitado."
#. type: Title ^
#: en/git-format-patch.txt:528
@@ -31160,10 +26737,7 @@ msgstr "Tr챗s etapas:"
#: en/git-format-patch.txt:534
#, ignore-ellipsis, priority:100
msgid "Configure your mail server composition as plain text: Edit...Account Settings...Composition & Addressing, uncheck \"Compose Messages in HTML\"."
-msgstr ""
-"Ainda no Thunderbird, configure a reda챌찾o da mensagem de e-mail como texto "
-"sem formata챌찾o, v찼 em Editar -> Propriedades -> suaconta@email.com -> "
-"Reda챌찾o e Endere챌amento, desmarque a op챌찾o \"Usar formata챌찾o (HTML)\"."
+msgstr "Ainda no Thunderbird, configure a reda챌찾o da mensagem de e-mail como texto sem formata챌찾o, v찼 em Editar -> Propriedades -> suaconta@email.com -> Reda챌찾o e Endere챌amento, desmarque a op챌찾o \"Usar formata챌찾o (HTML)\"."
#. type: Plain text
#: en/git-format-patch.txt:536
@@ -31175,40 +26749,25 @@ msgstr "Configure a sua janela de composi챌찾o geral para n찾o quebrar as linhas
#: en/git-format-patch.txt:539
#, priority:100
msgid "In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages at 0"
-msgstr ""
-"No Thunderbird 2: V찼 em Ferramentas -> Op챌천es -> Edi챌찾o -> Geral, defina "
-"como 0 (zero) caracteres a op챌찾o \"Quebrar a linha, em mensagem sem "
-"formata챌찾o, ap처s\""
+msgstr "No Thunderbird 2: V찼 em Ferramentas -> Op챌천es -> Edi챌찾o -> Geral, defina como 0 (zero) caracteres a op챌찾o \"Quebrar a linha, em mensagem sem formata챌찾o, ap처s\""
#. type: Plain text
#: en/git-format-patch.txt:545
#, priority:100
msgid "In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for \"mail.wrap_long_lines\". Toggle it to make sure it is set to `false`. Also, search for \"mailnews.wraplength\" and set the value to 0."
-msgstr ""
-"No Thunderbird 3: V찼 em Ferramentas -> Avan챌ado -> Editor de config. No "
-"campo localizar pesquise por \"mail.wrap_long_lines\". Clique duas vezes "
-"com o mouse e tenha certeza que o seu valor mudou para `false`. Pesquise "
-"tamb챕m pela op챌찾o \"mailnews.wraplength\", clique duas vezes com o mouse e "
-"defina o seu valor para 0 (zero)."
+msgstr "No Thunderbird 3: V찼 em Ferramentas -> Avan챌ado -> Editor de config. No campo localizar pesquise por \"mail.wrap_long_lines\". Clique duas vezes com o mouse e tenha certeza que o seu valor mudou para `false`. Pesquise tamb챕m pela op챌찾o \"mailnews.wraplength\", clique duas vezes com o mouse e defina o seu valor para 0 (zero)."
#. type: Plain text
#: en/git-format-patch.txt:550
#, priority:100
msgid "Disable the use of format=flowed: Edit..Preferences..Advanced..Config Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make sure it is set to `false`."
-msgstr ""
-"Desative a utiliza챌찾o da op챌찾o \"format=flowed\": V찼 em Ferramentas -> "
-"Avan챌ado -> Editor de config. No campo localizar pesquise por \"mailnews."
-"send_plaintext_flowed\". Clique duas vezes com o mouse e tenha certeza que "
-"o seu valor mudou para `false`."
+msgstr "Desative a utiliza챌찾o da op챌찾o \"format=flowed\": V찼 em Ferramentas -> Avan챌ado -> Editor de config. No campo localizar pesquise por \"mailnews.send_plaintext_flowed\". Clique duas vezes com o mouse e tenha certeza que o seu valor mudou para `false`."
#. type: Plain text
#: en/git-format-patch.txt:554
#, priority:100
msgid "After that is done, you should be able to compose email as you otherwise would (cut + paste, 'git format-patch' | 'git imap-send', etc), and the patches will not be mangled."
-msgstr ""
-"Ao concluir, agora 챕 poss챠vel compor o e-mail da mesma maneira que seria "
-"feito com (recortar + colar, 'git format-patch' | 'git imap-send', etc), e "
-"os patches n찾o ficar찾o mutilados."
+msgstr "Ao concluir, agora 챕 poss챠vel compor o e-mail da mesma maneira que seria feito com (recortar + colar, 'git format-patch' | 'git imap-send', etc), e os patches n찾o ficar찾o mutilados."
#. type: Title ^
#: en/git-format-patch.txt:556
@@ -31220,36 +26779,25 @@ msgstr "Abordagem n쨘 3 (editor externo)"
#: en/git-format-patch.txt:561
#, priority:100
msgid "The following Thunderbird extensions are needed: AboutConfig from http://aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles.php?lng=en&pg=8"
-msgstr ""
-"As seguintes extens천es do Thunderbird s찾o necess찼rias: O AboutConfig "
-"http://aboutconfig.mozdev.org/ (Observa챌찾o: o AboutConfig n찾o 챕 mais "
-"compat챠vel com as vers천es mais novas do Thunderbird.) e o \"External Editor\""
-" http://globs.org/articles.php?lng=en&pg=8"
+msgstr "As seguintes extens천es do Thunderbird s찾o necess찼rias: O AboutConfig http://aboutconfig.mozdev.org/ (Observa챌찾o: o AboutConfig n찾o 챕 mais compat챠vel com as vers천es mais novas do Thunderbird.) e o \"External Editor\" http://globs.org/articles.php?lng=en&pg=8"
#. type: Plain text
#: en/git-format-patch.txt:563
#, priority:100
msgid "Prepare the patch as a text file using your method of choice."
-msgstr ""
-"Prepare o patch como um arquivo de texto utilizando o seu m챕todo preferido."
+msgstr "Prepare o patch como um arquivo de texto utilizando o seu m챕todo preferido."
#. type: Plain text
#: en/git-format-patch.txt:568
#, priority:100
msgid "Before opening a compose window, use Edit->Account Settings to uncheck the \"Compose messages in HTML format\" setting in the \"Composition & Addressing\" panel of the account to be used to send the patch."
-msgstr ""
-"Antes de abrir uma janela de composi챌찾o, v찼 em Editar -> Propriedades -> "
-"Configura챌천es da conta -> Reda챌찾o e endere챌amento e desmarque a op챌찾o \"Usar "
-"formata챌찾o (HTML)\" para que seja poss챠vel enviar o patch."
+msgstr "Antes de abrir uma janela de composi챌찾o, v찼 em Editar -> Propriedades -> Configura챌천es da conta -> Reda챌찾o e endere챌amento e desmarque a op챌찾o \"Usar formata챌찾o (HTML)\" para que seja poss챠vel enviar o patch."
#. type: Plain text
#: en/git-format-patch.txt:572
#, priority:100
msgid "In the main Thunderbird window, 'before' you open the compose window for the patch, use Tools->about:config to set the following to the indicated values:"
-msgstr ""
-"Na janela principal do Thunderbird, 'antes' de abrir a janela de composi챌찾o "
-"do patch, v찼 em Ferramentas -> Avan챌ado -> Editor de Configura챌천es e defina "
-"os valores como indicado abaixo:"
+msgstr "Na janela principal do Thunderbird, 'antes' de abrir a janela de composi챌찾o do patch, v찼 em Ferramentas -> Avan챌ado -> Editor de Configura챌천es e defina os valores como indicado abaixo:"
#. type: delimited block -
#: en/git-format-patch.txt:576
@@ -31271,17 +26819,13 @@ msgstr "Abra uma janela de composi챌찾o e clique no 챠cone do editor externo."
#: en/git-format-patch.txt:582
#, priority:100
msgid "In the external editor window, read in the patch file and exit the editor normally."
-msgstr ""
-"Na janela do editor externo, carregue o arquivo patch e saia do editor "
-"normalmente."
+msgstr "Na janela do editor externo, carregue o arquivo patch e saia do editor normalmente."
#. type: Plain text
#: en/git-format-patch.txt:585
#, priority:100
msgid "Side note: it may be possible to do step 2 with about:config and the following settings but no one's tried yet."
-msgstr ""
-"Nota: Pode ser poss챠vel executar a segunda etapa para editar as seguintes "
-"configura챌천es, mas ningu챕m tentou ainda."
+msgstr "Nota: Pode ser poss챠vel executar a segunda etapa para editar as seguintes configura챌천es, mas ningu챕m tentou ainda."
#. type: delimited block -
#: en/git-format-patch.txt:590
@@ -31299,10 +26843,7 @@ msgstr ""
#: en/git-format-patch.txt:595
#, priority:100
msgid "There is a script in contrib/thunderbird-patch-inline which can help you include patches with Thunderbird in an easy way. To use it, do the steps above and then use the script as the external editor."
-msgstr ""
-"Existe um script em contrib/thunderbird-patch-inline que pode ajud찼-lo a "
-"incluir os patches com o Thunderbird facilmente. Para us찼-lo, execute as "
-"etapas acima e utilize o script como um editor externo."
+msgstr "Existe um script em contrib/thunderbird-patch-inline que pode ajud찼-lo a incluir os patches com o Thunderbird facilmente. Para us찼-lo, execute as etapas acima e utilize o script como um editor externo."
#. type: Title ~
#: en/git-format-patch.txt:597
@@ -31332,9 +26873,7 @@ msgstr "Clique em \"New Mail\"."
#: en/git-format-patch.txt:606
#, priority:100
msgid "Go under \"Options\" in the Composer window and be sure that \"Word wrap\" is not set."
-msgstr ""
-"V찼 em \"Op챌천es\" na janela do Compositor verifique se \"Quebra de linha\" "
-"n찾o est찼 definido."
+msgstr "V찼 em \"Op챌천es\" na janela do Compositor verifique se \"Quebra de linha\" n찾o est찼 definido."
#. type: Plain text
#: en/git-format-patch.txt:608
@@ -31346,9 +26885,7 @@ msgstr "Utilize Mensagem -> Inserir arquivo -> e insira o patch."
#: en/git-format-patch.txt:611
#, priority:100
msgid "Back in the compose window: add whatever other text you wish to the message, complete the addressing and subject fields, and press send."
-msgstr ""
-"De volta 횪 janela de composi챌찾o: adicione qualquer outro texto que desejar, "
-"preencha os campos de endere챌amento, assunto e pressione Enviar."
+msgstr "De volta 횪 janela de composi챌찾o: adicione qualquer outro texto que desejar, preencha os campos de endere챌amento, assunto e pressione Enviar."
#. type: Title -
#: en/git-format-patch.txt:613
@@ -31360,35 +26897,19 @@ msgstr "INFORMA횉횄O BASE DA 횁RVORE"
#: en/git-format-patch.txt:622
#, priority:100
msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
-msgstr ""
-"O bloco de informa챌찾o da base da 찼rvore 챕 utilizado para que os mantenedores "
-"ou os testadores de terceiros saibam a condi챌찾o exata ao qual a s챕rie de "
-"patches se aplicam. 횋 a 'base do commit', 챕 um commit conhecido que faz "
-"parte da parte est찼vel do hist처rico do projeto onde todos os outros usam "
-"para trabalhar. Zero ou mais 'patches de pr챕-requisi챌찾o' s찾o patches "
-"conhecidos em transi챌찾o, por챕m ainda n찾o fazem parte da 'base do commit' que "
-"precisam ser aplicados sobre o cume da 'base do commit' em ordem topol처gica "
-"antes que os patches possam ser aplicados."
+msgstr "O bloco de informa챌찾o da base da 찼rvore 챕 utilizado para que os mantenedores ou os testadores de terceiros saibam a condi챌찾o exata ao qual a s챕rie de patches se aplicam. 횋 a 'base do commit', 챕 um commit conhecido que faz parte da parte est찼vel do hist처rico do projeto onde todos os outros usam para trabalhar. Zero ou mais 'patches de pr챕-requisi챌찾o' s찾o patches conhecidos em transi챌찾o, por챕m ainda n찾o fazem parte da 'base do commit' que precisam ser aplicados sobre o cume da 'base do commit' em ordem topol처gica antes que os patches possam ser aplicados."
#. type: Plain text
#: en/git-format-patch.txt:628
#, priority:100
msgid "The 'base commit' is shown as \"base-commit: \" followed by the 40-hex of the commit object name. A 'prerequisite patch' is shown as \"prerequisite-patch-id: \" followed by the 40-hex 'patch id', which can be obtained by passing the patch through the `git patch-id --stable` command."
-msgstr ""
-"A 'base do commit' 챕 exibido como \"base-commit:\" seguido por 40 "
-"hexadecimais do nome do objeto commit. Um 'patch de pr챕-requisi챌찾o' 챕 "
-"exibido como \"prerequisite-patch-id:\" seguido por um 'patch id' com 40 "
-"hexadecimais, que pode ser obtido passando o patch pelo comando `git patch-"
-"id --stable`."
+msgstr "A 'base do commit' 챕 exibido como \"base-commit:\" seguido por 40 hexadecimais do nome do objeto commit. Um 'patch de pr챕-requisi챌찾o' 챕 exibido como \"prerequisite-patch-id:\" seguido por um 'patch id' com 40 hexadecimais, que pode ser obtido passando o patch pelo comando `git patch-id --stable`."
#. type: Plain text
#: en/git-format-patch.txt:632
#, priority:100
msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
-msgstr ""
-"Imagine que, em cima do commit p첬blico P, foi aplicado os patches conhecidos "
-"X, Y e Z de outra pessoa e construiu a sua s챕rie de tr챗s patches A, B, C, o "
-"hist처rico ficaria assim:"
+msgstr "Imagine que, em cima do commit p첬blico P, foi aplicado os patches conhecidos X, Y e Z de outra pessoa e construiu a sua s챕rie de tr챗s patches A, B, C, o hist처rico ficaria assim:"
#. type: delimited block .
#: en/git-format-patch.txt:635
@@ -31400,12 +26921,7 @@ msgstr "---P---X---Y---Z---A---B---C\n"
#: en/git-format-patch.txt:642
#, priority:100
msgid "With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this:"
-msgstr ""
-"Com o `git format-patch --base = P -3 C` (ou variantes do mesmo com `--cover-"
-"letter` ou utilizando `Z..C` em vez de `-3 C` para especificar o intervalo "
-"por exemplo), o bloco das informa챌천es da base da 찼rvore 챕 exibido no final "
-"da primeira mensagem que o comando gera (o primeiro patch ou a carta de "
-"apresenta챌찾o), assim:"
+msgstr "Com o `git format-patch --base = P -3 C` (ou variantes do mesmo com `--cover-letter` ou utilizando `Z..C` em vez de `-3 C` para especificar o intervalo por exemplo), o bloco das informa챌천es da base da 찼rvore 챕 exibido no final da primeira mensagem que o comando gera (o primeiro patch ou a carta de apresenta챌찾o), assim:"
#. type: delimited block -
#: en/git-format-patch.txt:648
@@ -31443,29 +26959,19 @@ msgstr ""
#: en/git-format-patch.txt:661
#, priority:100
msgid "You can also use `git format-patch --base=P -3 C` to generate patches for A, B and C, and the identifiers for P, X, Y, Z are appended at the end of the first message."
-msgstr ""
-"Voc챗 tamb챕m pode usar o comando `git format-patch --base = P -3 C` para "
-"gerar as corre챌천es para A, B e C, os identificadores para P, X, Y, Z ser찾o "
-"anexados no final da primeira mensagem."
+msgstr "Voc챗 tamb챕m pode usar o comando `git format-patch --base = P -3 C` para gerar as corre챌천es para A, B e C, os identificadores para P, X, Y, Z ser찾o anexados no final da primeira mensagem."
#. type: Plain text
#: en/git-format-patch.txt:667
#, priority:100
msgid "If set `--base=auto` in cmdline, it will track base commit automatically, the base commit will be the merge base of tip commit of the remote-tracking branch and revision-range specified in cmdline. For a local branch, you need to track a remote branch by `git branch --set-upstream-to` before using this option."
-msgstr ""
-"Caso `--base=auto` seja definido no cmdline, ele rastrear찼 automaticamente a "
-"base do commit, o commit da base ser찼 o cume do ramo do commit monitorado "
-"remotamente e o intervalo da revis찾o determinado pelo cmdline. Antes de "
-"utilizar esta op챌찾o para uma ramifica챌찾o local, 챕 necess찼rio monitorar um "
-"ramo remoto com o comando `git branch --set-upstream-to`."
+msgstr "Caso `--base=auto` seja definido no cmdline, ele rastrear찼 automaticamente a base do commit, o commit da base ser찼 o cume do ramo do commit monitorado remotamente e o intervalo da revis찾o determinado pelo cmdline. Antes de utilizar esta op챌찾o para uma ramifica챌찾o local, 챕 necess찼rio monitorar um ramo remoto com o comando `git branch --set-upstream-to`."
#. type: Plain text
#: en/git-format-patch.txt:673
#, priority:100
msgid "Extract commits between revisions R1 and R2, and apply them on top of the current branch using 'git am' to cherry-pick them:"
-msgstr ""
-"Extraia os commits entre as revis천es R1 e R2, aplique-as no cume do ramo "
-"atual utilizando o comando 'git am' para selecion찼-las:"
+msgstr "Extraia os commits entre as revis천es R1 e R2, aplique-as no cume do ramo atual utilizando o comando 'git am' para selecion찼-las:"
#. type: delimited block -
#: en/git-format-patch.txt:676
@@ -31477,9 +26983,7 @@ msgstr "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
#: en/git-format-patch.txt:680
#, priority:100
msgid "Extract all commits which are in the current branch but not in the origin branch:"
-msgstr ""
-"Extraia todos os commits que est찾o na ramifica챌찾o atual, mas n찾o na "
-"ramifica챌찾o \"origin\":"
+msgstr "Extraia todos os commits que est찾o na ramifica챌찾o atual, mas n찾o na ramifica챌찾o \"origin\":"
#. type: delimited block -
#: en/git-format-patch.txt:683
@@ -31497,8 +27001,7 @@ msgstr "Para cada commit 챕 criado um arquivo separado no diret처rio atual."
#: en/git-format-patch.txt:689
#, priority:100
msgid "Extract all commits that lead to 'origin' since the inception of the project:"
-msgstr ""
-"Extraia todos os commits que levem 횪 'origin' desde o in챠cio do projeto:"
+msgstr "Extraia todos os commits que levem 횪 'origin' desde o in챠cio do projeto:"
#. type: delimited block -
#: en/git-format-patch.txt:692
@@ -31522,21 +27025,13 @@ msgstr "$ git format-patch -M -B origin\n"
#: en/git-format-patch.txt:705
#, priority:100
msgid "Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. Note that non-Git \"patch\" programs won't understand renaming patches, so use it only when you know the recipient uses Git to apply your patch."
-msgstr ""
-"Al챕m disso, ele detecta e manipula as renomea챌천es e as reescritas "
-"completadas de maneira inteligente produzindo um patch de renomea챌찾o. Um "
-"patch de renomea챌찾o reduz a quantidade de sa챠da do texto e geralmente "
-"facilita a revis찾o. Observe que os programas de \"patches\" que n찾o sejam "
-"do Git n찾o entender찾o como renomear os patches; portanto, utilize-os apenas "
-"quando souber que o destinat찼rio usa o Git para aplicar seu patch."
+msgstr "Al챕m disso, ele detecta e manipula as renomea챌천es e as reescritas completadas de maneira inteligente produzindo um patch de renomea챌찾o. Um patch de renomea챌찾o reduz a quantidade de sa챠da do texto e geralmente facilita a revis찾o. Observe que os programas de \"patches\" que n찾o sejam do Git n찾o entender찾o como renomear os patches; portanto, utilize-os apenas quando souber que o destinat찼rio usa o Git para aplicar seu patch."
#. type: Plain text
#: en/git-format-patch.txt:708
#, priority:100
msgid "Extract three topmost commits from the current branch and format them as e-mailable patches:"
-msgstr ""
-"Extraia os tr챗s commits mais importantes do ramo atual, formate-os como "
-"patches que possam ser enviados por e-mail:"
+msgstr "Extraia os tr챗s commits mais importantes do ramo atual, formate-os como patches que possam ser enviados por e-mail:"
#. type: delimited block -
#: en/git-format-patch.txt:711
@@ -31560,9 +27055,7 @@ msgstr "git-fsck-objects(1)"
#: en/git-fsck-objects.txt:7
#, priority:100
msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database"
-msgstr ""
-"git-fsck-objects - Verifica a conectividade e validade dos objetos no banco "
-"de dados"
+msgstr "git-fsck-objects - Verifica a conectividade e validade dos objetos no banco de dados"
#. type: Plain text
#: en/git-fsck-objects.txt:13
@@ -31586,9 +27079,7 @@ msgstr "git-fsck(1)"
#: en/git-fsck.txt:7
#, priority:100
msgid "git-fsck - Verifies the connectivity and validity of the objects in the database"
-msgstr ""
-"git-fsck - Verifica a conectividade e a validade dos objetos no banco de "
-"dados"
+msgstr "git-fsck - Verifica a conectividade e a validade dos objetos no banco de dados"
#. type: Plain text
#: en/git-fsck.txt:16
@@ -31608,18 +27099,13 @@ msgstr ""
#: en/git-fsck.txt:25
#, priority:100
msgid "An object to treat as the head of an unreachability trace."
-msgstr ""
-"Um objeto a ser tratado como a cabe챌a de um rastreamento de inacessibilidade."
+msgstr "Um objeto a ser tratado como a cabe챌a de um rastreamento de inacessibilidade."
#. type: Plain text
#: en/git-fsck.txt:29
#, priority:100
msgid "If no objects are given, 'git fsck' defaults to using the index file, all SHA-1 references in `refs` namespace, and all reflogs (unless --no-reflogs is given) as heads."
-msgstr ""
-"Caso nenhum objeto seja informado o comando 'git fsck' utilizar찼 o arquivo "
-"do 챠ndice, todas as refer챗ncias SHA-1 no \"namespace\" `refs` e todos os "
-"reflogs (a menos que --no-reflogs seja informado) ser찾o utilizados como um "
-"cabe챌alho."
+msgstr "Caso nenhum objeto seja informado o comando 'git fsck' utilizar찼 o arquivo do 챠ndice, todas as refer챗ncias SHA-1 no \"namespace\" `refs` e todos os reflogs (a menos que --no-reflogs seja informado) ser찾o utilizados como um cabe챌alho."
#. type: Labeled list
#: en/git-fsck.txt:30
@@ -31631,9 +27117,7 @@ msgstr "--unreachable"
#: en/git-fsck.txt:33
#, priority:100
msgid "Print out objects that exist but that aren't reachable from any of the reference nodes."
-msgstr ""
-"Imprima os objetos que existam, por챕m que n찾o sejam acess챠veis a partir de "
-"nenhum dos n처s de refer챗ncia."
+msgstr "Imprima os objetos que existam, por챕m que n찾o sejam acess챠veis a partir de nenhum dos n처s de refer챗ncia."
#. type: Labeled list
#: en/git-fsck.txt:34
@@ -31645,10 +27129,7 @@ msgstr "--[no-]dangling"
#: en/git-fsck.txt:37
#, priority:100
msgid "Print objects that exist but that are never 'directly' used (default). `--no-dangling` can be used to omit this information from the output."
-msgstr ""
-"Imprima os objetos que existam por챕m, que nunca s찾o utilizados 'diretamente' "
-"(predefini챌찾o). `--no-dangling` pode ser utilizado para omitir esta "
-"informa챌찾o na sa챠da."
+msgstr "Imprima os objetos que existam por챕m, que nunca s찾o utilizados 'diretamente' (predefini챌찾o). `--no-dangling` pode ser utilizado para omitir esta informa챌찾o na sa챠da."
#. type: Plain text
#: en/git-fsck.txt:40
@@ -31672,9 +27153,7 @@ msgstr "--cache"
#: en/git-fsck.txt:47
#, priority:100
msgid "Consider any object recorded in the index also as a head node for an unreachability trace."
-msgstr ""
-"Considere qualquer objeto registrado no 챠ndice tamb챕m como um n처 principal "
-"para um rastreamento de inacessibilidade."
+msgstr "Considere qualquer objeto registrado no 챠ndice tamb챕m como um n처 principal para um rastreamento de inacessibilidade."
#. type: Labeled list
#: en/git-fsck.txt:48
@@ -31686,11 +27165,7 @@ msgstr "--no-reflogs"
#: en/git-fsck.txt:53
#, priority:100
msgid "Do not consider commits that are referenced only by an entry in a reflog to be reachable. This option is meant only to search for commits that used to be in a ref, but now aren't, but are still in that corresponding reflog."
-msgstr ""
-"Para serem alcan챌찼veis, n찾o considere que os commits sejam referenciados "
-"apenas por uma entrada em um \"reflog\". Esta op챌찾o serve apenas para "
-"procurar commits que costumavam estar em um \"ref\", mas agora n찾o est찾o "
-"mais, mas ainda assim em um reflog equivalente."
+msgstr "Para serem alcan챌찼veis, n찾o considere que os commits sejam referenciados apenas por uma entrada em um \"reflog\". Esta op챌찾o serve apenas para procurar commits que costumavam estar em um \"ref\", mas agora n찾o est찾o mais, mas ainda assim em um reflog equivalente."
#. type: Labeled list
#: en/git-fsck.txt:54
@@ -31702,14 +27177,7 @@ msgstr "--full"
#: en/git-fsck.txt:63
#, priority:100
msgid "Check not just objects in GIT_OBJECT_DIRECTORY ($GIT_DIR/objects), but also the ones found in alternate object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, and in packed Git archives found in $GIT_DIR/objects/pack and corresponding pack subdirectories in alternate object pools. This is now default; you can turn it off with --no-full."
-msgstr ""
-"Verifique n찾o apenas os objetos em `GIT_OBJECT_DIRECTORY` (`$GIT_DIR/"
-"objects`), mas tamb챕m os que forem encontrados nos conjuntos de objetos "
-"alternativos listados em `GIT_ALTERNATE_OBJECT_DIRECTORIES` ou `$GIT_DIR/"
-"objects/info/alternates`, nos arquivos Git encontrados em `$GIT_DIR/objects/"
-"pack` e nos pacotes dos subdiret처rios correspondentes nos conjuntos dos "
-"objetos alternativos. Esta 챕 a predefini챌찾o agora; desative-o com `--no-"
-"full`."
+msgstr "Verifique n찾o apenas os objetos em `GIT_OBJECT_DIRECTORY` (`$GIT_DIR/objects`), mas tamb챕m os que forem encontrados nos conjuntos de objetos alternativos listados em `GIT_ALTERNATE_OBJECT_DIRECTORIES` ou `$GIT_DIR/objects/info/alternates`, nos arquivos Git encontrados em `$GIT_DIR/objects/pack` e nos pacotes dos subdiret처rios correspondentes nos conjuntos dos objetos alternativos. Esta 챕 a predefini챌찾o agora; desative-o com `--no-full`."
#. type: Labeled list
#: en/git-fsck.txt:64
@@ -31739,12 +27207,7 @@ msgstr "--strict"
#: en/git-fsck.txt:84
#, priority:100
msgid "Enable more strict checking, namely to catch a file mode recorded with g+w bit set, which was created by older versions of Git. Existing repositories, including the Linux kernel, Git itself, and sparse repository have old objects that triggers this check, but it is recommended to check new projects with this flag."
-msgstr ""
-"Ative uma verifica챌찾o mais rigorosa para capturar um modo do arquivo gravado "
-"em um conjunto de bits g+w, criado por vers천es mais antigas do Git. Os "
-"reposit처rios existentes, incluindo o kernel do Linux, o pr처prio Git e o "
-"reposit처rio esparso, possuem objetos antigos que acionam esta verifica챌찾o. 횋 "
-"recomend찼vel verificar novos projetos com essa flag."
+msgstr "Ative uma verifica챌찾o mais rigorosa para capturar um modo do arquivo gravado em um conjunto de bits g+w, criado por vers천es mais antigas do Git. Os reposit처rios existentes, incluindo o kernel do Linux, o pr처prio Git e o reposit처rio esparso, possuem objetos antigos que acionam esta verifica챌찾o. 횋 recomend찼vel verificar novos projetos com essa flag."
#. type: Plain text
#: en/git-fsck.txt:87
@@ -31762,10 +27225,7 @@ msgstr "--lost-found"
#: en/git-fsck.txt:93
#, priority:100
msgid "Write dangling objects into .git/lost-found/commit/ or .git/lost-found/other/, depending on type. If the object is a blob, the contents are written into the file, rather than its object name."
-msgstr ""
-"Dependendo do tipo, escreva os objetos pendentes em .git/lost-found/commit/ "
-"ou .git/lost-found/other/. O conte첬do ser찼 gravado no arquivo e n찾o no nome "
-"do objeto caso o objeto seja uma bolha."
+msgstr "Dependendo do tipo, escreva os objetos pendentes em .git/lost-found/commit/ ou .git/lost-found/other/. O conte첬do ser찼 gravado no arquivo e n찾o no nome do objeto caso o objeto seja uma bolha."
#. type: Labeled list
#: en/git-fsck.txt:94
@@ -31777,51 +27237,31 @@ msgstr "--name-objects"
#: en/git-fsck.txt:99
#, priority:100
msgid "When displaying names of reachable objects, in addition to the SHA-1 also display a name that describes *how* they are reachable, compatible with linkgit:git-rev-parse[1], e.g. `HEAD@{1234567890}~25^2:src/`."
-msgstr ""
-"Ao exibir os nomes dos objetos alcan챌찼veis al챕m do SHA-1 que descrevam *como*"
-" eles s찾o alcan챌찼veis, 챕 compat챠vel com linkgit:git-rev-parse[1], "
-"`HEAD@{1234567890}~25^2:src/` por exemplo."
+msgstr "Ao exibir os nomes dos objetos alcan챌찼veis al챕m do SHA-1 que descrevam *como* eles s찾o alcan챌찼veis, 챕 compat챠vel com linkgit:git-rev-parse[1], `HEAD@{1234567890}~25^2:src/` por exemplo."
#. type: Plain text
#: en/git-fsck.txt:106
#, priority:100
msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless --no-progress or --verbose is specified. --progress forces progress status even if the standard error stream is not directed to a terminal."
-msgstr ""
-"A condi챌찾o do progresso 챕 relatado no fluxo de erro predefinido ao estar "
-"conectado em um terminal, a menos que as op챌천es `--no-progress` ou "
-"`--verbose` sejam utilizados. A op챌찾o `--progress` imp천em que a condi챌찾o do "
-"progresso seja exibida mesmo que o fluxo de erro predefinido n찾o esteja "
-"direcionado para um terminal."
+msgstr "A condi챌찾o do progresso 챕 relatado no fluxo de erro predefinido ao estar conectado em um terminal, a menos que as op챌천es `--no-progress` ou `--verbose` sejam utilizados. A op챌찾o `--progress` imp천em que a condi챌찾o do progresso seja exibida mesmo que o fluxo de erro predefinido n찾o esteja direcionado para um terminal."
#. type: Plain text
#: en/git-fsck.txt:121
#, priority:100
msgid "git-fsck tests SHA-1 and general object sanity, and it does full tracking of the resulting reachability and everything else. It prints out any corruption it finds (missing or bad objects), and if you use the `--unreachable` flag it will also print out objects that exist but that aren't reachable from any of the specified head nodes (or the default set, as mentioned above)."
-msgstr ""
-"O git-fsck testa se o SHA-1 e a sanidade geral dos objetos, faz o "
-"rastreamento completo da acessibilidade resultante e todo o resto. Imprime "
-"qualquer corrup챌찾o encontrada (objetos ausentes ou incorretos) , se utilizar "
-"a op챌찾o `--unreachable`, tamb챕m ser찾o impressos os objetos que existem mas "
-"que n찾o est찾o acess챠veis a partir de nenhum dos n처s principais (ou da "
-"predefini챌찾o mencionada acima)."
+msgstr "O git-fsck testa se o SHA-1 e a sanidade geral dos objetos, faz o rastreamento completo da acessibilidade resultante e todo o resto. Imprime qualquer corrup챌찾o encontrada (objetos ausentes ou incorretos) , se utilizar a op챌찾o `--unreachable`, tamb챕m ser찾o impressos os objetos que existem mas que n찾o est찾o acess챠veis a partir de nenhum dos n처s principais (ou da predefini챌찾o mencionada acima)."
#. type: Plain text
#: en/git-fsck.txt:125
#, priority:100
msgid "Any corrupt objects you will have to find in backups or other archives (i.e., you can just remove them and do an 'rsync' with some other site in the hopes that somebody else has the object you have corrupted)."
-msgstr ""
-"Voc챗 precisar찼 encontrar quaisquer outros objetos corrompidos nos backups ou "
-"em outros arquivos (ou seja, remova-os e fa챌a um 'rsync' com outro site na "
-"esperan챌a de que outra pessoa tenha uma c처pia do objeto que voc챗 corrompeu)."
+msgstr "Voc챗 precisar찼 encontrar quaisquer outros objetos corrompidos nos backups ou em outros arquivos (ou seja, remova-os e fa챌a um 'rsync' com outro site na esperan챌a de que outra pessoa tenha uma c처pia do objeto que voc챗 corrompeu)."
#. type: Plain text
#: en/git-fsck.txt:128
#, 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 utilizando 'git commit-graph verify'. See linkgit:git-commit-"
-"graph[1]."
+msgstr "Caso core.commitGraph seja verdadeiro, o arquivo commit-graph tamb챕m ser찼 inspecionado utilizando 'git commit-graph verify'. See linkgit:git-commit-graph[1]."
#. type: Title -
#: en/git-fsck.txt:130
@@ -31833,17 +27273,13 @@ msgstr "Diagn처sticos Extra챠dos"
#: en/git-fsck.txt:132
#, no-wrap, priority:100
msgid "expect dangling commits - potential heads - due to lack of head information"
-msgstr ""
-"aguardar pelos commits pendentes - potenciais cabe챌alhos - devido 횪 falta de "
-"informa챌천es dos cabe챌alhos"
+msgstr "aguardar pelos commits pendentes - potenciais cabe챌alhos - devido 횪 falta de informa챌천es dos cabe챌alhos"
#. type: Plain text
#: en/git-fsck.txt:136
#, priority:100
msgid "You haven't specified any nodes as heads so it won't be possible to differentiate between un-parented commits and root nodes."
-msgstr ""
-"Voc챗 n찾o especificou nenhum n처 como cabe챌alho, portanto n찾o ser찼 poss챠vel "
-"diferenciar entre os commits sem origem e os n처s raiz."
+msgstr "Voc챗 n찾o especificou nenhum n처 como cabe챌alho, portanto n찾o ser찼 poss챠vel diferenciar entre os commits sem origem e os n처s raiz."
#. type: Labeled list
#: en/git-fsck.txt:137
@@ -31867,12 +27303,7 @@ msgstr "unreachable <tipo> <object>"
#: en/git-fsck.txt:147
#, priority:100
msgid "The <type> object <object>, isn't actually referred to directly or indirectly in any of the trees or commits seen. This can mean that there's another root node that you're not specifying or that the tree is corrupt. If you haven't missed a root node then you might as well delete unreachable nodes since they can't be used."
-msgstr ""
-"O objeto <tipo> <objeto>, na verdade, n찾o tem refer챗ncia direta ou indireta "
-"com nenhuma das 찼rvores ou commits j찼 vistos. Significa que h찼 um outro n처 "
-"na raiz que voc챗 ainda n찾o est찼 informando ou que a 찼rvore est찼 corrompida. "
-"Caso voc챗 ainda n찾o tenha perdido um n처 na raiz, tamb챕m possa excluir os n처s "
-"que estejam inacess챠veis, pois eles n찾o possam ser utilizados."
+msgstr "O objeto <tipo> <objeto>, na verdade, n찾o tem refer챗ncia direta ou indireta com nenhuma das 찼rvores ou commits j찼 vistos. Significa que h찼 um outro n처 na raiz que voc챗 ainda n찾o est찼 informando ou que a 찼rvore est찼 corrompida. Caso voc챗 ainda n찾o tenha perdido um n처 na raiz, tamb챕m possa excluir os n처s que estejam inacess챠veis, pois eles n찾o possam ser utilizados."
#. type: Labeled list
#: en/git-fsck.txt:148
@@ -31896,9 +27327,7 @@ msgstr "dangling <tipo> <object>"
#: en/git-fsck.txt:155
#, priority:100
msgid "The <type> object <object>, is present in the database but never 'directly' used. A dangling commit could be a root node."
-msgstr ""
-"O <tipo> do objeto <objeto> est찼 presente no banco de dados, mas nunca 챕 "
-"utilizado 'diretamente'. A dangling commit could be a root node."
+msgstr "O <tipo> do objeto <objeto> est찼 presente no banco de dados, mas nunca 챕 utilizado 'diretamente'. A dangling commit could be a root node."
#. type: Labeled list
#: en/git-fsck.txt:156
@@ -31928,9 +27357,7 @@ msgstr "GIT_OBJECT_DIRECTORY"
#: en/git-fsck.txt:166
#, priority:100
msgid "used to specify the object database root (usually $GIT_DIR/objects)"
-msgstr ""
-"utilize para especificar a raiz do banco de dados do objeto (geralmente '$"
-"GIT_DIR/objects')"
+msgstr "utilize para especificar a raiz do banco de dados do objeto (geralmente '$GIT_DIR/objects')"
#. type: Labeled list
#: en/git-fsck.txt:167
@@ -31954,9 +27381,7 @@ msgstr "GIT_ALTERNATE_OBJECT_DIRECTORIES"
#: en/git-fsck.txt:172
#, priority:100
msgid "used to specify additional object database roots (usually unset)"
-msgstr ""
-"utilizado para determinar as ra챠zes adicionais do banco de dados dos objetos "
-"(geralmente n찾o definidos)"
+msgstr "utilizado para determinar as ra챠zes adicionais do banco de dados dos objetos (geralmente n찾o definidos)"
#. type: Title =
#: en/git-gc.txt:2
@@ -31980,13 +27405,7 @@ msgstr "'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune]
#: 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. Pode tamb챕m "
-"atualizar os 챠ndices auxiliares, como o gr찼fico do commit."
+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. Pode tamb챕m atualizar os 챠ndices auxiliares, como o gr찼fico do commit."
#. type: Plain text
#: en/git-gc.txt:27
@@ -32070,9 +27489,7 @@ msgstr "Suprimir todos os relat처rios de progresso."
#: en/git-gc.txt:74
#, priority:100
msgid "Force `git gc` to run even if there may be another `git gc` instance running on this repository."
-msgstr ""
-"Imponha a execu챌찾o do `git gc` mesmo que possa haver uma outra inst창ncia do `"
-"git gc` em execu챌찾o neste reposit처rio."
+msgstr "Imponha a execu챌찾o do `git gc` mesmo que possa haver uma outra inst창ncia do `git gc` em execu챌찾o neste reposit처rio."
#. type: Labeled list
#: en/git-gc.txt:75
@@ -32084,10 +27501,7 @@ msgstr "--keep-largest-pack"
#: en/git-gc.txt:79
#, priority:100
msgid "All packs except the largest pack and those marked with a `.keep` files are consolidated into a single pack. When this option is used, `gc.bigPackThreshold` is ignored."
-msgstr ""
-"Todos os pacotes, exceto o maior e os marcados com um arquivo `.keep`, s찾o "
-"consolidados em um 첬nico pacote. Quando esta op챌찾o 챕 utilizada, a vari찼vel "
-"`gc.bigPackThreshold` 챕 ignorada."
+msgstr "Todos os pacotes, exceto o maior e os marcados com um arquivo `.keep`, s찾o consolidados em um 첬nico pacote. Quando esta op챌찾o 챕 utilizada, a vari찼vel `gc.bigPackThreshold` 챕 ignorada."
#. type: Title -
#: en/git-gc.txt:81
@@ -32135,30 +27549,19 @@ msgstr ""
#: en/git-gc.txt:133
#, priority:100
msgid "On the other hand, when 'git gc' runs concurrently with another process, there is a risk of it deleting an object that the other process is using but hasn't created a reference to. This may just cause the other process to fail or may corrupt the repository if the other process later adds a reference to the deleted object. Git has two features that significantly mitigate this problem:"
-msgstr ""
-"Por outro lado, quando o 'git gc' 챕 executado simultaneamente com outro "
-"processo, existe o risco de excluir um objeto que o outro processo est찼 "
-"utilizando e que n찾o criou uma refer챗ncia para ele ainda. Isso pode causar "
-"falha no outro processo ou corromper o reposit처rio caso o outro processo "
-"adicione posteriormente uma refer챗ncia ao objeto exclu챠do. O Git possui dois "
-"recursos que atenuam bastante este problema:"
+msgstr "Por outro lado, quando o 'git gc' 챕 executado simultaneamente com outro processo, existe o risco de excluir um objeto que o outro processo est찼 utilizando e que n찾o criou uma refer챗ncia para ele ainda. Isso pode causar falha no outro processo ou corromper o reposit처rio caso o outro processo adicione posteriormente uma refer챗ncia ao objeto exclu챠do. O Git possui dois recursos que atenuam bastante este problema:"
#. type: Plain text
#: en/git-gc.txt:136
#, priority:100
msgid "Any object with modification time newer than the `--prune` date is kept, along with everything reachable from it."
-msgstr ""
-"Qualquer objeto com um tempo de modifica챌찾o mais recente que a data `--prune`"
-" 챕 mantido, junto com tudo o que pode ser acessado."
+msgstr "Qualquer objeto com um tempo de modifica챌찾o mais recente que a data `--prune` 챕 mantido, junto com tudo o que pode ser acessado."
#. type: Plain text
#: en/git-gc.txt:140
#, priority:100
msgid "Most operations that add an object to the database update the modification time of the object if it is already present so that #1 applies."
-msgstr ""
-"A maioria das opera챌천es que adicionam um objeto ao banco de dados atualiza a "
-"hora da modifica챌찾o do objeto, caso j찼 esteja presente para que #1 se "
-"aplique."
+msgstr "A maioria das opera챌천es que adicionam um objeto ao banco de dados atualiza a hora da modifica챌찾o do objeto, caso j찼 esteja presente para que #1 se aplique."
#. type: Plain text
#: en/git-gc.txt:144
@@ -32188,9 +27591,7 @@ msgstr "git-get-tar-commit-id(1)"
#: en/git-get-tar-commit-id.txt:7
#, priority:100
msgid "git-get-tar-commit-id - Extract commit ID from an archive created using git-archive"
-msgstr ""
-"git-get-tar-commit-id - Extrai o ID do commit de um arquivo criado "
-"utilizando o comando git-archive"
+msgstr "git-get-tar-commit-id - Extrai o ID do commit de um arquivo criado utilizando o comando git-archive"
#. type: Plain text
#: en/git-get-tar-commit-id.txt:13
@@ -32202,22 +27603,13 @@ msgstr "'git get-tar-commit-id'\n"
#: en/git-get-tar-commit-id.txt:22
#, priority:100
msgid "Read a tar archive created by 'git archive' from the standard input and extract the commit ID stored in it. It reads only the first 1024 bytes of input, thus its runtime is not influenced by the size of the tar archive very much."
-msgstr ""
-"Leia um arquivo tar criado pelo comando 'git archive' a partir da entrada "
-"predefinida e extraia o ID do commit armazenado nele. Ele l챗 apenas os "
-"primeiros 1024 bytes da entrada, portanto, o seu tempo de execu챌찾o n찾o 챕 "
-"influenciado pelo tamanho do arquivo tar."
+msgstr "Leia um arquivo tar criado pelo comando 'git archive' a partir da entrada predefinida e extraia o ID do commit armazenado nele. Ele l챗 apenas os primeiros 1024 bytes da entrada, portanto, o seu tempo de execu챌찾o n찾o 챕 influenciado pelo tamanho do arquivo tar."
#. type: Plain text
#: en/git-get-tar-commit-id.txt:27
#, priority:100
msgid "If no commit ID is found, 'git get-tar-commit-id' quietly exists with a return code of 1. This can happen if the archive had not been created using 'git archive' or if the first parameter of 'git archive' had been a tree ID instead of a commit ID or tag."
-msgstr ""
-"Caso nenhum ID do commit seja encontrado, o 'git get-tar-commit-id' encerra "
-"silenciosamente com um c처digo de retorno 1. Isso pode acontecer caso o "
-"arquivo n찾o tenha sido criado utilizando o comando 'git archive' ou se o "
-"primeiro par창metro do 'git archive' tenha sido um ID da 찼rvore em vez de um "
-"ID ou tag do commit."
+msgstr "Caso nenhum ID do commit seja encontrado, o 'git get-tar-commit-id' encerra silenciosamente com um c처digo de retorno 1. Isso pode acontecer caso o arquivo n찾o tenha sido criado utilizando o comando 'git archive' ou se o primeiro par창metro do 'git archive' tenha sido um ID da 찼rvore em vez de um ID ou tag do commit."
#. type: Title =
#: en/git-grep.txt:2
@@ -32256,8 +27648,7 @@ msgid ""
"\t [ [--[no-]exclude-standard] [--cached | --no-index | --untracked] | <tree>...]\n"
"\t [--] [<pathspec>...]\n"
msgstr ""
-"'git grep' [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-"
-"regexp]\n"
+"'git grep' [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]\n"
"\t [-v | --invert-match] [-h|-H] [--full-name]\n"
"\t [-E | --extended-regexp] [-G | --basic-regexp]\n"
"\t [-P | --perl-regexp]\n"
@@ -32275,21 +27666,14 @@ msgstr ""
"\t [-f <arquivo>] [-e] <pattern>\n"
"\t [--and|--or|--not|(|)|-e <pattern>...]\n"
"\t [--recurse-submodules] [--parent-basename <basename>]\n"
-"\t [ [--[no-]exclude-standard] [--cached | --no-index | --untracked] | "
-"<찼rvore>...]\n"
+"\t [ [--[no-]exclude-standard] [--cached | --no-index | --untracked] | <찼rvore>...]\n"
"\t [--] [<pathspec>...]\n"
#. type: Plain text
#: en/git-grep.txt:39
#, priority:100
msgid "Look for specified patterns in the tracked files in the work tree, blobs registered in the index file, or blobs in given tree objects. Patterns are lists of one or more search expressions separated by newline characters. An empty string as search expression matches all lines."
-msgstr ""
-"Procure por padr천es especificados nos arquivos rastreados da 찼rvore de "
-"trabalho, bolhas registradas no arquivo do 챠ndice ou nas bolhas de "
-"determinados objetos da 찼rvore. Os padr천es s찾o listas de uma ou mais "
-"express천es de pesquisa separadas por caracteres de nova linha. Uma cadeia "
-"de caracteres vazia utilizada como uma express찾o de pesquisa coincide com "
-"todas as linhas."
+msgstr "Procure por padr천es especificados nos arquivos rastreados da 찼rvore de trabalho, bolhas registradas no arquivo do 챠ndice ou nas bolhas de determinados objetos da 찼rvore. Os padr천es s찾o listas de uma ou mais express천es de pesquisa separadas por caracteres de nova linha. Uma cadeia de caracteres vazia utilizada como uma express찾o de pesquisa coincide com todas as linhas."
#. type: Labeled list
#: en/git-grep.txt:44
@@ -32301,9 +27685,7 @@ msgstr "grep.lineNumber"
#: en/git-grep.txt:46
#, priority:100
msgid "If set to true, enable `-n` option by default."
-msgstr ""
-"Caso seja definido como `true`, 챕 predefinido que a op챌찾o `-n` seja "
-"utilizada."
+msgstr "Caso seja definido como `true`, 챕 predefinido que a op챌찾o `-n` seja utilizada."
#. type: Labeled list
#: en/git-grep.txt:47
@@ -32315,9 +27697,7 @@ msgstr "grep.column"
#: en/git-grep.txt:49
#, priority:100
msgid "If set to true, enable the `--column` option by default."
-msgstr ""
-"Caso seja definido como `true`, 챕 predefinido que a op챌찾o `--column` seja "
-"utilizada."
+msgstr "Caso seja definido como `true`, 챕 predefinido que a op챌찾o `--column` seja utilizada."
#. type: Labeled list
#: en/git-grep.txt:50
@@ -32329,12 +27709,7 @@ msgstr "grep.patternType"
#: en/git-grep.txt:55
#, priority:100
msgid "Set the default matching behavior. Using a value of 'basic', 'extended', 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, `--fixed-strings`, or `--perl-regexp` option accordingly, while the value 'default' will return to the default matching behavior."
-msgstr ""
-"Define o comportamento de correspond챗ncia predefinido. A utiliza챌찾o de um "
-"valor 'basic', 'extended', 'fixed' ou 'perl' ativar찼 as op챌천es `--basic-"
-"regexp`, `--extended-regexp`, `--fixed-strings`, ou `--perl-regexp`, "
-"enquanto o valor 'default' retornar찼 ao comportamento de coincid챗ncias j찼 "
-"predefinida."
+msgstr "Define o comportamento de correspond챗ncia predefinido. A utiliza챌찾o de um valor 'basic', 'extended', 'fixed' ou 'perl' ativar찼 as op챌천es `--basic-regexp`, `--extended-regexp`, `--fixed-strings`, ou `--perl-regexp`, enquanto o valor 'default' retornar찼 ao comportamento de coincid챗ncias j찼 predefinida."
#. type: Labeled list
#: en/git-grep.txt:56
@@ -32358,10 +27733,7 @@ msgstr "grep.threads"
#: en/git-grep.txt:64
#, priority:100
msgid "Number of grep worker threads to use. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
-msgstr ""
-"Quantidade de threads de trabalho \"grep\" a serem utilizados. If unset (or "
-"set to 0), Git will use as many threads as the number of logical cores "
-"available."
+msgstr "Quantidade de threads de trabalho \"grep\" a serem utilizados. If unset (or set to 0), Git will use as many threads as the number of logical cores available."
#. type: Labeled list
#: en/git-grep.txt:65
@@ -32373,9 +27745,7 @@ msgstr "grep.fullName"
#: en/git-grep.txt:67
#, priority:100
msgid "If set to true, enable `--full-name` option by default."
-msgstr ""
-"Caso seja definido como `true`, 챕 predefinido que a op챌찾o `--full-name` seja "
-"utilizada."
+msgstr "Caso seja definido como `true`, 챕 predefinido que a op챌찾o `--full-name` seja utilizada."
#. type: Labeled list
#: en/git-grep.txt:68
@@ -32387,25 +27757,19 @@ msgstr "grep.fallbackToNoIndex"
#: en/git-grep.txt:71
#, priority:100
msgid "If set to true, fall back to git grep --no-index if git grep is executed outside of a git repository. Defaults to false."
-msgstr ""
-"Caso seja definido como `true`, retorne para `git grep --no-index` caso o `"
-"git grep` seja executado fora de um reposit처rio Git. 횋 predefinido como "
-"`false`."
+msgstr "Caso seja definido como `true`, retorne para `git grep --no-index` caso o `git grep` seja executado fora de um reposit처rio Git. 횋 predefinido como `false`."
#. type: Plain text
#: en/git-grep.txt:78
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs registered in the index file."
-msgstr ""
-"Em vez de procurar por arquivos rastreados na 찼rvore de trabalho, pesquisar "
-"por bolhas registradas no 챠ndice do arquivo."
+msgstr "Em vez de procurar por arquivos rastreados na 찼rvore de trabalho, pesquisar por bolhas registradas no 챠ndice do arquivo."
#. type: Plain text
#: en/git-grep.txt:81
#, priority:100
msgid "Search files in the current directory that is not managed by Git."
-msgstr ""
-"Localize os arquivos no diret처rio atual que n찾o sejam gerenciados pelo Git."
+msgstr "Localize os arquivos no diret처rio atual que n찾o sejam gerenciados pelo Git."
#. type: Labeled list
#: en/git-grep.txt:82
@@ -32417,9 +27781,7 @@ msgstr "--untracked"
#: en/git-grep.txt:85
#, priority:100
msgid "In addition to searching in the tracked files in the working tree, search also in untracked files."
-msgstr ""
-"Al챕m de localizar nos arquivos rastreados da 찼rvore de trabalho, localize "
-"tamb챕m nos arquivos n찾o rastreados."
+msgstr "Al챕m de localizar nos arquivos rastreados da 찼rvore de trabalho, localize tamb챕m nos arquivos n찾o rastreados."
#. type: Labeled list
#: en/git-grep.txt:86
@@ -32431,9 +27793,7 @@ msgstr "--no-exclude-standard"
#: en/git-grep.txt:89
#, priority:100
msgid "Also search in ignored files by not honoring the `.gitignore` mechanism. Only useful with `--untracked`."
-msgstr ""
-"Localize tamb챕m nos arquivos ignorados, ignorando o mecanismo `.gitignore`. "
-"횣til apenas com a op챌찾o `--untracked`."
+msgstr "Localize tamb챕m nos arquivos ignorados, ignorando o mecanismo `.gitignore`. 횣til apenas com a op챌찾o `--untracked`."
#. type: Labeled list
#: en/git-grep.txt:90 en/git-ls-files.txt:98
@@ -32469,16 +27829,13 @@ msgstr "Honre com as configura챌천es do filtro \"textconv\"."
#: en/git-grep.txt:112
#, priority:100
msgid "Do not honor textconv filter settings. This is the default."
-msgstr ""
-"N찾o respeite as configura챌천es do filtro 'textconv'. Esta 챕 a predefini챌찾o."
+msgstr "N찾o respeite as configura챌천es do filtro 'textconv'. Esta 챕 a predefini챌찾o."
#. type: Plain text
#: en/git-grep.txt:117
#, priority:100
msgid "Ignore case differences between the patterns and the files."
-msgstr ""
-"Ignore as diferen챌as entre mai첬sculas e min첬sculas entre os padr천es e os "
-"arquivos."
+msgstr "Ignore as diferen챌as entre mai첬sculas e min첬sculas entre os padr천es e os arquivos."
#. type: Labeled list
#: en/git-grep.txt:118
@@ -32502,13 +27859,7 @@ msgstr "--max-depth <profundidade>"
#: en/git-grep.txt:127
#, priority:100
msgid "For each <pathspec> given on command line, descend at most <depth> levels of directories. A value of -1 means no limit. This option is ignored if <pathspec> contains active wildcards. In other words if \"a*\" matches a directory named \"a*\", \"*\" is matched literally so --max-depth is still effective."
-msgstr ""
-"Para cada `<pathspec>` utilizado na linha de comandos, des챌a a "
-"<profundidade> m찼xima dos n챠veis do diret처rio. Um valor de -1 significa sem "
-"limite. Esta op챌찾o ser찼 ignorada caso <pathspec> contenha curingas ativos. "
-"Em outras palavras, caso \"a*\" coincida com um diret처rio chamado \"a*\", o "
-"curinga \"*\" coincidir찼 literalmente para que `--max-depth` ainda seja "
-"eficaz."
+msgstr "Para cada `<pathspec>` utilizado na linha de comandos, des챌a a <profundidade> m찼xima dos n챠veis do diret처rio. Um valor de -1 significa sem limite. Esta op챌찾o ser찼 ignorada caso <pathspec> contenha curingas ativos. Em outras palavras, caso \"a*\" coincida com um diret처rio chamado \"a*\", o curinga \"*\" coincidir찼 literalmente para que `--max-depth` ainda seja eficaz."
#. type: Labeled list
#: en/git-grep.txt:129 en/git-submodule.txt:410
@@ -32544,10 +27895,7 @@ msgstr "--word-regexp"
#: en/git-grep.txt:140
#, priority:100
msgid "Match the pattern only at word boundary (either begin at the beginning of a line, or preceded by a non-word character; end at the end of a line or followed by a non-word character)."
-msgstr ""
-"Coincida com o padr찾o apenas no limite da palavra (inicie no in챠cio de uma "
-"linha ou preceda um caractere que n찾o seja uma palavra; termine no final de "
-"uma linha ou seguido por um caractere que n찾o seja uma palavra)."
+msgstr "Coincida com o padr찾o apenas no limite da palavra (inicie no in챠cio de uma linha ou preceda um caractere que n찾o seja uma palavra; termine no final de uma linha ou seguido por um caractere que n찾o seja uma palavra)."
#. type: Labeled list
#: en/git-grep.txt:142
@@ -32565,11 +27913,7 @@ msgstr "Selecione as linhas que n찾o coincidam."
#: en/git-grep.txt:152
#, priority:100
msgid "By default, the command shows the filename for each match. `-h` option is used to suppress this output. `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
-msgstr ""
-"횋 predefinido que o comando exiba o nome do arquivo para cada coincid챗ncia. "
-"A op챌찾o `-h` 챕 utilizada para suprimir esta sa챠da. A op챌찾o `-H` existe para "
-"ser completo e n찾o faz nada exceto a substitui챌찾o do `-h` utilizado "
-"anteriormente na linha de comando."
+msgstr "횋 predefinido que o comando exiba o nome do arquivo para cada coincid챗ncia. A op챌찾o `-h` 챕 utilizada para suprimir esta sa챠da. A op챌찾o `-H` existe para ser completo e n찾o faz nada exceto a substitui챌찾o do `-h` utilizado anteriormente na linha de comando."
#. type: Labeled list
#: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
@@ -32581,10 +27925,7 @@ msgstr "--full-name"
#: en/git-grep.txt:158 en/git-ls-files.txt:149
#, priority:100
msgid "When run from a subdirectory, the command usually outputs paths relative to the current directory. This option forces paths to be output relative to the project top directory."
-msgstr ""
-"O comando geralmente gera caminhos relativos ao diret처rio atual ao ser "
-"executado a partir de um subdiret처rio. Esta op챌찾o imp천em que os caminhos "
-"saiam relativos ao topo do diret처rio do projeto."
+msgstr "O comando geralmente gera caminhos relativos ao diret처rio atual ao ser executado a partir de um subdiret처rio. Esta op챌찾o imp천em que os caminhos saiam relativos ao topo do diret처rio do projeto."
#. type: Labeled list
#: en/git-grep.txt:159 en/rev-list-options.txt:82
@@ -32614,9 +27955,7 @@ msgstr "--basic-regexp"
#: en/git-grep.txt:165
#, priority:100
msgid "Use POSIX extended/basic regexp for patterns. Default is to use basic regexp."
-msgstr ""
-"Para os padr천es, utilize uma express찾o regular (regexp) POSIX estendido/"
-"b찼sico. A predefini챌찾o 챕 utilizar uma express찾o regular (regexp) b찼sica."
+msgstr "Para os padr천es, utilize uma express찾o regular (regexp) POSIX estendido/b찼sico. A predefini챌찾o 챕 utilizar uma express찾o regular (regexp) b찼sica."
#. type: Labeled list
#: en/git-grep.txt:167 en/rev-list-options.txt:93
@@ -32652,9 +27991,7 @@ msgstr "--fixed-strings"
#: en/git-grep.txt:178
#, priority:100
msgid "Use fixed strings for patterns (don't interpret pattern as a regex)."
-msgstr ""
-"Utilize uma cadeia de caracteres fixos para os padr천es (n찾o interprete o "
-"padr찾o como uma express찾o regular \"regex\")."
+msgstr "Utilize uma cadeia de caracteres fixos para os padr천es (n찾o interprete o padr찾o como uma express찾o regular \"regex\")."
#. type: Labeled list
#: en/git-grep.txt:180
@@ -32678,9 +28015,7 @@ msgstr "--column"
#: en/git-grep.txt:186
#, priority:100
msgid "Prefix the 1-indexed byte-offset of the first match from the start of the matching line."
-msgstr ""
-"Prefixe o deslocamento do byte (byte-offset) indexado em 1 da primeira "
-"coincid챗ncia desde o in챠cio da linha coincidente."
+msgstr "Prefixe o deslocamento do byte (byte-offset) indexado em 1 da primeira coincid챗ncia desde o in챠cio da linha coincidente."
#. type: Labeled list
#: en/git-grep.txt:188
@@ -32704,11 +28039,7 @@ msgstr "--files-without-match"
#: en/git-grep.txt:196
#, priority:100
msgid "Instead of showing every matched line, show only the names of files that contain (or do not contain) matches. For better compatibility with 'git diff', `--name-only` is a synonym for `--files-with-matches`."
-msgstr ""
-"Em vez de exibir todas as linhas coincidentes, exiba apenas os nomes dos "
-"arquivos que contenha (ou n찾o) as coincid챗ncias. Para uma melhor "
-"compatibilidade com o comando 'git diff', a op챌찾o `--name-only` 챕 um "
-"sin척nimo de `--files-with-matches`."
+msgstr "Em vez de exibir todas as linhas coincidentes, exiba apenas os nomes dos arquivos que contenha (ou n찾o) as coincid챗ncias. Para uma melhor compatibilidade com o comando 'git diff', a op챌찾o `--name-only` 챕 um sin척nimo de `--files-with-matches`."
#. type: Labeled list
#: en/git-grep.txt:197
@@ -32726,23 +28057,14 @@ msgstr "--open-files-in-pager[=<pager>]"
#: en/git-grep.txt:206
#, priority:100
msgid "Open the matching files in the pager (not the output of 'grep'). If the pager happens to be \"less\" or \"vi\", and the user specified only one pattern, the first file is positioned at the first match automatically. The `pager` argument is optional; if specified, it must be stuck to the option without a space. If `pager` is unspecified, the default pager will be used (see `core.pager` in linkgit:git-config[1])."
-msgstr ""
-"Abra os arquivos coincidentes no pager (n찾o a sa챠da do 'grep'). Caso o "
-"pager seja \"less\" (menor) ou \"vi\" e o usu찼rio usar apenas um padr찾o, o "
-"primeiro arquivo ser찼 posicionado na primeira coincid챗ncia de forma "
-"autom찼tica. O argumento `pager` 챕 opcional; se utilizado, dever찼 estar preso "
-"횪 op챌찾o sem um espa챌o. Caso `pager` n찾o seja utilizado, a predefini챌찾o do "
-"pager ser찼 utilizado (consulte `core.pager` no linkgit:git-config[1])."
+msgstr "Abra os arquivos coincidentes no pager (n찾o a sa챠da do 'grep'). Caso o pager seja \"less\" (menor) ou \"vi\" e o usu찼rio usar apenas um padr찾o, o primeiro arquivo ser찼 posicionado na primeira coincid챗ncia de forma autom찼tica. O argumento `pager` 챕 opcional; se utilizado, dever찼 estar preso 횪 op챌찾o sem um espa챌o. Caso `pager` n찾o seja utilizado, a predefini챌찾o do pager ser찼 utilizado (consulte `core.pager` no linkgit:git-config[1])."
#. type: Plain text
#: en/git-grep.txt:213
-#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
-msgstr ""
-"Utilize o \\0 como um delimitador para gerar os nomes do caminho e as exiba "
-"de forma literal. Sem esta op챌찾o, nomes de caminho com caracteres \"incomuns"
-"\" s찾o citados como explicado para a vari찼vel de configura챌찾o core.quotePath "
-"(veja git-config(1))."
+#, fuzzy, priority:100
+#| msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgstr "Utilize o \\0 como um delimitador para gerar os nomes do caminho e as exiba de forma literal. Sem esta op챌찾o, nomes de caminho com caracteres \"incomuns\" s찾o citados como explicado para a vari찼vel de configura챌찾o core.quotePath (veja git-config(1))."
#. type: Labeled list
#: en/git-grep.txt:215
@@ -32754,12 +28076,10 @@ msgstr "--only-matching"
#: en/git-grep.txt:218
#, priority:100
msgid "Print only the matched (non-empty) parts of a matching line, with each such part on a separate output line."
-msgstr ""
-"Imprima apenas as partes que coincidam (n찾o vazias) de uma linha coincidente "
-"com cada uma dessas partes em uma linha separada na sa챠da."
+msgstr "Imprima apenas as partes que coincidam (n찾o vazias) de uma linha coincidente com cada uma dessas partes em uma linha separada na sa챠da."
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -32768,26 +28088,19 @@ msgstr "--count"
#: en/git-grep.txt:223
#, priority:100
msgid "Instead of showing every matched line, show the number of lines that match."
-msgstr ""
-"Em vez de exibir todas as linhas coincidentes, exiba a quantidade de linhas "
-"coincidentes."
+msgstr "Em vez de exibir todas as linhas coincidentes, exiba a quantidade de linhas coincidentes."
#. type: Plain text
#: en/git-grep.txt:227
#, priority:100
msgid "Show colored matches. The value must be always (the default), never, or auto."
-msgstr ""
-"Exibir as coincid챗ncias em cores. Always (sempre) 챕 o valor predefinido, as "
-"outras op챌천es s찾o \"never\" ou \"auto\"."
+msgstr "Exibir as coincid챗ncias em cores. Always (sempre) 챕 o valor predefinido, as outras op챌천es s찾o \"never\" ou \"auto\"."
#. type: Plain text
#: en/git-grep.txt:232
#, priority:100
msgid "Turn off match highlighting, even when the configuration file gives the default to color output. Same as `--color=never`."
-msgstr ""
-"Desative o destacamento das coincid챗ncias, mesmo quando o arquivo da "
-"configura챌찾o fornecer a predefini챌찾o para a sa챠da colorida. O mesmo que "
-"`--color=never`."
+msgstr "Desative o destacamento das coincid챗ncias, mesmo quando o arquivo da configura챌찾o fornecer a predefini챌찾o para a sa챠da colorida. O mesmo que `--color=never`."
#. type: Labeled list
#: en/git-grep.txt:233
@@ -32811,9 +28124,7 @@ msgstr "--heading"
#: en/git-grep.txt:239
#, priority:100
msgid "Show the filename above the matches in that file instead of at the start of each shown line."
-msgstr ""
-"Exiba o nome do arquivo acima das coincid챗ncias nesse arquivo em vez de "
-"exibir no in챠cio de cada linha."
+msgstr "Exiba o nome do arquivo acima das coincid챗ncias nesse arquivo em vez de exibir no in챠cio de cada linha."
#. type: Labeled list
#: en/git-grep.txt:241
@@ -32825,12 +28136,7 @@ msgstr "--show-function"
#: en/git-grep.txt:247
#, priority:100
msgid "Show the preceding line that contains the function name of the match, unless the matching line is a function name itself. The name is determined in the same way as 'git diff' works out patch hunk headers (see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
-msgstr ""
-"Exibe a linha anterior que contenha o nome da fun챌찾o da coincid챗ncia, a "
-"menos que a linha correspondente seja o pr처prio nome da fun챌찾o. O nome 챕 "
-"determinado da mesma maneira que o 'git diff' elabora os cabe챌alhos do patch "
-"hunk (consulte 'Definindo um cabe챌alho personalizado do hunk' em "
-"linkgit:gitattributes[5])."
+msgstr "Exibe a linha anterior que contenha o nome da fun챌찾o da coincid챗ncia, a menos que a linha correspondente seja o pr처prio nome da fun챌찾o. O nome 챕 determinado da mesma maneira que o 'git diff' elabora os cabe챌alhos do patch hunk (consulte 'Definindo um cabe챌alho personalizado do hunk' em linkgit:gitattributes[5])."
#. type: Labeled list
#: en/git-grep.txt:248
@@ -32854,9 +28160,7 @@ msgstr "--context <num>"
#: en/git-grep.txt:253
#, priority:100
msgid "Show <num> leading and trailing lines, and place a line containing `--` between contiguous groups of matches."
-msgstr ""
-"Exiba um `<num>` (quantidade) de linhas iniciais e finais, coloque uma linha "
-"contendo `--` entre os grupos cont챠nuos coincidentes."
+msgstr "Exiba um `<num>` (quantidade) de linhas iniciais e finais, coloque uma linha contendo `--` entre os grupos cont챠nuos coincidentes."
#. type: Labeled list
#: en/git-grep.txt:254
@@ -32874,9 +28178,7 @@ msgstr "--after-context <num>"
#: en/git-grep.txt:258
#, priority:100
msgid "Show <num> trailing lines, and place a line containing `--` between contiguous groups of matches."
-msgstr ""
-"Exibe `<num>` (quantidade) de linhas finais e coloque uma linha contendo `--`"
-" entre os grupos cont챠nuos coincidentes."
+msgstr "Exibe `<num>` (quantidade) de linhas finais e coloque uma linha contendo `--` entre os grupos cont챠nuos coincidentes."
#. type: Labeled list
#: en/git-grep.txt:259
@@ -32894,18 +28196,13 @@ msgstr "--before-context <num>"
#: en/git-grep.txt:263
#, priority:100
msgid "Show <num> leading lines, and place a line containing `--` between contiguous groups of matches."
-msgstr ""
-"Exibe `<num>` (quantidade) de linhas iniciais e coloque uma linha contendo "
-"`--` entre os grupos cont챠nuos coincidentes."
+msgstr "Exibe `<num>` (quantidade) de linhas iniciais e coloque uma linha contendo `--` entre os grupos cont챠nuos coincidentes."
#. type: Plain text
#: en/git-grep.txt:270
#, priority:100
msgid "Show the surrounding text from the previous line containing a function name up to the one before the next function name, effectively showing the whole function in which the match was found."
-msgstr ""
-"Exibe o texto ao redor da linha anterior que contenha um nome da fun챌찾o at챕 "
-"o nome anterior ao pr처ximo, exibindo efetivamente toda a fun챌찾o em que a "
-"coincid챗ncia foi encontrada."
+msgstr "Exibe o texto ao redor da linha anterior que contenha um nome da fun챌찾o at챕 o nome anterior ao pr처ximo, exibindo efetivamente toda a fun챌찾o em que a coincid챗ncia foi encontrada."
#. type: Labeled list
#: en/git-grep.txt:271
@@ -32917,9 +28214,7 @@ msgstr "--threads <num>"
#: en/git-grep.txt:274
#, priority:100
msgid "Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' for more information."
-msgstr ""
-"Quantidade de threads de trabalho \"grep\" a serem utilizados. Para mais "
-"informa챌천es consulte `grep.threads` em 'CONFIGURA횉횄O'."
+msgstr "Quantidade de threads de trabalho \"grep\" a serem utilizados. Para mais informa챌천es consulte `grep.threads` em 'CONFIGURA횉횄O'."
#. type: Labeled list
#: en/git-grep.txt:275
@@ -32961,10 +28256,7 @@ msgstr ""
#: en/git-grep.txt:300
#, priority:100
msgid "The next parameter is the pattern. This option has to be used for patterns starting with `-` and should be used in scripts passing user input to grep. Multiple patterns are combined by 'or'."
-msgstr ""
-"O pr처ximo par창metro 챕 o padr찾o. Esta op챌찾o deve ser utilizada para padr천es "
-"que comecem com `-` e deve ser utilizado em scripts que passam a entrada do "
-"usu찼rio ao \"grep\". Os v찼rios padr천es s찾o combinados por 'or' (ou)."
+msgstr "O pr처ximo par창metro 챕 o padr찾o. Esta op챌찾o deve ser utilizada para padr천es que comecem com `-` e deve ser utilizado em scripts que passam a entrada do usu찼rio ao \"grep\". Os v찼rios padr천es s찾o combinados por 'or' (ou)."
#. type: Labeled list
#: en/git-grep.txt:301
@@ -32994,10 +28286,7 @@ msgstr "( ... )"
#: en/git-grep.txt:309
#, priority:100
msgid "Specify how multiple patterns are combined using Boolean expressions. `--or` is the default operator. `--and` has higher precedence than `--or`. `-e` has to be used for all patterns."
-msgstr ""
-"Determina como os v찼rios padr천es s찾o combinados utilizando express천es "
-"booleanas. `--or` 챕 o operador predefinido. `--and` tem maior preced챗ncia "
-"que `--or`. `-e` deve ser utilizado para todos os padr천es."
+msgstr "Determina como os v찼rios padr천es s찾o combinados utilizando express천es booleanas. `--or` 챕 o operador predefinido. `--and` tem maior preced챗ncia que `--or`. `-e` deve ser utilizado para todos os padr천es."
#. type: Labeled list
#: en/git-grep.txt:310 en/rev-list-options.txt:65
@@ -33009,18 +28298,13 @@ msgstr "--all-match"
#: en/git-grep.txt:314
#, priority:100
msgid "When giving multiple pattern expressions combined with `--or`, this flag is specified to limit the match to files that have lines to match all of them."
-msgstr ""
-"Ao utilizar m첬ltiplas express천es de padr천es combinadas com `--or`, este flag "
-"챕 utilizado para limitar a coincid챗ncia nos arquivos que possuam linhas que "
-"coincidam com todas elas."
+msgstr "Ao utilizar m첬ltiplas express천es de padr천es combinadas com `--or`, este flag 챕 utilizado para limitar a coincid챗ncia nos arquivos que possuam linhas que coincidam com todas elas."
#. type: Plain text
#: en/git-grep.txt:319
#, priority:100
msgid "Do not output matched lines; instead, exit with status 0 when there is a match and with non-zero status when there isn't."
-msgstr ""
-"N찾o produza linhas coincidentes; em vez disso, encerre com uma condi챌찾o 0 "
-"quando houver uma coincid챗ncia e diferente de 0 quando n찾o houver."
+msgstr "N찾o produza linhas coincidentes; em vez disso, encerre com uma condi챌찾o 0 quando houver uma coincid챗ncia e diferente de 0 quando n찾o houver."
#. type: Labeled list
#: en/git-grep.txt:320
@@ -33032,26 +28316,19 @@ msgstr "<찼rvore>..."
#: en/git-grep.txt:323
#, priority:100
msgid "Instead of searching tracked files in the working tree, search blobs in the given trees."
-msgstr ""
-"Em vez de localizar os arquivos rastreados na 찼rvore de trabalho, localize "
-"as bolhas nas 찼rvores informadas."
+msgstr "Em vez de localizar os arquivos rastreados na 찼rvore de trabalho, localize as bolhas nas 찼rvores informadas."
#. type: Plain text
#: en/git-grep.txt:327
#, priority:100
msgid "Signals the end of options; the rest of the parameters are <pathspec> limiters."
-msgstr ""
-"Sinaliza o fim das op챌천es; o restante dos par창metros s찾o os limitadores do "
-"`<pathspec>`."
+msgstr "Sinaliza o fim das op챌천es; o restante dos par창metros s찾o os limitadores do `<pathspec>`."
#. type: Plain text
#: en/git-grep.txt:331
#, priority:100
msgid "If given, limit the search to paths matching at least one pattern. Both leading paths match and glob(7) patterns are supported."
-msgstr ""
-"Se utilizado, limite a localiza챌찾o dos caminhos que coincidam a pelo menos "
-"um padr찾o. Ambas s찾o compat챠veis, as coincid챗ncias dos caminhos principais "
-"e os padr천es bolha(7)."
+msgstr "Se utilizado, limite a localiza챌찾o dos caminhos que coincidam a pelo menos um padr찾o. Ambas s찾o compat챠veis, as coincid챗ncias dos caminhos principais e os padr천es bolha(7)."
#. type: Labeled list
#: en/git-grep.txt:338
@@ -33063,9 +28340,7 @@ msgstr "`git grep 'time_t' -- '*.[ch]'`"
#: en/git-grep.txt:341
#, priority:100
msgid "Looks for `time_t` in all tracked .c and .h files in the working directory and its subdirectories."
-msgstr ""
-"Procura por `time_t` em todos os arquivos rastreados .c e .h no diret처rio de "
-"trabalho e em seus subdiret처rios."
+msgstr "Procura por `time_t` em todos os arquivos rastreados .c e .h no diret처rio de trabalho e em seus subdiret처rios."
#. type: Labeled list
#: en/git-grep.txt:342
@@ -33077,9 +28352,7 @@ msgstr "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
#: en/git-grep.txt:345
#, priority:100
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
-msgstr ""
-"Procura por uma linha que contenha `#define` e at챕 mesmo `MAX_PATH` ou "
-"`PATH_MAX`."
+msgstr "Procura por uma linha que contenha `#define` e at챕 mesmo `MAX_PATH` ou `PATH_MAX`."
#. type: Labeled list
#: en/git-grep.txt:346
@@ -33091,9 +28364,7 @@ msgstr "`git grep --all-match -e NODE -e Unexpected`"
#: en/git-grep.txt:349
#, priority:100
msgid "Looks for a line that has `NODE` or `Unexpected` in files that have lines that match both."
-msgstr ""
-"Procura por uma linha que tenha `NODE` ou `Unexpected` nos arquivos que "
-"tenham linhas que coincidam com ambas."
+msgstr "Procura por uma linha que tenha `NODE` ou `Unexpected` nos arquivos que tenham linhas que coincidam com ambas."
#. type: Labeled list
#: en/git-grep.txt:350
@@ -33321,10 +28592,7 @@ msgstr ""
#: en/git-gui.txt:108
#, priority:100
msgid "The Git repository browser. Shows branches, commit history and file differences. gitk is the utility started by 'git gui''s Repository Visualize actions."
-msgstr ""
-"O navegador do reposit처rio Git. Shows branches, commit history and file "
-"differences. gitk is the utility started by 'git gui''s Repository "
-"Visualize actions."
+msgstr "O navegador do reposit처rio Git. Shows branches, commit history and file differences. gitk is the utility started by 'git gui''s Repository Visualize actions."
#. type: Title -
#: en/git-gui.txt:110
@@ -33369,20 +28637,14 @@ msgid ""
"'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin [--literally]] [--] <file>...\n"
"'git hash-object' [-t <type>] [-w] --stdin-paths [--no-filters]\n"
msgstr ""
-"'git hash-object' [-t <tipo>] [-w] [--path=<file>|--no-filters] [--stdin "
-"[--literally]] [--] <file>...\n"
+"'git hash-object' [-t <tipo>] [-w] [--path=<file>|--no-filters] [--stdin [--literally]] [--] <file>...\n"
"'git hash-object' [-t <tipo>] [-w] --stdin-paths [--no-filters]\n"
#. type: Plain text
#: en/git-hash-object.txt:22
#, priority:100
msgid "Computes the object ID value for an object with specified type with the contents of the named file (which can be outside of the work tree), and optionally writes the resulting object into the object database. Reports its object ID to its standard output. When <type> is not specified, it defaults to \"blob\"."
-msgstr ""
-"Calcula o valor do ID do objeto para um objeto com o tipo especificado com o "
-"conte첬do do nome do arquivo (que pode estar fora da 찼rvore de trabalho) e "
-"opcionalmente, grava o objeto gerado no banco de dados do objeto. Informa o "
-"ID do objeto na sa챠da predefinida. A predefini챌찾o 챕 \"blob\" quando o "
-"<tipo> n찾o 챕 informado."
+msgstr "Calcula o valor do ID do objeto para um objeto com o tipo especificado com o conte첬do do nome do arquivo (que pode estar fora da 찼rvore de trabalho) e opcionalmente, grava o objeto gerado no banco de dados do objeto. Informa o ID do objeto na sa챠da predefinida. A predefini챌찾o 챕 \"blob\" quando o <tipo> n찾o 챕 informado."
#. type: Labeled list
#: en/git-hash-object.txt:26
@@ -33528,9 +28790,7 @@ msgstr ""
#: en/git-help.txt:53
#, priority:100
msgid "When used with `--all` print description for all recognized commands. This is the default."
-msgstr ""
-"Quando utilizado com a op챌찾o `--all`, imprima todas as descri챌천es para todos "
-"os comandos que forem reconhecidos. Esta 챕 a predefini챌찾o."
+msgstr "Quando utilizado com a op챌찾o `--all`, imprima todas as descri챌천es para todos os comandos que forem reconhecidos. Esta 챕 a predefini챌찾o."
#. type: Labeled list
#: en/git-help.txt:55
@@ -33602,13 +28862,7 @@ msgstr ""
#: en/git-help.txt:89
#, 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 utilizando a vari찼vel de configura챌찾o "
-"`help.browser` ou` web.browser` se o primeiro j찼 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`) por predefini챌찾o "
-"ser찼 escolhida a melhor op챌찾o. Para obter mais informa챌천es, consulte linkgit"
-":git-web{litdd}browse[1]."
+msgstr "O navegador da web pode ser definido utilizando a vari찼vel de configura챌찾o `help.browser` ou` web.browser` se o primeiro j찼 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`) por predefini챌찾o ser찼 escolhida a melhor op챌찾o. Para obter mais informa챌천es, consulte linkgit:git-web{litdd}browse[1]."
#. type: Title -
#: en/git-help.txt:91 en/git-interpret-trailers.txt:135 en/git-p4.txt:556 en/git-web--browse.txt:59
@@ -33815,9 +29069,7 @@ msgstr ""
#: en/git-help.txt:201 en/git-web--browse.txt:121
#, 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 mais informa챌천es, consulte linkgit:git-config[1]."
+msgstr "como provavelmente s찾o mais espec챠ficos do usu찼rio do que do reposit처rio. Para mais informa챌천es, consulte linkgit:git-config[1]."
#. type: Title =
#: en/git-http-backend.txt:2
@@ -33883,10 +29135,7 @@ msgstr ""
#: en/git-http-backend.txt:49
#, priority:100
msgid "This serves 'git fetch-pack' and 'git ls-remote' clients. It is enabled by default, but a repository can disable it by setting this configuration item to `false`."
-msgstr ""
-"Isso serve aos clientes 'git fetch-pack' e 'git ls-remote'. A predefini챌찾o "
-"챕 estar sempre ativo, por챕m um reposit처rio pode desativ찼-lo ao definir este "
-"item de configura챌찾o como `false`."
+msgstr "Isso serve aos clientes 'git fetch-pack' e 'git ls-remote'. A predefini챌찾o 챕 estar sempre ativo, por챕m um reposit처rio pode desativ찼-lo ao definir este item de configura챌찾o como `false`."
#. type: Labeled list
#: en/git-http-backend.txt:50
@@ -34389,11 +29638,7 @@ msgstr ""
#: en/git-http-push.txt:36 en/git-send-pack.txt:60
#, priority:100
msgid "Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. This flag disables the check. What this means is that the remote repository can lose commits; use it with care."
-msgstr ""
-"Usually, the command refuses to update a remote ref that is not an ancestor "
-"of the local ref used to overwrite it. Esta flag desativa esta "
-"verifica챌찾o. What this means is that the remote repository can lose commits;"
-" use it with care."
+msgstr "Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. Esta flag desativa esta verifica챌찾o. What this means is that the remote repository can lose commits; use it with care."
#. type: Plain text
#: en/git-http-push.txt:39 en/git-push.txt:175 en/git-send-pack.txt:53
@@ -34459,18 +29704,13 @@ msgstr ""
#: en/git-http-push.txt:71
#, 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."
-msgstr ""
-"Cada par de padr천es consiste no lado da origem (antes dos dois pontos) e no "
-"lado do destino (depois dos dois pontos). O \"ref\" a ser impulsionado 챕 "
-"determinado ao localizar uma coincid챗ncia que corresponda com a origem, a "
-"localiza챌찾o da origem 챕 determinada utilizando o lado do destino."
+msgstr "Cada par de padr천es consiste no lado da origem (antes dos dois pontos) e no lado do destino (depois dos dois pontos). O \"ref\" a ser impulsionado 챕 determinado ao localizar uma coincid챗ncia que corresponda com a origem, a localiza챌찾o da origem 챕 determinada utilizando o lado do destino."
#. type: Plain text
#: en/git-http-push.txt:74 en/git-send-pack.txt:131
#, priority:100
msgid "It is an error if <src> does not match exactly one of the local refs."
-msgstr ""
-"횋 um erro caso `<src>` n찾o corresponda exatamente a um dos `refs` locais."
+msgstr "횋 um erro caso `<src>` n찾o corresponda exatamente a um dos `refs` locais."
#. type: Plain text
#: en/git-http-push.txt:76 en/git-send-pack.txt:135
@@ -34761,12 +30001,7 @@ msgstr "--fix-thin"
#: en/git-index-pack.txt:53
#, 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]) adicionando os objetos "
-"exclu챠dos nos quais os objetos \"deltificados\" utilizam como base no "
-"pacote. Esta op챌찾o s처 faz sentido caso seja utilizado em conjunto com "
-"`--stdin`."
+msgstr "Corrija um pacote \"thin\" produzido por `git pack objects thin` (para mais detalhes, consulte linkgit:git-pack-objects[1]) adicionando os objetos exclu챠dos nos quais os objetos \"deltificados\" utilizam como base no pacote. Esta op챌찾o s처 faz sentido caso seja utilizado em conjunto com `--stdin`."
#. type: Plain text
#: en/git-index-pack.txt:61
@@ -34832,15 +30067,7 @@ msgstr ""
#: en/git-index-pack.txt:92
#, priority:100
msgid "Specifies the number of threads to spawn when resolving deltas. This requires that index-pack be compiled with pthreads otherwise this option is ignored with a warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. Specifying 0 will cause Git to auto-detect the number of CPU's and use maximum 3 threads."
-msgstr ""
-"Determina a quantidade de \"threads\" a serem geradas para resolver os "
-"deltas. Isso requer que os objetos do pacote sejam compilados com \"pthreads"
-"\", caso contr찼rio esta op챌찾o ser찼 ignorada exibindo um aviso. Isso visa "
-"reduzir o tempo do empacotamento em m찼quinas com multiprocessados. A "
-"quantidade de mem처ria necess찼ria para a janela de pesquisa delta 챕 "
-"multiplicada pela quantidade de threads. Definindo como `0` faz com que o "
-"Git detecte automaticamente a quantidade de CPUs e defina a quantidade de "
-"\"threads\" proporcionalmente e utiliza o m찼ximo de 3 \"threads\"."
+msgstr "Determina a quantidade de \"threads\" a serem geradas para resolver os deltas. Isso requer que os objetos do pacote sejam compilados com \"pthreads\", caso contr찼rio esta op챌찾o ser찼 ignorada exibindo um aviso. Isso visa reduzir o tempo do empacotamento em m찼quinas com multiprocessados. A quantidade de mem처ria necess찼ria para a janela de pesquisa delta 챕 multiplicada pela quantidade de threads. Definindo como `0` faz com que o Git detecte automaticamente a quantidade de CPUs e defina a quantidade de \"threads\" proporcionalmente e utiliza o m찼ximo de 3 \"threads\"."
#. type: Labeled list
#: en/git-index-pack.txt:93 en/git-unpack-objects.txt:47
@@ -34858,19 +30085,13 @@ msgstr "Encerre caso o pacote seja maior que <tamanho>."
#: en/git-index-pack.txt:103
#, priority:100
msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
-msgstr ""
-"Ap처s a cria챌찾o do 챠ndice a lista dos nomes dos objetos 챕 classificada e o "
-"hash SHA-1 desta lista seja exibida no stdout. Caso `--stdin` tamb챕m seja "
-"utilizado, ent찾o este 챕 prefixado por \"pack\\t\" ou \"keep\\t\" caso um "
-"novo arquivo `.keep` seja criado com 챗xito. Isso 챕 첬til para remover um"
+msgstr "Ap처s a cria챌찾o do 챠ndice a lista dos nomes dos objetos 챕 classificada e o hash SHA-1 desta lista seja exibida no stdout. Caso `--stdin` tamb챕m seja utilizado, ent찾o este 챕 prefixado por \"pack\\t\" ou \"keep\\t\" caso um novo arquivo `.keep` seja criado com 챗xito. Isso 챕 첬til para remover um"
#. type: Block title
#: en/git-index-pack.txt:103
#, no-wrap, priority:100
msgid "keep file used as a lock to prevent the race with 'git repack'"
-msgstr ""
-"mantenha o arquivo utilizado como uma trava para impedir uma corrida com `"
-"git repack`"
+msgstr "mantenha o arquivo utilizado como uma trava para impedir uma corrida com `git repack`"
#. type: Plain text
#: en/git-index-pack.txt:105
@@ -34916,10 +30137,14 @@ msgstr "git-init - Cria um reposit처rio Git vazio ou reinicializa um j찼 existen
#. type: Plain text
#: en/git-init.txt:15
-#, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:300
+#| msgid ""
+#| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
+#| "\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+#| "\t [--shared[=<permissions>]] [directory]\n"
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
@@ -34930,41 +30155,25 @@ msgstr ""
#: 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` do ramo principal."
+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` do ramo 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 utilizado para a base dos reposit처rios em vez "
-"de `./.git`."
+msgstr "Caso a vari찼vel de ambiente `$ GIT_DIR` esteja configurada, esta especificar찼 um caminho a ser utilizado 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찼 utilizado o diret처rio predefinido "
-"`$GIT_DIR/objects`."
+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찼 utilizado 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 utilizado)."
+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 utilizado)."
#. type: Plain text
#: en/git-init.txt:45
@@ -34994,9 +30203,7 @@ msgstr ""
#: en/git-init.txt:60
#, priority:300
msgid "Specify the directory from which templates will be used. (See the \"TEMPLATE DIRECTORY\" section below.)"
-msgstr ""
-"Especifique o diret처rio de onde os modelos ser찾o utilizados. (Consulte a "
-"se챌찾o \"DIRET횙RIO MODELO\" abaixo.)"
+msgstr "Especifique o diret처rio de onde os modelos ser찾o utilizados. (Consulte a se챌찾o \"DIRET횙RIO MODELO\" abaixo.)"
#. type: Plain text
#: en/git-init.txt:67
@@ -35020,13 +30227,7 @@ msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
#: en/git-init.txt:78
#, 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 da configura챌찾o `core."
-"sharedRepository` 챕 utilizada 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)."
+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 da configura챌찾o `core.sharedRepository` 챕 utilizada 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:81
@@ -35044,9 +30245,7 @@ msgstr "'umask' (ou 'false')"
#: en/git-init.txt:87
#, priority:300
msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
-msgstr ""
-"Utilize as permiss천es informadas por umask(2). 횋 a predefini챌찾o quando "
-"`--shared` n찾o 챕 utilizado."
+msgstr "Utilize as permiss천es informadas por umask(2). 횋 a predefini챌찾o quando `--shared` n찾o 챕 utilizado."
#. type: Labeled list
#: en/git-init.txt:88
@@ -35058,14 +30257,7 @@ msgstr "'group' (ou 'true')"
#: en/git-init.txt:96
#, 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 "
-"챕 utilizado 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."
+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 챕 utilizado 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:97
@@ -35077,8 +30269,7 @@ msgstr "'all' ('world' ou 'everybody')"
#: en/git-init.txt:100
#, 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 por todos os usu찼rios."
+msgstr "O mesmo que 'group', mas torna o reposit처rio leg챠vel por todos os usu찼rios."
#. type: Labeled list
#: en/git-init.txt:101
@@ -35096,18 +30287,13 @@ msgstr "'0xxx' 챕 um n첬mero octal e cada arquivo ter찼 o modo '0xxx'. '0xxx' su
#: en/git-init.txt:113
#, 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 ""
-"횋 predefinido que a flag da configura챌찾o `receive.denyNonFastForwards` seja "
-"ativado nos reposit처rios compartilhados para que voc챗 n찾o possa impor um "
-"impulsionamento `fast-forwarding` para ele."
+msgstr "횋 predefinido que a flag da configura챌찾o `receive.denyNonFastForwards` seja ativado nos reposit처rios compartilhados para que voc챗 n찾o possa impor um impulsionamento `fast-forwarding` para ele."
#. type: Plain text
#: en/git-init.txt:116
#, 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 ""
-"Caso utilize um `diret처rio`, o comando ser찼 executado dentro dele. E caso o "
-"diret처rio n찾o exista, um ser찼 criado."
+msgstr "Caso utilize um `diret처rio`, o comando ser찼 executado dentro dele. E caso o diret처rio n찾o exista, um ser찼 criado."
#. type: Title -
#: en/git-init.txt:118
@@ -35155,18 +30341,13 @@ msgstr "A predefini챌찾o do diret처rio modelo: `/usr/share/git-core/templates`."
#: en/git-init.txt:135
#, 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 amostragem."
+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 amostragem."
#. type: Plain text
#: en/git-init.txt:138
#, 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 amostragem est찾o todos desativados. Para "
-"ativar um dos ganchos de amostragem, renomeie-o removendo o sufixo `.sample`."
+msgstr "Por predefini챌찾o os ganchos de amostragem est찾o todos desativados. Para ativar um dos ganchos de amostragem, renomeie-o removendo o sufixo `.sample`."
#. type: Plain text
#: en/git-init.txt:140
@@ -35258,12 +30439,7 @@ msgstr "--httpd"
#: en/git-instaweb.txt:35
#, 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 da configura챌찾o ser찼 "
-"adicionada no final da linha de comando. Atualmente s찾o compat챠veis, "
-"apache2, lighttpd, mongoose, plackup, python e webrick. (Predefini챌찾o: "
-"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 da configura챌찾o ser찼 adicionada 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
@@ -35299,11 +30475,7 @@ msgstr "--browser"
#: en/git-instaweb.txt:52
#, 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 utilizado 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."
+msgstr "O navegador da web que deve ser utilizado 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 en/git-update-ref.txt:125
@@ -35321,9 +30493,7 @@ msgstr "--start"
#: en/git-instaweb.txt:57
#, 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 criar uma nova inst창ncia conforme seja necess찼rio."
+msgstr "Inicie o servidor httpd e encerre. Gere novamente os arquivos de configura챌찾o para criar uma nova inst창ncia conforme seja necess찼rio."
#. type: Labeled list
#: en/git-instaweb.txt:58
@@ -35341,9 +30511,7 @@ msgstr "--stop"
#: en/git-instaweb.txt:63
#, 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 criar uma nova inst창ncia, nem fecha o navegador."
+msgstr "Pare o servidor httpd e encerre. Isso n찾o gera nenhum dos arquivos de configura챌찾o para criar uma nova inst창ncia, nem fecha o navegador."
#. type: Labeled list
#: en/git-instaweb.txt:64
@@ -35361,9 +30529,7 @@ msgstr "--restart"
#: en/git-instaweb.txt:68
#, 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 criar uma nova inst창ncia conforme seja necess찼rio."
+msgstr "Reinicia o servidor httpd e encerre. Gere novamente os arquivos de configura챌찾o para criar uma nova inst창ncia conforme seja necess찼rio."
#. type: Plain text
#: en/git-instaweb.txt:73
@@ -35393,11 +30559,7 @@ msgstr ""
#: 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 da configura챌찾o `instaweb.browser` n찾o esteja definida, a "
-"vari찼vel ` web.browser` ser찼 utilizada em seu lugar caso esteja definida. "
-"Para obter mais informa챌천es sobre isso consulte linkgit:git-"
-"web{litdd}browse[1]."
+msgstr "Caso a vari찼vel da configura챌찾o `instaweb.browser` n찾o esteja definida, a vari찼vel ` web.browser` ser찼 utilizada em seu lugar caso esteja definida. Para obter mais informa챌천es sobre isso consulte linkgit:git-web{litdd}browse[1]."
#. type: Title =
#: en/git-interpret-trailers.txt:2
@@ -35437,10 +30599,7 @@ msgstr "Este comando l챗 alguns patches ou faz o commit das mensagens dos argume
#: 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 utilizando a "
-"op챌찾o `trailer`, caso exista, 횪 parte da mensagem de commit de cada arquivo "
-"de entrada. O resultado 챕 emitido na sa챠da predefinida."
+msgstr "Caso contr찼rio, este comando aplica os argumentos passados utilizando 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
@@ -35452,13 +30611,7 @@ msgstr "Algumas vari찼veis de configura챌찾o controlam a maneira como os argumen
#: 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>' utilizando `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:"
+msgstr "횋 predefinido que um argumento informado '<token>=<value>' ou '<token>:<value>' utilizando `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
@@ -35482,37 +30635,19 @@ msgstr "횋 predefinido que o novo `trailer` aparecer찼 no final de todos os `tra
#: 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 caracteres de resposta j찼 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 caracteres de resposta. 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."
+msgstr "Os caracteres de resposta j찼 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 caracteres de resposta. 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 os caracteres de resposta, podem haver espa챌os ap처s o token, o "
-"separador e o valor. Tamb챕m pode haver espa챌os no token e no valor. O valor "
-"pode ser dividido em v찼rias linhas, com cada linha subsequente come챌ando com "
-"um espa챌o, como a descri챌찾o \"folding\" (dobra) na norma RFC 822."
+msgstr "Ao ler os caracteres de resposta, podem haver espa챌os ap처s o token, o separador e o valor. Tamb챕m pode haver espa챌os no token e no valor. O valor pode ser dividido em v찼rias linhas, com cada linha subsequente come챌ando com um espa챌o, 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 caracteres de resposta 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 n찾o sigam quaisquer "
-"outras."
+msgstr "Observe que caracteres de resposta 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 n찾o sigam quaisquer outras."
#. type: Labeled list
#: en/git-interpret-trailers.txt:74
@@ -35566,12 +30701,7 @@ msgstr "--no-where"
#: en/git-interpret-trailers.txt:94
#, 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 utilizada 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`."
+msgstr "Especifique onde todos os novos `trailers` ser찾o adicionados. Uma configura챌찾o utilizada 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
@@ -35589,13 +30719,7 @@ msgstr "--no-if-exists"
#: en/git-interpret-trailers.txt:103
#, 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 utilizada 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`."
+msgstr "Especifique qual a챌찾o ser찼 executada quando j찼 houver pelo menos um `trailer` com o mesmo <token> na mensagem. Uma configura챌찾o utilizada 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
@@ -35613,12 +30737,7 @@ msgstr "--no-if-missing"
#: en/git-interpret-trailers.txt:112
#, 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 utilizada com o comando `--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` ou `--no-if-"
-"missing`. As poss챠veis a챌천es s찾o `doNothing` ou `add`."
+msgstr "Especifique qual a챌찾o ser찼 executada quando n찾o houver outro trailer com o mesmo <token> na mensagem. Uma configura챌찾o utilizada com o comando `--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` ou `--no-if-missing`. As poss챠veis a챌천es s찾o `doNothing` ou `add`."
#. type: Labeled list
#: en/git-interpret-trailers.txt:113
@@ -35678,10 +30797,7 @@ msgstr "--no-divider"
#: en/git-interpret-trailers.txt:133
#, 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. Utilize isso quando "
-"souber que a sua entrada tenha apenas a pr처pria mensagem do commit (e n찾o um "
-"e-mail ou a sa챠da do `git format-patch`)."
+msgstr "N찾o trate `---` como o final da mensagem de commit. Utilize isso quando souber que a sua entrada tenha apenas a pr처pria mensagem do commit (e n찾o um e-mail ou a sa챠da do `git format-patch`)."
#. type: Labeled list
#: en/git-interpret-trailers.txt:137
@@ -35693,32 +30809,19 @@ msgstr "trailer.separators"
#: 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 ""
-"Esta op챌찾o informa quais os caracteres s찾o reconhecidos como separadores dos "
-"caracteres de resposta. 횋 predefinido que apenas o `:` seja reconhecido como "
-"um, a menos que `=` seja sempre aceito na linha de comando por quest천es de "
-"compatibilidade com os outros comandos git."
+msgstr "Esta op챌찾o informa quais os caracteres s찾o reconhecidos como separadores dos caracteres de resposta. 횋 predefinido que apenas o `:` seja reconhecido como um, a menos que `=` seja sempre aceito na linha de comando 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 informado por esta op챌찾o ser찼 o caractere predefinido "
-"que ser찼 utilizado quando um outro separador n찾o seja utilizado na "
-"configura챌찾o deste `trailer`."
+msgstr "O primeiro caractere informado por esta op챌찾o ser찼 o caractere predefinido que ser찼 utilizado quando um outro separador n찾o seja utilizado 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찼 "
-"utilizado 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)."
+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찼 utilizado 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
@@ -36158,11 +31261,7 @@ msgstr "Exibe os registros log do commit."
#: en/git-log.txt:22
#, priority:260
msgid "The command takes options applicable to the `git rev-list` command to control what is shown and how, and options applicable to the `git diff-*` commands to control how the changes each commit introduces are shown."
-msgstr ""
-"O comando aceita as op챌천es aplic찼veis ao comando `git rev-list` para "
-"controlar o que 챕 exibido e como. As op챌천es aplic찼veis ao comando `git "
-"diff-*` serve para controlar como as mudan챌as que cada commit faz s찾o "
-"exibidas."
+msgstr "O comando aceita as op챌천es aplic찼veis ao comando `git rev-list` para controlar o que 챕 exibido e como. As op챌천es aplic찼veis ao comando `git diff-*` serve para controlar como as mudan챌as que cada commit faz s찾o exibidas."
#. type: Labeled list
#: en/git-log.txt:27
@@ -36210,14 +31309,7 @@ msgstr "--decorate-refs-exclude=<pattern>"
#: en/git-log.txt:50
#, priority:260
msgid "If no `--decorate-refs` is given, pretend as if all refs were included. For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
-msgstr ""
-"Caso nenhum `--decorate-refs` seja usado, finja que todos os \"refs\" foram "
-"inclu챠dos. Para cada candidato, n찾o o use para decora챌찾o caso ele "
-"corresponda a algum padr찾o fornecido para a op챌찾o `--decorate-refs-exclude` "
-"ou caso n찾o corresponda a nenhum padr찾o usado em ` --decorate-refs`. A op챌찾o "
-"de configura챌찾o `log.excludeDecoration` permite a exclus찾o dos \"refs\" das "
-"decora챌천es, por챕m um padr찾o expl챠cito `--decorate-refs` substituir찼 a "
-"coincid챗ncia no `log.excludeDecoration`."
+msgstr "Caso nenhum `--decorate-refs` seja usado, finja que todos os \"refs\" foram inclu챠dos. Para cada candidato, n찾o o use para decora챌찾o caso ele corresponda a algum padr찾o fornecido para a op챌찾o `--decorate-refs-exclude` ou caso n찾o corresponda a nenhum padr찾o usado em ` --decorate-refs`. A op챌찾o de configura챌찾o `log.excludeDecoration` permite a exclus찾o dos \"refs\" das decora챌천es, por챕m um padr찾o expl챠cito `--decorate-refs` substituir찼 a coincid챗ncia no `log.excludeDecoration`."
#. type: Labeled list
#: en/git-log.txt:51
@@ -36229,9 +31321,7 @@ msgstr "--source"
#: en/git-log.txt:54
#, priority:260
msgid "Print out the ref name given on the command line by which each commit was reached."
-msgstr ""
-"Exiba na tela o nome \"ref\" utilizado na linha de comando pela qual cada "
-"commit foi alcan챌ado."
+msgstr "Exiba na tela o nome \"ref\" utilizado na linha de comando pela qual cada commit foi alcan챌ado."
#. type: Labeled list
#: en/git-log.txt:55
@@ -36249,10 +31339,7 @@ msgstr "--[no-]use-mailmap"
#: en/git-log.txt:60
#, 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 ""
-"Utilize o arquivo mailmap para mapear os nomes dos autores dos commits e "
-"seus endere챌os de e-mail para nomes e endere챌os de e-mail reais can척nicos. "
-"Consulte linkgit:git-shortlog[1]."
+msgstr "Utilize o arquivo mailmap para mapear os nomes dos autores dos commits e seus endere챌os de e-mail para nomes e endere챌os de e-mail reais can척nicos. Consulte linkgit:git-shortlog[1]."
#. type: Labeled list
#: en/git-log.txt:61
@@ -36300,17 +31387,7 @@ msgstr "-L :<nome-da-fun챌찾o>:<arquivo>"
#: en/git-log.txt:89
#, priority:260
msgid "Trace the evolution of the line range given by \"<start>,<end>\" (or the function name regex <funcname>) within the <file>. You may not give any pathspec limiters. This is currently limited to a walk starting from a single revision, i.e., you may only give zero or one positive revision arguments, and <start> and <end> (or <funcname>) must exist in the starting revision. You can specify this option more than once. Implies `--patch`. Patch output can be suppressed using `--no-patch`, but other diff formats (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`, `--name-status`, `--check`) are not currently implemented."
-msgstr ""
-"Monitore a evolu챌찾o do intervalo das linhas definidos em \"<inicio>,<fim>\" ("
-"ou o nome da fun챌찾o regex <nome-da-fun챌찾o>) dentro do <arquivo>. Voc챗 n찾o "
-"pode usar qualquer limitador com o `pathspec`. No momento, est찼 limitado a "
-"um passo a partir de uma 첬nica revis찾o, ou seja, voc챗 pode utilizar zero "
-"apenas ou um argumento de revis찾o positivo, onde <inicio> e <fim> (ou <nome-"
-"da-fun챌찾o>) devam existir na revis찾o inicial. 횋 poss챠vel utilizar esta op챌찾o "
-"amais de uma vez. Implica no uso da op챌찾o `--patch`. A gera챌찾o do patch pode "
-"ser suprimida utilizando o comando `--no-patch`, por챕m outros formatos diff ("
-"nomeadamente `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, "
-"`--name-only`,` --name-status`, `--check`) ainda n찾o foram implementados."
+msgstr "Monitore a evolu챌찾o do intervalo das linhas definidos em \"<inicio>,<fim>\" (ou o nome da fun챌찾o regex <nome-da-fun챌찾o>) dentro do <arquivo>. Voc챗 n찾o pode usar qualquer limitador com o `pathspec`. No momento, est찼 limitado a um passo a partir de uma 첬nica revis찾o, ou seja, voc챗 pode utilizar zero apenas ou um argumento de revis찾o positivo, onde <inicio> e <fim> (ou <nome-da-fun챌찾o>) devam existir na revis찾o inicial. 횋 poss챠vel utilizar esta op챌찾o amais de uma vez. Implica no uso da op챌찾o `--patch`. A gera챌찾o do patch pode ser suprimida utilizando o comando `--no-patch`, por챕m outros formatos diff (nomeadamente `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, `--name-only`,` --name-status`, `--check`) ainda n찾o foram implementados."
#. type: Labeled list
#: en/git-log.txt:92 en/git-shortlog.txt:63
@@ -36550,9 +31627,7 @@ msgstr "log.showSignature"
#: en/git-log.txt:223
#, priority:260
msgid "If `true`, `git log` and related commands will act as if the `--show-signature` option was passed to them."
-msgstr ""
-"Caso o valor `true` seja utilizado, o `git log` e os comandos relacionados "
-"atuar찾o como se a op챌찾o `--show-signature` tivesse sido utilizada."
+msgstr "Caso o valor `true` seja utilizado, o `git log` e os comandos relacionados atuar찾o como se a op챌찾o `--show-signature` tivesse sido utilizada."
#. type: Labeled list
#: en/git-log.txt:224
@@ -36923,19 +31998,13 @@ msgstr ""
#: en/git-ls-files.txt:138
#, 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 utilize as letras min첬sculas para os arquivos "
-"marcados como 'assume unchanged' ou 'assuma que n찾o foi alterado' (consulte "
-"linkgit:git-update-index[1])."
+msgstr "Semelhante ao `-t`, por챕m utilize as 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 utilize as letras min첬sculas para os arquivos "
-"marcados como 'fsmonitor valid' ou 'fsmonitor v찼lido' (consulte linkgit:git-"
-"update-index[1])."
+msgstr "Semelhante ao `-t`, por챕m utilize as letras min첬sculas para os arquivos marcados como 'fsmonitor valid' ou 'fsmonitor v찼lido' (consulte linkgit:git-update-index[1])."
#. type: Plain text
#: en/git-ls-files.txt:153
@@ -37027,13 +32096,7 @@ msgstr ""
#: en/git-ls-files.txt:207
#, 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 pair, 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 "
-"utilizada 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]"
+msgstr "Para um caminho que n찾o foi mesclado, em vez de gravar um 첬nico modo/ par SHA-1 pair, 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 utilizada 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
@@ -37168,10 +32231,7 @@ msgstr "--get-url"
#: en/git-ls-remote.txt:58
#, 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 informado, levando em considera챌찾o "
-"qualquer defini챌찾o da configura챌찾o \"url.<base>.insteadOf\" (consulte linkgit"
-":git-config[1]) e encerre sem se comunicar com o reposit처rio remoto."
+msgstr "Expanda a URL do reposit처rio remoto informado, levando em considera챌찾o qualquer defini챌찾o da 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
@@ -37189,27 +32249,13 @@ msgstr ""
#: en/git-ls-remote.txt:74
#, 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 ""
-"Classifique com base na chave informada. O prefixo `-` 챕 utilizado para "
-"classificar em ordem decrescente. Supports \"version:refname\" or \"v:"
-"refname\" (tag names are treated as versions). A ordem de classifica챌찾o "
-"`vers찾o:refname` tamb챕m pode ser afetada pela vari찼vel da configura챌찾o "
-"`versionsort.sufix`. 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 capturados remotamente e exibir찾o um erro `missing "
-"object`."
+msgstr "Classifique com base na chave informada. O prefixo `-` 챕 utilizado para classificar em ordem decrescente. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). A ordem de classifica챌찾o `vers찾o:refname` tamb챕m pode ser afetada pela vari찼vel da configura챌찾o `versionsort.sufix`. 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 capturados remotamente e exibir찾o um erro `missing object`."
#. type: Plain text
#: en/git-ls-remote.txt:82
#, priority:100
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."
-msgstr ""
-"Transmita a sequ챗ncia especificada para o servidor ao se comunicar "
-"utilizando o protocolo vers찾o 2. A sequ챗ncia informada n찾o deve conter um "
-"caractere `NUL` ou `LF`. Quando a op챌찾o `--server-option=<op챌찾o>` forem "
-"utilizadas v찼rias vezes, todos ser찾o enviados para o outro lado na ordem "
-"listada na linha de comando."
+msgstr "Transmita a sequ챗ncia especificada para o servidor ao se comunicar utilizando o protocolo vers찾o 2. A sequ챗ncia informada n찾o deve conter um caractere `NUL` ou `LF`. Quando a op챌찾o `--server-option=<op챌찾o>` forem utilizadas v찼rias vezes, todos ser찾o enviados para o outro lado na ordem listada na linha de comando."
#. type: Plain text
#: en/git-ls-remote.txt:87
@@ -37413,13 +32459,7 @@ msgstr ""
#: en/git-mailinfo.txt:23
#, 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 utilizados pelo comando 'git "
-"am'. Na maioria das vezes, n찾o 챕 necess찼rio usar este comando diretamente. "
-"Em vez disso, consulte linkgit:git-am[1]."
+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 utilizados 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
@@ -38487,11 +33527,7 @@ msgstr ""
#: 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 ""
-"Processe os arquivos na ordem especificada em <orderfile> que tenha um shell "
-"padr찾o \"glob\" por linha. Substitui a vari찼vel da configura챌찾o `diff."
-"orderFile` (consulte linkgit:git-config[1]). Para cancelar a vari찼vel `diff."
-"orderFile`, utilize `-O/dev/null`."
+msgstr "Processe os arquivos na ordem especificada em <orderfile> que tenha um shell padr찾o \"glob\" por linha. Substitui a vari찼vel da configura챌찾o `diff.orderFile` (consulte linkgit:git-config[1]). Para cancelar a vari찼vel `diff.orderFile`, utilize `-O/dev/null`."
#. type: Title -
#: en/git-mergetool.txt:103
@@ -38509,10 +33545,7 @@ msgstr "O `git mergetool` cria arquivos de backup` * .orig` enquanto lida com as
#: 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 ""
-"Definir a vari찼vel da configura챌찾o `mergetool.keepBackup` como` false` faz "
-"com que o comando `git mergetool` remova automaticamente o backup enquanto "
-"os arquivos forem sendo mesclados com sucesso."
+msgstr "Definir a vari찼vel da configura챌찾o `mergetool.keepBackup` como` false` faz com que o comando `git mergetool` remova automaticamente o backup enquanto os arquivos forem sendo mesclados com sucesso."
#. type: Title =
#: en/git-merge-tree.txt:2
@@ -38524,8 +33557,7 @@ msgstr "git-merge-tree(1)"
#: en/git-merge-tree.txt:7
#, priority:100
msgid "git-merge-tree - Show three-way merge without touching index"
-msgstr ""
-"git-merge-tree - Exiba as tr챗s maneiras de mesclagem sem mexer no 챠ndice"
+msgstr "git-merge-tree - Exiba as tr챗s maneiras de mesclagem sem mexer no 챠ndice"
#. type: Plain text
#: en/git-merge-tree.txt:13
@@ -38543,10 +33575,7 @@ msgstr "Faz a leitura de tr챗s 찼rvores e produz resultados comuns de mesclagem
#: en/git-merge-tree.txt:26
#, priority:100
msgid "This is meant to be used by higher level scripts to compute merge results outside of the index, and stuff the results back into the index. For this reason, the output from the command omits entries that match the <branch1> tree."
-msgstr ""
-"Isso foi pensado para ser utilizado por scripts de alto n챠vel para processar "
-"os resultados de mesclagem fora do 챠ndice e posteriormente retorn찼-los. Por "
-"esse motivo a sa챠da do comando omite as entradas que coincidam com <branch1>."
+msgstr "Isso foi pensado para ser utilizado por scripts de alto n챠vel para processar os resultados de mesclagem fora do 챠ndice e posteriormente retorn찼-los. Por esse motivo a sa챠da do comando omite as entradas que coincidam com <branch1>."
#. type: Title =
#: en/git-merge.txt:2
@@ -38580,12 +33609,7 @@ msgstr ""
#: 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 ""
-"Incorpora as altera챌천es dos commits citados (desde o momento em que os seus "
-"hist처ricos divergirem do ramo atual) para dentro do ramo atual. Este "
-"comando 챕 utilizado pelo 'git pull' para incorporar as altera챌천es vindos de "
-"outro reposit처rio e pode ser utilizado manualmente para mesclar as "
-"altera챌천es do outro ramo para um outro."
+msgstr "Incorpora as altera챌천es dos commits citados (desde o momento em que os seus hist처ricos divergirem do ramo atual) para dentro do ramo atual. Este comando 챕 utilizado pelo 'git pull' para incorporar as altera챌천es vindos de outro reposit처rio e pode ser utilizado manualmente para mesclar as altera챌천es do outro ramo para um outro."
#. type: Plain text
#: en/git-merge.txt:28 en/git-pull.txt:40
@@ -38609,12 +33633,7 @@ msgstr ""
#: 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 ""
-"Em seguida, `git merge topic` repetir찼 as altera챌천es feitas no ramo `topic` "
-"uma vez que ele divergiu de `master` (ou seja,`E`) at챕 que o seu commit "
-"atual (`C`) no topo do `master` registrando o resultado em um novo commit "
-"junto com os nomes de dois commits relacionados em uma mensagem log vindo do "
-"usu찼rio descrevendo as altera챌천es."
+msgstr "Em seguida, `git merge topic` repetir찼 as altera챌천es feitas no ramo `topic` uma vez que ele divergiu de `master` (ou seja,`E`) at챕 que o seu commit atual (`C`) no topo do `master` registrando o resultado em um novo commit junto com os nomes de dois commits relacionados em uma mensagem log vindo do usu찼rio descrevendo as altera챌천es."
#. type: delimited block -
#: en/git-merge.txt:45
@@ -38677,18 +33696,13 @@ msgstr "Leia a mensagem de commit que ser찼 utilizada para mesclar o commit (no
#: 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 ""
-"Silently overwrite ignored files from the merge result. Este 챕 o "
-"comportamento predefinido. Use `--no-overwrite-ignore` to abort."
+msgstr "Silently overwrite ignored files from the merge result. Este 챕 o comportamento predefinido. Use `--no-overwrite-ignore` to abort."
#. type: Plain text
#: en/git-merge.txt:99
#, priority:240
msgid "Abort the current conflict resolution process, and try to reconstruct the pre-merge state. If an autostash entry is present, apply it to the worktree."
-msgstr ""
-"Interrompa o processo de resolu챌찾o do conflito atual e tente reconstruir a "
-"condi챌찾o anterior a mesclagem. Caso um lan챌amento esteja presente, aplique-a "
-"na 찼rvore de trabalho."
+msgstr "Interrompa o processo de resolu챌찾o do conflito atual e tente reconstruir a condi챌찾o anterior a mesclagem. Caso um lan챌amento esteja presente, aplique-a na 찼rvore de trabalho."
#. type: Plain text
#: en/git-merge.txt:104
@@ -38706,10 +33720,7 @@ msgstr ""
#: en/git-merge.txt:115
#, priority:240
msgid "Forget about the current merge in progress. Leave the index and the working tree as-is. If `MERGE_AUTOSTASH` is present, the stash entry will be saved to the stash list."
-msgstr ""
-"N찾o se preocupa com a mesclagem em andamento. Mantenha o 챠ndice e a 찼rvore "
-"de trabalho como est찾o. Caso `MERGE_AUTOSTASH` esteja presente, os "
-"lan챌amentos armazenados ser찾o salvos na lista do estoque (stash list)."
+msgstr "N찾o se preocupa com a mesclagem em andamento. Mantenha o 챠ndice e a 찼rvore de trabalho como est찾o. Caso `MERGE_AUTOSTASH` esteja presente, os lan챌amentos armazenados ser찾o salvos na lista do estoque (stash list)."
#. type: Plain text
#: en/git-merge.txt:120
@@ -38745,14 +33756,7 @@ msgstr "VERIFICA횉횛ES PR횋VIAS DA MESCLAGEM"
#: en/git-merge.txt:144
#, 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. Consulte tamb챕m linkgit"
-":git-stash[1]. 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."
+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. Consulte tamb챕m linkgit:git-stash[1]. 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:150
@@ -39218,11 +34222,7 @@ msgstr ""
#: en/git-mv.txt:25
#, priority:280
msgid "In the first form, it renames <source>, which must exist and be either a file, symlink or directory, to <destination>. In the second form, the last argument has to be an existing directory; the given sources will be moved into this directory."
-msgstr ""
-"No primeiro formul찼rio, ele renomeia `<origem>`, que deve existir e ser um "
-"arquivo, link simb처lico ou diret처rio, para <destino>. Na segunda forma, o "
-"첬ltimo argumento deve ser um diret처rio existente; as fontes informadas ser찾o "
-"movidas para este diret처rio."
+msgstr "No primeiro formul찼rio, ele renomeia `<origem>`, que deve existir e ser um arquivo, link simb처lico ou diret처rio, para <destino>. Na segunda forma, o 첬ltimo argumento deve ser um diret처rio existente; as fontes informadas ser찾o movidas para este diret처rio."
#. type: Plain text
#: en/git-mv.txt:28
@@ -39240,11 +34240,7 @@ msgstr "Impor a renomea챌찾o ou a movimenta챌찾o de um arquivo, mesmo que o dest
#: en/git-mv.txt:39
#, priority:280
msgid "Skip move or rename actions which would lead to an error condition. An error happens when a source is neither existing nor controlled by Git, or when it would overwrite an existing file unless `-f` is given."
-msgstr ""
-"Ignorar um ato de mover ou renomear as a챌천es que levariam a uma condi챌찾o de "
-"erro. Um erro acontece quando uma fonte n찾o existe nem 챕 controlada pelo Git "
-"ou quando ela substituiria um arquivo existente a menos que `-f` seja "
-"utilizado."
+msgstr "Ignorar um ato de mover ou renomear as a챌천es que levariam a uma condi챌찾o de erro. Um erro acontece quando uma fonte n찾o existe nem 챕 controlada pelo Git ou quando ela substituiria um arquivo existente a menos que `-f` seja utilizado."
#. type: Plain text
#: en/git-mv.txt:42
@@ -39262,28 +34258,13 @@ msgstr "Relate os nomes dos arquivos conforme eles v찾o sendo movidos."
#: en/git-mv.txt:54
#, priority:280
msgid "Moving a submodule using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will update the gitfile and core.worktree setting to make the submodule work in the new location. It also will attempt to update the submodule.<name>.path setting in the linkgit:gitmodules[5] file and stage that file (unless -n is used)."
-msgstr ""
-"Mover um subm처dulo utilizando um gitfile (o que significa que eles foram "
-"clonados com uma vers찾o 1.7.8 ou mais recente do Git) atualizar찼 a "
-"configura챌찾o `gitfile` e `core.worktree` para fazer com que o subm처dulo "
-"funcione no novo local. Ele tamb챕m tentar찼 atualizar o `submodule.<name>."
-"path` no arquivo linkgit: gitmodules [5] e preparar este arquivo (a menos "
-"que a op챌찾o `-n` seja utilizada)."
+msgstr "Mover um subm처dulo utilizando um gitfile (o que significa que eles foram clonados com uma vers찾o 1.7.8 ou mais recente do Git) atualizar찼 a configura챌찾o `gitfile` e `core.worktree` para fazer com que o subm처dulo funcione no novo local. Ele tamb챕m tentar찼 atualizar o `submodule.<name>.path` no arquivo linkgit: gitmodules [5] e preparar este arquivo (a menos que a op챌찾o `-n` seja utilizada)."
#. type: Plain text
#: en/git-mv.txt:66
#, priority:280
msgid "Each time a superproject update moves a populated submodule (e.g. when switching between commits before and after the move) a stale submodule checkout will remain in the old location and an empty directory will appear in the new location. To populate the submodule again in the new location the user will have to run \"git submodule update\" afterwards. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. Both steps will be obsolete when recursive submodule update has been implemented."
-msgstr ""
-"Sempre que uma atualiza챌찾o do `superproject` move um subm처dulo preenchido ("
-"por exemplo, ao alternar entre commits antes e depois da mudan챌a), um "
-"`checkout` obsoleto do subm처dulo permanecer찼 no local antigo e um diret처rio "
-"vazio aparecer찼 no novo local. Para preencher o subm처dulo novamente no novo "
-"local, o usu찼rio precisar찼 depois, executar o comando `git submodule update`"
-". A remo챌찾o do diret처rio antigo s처 챕 segura quando ele usa um `gitfile`; "
-"caso contr찼rio, o hist처rico do subm처dulo tamb챕m ser찼 exclu챠do. Ambas as "
-"etapas ficar찾o obsoletas quando a atualiza챌찾o recursiva do subm처dulo for "
-"implementada."
+msgstr "Sempre que uma atualiza챌찾o do `superproject` move um subm처dulo preenchido (por exemplo, ao alternar entre commits antes e depois da mudan챌a), um `checkout` obsoleto do subm처dulo permanecer찼 no local antigo e um diret처rio vazio aparecer찼 no novo local. Para preencher o subm처dulo novamente no novo local, o usu찼rio precisar찼 depois, executar o comando `git submodule update`. A remo챌찾o do diret처rio antigo s처 챕 segura quando ele usa um `gitfile`; caso contr찼rio, o hist처rico do subm처dulo tamb챕m ser찼 exclu챠do. Ambas as etapas ficar찾o obsoletas quando a atualiza챌찾o recursiva do subm처dulo for implementada."
#. type: Title =
#: en/git-name-rev.txt:2
@@ -39345,10 +34326,7 @@ msgstr ""
#: en/git-name-rev.txt:50
#, priority:100
msgid "Transform stdin by substituting all the 40-character SHA-1 hexes (say $hex) with \"$hex ($rev_name)\". When used with --name-only, substitute with \"$rev_name\", omitting $hex altogether. Intended for the scripter's use."
-msgstr ""
-"Transform stdin by substituting all the 40-character SHA-1 hexes (say $hex) "
-"with \"$hex ($rev_name)\". When used with --name-only, substitute with \"$"
-"rev_name\", omitting $hex altogether. Destinado ao uso do scripter."
+msgstr "Transform stdin by substituting all the 40-character SHA-1 hexes (say $hex) with \"$hex ($rev_name)\". When used with --name-only, substitute with \"$rev_name\", omitting $hex altogether. Destinado ao uso do scripter."
#. type: Plain text
#: en/git-name-rev.txt:56
@@ -39764,14 +34742,7 @@ msgstr ""
#: en/git-notes.txt:236
#, 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 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."
+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 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
@@ -40619,11 +35590,7 @@ msgstr ""
#: en/git-p4.txt:322
#, 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 ""
-"Detecte as 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."
+msgstr "Detecte as 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
@@ -41351,9 +36318,7 @@ msgstr "git-p4.detectRenames"
#: en/git-p4.txt:691
#, 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 ""
-"Detecte as renomea챌천es. Consulte linkgit:git-diff[1]. Pode ser \"true\", "
-"\"false\" ou uma pontua챌찾o conforme 챕 o esperado pelo comando 'git diff -M'."
+msgstr "Detecte as 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:692
@@ -41377,8 +36342,7 @@ msgstr "git-p4.detectCopiesHarder"
#: en/git-p4.txt:698
#, priority:100
msgid "Detect copies harder. See linkgit:git-diff[1]. A boolean."
-msgstr ""
-"Detecte c처pias com mais vigor. Consulte linkgit:git-diff[1]. A boolean."
+msgstr "Detecte c처pias com mais vigor. Consulte linkgit:git-diff[1]. A boolean."
#. type: Labeled list
#: en/git-p4.txt:699
@@ -41639,7 +36603,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -41804,11 +36768,7 @@ msgstr "Crie um pacote \"magro\" ao omitir objetos comuns entre o remetente e o
#: en/git-pack-objects.txt:219
#, 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 utilizado pelo Git sem torn찼-"
-"lo independente. Para restaurar as propriedades deste pacote utilize o "
-"comando `git index-pack --fix-thin` (consulte linkgit:git-index-pack[1])."
+msgstr "Observa챌찾o: Um pacote leve viola o formato do arquivo compactado por omitir os objetos necess찼rios e portanto, n찾o pode ser utilizado pelo Git sem torn찼-lo independente. Para restaurar as propriedades deste pacote utilize o comando `git index-pack --fix-thin` (consulte linkgit:git-index-pack[1])."
#. type: Labeled list
#: en/git-pack-objects.txt:220
@@ -41856,9 +36816,7 @@ msgstr "--keep-true-parents"
#: en/git-pack-objects.txt:259
#, priority:100
msgid "With this option, parents that are hidden by grafts are packed nevertheless."
-msgstr ""
-"Com esta op챌찾o, as origens s찾o ocultas pelos enxertos s찾o embalados mesmo "
-"assim."
+msgstr "Com esta op챌찾o, as origens s찾o ocultas pelos enxertos s찾o embalados mesmo assim."
#. type: Plain text
#: en/git-pack-objects.txt:264
@@ -41867,7 +36825,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
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:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -41879,18 +36837,16 @@ msgid "Turns off any previous `--filter=` argument."
msgstr "Desliga qualquer argumento `--filter=` anterior."
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr "--missing=<missing-action>"
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
-msgstr ""
-"Uma op챌찾o de depura챌찾o para ajudar no desenvolvimento futuro do \"clone "
-"parcial\". Esta op챌찾o especifica como os objetos ausentes s찾o manipulados."
+msgstr "Uma op챌찾o de depura챌찾o para ajudar no desenvolvimento futuro do \"clone parcial\". Esta op챌찾o especifica como os objetos ausentes s찾o manipulados."
#. type: Plain text
#: en/git-pack-objects.txt:274
@@ -41899,25 +36855,19 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr "A op챌찾o `--missing=error` solicita que os objetos do pacote parem com um erro caso um objeto perdido seja encontrado. Esta 챕 a a챌찾o predefinida."
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
-msgstr ""
-"O formul찼rio '--missing=allow-any' permitir찼 que a travessia do objeto "
-"continue caso um objeto ausente seja encontrado. Os objetos ausentes ser찾o "
-"omitidos silenciosamente dos resultados."
+msgstr "O formul찼rio '--missing=allow-any' permitir찼 que a travessia do objeto continue caso um objeto ausente seja encontrado. Os objetos ausentes ser찾o omitidos silenciosamente dos resultados."
#. type: Plain text
#: en/git-pack-objects.txt:282
#, priority:100
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing object will raise an error."
-msgstr ""
-"A op챌찾o '--missing=allow-promisor' 챕 como `allow-any`, mas s처 vai permitir "
-"que a travessia de objetos continue para os objetos prometedores PREVISTOS. "
-"Os objetos perdidos e inesperados provocar찾o um erro."
+msgstr "A op챌찾o '--missing=allow-promisor' 챕 como `allow-any`, mas s처 vai permitir que a travessia de objetos continue para os objetos prometedores PREVISTOS. Os objetos perdidos e inesperados provocar찾o um erro."
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -42022,10 +36972,7 @@ msgstr ""
#: en/git-pack-objects.txt:360
#, priority:100
msgid "Islands are configured via the `pack.island` option, which can be specified multiple times. Each value is a left-anchored regular expressions matching refnames. For example:"
-msgstr ""
-"As ilhas s찾o configuradas atrav챕s da op챌찾o `pack.island`, que pode ser "
-"utilizada v찼rias vezes. Cada valor 챕 uma express찾o regular ancorada 횪 "
-"esquerda que coincidam com \"refnames\". Por exemplo:"
+msgstr "As ilhas s찾o configuradas atrav챕s da op챌찾o `pack.island`, que pode ser utilizada v찼rias vezes. Cada valor 챕 uma express찾o regular ancorada 횪 esquerda que coincidam com \"refnames\". Por exemplo:"
#. type: delimited block -
#: en/git-pack-objects.txt:365
@@ -42419,9 +37366,7 @@ msgstr ""
#: en/git-prune.txt:32
#, 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, consulte linkgit:git-repack[1]."
+msgstr "Observe que objetos compactados e inacess챠veis, permanecer찾o. Caso n찾o seja isso, consulte linkgit:git-repack[1]."
#. type: Plain text
#: en/git-prune.txt:40
@@ -42850,10 +37795,8 @@ msgid ""
"\t [--force-with-lease[=<refname>[:<expect>]]]\n"
"\t [--no-verify] [<repository> [<refspec>...]]\n"
msgstr ""
-"'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | "
-"--dry-run] [--receive-pack=<git-receive-pack>]\n"
-"\t [--repo=<reposit처rio>] [-f | --force] [-d | --delete] [--prune] [-v | "
-"--verbose]\n"
+"'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n"
+"\t [--repo=<reposit처rio>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n"
"\t [-u | --set-upstream] [-o <string> | --push-option=<string>]\n"
"\t [--[no-]signed|--signed=(true|false|if-asked)]\n"
"\t [--force-with-lease[=<refname>[:<expect>]]]\n"
@@ -42881,13 +37824,7 @@ msgstr ""
#: 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 ""
-"Quando a linha de comando n찾o especifica o que impulsionar (push) com as "
-"op챌천es `<refspec>...` ou com as op챌천es `--all`, `--mirror`, `--tags`, o "
-"comando encontra a predefini챌찾o `<refspec>` consultando a configura챌찾o "
-"`remote.*.push` e caso ainda n찾o tenha sido encontrado, honra a configura챌찾o "
-"do `push.default` para decidir o que enviar (para saber o significado de "
-"`push.default` consultelinkgit:git-config[1]."
+msgstr "Quando a linha de comando n찾o especifica o que impulsionar (push) com as op챌천es `<refspec>...` ou com as op챌천es `--all`, `--mirror`, `--tags`, o comando encontra a predefini챌찾o `<refspec>` consultando a configura챌찾o `remote.*.push` e caso ainda n찾o tenha sido encontrado, honra a configura챌찾o do `push.default` para decidir o que enviar (para saber o significado de `push.default` consultelinkgit:git-config[1]."
#. type: Plain text
#: en/git-push.txt:46
@@ -42923,10 +37860,7 @@ msgstr ""
#: 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 ""
-"Geralmente `<src>` 챕 o nome do ramo que voc챗 deseja impulsionar, pode ser "
-"qualquer \"express찾o SHA-1\" arbitr찼ria, como `master~4` ou `HEAD` (consulte "
-"linkgit:gitrevisions[7])."
+msgstr "Geralmente `<src>` 챕 o nome do ramo que voc챗 deseja impulsionar, 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
@@ -42956,11 +37890,7 @@ msgstr ""
#: 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 ""
-"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 impulsionar."
+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 impulsionar."
#. type: Plain text
#: en/git-push.txt:101
@@ -43086,17 +38016,7 @@ msgstr "--signed=(true|false|if-asked)"
#: en/git-push.txt:209 en/git-send-pack.txt:83
#, priority:220
msgid "GPG-sign the push request to update refs on the receiving side, to allow it to be checked by the hooks and/or be logged. If `false` or `--no-signed`, no signing will be attempted. If `true` or `--signed`, the push will fail if the server does not support signed pushes. If set to `if-asked`, sign if and only if the server supports signed pushes. The push will also fail if the actual call to `gpg --sign` fails. See linkgit:git-receive-pack[1] for the details on the receiving end."
-msgstr ""
-"O GPG assina a solicita챌찾o impulsionamento para atualizar os `refs` no lado "
-"do recebimento permitindo que ele seja verificado pelos ganchos ou seja "
-"catalogado nos registros. Caso as op챌천es `false` ou `--no-signed` sejam "
-"utilizadas, nenhuma tentativa de assinatura ser찼 feita. Caso as op챌천es "
-"`true` ou `--signed` sejam utilizadas, o impulsionamento ir찼 falhar찼 caso o "
-"servidor n찾o seja compat챠vel com impulsionamentos assinados. Caso seja "
-"definido com `if-asked`, a assinatura s처 ser찼 realizada caso o servidor seja "
-"compat챠vel com impulsionamentos assinados. O impulsionamento falhar찼 caso a "
-"chamada atual para o comando `gpg --sign` falhe. Para obter detalhes sobre "
-"o recebimento na parte final, consulte linkgit:git-receive-pack[1]."
+msgstr "O GPG assina a solicita챌찾o impulsionamento para atualizar os `refs` no lado do recebimento permitindo que ele seja verificado pelos ganchos ou seja catalogado nos registros. Caso as op챌천es `false` ou `--no-signed` sejam utilizadas, nenhuma tentativa de assinatura ser찼 feita. Caso as op챌천es `true` ou `--signed` sejam utilizadas, o impulsionamento ir찼 falhar찼 caso o servidor n찾o seja compat챠vel com impulsionamentos assinados. Caso seja definido com `if-asked`, a assinatura s처 ser찼 realizada caso o servidor seja compat챠vel com impulsionamentos assinados. O impulsionamento falhar찼 caso a chamada atual para o comando `gpg --sign` falhe. Para obter detalhes sobre o recebimento na parte final, consulte linkgit:git-receive-pack[1]."
#. type: Labeled list
#: en/git-push.txt:210
@@ -43120,14 +38040,7 @@ msgstr "--push-option=<op챌찾o>"
#: en/git-push.txt:226
#, priority:220
msgid "Transmit the given string to the server, which passes them to the pre-receive as well as the post-receive hook. The given string must not contain a NUL or LF character. When multiple `--push-option=<option>` are given, they are all sent to the other side in the order listed on the command line. When no `--push-option=<option>` is given from the command line, the values of configuration variable `push.pushOption` are used instead."
-msgstr ""
-"Transmita a sequ챗ncia informada para o servidor, que o repassa ao gancho de "
-"pr챕 recebimento assim como o de pr챕 recebimento. A sequ챗ncia informada n찾o "
-"deve conter um caractere `NUL` ou `LF`. Quando v찼rias op챌천es `--push-"
-"option=<op챌찾o>` s찾o utilizadas, todas elas s찾o enviadas ao outro lado para "
-"que sejam listadas na linha de comando. Quando nenhum comando `--push-"
-"option=<option>` 챕 utilizado, ent찾o os valores da configura챌찾o da vari찼vel "
-"`push.pushOption` passam a ser utilizados."
+msgstr "Transmita a sequ챗ncia informada para o servidor, que o repassa ao gancho de pr챕 recebimento assim como o de pr챕 recebimento. A sequ챗ncia informada n찾o deve conter um caractere `NUL` ou `LF`. Quando v찼rias op챌천es `--push-option=<op챌찾o>` s찾o utilizadas, todas elas s찾o enviadas ao outro lado para que sejam listadas na linha de comando. Quando nenhum comando `--push-option=<option>` 챕 utilizado, ent찾o os valores da configura챌찾o da vari찼vel `push.pushOption` passam a ser utilizados."
#. type: Labeled list
#: en/git-push.txt:227 en/git-send-pack.txt:28
@@ -43335,10 +38248,7 @@ msgstr ""
#: en/git-push.txt:366
#, priority:220
msgid "Suppress all output, including the listing of updated refs, unless an error occurs. Progress is not reported to the standard error stream."
-msgstr ""
-"Suprima tudo o que for gerado, incluindo a listagem das atualiza챌천es dos "
-"\"refs\", a menos que um erro aconte챌a. O progresso n찾o 챕 relatado para o "
-"fluxo de erro predefinido."
+msgstr "Suprima tudo o que for gerado, incluindo a listagem das atualiza챌천es dos \"refs\", a menos que um erro aconte챌a. O progresso n찾o 챕 relatado para o fluxo de erro predefinido."
#. type: Labeled list
#: en/git-push.txt:378
@@ -43374,10 +38284,7 @@ msgstr ""
#: en/git-push.txt:417
#, priority:220
msgid "The status of the push is output in tabular form, with each line representing the status of a single ref. Each line is of the form:"
-msgstr ""
-"Durante um \"push\" a condi챌찾o 챕 que seja gerado em formato de tabela, com "
-"cada linha representando a condi챌찾o de um 첬nico \"ref\". Cada linha 챕 uma "
-"forma de:"
+msgstr "Durante um \"push\" a condi챌찾o 챕 que seja gerado em formato de tabela, com cada linha representando a condi챌찾o de um 첬nico \"ref\". Cada linha 챕 uma forma de:"
#. type: delimited block -
#: en/git-push.txt:420
@@ -43467,13 +38374,7 @@ msgstr ""
#: en/git-push.txt:461
#, 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 ""
-"Quando o lado remoto recusa a atualiza챌찾o. Geralmente cautilizada por um "
-"gancho no lado remoto ou porque o reposit처rio remoto possui uma das "
-"seguintes op챌천es de seguran챌a em vigor: `receive.denyCurrentBranch` (para um "
-"`push` feiro em um ramo verificado), `receive.denyNonFastForwards` (para "
-"atualiza챌천es impostas ou r찼pidas), `receive.denyDeletes` ou `receive."
-"denyDeleteCurrent`. Consulte linkgit:git-config[1]."
+msgstr "Quando o lado remoto recusa a atualiza챌찾o. Geralmente cautilizada por um gancho no lado remoto ou porque o reposit처rio remoto possui uma das seguintes op챌천es de seguran챌a em vigor: `receive.denyCurrentBranch` (para um `push` feiro em um ramo verificado), `receive.denyNonFastForwards` (para atualiza챌천es impostas ou r찼pidas), `receive.denyDeletes` ou `receive.denyDeleteCurrent`. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/git-push.txt:462
@@ -43491,9 +38392,7 @@ msgstr ""
#: en/git-push.txt:472
#, priority:220
msgid "The name of the local ref being pushed, minus its `refs/<type>/` prefix. In the case of deletion, the name of the local ref is omitted."
-msgstr ""
-"O nome do \"ref\" local que est찼 sendo impulsionado, menos o seu prefixo `"
-"refs/<tipo>/`. No caso de exclus찾o, o nome do \"ref\" local 챕 omitido."
+msgstr "O nome do \"ref\" local que est찼 sendo impulsionado, menos o seu prefixo `refs/<tipo>/`. No caso de exclus찾o, o nome do \"ref\" local 챕 omitido."
#. type: Plain text
#: en/git-push.txt:476
@@ -43505,10 +38404,7 @@ msgstr "O nome ref remoto sendo atualizado, menos o seu prefixo `refs/<tipo>/`."
#: en/git-push.txt:481
#, priority:220
msgid "A human-readable explanation. In the case of successfully pushed refs, no explanation is needed. For a failed ref, the reason for failure is described."
-msgstr ""
-"Uma explica챌찾o leg챠vel para pessoas. No caso dos \"refs\" que forem enviados "
-"com sucesso, nenhuma explica챌찾o 챕 necess찼ria. Para um \"ref\" que falhou, o "
-"motivo do fracasso ent찾o 챕 descrito."
+msgstr "Uma explica챌찾o leg챠vel para pessoas. No caso dos \"refs\" que forem enviados com sucesso, nenhuma explica챌찾o 챕 necess찼ria. Para um \"ref\" que falhou, o motivo do fracasso ent찾o 챕 descrito."
#. type: Title -
#: en/git-push.txt:483
@@ -44072,11 +38968,7 @@ msgstr "--[no-]recurse-submodules"
#: en/git-read-tree.txt:123
#, priority:100
msgid "Using --recurse-submodules will update the content of all active submodules according to the commit recorded in the superproject by calling read-tree recursively, also setting the submodules' HEAD to be detached at that commit."
-msgstr ""
-"A utiliza챌찾o do --recurse-submodules atualizar찼 o conte첬do de todos os "
-"subm처dulos ativos de acordo com o commit registrado no superprojeto ao "
-"chamar de forma recursiva o \"read-tree\" e tamb챕m ao definir os subm처dulos "
-"para ser desanexados naquele commit."
+msgstr "A utiliza챌찾o do --recurse-submodules atualizar찼 o conte첬do de todos os subm처dulos ativos de acordo com o commit registrado no superprojeto ao chamar de forma recursiva o \"read-tree\" e tamb챕m ao definir os subm처dulos para ser desanexados naquele commit."
#. type: Labeled list
#: en/git-read-tree.txt:124
@@ -44562,13 +39454,7 @@ msgstr ""
#: en/git-rebase.txt:28
#, 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 utilizadas (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."
+msgstr "Caso o `<upstream>` n찾o seja definido, as op챌천es \"upstream\" configuradas em `branch.<name>.remote` e no `branch.<name>.merge` ser찾o utilizadas (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
@@ -45063,10 +39949,7 @@ msgstr ""
#: en/git-rebase.txt:351
#, 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 ""
-"Utilize estrat챕gias de mesclagem para fazer o `rebase`. Quando a estrat챕gia "
-"de mesclagem recursiva (predefinida) for utilizada, permite que o `rebase` "
-"esteja ciente das renomea챌천es no lado da inicial. Esta 챕 a predefini챌찾o."
+msgstr "Utilize estrat챕gias de mesclagem para fazer o `rebase`. Quando a estrat챕gia de mesclagem recursiva (predefinida) for utilizada, permite que o `rebase` esteja ciente das renomea챌천es no lado da inicial. Esta 챕 a predefini챌찾o."
#. type: Plain text
#: en/git-rebase.txt:357
@@ -45144,20 +40027,13 @@ msgstr "--verify"
#: en/git-rebase.txt:418
#, priority:100
msgid "Allows the pre-rebase hook to run, which is the default. This option can be used to override --no-verify. See also linkgit:githooks[5]."
-msgstr ""
-"횋 predefinido que seja permitido que o gancho \"pre-rebase\" seja "
-"executado. Esta op챌찾o pode ser usada para substituir o comando ` --no-"
-"verify`. Consulte tamb챕m linkgit:githooks[5]."
+msgstr "횋 predefinido que seja permitido que o gancho \"pre-rebase\" seja executado. Esta op챌찾o pode ser usada para substituir o comando ` --no-verify`. Consulte tamb챕m linkgit:githooks[5]."
#. type: Plain text
#: en/git-rebase.txt:424
#, 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 que pelo menos `<n>` linhas ao redor do contexto coincidente antes "
-"e depois de cada altera챌찾o. Quando h찼 menos linhas de contexto ao redor, "
-"todas elas devem coincidir. 횋 predefinido que nenhum contexto seja "
-"ignorado. Implica no uso da op챌찾o --apply."
+msgstr "Assegure que pelo menos `<n>` linhas ao redor do contexto coincidente antes e depois de cada altera챌찾o. Quando h찼 menos linhas de contexto ao redor, todas elas devem coincidir. 횋 predefinido que nenhum contexto seja ignorado. Implica no uso da op챌찾o --apply."
#. type: Labeled list
#: en/git-rebase.txt:427 en/merge-options.txt:43
@@ -45199,12 +40075,7 @@ msgstr ""
#: en/git-rebase.txt:451
#, 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찼 utilizado em vez do "
-"`<upstream>` calcular o conjunto dos 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 o "
-"'fork_point' termine vazio, o `<upstream>` ser찼 utilizado como substituto."
+msgstr "Quando \"--fork-point\" est찼 ativo o 'fork_point' ser찼 utilizado em vez do `<upstream>` calcular o conjunto dos 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 o 'fork_point' termine vazio, o `<upstream>` ser찼 utilizado como substituto."
#. type: Plain text
#: en/git-rebase.txt:454
@@ -45222,9 +40093,7 @@ msgstr ""
#: en/git-rebase.txt:466
#, priority:100
msgid "These flags are passed to the 'git apply' program (see linkgit:git-apply[1]) that applies the patch. Implies --apply."
-msgstr ""
-"Estas op챌천es s찾o repassados para o comando 'git apply' que aplica o patch ("
-"consulte linkgit:git-apply[1]). Implica no uso da op챌찾o --apply."
+msgstr "Estas op챌천es s찾o repassados para o comando '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:473
@@ -45798,10 +40667,8 @@ msgid ""
msgstr ""
"* Mensagens de progresso, informacionais e de erro: Os dois backends\n"
" fornecem um progresso ligeiramente diferente das 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"
+" 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 -
@@ -46337,10 +41204,7 @@ msgstr ""
#: en/git-rebase.txt:1090
#, 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 cume do "
-"'subsistema' fica em `subsystem@{1}`. As capturas subsequentes aumentar찾o "
-"este n첬mero. (Consulte linkgit:git-reflog[1].)"
+msgstr "Com o 'subsistema' reflog: depois de 'git fetch', o antigo cume do 'subsistema' fica em `subsystem@{1}`. As capturas subsequentes aumentar찾o este n첬mero. (Consulte linkgit:git-reflog[1].)"
#. type: Plain text
#: en/git-rebase.txt:1093
@@ -46613,11 +41477,7 @@ msgstr ""
#: en/git-receive-pack.txt:23
#, 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 utilizado para enviar atualiza챌천es para o reposit처rio "
-"remoto. Para as opera챌천es \"pull\", veja 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 utilizado 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
@@ -46677,13 +41537,7 @@ msgstr ""
#: en/git-receive-pack.txt:65
#, 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 impulsionamento assinado (consulte linkgit:git-push[1]), o "
-"certificado deste impulsionamento assinado 챕 armazenado em uma bolha e em "
-"uma vari찼vel `GIT_PUSH_CERT` do ambiente onde o seu nome do objeto pode ser "
-"consultado. Um exemplo pode ser visto consultando a descri챌찾o do gancho "
-"`post-receive`. Al챕m disso, o certificado 챕 verificado utilizando o GPG e "
-"seu resultado 챕 exportado com as seguintes vari찼veis de ambiente:"
+msgstr "Ao aceitar um impulsionamento assinado (consulte linkgit:git-push[1]), o certificado deste impulsionamento assinado 챕 armazenado em uma bolha e em uma vari찼vel `GIT_PUSH_CERT` do ambiente onde o seu nome do objeto pode ser consultado. Um exemplo pode ser visto consultando a descri챌찾o do gancho `post-receive`. Al챕m disso, o certificado 챕 verificado utilizando o GPG e seu resultado 챕 exportado com as seguintes vari찼veis de ambiente:"
#. type: Labeled list
#: en/git-receive-pack.txt:66
@@ -46719,10 +41573,7 @@ msgstr "`GIT_PUSH_CERT_STATUS`"
#: en/git-receive-pack.txt:77
#, 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 GPG do impulsionamento utiliza o "
-"mesmo processo mnem척nico de como 챕 utilizado em `%G?`, formato da fam챠lia de "
-"comandos `git log` (consulte linkgit:git-log[1])."
+msgstr "A condi챌찾o da verifica챌찾o do certificado GPG do impulsionamento utiliza o mesmo processo mnem척nico de como 챕 utilizado em `%G?`, formato da fam챠lia de comandos `git log` (consulte linkgit:git-log[1])."
#. type: Labeled list
#: en/git-receive-pack.txt:78
@@ -47050,15 +41901,7 @@ msgstr ""
#: en/git-reflog.txt:35
#, 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 cume dos "
-"ramos, assim como, quais as outras refer챗ncias que 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]."
+msgstr "Os registros log de refer챗ncia ou \"reflogs\", registram quando o cume dos ramos, assim como, quais as outras refer챗ncias que 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
@@ -47070,24 +41913,13 @@ msgstr "Este comando gerencia as informa챌천es registradas nos \"reflogs\"."
#: en/git-reflog.txt:44
#, 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 valor predefinido na aus챗ncia dos "
-"subcomandos) exibe o registro log da refer챗ncia informada atrav챕s da linha "
-"de comando (ou pela predefini챌찾o, `HEAD`). O \"reflog\" cobre todas as a챌천es "
-"recentes assim como, o reflog `HEAD` registra a altern창ncia do ramo. O "
-"comando `git reflog show` 챕 um apelido para `git log -g --abbrev-commit "
-"--pretty=oneline`; Para mais informa챌천es consulte linkgit:git-log[1]."
+msgstr "O subcomando \"show\" (que tamb챕m 챕 o valor predefinido na aus챗ncia dos subcomandos) exibe o registro log da refer챗ncia informada atrav챕s da linha de comando (ou pela predefini챌찾o, `HEAD`). O \"reflog\" cobre todas as a챌천es recentes assim como, o reflog `HEAD` registra a altern창ncia do ramo. 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 챕 utilizado de forma direta pelos "
-"usu찼rios finais -- em vez disso, consulte 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 챕 utilizado de forma direta pelos usu찼rios finais -- em vez disso, consulte linkgit:git-gc[1]."
#. type: Plain text
#: en/git-reflog.txt:55
@@ -47571,10 +42403,24 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:25
-#, ignore-ellipsis, no-wrap, priority:220
+#, fuzzy, ignore-ellipsis, no-wrap, priority:220
+#| msgid ""
+#| "'git remote' [-v | --verbose]\n"
+#| "'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+#| "'git remote rename' <old> <new>\n"
+#| "'git remote remove' <name>\n"
+#| "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
+#| "'git remote set-branches' [--add] <name> <branch>...\n"
+#| "'git remote get-url' [--push] [--all] <name>\n"
+#| "'git remote set-url' [--push] <name> <newurl> [<oldurl>]\n"
+#| "'git remote set-url --add' [--push] <name> <newurl>\n"
+#| "'git remote set-url --delete' [--push] <name> <url>\n"
+#| "'git remote' [-v | --verbose] 'show' [-n] <name>...\n"
+#| "'git remote prune' [-n | --dry-run] <name>...\n"
+#| "'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -47610,7 +42456,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -47628,7 +42474,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -47736,13 +42582,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -47760,7 +42606,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -47868,7 +42714,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -47879,15 +42725,10 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
-#, 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 ""
-"A captura das atualiza챌천es remoras ou em grupos remotos no reposit처rio como "
-"definido em `remotes.<grupo>`. Caso nenhum grupo local ou remoto seja "
-"especificado na linha de comandos, o par창metro `remotes.default` ser찼 "
-"utilizado; caso `remotes.default` n찾o esteja definido, todos os remotos que "
-"n찾o possuem o par창metro da configura챌찾o `remote.<name>.skipDefaultUpdate` "
-"definido como `true` ser찾o atualizados. (Consulte linkgit:git-config[1])."
+#, 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])."
+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 "A captura das atualiza챌천es remoras ou em grupos remotos no reposit처rio como definido em `remotes.<grupo>`. Caso nenhum grupo local ou remoto seja especificado na linha de comandos, o par창metro `remotes.default` ser찼 utilizado; caso `remotes.default` n찾o esteja definido, todos os remotos que n찾o possuem o par창metro da configura챌찾o `remote.<name>.skipDefaultUpdate` definido como `true` ser찾o atualizados. (Consulte linkgit:git-config[1])."
#. type: Plain text
#: en/git-remote.txt:197
@@ -47899,10 +42740,7 @@ msgstr ""
#: en/git-remote.txt:205
#, 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 utilizando as configura챌천es das vari찼veis "
-"`remote.origin.url` e `remote.origin.fetch`. (Consulte linkgit:git-"
-"config[1])."
+msgstr "A configura챌찾o remota 챕 arquivada utilizando as configura챌천es das vari찼veis `remote.origin.url` e `remote.origin.fetch`. (Consulte linkgit:git-config[1])."
#. type: Plain text
#: en/git-remote.txt:210
@@ -48026,25 +42864,19 @@ msgstr "Encaminha a op챌찾o `--local` para 'git pack-objects'. Consulte linkgit:
#: 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 ""
-"Encaminha a op챌찾o `--no-reuse-delta` para `git-pack-objects`, consulte "
-"linkgit:git-pack-objects[1]."
+msgstr "Encaminha 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 ""
-"Encaminha a op챌찾o `--no-reuse-object` para `git-pack-objects`, consulte "
-"linkgit:git-pack-objects[1]."
+msgstr "Encaminha 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 ""
-"Encaminha a op챌찾o `-q` para 'git pack-objects'. Consulte linkgit:git-pack-"
-"objects[1]."
+msgstr "Encaminha a op챌찾o `-q` para 'git pack-objects'. Consulte linkgit:git-pack-objects[1]."
#. type: Plain text
#: en/git-repack.txt:88
@@ -48296,13 +43128,7 @@ msgstr "--graft <commit> [<origem>...]"
#: en/git-replace.txt:93
#, ignore-ellipsis, priority:100
msgid "Create a graft commit. A new commit is created with the same content as <commit> except that its parents will be [<parent>...] instead of <commit>'s parents. A replacement ref is then created to replace <commit> with the newly created commit. Use `--convert-graft-file` to convert a `$GIT_DIR/info/grafts` file and use replace refs instead."
-msgstr ""
-"Cria um commit com enxerto. Um novo commit 챕 criado com o mesmo conte첬do de "
-"`<commit>` exceto que as suas origens ser찾o [<origem>...] em vez do <commit> "
-"das origens. Um \"ref\" de substitui챌찾o 챕 ent찾o criado para substituir o "
-"`<commit>` pelo commit rec챕m-criado. Utilize `--convert-graft-file` para "
-"converter um arquivo `$GIT_DIR/info/grafts` e utilize os \"refs\" de "
-"substitui챌찾o em seu lugar."
+msgstr "Cria um commit com enxerto. Um novo commit 챕 criado com o mesmo conte첬do de `<commit>` exceto que as suas origens ser찾o [<origem>...] em vez do <commit> das origens. Um \"ref\" de substitui챌찾o 챕 ent찾o criado para substituir o `<commit>` pelo commit rec챕m-criado. Utilize `--convert-graft-file` para converter um arquivo `$GIT_DIR/info/grafts` e utilize os \"refs\" de substitui챌찾o em seu lugar."
#. type: Labeled list
#: en/git-replace.txt:94
@@ -48867,11 +43693,9 @@ msgid ""
"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]\n"
msgstr ""
"'git reset' [-q] [<tree-ish>] [--] <pathspec>...\n"
-"'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-"
-"ish>]\n"
+"'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]\n"
"'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]\n"
-"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] "
-"[<commit>]\n"
+"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]\n"
#. type: Plain text
#: en/git-reset.txt:22
@@ -48889,18 +43713,13 @@ msgstr "'git reset' [-q] [<tree-ish>] [--] <pathspec>..."
#: en/git-reset.txt:24
#, no-wrap, priority:280
msgid "'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]"
-msgstr ""
-"'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-"
-"ish>]"
+msgstr "'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]"
#. type: Plain text
#: en/git-reset.txt:28
#, priority:280
msgid "These forms reset the index entries for all paths that match the `<pathspec>` to their state at `<tree-ish>`. (It does not affect the working tree or the current branch.)"
-msgstr ""
-"Esses formul찼rios redefinem as entradas do 챠ndice para todos os caminhos "
-"correspondentes ao `<pathspec>` 횪 sua condi챌찾o em `<tree-ish>`. (Isso n찾o "
-"afeta a 찼rvore de trabalho ou a ramifica챌찾o atual.)"
+msgstr "Esses formul찼rios redefinem as entradas do 챠ndice para todos os caminhos correspondentes ao `<pathspec>` 횪 sua condi챌찾o em `<tree-ish>`. (Isso n찾o afeta a 찼rvore de trabalho ou a ramifica챌찾o atual.)"
#. type: Plain text
#: en/git-reset.txt:32
@@ -48912,13 +43731,7 @@ msgstr "Isto significa que `git reset <pathspec>` 챕 o oposto de `git add <paths
#: en/git-reset.txt:39
#, priority:280
msgid "After running `git reset <pathspec>` to update the index entry, you can use linkgit:git-restore[1] to check the contents out of the index to the working tree. Alternatively, using linkgit:git-restore[1] and specifying a commit with `--source`, you can copy the contents of a path out of a commit to the index and to the working tree in one go."
-msgstr ""
-"Depois de executar o `git reset <pathspec>` para atualizar a entrada do "
-"챠ndice, voc챗 pode usar o linkgit:git-restore[1] para verificar o conte첬do do "
-"챠ndice para a 찼rvore de trabalho. Como alternativa, utilizando linkgit:git-"
-"restore[1] e especificando um commit com `--source`, voc챗 pode copiar o "
-"conte첬do de um caminho de um commit para o 챠ndice e a 찼rvore de trabalho de "
-"uma vez s처."
+msgstr "Depois de executar o `git reset <pathspec>` para atualizar a entrada do 챠ndice, voc챗 pode usar o linkgit:git-restore[1] para verificar o conte첬do do 챠ndice para a 찼rvore de trabalho. Como alternativa, utilizando linkgit:git-restore[1] e especificando um commit com `--source`, voc챗 pode copiar o conte첬do de um caminho de um commit para o 챠ndice e a 찼rvore de trabalho de uma vez s처."
#. type: Labeled list
#: en/git-reset.txt:40
@@ -48996,13 +43809,7 @@ msgstr "Redefine o 챠ndice e a 찼rvore de trabalho. Quaisquer altera챌천es nos a
#: en/git-reset.txt:81
#, priority:280
msgid "Resets the index and updates the files in the working tree that are different between `<commit>` and `HEAD`, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added). If a file that is different between `<commit>` and the index has unstaged changes, reset is aborted."
-msgstr ""
-"Redefine o 챠ndice e atualiza os arquivos na 찼rvore de trabalho que sejam "
-"diferentes entre o `<commit>` e o `HEAD`, mas mant챕m aqueles que s찾o "
-"diferentes entre o 챠ndice e a 찼rvore de trabalho (ou seja, que t챗m "
-"altera챌천es que n찾o foram adicionadas). Caso haja um arquivo diferente entre "
-"`<commit>` e o 챠ndice tiver altera챌천es sem etapas, a redefini챌찾o ser찼 "
-"abortada."
+msgstr "Redefine o 챠ndice e atualiza os arquivos na 찼rvore de trabalho que sejam diferentes entre o `<commit>` e o `HEAD`, mas mant챕m aqueles que s찾o diferentes entre o 챠ndice e a 찼rvore de trabalho (ou seja, que t챗m altera챌천es que n찾o foram adicionadas). Caso haja um arquivo diferente entre `<commit>` e o 챠ndice tiver altera챌천es sem etapas, a redefini챌찾o ser찼 abortada."
#. type: Plain text
#: en/git-reset.txt:84
@@ -49020,19 +43827,13 @@ msgstr "Redefine as entradas do 챠ndice e atualiza os arquivos na 찼rvore de tra
#: en/git-reset.txt:96
#, priority:280
msgid "When the working tree is updated, using --recurse-submodules will also recursively reset the working tree of all active submodules according to the commit recorded in the superproject, also setting the submodules' HEAD to be detached at that commit."
-msgstr ""
-"Quando a 찼rvore de trabalho 챕 atualizada, utilizando a op챌찾o `--recurse-"
-"submodules` tamb챕m redefinir찼 recursivamente a 찼rvore de trabalho de todos "
-"os subm처dulos ativos de acordo com o commit registrado no superprojeto, "
-"tamb챕m configurando o `HEAD` do subm처dulo a ser desanexado neste commit."
+msgstr "Quando a 찼rvore de trabalho 챕 atualizada, utilizando a op챌찾o `--recurse-submodules` tamb챕m redefinir찼 recursivamente a 찼rvore de trabalho de todos os subm처dulos ativos de acordo com o commit registrado no superprojeto, tamb챕m configurando o `HEAD` do subm처dulo a ser desanexado neste commit."
#. type: Plain text
#: en/git-reset.txt:100 en/git-restore.txt:30 en/git-revert.txt:33
#, priority:280
msgid "See \"Reset, restore and revert\" in linkgit:git[1] for the differences between the three commands."
-msgstr ""
-"Para as diferen챌as entre os tr챗s comandos consulte \"Redefinir, restaurar e "
-"reverter\" em linkgit:git[1]."
+msgstr "Para as diferen챌as entre os tr챗s comandos consulte \"Redefinir, restaurar e reverter\" em linkgit:git[1]."
#. type: Labeled list
#: en/git-reset.txt:107
@@ -49044,10 +43845,7 @@ msgstr "--no-quiet"
#: en/git-reset.txt:111
#, priority:280
msgid "Be quiet, only report errors. The default behavior is set by the `reset.quiet` config option. `--quiet` and `--no-quiet` will override the default behavior."
-msgstr ""
-"Relate apenas os erros. A predefini챌찾o deste comportamento 챕 definido pela "
-"op챌찾o da configura챌찾o `reset.quiet`. As op챌천es`--quiet` e `--no-quiet` "
-"substituir찾o este comportamento predefinido."
+msgstr "Relate apenas os erros. A predefini챌찾o deste comportamento 챕 definido pela op챌찾o da configura챌찾o `reset.quiet`. As op챌천es`--quiet` e `--no-quiet` substituir찾o este comportamento predefinido."
#. type: Labeled list
#: en/git-reset.txt:136
@@ -49087,12 +43885,7 @@ msgstr "Algu챕m pede para voc챗 fazer um `pull`, e as mudan챌as parecem dignas d
#: en/git-reset.txt:156
#, priority:280
msgid "However, you already dirtied the index (i.e. your index does not match the `HEAD` commit). But you know the pull you are going to make does not affect `frotz.c` or `filfre.c`, so you revert the index changes for these two files. Your changes in working tree remain there."
-msgstr ""
-"No entanto, voc챗 j찼 sujou o 챠ndice (ou seja, o seu 챠ndice n찾o corresponde ao "
-"commit `HEAD`). Mas voc챗 sabe que o `pull` que voc챗 far찼 n찾o afeta o "
-"arquivo `frotz.c` ou o arquivo `filfre.c`, portanto, voc챗 reverte as "
-"altera챌천es no 챠ndice destes dois arquivos. As suas altera챌천es na 찼rvore de "
-"trabalho permanecem l찼."
+msgstr "No entanto, voc챗 j찼 sujou o 챠ndice (ou seja, o seu 챠ndice n찾o corresponde ao commit `HEAD`). Mas voc챗 sabe que o `pull` que voc챗 far찼 n찾o afeta o arquivo `frotz.c` ou o arquivo `filfre.c`, portanto, voc챗 reverte as altera챌천es no 챠ndice destes dois arquivos. As suas altera챌천es na 찼rvore de trabalho permanecem l찼."
#. type: Plain text
#: en/git-reset.txt:158
@@ -49200,12 +43993,7 @@ msgstr ""
#: en/git-reset.txt:205
#, priority:280
msgid "The last three commits (`HEAD`, `HEAD^`, and `HEAD~2`) were bad and you do not want to ever see them again. Do *not* do this if you have already given these commits to somebody else. (See the \"RECOVERING FROM UPSTREAM REBASE\" section in linkgit:git-rebase[1] for the implications of doing so.)"
-msgstr ""
-"Os 첬ltimos tr챗s commits (`HEAD`, `HEAD^` e`HEAD~2`) foram ruins e voc챗 n찾o "
-"deseja mais v챗-los novamente. *N찾o* fa챌a isso caso j찼 tenha repassado estes "
-"commits para outra pessoa. (Para saber mais sobre as implica챌천es desta "
-"a챌찾o, consulte a se챌찾o \"RECUPERANDO DO UPSTREAM REBASE\" no linkgit:git-"
-"rebase[1].)"
+msgstr "Os 첬ltimos tr챗s commits (`HEAD`, `HEAD^` e`HEAD~2`) foram ruins e voc챗 n찾o deseja mais v챗-los novamente. *N찾o* fa챌a isso caso j찼 tenha repassado estes commits para outra pessoa. (Para saber mais sobre as implica챌천es desta a챌찾o, consulte a se챌찾o \"RECUPERANDO DO UPSTREAM REBASE\" no linkgit:git-rebase[1].)"
#. type: Labeled list
#: en/git-reset.txt:206
@@ -49241,10 +44029,7 @@ msgstr ""
#: en/git-reset.txt:223
#, priority:280
msgid "Try to update from the upstream resulted in a lot of conflicts; you were not ready to spend a lot of time merging right now, so you decide to do that later."
-msgstr ""
-"Tente atualizar a partir da inicial respons찼vel pelos diversos conflitos; "
-"voc챗 n찾o estava pronto para perder muito tempo mesclando agora, ent찾o decide "
-"fazer isso mais tarde."
+msgstr "Tente atualizar a partir da inicial respons찼vel pelos diversos conflitos; voc챗 n찾o estava pronto para perder muito tempo mesclando agora, ent찾o decide fazer isso mais tarde."
#. type: Plain text
#: en/git-reset.txt:226
@@ -49262,12 +44047,7 @@ msgstr "Mescle uma ramifica챌찾o de t처pico na ramifica챌찾o atual, o que result
#: en/git-reset.txt:233
#, priority:280
msgid "But you decided that the topic branch is not ready for public consumption yet. \"pull\" or \"merge\" always leaves the original tip of the current branch in `ORIG_HEAD`, so resetting hard to it brings your index file and the working tree back to that state, and resets the tip of the branch to that commit."
-msgstr ""
-"Mas voc챗 decidiu que o ramo de t처picos ainda n찾o est찼 pronto para consumo "
-"p첬blico. O \"pull\" ou \"merge\" sempre deixa o cume original do ramo atual "
-"em `ORIG_HEAD`, portanto, a redefini챌찾o for챌ada traz o seu arquivo do 챠ndice "
-"e a 찼rvore de trabalho de volta para esta condi챌찾o e redefine o cume do ramo "
-"para este commit."
+msgstr "Mas voc챗 decidiu que o ramo de t처picos ainda n찾o est찼 pronto para consumo p첬blico. O \"pull\" ou \"merge\" sempre deixa o cume original do ramo atual em `ORIG_HEAD`, portanto, a redefini챌찾o for챌ada traz o seu arquivo do 챠ndice e a 찼rvore de trabalho de volta para esta condi챌찾o e redefine o cume do ramo para este commit."
#. type: Labeled list
#: en/git-reset.txt:234
@@ -49303,12 +44083,7 @@ msgstr "Mesmo que voc챗 tenha modifica챌천es locais em sua 찼rvore de trabalho,
#: en/git-reset.txt:254
#, priority:280
msgid "After inspecting the result of the merge, you may find that the change in the other branch is unsatisfactory. Running `git reset --hard ORIG_HEAD` will let you go back to where you were, but it will discard your local changes, which you do not want. `git reset --merge` keeps your local changes."
-msgstr ""
-"Ap처s inspecionar o resultado da mesclagem, voc챗 pode achar que a altera챌찾o "
-"na outra ramifica챌찾o n찾o 챕 satisfat처ria. Se executar o `git reset --hard "
-"ORIG_HEAD` permitir찼 que voc챗 volte para onde estava, mas descartar찼 as "
-"altera챌천es locais que voc챗 n찾o quer. O `git reset --merge` mant챕m suas "
-"altera챌천es locais."
+msgstr "Ap처s inspecionar o resultado da mesclagem, voc챗 pode achar que a altera챌찾o na outra ramifica챌찾o n찾o 챕 satisfat처ria. Se executar o `git reset --hard ORIG_HEAD` permitir찼 que voc챗 volte para onde estava, mas descartar찼 as altera챌천es locais que voc챗 n찾o quer. O `git reset --merge` mant챕m suas altera챌천es locais."
#. type: Labeled list
#: en/git-reset.txt:256 en/git-stash.txt:286
@@ -49320,11 +44095,7 @@ msgstr "Fluxo de trabalho interrompido"
#: en/git-reset.txt:262
#, priority:280
msgid "Suppose you are interrupted by an urgent fix request while you are in the middle of a large change. The files in your working tree are not in any shape to be committed yet, but you need to get to the other branch for a quick bugfix."
-msgstr ""
-"Suponha que voc챗 seja interrompido por uma solicita챌찾o de corre챌찾o urgente "
-"enquanto estiver no meio de uma grande altera챌찾o. Os arquivos em sua 찼rvore "
-"de trabalho ainda n찾o est찾o em condi챌천es para um commit, mas voc챗 precisa "
-"acessar uma outra ramifica챌찾o para obter uma corre챌찾o r찼pida."
+msgstr "Suponha que voc챗 seja interrompido por uma solicita챌찾o de corre챌찾o urgente enquanto estiver no meio de uma grande altera챌찾o. Os arquivos em sua 찼rvore de trabalho ainda n찾o est찾o em condi챌천es para um commit, mas voc챗 precisa acessar uma outra ramifica챌찾o para obter uma corre챌찾o r찼pida."
#. type: delimited block -
#: en/git-reset.txt:273
@@ -49366,10 +44137,7 @@ msgstr "Isso remove o commit 'WIP' do hist처rico e define a sua 찼rvore de traba
#: en/git-reset.txt:281
#, priority:280
msgid "At this point the index file still has all the WIP changes you committed as 'snapshot WIP'. This updates the index to show your WIP files as uncommitted."
-msgstr ""
-"Neste ponto o arquivo do 챠ndice ainda possui todas as altera챌천es do `WIP` "
-"que voc챗 fez o commit como 'instant창neo WIP'. Isso faz a atualiza챌찾o do "
-"챠ndice para demonstrar que os seus arquivos WIP est찾o inalterados."
+msgstr "Neste ponto o arquivo do 챠ndice ainda possui todas as altera챌천es do `WIP` que voc챗 fez o commit como 'instant창neo WIP'. Isso faz a atualiza챌찾o do 챠ndice para demonstrar que os seus arquivos WIP est찾o inalterados."
#. type: Plain text
#: en/git-reset.txt:283
@@ -49479,15 +44247,7 @@ msgstr "Divida um commit em uma sequ챗ncia de commits"
#: en/git-reset.txt:335
#, priority:280
msgid "Suppose that you have created lots of logically separate changes and committed them together. Then, later you decide that it might be better to have each logical chunk associated with its own commit. You can use git reset to rewind history without changing the contents of your local files, and then successively use `git add -p` to interactively select which hunks to include into each commit, using `git commit -c` to pre-populate the commit message."
-msgstr ""
-"Suponha que voc챗 tenha criado muitas altera챌천es logicamente separadas e "
-"tenha feito o commit deles juntos. Depois, voc챗 decide que seria melhor ter "
-"cada peda챌o l처gico associado ao seu pr처prio commit. 횋 poss챠vel utilizar o `"
-"git reset` para retroceder o hist처rico sem alterar o conte첬do dos seus "
-"arquivos locais e sucessivamente utilizar o comando `git add -p` para "
-"selecionar interativamente quais os blocos que deseja incluir em cada commit "
-"utilizando o comando `git commit -c` para preencher previamente a mensagem "
-"do commit."
+msgstr "Suponha que voc챗 tenha criado muitas altera챌천es logicamente separadas e tenha feito o commit deles juntos. Depois, voc챗 decide que seria melhor ter cada peda챌o l처gico associado ao seu pr처prio commit. 횋 poss챠vel utilizar o `git reset` para retroceder o hist처rico sem alterar o conte첬do dos seus arquivos locais e sucessivamente utilizar o comando `git add -p` para selecionar interativamente quais os blocos que deseja incluir em cada commit utilizando o comando `git commit -c` para preencher previamente a mensagem do commit."
#. type: delimited block -
#: en/git-reset.txt:345
@@ -49521,43 +44281,25 @@ msgstr "Primeiro, faz o reset do hist처rico um commit para tr찼s para que possam
#: en/git-reset.txt:355
#, priority:280
msgid "Next, we interactively select diff hunks to add using the `git add -p` facility. This will ask you about each diff hunk in sequence and you can use simple commands such as \"yes, include this\", \"No don't include this\" or even the very powerful \"edit\" facility."
-msgstr ""
-"Em seguida, selecionamos interativamente os blocos das diferen챌as para serem "
-"adicionas utilizando o recurso `git add -p`. Isso lhe perguntar찼 sobre cada "
-"peda챌o diff em sequ챗ncia, assim voc챗 poder찼 usar de comandos simples como "
-"\"yes, include this\" (sim, inclua isso), \"no don't include this\" (n찾o, "
-"n찾o inclua isso) ou mesmo o poderoso recurso \"edit\" (editar)."
+msgstr "Em seguida, selecionamos interativamente os blocos das diferen챌as para serem adicionas utilizando o recurso `git add -p`. Isso lhe perguntar찼 sobre cada peda챌o diff em sequ챗ncia, assim voc챗 poder찼 usar de comandos simples como \"yes, include this\" (sim, inclua isso), \"no don't include this\" (n찾o, n찾o inclua isso) ou mesmo o poderoso recurso \"edit\" (editar)."
#. type: Plain text
#: en/git-reset.txt:359
#, priority:280
msgid "Once satisfied with the hunks you want to include, you should verify what has been prepared for the first commit by using `git diff --cached`. This shows all the changes that have been moved into the index and are about to be committed."
-msgstr ""
-"Uma vez satisfeito com os blocos que deseja incluir, voc챗 deve verificar o "
-"que foi preparado para o primeiro commit utilizando a op챌찾o `git diff "
-"--cached`. Isso exibe todas as altera챌천es que foram movidas para o 챠ndice e "
-"que est찾o prontas para o commit."
+msgstr "Uma vez satisfeito com os blocos que deseja incluir, voc챗 deve verificar o que foi preparado para o primeiro commit utilizando a op챌찾o `git diff --cached`. Isso exibe todas as altera챌천es que foram movidas para o 챠ndice e que est찾o prontas para o commit."
#. type: Plain text
#: en/git-reset.txt:366
#, 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` "
-"especifica para ser feito o preenchimento pr챕vio da mensagem original do "
-"commit iniciado com o primeiro commit. 횋 첬til para evitar ter que digit찼-la "
-"novamente. O `HEAD@{1}` 챕 uma nota챌찾o especial para o commit onde o `HEAD` "
-"estava antes da redefini챌찾o (reset) do commit original (1 altera챌찾o atr찼s). "
-"Para mais detalhes consulte linkgit:git-reflog[1]. Voc챗 tamb챕m pode utilizar "
-"qualquer outro commit v찼lido como refer챗ncia."
+msgstr "Em seguida, fa챌a o commit das altera챌천es armazenadas no 챠ndice. A op챌찾o `-c` especifica para ser feito o preenchimento pr챕vio da mensagem original do commit iniciado com o primeiro commit. 횋 첬til para evitar ter que digit찼-la novamente. O `HEAD@{1}` 챕 uma nota챌찾o especial para o commit onde o `HEAD` estava antes da redefini챌찾o (reset) do commit original (1 altera챌찾o atr찼s). Para mais detalhes consulte linkgit:git-reflog[1]. Voc챗 tamb챕m pode utilizar qualquer outro commit v찼lido como refer챗ncia."
#. type: Plain text
#: en/git-reset.txt:368
#, priority:280
msgid "You can repeat steps 2-4 multiple times to break the original code into any number of commits."
-msgstr ""
-"Voc챗 pode repetir os passos 2-4 diversas vezes para quebrar o c처digo "
-"original em diversos commits."
+msgstr "Voc챗 pode repetir os passos 2-4 diversas vezes para quebrar o c처digo original em diversos commits."
#. type: Plain text
#: en/git-reset.txt:371
@@ -49599,15 +44341,7 @@ msgstr "para redefinir o `HEAD` para outro commit (` target`) com as diferentes
#: en/git-reset.txt:397
#, priority:280
msgid "In these tables, `A`, `B`, `C` and `D` are some different states of a file. For example, the first line of the first table means that if a file is in state `A` in the working tree, in state `B` in the index, in state `C` in `HEAD` and in state `D` in the target, then `git reset --soft target` will leave the file in the working tree in state `A` and in the index in state `B`. It resets (i.e. moves) the `HEAD` (i.e. the tip of the current branch, if you are on one) to `target` (which has the file in state `D`)."
-msgstr ""
-"Nas tabelas, `A`, `B`, `C` e `D` s찾o algumas diferen챌as entre as condi챌천es "
-"de um arquivo. Por exemplo, a primeira linha da primeira tabela significa "
-"que caso um arquivo esteja no estado `A` na 찼rvore de trabalho, no estado` B`"
-" no 챠ndice, no estado `C` em `HEAD` e no estado `D` no alvo, o `git reset --"
-"soft target` deixar찼 o arquivo na 찼rvore de trabalho no estado `A` e o "
-"챠ndice no estado `B`. Ele redefine (ou seja, move) o `HEAD` (ou seja, o "
-"cume do ramo atual, caso tenha um) para `target` (que tem o arquivo no "
-"estado `D`)."
+msgstr "Nas tabelas, `A`, `B`, `C` e `D` s찾o algumas diferen챌as entre as condi챌천es de um arquivo. Por exemplo, a primeira linha da primeira tabela significa que caso um arquivo esteja no estado `A` na 찼rvore de trabalho, no estado` B` no 챠ndice, no estado `C` em `HEAD` e no estado `D` no alvo, o `git reset --soft target` deixar찼 o arquivo na 찼rvore de trabalho no estado `A` e o 챠ndice no estado `B`. Ele redefine (ou seja, move) o `HEAD` (ou seja, o cume do ramo atual, caso tenha um) para `target` (que tem o arquivo no estado `D`)."
#. type: delimited block .
#: en/git-reset.txt:406
@@ -49733,37 +44467,19 @@ msgstr ""
#: en/git-reset.txt:466
#, priority:280
msgid "`reset --merge` is meant to be used when resetting out of a conflicted merge. Any mergy operation guarantees that the working tree file that is involved in the merge does not have a local change with respect to the index before it starts, and that it writes the result out to the working tree. So if we see some difference between the index and the target and also between the index and the working tree, then it means that we are not resetting out from a state that a mergy operation left after failing with a conflict. That is why we disallow `--merge` option in this case."
-msgstr ""
-"A op챌찾o `reset --merge` deve ser utilizada durante a redefini챌찾o de uma "
-"mesclagem em conflito. Qualquer opera챌찾o de mesclagem garante que o arquivo "
-"da 찼rvore de trabalho envolvido na mesclagem n찾o tenha uma altera챌찾o local "
-"em rela챌찾o ao 챠ndice antes do inicio e que grave o resultado na 찼rvore de "
-"trabalho. Portanto, se observarmos alguma diferen챌a entre o 챠ndice e o "
-"destino, assim como entre o 챠ndice e a 찼rvore de trabalho, significa que n찾o "
-"estamos redefinindo a partir de um estado que uma opera챌찾o de mesclagem "
-"deixou ap처s falhar com um conflito. 횋 por isso que n찾o permitimos a op챌찾o "
-"`--merge` nesse caso."
+msgstr "A op챌찾o `reset --merge` deve ser utilizada durante a redefini챌찾o de uma mesclagem em conflito. Qualquer opera챌찾o de mesclagem garante que o arquivo da 찼rvore de trabalho envolvido na mesclagem n찾o tenha uma altera챌찾o local em rela챌찾o ao 챠ndice antes do inicio e que grave o resultado na 찼rvore de trabalho. Portanto, se observarmos alguma diferen챌a entre o 챠ndice e o destino, assim como entre o 챠ndice e a 찼rvore de trabalho, significa que n찾o estamos redefinindo a partir de um estado que uma opera챌찾o de mesclagem deixou ap처s falhar com um conflito. 횋 por isso que n찾o permitimos a op챌찾o `--merge` nesse caso."
#. type: Plain text
#: en/git-reset.txt:475
#, priority:280
msgid "`reset --keep` is meant to be used when removing some of the last commits in the current branch while keeping changes in the working tree. If there could be conflicts between the changes in the commit we want to remove and the changes in the working tree we want to keep, the reset is disallowed. That's why it is disallowed if there are both changes between the working tree and `HEAD`, and between `HEAD` and the target. To be safe, it is also disallowed when there are unmerged entries."
-msgstr ""
-"O comando `reset --keep` deve ser utilizado para remover alguns dos 첬ltimos "
-"commits no ramo atual mantendo as altera챌천es na 찼rvore de trabalho. Caso "
-"haja conflitos entre as altera챌천es no commit que queremos remover e as "
-"mudan챌as na 찼rvore de trabalho que desejamos manter, a redefini챌찾o ser찼 "
-"desativada. 횋 por isso que n찾o 챕 permitido caso haja duas mudan챌as entre a "
-"찼rvore de trabalho, o `HEAD` e entre o` HEAD` e o destino. Por seguran챌a, "
-"tamb챕m n찾o 챕 permitido quando h찼 entradas n찾o imersas."
+msgstr "O comando `reset --keep` deve ser utilizado para remover alguns dos 첬ltimos commits no ramo atual mantendo as altera챌천es na 찼rvore de trabalho. Caso haja conflitos entre as altera챌천es no commit que queremos remover e as mudan챌as na 찼rvore de trabalho que desejamos manter, a redefini챌찾o ser찼 desativada. 횋 por isso que n찾o 챕 permitido caso haja duas mudan챌as entre a 찼rvore de trabalho, o `HEAD` e entre o` HEAD` e o destino. Por seguran챌a, tamb챕m n찾o 챕 permitido quando h찼 entradas n찾o imersas."
#. type: Plain text
#: en/git-reset.txt:478
#, priority:280
msgid "The following tables show what happens when there are unmerged entries:"
-msgstr ""
-"As tabelas a seguir demonstram o que acontece quando h찼 entradas que n찾o "
-"foram mescladas:"
+msgstr "As tabelas a seguir demonstram o que acontece quando h찼 entradas que n찾o foram mescladas:"
#. type: delimited block .
#: en/git-reset.txt:487
@@ -49887,10 +44603,7 @@ msgstr ""
#: en/git-restore.txt:50
#, priority:100
msgid "Interactively select hunks in the difference between the restore source and the restore location. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode."
-msgstr ""
-"Selecione a diferen챌a entre os blocos interativamente entre a origem da "
-"restaura챌찾o e o local da restaura챌찾o. Consulte a se챌찾o ``Modo Interativo'' "
-"do linkgit:git-add[1] para aprender como operar o modo `--patch`."
+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:53
@@ -49914,11 +44627,7 @@ msgstr "--staged"
#: en/git-restore.txt:61
#, priority:100
msgid "Specify the restore location. If neither option is specified, by default the working tree is restored. Specifying `--staged` will only restore the index. Specifying both restores both."
-msgstr ""
-"Especifica o local da restaura챌찾o. 횋 predefinido que caso nenhuma op챌찾o seja "
-"utilizada a 찼rvore de trabalho ser찼 restaurada. Ao usar a op챌찾o `--staged` "
-"apenas a 챠ndice ser찼 restaurado. A utiliza챌찾o de ambas as op챌천es faz a "
-"restaura챌찾o de ambos."
+msgstr "Especifica o local da restaura챌찾o. 횋 predefinido que caso nenhuma op챌찾o seja utilizada a 찼rvore de trabalho ser찼 restaurada. Ao usar a op챌찾o `--staged` apenas a 챠ndice ser찼 restaurado. A utiliza챌찾o de ambas as op챌천es faz a restaura챌찾o de ambos."
#. type: Plain text
#: en/git-restore.txt:65
@@ -49930,18 +44639,13 @@ msgstr "Silencioso, suprima as mensagens de feedback. Implies `--no-progress`."
#: en/git-restore.txt:77
#, 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 restaurar os arquivos no 챠ndice da 찼rvore de trabalho, utilize o est찼gio #"
-"2 ('nosso') ou #3 ('deles') para os caminhos que n찾o foram mesclados."
+msgstr "Ao restaurar os arquivos no 챠ndice da 찼rvore de trabalho, utilize o est찼gio #2 ('nosso') ou #3 ('deles') para os caminhos que n찾o foram mesclados."
#. type: Plain text
#: en/git-restore.txt:81
#, priority:100
msgid "Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' may appear swapped. See the explanation of the same options in linkgit:git-checkout[1] for details."
-msgstr ""
-"Note que durante o `git rebase` e` git pull --rebase`, o 'nosso' e o 'deles' "
-"podem aparecer trocados. Para mais detalhes, consulte a explica챌찾o das "
-"mesmas op챌천es em linkgit:git-checkout[1]."
+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:86
@@ -49959,12 +44663,7 @@ msgstr "--ignore-unmerged"
#: en/git-restore.txt:99
#, priority:100
msgid "When restoring files on the working tree from the index, do not abort the operation if there are unmerged entries and neither `--ours`, `--theirs`, `--merge` or `--conflict` is specified. Unmerged paths on the working tree are left alone."
-msgstr ""
-"N찾o aborte a opera챌찾o ao restaurar os arquivos no 챠ndice da 찼rvore de "
-"trabalho caso existam entradas que n찾o foram mescladas e t찾o pouco as op챌천es "
-"`--ours`, `--theirs`, `--merge` ou `--conflict` tenham sido utilizadas. Nada "
-"acontece com os caminhos das 찼rvores de trabalho caso eles n찾o tenham sido "
-"mesclados."
+msgstr "N찾o aborte a opera챌찾o ao restaurar os arquivos no 챠ndice da 찼rvore de trabalho caso existam entradas que n찾o foram mescladas e t찾o pouco as op챌천es `--ours`, `--theirs`, `--merge` ou `--conflict` tenham sido utilizadas. Nada acontece com os caminhos das 찼rvores de trabalho caso eles n찾o tenham sido mesclados."
#. type: Plain text
#: en/git-restore.txt:106
@@ -49976,14 +44675,7 @@ msgstr "횋 predefinido que no modo de checkout esparso apenas as entradas que se
#: en/git-restore.txt:117
#, priority:100
msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
-msgstr ""
-"Caso o`<pathspec>` d챗 nome para um subm처dulo ativo e o ponto de restaura챌찾o "
-"inclua a 찼rvore de trabalho, o subm처dulo apenas ser찼 atualizado caso essa "
-"informa챌찾o seja utilizada, no caso, a sua 찼rvore de trabalho ser찼 restaurado "
-"ao commit registrado no superprojeto e quaisquer altera챌천es locais ser찼 "
-"substituida. Caso nenhum (ou `--no-recurse-submodules`) seja utilizado, os "
-"subm처dulos nas 찼rvores de trabalho n찾o ser찾o atualizados. Assim como linkgit"
-":git-checkout[1], isso ir찼 desanexar o `HEAD` do subm처dulo."
+msgstr "Caso o`<pathspec>` d챗 nome para um subm처dulo ativo e o ponto de restaura챌찾o inclua a 찼rvore de trabalho, o subm처dulo apenas ser찼 atualizado caso essa informa챌찾o seja utilizada, no caso, a sua 찼rvore de trabalho ser찼 restaurado ao commit registrado no superprojeto e quaisquer altera챌천es locais ser찼 substituida. Caso nenhum (ou `--no-recurse-submodules`) seja utilizado, os subm처dulos nas 찼rvores de trabalho n찾o ser찾o atualizados. Assim como linkgit:git-checkout[1], isso ir찼 desanexar o `HEAD` do subm처dulo."
#. type: Plain text
#: en/git-restore.txt:124
@@ -49995,9 +44687,7 @@ msgstr "No modo de sobreposi챌찾o, o comando nunca remove os arquivos durante a
#: en/git-restore.txt:152
#, priority:100
msgid "The following sequence switches to the `master` branch, reverts the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index."
-msgstr ""
-"A sequ챗ncia a seguir muda para o ramo `master`, reverte o` Makefile` para "
-"duas revis천es anteriores, apaga o hello.c por engano e o recupera do 챠ndice."
+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:158
@@ -50023,9 +44713,7 @@ msgstr "restaurar o hello.c do 챠ndice"
#: en/git-restore.txt:165
#, priority:100
msgid "If you want to restore _all_ C source files to match the version in the index, you can say"
-msgstr ""
-"Caso queira restaurar _TODOS_ os arquivos do c처digo fonte C para que "
-"coincidam com a vers찾o do 챠ndice, voc챗 pode usar"
+msgstr "Caso queira restaurar _TODOS_ os arquivos do c처digo fonte C para que coincidam com a vers찾o do 챠ndice, voc챗 pode usar"
#. type: delimited block -
#: en/git-restore.txt:168
@@ -50037,11 +44725,7 @@ msgstr "$ git restore '*.c'\n"
#: en/git-restore.txt:174
#, 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찼 "
-"restaurado ainda que n찾o esteja mais na 찼rvore de trabalho, pois o "
-"agrupamento dos arquivos 챕 utilizado para coincidir com as entradas do "
-"챠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 dos arquivos 챕 utilizado para coincidir com as entradas do 챠ndice (n찾o na 찼rvore de trabalho pelo shell)."
#. type: Plain text
#: en/git-restore.txt:176
@@ -50059,9 +44743,7 @@ msgstr "$ git restore .\n"
#: en/git-restore.txt:183
#, 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 cume da 찼rvore de trabalho com a "
-"m찼gica do \"pathspec\" (consulte linkgit:gitglossary[7])"
+msgstr "ou para restaurar todos os arquivos do cume da 찼rvore de trabalho com a m찼gica do \"pathspec\" (consulte linkgit:gitglossary[7])"
#. type: delimited block -
#: en/git-restore.txt:186
@@ -50143,27 +44825,13 @@ msgstr "Dado um ou mais commits existentes, reverta as altera챌천es que os patch
#: en/git-revert.txt:30
#, 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' 챕 utilizado 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, voc챗 deve consultar 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 "
-"consutar 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."
+msgstr "Nota: 'git revert' 챕 utilizado 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, voc챗 deve consultar 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 consutar 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 informados "
-"por챕m nenhuma travessia 챕 feita por padr찾o, consulte linkgit:git-rev-list[1] "
-"e a sua op챌찾o `--no-walk`."
+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 informados 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
@@ -50503,10 +45171,7 @@ msgstr ""
#: en/git-rev-parse.txt:90
#, priority:100
msgid "This can be used to convert arguments to a command run in a subdirectory so that they can still be used after moving to the top-level of the repository. For example:"
-msgstr ""
-"Pode ser utilizado para converter os argumentos em um comando executado-o em "
-"um subdiret처rio para que eles ainda possam ser utilizados ap처s a mudan챌a "
-"para o n챠vel mais alto do reposit처rio. Por exemplo:"
+msgstr "Pode ser utilizado para converter os argumentos em um comando executado-o em um subdiret처rio para que eles ainda possam ser utilizados ap처s a mudan챌a para o n챠vel mais alto do reposit처rio. Por exemplo:"
#. type: delimited block -
#: en/git-rev-parse.txt:96
@@ -50562,11 +45227,7 @@ msgstr ""
#: en/git-rev-parse.txt:134
#, 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 da configura챌찾o "
-"`core.abbrev` (consulte 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 da configura챌찾o `core.abbrev` (consulte linkgit:git-config[1])."
#. type: Plain text
#: en/git-rev-parse.txt:139
@@ -51274,27 +45935,13 @@ msgstr ""
#: en/git-rm.txt:27
#, priority:280
msgid "Remove files matching pathspec from the index, or from the working tree and the index. `git rm` will not remove a file from just your working directory. (There is no option to remove a file only from the working tree and yet keep it in the index; use `/bin/rm` if you want to do that.) The files being removed have to be identical to the tip of the branch, and no updates to their contents can be staged in the index, though that default behavior can be overridden with the `-f` option. When `--cached` is given, the staged content has to match either the tip of the branch or the file on disk, allowing the file to be removed from just the index."
-msgstr ""
-"Remove os arquivos correspondentes ao `pathspec` do 챠ndice, ou da 찼rvore de "
-"trabalho e do 챠ndice. O comando `git rm` n찾o remover찼 um arquivo apenas do "
-"seu diret처rio de trabalho. (N찾o h찼 op챌찾o para remover um arquivo apenas da "
-"찼rvore de trabalho e ainda mant챗-lo no 챠ndice; utilize `/bin/rm` caso queira "
-"fazer isso.) Os arquivos que est찾o sendo removidos devem ser id챗nticos ao "
-"cume do ramo e nenhuma atualiza챌찾o do seu conte첬do pode ser preparada no "
-"챠ndice, embora este comportamento predefinido possa ser substitu챠do pela "
-"op챌찾o `-f `. Quando `--cached` 챕 utilizado, o conte첬do escalonado deve "
-"corresponder ao cume do ramo ou ao arquivo no disco, permitindo que o "
-"arquivo seja removido no 챠ndice apenas."
+msgstr "Remove os arquivos correspondentes ao `pathspec` do 챠ndice, ou da 찼rvore de trabalho e do 챠ndice. O comando `git rm` n찾o remover찼 um arquivo apenas do seu diret처rio de trabalho. (N찾o h찼 op챌찾o para remover um arquivo apenas da 찼rvore de trabalho e ainda mant챗-lo no 챠ndice; utilize `/bin/rm` caso queira fazer isso.) Os arquivos que est찾o sendo removidos devem ser id챗nticos ao cume do ramo e nenhuma atualiza챌찾o do seu conte첬do pode ser preparada no 챠ndice, embora este comportamento predefinido possa ser substitu챠do pela op챌찾o `-f `. Quando `--cached` 챕 utilizado, o conte첬do escalonado deve corresponder ao cume do ramo ou ao arquivo no disco, permitindo que o arquivo seja removido no 챠ndice apenas."
#. type: Plain text
#: en/git-rm.txt:36
#, priority:280
msgid "Files to remove. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be given to remove all files in the directory, and recursively all sub-directories, but this requires the `-r` option to be explicitly given."
-msgstr ""
-"Arquivos para serem removidos. Um nome do diret처rio principal (por exemplo, "
-"`dir` para remover `dir/arquivo1` e `dir/arquivo2`) pode ser utilizadopara "
-"remover todos os arquivos do diret처rio e recursivamente de todos os "
-"subdiret처rios, por챕m isso requer o uso da op챌찾o `-r` de forma explicita."
+msgstr "Arquivos para serem removidos. Um nome do diret처rio principal (por exemplo, `dir` para remover `dir/arquivo1` e `dir/arquivo2`) pode ser utilizadopara remover todos os arquivos do diret처rio e recursivamente de todos os subdiret처rios, por챕m isso requer o uso da op챌찾o `-r` de forma explicita."
#. type: Plain text
#: en/git-rm.txt:38
@@ -51306,11 +45953,7 @@ msgstr "O comando remove apenas os caminhos conhecidos pelo Git."
#: en/git-rm.txt:43
#, priority:280
msgid "File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between using `git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all of directory `d2`."
-msgstr ""
-"As coincid챗ncia do mascaramento do nome do arquivo atrav챕s dos limites do "
-"diret처rio. Assim, os dados dos dois diret처rios `d` e `d2`, existe uma "
-"diferen챌a entre o uso do comando `git rm 'd*'` e `git rm 'd/*'`, pois o "
-"primeiro tamb챕m remover찼 todo o diret처rio `d2` ."
+msgstr "As coincid챗ncia do mascaramento do nome do arquivo atrav챕s dos limites do diret처rio. Assim, os dados dos dois diret처rios `d` e `d2`, existe uma diferen챌a entre o uso do comando `git rm 'd*'` e `git rm 'd/*'`, pois o primeiro tamb챕m remover찼 todo o diret처rio `d2` ."
#. type: Plain text
#: en/git-rm.txt:49
@@ -51334,10 +45977,7 @@ msgstr "Permitir a remo챌찾o recursiva quando um nome do diret처rio principal fo
#: en/git-rm.txt:69
#, priority:280
msgid "Use this option to unstage and remove paths only from the index. Working tree files, whether modified or not, will be left alone."
-msgstr ""
-"Utilize esta op챌찾o para desestabilizar e remover os caminhos do 챠ndice "
-"apenas. Os arquivos da 찼rvore de trabalho, modificados ou n찾o, ser찾o "
-"deixados em paz."
+msgstr "Utilize esta op챌찾o para desestabilizar e remover os caminhos do 챠ndice apenas. Os arquivos da 찼rvore de trabalho, modificados ou n찾o, ser찾o deixados em paz."
#. type: Labeled list
#: en/git-rm.txt:70
@@ -51379,13 +46019,7 @@ msgstr "Utilizando o `git commit -a`"
#: en/git-rm.txt:107
#, priority:280
msgid "If you intend that your next commit should record all modifications of tracked files in the working tree and record all removals of files that have been removed from the working tree with `rm` (as opposed to `git rm`), use `git commit -a`, as it will automatically notice and record all removals. You can also have a similar effect without committing by using `git add -u`."
-msgstr ""
-"Caso tenha pretens찾o de que o seu pr처ximo commit registre todas as "
-"modifica챌천es dos arquivos rastreados na 찼rvore de trabalho e registre todas "
-"as remo챌천es dos arquivos que foram removidos da 찼rvore de trabalho com `rm` ("
-"ao contr찼rio de `git rm`), utilize `git commit -a`, pois alertar찼 e "
-"registrar찼 automaticamente todas as remo챌천es. 횋 poss챠vel ter tamb챕m um "
-"efeito semelhante sem fazer um commit utilizando o comando `git add -u`."
+msgstr "Caso tenha pretens찾o de que o seu pr처ximo commit registre todas as modifica챌천es dos arquivos rastreados na 찼rvore de trabalho e registre todas as remo챌천es dos arquivos que foram removidos da 찼rvore de trabalho com `rm` (ao contr찼rio de `git rm`), utilize `git commit -a`, pois alertar찼 e registrar찼 automaticamente todas as remo챌천es. 횋 poss챠vel ter tamb챕m um efeito semelhante sem fazer um commit utilizando o comando `git add -u`."
#. type: Title ~
#: en/git-rm.txt:109
@@ -51403,9 +46037,7 @@ msgstr "Ao aceitar um novo c처digo para o fornecedor de um ramo, voc챗 provavelm
#: en/git-rm.txt:116
#, priority:280
msgid "Typically you would first remove all tracked files from the working tree using this command:"
-msgstr ""
-"Normalmente, voc챗 primeiro remove todos os arquivos rastreados da 찼rvore de "
-"trabalho utilizando este comando:"
+msgstr "Normalmente, voc챗 primeiro remove todos os arquivos rastreados da 찼rvore de trabalho utilizando este comando:"
#. type: delimited block -
#: en/git-rm.txt:119
@@ -51447,11 +46079,7 @@ msgstr "Outras maneiras"
#: en/git-rm.txt:139
#, priority:280
msgid "If all you really want to do is to remove from the index the files that are no longer present in the working tree (perhaps because your working tree is dirty so that you cannot use `git commit -a`), use the following command:"
-msgstr ""
-"Se tudo o que voc챗 realmente deseja 챕 remover do 챠ndice os arquivos que n찾o "
-"est찾o mais presentes na 찼rvore de trabalho (talvez porque a sua 찼rvore de "
-"trabalho esteja suja e voc챗 n찾o possa usar o comando `git commit -a`), "
-"utilize o seguinte comando:"
+msgstr "Se tudo o que voc챗 realmente deseja 챕 remover do 챠ndice os arquivos que n찾o est찾o mais presentes na 찼rvore de trabalho (talvez porque a sua 찼rvore de trabalho esteja suja e voc챗 n찾o possa usar o comando `git commit -a`), utilize o seguinte comando:"
#. type: delimited block -
#: en/git-rm.txt:142
@@ -51463,16 +46091,7 @@ msgstr "git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached\n"
#: en/git-rm.txt:155
#, priority:280
msgid "Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will move the submodules git directory into the superprojects git directory to protect the submodule's history. If it exists the submodule.<name> section in the linkgit:gitmodules[5] file will also be removed and that file will be staged (unless --cached or -n are used)."
-msgstr ""
-"Somente os subm처dulos que usam um arquivo git (o que significa que foram "
-"clonados com uma vers찾o 1.7.8 ou mais recente do Git) ser찾o removidos da "
-"찼rvore de trabalho, pois seu reposit처rio vive dentro do diret처rio .git do "
-"`superproject`. Caso um subm처dulo (ou um dos aninhados dentro dele) ainda "
-"utilize um diret처rio .git, `git rm` mover찼 o diret처rio dos subm처dulos git "
-"para o diret처rio `superprojects` git para proteger o hist처rico do subm처dulo. "
-"Caso exista a se챌찾o submodule.<nome> no arquivo linkgit:gitmodules[5] tamb챕m "
-"ser찼 removido e esse arquivo ser찼 preparado (a menos que `--cached` ou `-n` "
-"sejam utilizados)."
+msgstr "Somente os subm처dulos que usam um arquivo git (o que significa que foram clonados com uma vers찾o 1.7.8 ou mais recente do Git) ser찾o removidos da 찼rvore de trabalho, pois seu reposit처rio vive dentro do diret처rio .git do `superproject`. Caso um subm처dulo (ou um dos aninhados dentro dele) ainda utilize um diret처rio .git, `git rm` mover찼 o diret처rio dos subm처dulos git para o diret처rio `superprojects` git para proteger o hist처rico do subm처dulo. Caso exista a se챌찾o submodule.<nome> no arquivo linkgit:gitmodules[5] tamb챕m ser찼 removido e esse arquivo ser찼 preparado (a menos que `--cached` ou `-n` sejam utilizados)."
#. type: Plain text
#: en/git-rm.txt:161
@@ -51520,13 +46139,7 @@ msgstr "Como este exemplo permite que o shell expanda o asterisco (ou seja, voc
#: en/git-rm.txt:189
#, priority:280
msgid "Each time a superproject update removes a populated submodule (e.g. when switching between commits before and after the removal) a stale submodule checkout will remain in the old location. Removing the old directory is only safe when it uses a gitfile, as otherwise the history of the submodule will be deleted too. This step will be obsolete when recursive submodule update has been implemented."
-msgstr ""
-"Sempre que uma atualiza챌찾o do `superproject` remove um subm처dulo preenchido ("
-"por exemplo, ao alternar entre commits antes e ap처s a remo챌찾o), um checkout "
-"obsoleto do subm처dulo permanece no local antigo. A remo챌찾o do diret처rio "
-"antigo s처 챕 segura quando ele usa um `gitfile`; caso contr찼rio, o hist처rico "
-"do subm처dulo tamb챕m ser찼 exclu챠do. Esta etapa ser찼 obsoleta quando a "
-"atualiza챌찾o recursiva do subm처dulo for implementada."
+msgstr "Sempre que uma atualiza챌찾o do `superproject` remove um subm처dulo preenchido (por exemplo, ao alternar entre commits antes e ap처s a remo챌찾o), um checkout obsoleto do subm처dulo permanece no local antigo. A remo챌찾o do diret처rio antigo s처 챕 segura quando ele usa um `gitfile`; caso contr찼rio, o hist처rico do subm처dulo tamb챕m ser찼 exclu챠do. Esta etapa ser찼 obsoleta quando a atualiza챌찾o recursiva do subm처dulo for implementada."
#. type: Title =
#: en/git-send-email.txt:2
@@ -51871,9 +46484,7 @@ msgstr ""
#: en/git-send-email.txt:185
#, priority:100
msgid "Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example:"
-msgstr ""
-"Mecanismos SMTP-AUTH permitidos, listas separadas por um espa챌o. Est찼 "
-"configura챌찾o imp천em a utiliza챌찾o dos mecanismos listados. Exemplo:"
+msgstr "Mecanismos SMTP-AUTH permitidos, listas separadas por um espa챌o. Est찼 configura챌찾o imp천em a utiliza챌찾o dos mecanismos listados. Exemplo:"
#. type: delimited block -
#: en/git-send-email.txt:188
@@ -52131,12 +46742,7 @@ msgstr "--[no-]cc-cover"
#: en/git-send-email.txt:325
#, priority:100
msgid "If this is set, emails found in Cc: headers in the first patch of the series (typically the cover letter) are added to the cc list for each email set. Default is the value of 'sendemail.cccover' configuration value; if that is unspecified, default to --no-cc-cover."
-msgstr ""
-"Caso seja definido, os emails encontrados nos cabe챌alhos Cc: no primeiro "
-"patch da s챕rie (normalmente a carta de apresenta챌찾o) ser찾o adicionados 횪 "
-"lista Cc: de cada conjunto de e-mails. Default is the value of "
-"'sendemail.cccover' configuration value; if that is unspecified, default to "
-"--no-cc-cover."
+msgstr "Caso seja definido, os emails encontrados nos cabe챌alhos Cc: no primeiro patch da s챕rie (normalmente a carta de apresenta챌찾o) ser찾o adicionados 횪 lista Cc: de cada conjunto de e-mails. Default is the value of 'sendemail.cccover' configuration value; if that is unspecified, default to --no-cc-cover."
#. type: Labeled list
#: en/git-send-email.txt:326
@@ -52148,12 +46754,7 @@ msgstr "--[no-]to-cover"
#: en/git-send-email.txt:331
#, priority:100
msgid "If this is set, emails found in To: headers in the first patch of the series (typically the cover letter) are added to the to list for each email set. Default is the value of 'sendemail.tocover' configuration value; if that is unspecified, default to --no-to-cover."
-msgstr ""
-"Caso seja definido, os emails encontrados nos cabe챌alhos To: (Para) no "
-"primeiro patch da s챕rie (normalmente a carta de apresenta챌찾o) ser찾o "
-"adicionados 횪 lista To: de cada conjunto de e-mails. Default is the value of "
-"'sendemail.tocover' configuration value; if that is unspecified, default to "
-"--no-to-cover."
+msgstr "Caso seja definido, os emails encontrados nos cabe챌alhos To: (Para) no primeiro patch da s챕rie (normalmente a carta de apresenta챌찾o) ser찾o adicionados 횪 lista To: de cada conjunto de e-mails. Default is the value of 'sendemail.tocover' configuration value; if that is unspecified, default to --no-to-cover."
#. type: Labeled list
#: en/git-send-email.txt:332
@@ -52595,9 +47196,7 @@ msgstr ""
#: en/git-send-pack.txt:21
#, 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 utilize 'git push' que 챕 um wrapper de maior hierarquia deste "
-"comando. Consulte linkgit:git-push[1]."
+msgstr "No lugar utilize 'git push' que 챕 um wrapper de maior hierarquia deste comando. Consulte linkgit:git-push[1]."
#. type: Plain text
#: en/git-send-pack.txt:24
@@ -52645,11 +47244,7 @@ msgstr ""
#: en/git-send-pack.txt:89
#, 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 ""
-"Encaminha uma cadeia de caracteres espec챠ficos para uma op챌찾o `push` que "
-"ser찼 utilizada por ganchos no lado do servidor. Caso o servidor n찾o seja "
-"compat챠vel com as op챌천es `push`, exibe erro. Para mais detalhes consulte "
-"linkgit:git-push[1] e linkgit:githooks[5]."
+msgstr "Encaminha uma cadeia de caracteres espec챠ficos para uma op챌찾o `push` que ser찼 utilizada por ganchos no lado do servidor. Caso o servidor n찾o seja compat챠vel com as op챌천es `push`, exibe erro. Para mais detalhes consulte linkgit:git-push[1] e linkgit:githooks[5]."
#. type: Labeled list
#: en/git-send-pack.txt:90
@@ -53076,10 +47671,7 @@ msgstr "Considere apenas os commits que s찾o suficientes para explicar como os a
#: en/git-shortlog.txt:88
#, priority:260
msgid "The `.mailmap` feature is used to coalesce together commits by the same person in the shortlog, where their name and/or email address was spelled differently."
-msgstr ""
-"O recurso `.mailmap` 챕 utilizado para agrupar os commits da mesma pessoa no "
-"\"shortlog\", onde o seu nome ou endere챌o de email foram escritos de "
-"maneiras diferentes."
+msgstr "O recurso `.mailmap` 챕 utilizado para agrupar os commits da mesma pessoa no \"shortlog\", onde o seu nome ou endere챌o de email foram escritos de maneiras diferentes."
#. type: Title =
#: en/git-show-branch.txt:2
@@ -53172,7 +47764,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -53184,7 +47776,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -53289,18 +47881,13 @@ msgstr ""
#: en/git-show-branch.txt:123
#, priority:100
msgid "Color the status sign (one of these: `*` `!` `+` `-`) of each commit corresponding to the branch it's in. The value must be always (the default), never, or auto."
-msgstr ""
-"Color the status sign (one of these: `*` `!` `+` `-`) of each commit "
-"corresponding to the branch it's in. Always (sempre) 챕 o valor predefinido, "
-"as outras op챌천es s찾o \"never\" ou \"auto\"."
+msgstr "Color the status sign (one of these: `*` `!` `+` `-`) of each commit corresponding to the branch it's in. Always (sempre) 챕 o valor predefinido, as outras op챌천es s찾o \"never\" ou \"auto\"."
#. type: Plain text
#: en/git-show-branch.txt:128
#, priority:100
msgid "Turn off colored output, even when the configuration file gives the default to color output. Same as `--color=never`."
-msgstr ""
-"Turn off colored output, even when the configuration file gives the default "
-"to color output. O mesmo que `--color=never`."
+msgstr "Turn off colored output, even when the configuration file gives the default to color output. O mesmo que `--color=never`."
#. type: Plain text
#: en/git-show-branch.txt:131
@@ -53339,8 +47926,7 @@ msgstr ""
"$ git show-branch master fixes mhf\n"
"* [master] Add 'git show-branch'.\n"
" ! [fixes] Introduz a flag \"reset type\" para \"git reset\"\n"
-" ! [mhf] Permite que o refspec \"+remote:local\" cause --force quando for "
-"buscar.\n"
+" ! [mhf] Permite que o refspec \"+remote:local\" cause --force quando for buscar.\n"
"---\n"
#. type: delimited block -
@@ -53359,14 +47945,12 @@ msgid ""
" + [mhf~8] Start adding the $GIT_DIR/remotes/ support.\n"
"*++ [master] Add 'git show-branch'.\n"
msgstr ""
-" + [mhf] Permite que o refspec \"+remote:local\" cause --force quando for "
-"buscar.\n"
+" + [mhf] Permite que o refspec \"+remote:local\" cause --force quando for buscar.\n"
" + [mhf~1] Usa git-octopus quando for capturar mais de um cabe챌alho.\n"
" + [fixes] Introduz a sinaliza챌찾o \"reset type\" para \"git reset\"\n"
" + [mhf~2] \"git fetch --force\".\n"
" + [mhf~3] Utilize .git/remote/origin, e n찾o .git/branches/origin.\n"
-" + [mhf~4] Faz um \"git pull\" e \"git fetch\" retornar para a predefini챌찾o "
-"no \"origin\"\n"
+" + [mhf~4] Faz um \"git pull\" e \"git fetch\" retornar para a predefini챌찾o no \"origin\"\n"
" + [mhf~5] Infame 'octopus merge'\n"
" + [mhf~6] Retira git-parse-remote.\n"
" + [mhf~7] Multi-head fetch.\n"
@@ -53784,10 +48368,7 @@ msgstr "Exibe um ou mais objetos (gotas, 찼rvores, tags e commits)."
#: 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'."
+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
@@ -53817,9 +48398,7 @@ msgstr "O comando aceita as op챌천es aplic찼veis ao comando `git diff-tree` para
#: 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 utilizadas com mais "
-"frequ챗ncia."
+msgstr "Esta p찼gina do manual descreve apenas as op챌천es utilizadas com mais frequ챗ncia."
#. type: Labeled list
#: en/git-show.txt:37
@@ -53831,10 +48410,7 @@ msgstr "<object>..."
#: 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 \"DEFININDO AS REVIS횛ES\" em 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 \"DEFININDO AS REVIS횛ES\" em linkgit:gitrevisions[7]."
#. type: Labeled list
#: en/git-show.txt:60
@@ -54092,9 +48668,7 @@ msgstr ""
#: en/git-stage.txt:20
#, priority:100
msgid "This is a synonym for linkgit:git-add[1]. Please refer to the documentation of that command."
-msgstr ""
-"횋 um sin척nimo para linkgit:git-add[1]. Para refer챗ncias deste comando, "
-"favor consultar a documenta챌찾o."
+msgstr "횋 um sin척nimo para linkgit:git-add[1]. Para refer챗ncias deste comando, favor consultar a documenta챌찾o."
#. type: Title =
#: en/git-stash.txt:2
@@ -54212,9 +48786,7 @@ msgstr ""
#: 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 ""
-"O comando aceita as op챌천es aplic찼veis ao comando 'git log' para controlar o "
-"que 챕 exibido e como. 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. See linkgit:git-log[1]."
#. type: Labeled list
#: en/git-stash.txt:86
@@ -54526,8 +49098,7 @@ msgstr ""
#: en/git-stash.txt:306
#, priority:240
msgid "You can use 'git stash' to simplify the above, like this:"
-msgstr ""
-"Voc챗 pode utilizar o comando 'git stash' para simplificar o exemplo acima:"
+msgstr "Voc챗 pode utilizar o comando 'git stash' para simplificar o exemplo acima:"
#. type: delimited block -
#: en/git-stash.txt:314
@@ -54557,10 +49128,7 @@ msgstr "Testando commits parciais"
#: 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 ""
-"Voc챗 pode utilizar o comando `git stash push --keep-index` quando quiser "
-"fazer dois ou mais commits das altera챌천es na 찼rvore de trabalho e queira "
-"testar cada uma das altera챌천es antes de fazer o commit:"
+msgstr "Voc챗 pode utilizar o comando `git stash push --keep-index` quando quiser fazer dois ou mais commits das altera챌천es na 찼rvore de trabalho e queira testar cada uma das altera챌천es antes de fazer o commit:"
#. type: delimited block -
#: en/git-stash.txt:332
@@ -54577,14 +49145,11 @@ msgid ""
"$ git commit foo -m 'Remaining parts'\n"
msgstr ""
"# ... hack hack hack ...\n"
-"$ git add --patch foo # adiciona apenas a primeira parte ao "
-"챠ndice\n"
+"$ git add --patch foo # adiciona apenas a primeira parte ao 챠ndice\n"
"$ git stash push --keep-index # acumule todas as outras modifica챌천es\n"
"$ edit/build/test first part\n"
-"$ git commit -m 'First part' # fa챌a o commit completo de todas as "
-"modifica챌천es testadas\n"
-"$ git stash pop # prepare para trabalhar em todas as outras "
-"modifica챌천es\n"
+"$ git commit -m 'First part' # fa챌a o commit completo de todas as modifica챌천es testadas\n"
+"$ git stash pop # prepare para trabalhar em todas as outras modifica챌천es\n"
"# ... repita os cinco passos acima at챕 que sobre apenas um commit ...\n"
"$ edit/build/test remaining parts\n"
"$ git commit foo -m 'Partes resultantes'\n"
@@ -54599,11 +49164,7 @@ msgstr "Recuperando entradas stash que foram limpas/eliminadas erroneamente"
#: 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 ""
-"Caso voc챗 derrube ou limpe as entradas stash por engano, elas n찾o poder찾o "
-"mais ser recuperadas pelos mecanismos de seguran챌a normais. No entanto, 챕 "
-"poss챠vel tentar o seguinte encantamento para obter uma lista das entradas "
-"stash que ainda est찾o em seu reposit처rio, mas que n찾o s찾o mais acess챠veis:"
+msgstr "Caso voc챗 derrube ou limpe as entradas stash por engano, elas n찾o poder찾o mais ser recuperadas pelos mecanismos de seguran챌a normais. No entanto, 챕 poss챠vel tentar o seguinte encantamento para obter uma lista das entradas stash que ainda est찾o em seu reposit처rio, mas que n찾o s찾o mais acess챠veis:"
#. type: delimited block -
#: en/git-stash.txt:345
@@ -54675,10 +49236,7 @@ msgstr "--porcelain[=<vers찾o>]"
#: en/git-status.txt:43
#, priority:280
msgid "Give the output in an easy-to-parse format for scripts. This is similar to the short output, but will remain stable across Git versions and regardless of user configuration. See below for details."
-msgstr ""
-"Forne챌a a sa챠da em um formato f찼cil de analisar para os scripts. Isso 챕 "
-"semelhante 횪 sa챠da curta, mas permanecer찼 est찼vel nas vers천es do Git e "
-"independentemente da configura챌찾o do usu찼rio. Veja abaixo os detalhes."
+msgstr "Forne챌a a sa챠da em um formato f찼cil de analisar para os scripts. Isso 챕 semelhante 횪 sa챠da curta, mas permanecer찼 est찼vel nas vers천es do Git e independentemente da configura챌찾o do usu찼rio. Veja abaixo os detalhes."
#. type: Plain text
#: en/git-status.txt:46
@@ -54696,21 +49254,13 @@ msgstr "Gere um formato longo na sa챠da. Esta 챕 a predefini챌찾o."
#: en/git-status.txt:57
#, priority:280
msgid "In addition to the names of files that have been changed, also show the textual changes that are staged to be committed (i.e., like the output of `git diff --cached`). If `-v` is specified twice, then also show the changes in the working tree that have not yet been staged (i.e., like the output of `git diff`)."
-msgstr ""
-"Al챕m dos nomes dos arquivos que foram alterados, exiba tamb챕m as altera챌천es "
-"textuais que s찾o preparadas para o commit (ou seja, como a sa챠da do `git "
-"diff --cached`). Caso a op챌찾o `-v` seja utilizada duas vezes, tamb챕m exiba "
-"as altera챌천es na 찼rvore de trabalho que ainda n찾o foram preparadas (ou seja, "
-"como a sa챠da do comando `git diff`)."
+msgstr "Al챕m dos nomes dos arquivos que foram alterados, exiba tamb챕m as altera챌천es textuais que s찾o preparadas para o commit (ou seja, como a sa챠da do `git diff --cached`). Caso a op챌찾o `-v` seja utilizada duas vezes, tamb챕m exiba as altera챌천es na 찼rvore de trabalho que ainda n찾o foram preparadas (ou seja, como a sa챠da do comando `git diff`)."
#. type: Plain text
#: en/git-status.txt:66
#, priority:280
msgid "The mode parameter is used to specify the handling of untracked files. It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
-msgstr ""
-"O par창metro `modo` 챕 utilizado para definir a manipula챌찾o dos arquivos n찾o "
-"rastreados. 횋 opcional: a predefini챌찾o 챕 'all' e se definido, deve estar "
-"preso 횪 op챌찾o (por exemplo, `-uno`, mas n찾o `-u no`)."
+msgstr "O par창metro `modo` 챕 utilizado para definir a manipula챌찾o dos arquivos n찾o rastreados. 횋 opcional: a predefini챌찾o 챕 'all' e se definido, deve estar preso 횪 op챌찾o (por exemplo, `-uno`, mas n찾o `-u no`)."
#. type: Plain text
#: en/git-status.txt:70
@@ -54728,39 +49278,13 @@ msgstr "'normal' - Exibe todos os arquivo e diret처rios que n찾o foram rastreado
#: en/git-status.txt:82
#, priority:280
msgid "When `-u` option is not used, untracked files and directories are shown (i.e. the same as specifying `normal`), to help you avoid forgetting to add newly created files. Because it takes extra work to find untracked files in the filesystem, this mode may take some time in a large working tree. Consider enabling untracked cache and split index if supported (see `git update-index --untracked-cache` and `git update-index --split-index`), Otherwise you can use `no` to have `git status` return more quickly without showing untracked files."
-msgstr ""
-"Quando a op챌찾o `-u` n찾o 챕 utilizada, os arquivos e diret처rios n찾o rastreados "
-"s찾o exibidos (ou seja, o mesmo que usar `normal`), para ajudar a evitar o "
-"esquecimento de adicionar os arquivos rec챕m-criados. Como 챕 necess찼rio um "
-"trabalho extra para encontrar os arquivos que n찾o foram rastreados no "
-"sistema de arquivos, esse modo pode levar algum tempo em uma grande 찼rvore "
-"de trabalho. Considere ativar o cache n찾o rastreado e dividir o 챠ndice, se "
-"suportado (consulte `git update-index --untracked-cache` e `git update-index "
-"--split-index`). Caso contr찼rio, voc챗 pode usar `no` para obter o retorno do "
-"comando `git status` mais rapidamente sem demonstrar quais foram os arquivos "
-"que n찾o foram rastreados."
+msgstr "Quando a op챌찾o `-u` n찾o 챕 utilizada, os arquivos e diret처rios n찾o rastreados s찾o exibidos (ou seja, o mesmo que usar `normal`), para ajudar a evitar o esquecimento de adicionar os arquivos rec챕m-criados. Como 챕 necess찼rio um trabalho extra para encontrar os arquivos que n찾o foram rastreados no sistema de arquivos, esse modo pode levar algum tempo em uma grande 찼rvore de trabalho. Considere ativar o cache n찾o rastreado e dividir o 챠ndice, se suportado (consulte `git update-index --untracked-cache` e `git update-index --split-index`). Caso contr찼rio, voc챗 pode usar `no` para obter o retorno do comando `git status` mais rapidamente sem demonstrar quais foram os arquivos que n찾o foram rastreados."
#. type: Plain text
#: 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 ""
-"Ignore as altera챌천es nos subm처dulos ao procular pelas altera챌천es. O "
-"`<quando>` pode ser \"none\" (nenhum), \"untracked\" (sem monitoramento/"
-"rastreamento), \"dirty\" (sujo) ou \"all\" (todos), que 챕 a predefini챌찾o. O "
-"\"none\" considera o subm처dulo modificado quando houver arquivos n찾o estejam "
-"rastreados, modificados ou o seu `HEAD` seja diferente do commit registrado "
-"no superprojeto, pode ser utilizado para substituir qualquer configura챌찾o da "
-"op챌찾o 'ignore' (ignorar) em linkgit:git-config[1] ou linkgit:gitmodules[5]. "
-"Quando o \"untracked\" 챕 utilizado, os subm처dulos n찾o s찾o considerados sujos "
-"quando houver apenas um conte첬do sem rastreamento (por챕m o monitoramento de "
-"altera챌천es do seu conte첬do continua) O uso de \"dirty\" ignora todas as "
-"altera챌천es na 찼rvore de trabalho dos subm처dulos, apenas as altera챌천es nos "
-"commit que foram armazenados no superprojeto s찾o exibidos (esse era o "
-"comportamento anterior a vers찾o 1.7.0). O uso de \"all\" oculta todas as "
-"altera챌천es nos subm처dulos (e suprime a sa챠da dos resumos dos subm처dulos "
-"quando a vari찼vel da configura챌찾o `status.submoduleSummary` estiver "
-"definida)."
+msgstr "Ignore as altera챌천es nos subm처dulos ao procular pelas altera챌천es. O `<quando>` pode ser \"none\" (nenhum), \"untracked\" (sem monitoramento/rastreamento), \"dirty\" (sujo) ou \"all\" (todos), que 챕 a predefini챌찾o. O \"none\" considera o subm처dulo modificado quando houver arquivos n찾o estejam rastreados, modificados ou o seu `HEAD` seja diferente do commit registrado no superprojeto, pode ser utilizado para substituir qualquer configura챌찾o da op챌찾o 'ignore' (ignorar) em linkgit:git-config[1] ou linkgit:gitmodules[5]. Quando o \"untracked\" 챕 utilizado, os subm처dulos n찾o s찾o considerados sujos quando houver apenas um conte첬do sem rastreamento (por챕m o monitoramento de altera챌천es do seu conte첬do continua) O uso de \"dirty\" ignora todas as altera챌천es na 찼rvore de trabalho dos subm처dulos, apenas as altera챌천es nos commit que foram armazenados no superprojeto s찾o exibidos (esse era o comportamento anterior a vers찾o 1.7.0). O uso de \"all\" oculta todas as altera챌천es nos subm처dulos (e suprime a sa챠da dos resumos dos subm처dulos quando a vari찼vel da configura챌찾o `status.submoduleSummary` estiver definida)."
#. type: Labeled list
#: en/git-status.txt:102
@@ -54820,31 +49344,19 @@ msgstr "ignora o padr찾o.\n"
#: en/git-status.txt:124
#, priority:280
msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
-msgstr ""
-"Quando o modo 'matching' 챕 utilizado, os caminhos que coincidam "
-"explicitamente a um padr찾o ignorado s찾o exibidos. Caso um diret처rio "
-"coincidir com um padr찾o a ser ignorado, ele ser찼 exibido, mas n찾o os "
-"caminhos contidos no diret처rio ignorado. Caso um diret처rio n찾o coincida com "
-"um padr찾o a ser ignorado, mas todo o conte첬do for ignorado, o diret처rio n찾o "
-"ser찼 exibido, mas todo o resto do conte첬do ser찼."
+msgstr "Quando o modo 'matching' 챕 utilizado, os caminhos que coincidam explicitamente a um padr찾o ignorado s찾o exibidos. Caso um diret처rio coincidir com um padr찾o a ser ignorado, ele ser찼 exibido, mas n찾o os caminhos contidos no diret처rio ignorado. Caso um diret처rio n찾o coincida com um padr찾o a ser ignorado, mas todo o conte첬do for ignorado, o diret처rio n찾o ser찼 exibido, mas todo o resto do conte첬do ser찼."
#. type: Plain text
#: en/git-status.txt:129
#, priority:280
msgid "Terminate entries with NUL, instead of LF. This implies the `--porcelain=v1` output format if no other format is given."
-msgstr ""
-"Terminar as entradas com `NUL`, em vez de `LF`. Isto implica o formato de "
-"sa챠da `--porcelain=v1` caso nenhum outro formato seja utilizado."
+msgstr "Terminar as entradas com `NUL`, em vez de `LF`. Isto implica o formato de sa챠da `--porcelain=v1` caso nenhum outro formato seja utilizado."
#. type: Plain text
#: en/git-status.txt:136
#, priority:280
msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
-msgstr ""
-"Exiba os arquivos que n찾o foram rastreados em colunas. Veja a vari찼vel da "
-"configura챌찾o `column.status` para conhecer a sintaxe desta op챌찾o.`--column` "
-"e `--no-column` sem as op챌천es s찾o equivalentes a 'always' e 'never' "
-"respectivamente."
+msgstr "Exiba os arquivos que n찾o foram rastreados em colunas. Veja a vari찼vel da configura챌찾o `column.status` para conhecer a sintaxe desta op챌찾o.`--column` e `--no-column` sem as op챌천es s찾o equivalentes a 'always' e 'never' respectivamente."
#. type: Labeled list
#: en/git-status.txt:137
@@ -54862,9 +49374,7 @@ msgstr "--no-ahead-behind"
#: en/git-status.txt:141
#, priority:280
msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch. Defaults to true."
-msgstr ""
-"Exiba ou n찾o as contagens detalhadas antecipadas/atrasadas do ramo em "
-"rela챌찾o 횪 ramifica챌찾o `upstream`. A predefini챌찾o 챕 `true`."
+msgstr "Exiba ou n찾o as contagens detalhadas antecipadas/atrasadas do ramo em rela챌찾o 횪 ramifica챌찾o `upstream`. A predefini챌찾o 챕 `true`."
#. type: Labeled list
#: en/git-status.txt:142
@@ -54882,9 +49392,7 @@ msgstr "Ligue/desligue a detec챌찾o de renomea챌찾o, independentemente da config
#: en/git-status.txt:151
#, priority:280
msgid "Turn on rename detection, optionally setting the similarity threshold. See also linkgit:git-diff[1] `--find-renames`."
-msgstr ""
-"Liga a detec챌찾o de renomea챌찾o, configurando opcionalmente o limite de "
-"similaridade. Consulte tamb챕m linkgit:git-diff[1] `--find-renames`."
+msgstr "Liga a detec챌찾o de renomea챌찾o, configurando opcionalmente o limite de similaridade. Consulte tamb챕m linkgit:git-diff[1] `--find-renames`."
#. type: Plain text
#: en/git-status.txt:154
@@ -54896,21 +49404,13 @@ msgstr "Consulte a entrada 'pathspec' em linkgit:gitglossary[7]."
#: en/git-status.txt:162
#, priority:280
msgid "The output from this command is designed to be used as a commit template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time."
-msgstr ""
-"A sa챠da deste comando foi projetada para ser utilizada como um coment찼rio "
-"modelo do commit. A predefini챌찾o 챕 utilizar o formato longo, foi projetado "
-"para ser leg챠vel por seres humanos, detalhado e descritivo. Seu conte첬do e "
-"formato est찾o sujeitos a altera챌천es a qualquer momento."
+msgstr "A sa챠da deste comando foi projetada para ser utilizada como um coment찼rio modelo do commit. A predefini챌찾o 챕 utilizar o formato longo, foi projetado para ser leg챠vel por seres humanos, detalhado e descritivo. Seu conte첬do e formato est찾o sujeitos a altera챌천es a qualquer momento."
#. type: Plain text
#: en/git-status.txt:167
#, priority:280
msgid "The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below."
-msgstr ""
-"Os caminhos mencionados na sa챠da, diferentemente de muitos outros comandos "
-"Git, s찾o feitos em rela챌찾o ao diret처rio atual. Caso esteja trabalhando em um "
-"subdiret처rio (isso 챕 proposital, para ajudar a cortar e colar). Consulte a "
-"op챌찾o da configura챌찾o `status.relativePaths` abaixo."
+msgstr "Os caminhos mencionados na sa챠da, diferentemente de muitos outros comandos Git, s찾o feitos em rela챌찾o ao diret처rio atual. Caso esteja trabalhando em um subdiret처rio (isso 챕 proposital, para ajudar a cortar e colar). Consulte a op챌찾o da configura챌찾o `status.relativePaths` abaixo."
#. type: Title ~
#: en/git-status.txt:169
@@ -54950,13 +49450,7 @@ msgstr "Os campos (incluindo o `->`) est찾o separados um do outro por um 첬nico
#: en/git-status.txt:192
#, priority:280
msgid "For paths with merge conflicts, `X` and `Y` show the modification states of each side of the merge. For paths that do not have merge conflicts, `X` shows the status of the index, and `Y` shows the status of the work tree. For untracked paths, `XY` are `??`. Other status codes can be interpreted as follows:"
-msgstr ""
-"Para os caminhos com conflitos de mesclagem, `X` e `Y` exibem a condi챌찾o das "
-"modifica챌천es de cada lado da mesclagem. Para os caminhos que n찾o possuam "
-"conflitos de mesclagem, `X` exibe a condi챌찾o do 챠ndice e `Y` exibe a "
-"condi챌찾o da 찼rvore de trabalho. Para os caminhos n찾o rastreados, `XY` 챕 `??`"
-". Os outros c처digos das condi챌천es podem ser interpretados da seguinte "
-"maneira:"
+msgstr "Para os caminhos com conflitos de mesclagem, `X` e `Y` exibem a condi챌찾o das modifica챌천es de cada lado da mesclagem. Para os caminhos que n찾o possuam conflitos de mesclagem, `X` exibe a condi챌찾o do 챠ndice e `Y` exibe a condi챌찾o da 찼rvore de trabalho. Para os caminhos n찾o rastreados, `XY` 챕 `??`. Os outros c처digos das condi챌천es podem ser interpretados da seguinte maneira:"
#. type: Plain text
#: en/git-status.txt:194
@@ -55092,9 +49586,7 @@ msgstr "'m' e '?' s찾o aplicados recursivamente. Por exemplo, se um subm처dulo a
#: en/git-status.txt:244
#, priority:280
msgid "If -b is used the short-format status is preceded by a line"
-msgstr ""
-"Caso `-b` seja utilizado, a condi챌찾o de formato curto ser찼 precedido por uma "
-"linhas"
+msgstr "Caso `-b` seja utilizado, a condi챌찾o de formato curto ser찼 precedido por uma linhas"
#. type: Plain text
#: en/git-status.txt:246
@@ -55112,13 +49604,7 @@ msgstr "Formato de Porcelana Vers찾o 1"
#: en/git-status.txt:255
#, priority:280
msgid "Version 1 porcelain format is similar to the short format, but is guaranteed not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions:"
-msgstr ""
-"O formato de porcelana da vers찾o 1 챕 semelhante ao formato curto, no entanto "
-"챕 garantido que n찾o seja alterado de maneira que seja incompat챠vel com as "
-"vers천es anteriores das vers천es do Git ou com a base na configura챌찾o do "
-"usu찼rio. Isso o torna ideal para ser analisado por scripts. A descri챌찾o do "
-"formato curto acima tamb챕m descreve o formato de porcelana, com algumas "
-"exce챌천es:"
+msgstr "O formato de porcelana da vers찾o 1 챕 semelhante ao formato curto, no entanto 챕 garantido que n찾o seja alterado de maneira que seja incompat챠vel com as vers천es anteriores das vers천es do Git ou com a base na configura챌찾o do usu찼rio. Isso o torna ideal para ser analisado por scripts. A descri챌찾o do formato curto acima tamb챕m descreve o formato de porcelana, com algumas exce챌천es:"
#. type: Plain text
#: en/git-status.txt:258
@@ -55172,9 +49658,7 @@ msgstr "Cabe챌alho dos Ramos"
#: en/git-status.txt:290
#, priority:280
msgid "If `--branch` is given, a series of header lines are printed with information about the current branch."
-msgstr ""
-"Caso `--branch` seja utilizado, uma s챕rie de linhas de cabe챌alho ser찼 "
-"impressa com as informa챌천es sobre a ramifica챌찾o atual."
+msgstr "Caso `--branch` seja utilizado, uma s챕rie de linhas de cabe챌alho ser찼 impressa com as informa챌천es sobre a ramifica챌찾o atual."
#. type: delimited block .
#: en/git-status.txt:300
@@ -55193,10 +49677,8 @@ msgstr ""
"------------------------------------------------------------\n"
"# branch.oid <commit> | (initial) Commit atual.\n"
"# branch.head <ramo> | (desanexado) Ramifica챌찾o atual.\n"
-"# branch.upstream <upstream_branch> Caso o \"upstream\" esteja definido."
-"\n"
-"# branch.ab +<ahead> -<behind> Caso o \"upstream\" esteja definido "
-"e\n"
+"# branch.upstream <upstream_branch> Caso o \"upstream\" esteja definido.\n"
+"# branch.ab +<ahead> -<behind> Caso o \"upstream\" esteja definido e\n"
"\t\t\t\t\t o commit esteja presente.\n"
"------------------------------------------------------------\n"
@@ -55210,12 +49692,7 @@ msgstr "Entradas Rastreadas que Foram Alteradas"
#: en/git-status.txt:310
#, priority:280
msgid "Following the headers, a series of lines are printed for tracked entries. One of three different line formats may be used to describe an entry depending on the type of change. Tracked entries are printed in an undefined order; parsers should allow for a mixture of the 3 line types in any order."
-msgstr ""
-"Ap처s os cabe챌alhos, uma s챕rie de linhas 챕 impressa para entradas que s찾o "
-"rastreadas. Um dos tr챗s formatos diferentes da linha podem ser utilizados "
-"para descrever uma entrada, dependendo do tipo da altera챌찾o. As entradas "
-"rastreadas s찾o impressas em uma ordem indefinida; os analisadores devem "
-"permitir uma mistura dos tr챗s tipos de linha e em qualquer ordem."
+msgstr "Ap처s os cabe챌alhos, uma s챕rie de linhas 챕 impressa para entradas que s찾o rastreadas. Um dos tr챗s formatos diferentes da linha podem ser utilizados para descrever uma entrada, dependendo do tipo da altera챌찾o. As entradas rastreadas s찾o impressas em uma ordem indefinida; os analisadores devem permitir uma mistura dos tr챗s tipos de linha e em qualquer ordem."
#. type: Plain text
#: en/git-status.txt:312
@@ -55292,15 +49769,12 @@ msgstr ""
"<mW> O modo de um arquivo octal na 찼rvore de trabalho.\n"
"<hH> O nome do objeto no HEAD.\n"
"<hI> O nome do objeto no 챠ndice.\n"
-"<X><score> O renomeamento ou a c처pia do score \"placar\"(denota a "
-"porcentagem\n"
+"<X><score> O renomeamento ou a c처pia do score \"placar\"(denota a porcentagem\n"
"\t ou a similaridade entre a fonte e o destino da a챌찾o de\n"
"\t mover ou copiar. Por exemplo, \"R100\" ou \"C75\".\n"
-"<path> O `pathname` \"nome do caminho\". Em um lan챌amento de renomea챌찾"
-"o/c처pia,\n"
+"<path> O `pathname` \"nome do caminho\". Em um lan챌amento de renomea챌찾o/c처pia,\n"
"\t este 챕 o caminho de destino.\n"
-"<sep> Quando a op챌찾o `-z` for utilizada, os 2 `pathnames` s찾o "
-"separados\n"
+"<sep> Quando a op챌찾o `-z` for utilizada, os 2 `pathnames` s찾o separados\n"
"\t com um byte `NUL` (ASCII 0x00); sen찾o um byte tab (ASCII 0x09)\n"
"\t que os separam.\n"
"<origPath> O `pathname` dentro do commit localizado no HEAD ou no 챠ndice.\n"
@@ -55366,10 +49840,7 @@ msgstr "Outros itens"
#: en/git-status.txt:380
#, priority:280
msgid "Following the tracked entries (and if requested), a series of lines will be printed for untracked and then ignored items found in the worktree."
-msgstr ""
-"Ap처s as entradas rastreadas (se for solicitado), uma s챕rie de linhas ser찼 "
-"impressa para os itens n찾o rastreados e depois ignorados para os itens "
-"encontrados na 찼rvore de trabalho."
+msgstr "Ap처s as entradas rastreadas (se for solicitado), uma s챕rie de linhas ser찼 impressa para os itens n찾o rastreados e depois ignorados para os itens encontrados na 찼rvore de trabalho."
#. type: Plain text
#: en/git-status.txt:382
@@ -55405,18 +49876,13 @@ msgstr "Notas sobre o formato do `pathname` e `-z`"
#: en/git-status.txt:395
#, priority:280
msgid "When the `-z` option is given, pathnames are printed as is and without any quoting and lines are terminated with a NUL (ASCII 0x00) byte."
-msgstr ""
-"Quando a op챌찾o `z` 챕 utilizada os `pathnames` s찾o exibidos como est찾o e sem "
-"nenhuma cita챌찾o e as linhas s찾o terminadas com um byte NUL (ASCII 0x00)."
+msgstr "Quando a op챌찾o `z` 챕 utilizada os `pathnames` s찾o exibidos como est찾o e sem nenhuma cita챌찾o e as linhas s찾o terminadas com um byte NUL (ASCII 0x00)."
#. type: Plain text
#: en/git-status.txt:399
#, priority:280
msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgstr ""
-"Sem a op챌찾o `z`, os `pathnames` com os caracteres \"incomuns\" s찾o citados "
-"conforme explicado na vari찼vel da configura챌찾o `core.quotePath` (consulte "
-"linkgit:git-config[1])."
+msgstr "Sem a op챌찾o `z`, os `pathnames` com os caracteres \"incomuns\" s찾o citados conforme explicado na vari찼vel da configura챌찾o `core.quotePath` (consulte linkgit:git-config[1])."
#. type: Plain text
#: en/git-status.txt:408
@@ -55428,28 +49894,13 @@ msgstr "O comando segue a vari찼vel `color.status` (ou `status.color`, ambos t챗
#: en/git-status.txt:412
#, priority:280
msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
-msgstr ""
-"Se a vari찼vel da configura챌찾o `status.relativePaths` estiver configurada "
-"como `false`, todos os caminhos exibidos ser찾o relativos 횪 raiz do "
-"reposit처rio e n찾o ao diret처rio atual."
+msgstr "Se a vari찼vel da configura챌찾o `status.relativePaths` estiver configurada como `false`, todos os caminhos exibidos ser찾o relativos 횪 raiz do reposit처rio e n찾o ao diret처rio atual."
#. type: Plain text
#: en/git-status.txt:423
#, priority:280
msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
-msgstr ""
-"Se a vari찼vel `status.submoduleSummary` for definida como um n첬mero "
-"diferente de zero ou `true` (id챗ntico a `-1` ou um n첬mero ilimitado), o "
-"resumo do subm처dulo ser찼 ativado para o formato longo e um resumo das "
-"confirma챌천es para os subm처dulos modificados ser찾o exibidos (consulte a op챌찾o "
-"--summary-limit de linkgit:git-submodule[1]). Por favor note que a sa챠da "
-"resumida do comando status ser찼 suprimida para todos os subm처dulos quando a "
-"vari찼vel `diff.ignoreSubmodules` estiver definida como `all` ou apenas para "
-"aqueles subm처dulos em onde seja o mesmo que `submodule.<name>.ignore=all`. "
-"Para visualizar tamb챕m o resumo dos subm처dulos ignorados, voc챗 pode usar a "
-"op챌찾o de clinha de comando `--ignore-submodules=dirty ` ou o comando `git "
-"submodule summary`, que exibe uma sa챠da semelhante por챕m n찾o respeita estas "
-"configura챌천es."
+msgstr "Se a vari찼vel `status.submoduleSummary` for definida como um n첬mero diferente de zero ou `true` (id챗ntico a `-1` ou um n첬mero ilimitado), o resumo do subm처dulo ser찼 ativado para o formato longo e um resumo das confirma챌천es para os subm처dulos modificados ser찾o exibidos (consulte a op챌찾o --summary-limit de linkgit:git-submodule[1]). Por favor note que a sa챠da resumida do comando status ser찼 suprimida para todos os subm처dulos quando a vari찼vel `diff.ignoreSubmodules` estiver definida como `all` ou apenas para aqueles subm처dulos em onde seja o mesmo que `submodule.<name>.ignore=all`. Para visualizar tamb챕m o resumo dos subm처dulos ignorados, voc챗 pode usar a op챌찾o de clinha de comando `--ignore-submodules=dirty ` ou o comando `git submodule summary`, que exibe uma sa챠da semelhante por챕m n찾o respeita estas configura챌천es."
#. type: Title -
#: en/git-status.txt:425
@@ -55461,17 +49912,7 @@ msgstr "RENOVA횉횄O DO PLANO DE FUNDO"
#: en/git-status.txt:436
#, 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 comando `git status` renove automaticamente o 챠ndice, as "
-"estat챠sticas das informa챌천es armazenadas no cache da 찼rvore de trabalho e "
-"gravando o seu 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 repitam o "
-"nosso processamento). Quando o `status` 챕 executado em segundo plano, o "
-"bloqueio retido durante a grava챌찾o pode entrar em conflito com os outros "
-"processos simult창neos, causando falhas. Os scripts que executam `status` em "
-"segundo plano devem considerar a utiliza챌찾o do comando `git --no-optional-"
-"locks status` (para mais detalhes consulte linkgit:git[1])."
+msgstr "횋 predefinido que o comando `git status` renove automaticamente o 챠ndice, as estat챠sticas das informa챌천es armazenadas no cache da 찼rvore de trabalho e gravando o seu 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 repitam o nosso processamento). Quando o `status` 챕 executado em segundo plano, o bloqueio retido durante a grava챌찾o pode entrar em conflito com os outros processos simult창neos, causando falhas. Os scripts que executam `status` em segundo plano devem considerar a utiliza챌찾o do comando `git --no-optional-locks status` (para mais detalhes consulte linkgit:git[1])."
#. type: Title =
#: en/git-stripspace.txt:2
@@ -55499,10 +49940,7 @@ msgstr ""
#: en/git-stripspace.txt:21
#, priority:100
msgid "Read text, such as commit messages, notes, tags and branch descriptions, from the standard input and clean it in the manner used by Git."
-msgstr ""
-"Leia o texto, como mensagens de commit, notas, tags e suas respectivas "
-"descri챌천es das ramifica챌천es, da entrada predefinida e limpe-o da maneira "
-"utilizada pelo Git."
+msgstr "Leia o texto, como mensagens de commit, notas, tags e suas respectivas descri챌천es das ramifica챌천es, da entrada predefinida e limpe-o da maneira utilizada pelo Git."
#. type: Plain text
#: en/git-stripspace.txt:23
@@ -55548,10 +49986,8 @@ msgid ""
"mode of linkgit:git-apply[1] for correcting whitespace of patches or files in\n"
"the repository.\n"
msgstr ""
-"* NOTA *: Destina-se 횪 limpeza de metadados, prefira o modo "
-"`--whitespace=fix`\n"
-"do linkgit:git-apply[1] para corrigir os espa챌os em branco dos patches ou "
-"os\n"
+"* NOTA *: Destina-se 횪 limpeza de metadados, prefira o modo `--whitespace=fix`\n"
+"do linkgit:git-apply[1] para corrigir os espa챌os em branco dos patches ou os\n"
"arquivos no reposit처rio.\n"
#. type: Labeled list
@@ -55576,10 +50012,7 @@ msgstr "--comment-lines"
#: en/git-stripspace.txt:47
#, priority:100
msgid "Prepend comment character and blank to each line. Lines will automatically be terminated with a newline. On empty lines, only the comment character will be prepended."
-msgstr ""
-"Coloque um caractere de coment찼rio previamente com espa챌o em branco em cada "
-"linha. As linhas ser찾o automaticamente terminadas com uma nova linha. Nas "
-"linhas vazias, apenas o caractere de coment찼rio ser찼 anexado."
+msgstr "Coloque um caractere de coment찼rio previamente com espa챌o em branco em cada linha. As linhas ser찾o automaticamente terminadas com uma nova linha. Nas linhas vazias, apenas o caractere de coment찼rio ser찼 anexado."
#. type: Plain text
#: en/git-stripspace.txt:52
@@ -55727,9 +50160,7 @@ msgstr "Para mais informa챌천es sobre subm처dulos, consulte linkgit:gitsubmodule
#: en/git-submodule.txt:36
#, priority:220
msgid "With no arguments, shows the status of existing submodules. Several subcommands are available to perform operations on the submodules."
-msgstr ""
-"Sem argumentos, exiba a condi챌찾o geral dos subm처dulos j찼 existentes. V찼rios "
-"subcomandos est찾o dispon챠veis para execu챌찾o das opera챌천es nos subm처dulos."
+msgstr "Sem argumentos, exiba a condi챌찾o geral dos subm처dulos j찼 existentes. V찼rios subcomandos est찾o dispon챠veis para execu챌찾o das opera챌천es nos subm처dulos."
#. type: Labeled list
#: en/git-submodule.txt:37
@@ -55747,54 +50178,25 @@ msgstr "Adicione o reposit처rio informado como um subm처dulo no caminho especifi
#: en/git-submodule.txt:50
#, priority:220
msgid "<repository> is the URL of the new submodule's origin repository. This may be either an absolute URL, or (if it begins with ./ or ../), the location relative to the superproject's default remote repository (Please note that to specify a repository 'foo.git' which is located right next to a superproject 'bar.git', you'll have to use `../foo.git` instead of `./foo.git` - as one might expect when following the rules for relative URLs - because the evaluation of relative URLs in Git is identical to that of relative directories)."
-msgstr ""
-"O <reposit처rio> 챕 o URL do reposit처rio de origem do novo subm처dulo. Este "
-"pode ser um URL absoluto, ou (se come챌ar com ./ ou ../), a localiza챌찾o "
-"relativa ao reposit처rio predefinido do superprojeto remoto (Por favor note "
-"que para especificar um reposit처rio 'foo.git' que est찼 localizado bem ao "
-"lado de um superproject 'bar.git', voc챗 ter찼 que usar `../foo.git` em vez de "
-"`./foo.git` - como se pode esperar quando se seguem as regras para URLs "
-"relativas - porque a avalia챌찾o das URLs relativas no Git 챕 id챗ntica 횪 dos "
-"diret처rios relativos)."
+msgstr "O <reposit처rio> 챕 o URL do reposit처rio de origem do novo subm처dulo. Este pode ser um URL absoluto, ou (se come챌ar com ./ ou ../), a localiza챌찾o relativa ao reposit처rio predefinido do superprojeto remoto (Por favor note que para especificar um reposit처rio 'foo.git' que est찼 localizado bem ao lado de um superproject 'bar.git', voc챗 ter찼 que usar `../foo.git` em vez de `./foo.git` - como se pode esperar quando se seguem as regras para URLs relativas - porque a avalia챌찾o das URLs relativas no Git 챕 id챗ntica 횪 dos diret처rios relativos)."
#. type: Plain text
#: en/git-submodule.txt:57
#, priority:220
msgid "The default remote is the remote of the remote-tracking branch of the current branch. If no such remote-tracking branch exists or the HEAD is detached, \"origin\" is assumed to be the default remote. If the superproject doesn't have a default remote configured the superproject is its own authoritative upstream and the current working directory is used instead."
-msgstr ""
-"A predefini챌찾o do ramo remoto 챕 que ele seja monitorado pelo ramo atual. Se "
-"esse ramo monitorado remotamente n찾o exista ou o `HEAD` esteja desconectado, "
-"a \"origin\" ser찼 assumida como o ramo remoto predefinido. Caso o "
-"superprojeto n찾o tenha predefinido um ramo remoto configurado, o "
-"superprojeto ser찼 o seu pr처prio upstream autoritativo e ser찼 utilizado o "
-"diret처rio de trabalho atual."
+msgstr "A predefini챌찾o do ramo remoto 챕 que ele seja monitorado pelo ramo atual. Se esse ramo monitorado remotamente n찾o exista ou o `HEAD` esteja desconectado, a \"origin\" ser찼 assumida como o ramo remoto predefinido. Caso o superprojeto n찾o tenha predefinido um ramo remoto configurado, o superprojeto ser찼 o seu pr처prio upstream autoritativo e ser찼 utilizado o diret처rio de trabalho atual."
#. type: Plain text
#: en/git-submodule.txt:66
#, priority:220
msgid "The optional argument <path> is the relative location for the cloned submodule to exist in the superproject. If <path> is not given, the canonical part of the source repository is used (\"repo\" for \"/path/to/repo.git\" and \"foo\" for \"host.xz:foo/.git\"). If <path> exists and is already a valid Git repository, then it is staged for commit without cloning. The <path> is also used as the submodule's logical name in its configuration entries unless `--name` is used to specify a logical name."
-msgstr ""
-"O argumento opcional `<caminho>` 챕 o local relativo para que o subm처dulo "
-"clonado exista no superprojeto. Caso o `<caminho>` n찾o seja informado, a "
-"parte can척nica do reposit처rio da origem ser찼 utilizada (\"repo\" para o \"/"
-"path/to/repo.git\" e \"foo\" para o \"host.xz:foo/.git\"). Caso o `<caminho>`"
-" exista e j찼 for um reposit처rio Git v찼lido, ele ser찼 preparado para o commit "
-"sem clonagem. O `<caminho>` tamb챕m 챕 utilizado como o nome l처gico do sub-"
-"m처dulo nas suas entradas de configura챌찾o, a menos que `--name` seja "
-"utilizado para definir um nome l처gico."
+msgstr "O argumento opcional `<caminho>` 챕 o local relativo para que o subm처dulo clonado exista no superprojeto. Caso o `<caminho>` n찾o seja informado, a parte can척nica do reposit처rio da origem ser찼 utilizada (\"repo\" para o \"/path/to/repo.git\" e \"foo\" para o \"host.xz:foo/.git\"). Caso o `<caminho>` exista e j찼 for um reposit처rio Git v찼lido, ele ser찼 preparado para o commit sem clonagem. O `<caminho>` tamb챕m 챕 utilizado como o nome l처gico do sub-m처dulo nas suas entradas de configura챌찾o, a menos que `--name` seja utilizado para definir um nome l처gico."
#. type: Plain text
#: en/git-submodule.txt:74
#, priority:220
msgid "The given URL is recorded into `.gitmodules` for use by subsequent users cloning the superproject. If the URL is given relative to the superproject's repository, the presumption is the superproject and submodule repositories will be kept together in the same relative location, and only the superproject's URL needs to be provided. git-submodule will correctly locate the submodule using the relative URL in `.gitmodules`."
-msgstr ""
-"A URL informada 챕 registrada no `.gitmodules` para a utiliza챌찾o dos "
-"subsequentes usu찼rios que clonam o superprojeto. Caso a URL seja informada "
-"com rela챌찾o ao reposit처rio do superprojeto, a presun챌찾o que os reposit처rios "
-"do superprojeto e dos subm처dulos ser찾o mantidos juntos, pe처ximos do mesmo "
-"local, somente a URL do superprojeto precisar찼 ser informada. O comando "
-"`git-submodule` localizar찼 corretamente o subm처dulo utilizando uma URL "
-"relativa em `.gitmodules`."
+msgstr "A URL informada 챕 registrada no `.gitmodules` para a utiliza챌찾o dos subsequentes usu찼rios que clonam o superprojeto. Caso a URL seja informada com rela챌찾o ao reposit처rio do superprojeto, a presun챌찾o que os reposit처rios do superprojeto e dos subm처dulos ser찾o mantidos juntos, pe처ximos do mesmo local, somente a URL do superprojeto precisar찼 ser informada. O comando `git-submodule` localizar찼 corretamente o subm처dulo utilizando uma URL relativa em `.gitmodules`."
#. type: Labeled list
#: en/git-submodule.txt:75
@@ -55806,40 +50208,25 @@ msgstr "status [--cached] [--recursive] [--] [<caminho>...]"
#: en/git-submodule.txt:83
#, priority:220
msgid "Show the status of the submodules. This will print the SHA-1 of the currently checked out commit for each submodule, along with the submodule path and the output of 'git describe' for the SHA-1. Each SHA-1 will possibly be prefixed with `-` if the submodule is not initialized, `+` if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing repository and `U` if the submodule has merge conflicts."
-msgstr ""
-"Exiba a condi챌찾o geral dos subm처dulos. Ir찼 exibir o SHA-1 do commit "
-"registrado atualmente para cada subm처dulo, junto com o caminho do subm처dulo "
-"e a sa챠da do comando 'git description' para o SHA-1. Cada SHA-1 "
-"provavelmente ser찼 prefixado com `-` caso o subm처dulo n찾o seja "
-"inicializado,`+` caso o commit verificado do subm처dulo atual n찾o coincida "
-"com o SHA-1 encontrado no 챠ndice do reposit처rio que contenha o `U` caso o "
-"subm처dulo tenha conflitos de mesclagem."
+msgstr "Exiba a condi챌찾o geral dos subm처dulos. Ir찼 exibir o SHA-1 do commit registrado atualmente para cada subm처dulo, junto com o caminho do subm처dulo e a sa챠da do comando 'git description' para o SHA-1. Cada SHA-1 provavelmente ser찼 prefixado com `-` caso o subm처dulo n찾o seja inicializado,`+` caso o commit verificado do subm처dulo atual n찾o coincida com o SHA-1 encontrado no 챠ndice do reposit처rio que contenha o `U` caso o subm처dulo tenha conflitos de mesclagem."
#. type: Plain text
#: en/git-submodule.txt:86
#, priority:220
msgid "If `--cached` is specified, this command will instead print the SHA-1 recorded in the superproject for each submodule."
-msgstr ""
-"Caso a op챌찾o `--cached` seja utilizado, este comando exibir찼 o SHA-1 "
-"registrado no superprojeto para cada sub-m처dulo."
+msgstr "Caso a op챌찾o `--cached` seja utilizado, este comando exibir찼 o SHA-1 registrado no superprojeto para cada sub-m처dulo."
#. type: Plain text
#: en/git-submodule.txt:89
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into nested submodules, and show their status as well."
-msgstr ""
-"Caso `--recursive` seja utilizado, este comando ser찼 recusado no subm처dulos "
-"aninhados e exibir찼 a sua condi챌찾o geral tamb챕m."
+msgstr "Caso `--recursive` seja utilizado, este comando ser찼 recusado no subm처dulos aninhados e exibir찼 a sua condi챌찾o geral tamb챕m."
#. type: Plain text
#: en/git-submodule.txt:94
#, priority:220
msgid "If you are only interested in changes of the currently initialized submodules with respect to the commit recorded in the index or the HEAD, linkgit:git-status[1] and linkgit:git-diff[1] will provide that information too (and can also report changes to a submodule's work tree)."
-msgstr ""
-"Caso apenas tenha interesse nas altera챌천es dos subm처dulos inicializados no "
-"momento em rela챌찾o ao commit registrado no 챠ndice ou no HEAD, o linkgit:git-"
-"status[1] e o linkgit:git-diff[1] tamb챕m disponibilizar찾o essas informa챌천es ("
-"e podem tamb챕m relatar as altera챌천es na 찼rvore de trabalho de um subm처dulo)."
+msgstr "Caso apenas tenha interesse nas altera챌천es dos subm처dulos inicializados no momento em rela챌찾o ao commit registrado no 챠ndice ou no HEAD, o linkgit:git-status[1] e o linkgit:git-diff[1] tamb챕m disponibilizar찾o essas informa챌천es (e podem tamb챕m relatar as altera챌천es na 찼rvore de trabalho de um subm처dulo)."
#. type: Labeled list
#: en/git-submodule.txt:95
@@ -55851,44 +50238,25 @@ msgstr "init [--] [<caminho>...]"
#: en/git-submodule.txt:102
#, priority:220
msgid "Initialize the submodules recorded in the index (which were added and committed elsewhere) by setting `submodule.$name.url` in .git/config. It uses the same setting from `.gitmodules` as a template. If the URL is relative, it will be resolved using the default remote. If there is no default remote, the current repository will be assumed to be upstream."
-msgstr ""
-"Inicialize os subm처dulos registrados no 챠ndice (que foram adicionados e onde "
-"os commits foram feitos em outros lugares) configurando o `submodule.$name."
-"url` no `.git/config`. Ele usa a mesma configura챌찾o do `.gitmodules` como um "
-"modelo. Caso a URL seja relativa, ser찼 resolvido utilizando ramo remoto "
-"predefinido. Caso n찾o nenhum ramo remoto seja predefinido, o reposit처rio "
-"atual ser찼 reconhecido como sendo a inicial."
+msgstr "Inicialize os subm처dulos registrados no 챠ndice (que foram adicionados e onde os commits foram feitos em outros lugares) configurando o `submodule.$name.url` no `.git/config`. Ele usa a mesma configura챌찾o do `.gitmodules` como um modelo. Caso a URL seja relativa, ser찼 resolvido utilizando ramo remoto predefinido. Caso n찾o nenhum ramo remoto seja predefinido, o reposit처rio atual ser찼 reconhecido como sendo a inicial."
#. type: Plain text
#: en/git-submodule.txt:107
#, priority:220
msgid "Optional <path> arguments limit which submodules will be initialized. If no path is specified and submodule.active has been configured, submodules configured to be active will be initialized, otherwise all submodules are initialized."
-msgstr ""
-"Os argumentos opcionais do `<caminho>` limitam quais foram os subm처dulos que "
-"ser찾o inicializados. Caso nenhum caminho seja informado e o `submodule."
-"active` tenha sido configurado, apenas os subm처dulos configurados para "
-"estarem ativos ser찾o inicializados, caso contr찼rio, todos os subm처dulos "
-"ser찾o."
+msgstr "Os argumentos opcionais do `<caminho>` limitam quais foram os subm처dulos que ser찾o inicializados. Caso nenhum caminho seja informado e o `submodule.active` tenha sido configurado, apenas os subm처dulos configurados para estarem ativos ser찾o inicializados, caso contr찼rio, todos os subm처dulos ser찾o."
#. type: Plain text
#: en/git-submodule.txt:115
#, priority:220
msgid "When present, it will also copy the value of `submodule.$name.update`. This command does not alter existing information in .git/config. You can then customize the submodule clone URLs in .git/config for your local setup and proceed to `git submodule update`; you can also just use `git submodule update --init` without the explicit 'init' step if you do not intend to customize any submodule locations."
-msgstr ""
-"Quando presente, tamb챕m copiar찼 o valor do `submodule.$name.update`. Este "
-"comando n찾o altera as informa챌천es existentes no `.git/config`. 횋 poss챠vel "
-"personalizar os clones dos subm처dulos das URLs no `.git/config` para sua "
-"configura챌찾o local e prosseguir para o `git submodule update`; tam챕m 챕 "
-"poss챠vel utilizar o `git submodule update --init` sem a etapa 'init' de "
-"forma expl챠cita caso n찾o pretenda personalizar nenhum local do submodule."
+msgstr "Quando presente, tamb챕m copiar찼 o valor do `submodule.$name.update`. Este comando n찾o altera as informa챌천es existentes no `.git/config`. 횋 poss챠vel personalizar os clones dos subm처dulos das URLs no `.git/config` para sua configura챌찾o local e prosseguir para o `git submodule update`; tam챕m 챕 poss챠vel utilizar o `git submodule update --init` sem a etapa 'init' de forma expl챠cita caso n찾o pretenda personalizar nenhum local do submodule."
#. type: Plain text
#: en/git-submodule.txt:117
#, priority:220
msgid "See the add subcommand for the definition of default remote."
-msgstr ""
-"Consulte o subcomando `add` para obter a defini챌찾o predefinida do ramo "
-"remoto."
+msgstr "Consulte o subcomando `add` para obter a defini챌찾o predefinida do ramo remoto."
#. type: Labeled list
#: en/git-submodule.txt:118
@@ -55900,39 +50268,25 @@ msgstr "deinit [-f|--force] (--all|[--] <caminho>...)"
#: en/git-submodule.txt:125
#, priority:220
msgid "Unregister the given submodules, i.e. remove the whole `submodule.$name` section from .git/config together with their work tree. Further calls to `git submodule update`, `git submodule foreach` and `git submodule sync` will skip any unregistered submodules until they are initialized again, so use this command if you don't want to have a local checkout of the submodule in your working tree anymore."
-msgstr ""
-"Cancele o registro dos subm처dulos informado, ou seja, remova toda a se챌찾o "
-"`submodule.$name` do `.git/config` junto com a sua 찼rvore de trabalho. "
-"Outras futuras chamadas para o comando `git submodule update`, `git "
-"submodule foreach` e `git submodule sync` ir찾o ignorar todos os subm처dulos "
-"n찾o registrados at챕 que sejam inicializados novamente, ent찾o utilize este "
-"comando caso n찾o queira mais fazer uma verifica챌찾o do subm처dulo na sua "
-"찼rvore de trabalho local."
+msgstr "Cancele o registro dos subm처dulos informado, ou seja, remova toda a se챌찾o `submodule.$name` do `.git/config` junto com a sua 찼rvore de trabalho. Outras futuras chamadas para o comando `git submodule update`, `git submodule foreach` e `git submodule sync` ir찾o ignorar todos os subm처dulos n찾o registrados at챕 que sejam inicializados novamente, ent찾o utilize este comando caso n찾o queira mais fazer uma verifica챌찾o do subm처dulo na sua 찼rvore de trabalho local."
#. type: Plain text
#: en/git-submodule.txt:128
#, priority:220
msgid "When the command is run without pathspec, it errors out, instead of deinit-ing everything, to prevent mistakes."
-msgstr ""
-"O comando exibe um erro quando for executado sem o `pathspec` em vez de "
-"cancelar a inicializa챌찾o de tudo, evitando erros."
+msgstr "O comando exibe um erro quando for executado sem o `pathspec` em vez de cancelar a inicializa챌찾o de tudo, evitando erros."
#. type: Plain text
#: en/git-submodule.txt:131
#, priority:220
msgid "If `--force` is specified, the submodule's working tree will be removed even if it contains local modifications."
-msgstr ""
-"Caso `--force` seja utilizado, a 찼rvore de trabalho do subm처dulo ser찼 "
-"removida, mesmo que contenha altera챌천es locais."
+msgstr "Caso `--force` seja utilizado, a 찼rvore de trabalho do subm처dulo ser찼 removida, mesmo que contenha altera챌천es locais."
#. type: Plain text
#: en/git-submodule.txt:135
#, 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 realmente deseja remover um subm처dulo do reposit처rio e fazer o commit "
-"em vez disso utilize linkgit:git-rm[1] Para op챌천es de remo챌찾o consulte "
-"linkgit:gitsubmodules[7]."
+msgstr "Caso realmente deseja remover um subm처dulo do reposit처rio e fazer o commit em vez disso utilize linkgit:git-rm[1] Para op챌천es de remo챌찾o consulte linkgit:gitsubmodules[7]."
#. type: Labeled list
#: en/git-submodule.txt:136
@@ -55944,16 +50298,7 @@ msgstr "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-
#: en/git-submodule.txt:148
#, priority:220
msgid "Update the registered submodules to match what the superproject expects by cloning missing submodules, fetching missing commits in submodules and updating the working tree of the submodules. The \"updating\" can be done in several ways depending on command line options and the value of `submodule.<name>.update` configuration variable. The command line option takes precedence over the configuration variable. If neither is given, a 'checkout' is performed. The 'update' procedures supported both from the command line as well as through the `submodule.<name>.update` configuration are:"
-msgstr ""
-"Atualize os subm처dulos registrados para que coincidam com o que o "
-"superprojeto espera, clonando os subm처dulos ausentes, capturando os commit "
-"que estejam ausentes nos subm처dulos e atualizando a 찼rvore de trabalho dos "
-"subm처dulos. A \"atualiza챌찾o\" pode ser feita de v찼rias maneiras, dependendo "
-"das op챌천es da linha de comando e do valor da vari찼vel de configura챌찾o "
-"`submodule.<nome>.update`. A op챌찾o da linha de comando tem preced챗ncia sobre "
-"a vari찼vel de configura챌찾o. Caso nenhum seja informado, um 'checkout' 챕 "
-"realizado. Os procedimentos de 'atualiza챌찾o' compat챠veis tanto na linha de "
-"comando quanto na configura챌찾o `submodule.<nome>.update` s찾o:"
+msgstr "Atualize os subm처dulos registrados para que coincidam com o que o superprojeto espera, clonando os subm처dulos ausentes, capturando os commit que estejam ausentes nos subm처dulos e atualizando a 찼rvore de trabalho dos subm처dulos. A \"atualiza챌찾o\" pode ser feita de v찼rias maneiras, dependendo das op챌천es da linha de comando e do valor da vari찼vel de configura챌찾o `submodule.<nome>.update`. A op챌찾o da linha de comando tem preced챗ncia sobre a vari찼vel de configura챌찾o. Caso nenhum seja informado, um 'checkout' 챕 realizado. Os procedimentos de 'atualiza챌찾o' compat챠veis tanto na linha de comando quanto na configura챌찾o `submodule.<nome>.update` s찾o:"
#. type: Labeled list
#: en/git-submodule.txt:149
@@ -55977,10 +50322,7 @@ msgstr "verificado no subm처dulo em um HEAD desanexado.\n"
#: en/git-submodule.txt:156
#, priority:220
msgid "If `--force` is specified, the submodule will be checked out (using `git checkout --force`), even if the commit specified in the index of the containing repository already matches the commit checked out in the submodule."
-msgstr ""
-"Caso a op챌찾o `--force` utilizado, o subm처dulo ser찼 averiguado (utilizando `"
-"git checkout --force`), mesmo que o commit definido no 챠ndice do reposit처rio "
-"que o contenha j찼 coincida com os commits que j찼 foram verificados."
+msgstr "Caso a op챌찾o `--force` utilizado, o subm처dulo ser찼 averiguado (utilizando `git checkout --force`), mesmo que o commit definido no 챠ndice do reposit처rio que o contenha j찼 coincida com os commits que j찼 foram verificados."
#. type: Labeled list
#: en/git-submodule.txt:157
@@ -56016,9 +50358,7 @@ msgstr "na ramifica챌찾o atual no subm처dulo.\n"
#: en/git-submodule.txt:165
#, priority:220
msgid "The following 'update' procedures are only available via the `submodule.<name>.update` configuration variable:"
-msgstr ""
-"Os seguintes procedimentos de 'atualiza챌찾o' est찾o dispon챠veis apenas atrav챕s "
-"da vari찼vel de configura챌찾o `submodule.<nome>.update`:"
+msgstr "Os seguintes procedimentos de 'atualiza챌찾o' est찾o dispon챠veis apenas atrav챕s da vari찼vel de configura챌찾o `submodule.<nome>.update`:"
#. type: Labeled list
#: en/git-submodule.txt:166
@@ -56056,18 +50396,13 @@ msgstr "o subm처dulo n찾o 챕 atualizado."
#: en/git-submodule.txt:177
#, priority:220
msgid "If the submodule is not yet initialized, and you just want to use the setting as stored in `.gitmodules`, you can automatically initialize the submodule with the `--init` option."
-msgstr ""
-"Se o subm처dulo ainda n찾o foi inicializado e voc챗 apenas deseja utilizar a "
-"configura챌찾o armazenada no `.gitmodules`, voc챗 pode inicializar "
-"automaticamente o subm처dulo com a op챌찾o `--init`."
+msgstr "Se o subm처dulo ainda n찾o foi inicializado e voc챗 apenas deseja utilizar a configura챌찾o armazenada no `.gitmodules`, voc챗 pode inicializar automaticamente o subm처dulo com a op챌찾o `--init`."
#. type: Plain text
#: en/git-submodule.txt:180
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and update any nested submodules within."
-msgstr ""
-"Caso a op챌찾o `--recursive` seja utilizada, este comando recursar찼 nos "
-"subm처dulos registrados e atualizar찼 todos os subm처dulos aninhados."
+msgstr "Caso a op챌찾o `--recursive` seja utilizada, este comando recursar찼 nos subm처dulos registrados e atualizar찼 todos os subm처dulos aninhados."
#. type: Labeled list
#: en/git-submodule.txt:181
@@ -56085,11 +50420,7 @@ msgstr "set-branch (-d|--default) [--] <caminho>"
#: en/git-submodule.txt:187
#, priority:220
msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
-msgstr ""
-"Define o subm처dulo como predefinido nos ramos monitorados remotamente. A "
-"op챌찾o `--branch` permite que o nome do ramo remoto seja definido. A op챌찾o "
-"`--default` remove a chave da configura챌찾o `submodule.<nome>.branch`, que "
-"faz com que a predefini챌찾o do ramo monitorado seja 'master'."
+msgstr "Define o subm처dulo como predefinido nos ramos monitorados remotamente. A op챌찾o `--branch` permite que o nome do ramo remoto seja definido. A op챌찾o `--default` remove a chave da configura챌찾o `submodule.<nome>.branch`, que faz com que a predefini챌찾o do ramo monitorado seja 'master'."
#. type: Labeled list
#: en/git-submodule.txt:188
@@ -56101,9 +50432,7 @@ msgstr "set-url [--] <caminho> <newurl>"
#: en/git-submodule.txt:192
#, priority:220
msgid "Sets the URL of the specified submodule to <newurl>. Then, it will automatically synchronize the submodule's new remote URL configuration."
-msgstr ""
-"Define a URL do subm처dulo informado para `<newurl>` . Em seguida, sincronize "
-"automaticamente a nova configura챌찾o da URL remota do subm처dulo."
+msgstr "Define a URL do subm처dulo informado para `<newurl>` . Em seguida, sincronize automaticamente a nova configura챌찾o da URL remota do subm처dulo."
#. type: Labeled list
#: en/git-submodule.txt:193
@@ -56115,23 +50444,13 @@ msgstr "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<ca
#: en/git-submodule.txt:202
#, priority:220
msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
-msgstr ""
-"Exiba o resumo do commit entre o commit informado (a predefini챌찾o 챕 `HEAD`) "
-"e a 찼rvore de trabalho/챠ndice. Para um subm처dulo em quest찾o, s찾o exibidas "
-"uma s챕rie de commit do subm처dulo entre o commit do super projeto e o 챠ndice "
-"ou a 찼rvore de trabalho (alternada por `--cached`). Caso a op챌찾o `--files` "
-"seja utilizada, exiba a s챕rie dos commits no subm처dulo entre o 챠ndice do "
-"super projeto e a 찼rvore de trabalho do subm처dulo (esta op챌찾o n찾o permite a "
-"utiliza챌찾o da op챌찾o `--cached` ou para informar um commit de forma "
-"expl챠cita)."
+msgstr "Exiba o resumo do commit entre o commit informado (a predefini챌찾o 챕 `HEAD`) e a 찼rvore de trabalho/챠ndice. Para um subm처dulo em quest찾o, s찾o exibidas uma s챕rie de commit do subm처dulo entre o commit do super projeto e o 챠ndice ou a 찼rvore de trabalho (alternada por `--cached`). Caso a op챌찾o `--files` seja utilizada, exiba a s챕rie dos commits no subm처dulo entre o 챠ndice do super projeto e a 찼rvore de trabalho do subm처dulo (esta op챌찾o n찾o permite a utiliza챌찾o da op챌찾o `--cached` ou para informar um commit de forma expl챠cita)."
#. type: Plain text
#: en/git-submodule.txt:205
#, priority:220
msgid "Using the `--submodule=log` option with linkgit:git-diff[1] will provide that information too."
-msgstr ""
-"O uso da op챌찾o `--submodule=log` com linkgit:git-diff[1] tamb챕m fornecer찼 "
-"estas informa챌천es."
+msgstr "O uso da op챌찾o `--submodule=log` com linkgit:git-diff[1] tamb챕m fornecer찼 estas informa챌천es."
#. type: Labeled list
#: en/git-submodule.txt:206
@@ -56143,33 +50462,13 @@ msgstr "foreach [--recursive] <comando>"
#: en/git-submodule.txt:227
#, priority:220
msgid "Evaluates an arbitrary shell command in each checked out submodule. The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject. Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable. Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command. If `--recursive` is given, submodules are traversed recursively (i.e. the given shell command is evaluated in nested submodules as well). A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
-msgstr ""
-"Avalia um comando arbitr찼rio do shell em cada sub-m처dulo averiguado. O "
-"comando tem acesso 횪s vari찼veis `$name`, `$sm_path`, `$displaypath`, `$sha1` "
-"e `$toplevel`: '$name' 챕 o nome da se챌찾o do subm처dulo relevante no `."
-"gitmodules`, '$sm_path' 챕 o caminho do subm처dulo conforme foi diretamente "
-"registrado no superprojeto, '$displaypath' cont챕m o caminho relativo do "
-"diret처rio de trabalho atual para o diret처rio raiz dos sub-m처dulos, '$sha1' 챕 "
-"o commit conforme registrado diretamente no superprojeto e '$toplevel' 챕 o "
-"caminho absoluto e direto para o n챠vel mais alto do superprojeto. Observe "
-"que para evitar conflitos com '$ PATH' no Windows, a vari찼vel '$path' agora "
-"챕 um sin척nimo obsoleto da vari찼vel '$sm_path'. Todos os subm처dulos "
-"definidos no superprojeto, mas sem averigua챌찾o, s찾o ignorados por este "
-"comando. A menos que seja utilizado a op챌찾o `--quiet`, o 'foreach' imprime o "
-"nome de cada subm처dulo antes de avaliar o comando. Caso a op챌찾o "
-"`--recursive` seja utilizada, os subm처dulos ser찾o percorridos de forma "
-"recursiva (ou seja, o comando shell informado tamb챕m ser찼 avaliado nos "
-"subm처dulos aninhados). Um retorno do comando diferente de zero em qualquer "
-"subm처dulo, faz com que o processamento seja finalizado. Isso pode ser "
-"alterado adicionando '|| :' at챕 o final do comando."
+msgstr "Avalia um comando arbitr찼rio do shell em cada sub-m처dulo averiguado. O comando tem acesso 횪s vari찼veis `$name`, `$sm_path`, `$displaypath`, `$sha1` e `$toplevel`: '$name' 챕 o nome da se챌찾o do subm처dulo relevante no `.gitmodules`, '$sm_path' 챕 o caminho do subm처dulo conforme foi diretamente registrado no superprojeto, '$displaypath' cont챕m o caminho relativo do diret처rio de trabalho atual para o diret처rio raiz dos sub-m처dulos, '$sha1' 챕 o commit conforme registrado diretamente no superprojeto e '$toplevel' 챕 o caminho absoluto e direto para o n챠vel mais alto do superprojeto. Observe que para evitar conflitos com '$ PATH' no Windows, a vari찼vel '$path' agora 챕 um sin척nimo obsoleto da vari찼vel '$sm_path'. Todos os subm처dulos definidos no superprojeto, mas sem averigua챌찾o, s찾o ignorados por este comando. A menos que seja utilizado a op챌찾o `--quiet`, o 'foreach' imprime o nome de cada subm처dulo antes de avaliar o comando. Caso a op챌찾o `--recursive` seja utilizada, os subm처dulos ser찾o percorridos de forma recursiva (ou seja, o comando shell informado tamb챕m ser찼 avaliado nos subm처dulos aninhados). Um retorno do comando diferente de zero em qualquer subm처dulo, faz com que o processamento seja finalizado. Isso pode ser alterado adicionando '|| :' at챕 o final do comando."
#. type: Plain text
#: en/git-submodule.txt:230
#, priority:220
msgid "As an example, the command below will show the path and currently checked out commit for each submodule:"
-msgstr ""
-"Como um exemplo, o comando abaixo exibir찼 o caminho e a averigua챌찾o atual do "
-"commit para cada subm처dulo:"
+msgstr "Como um exemplo, o comando abaixo exibir찼 o caminho e a averigua챌찾o atual do commit para cada subm처dulo:"
#. type: delimited block -
#: en/git-submodule.txt:233
@@ -56187,28 +50486,19 @@ msgstr "sync [--recursive] [--] [<caminho>...]"
#: en/git-submodule.txt:242
#, priority:220
msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
-msgstr ""
-"Sincroniza a configura챌찾o da URL remota dos subm처dulos com o valor definido "
-"em `.gitmodules`. Afetar찼 apenas os subm처dulos que j찼 possuem uma entrada da "
-"URL no `.git/config` (챕 o caso quando eles s찾o inicializados ou foram "
-"adicionados recentemente). 횋 첬til quando as URLs do subm처dulo mudam a "
-"inicial e voc챗 precisa atualizar os seus reposit처rios locais de acordo."
+msgstr "Sincroniza a configura챌찾o da URL remota dos subm처dulos com o valor definido em `.gitmodules`. Afetar찼 apenas os subm처dulos que j찼 possuem uma entrada da URL no `.git/config` (챕 o caso quando eles s찾o inicializados ou foram adicionados recentemente). 횋 첬til quando as URLs do subm처dulo mudam a inicial e voc챗 precisa atualizar os seus reposit처rios locais de acordo."
#. type: Plain text
#: en/git-submodule.txt:245
#, priority:220
msgid "`git submodule sync` synchronizes all submodules while `git submodule sync -- A` synchronizes submodule \"A\" only."
-msgstr ""
-"O comando `git submodule sync` sincroniza todos os subm처dulos enquanto o "
-"comando `git submodule sync - A` sincroniza apenas o subm처dulo \"A\"."
+msgstr "O comando `git submodule sync` sincroniza todos os subm처dulos enquanto o comando `git submodule sync - A` sincroniza apenas o subm처dulo \"A\"."
#. type: Plain text
#: en/git-submodule.txt:248
#, priority:220
msgid "If `--recursive` is specified, this command will recurse into the registered submodules, and sync any nested submodules within."
-msgstr ""
-"Caso a op챌찾o `--recursive` seja utilizada, este comando recursar찼 nos "
-"subm처dulos registrados e sincronizar찼 todos os subm처dulos aninhados."
+msgstr "Caso a op챌찾o `--recursive` seja utilizada, este comando recursar찼 nos subm처dulos registrados e sincronizar찼 todos os subm처dulos aninhados."
#. type: Labeled list
#: en/git-submodule.txt:249
@@ -56220,22 +50510,13 @@ msgstr "absorbgitdirs"
#: en/git-submodule.txt:256
#, priority:220
msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superproject's `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
-msgstr ""
-"Caso um diret처rio git de um subm처dulo estiver dentro dele, mova o diret처rio "
-"git do subm처dulo para o caminho `$ GIT_DIR/modules` do superprojeto, conecte "
-"o diret처rio git, o seu diret처rio de trabalho, definindo `core.worktree` e "
-"adicionando um Arquivo .git apontando para o diret처rio git incorporado no "
-"diret처rio git dos superprojetos."
+msgstr "Caso um diret처rio git de um subm처dulo estiver dentro dele, mova o diret처rio git do subm처dulo para o caminho `$ GIT_DIR/modules` do superprojeto, conecte o diret처rio git, o seu diret처rio de trabalho, definindo `core.worktree` e adicionando um Arquivo .git apontando para o diret처rio git incorporado no diret처rio git dos superprojetos."
#. type: Plain text
#: en/git-submodule.txt:260
#, priority:220
msgid "A repository that was cloned independently and later added as a submodule or old setups have the submodules git directory inside the submodule instead of embedded into the superprojects git directory."
-msgstr ""
-"Um reposit처rio que foi clonado de forma independente e posteriormente "
-"adicionado como um subm처dulo ou com configura챌천es antigas, que possua o "
-"diret처rio git dentro do subm처dulo, em vez de estar incorporado ao diret처rio "
-"git dos superprojetos."
+msgstr "Um reposit처rio que foi clonado de forma independente e posteriormente adicionado como um subm처dulo ou com configura챌천es antigas, que possua o diret처rio git dentro do subm처dulo, em vez de estar incorporado ao diret처rio git dos superprojetos."
#. type: Plain text
#: en/git-submodule.txt:262
@@ -56253,12 +50534,7 @@ msgstr "Exiba apenas as mensagens de erro."
#: en/git-submodule.txt:275
#, 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` e `update`. 횋 predefinido que "
-"a condi챌찾o geral do progresso seja relatada no fluxo de erros quando estiver "
-"conectado em um terminal, a menos que `-q` seja utilizado. Esta op챌찾o imp천em "
-"a condi챌찾o geral do progresso, mesmo que o fluxo de erro predefinido n찾o "
-"seja direcionado para um terminal."
+msgstr "Esta op챌찾o s처 챕 v찼lida para os comandos `add` e `update`. 횋 predefinido que a condi챌찾o geral do progresso seja relatada no fluxo de erros quando estiver conectado em um terminal, a menos que `-q` seja utilizado. Esta op챌찾o imp천em a condi챌찾o geral do progresso, mesmo que o fluxo de erro predefinido n찾o seja direcionado para um terminal."
#. type: Plain text
#: en/git-submodule.txt:279
@@ -56276,36 +50552,19 @@ msgstr "-b <ramo>"
#: en/git-submodule.txt:288
#, priority:220
msgid "Branch of repository to add as submodule. The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`. A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository. If the option is not specified, it defaults to 'master'."
-msgstr ""
-"O ramo do reposit처rio para ser adicionado como um subm처dulo. O nome do ramo "
-"챕 registrado como `submodule.<nome>.branch` no `.gitmodules` para `update "
-"--remote`. Um valor especial de `.` 챕 utilizado para indicar que o nome do "
-"ramo no subm처dulo deve ser o mesmo nome como o da ramifica챌찾o atual, no "
-"reposit처rio atual. Caso a op챌찾o n찾o seja utilizada, a predefini챌찾o ser찼 "
-"'master'."
+msgstr "O ramo do reposit처rio para ser adicionado como um subm처dulo. O nome do ramo 챕 registrado como `submodule.<nome>.branch` no `.gitmodules` para `update --remote`. Um valor especial de `.` 챕 utilizado para indicar que o nome do ramo no subm처dulo deve ser o mesmo nome como o da ramifica챌찾o atual, no reposit처rio atual. Caso a op챌찾o n찾o seja utilizada, a predefini챌찾o ser찼 'master'."
#. type: Plain text
#: en/git-submodule.txt:301
#, 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 subm처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 averigua챌찾o), descarte as altera챌천es locais nos "
-"subm처dulos durante a altern창ncia para um commit diferente; sempre execute "
-"uma opera챌찾o de averigua챌찾o no subm처dulo, mesmo que o commit listado no "
-"챠ndice do reposit처rio coincida com o commit averiguado no subm처dulo."
+msgstr "Esta op챌찾o s처 챕 v찼lida para os comandos `add`, `deinit` e `update`. Ao executar `add`, permita adicionar um caminho ignorado do subm처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 averigua챌찾o), descarte as altera챌천es locais nos subm처dulos durante a altern창ncia para um commit diferente; sempre execute uma opera챌찾o de averigua챌찾o no subm처dulo, mesmo que o commit listado no 챠ndice do reposit처rio coincida com o commit averiguado 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 utilizam o commit encontrado no subm처dulo `HEAD`, por챕m "
-"o commit armazenado no 챠ndice que 챕 utilizado em seu lugar."
+msgstr "Esta op챌찾o s처 챕 v찼lida para os comandos `status` e `summary`. Esses comandos normalmente utilizam o commit encontrado no subm처dulo `HEAD`, por챕m o commit armazenado no 챠ndice que 챕 utilizado em seu lugar."
#. type: Labeled list
#: en/git-submodule.txt:307
@@ -56317,10 +50576,7 @@ msgstr "--files"
#: en/git-submodule.txt:311
#, 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 챕 "
-"utilizada o comando compara o commit no 챠ndice em conjunto com o que est찼 no "
-"subm처dulo `HEAD`."
+msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `summary`. Quando esta op챌찾o 챕 utilizada 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
@@ -56332,12 +50588,7 @@ msgstr "--summary-limit"
#: en/git-submodule.txt:319
#, 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). O n첬mero 0 desativa 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."
+msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `summary`. Limite o tamanho do resumo (quantidade de commits exibidos no total). O n첬mero 0 desativa 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
@@ -56349,50 +50600,25 @@ msgstr "--remote"
#: en/git-submodule.txt:329
#, 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 utilizar o SHA-1 "
-"registrado no superprojeto para atualizar o subm처dulo, utilize a condi챌찾o "
-"geral do subm처dulo do ramo monitorado remotamente. O ramo remoto utilizado "
-"챕 o ramo (`branch.<name>.remote`) predefinido para `origin`. O ramo remoto "
-"utiliza a predefini챌찾o `master`, por챕m o nome do ramo pode ser substitu챠do "
-"ao definir a op챌찾o `submodule.<nome>.branch` ou entre `.gitmodules` ou `.git/"
-"config` (onde `.git/config` tem prioridade)."
+msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `update`. Em vez de utilizar o SHA-1 registrado no superprojeto para atualizar o subm처dulo, utilize a condi챌찾o geral do subm처dulo do ramo monitorado remotamente. O ramo remoto utilizado 챕 o ramo (`branch.<name>.remote`) predefinido para `origin`. O ramo remoto utiliza a predefini챌찾o `master`, por챕m o nome do ramo pode ser substitu챠do ao definir a op챌찾o `submodule.<nome>.branch` ou entre `.gitmodules` ou `.git/config` (onde `.git/config` tem prioridade)."
#. type: Plain text
#: en/git-submodule.txt:335
#, priority:220
msgid "This works for any of the supported update procedures (`--checkout`, `--rebase`, etc.). The only change is the source of the target SHA-1. For example, `submodule update --remote --merge` will merge upstream submodule changes into the submodules, while `submodule update --merge` will merge superproject gitlink changes into the submodules."
-msgstr ""
-"Funciona para qualquer um dos procedimentos compat챠veis de atualiza챌찾o "
-"(`--checkout`, `--rebase`, etc.). A 첬nica altera챌찾o 챕 a origem do SHA-1 do "
-"destino. Por exemplo, `submodule update --remote --merge` mesclar찼 as "
-"altera챌천es iniciais do subm처dulo nos subm처dulos, enquanto `submodule update "
-"--merge` mesclar찼 as altera챌천es do 'gitlink' do superprojeto nos subm처dulos."
+msgstr "Funciona para qualquer um dos procedimentos compat챠veis de atualiza챌찾o (`--checkout`, `--rebase`, etc.). A 첬nica altera챌찾o 챕 a origem do SHA-1 do destino. Por exemplo, `submodule update --remote --merge` mesclar찼 as altera챌천es iniciais do subm처dulo nos subm처dulos, enquanto `submodule update --merge` mesclar찼 as altera챌천es do 'gitlink' do superprojeto nos subm처dulos."
#. type: Plain text
#: en/git-submodule.txt:340
#, priority:220
msgid "In order to ensure a current tracking branch state, `update --remote` fetches the submodule's remote repository before calculating the SHA-1. If you don't want to fetch, you should use `submodule update --remote --no-fetch`."
-msgstr ""
-"Para garantir uma condi챌찾o de monitoramento da ramifica챌찾o atual, `update "
-"--remote` captura o reposit처rio remoto do subm처dulo antes de calcular o seu "
-"SHA-1. Caso n찾o queira capturar, utilize `submodule update --remote --no-"
-"fetch`."
+msgstr "Para garantir uma condi챌찾o de monitoramento da ramifica챌찾o atual, `update --remote` captura o reposit처rio remoto do subm처dulo antes de calcular o seu SHA-1. Caso n찾o queira capturar, utilize `submodule update --remote --no-fetch`."
#. type: Plain text
#: en/git-submodule.txt:350
#, priority:220
msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD. Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
-msgstr ""
-"Use esta op챌찾o para integrar as altera챌천es do subprojeto inicial ao `HEAD` "
-"atual do seu subm처dulo. Como alternativa, voc챗 pode executar o comando `git "
-"pull` a partir do subm처dulo, que 챕 equivalente, exceto pelo nome do ramo "
-"remoto: `update --remote` utiliza o reposit처rio inicial predefinido e "
-"`submodule.<nome>.branch`, enquanto `git pull` utiliza o subm처dulo "
-"`branch.<name>.merge`. Prefira o `submodule.<name>.branch` caso queira "
-"distribuir a ramifica챌찾o inicial predefinido com o superprojeto e "
-"`branch.<nome>.merge` caso queira uma sensa챌찾o mais nativa ao trabalhar no "
-"pr처prio subm처dulo."
+msgstr "Use esta op챌찾o para integrar as altera챌천es do subprojeto inicial ao `HEAD` atual do seu subm처dulo. Como alternativa, voc챗 pode executar o comando `git pull` a partir do subm처dulo, que 챕 equivalente, exceto pelo nome do ramo remoto: `update --remote` utiliza o reposit처rio inicial predefinido e `submodule.<nome>.branch`, enquanto `git pull` utiliza o subm처dulo `branch.<name>.merge`. Prefira o `submodule.<name>.branch` caso queira distribuir a ramifica챌찾o inicial predefinido com o superprojeto e `branch.<nome>.merge` caso queira uma sensa챌찾o mais nativa ao trabalhar no pr처prio subm처dulo."
#. type: Labeled list
#: en/git-submodule.txt:352
@@ -56404,9 +50630,7 @@ msgstr "--no-fetch"
#: en/git-submodule.txt:355
#, 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 capture os novos "
-"objetos do site remoto."
+msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `update`. N찾o capture os novos objetos do site remoto."
#. type: Labeled list
#: en/git-submodule.txt:356
@@ -56418,27 +50642,13 @@ msgstr "--checkout"
#: en/git-submodule.txt:364
#, priority:220
msgid "This option is only valid for the update command. Checkout the commit recorded in the superproject on a detached HEAD in the submodule. This is the default behavior, the main use of this option is to override `submodule.$name.update` when set to a value other than `checkout`. If the key `submodule.$name.update` is either not explicitly set or set to `checkout`, this option is implicit."
-msgstr ""
-"Esta op챌찾o s처 챕 v찼lida para o comando `update`. Fa챌a a averigua챌찾o do "
-"commit registrado no superprojeto em um `HEAD` desanexado no subm처dulo. Este "
-"챕 o comportamento predefinido, a utiliza챌찾o principal desta op챌찾o 챕 "
-"substituir o `submodule.$name.update` quando definido como um valor "
-"diferente do `checkout`. Caso a chave do `submodule.$name.update` n찾o "
-"esteja nem explicitamente configurada ou definida com `checkout` (para "
-"averigua챌찾o), ent찾o esta op챌찾o se torna impl챠cita."
+msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `update`. Fa챌a a averigua챌찾o do commit registrado no superprojeto em um `HEAD` desanexado no subm처dulo. Este 챕 o comportamento predefinido, a utiliza챌찾o principal desta op챌찾o 챕 substituir o `submodule.$name.update` quando definido como um valor diferente do `checkout`. Caso a chave do `submodule.$name.update` n찾o esteja nem explicitamente configurada ou definida com `checkout` (para averigua챌찾o), ent찾o esta op챌찾o se torna impl챠cita."
#. type: Plain text
#: en/git-submodule.txt:374
#, priority:220
msgid "This option is only valid for the update command. Merge the commit recorded in the superproject into the current branch of the submodule. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve the resulting conflicts within the submodule with the usual conflict resolution tools. If the key `submodule.$name.update` is set to `merge`, this option is implicit."
-msgstr ""
-"Esta op챌찾o s처 챕 v찼lida para o comando `update`. Mescle o commit registrado "
-"no superprojeto do ramo atual do subm처dulo. Caso esta op챌찾o seja utilizada, "
-"o `HEAD` do subm처dulo n찾o ser찼 desconectado. Caso uma mesclagem falhe e "
-"interrompa este processo, ser찼 necess찼rio resolver os conflitos resultantes "
-"no subm처dulo com as ferramentas habituais da resolu챌찾o de conflitos. Caso a "
-"chave `submodule.$name.update` esteja configurada para `mesclar`, ent찾o esta "
-"op챌찾o se torna impl챠cita."
+msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `update`. Mescle o commit registrado no superprojeto do ramo atual do subm처dulo. Caso esta op챌찾o seja utilizada, o `HEAD` do subm처dulo n찾o ser찼 desconectado. Caso uma mesclagem falhe e interrompa este processo, ser찼 necess찼rio resolver os conflitos resultantes no subm처dulo com as ferramentas habituais da resolu챌찾o de conflitos. Caso a chave `submodule.$name.update` esteja configurada para `mesclar`, ent찾o esta op챌찾o se torna impl챠cita."
#. type: Labeled list
#: en/git-submodule.txt:375
@@ -56450,13 +50660,7 @@ msgstr "--rebase"
#: en/git-submodule.txt:383
#, priority:220
msgid "This option is only valid for the update command. Rebase the current branch onto the commit recorded in the superproject. If this option is given, the submodule's HEAD will not be detached. If a merge failure prevents this process, you will have to resolve these failures with linkgit:git-rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this option is implicit."
-msgstr ""
-"Esta op챌찾o s처 챕 v찼lida para o comando `update`. Reorganize a funda챌찾o do "
-"ramo atual no commit registrado no superprojeto. Caso esta op챌찾o seja "
-"utilizada, o `HEAD` do subm처dulo n찾o ser찼 desconectado. Caso uma mesclagem "
-"falhe e interrompa este processo, ser찼 necess찼rio resolver os conflitos "
-"resultantes com linkgit:git-rebase[1]. Caso a chave `submodule.$name.update`"
-" esteja definida como `rebase`, ent찾o esta op챌찾o se torna impl챠cita."
+msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `update`. Reorganize a funda챌찾o do ramo atual no commit registrado no superprojeto. Caso esta op챌찾o seja utilizada, o `HEAD` do subm처dulo n찾o ser찼 desconectado. Caso uma mesclagem falhe e interrompa este processo, ser찼 necess찼rio resolver os conflitos resultantes com linkgit:git-rebase[1]. Caso a chave `submodule.$name.update` esteja definida como `rebase`, ent찾o esta op챌찾o se torna impl챠cita."
#. type: Labeled list
#: en/git-submodule.txt:384
@@ -56468,10 +50672,7 @@ msgstr "--init"
#: en/git-submodule.txt:388
#, priority:220
msgid "This option is only valid for the update command. Initialize all submodules for which \"git submodule init\" has not been called so far before updating."
-msgstr ""
-"Esta op챌찾o s처 챕 v찼lida para o comando `update`. Inicialize todos os "
-"subm처dulos para os quais o comando \"git submodule init\" n찾o foi chamado "
-"at챕 o momento antes da atualiza챌찾o."
+msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `update`. Inicialize todos os subm처dulos para os quais o comando \"git submodule init\" n찾o foi chamado at챕 o momento antes da atualiza챌찾o."
#. type: Labeled list
#: en/git-submodule.txt:389
@@ -56483,11 +50684,7 @@ msgstr "--name"
#: en/git-submodule.txt:393
#, 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 informada 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 "
-"'/'."
+msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `add`. Define o nome do subm처dulo para a carreira de caracteres informada 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
@@ -56499,10 +50696,7 @@ msgstr "--reference <reposit처rio>"
#: en/git-submodule.txt:398 en/git-submodule.txt:407
#, 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 os comandos `add` e `update`. �s vezes estes "
-"comandos precisam clonar um reposit처rio remoto. Neste caso, esta op챌찾o ser찼 "
-"passada ao comando linkgit:git-clone[1]."
+msgstr "Esta op챌찾o s처 챕 v찼lida para os comandos `add` e `update`. �s vezes estes comandos precisam clonar um reposit처rio remoto. Neste caso, esta op챌찾o ser찼 passada ao comando linkgit:git-clone[1]."
#. type: Plain text
#: en/git-submodule.txt:402
@@ -56512,10 +50706,8 @@ msgid ""
"for linkgit:git-clone[1]'s `--reference`, `--shared`, and `--dissociate`\n"
"options carefully.\n"
msgstr ""
-"*OBSERVA횉횄O*: *Jamais* utilize esta op챌찾o, a menos que voc챗 tenha lido as "
-"observa챌천es para\n"
-"as op챌천es linkgit:git-clone[1]'s `--reference`, `--shared`, e `--dissociate`"
-"\n"
+"*OBSERVA횉횄O*: *Jamais* utilize esta op챌찾o, a menos que voc챗 tenha lido as observa챌천es para\n"
+"as op챌천es linkgit:git-clone[1]'s `--reference`, `--shared`, e `--dissociate`\n"
"com muita aten챌찾o.\n"
#. type: Plain text
@@ -56528,11 +50720,7 @@ msgstr "*OBSERVA횉횄O*: Consulte a OBSERVA횉횄O para a op챌찾o `--reference`.\n"
#: en/git-submodule.txt:415
#, priority:220
msgid "This option is only valid for foreach, update, status and sync commands. Traverse submodules recursively. The operation is performed not only in the submodules of the current repo, but also in any nested submodules inside those submodules (and so on)."
-msgstr ""
-"Esta op챌찾o s처 챕 v찼lida para os comandos `foreach`, `update`, `status` e "
-"`sync`. Transponha os subm처dulos recursivamente. A opera챌찾o 챕 executada n찾o "
-"apenas nos subm처dulos do reposit처rio atual, mas tamb챕m em qualquer outro "
-"subm처dulo aninhado dentro desses subm처dulos (e assim por diante)."
+msgstr "Esta op챌찾o s처 챕 v찼lida para os comandos `foreach`, `update`, `status` e `sync`. Transponha os subm처dulos recursivamente. A opera챌찾o 챕 executada n찾o apenas nos subm처dulos do reposit처rio atual, mas tamb챕m em qualquer outro subm처dulo aninhado dentro desses subm처dulos (e assim por diante)."
#. type: Labeled list
#: en/git-submodule.txt:416
@@ -56544,10 +50732,7 @@ msgstr "--depth"
#: en/git-submodule.txt:420
#, 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 ""
-"Esta op챌찾o 챕 v찼lida para os comandos `add` e `update`. Crie uma clonagem "
-"'superficial' com um hist처rico truncado para uma quantidade determinada de "
-"revis천es. Consulte linkgit:git-clone[1]"
+msgstr "Esta op챌찾o 챕 v찼lida para os comandos `add` e `update`. Crie uma clonagem 'superficial' com um hist처rico truncado para uma quantidade determinada de revis천es. Consulte linkgit:git-clone[1]"
#. type: Labeled list
#: en/git-submodule.txt:421
@@ -56559,49 +50744,31 @@ msgstr "--[no-]recommend-shallow"
#: en/git-submodule.txt:426
#, priority:220
msgid "This option is only valid for the update command. The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
-msgstr ""
-"Esta op챌찾o s처 챕 v찼lida para o comando `update`. O clone inicial de um "
-"subm처dulo por predefini챌찾o, utilizar찼 o `submodule.<name>.shallow` "
-"recomendado conforme 챕 fornecido pelo arquivo `.gitmodules`. Para ignorar as "
-"sugest천es, utilize `--no-recommend-shallow`."
+msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `update`. O clone inicial de um subm처dulo por predefini챌찾o, utilizar찼 o `submodule.<name>.shallow` recomendado conforme 챕 fornecido pelo arquivo `.gitmodules`. Para ignorar as sugest천es, utilize `--no-recommend-shallow`."
#. type: Plain text
#: en/git-submodule.txt:432
#, 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`. Clone novos subm처dulos em "
-"paralelo com a mesmo quantidade de trabalhos. 횋 predefinido na op챌찾o "
-"`submodule.fetchJobs`."
+msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `update`. Clone novos subm처dulos em paralelo com a mesmo quantidade de trabalhos. 횋 predefinido na 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 uma "
-"ramifica챌찾o durante a atualiza챌찾o: `HEAD` ou uma definida pela op챌찾o "
-"`--branch`."
+msgstr "Esta op챌찾o s처 챕 v찼lida para o comando `update`. Clone apenas uma ramifica챌찾o durante a atualiza챌찾o: `HEAD` ou uma definida pela op챌찾o `--branch`."
#. type: Plain text
#: en/git-submodule.txt:441
#, priority:220
msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. (This argument is required with add)."
-msgstr ""
-"Caminhos para o subm처dulo(s). Quando for utilizado, restringe o comando a "
-"operar apenas nos subm처dulos encontrados nos caminhos informados. (횋 "
-"obrigat처rio a utiliza챌찾o desta op챌찾o com o `add`)."
+msgstr "Caminhos para o subm처dulo(s). Quando for utilizado, restringe o comando a operar apenas nos subm처dulos encontrados nos caminhos informados. (횋 obrigat처rio a utiliza챌찾o desta op챌찾o com o `add`)."
#. type: Plain text
#: en/git-submodule.txt:449
#, 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 ""
-"Durante a atualiza챌찾o dos subm처dulos um arquivo `.gitmodules` fica no topo "
-"do diret처rio do reposit처rio que o contenha, 챕 utilizado para encontrar a URL "
-"de cada subm처dulo. Este arquivo deve ser formatado da mesma maneira que `$"
-"GIT_DIR/config`. A chave para cada URL do subm처dulo 챕 `submodule.$name.url`"
-". Para mais detalhes consulte linkgit:gitmodules[5]."
+msgstr "Durante a atualiza챌찾o dos subm처dulos um arquivo `.gitmodules` fica no topo do diret처rio do reposit처rio que o contenha, 챕 utilizado para encontrar a URL de cada subm처dulo. Este arquivo deve ser formatado da mesma maneira que `$GIT_DIR/config`. A chave para cada URL do subm처dulo 챕 `submodule.$name.url`. Para mais detalhes consulte linkgit:gitmodules[5]."
#. type: Plain text
#: en/git-submodule.txt:453
@@ -56619,8 +50786,7 @@ msgstr "git-svn(1)"
#: en/git-svn.txt:7
#, priority:100
msgid "git-svn - Bidirectional operation between a Subversion repository and Git"
-msgstr ""
-"git-svn - Opera챌찾o bidirecional entre um reposit처rio do Subversion e o Git"
+msgstr "git-svn - Opera챌찾o bidirecional entre um reposit처rio do Subversion e o Git"
#. type: Plain text
#: en/git-svn.txt:12
@@ -56632,10 +50798,7 @@ msgstr "'git svn' <comando> [<op챌천es>] [<argumentos>]\n"
#: en/git-svn.txt:18
#, priority:100
msgid "'git svn' is a simple conduit for changesets between Subversion and Git. It provides a bidirectional flow of changes between a Subversion and a Git repository."
-msgstr ""
-"'git svn' 챕 um canal simples para os conjuntos das altera챌천es entre o "
-"Subversion e o Git. Ele fornece um fluxo bidirecional das altera챌천es entre "
-"um Subversion e um reposit처rio Git."
+msgstr "'git svn' 챕 um canal simples para os conjuntos das altera챌천es entre o Subversion e o Git. Ele fornece um fluxo bidirecional das altera챌천es entre um Subversion e um reposit처rio Git."
#. type: Plain text
#: en/git-svn.txt:23
@@ -57240,7 +51403,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -57375,14 +51538,7 @@ msgstr "'blame'"
#: en/git-svn.txt:399
#, priority:100
msgid "Show what revision and author last modified each line of a file. The output of this mode is format-compatible with the output of `svn blame' by default. Like the SVN blame command, local uncommitted changes in the working tree are ignored; the version of the file in the HEAD revision is annotated. Unknown arguments are passed directly to 'git blame'."
-msgstr ""
-"Exiba quais foram as 첬ltimas modifica챌천es feitas em cada linha de um arquivo "
-"separados pela vers찾o da revis찾o e do autor da modifica챌찾o. 횋 predefinido "
-"que a sa챠da deste modo seja compat챠vel com o formato `svn blame'. Como o "
-"\"SVN blame\", as altera챌천es dos commits locais que n찾o tenham sido feitas "
-"na 찼rvore de trabalho s찾o ignoradas; a vers찾o do arquivo na revis찾o `HEAD` 챕 "
-"anotada. os argumentos desconhecidos s찾o passados diretamente para o comando "
-"'git blame'."
+msgstr "Exiba quais foram as 첬ltimas modifica챌천es feitas em cada linha de um arquivo separados pela vers찾o da revis찾o e do autor da modifica챌찾o. 횋 predefinido que a sa챠da deste modo seja compat챠vel com o formato `svn blame'. Como o \"SVN blame\", as altera챌천es dos commits locais que n찾o tenham sido feitas na 찼rvore de trabalho s찾o ignoradas; a vers찾o do arquivo na revis찾o `HEAD` 챕 anotada. os argumentos desconhecidos s찾o passados diretamente para o comando 'git blame'."
#. type: Labeled list
#: en/git-svn.txt:400
@@ -58409,14 +52565,7 @@ msgstr ""
#: en/git-svn.txt:1060
#, priority:100
msgid "When using multiple --branches or --tags, 'git svn' does not automatically handle name collisions (for example, if two branches from different paths have the same name, or if a branch and a tag have the same name). In these cases, use 'init' to set up your Git repository then, before your first 'fetch', edit the $GIT_DIR/config file so that the branches and tags are associated with different name spaces. For example:"
-msgstr ""
-"Quando utilizar v찼rios `--branches` ou `--tags`, o comando `git svn` n찾o "
-"lida com as colis천es dos nomes de forma autom찼tica (caso dois ramos com "
-"caminhos diferentes tiverem o mesmo nome ou caso um ramo e uma marca챌찾o "
-"tiverem o mesmo nome por exemplo). Nestes casos, utilize `init` para "
-"configurar o seu reposit처rio Git antes do seu primeiro 'fetch', edite o "
-"arquivo `$GIT_DIR/config` para que as ramifica챌천es e as tags sejam "
-"associadas com diferentes espa챌os de nome. Por exemplo:"
+msgstr "Quando utilizar v찼rios `--branches` ou `--tags`, o comando `git svn` n찾o lida com as colis천es dos nomes de forma autom찼tica (caso dois ramos com caminhos diferentes tiverem o mesmo nome ou caso um ramo e uma marca챌찾o tiverem o mesmo nome por exemplo). Nestes casos, utilize `init` para configurar o seu reposit처rio Git antes do seu primeiro 'fetch', edite o arquivo `$GIT_DIR/config` para que as ramifica챌천es e as tags sejam associadas com diferentes espa챌os de nome. Por exemplo:"
#. type: Plain text
#: en/git-svn.txt:1063
@@ -58481,8 +52630,7 @@ msgstr ""
#: en/git-svn.txt:1112
#, priority:100
msgid "Also note that only one asterisk is allowed per word. For example:"
-msgstr ""
-"Observe tamb챕m que apenas um asterisco 챕 permitido por palavra. Por exemplo:"
+msgstr "Observe tamb챕m que apenas um asterisco 챕 permitido por palavra. Por exemplo:"
#. type: Plain text
#: en/git-svn.txt:1114
@@ -58512,9 +52660,7 @@ msgstr "ir찼 produzir um erro."
#: en/git-svn.txt:1123
#, priority:100
msgid "It is also possible to fetch a subset of branches or tags by using a comma-separated list of names within braces. For example:"
-msgstr ""
-"Tamb챕m 챕 poss챠vel capturar um subconjunto de ramos ou tags utilizando uma "
-"lista com os nomes separados por v챠rgulas dentro de colchetes. Por exemplo:"
+msgstr "Tamb챕m 챕 poss챠vel capturar um subconjunto de ramos ou tags utilizando uma lista com os nomes separados por v챠rgulas dentro de colchetes. Por exemplo:"
#. type: delimited block -
#: en/git-svn.txt:1130
@@ -58656,12 +52802,7 @@ msgstr ""
#: en/git-switch.txt:54
#, 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 ao 첬ltimo ramo/commit "
-"alternado utilizando as opera챌천es \"git switch\" ou \"git checkout\". Voc챗 "
-"tamb챕m pode especificar `-` que 챕 sin척nimo de`@{-1}`. Isso geralmente 챕 "
-"utilizado para alternar rapidamente entre duas ramifica챌천es ou para desfazer "
-"uma altern창ncia de ramifica챌찾o feita por engano."
+msgstr "Voc챗 pode usar a sintaxe `@{-N}` para se referir ao 첬ltimo ramo/commit alternado utilizando as opera챌천es \"git switch\" ou \"git checkout\". Voc챗 tamb챕m pode especificar `-` que 챕 sin척nimo de`@{-1}`. Isso geralmente 챕 utilizado 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
@@ -58795,12 +52936,7 @@ msgstr "O `git checkout` recusa quando j찼 foi feito o checkout do \"ref\" desej
#: en/git-switch.txt:189
#, priority:100
msgid "Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules."
-msgstr ""
-"O uso de `--recurse-submodules` atualizar찼 o conte첬do de todos os subm처dulos "
-"ativos de acordo com o commit registrado no superprojeto. Se nada (ou `--no-"
-"recurse-submodules`) for usado, os subm처dulos das 찼rvores de trabalho n찾o "
-"ser찾o atualizados. Assim como em linkgit:git-submodule[1], isso faz com que "
-"`HEAD` seja desanexado do subm처dulo."
+msgstr "O uso de `--recurse-submodules` atualizar찼 o conte첬do de todos os subm처dulos ativos de acordo com o commit registrado no superprojeto. Se nada (ou `--no-recurse-submodules`) for usado, os subm처dulos das 찼rvores de trabalho n찾o ser찾o atualizados. 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
@@ -59038,9 +53174,7 @@ msgstr ""
#: 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 ""
-"Adicione uma tag de refer챗ncia em `refs/tags/`, a menos que `-d/-l/-v` seja "
-"utilizado para excluir, listar ou verificar as tags."
+msgstr "Adicione uma tag de refer챗ncia em `refs/tags/`, a menos que `-d/-l/-v` seja utilizado para excluir, listar ou verificar as tags."
#. type: Plain text
#: en/git-tag.txt:28
@@ -59100,11 +53234,7 @@ msgstr "--sign"
#: en/git-tag.txt:70
#, 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 utilizando a chave predefinida do "
-"endere챌o de e-mail. O comportamento predefinido da assinatura da tag GPG 챕 "
-"controlado pela vari찼vel da configura챌찾o `tag.gpgSign`, se existir, caso "
-"contr찼rio 챕 desativada. Consulte linkgit:git-config[1]."
+msgstr "Fa챌a uma etiqueta assinada por GPG utilizando a chave predefinida do endere챌o de e-mail. O comportamento predefinido da assinatura da tag GPG 챕 controlado pela vari찼vel da configura챌찾o `tag.gpgSign`, se existir, caso contr찼rio 챕 desativada. Consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/git-tag.txt:71
@@ -59164,9 +53294,7 @@ msgstr "-n<num>"
#: en/git-tag.txt:94
#, priority:240
msgid "<num> specifies how many lines from the annotation, if any, are printed when using -l. Implies `--list`."
-msgstr ""
-"O <num> determina a quantidade das linhas de anota챌찾o, caso haja, s찾o "
-"exibidas quando utilizadas com `-l`. Implica no uso da op챌찾o `--list`."
+msgstr "O <num> determina a quantidade das linhas de anota챌찾o, caso haja, s찾o exibidas quando utilizadas com `-l`. Implica no uso da op챌찾o `--list`."
#. type: Plain text
#: en/git-tag.txt:98
@@ -59178,52 +53306,31 @@ msgstr ""
#: 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 ""
-"Listar as tags. Com `<pattern>...`, exemplo, `git tag --list 'v-*'` liste "
-"apenas as tags que coincidam ao(s) padr천es."
+msgstr "Listar as tags. Com `<pattern>...`, exemplo, `git tag --list 'v-*'` 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 informados; caso haja coincid챗ncia entre alguns deles, a "
-"tag ser찼 exibida."
+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 informados; 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 de forma impl챠cita caso qualquer outra lista como a "
-"op챌찾o `--contains` seja utilizada. Para mais detalhes consulte a "
-"documenta챌찾o de cada uma dessas op챌천es."
+msgstr "Esta op챌찾o 챕 fornecida de forma impl챠cita caso qualquer outra lista como a op챌찾o `--contains` seja utilizada. 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 informada. O prefixo `-` 챕 utilizado para "
-"classificar em ordem decrescente. Voc챗 pode utilizar a op챌찾o `--sort=<chave>`"
-" 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 da configura챌찾o `versionsort.sufix`. As "
-"chaves compat챠veis s찾o as mesmas que as 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]."
+msgstr "Classifique com base na chave informada. O prefixo `-` 챕 utilizado para classificar em ordem decrescente. Voc챗 pode utilizar a op챌찾o `--sort=<chave>` 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 da configura챌찾o `versionsort.sufix`. As chaves compat챠veis s찾o as mesmas que as 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
#, priority:240
msgid "Sorting and filtering tags are case insensitive."
-msgstr ""
-"As refer챗ncias de classifica챌찾o e filtragem n찾o diferenciam mai첬sculas de "
-"min첬sculas."
+msgstr "As refer챗ncias de classifica챌찾o e filtragem n찾o diferenciam mai첬sculas de min첬sculas."
#. type: Plain text
#: en/git-tag.txt:139
@@ -59241,69 +53348,49 @@ msgstr "Esta op챌찾o 챕 aplic찼vel apenas ao listar as tags sem linhas de anota
#: en/git-tag.txt:145
#, priority:240
msgid "Only list tags which contain the specified commit (HEAD if not specified). Implies `--list`."
-msgstr ""
-"Liste apenas as tags que contenham um commit em espec챠fico (`HEAD`caso n찾o "
-"esteja definido). Implica no uso da op챌찾o `--list`."
+msgstr "Liste apenas as tags que contenham um commit em espec챠fico (`HEAD`caso n찾o esteja definido). Implica no uso da op챌찾o `--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 ""
-"Liste apenas as tags que n찾o contenham nenhum commit em espec챠fico (`HEAD`"
-"caso n찾o esteja definido). Implica no uso da op챌찾o `--list`."
+msgstr "Liste apenas as tags que n찾o contenham nenhum commit em espec챠fico (`HEAD`caso n찾o esteja definido). Implica no uso da op챌찾o `--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 ""
-"Liste apenas as tags cujos commits sejam alcan챌찼veis de um determinado "
-"commit (`HEAD`caso n찾o esteja definido), 챕 incompat챠vel com `--no-merged`."
+msgstr "Liste apenas as tags cujos commits sejam alcan챌찼veis de um determinado commit (`HEAD`caso n찾o esteja definido), 챕 incompat챠vel com `--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 ""
-"Liste apenas as tags cujos commits n찾o sejam alcan챌찼veis em um commit em "
-"espec챠fico (`HEAD`caso n찾o esteja definido), 챕 incompat챠vel com `--merged`."
+msgstr "Liste apenas as tags cujos commits n찾o sejam alcan챌찼veis em um commit em espec챠fico (`HEAD`caso n찾o esteja definido), 챕 incompat챠vel com `--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 ""
-"Liste apenas as tags dos objetos informados (`HEAD`caso n찾o esteja definido)"
-". Implica no uso da op챌찾o `--list`."
+msgstr "Liste apenas as tags dos objetos informados (`HEAD`caso n찾o esteja definido). Implica no uso da op챌찾o `--list`."
#. type: Plain text
#: en/git-tag.txt:169
#, priority:240
msgid "Use the given tag message (instead of prompting). If multiple `-m` options are given, their values are concatenated as separate paragraphs. Implies `-a` if none of `-a`, `-s`, or `-u <keyid>` is given."
-msgstr ""
-"Utilize a mensagem da tag informada (em vez de solicitar). Caso m첬ltiplas "
-"op챌천es `-m` sejam utilizadas, os seus valores s찾o concatenados como "
-"separados por par찼grafo. Implica na utiliza챌찾o de `-a` caso nenhum dos `-a`, "
-"`-s`, ou `-u <keyid>` sejam utilizados."
+msgstr "Utilize a mensagem da tag informada (em vez de solicitar). Caso m첬ltiplas op챌천es `-m` sejam utilizadas, os seus valores s찾o concatenados como separados por par찼grafo. Implica na utiliza챌찾o de `-a` caso nenhum dos `-a`, `-s`, ou `-u <keyid>` sejam utilizados."
#. type: Plain text
#: en/git-tag.txt:176
#, priority:240
msgid "Take the tag message from the given file. Use '-' to read the message from the standard input. Implies `-a` if none of `-a`, `-s`, or `-u <keyid>` is given."
-msgstr ""
-"Assume a mensagem da tag de um determinado arquivo. Utilize '-' para ler a "
-"mensagem da entrada predefinida. Implica na utiliza챌찾o da op챌찾o `-a` caso "
-"nenhum `-a`, `-s` ou `-u <keyid>` seja utilizado."
+msgstr "Assume a mensagem da tag de um determinado arquivo. Utilize '-' para ler a mensagem da entrada predefinida. Implica na utiliza챌찾o da op챌찾o `-a` caso nenhum `-a`, `-s` ou `-u <keyid>` seja utilizado."
#. type: Plain text
#: en/git-tag.txt:182
#, priority:240
msgid "The message taken from file with `-F` and command line with `-m` are usually used as the tag message unmodified. This option lets you further edit the message taken from these sources."
-msgstr ""
-"A mensagem tirada do arquivo com `-F` e a linha de comando com `-m` "
-"normalmente s찾o utilizadas como mensagens das tags sem altera챌천es. Esta "
-"op챌찾o permite editar ainda mais a mensagem retirada destas fontes."
+msgstr "A mensagem tirada do arquivo com `-F` e a linha de comando com `-m` normalmente s찾o utilizadas como mensagens das tags sem altera챌천es. Esta op챌찾o permite editar ainda mais a mensagem retirada destas fontes."
#. type: Plain text
#: en/git-tag.txt:189
@@ -59315,21 +53402,13 @@ msgstr "Esta op챌찾o define como a mensagem da tag 챕 limpa. O '<modo>' pode se
#: 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 ""
-"Cria um \"reflog\" para a tag. Para ativar globalmente, consulte `core."
-"logAllRefUpdates` em linkgit:git-config[1]. A forma negada do comando `--no-"
-"create-reflog` substitui apenas um `--create-reflog` anterior, mas "
-"atualmente n찾o nega a configura챌찾o do `core.logAllRefUpdates`."
+msgstr "Cria um \"reflog\" para a tag. Para ativar globalmente, consulte `core.logAllRefUpdates` em linkgit:git-config[1]. A forma negada do comando `--no-create-reflog` substitui apenas um `--create-reflog` anterior, mas atualmente n찾o nega a configura챌찾o do `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 ""
-"Uma cadeia de caracteres que interpola `%(fieldname)` vindo de uma "
-"refer챗ncia sendo exibida e o objeto para o qual aponta. O formato 챕 o mesmo "
-"do linkgit:git-for-each-ref[1]. Quando n찾o for definido, a predefini챌찾o 챕 "
-"`%(refname:strip=2)`."
+msgstr "Uma cadeia de caracteres que interpola `%(fieldname)` vindo de uma refer챗ncia sendo exibida e o objeto para o qual aponta. O formato 챕 o mesmo do linkgit:git-for-each-ref[1]. Quando n찾o for definido, a predefini챌찾o 챕 `%(refname:strip=2)`."
#. type: Labeled list
#: en/git-tag.txt:203
@@ -59375,10 +53454,7 @@ msgstr ""
#: 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 ""
-"A vari찼vel `pager.tag` s처 챕 respeitada quando listar as tags, por exemplo, "
-"quando `-l` for utilizada ou indicada. A predefini챌찾o 챕 utilizar um pager. "
-"Consulte linkgit:git-config[1]."
+msgstr "A vari찼vel `pager.tag` s처 챕 respeitada quando listar as tags, por exemplo, quando `-l` for utilizada ou indicada. A predefini챌찾o 챕 utilizar um pager. Consulte linkgit:git-config[1]."
#. type: Title ~
#: en/git-tag.txt:234
@@ -59802,9 +53878,7 @@ msgstr ""
#: en/git.txt:130
#, priority:100
msgid "If you just want to run git as if it was started in `<path>` then use `git -C <path>`."
-msgstr ""
-"Caso queira executar o git como se tivesse sido iniciado em `<caminho>`, "
-"utilize `git -C <caminho>`."
+msgstr "Caso queira executar o git como se tivesse sido iniciado em `<caminho>`, utilize `git -C <caminho>`."
#. type: Labeled list
#: en/git.txt:131
@@ -60237,10 +54311,7 @@ msgstr ""
#: en/git.txt:389
#, priority:100
msgid "For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
-msgstr ""
-"Para obter uma lista mais completa de maneiras de soletrar os nomes dos "
-"objetos, consulte a se챌찾o \"DEFININDO AS REVIS횛ES\" em "
-"linkgit:gitrevisions[7]."
+msgstr "Para obter uma lista mais completa de maneiras de soletrar os nomes dos objetos, consulte a se챌찾o \"DEFININDO AS REVIS횛ES\" em linkgit:gitrevisions[7]."
#. type: Title -
#: en/git.txt:392
@@ -60318,11 +54389,7 @@ msgstr "`GIT_INDEX_VERSION`"
#: en/git.txt:427
#, 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 챕 utilizado. Para "
-"mais informa챌천es consulte linkgit:git-update-index[1]."
+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 챕 utilizado. Para mais informa챌천es consulte linkgit:git-update-index[1]."
#. type: Labeled list
#: en/git.txt:428
@@ -60429,8 +54496,8 @@ msgstr "Se essa vari찼vel estiver definida para um caminho, os arquivos que n찾o
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -60478,10 +54545,7 @@ msgstr "`GIT_AUTHOR_DATE`"
#: en/git.txt:517
#, 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 utilizada para a identidade do autor ao criar objetos commit ou tags "
-"ou quando escrever \"reflogs\". Para conhecer os formatos v찼lidos, consulte "
-"linkgit:git-commit[1]."
+msgstr "A data utilizada para a identidade do autor ao criar objetos commit ou tags ou quando escrever \"reflogs\". Para conhecer os formatos v찼lidos, consulte linkgit:git-commit[1]."
#. type: Labeled list
#: en/git.txt:518
@@ -60667,10 +54731,7 @@ msgstr "`GIT_MERGE_VERBOSITY`"
#: en/git.txt:583
#, 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 demonstrada pela estrat챕gia de "
-"mesclagem recursiva. Substitui o `merge.verbosity`. Consulte linkgit:git-"
-"merge[1]"
+msgstr "Um n첬mero que controla a quantidade de sa챠da demonstrada pela estrat챕gia de mesclagem recursiva. Substitui o `merge.verbosity`. Consulte linkgit:git-merge[1]"
#. type: Labeled list
#: en/git.txt:584
@@ -61117,12 +55178,7 @@ msgstr "`GIT_PROTOCOL_FROM_USER`"
#: en/git.txt:843
#, 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 ""
-"Defina como `0` para evitar que os protocolos utilizados por `fetch/push/"
-"clone` sejam configurados por `user`. 횋 첬til para restringir a "
-"inicializa챌찾o recursiva do subm처dulo de um reposit처rio n찾o confi찼vel ou para "
-"programas que alimentam as URLS potencialmente n찾o confi찼veis aos comandos "
-"git. Para mais detalhes consulte linkgit:git-config[1]."
+msgstr "Defina como `0` para evitar que os protocolos utilizados por `fetch/push/clone` sejam configurados por `user`. 횋 첬til para restringir a inicializa챌찾o recursiva do subm처dulo de um reposit처rio n찾o confi찼vel ou para programas que alimentam as URLS potencialmente n찾o confi찼veis aos comandos git. Para mais detalhes consulte linkgit:git-config[1]."
#. type: Labeled list
#: en/git.txt:844
@@ -61749,9 +55805,7 @@ msgstr ""
#: en/git-update-index.txt:177
#, priority:100
msgid "Only meaningful with `--stdin` or `--index-info`; paths are separated with NUL character instead of LF."
-msgstr ""
-"S처 faz algum sentido se for utilizado com `--stdin` or `--index-info`; os "
-"caminhos s찾o separados com caracteres `NUL` em vez de `LF`."
+msgstr "S처 faz algum sentido se for utilizado com `--stdin` or `--index-info`; os caminhos s찾o separados com caracteres `NUL` em vez de `LF`."
#. type: Labeled list
#: en/git-update-index.txt:178
@@ -61775,12 +55829,7 @@ msgstr ""
#: en/git-update-index.txt:190
#, 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 quer configura챌찾o da 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, removendo o efeito pretendido da op챌찾o."
+msgstr "Estas op챌천es entram em vigor independente de quer configura챌찾o da 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, removendo o efeito pretendido da op챌찾o."
#. type: Labeled list
#: en/git-update-index.txt:191
@@ -61798,20 +55847,13 @@ msgstr "--no-untracked-cache"
#: en/git-update-index.txt:195
#, priority:100
msgid "Enable or disable untracked cache feature. Please use `--test-untracked-cache` before enabling it."
-msgstr ""
-"Ative ou desative o recurso de cache n찾o rastreado. Antes de ativar utilize "
-"`--test-untracked-cache`."
+msgstr "Ative ou desative o recurso de cache n찾o rastreado. Antes de ativar utilize `--test-untracked-cache`."
#. type: Plain text
#: en/git-update-index.txt:201
#, 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 quer configura챌찾o da 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, removendo o efeito pretendido da op챌찾o."
+msgstr "Estas op챌천es entram em vigor independente de quer configura챌찾o da 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, removendo o efeito pretendido da op챌찾o."
#. type: Labeled list
#: en/git-update-index.txt:202
@@ -61853,13 +55895,7 @@ msgstr "--no-fsmonitor"
#: en/git-update-index.txt:226
#, 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 quer 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, removendo o efeito pretendido da op챌찾o."
+msgstr "Ativar ou desativar o recurso de monitoramento do sistema de arquivos. Estas op챌천es entram em vigor independente de quer 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, removendo o efeito pretendido da op챌찾o."
#. type: Plain text
#: en/git-update-index.txt:236
@@ -62036,11 +56072,7 @@ msgstr ""
#: en/git-update-index.txt:344
#, 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 ""
-"Para definir o bit \"assume unchanged\" (assuma como inalterado), utilize a "
-"op챌찾o `--assume-unchanged`. Para remover a defini챌찾o utilize `--no-assume-"
-"unchanged`. Para ver quais os arquivos tem o bit \"assume unchanged\" "
-"definido, utilize `git ls-files -v` (consulte linkgit:git-ls-files[1])."
+msgstr "Para definir o bit \"assume unchanged\" (assuma como inalterado), utilize a op챌찾o `--assume-unchanged`. Para remover a defini챌찾o utilize `--no-assume-unchanged`. Para ver quais os arquivos tem o bit \"assume unchanged\" definido, utilize `git ls-files -v` (consulte linkgit:git-ls-files[1])."
#. type: Plain text
#: en/git-update-index.txt:354
@@ -62319,12 +56351,7 @@ msgstr ""
#: 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 da 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."
+msgstr "De maneira semelhante, caso a vari찼vel da 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
@@ -63684,9 +57711,7 @@ msgstr "Com `worktree add <caminho>`, sem `<commit-ish>`, em vez de criar uma no
#: 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 ""
-"Isso tamb챕m pode ser definido como um comportamento predefinido ao usar a "
-"op챌찾o da configura챌찾o `worktree.guessRemote`."
+msgstr "Isso tamb챕m pode ser definido como um comportamento predefinido ao usar a op챌찾o da configura챌찾o `worktree.guessRemote`."
#. type: Labeled list
#: en/git-worktree.txt:163
@@ -63722,10 +57747,7 @@ msgstr "Com `prune`, n찾o remove nada; apenas relate o que seria removido."
#: en/git-worktree.txt:183
#, priority:240
msgid "With `list`, output in an easy-to-parse format for scripts. This format will remain stable across Git versions and regardless of user configuration. See below for details."
-msgstr ""
-"Com `list` gere um formato para f찼cil an찼lise dos scripts. Este formato "
-"permanecer찼 est찼vel em todas as vers천es Git independentemente da "
-"configura챌찾o do usu찼rio. Veja abaixo os detalhes."
+msgstr "Com `list` gere um formato para f찼cil an찼lise dos scripts. Este formato permanecer찼 est찼vel em todas as vers천es Git independentemente da configura챌찾o do usu찼rio. Veja abaixo os detalhes."
#. type: Plain text
#: en/git-worktree.txt:187
@@ -63743,9 +57765,7 @@ msgstr "Com `prune`, relate todas as remo챌천es."
#: en/git-worktree.txt:194
#, priority:240
msgid "With `prune`, only expire unused working trees older than <time>."
-msgstr ""
-"Com `prune`, expire apenas as 찼rvores de trabalho n찾o utilizadas mais velhas "
-"que <tempo>."
+msgstr "Com `prune`, expire apenas as 찼rvores de trabalho n찾o utilizadas mais velhas que <tempo>."
#. type: Labeled list
#: en/git-worktree.txt:195
@@ -63787,25 +57807,13 @@ msgstr "REFS"
#: 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.Um "
-"exemplo 챕 que o `HEAD` 챕 diferente para todas as 찼rvores de trabalho. Esta "
-"se챌찾o 챕 sobre as regras de compartilhamento e como acessar tais \"refs\" de "
-"uma 찼rvore de trabalho para outra."
+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.Um exemplo 챕 que o `HEAD` 챕 diferente para todas as 찼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 \"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`."
+msgstr "Em geral, cada 찼rvore de trabalho possu챠 um \"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
@@ -63823,20 +57831,13 @@ msgstr "Por exemplo, `main-worktree/HEAD` ou `main-worktree/refs/bisect/good` re
#: 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, utilize comandos como o linkgit:git-rev-parse[1] ou "
-"linkgit:git-update-ref[1] que manipular찾o corretamente as \"refs\"."
+msgstr "Para acessar as `refs` 챕 melhor n찾o olhar diretamente para dentro do `GIT_DIR`. Em vez disso, utilize comandos como o linkgit:git-rev-parse[1] ou linkgit:git-update-ref[1] que manipular찾o corretamente as \"refs\"."
#. 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 da configura챌찾o `core."
-"bare` ou` core.worktree` estejam presentes no arquivo de configura챌찾o elas "
-"ser찾o aplicadas apenas 횪s principais 찼rvores de trabalho."
+msgstr "횋 predefinido que o arquivo \"config\" do reposit처rio seja compartilhado entre todas as 찼rvores de trabalho. Caso as vari찼veis da 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
@@ -63902,12 +57903,7 @@ msgstr ""
#: 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 ""
-"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 utilize o comando `git "
-"rev-parse --git-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 utilize o comando `git rev-parse --git-path`."
#. type: Plain text
#: en/git-worktree.txt:304
@@ -63919,16 +57915,7 @@ msgstr ""
#: 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 ""
-"Para impedir que uma entrada `$GIT_DIR/worktrees` seja removida (que pode "
-"ser 첬til em algumas situa챌천es, como quando a 찼rvore de trabalho da entrada 챕 "
-"armazenada em um dispositivo port찼til), utilize o comando `git worktree lock`"
-" que adiciona um arquivo chamado 'locked' ao diret처rio da entrada. O arquivo "
-"cont챕m o motivo no formato texto puro, sem formata챌찾o. Por exemplo, caso o "
-"arquivo `.git` aponte para `/path/main/.git/worktrees/test-next` ent찾o o "
-"arquivo de nome `/path/main/.git/worktrees/test-next/locked` prevenir찼 que a "
-"entrada `test-next` seja exclu챠da. Para mais detalhes consulte linkgit"
-":gitrepository-layout[5]."
+msgstr "Para impedir que uma entrada `$GIT_DIR/worktrees` seja removida (que pode ser 첬til em algumas situa챌천es, como quando a 찼rvore de trabalho da entrada 챕 armazenada em um dispositivo port찼til), utilize o comando `git worktree lock` que adiciona um arquivo chamado 'locked' ao diret처rio da entrada. O arquivo cont챕m o motivo no formato texto puro, sem formata챌찾o. Por exemplo, caso o arquivo `.git` aponte para `/path/main/.git/worktrees/test-next` ent찾o o arquivo de nome `/path/main/.git/worktrees/test-next/locked` prevenir찼 que a entrada `test-next` seja exclu챠da. Para mais detalhes consulte linkgit:gitrepository-layout[5]."
#. type: Plain text
#: en/git-worktree.txt:318
@@ -63946,9 +57933,7 @@ msgstr "FORMATO DA LISTA DE SA횒DA"
#: 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 ""
-"O comando `worktree` gera dois formatos na sa챠da. O formato j찼 predefinido "
-"exibe os detalhes em uma 첬nica linha com colunas. Por exemplo:"
+msgstr "O comando `worktree` gera dois formatos na sa챠da. O formato j찼 predefinido exibe os detalhes em uma 첬nica linha com colunas. Por exemplo:"
#. type: delimited block -
#: en/git-worktree.txt:329
@@ -64106,9 +58091,7 @@ msgstr ""
#: en/gitglossary.txt:24
#, 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:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7]"
-", linkgit:giteveryday[7], link:user-manual.html[O Manual do Usu찼rio Git]"
+msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], linkgit:giteveryday[7], link:user-manual.html[O Manual do Usu찼rio Git]"
#. type: Labeled list
#: en/glossary-content.txt:1
@@ -64888,10 +58871,7 @@ msgstr "[[def_parent]]parent"
#: 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 "
-"origens."
+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 origens."
#. type: Labeled list
#: en/glossary-content.txt:432
@@ -64903,13 +58883,7 @@ msgstr "[[def_pickaxe]]pickaxe"
#: 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 utilizada "
-"para visualizar completamente o <<def_changeset,changeset>> que introduziu "
-"ou removeu, digamos, uma determinada linha de texto. Consulte 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 utilizada 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
@@ -64957,20 +58931,7 @@ msgstr "[[def_pseudoref]]pseudoref"
#: 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. "
-"S찾o exemplos `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찼."
+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. S찾o exemplos `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
@@ -64994,15 +58955,7 @@ msgstr "[[def_push]]push"
#: 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 ""
-"Fazer um impulsionamento 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 impulsionamento falhar찼."
+msgstr "Fazer um impulsionamento 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 impulsionamento falhar찼."
#. type: Labeled list
#: en/glossary-content.txt:486
@@ -65014,14 +58967,7 @@ msgstr "[[def_reachable]]reachable"
#: 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 ""
-"Todos os ancestrais de um determinado <<def_commit,commit>> s찾o considerados "
-"\"alcan챌찼veis\" a partir deste commit. 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 "
-"origens ou 찼rvores e <<def_tree_object,trees>> para as 찼rvores ou "
-"<<def_blob_object,blobs>> que os contiverem."
+msgstr "Todos os ancestrais de um determinado <<def_commit,commit>> s찾o considerados \"alcan챌찼veis\" a partir deste commit. 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 origens 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
@@ -65045,22 +58991,13 @@ msgstr "[[def_ref]]ref"
#: 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 utilizado como um argumento em um comando Git; Para "
-"mais detalhes consulte linkgit:gitrevisions[7]. Os `refs` s찾o armazenadas "
-"no <<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 utilizado 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 "
-"utilizadas para diferentes prop처sitos (por exemplo, a hierarquia `refs/heads/"
-"` 챕 utilizada para representar as ramifica챌천es locais)."
+msgstr "O `namespace` do `ref` 챕 hier찼rquico. Sub-hierarquias diferentes s찾o utilizadas para diferentes prop처sitos (por exemplo, a hierarquia `refs/heads/` 챕 utilizada para representar as ramifica챌천es locais)."
#. type: Plain text
#: en/glossary-content.txt:516
@@ -65186,9 +59123,7 @@ msgstr "[[def_SHA1]]SHA-1"
#: 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 utilizado como sin척nimo de <<def_object_name,object name>>."
+msgstr "\"Secure Hash Algorithm 1\"; uma fun챌찾o hash de criptogr찼fica. No contexto do Git utilizado como sin척nimo de <<def_object_name,object name>>."
#. type: Labeled list
#: en/glossary-content.txt:568
@@ -65212,16 +59147,7 @@ msgstr "[[def_shallow_repository]]reposit처rio raso"
#: 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 possuam origens, 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]."
+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 possuam origens, 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
@@ -65269,12 +59195,7 @@ msgstr "[[def_symref]]symref"
#: 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]."
+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
@@ -65286,15 +59207,7 @@ msgstr "[[def_tag]]tag"
#: 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 utilizada para marcar um ponto espec챠fico na ancestralidade de "
-"um commit <<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 utilizada para marcar um ponto espec챠fico na ancestralidade de um commit <<def_chain,chain>>."
#. type: Labeled list
#: en/glossary-content.txt:617
@@ -65306,11 +59219,7 @@ msgstr "[[def_tag_object]]objeto tag"
#: 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\"."
+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
@@ -65322,12 +59231,7 @@ msgstr "[[def_topic_branch]]topic branch"
#: 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 챕 utilizado 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."
+msgstr "Um Git comum <<def_branch,branch>> que 챕 utilizado 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
@@ -65363,15 +59267,7 @@ msgstr "[[def_tree-ish]]tree-ish (tamb챕m treeish)"
#: 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 objeto da 찼rvore, um objeto tag que aponta para o objeto tag "
-"que aponta para o objeto 찼rvore, 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 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
@@ -65407,12 +59303,7 @@ msgstr "[[def_upstream_branch]]upstream branch"
#: 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 "
-"a ramifica챌찾o \"upstream\" de 'A' seja 'origin/B' algumas vezes n처s dizemos "
-"que \"'A' est찼 rastreando '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 a ramifica챌찾o \"upstream\" de 'A' seja 'origin/B' algumas vezes n처s dizemos que \"'A' est찼 rastreando 'origin/B'\"."
#. type: Labeled list
#: en/glossary-content.txt:668
@@ -65424,10 +59315,7 @@ msgstr "[[def_working_tree]]찼rvore de trabalho"
#: 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 averiguados. A 찼rvore de trabalho "
-"normalmente cont챕m o conte첬do <<def_HEAD,HEAD>> do commiy da 찼rvore, al챕m de "
-"quaisquer altera챌천es locais que voc챗 fizer, por챕m ainda n찾o fez o commit."
+msgstr "A 찼rvore dos arquivos atualmente averiguados. A 찼rvore de trabalho normalmente cont챕m o conte첬do <<def_HEAD,HEAD>> do commiy da 찼rvore, al챕m de quaisquer altera챌천es locais que voc챗 fizer, por챕m ainda n찾o fez o commit."
#. type: Plain text
#: en/i18n.txt:2
@@ -65439,9 +59327,7 @@ msgstr "O Git 챕, at챕 certo ponto, um codificador de caracteres agn처stico."
#: en/i18n.txt:6
#, 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 blob s찾o sequ챗ncias de bytes n찾o interpretados. N찾o "
-"h찼 tradu챌찾o de codifica챌찾o no n챠vel principal."
+msgstr "O conte첬do dos objetos blob 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
@@ -65453,17 +59339,7 @@ msgstr "Os nomes do caminho s찾o codificados na forma de normaliza챌찾o UTF-8 C.
#: en/i18n.txt:23
#, priority:280
msgid "Note that Git at the core level treats path names simply as sequences of non-NUL bytes, there are no path name encoding conversions (except on Mac and Windows). Therefore, using non-ASCII path names will mostly work even on platforms and file systems that use legacy extended ASCII encodings. However, repositories created on such systems will not work properly on UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa. Additionally, many Git-based tools simply assume path names to be UTF-8 and will fail to display other encodings correctly."
-msgstr ""
-"Observe que o Git em seu n챠vel b찼sico trata os nomes dos caminhos "
-"simplesmente como sequ챗ncias de bytes n찾o `NUL`, n찾o h찼 convers천es de "
-"codifica챌찾o dos nomes dos caminhos (exceto no Mac e no Windows). Portanto, o "
-"uso dos nomes do caminhos que n찾o sejam `ASCII` funcionar찼 principalmente em "
-"plataformas e sistemas de arquivos que se utilizem de codifica챌천es ASCII "
-"estendidas e herdadas. No entanto, os reposit처rios criados nestes sistemas "
-"n찾o funcionar찾o corretamente em sistemas baseados em UTF-8 (por exemplo, "
-"Linux, Mac, Windows) e vice-versa. Al챕m disso, muitas ferramentas baseadas "
-"em Git simplesmente assumem nomes do caminho como UTF-8 e falhar찾o ao exibir "
-"outros tipos de codifica챌천es corretamente."
+msgstr "Observe que o Git em seu n챠vel b찼sico trata os nomes dos caminhos simplesmente como sequ챗ncias de bytes n찾o `NUL`, n찾o h찼 convers천es de codifica챌찾o dos nomes dos caminhos (exceto no Mac e no Windows). Portanto, o uso dos nomes do caminhos que n찾o sejam `ASCII` funcionar찼 principalmente em plataformas e sistemas de arquivos que se utilizem de codifica챌천es ASCII estendidas e herdadas. No entanto, os reposit처rios criados nestes sistemas n찾o funcionar찾o corretamente em sistemas baseados em UTF-8 (por exemplo, Linux, Mac, Windows) e vice-versa. Al챕m disso, muitas ferramentas baseadas em Git simplesmente assumem nomes do caminho como UTF-8 e falhar찾o ao exibir outros tipos de codifica챌천es corretamente."
#. type: Plain text
#: en/i18n.txt:29
@@ -65481,12 +59357,7 @@ msgstr "Embora incentivemos que as mensagens do registro log do commit sejam cod
#: en/i18n.txt:42
#, priority:280
msgid "'git commit' and 'git commit-tree' issues a warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have i18n.commitencoding in `.git/config` file, like this:"
-msgstr ""
-"Ambos os comandos 'git commit\" e \"git commit-찼rvore' emitem um aviso caso "
-"a mensagem do registro log do commit utilizada n찾o se parecer com uma string "
-"UTF-8 v찼lida, a menos que explicitamente queira que seu projeto utilize uma "
-"codifica챌찾o do legado. A melhor maneira de usar isso 챕 ter uma vari찼vel "
-"`i18n.commitencoding` em um arquivo `.git/config`, como este:"
+msgstr "Ambos os comandos 'git commit\" e \"git commit-찼rvore' emitem um aviso caso a mensagem do registro log do commit utilizada n찾o se parecer com uma string UTF-8 v찼lida, a menos que explicitamente queira que seu projeto utilize uma codifica챌찾o do legado. A melhor maneira de usar isso 챕 ter uma vari찼vel `i18n.commitencoding` em um arquivo `.git/config`, como este:"
#. type: delimited block -
#: en/i18n.txt:46
@@ -65560,13 +59431,7 @@ msgstr "/regex/"
#: 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 atrav챕s do "
-"`<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 atrav챕s do `<start>`."
#. type: Plain text
#: en/line-range-format.txt:20
@@ -65578,40 +59443,25 @@ msgstr "+offset ou -offset"
#: 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>` que definir찼 uma quantidade de linhas antes ou "
-"depois da linha utilizada por `<start>`."
+msgstr "V찼lido apenas para `<end>` que definir찼 uma quantidade de linhas antes ou depois da linha utilizada 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 informado 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."
+msgstr "Caso ``:<funcname>'' seja informado 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 da configura챌찾o `mailmap.file` ou `mailmap.blob`, ele ser찼 "
-"utilizado para mapear os nomes dos autores e os endere챌os de email para os "
-"seus respectivos nomes e endere챌os de email verdadeiros."
+msgstr "Caso o arquivo `.mailmap` exista no topo do reposit처rio ou no local apontado pelas op챌천es da configura챌찾o `mailmap.file` ou `mailmap.blob`, ele ser찼 utilizado 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 utilizado no commit (delimitado por "
-"'<' and '>') mapeando para o nome. Por exemplo:"
+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 utilizado no commit (delimitado por '<' and '>') mapeando para o nome. Por exemplo:"
#. type: Plain text
#: en/mailmap.txt:12
@@ -65687,10 +59537,7 @@ msgstr ""
#: 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 utilizado no come챌o "
-"e Jane prefere que o nome de sua fam챠lia seja escrito por extenso. Um "
-"arquivo `.mailmap` apropriado se pareceria com:"
+msgstr "Agora, suponha que Joe queira que seu nome do meio seja utilizado 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
@@ -65758,9 +59605,7 @@ msgstr ""
#: en/mailmap.txt:75
#, priority:260
msgid "Use hash '#' for comments that are either on their own line, or after the email address."
-msgstr ""
-"Utilize o sinal de jogo da velha '#' para coment찼rios que estejam em sua "
-"pr처pria linha ou ap처s o endere챌o de email."
+msgstr "Utilize 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
@@ -65838,11 +59683,7 @@ msgstr ""
#: en/merge-options.txt:70
#, priority:240
msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`."
-msgstr ""
-"Assine a mesclagem resultante do commit com o GPG. O argumento `keyid` 챕 "
-"opcional e padroniza a identidade de quem fez o commit; se utilizado, deve "
-"estar preso 횪 op챌찾o sem espa챌o. A op챌찾o `--no-gpg-sign` 챕 첬til para revogar "
-"a vari찼vel da configura챌찾o `commit.gpgSign` e a anterior `--gpg-sign`."
+msgstr "Assine a mesclagem resultante do commit com o GPG. O argumento `keyid` 챕 opcional e padroniza a identidade de quem fez o commit; se utilizado, deve estar preso 횪 op챌찾o sem espa챌o. A op챌찾o `--no-gpg-sign` 챕 첬til para revogar a vari찼vel da configura챌찾o `commit.gpgSign` e a anterior `--gpg-sign`."
#. type: Plain text
#: en/merge-options.txt:76
@@ -65914,9 +59755,7 @@ msgstr ""
#: en/merge-options.txt:118
#, priority:240
msgid "This option bypasses the pre-merge and commit-msg hooks. See also linkgit:githooks[5]."
-msgstr ""
-"Esta op챌찾o ignora os ganchos dos commits anteriores e os ganchos das "
-"mensagens do commit. Consulte tamb챕m linkgit:githooks[5]."
+msgstr "Esta op챌찾o ignora os ganchos dos commits anteriores e os ganchos das mensagens do commit. Consulte tamb챕m linkgit:githooks[5]."
#. type: Plain text
#: en/merge-options.txt:126
@@ -65982,12 +59821,7 @@ msgstr ""
#: en/merge-options.txt:170
#, priority:240
msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run the operation on a dirty worktree. However, use with care: the final stash application after a successful merge might result in non-trivial conflicts."
-msgstr ""
-"Automatically create a temporary stash entry before the operation begins, "
-"and apply it after the operation ends. This means that you can run the "
-"operation on a dirty worktree. No entanto, utilize com cuidado: conflitos "
-"n찾o triviais podem acontecer caso a aplica챌찾o final do \"stash\" ocorra ap처s "
-"uma mesclagem bem-sucedida."
+msgstr "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends. This means that you can run the operation on a dirty worktree. No entanto, utilize com cuidado: conflitos n찾o triviais podem acontecer caso a aplica챌찾o final do \"stash\" ocorra ap처s uma mesclagem bem-sucedida."
#. type: Labeled list
#: en/merge-options.txt:171
@@ -66137,13 +59971,7 @@ msgstr "renormalize"
#: en/merge-strategies.txt:82
#, 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 ""
-"Executa um check-out e um check-in virtual de tr챗s est찼gios em um arquivo ao "
-"resolver uma mesclagem de tr챗s vias. Esta op챌찾o deve ser utilizada ao "
-"mesclar os ramos com diferentes filtros que estejam limpos ou as regras "
-"normais para a quebra de linha. Para obter mais detalhes, consulte "
-"\"Mesclando ramifica챌천es com diferentes atributos de check-in/check-out\" em "
-"linkgit:gitattributes[5]."
+msgstr "Executa um check-out e um check-in virtual de tr챗s est찼gios em um arquivo ao resolver uma mesclagem de tr챗s vias. Esta op챌찾o deve ser utilizada ao mesclar os ramos com diferentes filtros que estejam limpos ou as regras normais para a quebra de linha. Para obter mais detalhes, consulte \"Mesclando ramifica챌천es com diferentes atributos de check-in/check-out\" em linkgit:gitattributes[5]."
#. type: Labeled list
#: en/merge-strategies.txt:83
@@ -66167,9 +59995,7 @@ msgstr "no-renames"
#: en/merge-strategies.txt:91
#, priority:240
msgid "Turn off rename detection. This overrides the `merge.renames` configuration variable. See also linkgit:git-diff[1] `--no-renames`."
-msgstr ""
-"Desativa a detec챌찾o de renomea챌찾o. Isso substitui a vari찼vel de configura챌찾o "
-"`merge.renames`. Consulte tamb챕mlinkgit:git-diff[1] `--no-renames`."
+msgstr "Desativa a detec챌찾o de renomea챌찾o. Isso substitui a vari찼vel de configura챌찾o `merge.renames`. Consulte tamb챕mlinkgit:git-diff[1] `--no-renames`."
#. type: Labeled list
#: en/merge-strategies.txt:92
@@ -66181,11 +60007,7 @@ msgstr "find-renames[=<n>]"
#: en/merge-strategies.txt:97
#, 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 ""
-"Liga a detec챌찾o de renomea챌찾o, configurando opcionalmente o limite de "
-"similaridade. Esta 챕 a predefini챌찾o. Isso substitui a configura챌찾o da "
-"vari찼vel 'merge.renames'. Consulte tamb챕m linkgit:git-diff[1] `--find-"
-"renames`."
+msgstr "Liga a detec챌찾o de renomea챌찾o, configurando opcionalmente o limite de similaridade. Esta 챕 a predefini챌찾o. Isso substitui a configura챌찾o da vari찼vel 'merge.renames'. Consulte tamb챕m linkgit:git-diff[1] `--find-renames`."
#. type: Labeled list
#: en/merge-strategies.txt:98
@@ -66419,12 +60241,7 @@ msgstr "Se o commit for uma mesclagem e se o formato bonito n찾o for 'oneline',
#: 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 da configura챌찾o `pretty.<nome>` 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: Aqui "
-"est찾o os detalhes dos formatos incorporados:"
+msgstr "Existem v찼rios formatos incorporados e voc챗 pode definir formatos adicionais ao definir uma op챌찾o da configura챌찾o `pretty.<nome>` 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: Aqui est찾o os detalhes dos formatos incorporados:"
#. type: Plain text
#: en/pretty-formats.txt:22
@@ -66546,13 +60363,7 @@ msgstr "<abbrev hash> (<title line>, <short author date>)\n"
#: 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 챕 utilizado 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 utilizada 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`."
+msgstr "Este formato 챕 utilizado 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 utilizada 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
@@ -66596,16 +60407,7 @@ msgstr "'raw'"
#: en/pretty-formats.txt:103
#, 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' exibe todo o commit exatamente como foi armazenado no "
-"objeto commit. Notavelmente, os hashes s찾o exibidos na 챠ntegra "
-"independentemente se a op챌찾o `--abbrev` ou `--no-abbrev` foram utilizadas, "
-"as informa챌천es relacionadas as origens 'parents' demonstram quais os "
-"verdadeiros commits da origem 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, utilize `--no-abbrev`."
+msgstr "O formato 'bruto' exibe todo o commit exatamente como foi armazenado no objeto commit. Notavelmente, os hashes s찾o exibidos na 챠ntegra independentemente se a op챌찾o `--abbrev` ou `--no-abbrev` foram utilizadas, as informa챌천es relacionadas as origens 'parents' demonstram quais os verdadeiros commits da origem 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, utilize `--no-abbrev`."
#. type: Plain text
#: en/pretty-formats.txt:105
@@ -66747,17 +60549,7 @@ msgstr "especifica챌찾o de cores, conforme descrito em Valores no"
#: en/pretty-formats.txt:146
#, 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."
+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:146
@@ -66859,9 +60651,7 @@ msgstr "semelhante a '%>(<N>)', '%>|(<N>)'"
#: en/pretty-formats.txt:166
#, 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 caso o pr처ximo espa챌o reservado ocupe mais espa챌os "
-"do que o informado e haja espa챌os 횪 esquerda, utilize estes espa챌os"
+msgstr "respectivamente, exceto caso o pr처ximo espa챌o reservado ocupe mais espa챌os do que o informado e haja espa챌os 횪 esquerda, utilize estes espa챌os"
#. type: Labeled list
#: en/pretty-formats.txt:166
@@ -67443,9 +61233,7 @@ msgstr "'%GF'"
#: en/pretty-formats.txt:233
#, priority:260
msgid "show the fingerprint of the key used to sign a signed commit"
-msgstr ""
-"exiba a impress찾o digital da chave utilizada para assinar um commit j찼 "
-"assinado"
+msgstr "exiba a impress찾o digital da chave utilizada para assinar um commit j찼 assinado"
#. type: Labeled list
#: en/pretty-formats.txt:233
@@ -67475,8 +61263,7 @@ msgstr "'%GT'"
#: en/pretty-formats.txt:236
#, 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 utilizada para assinar um commit assinado"
+msgstr "exiba o n챠vel de confian챌a da chave utilizada para assinar um commit assinado"
#. type: Labeled list
#: en/pretty-formats.txt:236
@@ -67596,16 +61383,7 @@ msgstr "interpretado por linkgit:git-interpret-trailers[1]. A carreira de caract
#: en/pretty-formats.txt:264
#, priority:260
msgid "'key=<K>': only show trailers with specified key. Matching is done case-insensitively and trailing colon is optional. If option is given multiple times trailer lines matching any of the keys are shown. This option automatically enables the `only` option so that non-trailer lines in the trailer block are hidden. If that is not desired it can be disabled with `only=false`. E.g., `%(trailers:key=Reviewed-by)` shows trailer lines with key `Reviewed-by`."
-msgstr ""
-"'key=<K>': exibe apenas os caracteres de resposta com as chaves que forem "
-"definidas. A combina챌찾o 챕 feita sem distin챌찾o entre mai첬sculas e min첬sculas, "
-"os dois pontos 횪 direita s찾o opcionais. Caso a op챌찾o seja utilizada v찼rias "
-"vezes, os atributos das linhas coincidentes a qualquer uma das teclas ser찾o "
-"exibidas. Esta op챌찾o ativa automaticamente a op챌찾o `only`, para que as "
-"linhas de bloqueio n찾o sejam ocultadas. Caso n찾o seja o efeito desejado, "
-"pode ser desativado com a op챌찾o `only=false`. Por exemplo, `%(trailers:key"
-"=Revisado-por)` exibe as linhas com caracteres de resposta com a chave "
-"`Revisado-por`."
+msgstr "'key=<K>': exibe apenas os caracteres de resposta com as chaves que forem definidas. A combina챌찾o 챕 feita sem distin챌찾o entre mai첬sculas e min첬sculas, os dois pontos 횪 direita s찾o opcionais. Caso a op챌찾o seja utilizada v찼rias vezes, os atributos das linhas coincidentes a qualquer uma das teclas ser찾o exibidas. Esta op챌찾o ativa automaticamente a op챌찾o `only`, para que as linhas de bloqueio n찾o sejam ocultadas. Caso n찾o seja o efeito desejado, pode ser desativado com a op챌찾o `only=false`. Por exemplo, `%(trailers:key=Revisado-por)` exibe as linhas com caracteres de resposta com a chave `Revisado-por`."
#. type: Plain text
#: en/pretty-formats.txt:270
@@ -67665,14 +61443,7 @@ msgstr "'tformat:'"
#: en/pretty-formats.txt:314
#, priority:260
msgid "The 'tformat:' format works exactly like 'format:', except that it provides \"terminator\" semantics instead of \"separator\" semantics. In other words, each commit has the message terminator character (usually a newline) appended, rather than a separator placed between entries. This means that the final entry of a single-line format will be properly terminated with a new line, just as the \"oneline\" format does. For example:"
-msgstr ""
-"O formato 'tformat:' funciona exatamente como 'format:', exceto que ele "
-"prov챗 a sem창ntica \"terminator\" (terminador) em vez do \"separator\" "
-"(separador). Em outras palavras, cada commit tem o caractere terminador da "
-"mensagem (geralmente uma nova linha) adicionada em vez de um separador "
-"colocado entre as entradas. Significa que o final de cada entrada do "
-"formato de uma linha 첬nica ser찼 terminada corretamente com uma nova linha, "
-"assim como o formato com uma linha faz (oneline). Por exemplo:"
+msgstr "O formato 'tformat:' funciona exatamente como 'format:', exceto que ele prov챗 a sem창ntica \"terminator\" (terminador) em vez do \"separator\" (separador). Em outras palavras, cada commit tem o caractere terminador da mensagem (geralmente uma nova linha) adicionada em vez de um separador colocado entre as entradas. Significa que o final de cada entrada do formato de uma linha 첬nica ser찼 terminada corretamente com uma nova linha, assim como o formato com uma linha faz (oneline). Por exemplo:"
#. type: delimited block -
#: en/pretty-formats.txt:320
@@ -67776,9 +61547,7 @@ msgstr "Exibe os 40 bytes hexadecimais completos do objeto commit. Isso nega a o
#: en/pretty-options.txt:34
#, priority:260
msgid "This is a shorthand for \"--pretty=oneline --abbrev-commit\" used together."
-msgstr ""
-"Este 챕 um atalho para \"--pretty=oneline --abbrev-commit\" ser utilizado "
-"junto."
+msgstr "Este 챕 um atalho para \"--pretty=oneline --abbrev-commit\" ser utilizado junto."
#. type: Plain text
#: en/pretty-options.txt:44
@@ -67826,11 +61595,7 @@ msgstr "Exiba as anota챌천es (consulte linkgit:git-notes[1]) que acompanham o co
#: 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 anota챌천es exibidas s찾o das anota챌천es \"refs\" listadas "
-"nas vari찼veis `core.notesRef` e `notes.displayRef` (ou substitui챌천es "
-"correspondentes do ambiente). Para mais detalhes consulte linkgit:git-"
-"config[1]."
+msgstr "횋 predefinido que as anota챌천es exibidas s찾o das anota챌천es \"refs\" listadas nas vari찼veis `core.notesRef` e `notes.displayRef` (ou substitui챌천es correspondentes do ambiente). Para mais detalhes consulte linkgit:git-config[1]."
#. type: Plain text
#: en/pretty-options.txt:75
@@ -67896,9 +61661,7 @@ msgstr ""
#: en/pull-fetch-param.txt:12
#, 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 da "
-"configura챌찾o `remotes.<group>`. (Consulte linkgit:git-config[1])."
+msgstr "Um nome referente para a lista de reposit처rios como o valor no arquivo da configura챌찾o `remotes.<group>`. (Consulte linkgit:git-config[1])."
#. type: Labeled list
#: en/pull-fetch-param.txt:14
@@ -68110,16 +61873,7 @@ msgstr "'[<refname>]@{<date>}', exemplo. 'master@\\{yesterday\\}', 'HEAD@{5 minu
#: 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 utilizado 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`."
+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 utilizado 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
@@ -68131,13 +61885,7 @@ msgstr "'<refname>@{<n>}', e.g. 'master@\\{1\\}'"
#: en/revisions.txt:88
#, priority:100
msgid "A ref followed by the suffix '@' with an ordinal specification enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies the n-th prior value of that ref. For example 'master@\\{1\\}' is the immediate prior value of 'master' while 'master@\\{5\\}' is the 5th prior value of 'master'. This suffix may only be used immediately following a ref name and the ref must have an existing log ('$GIT_DIR/logs/<refname>')."
-msgstr ""
-"Um `ref` seguido pelo sufixo '@' com uma especifica챌찾o ordinal inclu챠da em "
-"um par de chaves (exemplo, '\\{1\\}', '\\{15\\}') especifica o en챕simo valor "
-"anterior dessa ref. Por exemplo, 'master@\\{1\\}' 챕 o valor anterior "
-"imediato de 'master', enquanto 'master@\\{5\\}' 챕 o quinto valor anterior do "
-"'master'. Este sufixo poder찼 ser utilizado imediatamente ap처s um nome `ref` "
-"e o mesmo deve ter um registro log existente em ('$GIT_DIR/logs/<refname>')."
+msgstr "Um `ref` seguido pelo sufixo '@' com uma especifica챌찾o ordinal inclu챠da em um par de chaves (exemplo, '\\{1\\}', '\\{15\\}') especifica o en챕simo valor anterior dessa ref. Por exemplo, 'master@\\{1\\}' 챕 o valor anterior imediato de 'master', enquanto 'master@\\{5\\}' 챕 o quinto valor anterior do 'master'. Este sufixo poder찼 ser utilizado imediatamente ap처s um nome `ref` e o mesmo deve ter um registro log existente em ('$GIT_DIR/logs/<refname>')."
#. type: Labeled list
#: en/revisions.txt:89
@@ -68149,10 +61897,7 @@ msgstr "'@{<n>}', exemplo. '@\\{1\\}'"
#: en/revisions.txt:93
#, priority:100
msgid "You can use the '@' construct with an empty ref part to get at a reflog entry of the current branch. For example, if you are on branch 'blabla' then '@\\{1\\}' means the same as 'blabla@\\{1\\}'."
-msgstr ""
-"Voc챗 pode usar a constru챌찾o '@' com um `ref` vazio para obter uma entrada "
-"`reflog` do ramo atual. Por exemplo, caso esteja no ramo 'blabla' ent찾o '@\\{"
-"1\\}' significa o mesmo que 'blabla@\\{1\\}'."
+msgstr "Voc챗 pode usar a constru챌찾o '@' com um `ref` vazio para obter uma entrada `reflog` do ramo atual. Por exemplo, caso esteja no ramo 'blabla' ent찾o '@\\{1\\}' significa o mesmo que 'blabla@\\{1\\}'."
#. type: Labeled list
#: en/revisions.txt:94
@@ -68176,13 +61921,7 @@ msgstr "'[<branchname>]@\\{upstream\\}', exemplo, 'master@\\{upstream\\}', '@\\{
#: en/revisions.txt:105
#, priority:100
msgid "The suffix '@\\{upstream\\}' to a branchname (short form '<branchname>@\\{u\\}') refers to the branch that the branch specified by branchname is set to build on top of (configured with `branch.<name>.remote` and `branch.<name>.merge`). A missing branchname defaults to the current one. These suffixes are also accepted when spelled in uppercase, and they mean the same thing no matter the case."
-msgstr ""
-"O sufixo '@ {upstream}' para uma ramifica챌찾o (formato abreviado "
-"'<branchname>@\\{u\\}') refere-se ao ramo que o ramo informado pelo "
-"\"branchname\" esteja definido para construir em cima do `branch.<nome>."
-"remote` e `branch.<nome>.merge`). 횋 predefinido que na falta do nome de um "
-"ramo o atual seja utilizado. Esses sufixos tamb챕m s찾o aceitos quando "
-"digitados em mai첬sculas e significam a mesma coisa, n찾o importa o caso."
+msgstr "O sufixo '@ {upstream}' para uma ramifica챌찾o (formato abreviado '<branchname>@\\{u\\}') refere-se ao ramo que o ramo informado pelo \"branchname\" esteja definido para construir em cima do `branch.<nome>.remote` e `branch.<nome>.merge`). 횋 predefinido que na falta do nome de um ramo o atual seja utilizado. Esses sufixos tamb챕m s찾o aceitos quando digitados em mai첬sculas e significam a mesma coisa, n찾o importa o caso."
#. type: Labeled list
#: en/revisions.txt:106
@@ -68194,13 +61933,7 @@ msgstr "'[<branchname>]@\\{push\\}', exemplo, 'master@\\{push\\}', '@\\{push\\}'
#: en/revisions.txt:112
#, priority:100
msgid "The suffix '@\\{push}' reports the branch \"where we would push to\" if `git push` were run while `branchname` was checked out (or the current `HEAD` if no branchname is specified). Since our push destination is in a remote repository, of course, we report the local tracking branch that corresponds to that branch (i.e., something in `refs/remotes/`)."
-msgstr ""
-"O sufixo '@\\{push}' relata ao ramo \"para onde estaremos fazendo "
-"impulsionamento\" caso `git push` seja executado enquanto `branchname` seja "
-"verificado (ou o `HEAD` atual, caso nenhum nome do ramo tenha sido "
-"especificado). Como o nosso impulsionamento foi feito em um reposit처rio "
-"remoto, 챕 claro, relatamos o ramo de rastreamento local que tenha "
-"correspond챗ncia a esse ramo (ou seja, algo em `refs/remotes/`)."
+msgstr "O sufixo '@\\{push}' relata ao ramo \"para onde estaremos fazendo impulsionamento\" caso `git push` seja executado enquanto `branchname` seja verificado (ou o `HEAD` atual, caso nenhum nome do ramo tenha sido especificado). Como o nosso impulsionamento foi feito em um reposit처rio remoto, 챕 claro, relatamos o ramo de rastreamento local que tenha correspond챗ncia a esse ramo (ou seja, algo em `refs/remotes/`)."
#. type: Plain text
#: en/revisions.txt:114
@@ -68244,11 +61977,7 @@ msgstr ""
#: en/revisions.txt:130
#, priority:100
msgid "Note in the example that we set up a triangular workflow, where we pull from one location and push to another. In a non-triangular workflow, '@\\{push}' is the same as '@\\{upstream}', and there is no need for it."
-msgstr ""
-"Observe no exemplo que configuramos um fluxo de trabalho triangular, onde "
-"fazemos o `pull` (obten챌찾o) de um local e o `push` (impulsionamento) para "
-"outro. Em um fluxo de trabalho n찾o triangular, o '@\\{push}' 챕 igual como o "
-"'@\\{upstream}' que n찾o 챕 necess찼rio."
+msgstr "Observe no exemplo que configuramos um fluxo de trabalho triangular, onde fazemos o `pull` (obten챌찾o) de um local e o `push` (impulsionamento) para outro. Em um fluxo de trabalho n찾o triangular, o '@\\{push}' 챕 igual como o '@\\{upstream}' que n찾o 챕 necess찼rio."
#. type: Plain text
#: en/revisions.txt:133
@@ -68266,13 +61995,7 @@ msgstr "'<rev>{caret}[<n>]', exemplo, 'HEAD{caret}, v1.5.1{caret}0'"
#: en/revisions.txt:141
#, priority:100
msgid "A suffix '{caret}' to a revision parameter means the first parent of that commit object. '{caret}<n>' means the <n>th parent (i.e. '<rev>{caret}' is equivalent to '<rev>{caret}1'). As a special rule, '<rev>{caret}0' means the commit itself and is used when '<rev>' is the object name of a tag object that refers to a commit object."
-msgstr ""
-"Um sufixo '{caret}' para um par창metro de revis찾o significa que a primeira "
-"origem deste objeto commit. '{caret}<n>' significa que 챕 a quantidade <n> "
-"da origem (ou seja, '<rev>{caret}' 챕 equivamente a '<rev>{caret}1'). Como "
-"regra especial, '<rev>{caret}0' significa o commit em si e 챕 utilizado "
-"quando '<rev>' for o nome do objeto de um objeto `tag` que tenha refer챗ncia "
-"a um objeto de commit."
+msgstr "Um sufixo '{caret}' para um par창metro de revis찾o significa que a primeira origem deste objeto commit. '{caret}<n>' significa que 챕 a quantidade <n> da origem (ou seja, '<rev>{caret}' 챕 equivamente a '<rev>{caret}1'). Como regra especial, '<rev>{caret}0' significa o commit em si e 챕 utilizado quando '<rev>' for o nome do objeto de um objeto `tag` que tenha refer챗ncia a um objeto de commit."
#. type: Labeled list
#: en/revisions.txt:142
@@ -68284,14 +62007,7 @@ msgstr "'<rev>{tilde}[<n>]', exemplo, 'HEAD{tilde}, master{tilde}3'"
#: en/revisions.txt:151
#, priority:100
msgid "A suffix '{tilde}' to a revision parameter means the first parent of that commit object. A suffix '{tilde}<n>' to a revision parameter means the commit object that is the <n>th generation ancestor of the named commit object, following only the first parents. I.e. '<rev>{tilde}3' is equivalent to '<rev>{caret}{caret}{caret}' which is equivalent to '<rev>{caret}1{caret}1{caret}1'. See below for an illustration of the usage of this form."
-msgstr ""
-"Um sufixo '{tilde}' para um par창metro de revis찾o significa o que a primeira "
-"origem deste objeto commit. Um sufixo '{tilde}<n>' para um par창metro de "
-"revis찾o significa que o objeto commit 챕 o <n> do ancestral da gera챌찾o do "
-"objeto commit informado, seguindo apenas os primeiras origens. Ou seja, "
-"'<rev>{tilde}3' 챕 equivalente a '<rev>{caret}{caret}{caret}' que 챕 "
-"equivalente a '<rev>{caret}1{caret}1{caret}1'. Veja abaixo uma ilustra챌찾o "
-"do uso deste formato."
+msgstr "Um sufixo '{tilde}' para um par창metro de revis찾o significa o que a primeira origem deste objeto commit. Um sufixo '{tilde}<n>' para um par창metro de revis찾o significa que o objeto commit 챕 o <n> do ancestral da gera챌찾o do objeto commit informado, seguindo apenas os primeiras origens. Ou seja, '<rev>{tilde}3' 챕 equivalente a '<rev>{caret}{caret}{caret}' que 챕 equivalente a '<rev>{caret}1{caret}1{caret}1'. Veja abaixo uma ilustra챌찾o do uso deste formato."
#. type: Labeled list
#: en/revisions.txt:152
@@ -68303,15 +62019,7 @@ msgstr "'<rev>{caret}{<type>}', exemplo, 'v0.99.8{caret}\\{commit\\}'"
#: en/revisions.txt:163
#, priority:100
msgid "A suffix '{caret}' followed by an object type name enclosed in brace pair means dereference the object at '<rev>' recursively until an object of type '<type>' is found or the object cannot be dereferenced anymore (in which case, barf). For example, if '<rev>' is a commit-ish, '<rev>{caret}\\{commit\\}' describes the corresponding commit object. Similarly, if '<rev>' is a tree-ish, '<rev>{caret}\\{tree\\}' describes the corresponding tree object. '<rev>{caret}0' is a short-hand for '<rev>{caret}\\{commit\\}'."
-msgstr ""
-"Um sufixo '{caret}' seguido por um tipo de objeto com nome fechado entre "
-"chaves significa remover a refer챗ncia do objeto em '<ref>' recursivamente "
-"at챕 que um objeto do tipo '<type>' seja encontrado ou n찾o seja mais poss챠vel "
-"remover a refer챗ncia do (nesse caso, `barf`). Por exemplo, caso '<ref>' "
-"seja um commit ish, '<rev>{caret}\\{commit\\}' descreve o objeto commit "
-"correspondente. Da mesma forma caso '<re>' seja um ish da 찼rvore "
-"'<rev>{caret}\\{tree\\}', descreve o objeto da 찼rvore correspondente. "
-"'<rev>{caret}0' 챕 um atalho para '<rev>{caret}\\{commit\\}'."
+msgstr "Um sufixo '{caret}' seguido por um tipo de objeto com nome fechado entre chaves significa remover a refer챗ncia do objeto em '<ref>' recursivamente at챕 que um objeto do tipo '<type>' seja encontrado ou n찾o seja mais poss챠vel remover a refer챗ncia do (nesse caso, `barf`). Por exemplo, caso '<ref>' seja um commit ish, '<rev>{caret}\\{commit\\}' descreve o objeto commit correspondente. Da mesma forma caso '<re>' seja um ish da 찼rvore '<rev>{caret}\\{tree\\}', descreve o objeto da 찼rvore correspondente. '<rev>{caret}0' 챕 um atalho para '<rev>{caret}\\{commit\\}'."
#. type: Plain text
#: en/revisions.txt:168
@@ -68359,19 +62067,7 @@ msgstr "':/<text>', exemplo, ':/fix nasty bug'"
#: en/revisions.txt:198
#, priority:100
msgid "A colon, followed by a slash, followed by a text, names a commit whose commit message matches the specified regular expression. This name returns the youngest matching commit which is reachable from any ref, including HEAD. The regular expression can match any part of the commit message. To match messages starting with a string, one can use e.g. ':/^foo'. The special sequence ':/!' is reserved for modifiers to what is matched. ':/!-foo' performs a negative match, while ':/!!foo' matches a literal '!' character, followed by 'foo'. Any other sequence beginning with ':/!' is reserved for now. Depending on the given text, the shell's word splitting rules might require additional quoting."
-msgstr ""
-"Da nome a um commit aqueles que forem seguidos por um tra챌o e por um texto, "
-"e a mensagem de commit coincidir 횪 express찾o regular especificada. Esse "
-"nome retorna o commit coincidente mais jovem, acess챠vel a partir de qualquer "
-"refer챗ncia, incluindo `HEAD`. A express찾o regular pode corresponder a "
-"qualquer parte da mensagem do commit. Para coincidir mensagens que comecem "
-"com uma string, pode-se utilizar ':/^foo' por exemplo. A sequ챗ncia especial "
-"': /!' est찼 reservada para modificadores que tenham coincid챗ncias. ':/!-foo' "
-"executa uma coincid챗ncia negativa, enquanto ':/!!foo' coincide com um "
-"caractere literal '!', seguido por 'foo'. No momento, qualquer outra "
-"sequ챗ncia come챌ando com ':/!' est찼 reservada. Dependendo do texto "
-"informado, as regras de divis찾o de palavras do shell podem exigir cita챌천es "
-"adicionais."
+msgstr "Da nome a um commit aqueles que forem seguidos por um tra챌o e por um texto, e a mensagem de commit coincidir 횪 express찾o regular especificada. Esse nome retorna o commit coincidente mais jovem, acess챠vel a partir de qualquer refer챗ncia, incluindo `HEAD`. A express찾o regular pode corresponder a qualquer parte da mensagem do commit. Para coincidir mensagens que comecem com uma string, pode-se utilizar ':/^foo' por exemplo. A sequ챗ncia especial ': /!' est찼 reservada para modificadores que tenham coincid챗ncias. ':/!-foo' executa uma coincid챗ncia negativa, enquanto ':/!!foo' coincide com um caractere literal '!', seguido por 'foo'. No momento, qualquer outra sequ챗ncia come챌ando com ':/!' est찼 reservada. Dependendo do texto informado, as regras de divis찾o de palavras do shell podem exigir cita챌천es adicionais."
#. type: Labeled list
#: en/revisions.txt:199
@@ -68383,14 +62079,7 @@ msgstr "'<rev>:<path>', exemplo, 'HEAD:README', 'master:./README'"
#: en/revisions.txt:207
#, priority:100
msgid "A suffix ':' followed by a path names the blob or tree at the given path in the tree-ish object named by the part before the colon. A path starting with './' or '../' is relative to the current working directory. The given path will be converted to be relative to the working tree's root directory. This is most useful to address a blob or tree from a commit or tree that has the same tree structure as the working tree."
-msgstr ""
-"Um sufixo ':' seguido de um caminho nomeia a gota ou a 찼rvore no caminho "
-"especificado no objeto da 찼rvore \"ish\" informado pela parte antes dos "
-"dois pontos. Um caminho come챌ando com './' ou '../' 챕 relativo ao diret처rio "
-"de trabalho atual. O caminho especificado ser찼 convertido para ser relativo "
-"ao diret처rio raiz da 찼rvore de trabalho. Isso 챕 mais 첬til para abordar uma "
-"gota ou 찼rvore de um commit ou uma 찼rvore que tenha a mesma estrutura de "
-"찼rvore que uma 찼rvore de trabalho."
+msgstr "Um sufixo ':' seguido de um caminho nomeia a gota ou a 찼rvore no caminho especificado no objeto da 찼rvore \"ish\" informado pela parte antes dos dois pontos. Um caminho come챌ando com './' ou '../' 챕 relativo ao diret처rio de trabalho atual. O caminho especificado ser찼 convertido para ser relativo ao diret처rio raiz da 찼rvore de trabalho. Isso 챕 mais 첬til para abordar uma gota ou 찼rvore de um commit ou uma 찼rvore que tenha a mesma estrutura de 찼rvore que uma 찼rvore de trabalho."
#. type: Labeled list
#: en/revisions.txt:208
@@ -68408,10 +62097,7 @@ msgstr "Os dois pontos opcionalmente seguidos por um n첬mero de est찼gio (0 para
#: en/revisions.txt:220
#, priority:100
msgid "Here is an illustration, by Jon Loeliger. Both commit nodes B and C are parents of commit node A. Parent commits are ordered left-to-right."
-msgstr ""
-"Aqui est찼 uma ilustra챌찾o, de Jon Loeliger. Ambos os n처s do commit B e C s찾o "
-"as origens dos n처s do commit A. Os commits da origem s찾o ordenados da "
-"esquerda para a direita."
+msgstr "Aqui est찼 uma ilustra챌찾o, de Jon Loeliger. Ambos os n처s do commit B e C s찾o as origens dos n처s do commit A. Os commits da origem s찾o ordenados da esquerda para a direita."
#. type: delimited block .
#: en/revisions.txt:232
@@ -68475,10 +62161,7 @@ msgstr "O hist처rico que atravessa os comandos como o `git log` opera em um dete
#: en/revisions.txt:256
#, priority:100
msgid "For these commands, specifying a single revision, using the notation described in the previous section, means the set of commits `reachable` from the given commit."
-msgstr ""
-"Para estes comandos, defina uma 첬nica revis찾o utilizando a nota챌찾o descrita "
-"na se챌찾o anterior, significa que o conjunto dos commits `alcan챌찼veis` a "
-"partir do commit informado."
+msgstr "Para estes comandos, defina uma 첬nica revis찾o utilizando a nota챌찾o descrita na se챌찾o anterior, significa que o conjunto dos commits `alcan챌찼veis` a partir do commit informado."
#. type: Plain text
#: en/revisions.txt:259
@@ -68710,10 +62393,7 @@ msgstr "Limita챌찾o do Commit"
#: en/rev-list-options.txt:7
#, priority:260
msgid "Besides specifying a range of commits that should be listed using the special notations explained in the description, additional commit limiting may be applied."
-msgstr ""
-"Al챕m de especificar uma s챕rie de commits que devem ser listados utilizando "
-"as nota챌천es especiais explicadas na descri챌찾o, podem ser aplicadas "
-"limita챌천es adicionais ao commit."
+msgstr "Al챕m de especificar uma s챕rie de commits que devem ser listados utilizando as nota챌천es especiais explicadas na descri챌찾o, podem ser aplicadas limita챌천es adicionais ao commit."
#. type: Plain text
#: en/rev-list-options.txt:12
@@ -68797,8 +62477,7 @@ msgstr "--before=<data>"
#: en/rev-list-options.txt:31
#, priority:260
msgid "Show commits older than a specific date."
-msgstr ""
-"Exiba os commits mais antigos com data mais antiga das que foram informada."
+msgstr "Exiba os commits mais antigos com data mais antiga das que foram informada."
#. type: Labeled list
#: en/rev-list-options.txt:33
@@ -68858,11 +62537,7 @@ msgstr "--grep=<pattern>"
#: en/rev-list-options.txt:59
#, priority:260
msgid "Limit the commits output to ones with log message that matches the specified pattern (regular expression). With more than one `--grep=<pattern>`, commits whose message matches any of the given patterns are chosen (but see `--all-match`)."
-msgstr ""
-"Limite a sa챠da dos commits para aqueles com mensagem de registro log que "
-"coincida com padr찾o determinado (express찾o regular). Com mais de um "
-"`--grep=<pattern>`, fa챌a o commit daqueles cuja mensagem coincida com "
-"qualquer um dos padr천es determinado (por챕m consulte `--all-match`)."
+msgstr "Limite a sa챠da dos commits para aqueles com mensagem de registro log que coincida com padr찾o determinado (express찾o regular). Com mais de um `--grep=<pattern>`, fa챌a o commit daqueles cuja mensagem coincida com qualquer um dos padr천es determinado (por챕m consulte `--all-match`)."
#. type: Plain text
#: en/rev-list-options.txt:63
@@ -68874,9 +62549,7 @@ msgstr "Quando `--notes` est찼 em vigor, a mensagem das anota챌천es 챕 coincidid
#: en/rev-list-options.txt:68
#, priority:260
msgid "Limit the commits output to ones that match all given `--grep`, instead of ones that match at least one."
-msgstr ""
-"Limita a sa챠da dos commits para aqueles que coincidam com todos os comandos "
-"`--grep` utilizado, em vez daqueles que coincidam com apenas um."
+msgstr "Limita a sa챠da dos commits para aqueles que coincidam com todos os comandos `--grep` utilizado, em vez daqueles que coincidam com apenas um."
#. type: Labeled list
#: en/rev-list-options.txt:69
@@ -68888,9 +62561,7 @@ msgstr "--invert-grep"
#: en/rev-list-options.txt:72
#, priority:260
msgid "Limit the commits output to ones with log message that do not match the pattern specified with `--grep=<pattern>`."
-msgstr ""
-"Limita a sa챠da dos commits para aqueles com uma mensagem do registro log que "
-"n찾o coincida com o padr찾o utilizado em com o comando `--grep=<pattern>`."
+msgstr "Limita a sa챠da dos commits para aqueles com uma mensagem do registro log que n찾o coincida com o padr찾o utilizado em com o comando `--grep=<pattern>`."
#. type: Labeled list
#: en/rev-list-options.txt:74
@@ -68962,9 +62633,7 @@ msgstr "--no-merges"
#: en/rev-list-options.txt:110
#, priority:260
msgid "Do not print commits with more than one parent. This is exactly the same as `--max-parents=1`."
-msgstr ""
-"N찾o exiba os commits com mais de uma origem. 횋 exatamente o mesmo que a "
-"op챌찾o `--max-parents=1`."
+msgstr "N찾o exiba os commits com mais de uma origem. 횋 exatamente o mesmo que a op챌찾o `--max-parents=1`."
#. type: Labeled list
#: en/rev-list-options.txt:111
@@ -69006,14 +62675,7 @@ msgstr ""
#: en/rev-list-options.txt:133
#, priority:260
msgid "Follow only the first parent commit upon seeing a merge commit. This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge. Cannot be combined with --bisect."
-msgstr ""
-"Siga apenas o primeiro commit da origem ao ver a mesclagem de um commit. "
-"Essa op챌찾o pode lhe fornecer uma melhor vis찾o geral durante a visualiza챌찾o "
-"da evolu챌찾o de um t처pico espec챠fico no ramo, pois faz a mesclagem em um "
-"t처pico no ramo e tende a ser apenas sobre o ajuste das atualiza챌천es da "
-"inicial de tempos em tempos, esta op챌찾o permite ignorar os commits "
-"individuais trazidas para o seu hist처rico feitas por essa mesclagem. N찾o "
-"pode ser combinado com `--bisect`."
+msgstr "Siga apenas o primeiro commit da origem ao ver a mesclagem de um commit. Essa op챌찾o pode lhe fornecer uma melhor vis찾o geral durante a visualiza챌찾o da evolu챌찾o de um t처pico espec챠fico no ramo, pois faz a mesclagem em um t처pico no ramo e tende a ser apenas sobre o ajuste das atualiza챌천es da inicial de tempos em tempos, esta op챌찾o permite ignorar os commits individuais trazidas para o seu hist처rico feitas por essa mesclagem. N찾o pode ser combinado com `--bisect`."
#. type: Plain text
#: en/rev-list-options.txt:137
@@ -69097,13 +62759,7 @@ msgstr "--alternate-refs"
#: en/rev-list-options.txt:192
#, 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 dos objetos "
-"seja definido no `objects/info/alternates`. O conjunto dos objetos "
-"inclu챠dos podem ser modificados pelo `core.alternateRefsCommand`, etc. "
-"Consulte 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 dos objetos seja definido no `objects/info/alternates`. O conjunto dos objetos inclu챠dos podem ser modificados pelo `core.alternateRefsCommand`, etc. Consulte linkgit:git-config[1]."
#. type: Plain text
#: en/rev-list-options.txt:200
@@ -69118,7 +62774,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr "Ao ver um nome de objeto inv찼lido na entrada, finja que a entrada incorreta n찾o foi informada."
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -69229,26 +62885,19 @@ msgstr ""
#: en/rev-list-options.txt:282
#, priority:260
msgid "If the starting point is specified as `ref@{Nth}`, show the index format."
-msgstr ""
-"Caso o ponto inicial seja utilizado como `ref@{Nth}`, exiba o formato do "
-"챠ndice."
+msgstr "Caso o ponto inicial seja utilizado como `ref@{Nth}`, exiba o formato do 챠ndice."
#. type: Plain text
#: en/rev-list-options.txt:285
#, priority:260
msgid "If the starting point was specified as `ref@{now}`, show the timestamp format."
-msgstr ""
-"Caso o ponto inicial seja utilizado como `ref@{now}`, exiba o formato do "
-"registro de data e hora."
+msgstr "Caso o ponto inicial seja utilizado como `ref@{now}`, exiba o formato do registro de data e hora."
#. type: Plain text
#: en/rev-list-options.txt:288
#, priority:260
msgid "If neither was used, but `--date` was given on the command line, show the timestamp in the format requested by `--date`."
-msgstr ""
-"Caso nenhum deles tenha sido utilizado, mas a op챌찾o `--data` foi utilizado "
-"na linha de comando, exibe o registro de data e hora no formato solicitado "
-"por `--data`."
+msgstr "Caso nenhum deles tenha sido utilizado, mas a op챌찾o `--data` foi utilizado na linha de comando, exibe o registro de data e hora no formato solicitado por `--data`."
#. type: Plain text
#: en/rev-list-options.txt:290
@@ -69350,9 +62999,7 @@ msgstr "--simplify-by-decoration"
#: en/rev-list-options.txt:334
#, priority:260
msgid "Commits that are referred by some branch or tag are selected."
-msgstr ""
-"S찾o selecionados os commits utilizados como refer챗ncia por algumas "
-"ramifica챌천es ou tags."
+msgstr "S찾o selecionados os commits utilizados como refer챗ncia por algumas ramifica챌천es ou tags."
#. type: Plain text
#: en/rev-list-options.txt:336
@@ -69379,7 +63026,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr "Simplifica o hist처rico para o mais simples, explicando a condi챌찾o final da 찼rvore. Mais simples, porque remove algumas ramifica챌천es laterais caso o resultado final seja o mesmo (ou seja, mesclar as ramifica챌천es com o mesmo conte첬do)"
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -69921,31 +63568,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -69963,43 +63616,43 @@ msgstr ""
"\t `---X--'\n"
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr "\t$ git rev-list --bisect foo ^bar ^baz\n"
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -70009,100 +63662,91 @@ msgstr ""
"\t$ git rev-list midpoint ^bar ^baz\n"
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr "Isso 챕 첬til porque facilita a escolha de um bom commit para testar quando quiser evitar o teste de alguns deles por algum motivo (por eles n찾o poderem ser compilados, por exemplo)."
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
-msgstr ""
-"Esta op챌찾o pode ser utilizada junto com `--bisect-vars`, neste caso, quando "
-"todos os objetos commits forem classificados, haver찼 o mesmo texto como se "
-"`--bisect-vars` tivesse sido utilizado sozinho."
+msgstr "Esta op챌찾o pode ser utilizada junto com `--bisect-vars`, neste caso, quando todos os objetos commits forem classificados, haver찼 o mesmo texto como se `--bisect-vars` tivesse sido utilizado sozinho."
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr "Ordenando os Commits"
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr "횋 predefinido que os commits sejam exibidos em uma ordem cronol처gica reversa."
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
-msgstr ""
-"N찾o exiba nenhuma origem antes de todos os herdeiros, por챕m exiba os commits "
-"com uma ordem de data e hora."
+msgstr "N찾o exiba nenhuma origem antes de todos os herdeiros, por챕m exiba os commits com uma ordem de data e hora."
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
-msgstr ""
-"N찾o exiba nenhuma origem antes de todos os herdeiros, por챕m exiba os commits "
-"com uma ordem de data e hora do autor."
+msgstr "N찾o exiba nenhuma origem antes de todos os herdeiros, por챕m exiba os commits com uma ordem de data e hora do autor."
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
-msgstr ""
-"N찾o exiba nenhuma origem antes de todos os herdeiros e evite exibir os "
-"commits com m첬ltiplas linhas misturadas no hist처rico."
+msgstr "N찾o exiba nenhuma origem antes de todos os herdeiros e evite exibir os commits com m첬ltiplas linhas misturadas no hist처rico."
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr "Por exemplo, em um hist처rico de commit como este:"
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -70114,466 +63758,439 @@ msgstr ""
"\t 3----5----6----8---\n"
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr "onde os n첬meros indicam a ordem dos registros de data e hora do commit, o comando `git rev-list` e seus amigos `--date-order` exibem os commits na ordem de registro de data e hora: 8 7 6 5 4 3 2 1."
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
-msgstr ""
-"Com `--topo-order`, eles demonstrariam 8 6 5 3 7 4 2 1 (ou 8 7 4 2 6 5 3 1); "
-"alguns commits mais antigos s찾o exibidos antes dos mais recentes, a fim de "
-"se evitar exibir os commits das duas trilhas de desenvolvimento paralelas "
-"misturadas juntas."
+msgstr "Com `--topo-order`, eles demonstrariam 8 6 5 3 7 4 2 1 (ou 8 7 4 2 6 5 3 1); alguns commits mais antigos s찾o exibidos antes dos mais recentes, a fim de se evitar exibir os commits das duas trilhas de desenvolvimento paralelas misturadas juntas."
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr "Envie os commits escolhidos para serem exibidos (consulte a se챌찾o Limita챌찾o do Commit acima) na ordem inversa. N찾o pode ser combinado com `--walk-reflogs`."
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr "Passagem de Objeto"
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr "Essas op챌천es s찾o direcionadas principalmente para o empacotamento dos reposit처rios Git."
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
-msgstr ""
-"횣til apenas com a op챌찾o `--objects`; imprima os nomes dos IDs dos objetos "
-"que forem encontrados. Este 챕 o comportamento predefinido."
+msgstr "횣til apenas com a op챌찾o `--objects`; imprima os nomes dos IDs dos objetos que forem encontrados. Este 챕 o comportamento predefinido."
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr "횣til apenas com `--objects`; n찾o imprime os nomes dos IDs dos objetos encontrados. Isso inverte `--object-names`. Essa flag permite que a sa챠da seja analisada mais facilmente por comandos como linkgit:git-cat-file[1]."
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr "O formul찼rio '--filter=blob:none' omite todos as \"gotas\"."
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr "Desligue qualquer op챌찾o `--filter=` utilizada anteriormente."
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr "A op챌찾o `--missing=error` solicita que os objetos do pacote parem com um erro caso um objeto perdido seja encontrado. Esta 챕 a a챌찾o predefinida."
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr "A op챌찾o '--missing=allow-promisor' 챕 como `allow-any`, mas s처 vai permitir que a travessia de objetos continue para os objetos prometedores PREVISTOS. Os objetos perdidos e inesperados provocar찾o um erro."
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr "A op챌찾o `--missing=print' 챕 como `allow any`, por챕m tamb챕m imprime uma lista dos objetos perdidos. As IDs do objeto s찾o prefixadas com um caractere `?`."
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
-msgstr ""
-"(Apenas para uso interno.) Uma pr챕-filtragem da travessia do objeto em um "
-"limite promissor Isso 챕 utilizado com clone parcial. 횋 mais forte do que "
-"`--missing=allow-promisor` porque limita a passagem, em vez de apenas "
-"silenciar os erros sobre os objetos perdidos."
+msgstr "(Apenas para uso interno.) Uma pr챕-filtragem da travessia do objeto em um limite promissor Isso 챕 utilizado com clone parcial. 횋 mais forte do que `--missing=allow-promisor` porque limita a passagem, em vez de apenas silenciar os erros sobre os objetos perdidos."
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr "--no-walk [=(com classifica챌찾o|sem classifica챌찾o)]"
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
-msgstr ""
-"Exibe apenas determinados commits, mas n찾o atravesse os seus ancestrais. "
-"Isso n찾o tem nenhum efeito caso um intervalo seja especificado. Caso o "
-"argumento `unsorted` (sem classifica챌찾o) seja utilizada, os commits ser찾o "
-"exibidos na ordem em que foram utilizadas na linha de comando. Caso "
-"contr찼rio (se o argumento `ordenado` ou nenhum outro seja utilizado), os "
-"commits ser찾o exibidos em ordem cronol처gica reversa pela data do commit. "
-"N찾o pode ser combinado com `--graph`."
+msgstr "Exibe apenas determinados commits, mas n찾o atravesse os seus ancestrais. Isso n찾o tem nenhum efeito caso um intervalo seja especificado. Caso o argumento `unsorted` (sem classifica챌찾o) seja utilizada, os commits ser찾o exibidos na ordem em que foram utilizadas na linha de comando. Caso contr찼rio (se o argumento `ordenado` ou nenhum outro seja utilizado), os commits ser찾o exibidos em ordem cronol처gica reversa pela data do commit. N찾o pode ser combinado com `--graph`."
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr "Substitui um `--no-walk` anterior."
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr "Formata챌찾o do Commit"
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
-msgstr ""
-"Utilizando estas op챌천es linkgit:git-rev-list[1] funcionar찼 de maneira "
-"semelhante 횪 fam챠lia mais especializada de ferramentas do registro log do "
-"commit: linkgit:git-log[1], linkgit:git-show[1] e linkgit:git-whatchanged[1]"
+msgstr "Utilizando estas op챌천es linkgit:git-rev-list[1] funcionar찼 de maneira semelhante 횪 fam챠lia mais especializada de ferramentas do registro log do commit: linkgit:git-log[1], linkgit:git-show[1] e linkgit:git-whatchanged[1]"
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr "횋 um sin척nimo para `--date=relative`."
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr "--date=<formato>"
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
-msgstr ""
-"Somente entra em vigor para as datas demonstradas no formato leg챠vel para as "
-"pessoas como utilizada na op챌찾o `--pretty`. A vari찼vel da configura챌찾o `log."
-"date` define um valor predefinido para a op챌찾o `--date` do comando do "
-"registro log. 횋 predefinido que os hor찼rios sejam exibidas no fuso hor찼rio "
-"original (do autor do commit ou do autor). Caso `-local` seja anexado ao "
-"formato (por exemplo,`iso-local`), o fuso hor찼rio local do usu찼rio ser찼 "
-"utilizado."
+msgstr "Somente entra em vigor para as datas demonstradas no formato leg챠vel para as pessoas como utilizada na op챌찾o `--pretty`. A vari찼vel da configura챌찾o `log.date` define um valor predefinido para a op챌찾o `--date` do comando do registro log. 횋 predefinido que os hor찼rios sejam exibidas no fuso hor찼rio original (do autor do commit ou do autor). Caso `-local` seja anexado ao formato (por exemplo,`iso-local`), o fuso hor찼rio local do usu찼rio ser찼 utilizado."
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr "A op챌찾o `--date=relative` exibe as datas relativas 횪 hora atual, por exemplo, ``2 horas atr찼s''. A op챌찾o `-local` n찾o tem efeito para `--date=relative`."
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr "`date=local` 챕 um apelido para `date=default-local`."
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr "A op챌찾o `--date=iso` (ou `date=iso`) exibe os registros de data e hora em formato semelhante ao ISO 8601. As diferen챌as para o formato r챠gido do ISO 8601 s찾o:"
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr "um espa챌o em vez do `T` para delimitar data/hora"
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr "um espa챌o entre a hora e o fuso hor찼rio"
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr "sem dois pontos entre horas e minutos do fuso hor찼rio"
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr "`--date=short` exibe apenas a data em formato `AAAA-MM-DD` por챕m n찾o a hora."
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr "A op챌찾o `--date=default` 챕 o formato predefinido e similar ao `--date=rfc2822` com algumas excess천es:"
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr "n찾o h찼 v챠rgula ap처s o dia da semana"
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr "o fuso hor찼rio 챕 omitido quando o fuso hor찼rio local 챕 utilizado"
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr "Exiba o conte첬do dos commits em formato bruto; cada registro 챕 separado por um caractere `NUL`."
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr "Exiba a data e hora do commit em formato bruto."
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr "Por exemplo, caso tenha essa topologia:"
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -70589,19 +64206,19 @@ msgstr ""
"\t o---x---a---a ramo A\n"
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr "voc챗 obter찼 uma sa챠da como essa:"
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -70619,90 +64236,85 @@ msgstr ""
"\t-xxxxxxx... 1쨘 no a\n"
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr "--show-linear-break[=<barreira>]"
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr "Formatando o \"Diff\""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
-msgstr ""
-"Com esta op챌찾o, a sa챠da \"diff\" para um commit de mesclagem exibe as "
-"diferen챌as de cada uma das origens para a mesclagem resultante de forma "
-"simult창nea em vez de mostrar a diferen챌a pareada entre uma origem e o "
-"resultado, um de cada vez. Al챕m disso, lista apenas os arquivos que foram "
-"modificados por todas as origens."
+msgstr "Com esta op챌찾o, a sa챠da \"diff\" para um commit de mesclagem exibe as diferen챌as de cada uma das origens para a mesclagem resultante de forma simult창nea em vez de mostrar a diferen챌a pareada entre uma origem e o resultado, um de cada vez. Al챕m disso, lista apenas os arquivos que foram modificados por todas as origens."
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr "Exibe os \"diffs\" recursivos."
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr "Exibe os objetos da 찼rvore em formato \"diff\". Isso implica no uso da op챌찾o `-r`."
@@ -70917,17 +64529,13 @@ msgstr "Em geral as URLs cont챗m informa챌천es sobre o protocolo de transporte,
#: 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 ""
-"O Git suporta os protocolos ssh, git, http e https (al챕m do ftp e ftps podem "
-"ser utilizados para capturar, por챕m 챕 ineficiente e obsoleto; n찾o utilize)."
+msgstr "O Git suporta os protocolos ssh, git, http e https (al챕m do ftp e ftps podem ser utilizados para capturar, por챕m 챕 ineficiente e obsoleto; n찾o utilize)."
#. 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 ""
-"O transporte nativo (ou seja, git:// URL) n찾o faz a autentica챌찾o e deve ser "
-"utilizado com cuidado em redes sem seguran챌a."
+msgstr "O transporte nativo (ou seja, git:// URL) n찾o faz a autentica챌찾o e deve ser utilizado com cuidado em redes sem seguran챌a."
#. type: Plain text
#: en/urls.txt:17
@@ -70963,9 +64571,7 @@ msgstr "ftp{startsb}s{endsb}://host.xz{startsb}:port{endsb}/caminho/para/o/repos
#: en/urls.txt:24
#, priority:300
msgid "An alternative scp-like syntax may also be used with the ssh protocol:"
-msgstr ""
-"Uma sintaxe alternativa como scp tamb챕m pode ser utilizada com o protocolo "
-"ssh:"
+msgstr "Uma sintaxe alternativa como scp tamb챕m pode ser utilizada com o protocolo ssh:"
#. type: Plain text
#: en/urls.txt:26
@@ -70977,12 +64583,7 @@ msgstr "{startsb}user@{endsb}host.xz:caminho/para/o/reposit처rio.git/"
#: 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 ""
-"Essa sintaxe apenas 챕 reconhecida caso n찾o haja barras antes dos primeiros "
-"dois pontos. Isso ajuda a diferenciar um caminho local que cont챕m dois "
-"pontos. Por exemplo, o caminho local `foo:bar` pode ser utilizado como um "
-"caminho absoluto ou `./foo:bar` para evitar ser mal interpretado como uma "
-"url ssh."
+msgstr "Essa sintaxe apenas 챕 reconhecida caso n찾o haja barras antes dos primeiros dois pontos. Isso ajuda a diferenciar um caminho local que cont챕m dois pontos. Por exemplo, o caminho local `foo:bar` pode ser utilizado como um caminho absoluto ou `./foo:bar` para evitar ser mal interpretado como uma url ssh."
#. type: Plain text
#: en/urls.txt:34
@@ -71012,9 +64613,7 @@ msgstr "{startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/caminho/para/o/repos
#: en/urls.txt:41
#, priority:300
msgid "For local repositories, also supported by Git natively, the following syntaxes may be used:"
-msgstr ""
-"Para os reposit처rios locais, as seguintes sintaxes podem ser utilizadas que "
-"tamb챕m s찾o compat챠veis de forma nativa pelo Git:"
+msgstr "Para os reposit처rios locais, as seguintes sintaxes podem ser utilizadas que tamb챕m s찾o compat챠veis de forma nativa pelo Git:"
#. type: Plain text
#: en/urls.txt:43
@@ -71050,10 +64649,7 @@ msgstr "`git clone`, `git fetch` e `git pull`, mas n찾o `git push`, tamb챕m acei
#: 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 ""
-"Quando o Git n찾o sabe como lidar com um determinado protocolo de transporte, "
-"quando existe, ele tenta usar o auxiliar `remote-<transporte>`. Para os "
-"reposit처rios locais, as seguintes sintaxes podem ser utilizadas:"
+msgstr "Quando o Git n찾o sabe como lidar com um determinado protocolo de transporte, quando existe, ele tenta usar o auxiliar `remote-<transporte>`. Para os reposit처rios locais, as seguintes sintaxes podem ser utilizadas:"
#. type: Plain text
#: en/urls.txt:65
@@ -71071,11 +64667,7 @@ msgstr "onde `<endere챌o>` pode ser um caminho, um servidor e um caminho ou uma
#: 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 ""
-"Se houver um grande n첬mero de reposit처rios remotos com nomes semelhantes e "
-"caso queira usar um formato diferente para eles (de modo que as URLs "
-"utilizadas sejam reescritas nas URLs que funcionam), voc챗 poder찼 criar uma "
-"se챌찾o de configura챌찾o da op챌찾o:"
+msgstr "Se houver um grande n첬mero de reposit처rios remotos com nomes semelhantes e caso queira usar um formato diferente para eles (de modo que as URLs utilizadas sejam reescritas nas URLs que funcionam), voc챗 poder찼 criar uma se챌찾o de configura챌찾o da op챌찾o:"
#. type: delimited block -
#: en/urls.txt:78
@@ -71115,9 +64707,7 @@ msgstr "uma URL como \"work:repo.git\" ou como \"host.xz:/caminho/para/o/reposit
#: 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 ""
-"Caso queira reescrever apenas as URLs para envio por \"push\" "
-"(impulsionamento), 챕 poss챠vel criar uma se챌찾o de configura챌찾o da op챌찾o:"
+msgstr "Caso queira reescrever apenas as URLs para envio por \"push\" (impulsionamento), 챕 poss챠vel criar uma se챌찾o de configura챌찾o da op챌찾o:"
#. type: delimited block -
#: en/urls.txt:97
@@ -71143,11 +64733,7 @@ msgstr ""
#: 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 ""
-"uma URL como \"git://exemplo.org/caminho/para/o/reposit처rio.git\" ser찼 "
-"reescrito para \"ssh://exemplo.org/caminho/para/o/reposit처rio.git\" para os "
-"\"pushes\" (impulsionamentos), por챕m os \"pulls\" (obten챌천es) ainda usar찾o a "
-"URL original."
+msgstr "uma URL como \"git://exemplo.org/caminho/para/o/reposit처rio.git\" ser찼 reescrito para \"ssh://exemplo.org/caminho/para/o/reposit처rio.git\" para os \"pushes\" (impulsionamentos), por챕m os \"pulls\" (obten챌천es) ainda usar찾o a URL original."
#. type: Title =
#: en/git-bisect-lk2009.txt:2
@@ -71456,11 +65042,7 @@ msgstr ""
#: en/git-bisect-lk2009.txt:241
#, priority:100
msgid "If the user is driving it, then at each step of the search, the user will have to test the current commit and say if it is \"good\" or \"bad\" using the \"git bisect good\" or \"git bisect bad\" commands respectively that have been described above. For example:"
-msgstr ""
-"Caso o usu찼rio esteja conduzindo, em cada etapa da pesquisa, o usu찼rio ter찼 "
-"que testar a confirma챌찾o atual e dizer se 챕 \"bom\" ou \"ruim\" utilizando "
-"os comandos 'git bisect good' or 'git bisect bad' respectivamente, como "
-"foram descritos acima. Por exemplo:"
+msgstr "Caso o usu찼rio esteja conduzindo, em cada etapa da pesquisa, o usu찼rio ter찼 que testar a confirma챌찾o atual e dizer se 챕 \"bom\" ou \"ruim\" utilizando os comandos 'git bisect good' or 'git bisect bad' respectivamente, como foram descritos acima. Por exemplo:"
#. type: delimited block -
#: en/git-bisect-lk2009.txt:246
@@ -72753,8 +66335,7 @@ msgstr ""
#: en/git-bisect-lk2009.txt:1020
#, priority:100
msgid "use \"git bisect run\" to find the commit that introduced it"
-msgstr ""
-"Utilize um \"git bisect run\" para localizar o commit que introduziu um bug"
+msgstr "Utilize um \"git bisect run\" para localizar o commit que introduziu um bug"
#. type: Plain text
#: en/git-bisect-lk2009.txt:1021
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index 185855b..f5fb959 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2020-02-08 19:43+0100\n"
"Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
"Language-Team: pt_PT\n"
@@ -88,7 +88,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -312,143 +312,155 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr ""
@@ -1116,83 +1128,95 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Switch branches."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr ""
@@ -2781,11 +2805,11 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 ""
@@ -6483,7 +6507,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6513,7 +6537,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6761,7 +6785,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7094,7 +7118,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9865,7 +9889,7 @@ msgstr "--git-format"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13617,7 +13641,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -18887,7 +18911,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19535,13 +19559,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27002,7 +27026,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27018,7 +27042,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29077,7 +29101,7 @@ msgstr ""
#, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
@@ -35499,7 +35523,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35721,7 +35745,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35733,13 +35757,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35751,7 +35775,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35763,7 +35787,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -41252,7 +41276,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41275,7 +41299,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41293,7 +41317,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41401,13 +41425,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41425,7 +41449,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41533,7 +41557,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41545,7 +41569,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46443,7 +46467,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46455,7 +46479,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49877,7 +49901,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -52937,8 +52961,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61125,7 +61149,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61377,7 +61401,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -61873,31 +61897,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -61909,43 +61939,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -61953,91 +61983,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62046,439 +62076,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62489,19 +62519,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62513,85 +62543,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 1495e75..9461f31 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2020-05-24 21:41+0000\n"
"Last-Translator: Golubev Alexander <fatzer2@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -13,8 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.1-dev\n"
#. type: Labeled list
@@ -90,7 +89,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -315,143 +314,155 @@ msgstr "�棘克逵鈞 �筠畇逵克�龜龜 龜 逵勻�棘�逵 極棘�剋筠畇戟筠均棘 龜鈞劇
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr "�棘畇��筠� 克棘剋龜�筠��勻逵 戟筠�極逵克棘勻逵戟戟�� 棘閨�筠克�棘勻 龜 極棘��筠閨剋筠戟龜� 龜劇龜 畇龜�克棘勻棘均棘 極�棘���逵戟��勻逵."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, fuzzy, priority:100
msgid "Show changes using common diff tools."
msgstr "�棘克逵鈞 龜鈞劇筠戟筠戟龜橘 � 極棘劇棘��� �逵�極�棘���逵戟筠戟戟�� ��龜剋龜� ��逵勻戟筠戟龜�"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, fuzzy, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr "��棘勻筠�克逵 �勻�鈞戟棘��龜 龜 勻逵剋龜畇戟棘��龜 棘閨�筠克�棘勻 勻 閨逵鈞筠 畇逵戟戟��"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr "��棘閨�逵菌筠戟龜筠 �極�逵勻棘�戟棘橘 龜戟�棘�劇逵�龜龜 棘 Git."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, fuzzy, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr "�均戟棘勻筠戟戟�橘 極�棘�劇棘�� 勻逵�筠均棘 �逵閨棘�筠均棘 �筠極棘鈞龜�棘�龜� 勻 gitweb"
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr "��棘閨�逵菌筠戟龜筠 ������棘�棘戟戟筠均棘 �剋龜�戟龜� 閨筠鈞 龜鈞劇筠戟筠戟龜� 龜戟畇筠克�逵."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr "�棘勻�棘�戟棘筠 龜�極棘剋�鈞棘勻逵戟龜筠 鈞逵極龜�逵戟戟�� �逵鈞�筠�筠戟龜橘 克棘戟�剋龜克�棘勻 �剋龜�戟龜�."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr "��棘閨�逵菌筠戟龜筠 勻筠�棘克 龜 龜� 克棘劇劇龜�棘勻."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr "��棘勻筠�克逵 GPG-極棘畇極龜�龜 克棘劇劇龜�棘勻."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr "��棘勻筠�克逵 GPG-極棘畇極龜�龜 劇筠�棘克."
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr "��勻棘畇 菌��戟逵剋逵 龜鈞劇筠戟筠戟龜橘, 勻戟筠��戟戟�� 克逵菌畇�劇 龜鈞 克棘劇劇龜�棘勻."
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr "�筠閨 龜戟�筠��筠橘� Git (勻筠閨-龜戟�筠��筠橘� 畇剋� Git �筠極棘鈞龜�棘�龜筠勻)."
@@ -1119,83 +1130,95 @@ msgstr "��勻棘畇 �逵鈞剋龜�戟�� �龜極棘勻 棘閨�筠克�棘勻"
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, fuzzy, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr "鬼極���逵�� 龜鈞劇筠戟筠戟龜� 勻 龜鈞劇筠戟�戟戟棘劇 �逵閨棘�筠劇 克逵�逵剋棘均筠"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, fuzzy, priority:100
msgid "Show the working tree status."
msgstr "��勻棘畇 �棘��棘�戟龜� �逵閨棘�筠均棘 克逵�逵剋棘均逵"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, fuzzy, priority:100
msgid "Initialize, update or inspect submodules."
msgstr "�戟龜�龜逵剋龜鈞逵�龜�, 棘閨戟棘勻剋筠戟龜筠 龜剋龜 極�棘�劇棘�� 極棘畇劇棘畇�剋筠橘"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, fuzzy, priority:100
msgid "Switch branches."
msgstr "�筠�筠鈞逵極龜�� 勻筠�棘克"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, fuzzy, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr "鬼棘鈞畇逵戟龜筠, 勻�勻棘畇 �極龜�克逵, �畇逵剋筠戟龜筠 龜剋龜 極�棘勻筠�克逵 劇筠�克龜, 極棘畇極龜�逵戟戟棘橘 � 極棘劇棘��� GPG"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, fuzzy, priority:100
msgid "Manage multiple working trees."
msgstr "叫極�逵勻剋筠戟龜筠 戟筠�克棘剋�克龜劇龜 �逵閨棘�龜劇龜 克逵�逵剋棘均逵劇龜"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr "��逵�鈞筠� �筠極棘鈞龜�棘�龜� Git."
@@ -2784,11 +2807,11 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 ""
@@ -6518,7 +6541,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6548,7 +6571,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6796,7 +6819,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7129,7 +7152,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9901,7 +9924,7 @@ msgstr "--date <�棘�劇逵�>"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13671,7 +13694,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -18952,7 +18975,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19600,13 +19623,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27075,7 +27098,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27091,7 +27114,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29147,10 +29170,14 @@ msgstr "git-init - 鬼棘鈞畇逵戟龜筠 極���棘均棘 �筠極棘鈞龜�棘�龜� Git 龜
#. type: Plain text
#: en/git-init.txt:15
-#, no-wrap, priority:300
+#, fuzzy, no-wrap, priority:300
+#| msgid ""
+#| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
+#| "\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+#| "\t [--shared[=<permissions>]] [directory]\n"
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
"'git init' [-q | --quiet] [--bare] [--template=<克逵�逵剋棘均_�逵閨剋棘戟棘勻>]\n"
@@ -29161,56 +29188,37 @@ msgstr ""
#: 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 ""
-"葵�逵 克棘劇逵戟畇逵 �棘鈞畇逵�� 極���棘橘 �筠極棘鈞龜�棘�龜橘 Git, 極棘 ���筠��勻�, 克逵�逵剋棘均 `.git` � "
-"極棘畇克逵�逵剋棘均逵劇龜 `objects`, `refs/heads`, `refs/tags`, 龜 �逵橘剋逵劇龜 �逵閨剋棘戟棘勻. "
-"龜逵克菌筠 �棘鈞畇逵���� 戟逵�逵剋�戟�橘 �逵橘剋 `HEAD`, 克棘�棘��橘 ���剋逵筠��� 戟逵 HEAD 勻筠�克龜 "
-"master."
+msgstr "葵�逵 克棘劇逵戟畇逵 �棘鈞畇逵�� 極���棘橘 �筠極棘鈞龜�棘�龜橘 Git, 極棘 ���筠��勻�, 克逵�逵剋棘均 `.git` � 極棘畇克逵�逵剋棘均逵劇龜 `objects`, `refs/heads`, `refs/tags`, 龜 �逵橘剋逵劇龜 �逵閨剋棘戟棘勻. 龜逵克菌筠 �棘鈞畇逵���� 戟逵�逵剋�戟�橘 �逵橘剋 `HEAD`, 克棘�棘��橘 ���剋逵筠��� 戟逵 HEAD 勻筠�克龜 master."
#. 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 ""
-"��剋龜 極筠�筠劇筠戟戟逵� ��筠畇� `$GIT_DIR` ���逵戟棘勻剋筠戟逵, �棘 棘戟逵 鈞逵畇逵�� 極���, 克棘�棘��橘 "
-"閨�畇筠� 龜�極棘剋�鈞棘勻逵���� 勻劇筠��棘 `./.git` 勻 克逵�筠��勻筠 棘�戟棘勻� 畇剋� �棘鈞畇逵戟龜� "
-"�筠極棘鈞龜�棘�龜�."
+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`."
+msgstr "��剋龜 克逵�逵剋棘均 ��逵戟筠戟龜� 棘閨�筠克�棘勻 鈞逵畇逵戟 � 極棘劇棘��� 極筠�筠劇筠戟戟棘橘 ��筠畇� `$GIT_OBJECT_DIRECTORY`, �棘 克逵�逵剋棘均龜 � �筠�-克棘畇棘劇 sha1 閨�畇�� �棘鈞畇逵勻逵���� 勻 戟�劇. � 極�棘�龜勻戟棘劇 �剋��逵筠 閨�畇筠� 龜�極棘剋�鈞棘勻逵���� 克逵�逵剋棘均 極棘 �劇棘剋�逵戟龜�, `$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 ""
-"�逵極��克逵�� 'git init' 勻戟���龜 ���筠��勻���筠均棘 �筠極棘鈞龜�棘�龜� 閨筠鈞棘極逵�戟棘. 葵�逵 克棘劇逵戟畇逵 "
-"戟筠 極筠�筠鈞逵極龜�筠� �棘, ��棘 �逵劇 �菌筠 筠���. ��戟棘勻戟逵� 極�龜�龜戟逵 極棘勻�棘�戟棘 鈞逵極��克逵�� "
-"'git init' �棘��棘龜� 勻 �棘劇, ��棘閨� 極棘畇�勻逵�龜剋龜�� �棘剋�克棘 ��棘 畇棘閨逵勻剋筠戟戟�筠 �逵閨剋棘戟� ("
-"龜剋龜 ��棘閨� 極筠�筠劇筠��龜�� �筠極棘鈞龜�棘�龜橘 勻 畇��均棘筠 劇筠��棘, 筠�剋龜 鈞逵畇逵戟 極逵�逵劇筠�� "
-"`--separate-git-dir`)."
+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 ""
-"鬼棘鈞畇逵�� 均棘剋�橘 �筠極棘鈞龜�棘�龜橘. ��剋龜 極筠�筠劇筠戟戟逵� ��筠畇� `GIT_DIR` 戟筠 鈞逵畇逵戟逵, �棘 筠橘 "
-"閨�畇筠� 極�龜�勻棘筠戟 �筠克��龜橘 �逵閨棘�龜橘 克逵�逵剋棘均."
+msgstr "鬼棘鈞畇逵�� 均棘剋�橘 �筠極棘鈞龜�棘�龜橘. ��剋龜 極筠�筠劇筠戟戟逵� ��筠畇� `GIT_DIR` 戟筠 鈞逵畇逵戟逵, �棘 筠橘 閨�畇筠� 極�龜�勻棘筠戟 �筠克��龜橘 �逵閨棘�龜橘 克逵�逵剋棘均."
#. type: Labeled list
#: en/git-init.txt:51
@@ -29222,9 +29230,7 @@ msgstr "--patch-format=<�棘�劇逵�>"
#: en/git-init.txt:55
#, priority:300
msgid "Specify the given object format (hash algorithm) for the repository. The valid values are 'sha1' and (if enabled) 'sha256'. 'sha1' is the default."
-msgstr ""
-"�逵畇逵�� �棘�劇逵� 棘閨�筠克�棘勻 (逵剋均棘�龜�劇 �筠�龜�棘勻逵戟龜�) �筠極棘鈞龜�棘�龜�. �棘極���龜劇�筠 "
-"鈞戟逵�筠戟龜�: 'sha1' 龜 (筠�剋龜 勻克剋���戟) 'sha256'. �棘 �劇棘剋�逵戟龜�: 'sha1'."
+msgstr "�逵畇逵�� �棘�劇逵� 棘閨�筠克�棘勻 (逵剋均棘�龜�劇 �筠�龜�棘勻逵戟龜�) �筠極棘鈞龜�棘�龜�. �棘極���龜劇�筠 鈞戟逵�筠戟龜�: 'sha1' 龜 (筠�剋龜 勻克剋���戟) 'sha256'. �棘 �劇棘剋�逵戟龜�: 'sha1'."
#. type: Plain text
#: en/git-init.txt:60
@@ -29332,17 +29338,13 @@ msgstr "��龜���� 珪�������"
#: en/git-init.txt:122
#, 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 ""
-"圭逵橘剋� 龜 克逵�逵剋棘均龜, 龜鈞 克逵�逵剋棘均逵 �逵閨剋棘戟棘勻, ��龜 龜劇筠戟逵 戟逵�龜戟逵���� 戟筠 � �棘�克龜 "
-"閨�畇�� �克棘極龜�棘勻逵戟� 勻 `$GIT_DIR` 極棘�剋筠 �棘均棘, 克逵克 棘戟 閨�畇筠� �棘鈞畇逵戟."
+msgstr "圭逵橘剋� 龜 克逵�逵剋棘均龜, 龜鈞 克逵�逵剋棘均逵 �逵閨剋棘戟棘勻, ��龜 龜劇筠戟逵 戟逵�龜戟逵���� 戟筠 � �棘�克龜 閨�畇�� �克棘極龜�棘勻逵戟� 勻 `$GIT_DIR` 極棘�剋筠 �棘均棘, 克逵克 棘戟 閨�畇筠� �棘鈞畇逵戟."
#. type: Plain text
#: en/git-init.txt:124
#, priority:300
msgid "The template directory will be one of the following (in order):"
-msgstr ""
-"� 克逵�筠��勻筠 克逵�逵剋棘均逵 �逵閨剋棘戟棘勻 閨�畇筠� 龜�極棘剋�鈞棘勻逵���� 棘畇龜戟 龜鈞 �剋筠畇���龜� (勻 "
-"極棘��畇克筠 極筠�筠�龜�剋筠戟龜�):"
+msgstr "� 克逵�筠��勻筠 克逵�逵剋棘均逵 �逵閨剋棘戟棘勻 閨�畇筠� 龜�極棘剋�鈞棘勻逵���� 棘畇龜戟 龜鈞 �剋筠畇���龜� (勻 極棘��畇克筠 極筠�筠�龜�剋筠戟龜�):"
#. type: Plain text
#: en/git-init.txt:126
@@ -29372,10 +29374,7 @@ msgstr "克逵�逵剋棘均 �逵閨剋棘戟棘勻 極棘 �劇棘剋�逵戟龜�: `/usr/share/git
#: en/git-init.txt:135
#, priority:300
msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
-msgstr ""
-"�逵�逵剋棘均 �逵閨剋棘戟棘勻 極棘 �劇棘剋�逵戟龜� �菌筠 �棘畇筠�菌龜� 戟筠克棘�棘��� ����克���� 克逵�逵剋棘均棘勻: "
-"�筠克棘劇筠戟畇棘勻逵戟戟�筠 짬�逵閨剋棘戟� 龜�克剋��筠戟龜橘쨩 (exlude patterns, �劇. "
-"linkgit:gitignore[5]) 龜 極�龜劇筠�� �逵橘剋棘勻-極筠�筠�勻逵��龜克棘勻 (hook)."
+msgstr "�逵�逵剋棘均 �逵閨剋棘戟棘勻 極棘 �劇棘剋�逵戟龜� �菌筠 �棘畇筠�菌龜� 戟筠克棘�棘��� ����克���� 克逵�逵剋棘均棘勻: �筠克棘劇筠戟畇棘勻逵戟戟�筠 짬�逵閨剋棘戟� 龜�克剋��筠戟龜橘쨩 (exlude patterns, �劇. linkgit:gitignore[5]) 龜 極�龜劇筠�� �逵橘剋棘勻-極筠�筠�勻逵��龜克棘勻 (hook)."
#. type: Plain text
#: en/git-init.txt:138
@@ -33210,8 +33209,7 @@ msgstr ""
#: en/git-mv.txt:17
#, priority:280
msgid "Move or rename a file, directory or symlink."
-msgstr ""
-"�筠�筠劇筠�筠戟龜筠 龜剋龜 極筠�筠龜劇筠戟棘勻逵戟龜筠 �逵橘剋逵, 克逵�逵剋棘均逵 龜剋龜 �龜劇勻棘剋龜�筠�克棘橘 ���剋克龜."
+msgstr "�筠�筠劇筠�筠戟龜筠 龜剋龜 極筠�筠龜劇筠戟棘勻逵戟龜筠 �逵橘剋逵, 克逵�逵剋棘均逵 龜剋龜 �龜劇勻棘剋龜�筠�克棘橘 ���剋克龜."
#. type: Plain text
#: en/git-mv.txt:20
@@ -35608,7 +35606,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35830,7 +35828,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35842,13 +35840,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35860,7 +35858,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35872,7 +35870,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -36182,11 +36180,7 @@ msgstr "'. \"$(git --exec-path)/git-parse-remote\"'\n"
#: en/git-parse-remote.txt:20
#, priority:100
msgid "This script is included in various scripts to supply routines to parse files under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables that are related to fetching, pulling and pushing."
-msgstr ""
-"葵�棘� ��筠戟逵�龜橘 畇棘閨逵勻剋筠戟 勻 克棘剋剋筠克�龜� ��筠戟逵�龜筠勻, 畇逵閨� 極�筠畇棘��逵勻龜�� 極棘畇極�棘均�逵劇劇� "
-"畇剋� �逵鈞閨棘�逵 �逵橘剋棘勻, ��逵戟��龜��� 勻 克逵�逵剋棘均逵� $GIT_DIR/remotes/ 龜 $GIT_DIR/"
-"branches/, 逵 �逵克菌筠 戟筠克棘�棘��� 戟逵���棘筠�戟�� 極筠�筠劇筠戟戟��, �勻�鈞逵戟戟�� � 龜鈞勻剋筠�筠戟龜筠劇 "
-"(fetch), 極棘剋��筠戟龜筠劇 (pull) 龜 棘�極�逵勻克棘橘 (push) 龜鈞劇筠戟筠戟龜橘."
+msgstr "葵�棘� ��筠戟逵�龜橘 畇棘閨逵勻剋筠戟 勻 克棘剋剋筠克�龜� ��筠戟逵�龜筠勻, 畇逵閨� 極�筠畇棘��逵勻龜�� 極棘畇極�棘均�逵劇劇� 畇剋� �逵鈞閨棘�逵 �逵橘剋棘勻, ��逵戟��龜��� 勻 克逵�逵剋棘均逵� $GIT_DIR/remotes/ 龜 $GIT_DIR/branches/, 逵 �逵克菌筠 戟筠克棘�棘��� 戟逵���棘筠�戟�� 極筠�筠劇筠戟戟��, �勻�鈞逵戟戟�� � 龜鈞勻剋筠�筠戟龜筠劇 (fetch), 極棘剋��筠戟龜筠劇 (pull) 龜 棘�極�逵勻克棘橘 (push) 龜鈞劇筠戟筠戟龜橘."
#. type: Title =
#: en/git-patch-id.txt:2
@@ -41378,7 +41372,7 @@ msgstr "git-remote - 叫極�逵勻剋筠戟龜筠 棘��剋筠菌龜勻逵筠劇�劇龜 �筠極棘
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41401,7 +41395,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41419,7 +41413,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41527,13 +41521,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41551,7 +41545,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41659,7 +41653,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41671,7 +41665,7 @@ msgstr "'update'"
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46574,7 +46568,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46586,7 +46580,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -50008,7 +50002,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -53076,8 +53070,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61270,7 +61264,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61522,7 +61516,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -62018,31 +62012,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -62054,43 +62054,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -62098,91 +62098,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62191,439 +62191,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr "--date=<�棘�劇逵�>"
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62634,19 +62634,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62658,85 +62658,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index f91e534..f5f8bfb 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2020-05-16 17:45+0000\n"
"Last-Translator: O휓uz Ersen <oguzersen@protonmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -90,7 +90,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -314,143 +314,155 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr ""
@@ -1118,83 +1130,95 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Switch branches."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr ""
@@ -2783,11 +2807,11 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 ""
@@ -6490,7 +6514,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6520,7 +6544,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6768,7 +6792,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7100,7 +7124,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9868,7 +9892,7 @@ msgstr "--suffix <bi챌im>"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13620,7 +13644,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -18890,7 +18914,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19538,13 +19562,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27002,7 +27026,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27018,7 +27042,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29077,7 +29101,7 @@ msgstr ""
#, no-wrap, priority:300
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
@@ -35497,7 +35521,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35719,7 +35743,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35731,13 +35755,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35749,7 +35773,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35761,7 +35785,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -41249,7 +41273,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41272,7 +41296,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41290,7 +41314,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41398,13 +41422,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41422,7 +41446,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41530,7 +41554,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41542,7 +41566,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46439,7 +46463,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46451,7 +46475,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49873,7 +49897,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -52932,8 +52956,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61111,7 +61135,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61363,7 +61387,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -61859,31 +61883,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -61895,43 +61925,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -61939,91 +61969,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62032,439 +62062,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62475,19 +62505,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62499,85 +62529,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 396e5b9..1e5ab2a 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: git documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2020-05-28 20:42+0000\n"
"Last-Translator: �� <ranto2012@163.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -90,7 +90,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -314,143 +314,155 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, fuzzy, priority:100
msgid "Display help information about Git."
msgstr " Git "
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, fuzzy, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr " gitweb "
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, fuzzy, priority:100
msgid "Check the GPG signature of commits."
msgstr " GPG "
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, fuzzy, priority:100
msgid "Check the GPG signature of tags."
msgstr " GPG "
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, fuzzy, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr "Git web Git web "
@@ -1118,83 +1130,95 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, priority:100
msgid "Switch branches."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, fuzzy, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr " GPG "
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, fuzzy, priority:100
msgid "The Git repository browser."
msgstr "Git "
@@ -1337,8 +1361,8 @@ msgstr ""
msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]"
-# �ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁�
#. type: Plain text
+# �ζ돻瀯쇿츣�덃쑍�꾤Е�룟릫燁�
#: en/cmds-plumbinginterrogators.txt:36
#, priority:100
msgid "Find symbolic names for given revs."
@@ -2785,11 +2809,11 @@ msgstr "ISO 8601"
#: en/date-formats.txt:26
#, fuzzy, 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."
-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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr "ISO 8601 �뉐뇛鰲꾢츣�꾣뿶�닷뭽�ζ쐿竊뚥풃倻� `2005-04-07T22:13:13`�귟㎗�먨솳阿잍렏�쀥컛 `T` �욘뜟訝븀㈉�쇈��"
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 "閭ㅵ쨼竊뚧뿥�잓깿�녻퓲�ε룛餓δ툔�쇔폀竊�`YYYY.MM.DD`竊�`MM/DD/YYYY` �� `DD.MM.YYYY`��"
@@ -3906,8 +3930,7 @@ msgstr "--numstat"
#: en/diff-options.txt:155
#, priority:280
msgid "Similar to `--stat`, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly. For binary files, outputs two `-` instead of saying `0 0`."
-msgstr ""
-"映삡세雅� `--stat`竊뚥퐜��슴�ⓨ컦�곁궧�뚥툖�ョ섄�숂쉪瓮�푶�띷샑鹽뷸렌�졾뭽�좈솮�꾥죱�곤펽鵝욕끀野밭쮮佯뤸쎍�뗥��귛�雅롣틠瓦쎾댍�뉏뻑竊뚩풏�뷰륵訝� `-`竊뚩�뚥툖�� `0 0`��"
+msgstr "映삡세雅� `--stat`竊뚥퐜��슴�ⓨ컦�곁궧�뚥툖�ョ섄�숂쉪瓮�푶�띷샑鹽뷸렌�졾뭽�좈솮�꾥죱�곤펽鵝욕끀野밭쮮佯뤸쎍�뗥��귛�雅롣틠瓦쎾댍�뉏뻑竊뚩풏�뷰륵訝� `-`竊뚩�뚥툖�� `0 0`��"
#. type: Labeled list
#: en/diff-options.txt:156
@@ -3937,9 +3960,7 @@ msgstr "--dirstat[=<�귝빊1,�귝빊2,...>]"
#: en/diff-options.txt:169
#, priority:280
msgid "Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters. The defaults are controlled by the `diff.dirstat` configuration variable (see linkgit:git-config[1]). The following parameters are available:"
-msgstr ""
-"渦볟눣驪뤶릉耶먪쎅壤뺟쉪�멨��섇뙑�뤹쉪�녶툋��`--dirstat` �꾥죱訝뷴룾餓ι�싪퓝鴉좈�믢�訝や빳�쀥뤇�녽슂�꾢뢿�겼닓烏ⓩ씎�ゅ츣阿됥�귡퍡溫ㅵ�쇘뵳`diff.dirstat` "
-"�띸쉰�섌뇧�㎩댍 (�귟쭅 linkgit:git-config[1])�귚빳訝뗦삸��뵪�꾢뢿�곤폏"
+msgstr "渦볟눣驪뤶릉耶먪쎅壤뺟쉪�멨��섇뙑�뤹쉪�녶툋��`--dirstat` �꾥죱訝뷴룾餓ι�싪퓝鴉좈�믢�訝や빳�쀥뤇�녽슂�꾢뢿�겼닓烏ⓩ씎�ゅ츣阿됥�귡퍡溫ㅵ�쇘뵳`diff.dirstat` �띸쉰�섌뇧�㎩댍 (�귟쭅 linkgit:git-config[1])�귚빳訝뗦삸��뵪�꾢뢿�곤폏"
#. type: Labeled list
#: en/diff-options.txt:171
@@ -3951,9 +3972,7 @@ msgstr "`changes`"
#: en/diff-options.txt:177
#, priority:280
msgid "Compute the dirstat numbers by counting the lines that have been removed from the source, or added to the destination. This ignores the amount of pure code movements within a file. In other words, rearranging lines in a file is not counted as much as other changes. This is the default behavior when no parameter is given."
-msgstr ""
-"�싪퓝溫←츞餓롦틦�뉏뻑訝�닠�ㅷ쉪烏뚧빊�뽪렌�졾댆��젃�뉏뻑訝�쉪烏뚧빊�θ�嶸쀥늽躍껆듁�곭쉪�겼춻�귟퓳恙썹븼雅녷뻼餓뜹냵�꾡빰�곭㎉�②죱訝뷩�귚튋弱길삸瑥댐펽�ⓩ뻼餓뜸릎�띷뼭�믣닓�꾥죱訝띴폏�뤷끀餓뽩룜�뽨��룩˙"
-"溫←츞�ⓨ냵�귟퓳��쑉亦→쐣瀯쇿눣�귝빊�띄쉪容섋�烏뚥맏��"
+msgstr "�싪퓝溫←츞餓롦틦�뉏뻑訝�닠�ㅷ쉪烏뚧빊�뽪렌�졾댆��젃�뉏뻑訝�쉪烏뚧빊�θ�嶸쀥늽躍껆듁�곭쉪�겼춻�귟퓳恙썹븼雅녷뻼餓뜹냵�꾡빰�곭㎉�②죱訝뷩�귚튋弱길삸瑥댐펽�ⓩ뻼餓뜸릎�띷뼭�믣닓�꾥죱訝띴폏�뤷끀餓뽩룜�뽨��룩˙溫←츞�ⓨ냵�귟퓳��쑉亦→쐣瀯쇿눣�귝빊�띄쉪容섋�烏뚥맏��"
#. type: Labeled list
#: en/diff-options.txt:177
@@ -3965,10 +3984,7 @@ msgstr "`lines`"
#: en/diff-options.txt:185
#, priority:280
msgid "Compute the dirstat numbers by doing the regular line-based diff analysis, and summing the removed/added line counts. (For binary files, count 64-byte chunks instead, since binary files have no natural concept of lines). This is a more expensive `--dirstat` behavior than the `changes` behavior, but it does count rearranged lines within a file as much as other changes. The resulting output is consistent with what you get from the other `--*stat` options."
-msgstr ""
-"�싪퓝�싧만鰲꾢읃雅롨죱�꾢량凉귛늽�먲펽溫←츞�녶툋�뜻�곭쉪�겼춻竊뚦뭉弱녶닠��/曆삣뒥�꾥죱�곁쎑�졼��(野밥틢雅뚩퓵�뜻뻼餓띰펽��64耶쀨뒄�꾢쓼�θ�嶸쀯펽�졽맏雅뚩퓵�뜻뻼餓뜻깹�됭죱�꾣쫩恙�)�귛쑉鵝욜뵪 "
-"`--dirstat` �띈퓳訝ら�됮」�꾥죱訝뷴���驪� `changes` �닷ㄷ竊뚥퐜鴉싧��뉏뻑訝�뇥�경럲�쀧쉪烏뚩퓵烏뚩��겹�귛끀孃쀥댆�꾥풏�븀퍜�쒍툗�뜸퍟�� `--*stat` "
-"�됮」訝��담��"
+msgstr "�싪퓝�싧만鰲꾢읃雅롨죱�꾢량凉귛늽�먲펽溫←츞�녶툋�뜻�곭쉪�겼춻竊뚦뭉弱녶닠��/曆삣뒥�꾥죱�곁쎑�졼��(野밥틢雅뚩퓵�뜻뻼餓띰펽��64耶쀨뒄�꾢쓼�θ�嶸쀯펽�졽맏雅뚩퓵�뜻뻼餓뜻깹�됭죱�꾣쫩恙�)�귛쑉鵝욜뵪 `--dirstat` �띈퓳訝ら�됮」�꾥죱訝뷴���驪� `changes` �닷ㄷ竊뚥퐜鴉싧��뉏뻑訝�뇥�경럲�쀧쉪烏뚩퓵烏뚩��겹�귛끀孃쀥댆�꾥풏�븀퍜�쒍툗�뜸퍟�� `--*stat` �됮」訝��담��"
#. type: Labeled list
#: en/diff-options.txt:185
@@ -3980,9 +3996,7 @@ msgstr "`files`"
#: en/diff-options.txt:190
#, priority:280
msgid "Compute the dirstat numbers by counting the number of files changed. Each changed file counts equally in the dirstat analysis. This is the computationally cheapest `--dirstat` behavior, since it does not have to look at the file contents at all."
-msgstr ""
-"�싪퓝溫←츞熬ユ뵻�섊쉪�뉏뻑�곈뇧�θ�嶸쀥늽躍껆듁�곭쉪�겼춻�귛쑉�녶툋�뜻�곩늽�먧릎竊뚧캀訝�訝よ˙�밧룜�꾣뻼餓띌꺗鴉싪˙亮녕춬�계�嶸쀣�귟퓳���嶸쀤툓凉�����弱뤹쉪 `--dirstat` "
-"烏뚥맏竊뚦썱訝뷴츆�좈��η쐦�뉏뻑�끻���"
+msgstr "�싪퓝溫←츞熬ユ뵻�섊쉪�뉏뻑�곈뇧�θ�嶸쀥늽躍껆듁�곭쉪�겼춻�귛쑉�녶툋�뜻�곩늽�먧릎竊뚧캀訝�訝よ˙�밧룜�꾣뻼餓띌꺗鴉싪˙亮녕춬�계�嶸쀣�귟퓳���嶸쀤툓凉�����弱뤹쉪 `--dirstat` 烏뚥맏竊뚦썱訝뷴츆�좈��η쐦�뉏뻑�끻���"
#. type: Labeled list
#: en/diff-options.txt:190
@@ -3994,9 +4008,7 @@ msgstr "`cumulative`"
#: en/diff-options.txt:195
#, priority:280
msgid "Count changes in a child directory for the parent directory as well. Note that when using `cumulative`, the sum of the percentages reported may exceed 100%. The default (non-cumulative) behavior can be specified with the `noncumulative` parameter."
-msgstr ""
-"耶먪쎅壤뺜릎�꾢룜�뽬�嶸쀥댆�띄쎅壤뺜릎�� 力ⓩ꼷竊뚦퐪鵝욜뵪 `cumulative` �됮」�띰펽�ε몜�꾤쇍�녷캈阿뗥뭽��꺗擁낁퓝100%�귡퍡溫ㅷ쉪竊덆씆榮�㎝竊됭죱訝뷴룾餓η뵪 "
-"`noncumulative` �귝빊�뉐츣��"
+msgstr "耶먪쎅壤뺜릎�꾢룜�뽬�嶸쀥댆�띄쎅壤뺜릎�� 力ⓩ꼷竊뚦퐪鵝욜뵪 `cumulative` �됮」�띰펽�ε몜�꾤쇍�녷캈阿뗥뭽��꺗擁낁퓝100%�귡퍡溫ㅷ쉪竊덆씆榮�㎝竊됭죱訝뷴룾餓η뵪 `noncumulative` �귝빊�뉐츣��"
#. type: Labeled list
#: en/diff-options.txt:195 en/git-cherry.txt:39
@@ -4014,9 +4026,7 @@ msgstr "訝�訝ゆ빐�겼뢿�곤펽�뜻뙁若싦�訝ゆ닼閭®쇍�녷캈竊덆퍡溫ㅴ맏3%竊됥��
#: en/diff-options.txt:205
#, priority:280
msgid "Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`."
-msgstr ""
-"堊뗥쫩竊싦툔�®쉪�귝빊鴉싩퍨溫→쎍�밭쉪�뉏뻑竊뚦릪�뜹옙�ε뜝�닸뵻�뉏뻑�삥빊10%餓δ툔�꾤쎅壤뺧펽亮띄눕燁�댍��퐬訝�쉪耶먪쎅壤뺠��곤폏`--dirstat=files,10,cumula"
-"tive`��"
+msgstr "堊뗥쫩竊싦툔�®쉪�귝빊鴉싩퍨溫→쎍�밭쉪�뉏뻑竊뚦릪�뜹옙�ε뜝�닸뵻�뉏뻑�삥빊10%餓δ툔�꾤쎅壤뺧펽亮띄눕燁�댍��퐬訝�쉪耶먪쎅壤뺠��곤폏`--dirstat=files,10,cumulative`��"
#. type: Labeled list
#: en/diff-options.txt:206
@@ -4098,9 +4108,7 @@ msgstr ""
#: en/diff-options.txt:238 en/git-apply.txt:122
#, fuzzy, priority:280
msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgstr ""
-"倻귝옖亦→쐣瓦쇾릉�됮」竊뚦를 \"訝띶만鰲�\" 耶쀧Е�꾥러孃꾢릫鴉싪˙凉뺟뵪竊뚧�倻귡뀓營�룜�� `core.quotePath` ��鰲ｉ뇢�꾦궍�뤄펷�귟쭅 linkgit:git-"
-"config[1]竊됥��"
+msgstr "倻귝옖亦→쐣瓦쇾릉�됮」竊뚦를 \"訝띶만鰲�\" 耶쀧Е�꾥러孃꾢릫鴉싪˙凉뺟뵪竊뚧�倻귡뀓營�룜�� `core.quotePath` ��鰲ｉ뇢�꾦궍�뤄펷�귟쭅 linkgit:git-config[1]竊됥��"
#. type: Labeled list
#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
@@ -4136,12 +4144,7 @@ msgstr "--submodule[=<�쇔폀>]"
#: en/diff-options.txt:257
#, priority:280
msgid "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset."
-msgstr ""
-"�뉐츣耶먩Æ�쀤릎�꾢량凉귛쫩鵝뺞샑鹽뷩�귛퐪�뉐츣 `--submodule=short` �됮」�띰펽鴉싦슴�� 'short' "
-"�쇔폀�귟퓳燁띷졏凉뤷룵�양ㅊ�껃쎍�꾢�鸚닷뭽瀯볟갼鸚꾤쉪�먧벡�띸㎞�귛퐪�뉐츣雅� `--submodule=short` �� `--submodule=log` �띰펽鴉싦슴�� "
-"'log' �쇔폀�귟퓳燁띷졏凉뤶폏�� linkgit:git-submodule[1] `summary` �ｆ졆竊뚦닓�븃��껃쎍�끿쉪�먧벡�귛퐪�뉐츣雅� "
-"`--submodule=diff` �띰펽鴉싦슴�� 'diff' �쇔폀�귟퓳訝ゆ졏凉뤸샑鹽븀쉪��춴與▼쓼�끻쑉�먧벡�껃쎍阿뗩뿴�꾢룜�뽩량凉귙�귡퍡溫ㅴ맏 `diff."
-"submodule`竊뚦쫩�쒒뀓營��됮」�よ�營�펽 �쇾맏 `short` �쇔폀��"
+msgstr "�뉐츣耶먩Æ�쀤릎�꾢량凉귛쫩鵝뺞샑鹽뷩�귛퐪�뉐츣 `--submodule=short` �됮」�띰펽鴉싦슴�� 'short' �쇔폀�귟퓳燁띷졏凉뤷룵�양ㅊ�껃쎍�꾢�鸚닷뭽瀯볟갼鸚꾤쉪�먧벡�띸㎞�귛퐪�뉐츣雅� `--submodule=short` �� `--submodule=log` �띰펽鴉싦슴�� 'log' �쇔폀�귟퓳燁띷졏凉뤶폏�� linkgit:git-submodule[1] `summary` �ｆ졆竊뚦닓�븃��껃쎍�끿쉪�먧벡�귛퐪�뉐츣雅� `--submodule=diff` �띰펽鴉싦슴�� 'diff' �쇔폀�귟퓳訝ゆ졏凉뤸샑鹽븀쉪��춴與▼쓼�끻쑉�먧벡�껃쎍阿뗩뿴�꾢룜�뽩량凉귙�귡퍡溫ㅴ맏 `diff.submodule`竊뚦쫩�쒒뀓營��됮」�よ�營�펽 �쇾맏 `short` �쇔폀��"
#. type: Labeled list
#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:224 en/git-show-branch.txt:119 en/git-tag.txt:125
@@ -4153,9 +4156,7 @@ msgstr "--color[=<鵝뺞뿶>]"
#: en/diff-options.txt:262
#, priority:280
msgid "Show colored diff. `--color` (i.e. without '=<when>') is the same as `--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
-msgstr ""
-"�양ㅊ�됮쥪�꿰쉪藥�펰��`--color`竊덂뜵訝띶맜 '=<鵝뺞뿶>'竊됦툗 `--color=always` �멨릪��'<鵝뺞뿶>' ��빳�� "
-"`always`��`never` �� `auto`��"
+msgstr "�양ㅊ�됮쥪�꿰쉪藥�펰��`--color`竊덂뜵訝띶맜 '=<鵝뺞뿶>'竊됦툗 `--color=always` �멨릪��'<鵝뺞뿶>' ��빳�� `always`��`never` �� `auto`��"
#. type: Plain text
#: en/diff-options.txt:265
@@ -4255,10 +4256,7 @@ msgstr "plain"
#: en/diff-options.txt:296
#, fuzzy, priority:280
msgid "Any line that is added in one location and was removed in another location will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved' will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation."
-msgstr ""
-"餓삡퐬�ⓩ윇訝や퐤營�˙曆삣뒥竊뚥툝�ⓨ룱訝�訝や퐤營�˙�좈솮�꾥죱竊뚪꺗鴉싪˙�� 'color.diff.newMoved' ���꿔�귛릪�루쉪竊�"
-"�ⓨ량凉귚릎�ⓩ윇鸚꾢닠�ㅴ툝�ⓨ끀若껃쑑�방렌�좂쉪烏뚥폏鵝욜뵪 'color.diff.oldMoved' "
-"���꿔�귟퓳燁띷Æ凉뤷룾餓θ��뽨뻣鵝뺠˙燁삣뒯�꾥죱竊뚥퐜�ⓧ빰�곩��δ릎竊뚦츆訝띹꺗簾�츣訝�訝や빰�곩쓼��맔�ょ퍘�믣닓�뚩퓵烏뚥틙燁삣뒯��"
+msgstr "餓삡퐬�ⓩ윇訝や퐤營�˙曆삣뒥竊뚥툝�ⓨ룱訝�訝や퐤營�˙�좈솮�꾥죱竊뚪꺗鴉싪˙�� 'color.diff.newMoved' ���꿔�귛릪�루쉪竊뚦쑉藥�펰訝�쑉�먨쨪�좈솮訝붷쑉�뜹츆�경뼶曆삣뒥�꾥죱鴉싦슴�� 'color.diff.oldMoved' ���꿔�귟퓳燁띷Æ凉뤷룾餓θ��뽨뻣鵝뺠˙燁삣뒯�꾥죱竊뚥퐜�ⓧ빰�곩��δ릎竊뚦츆訝띹꺗簾�츣訝�訝や빰�곩쓼��맔�ょ퍘�믣닓�뚩퓵烏뚥틙燁삣뒯��"
#. type: Labeled list
#: en/diff-options.txt:296
@@ -4270,9 +4268,7 @@ msgstr "blocks"
#: en/diff-options.txt:301
#, priority:280
msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart."
-msgstr ""
-"鵝욜뵪兀ゅ퓘�방퀡汝�役뗥맜�녑컩20訝ゅ춻驪띷빊耶쀥춻寧�쉪燁삣뒯�뉑쑍�쀣�귝�役뗥댆�꾢뙷�쀤슴�� 'color.diff.{old,new}Moved' "
-"�꾦쥪�꿔�귞쎑�사쉪�뷴쓼訝띹꺗熬ュ뙷�녶���"
+msgstr "鵝욜뵪兀ゅ퓘�방퀡汝�役뗥맜�녑컩20訝ゅ춻驪띷빊耶쀥춻寧�쉪燁삣뒯�뉑쑍�쀣�귝�役뗥댆�꾢뙷�쀤슴�� 'color.diff.{old,new}Moved' �꾦쥪�꿔�귞쎑�사쉪�뷴쓼訝띹꺗熬ュ뙷�녶���"
#. type: Labeled list
#: en/diff-options.txt:301
@@ -4284,9 +4280,7 @@ msgstr "zebra"
#: en/diff-options.txt:306
#, priority:280
msgid "Blocks of moved text are detected as in 'blocks' mode. The blocks are painted using either the 'color.diff.{old,new}Moved' color or 'color.diff.{old,new}MovedAlternative'. The change between the two colors indicates that a new block was detected."
-msgstr ""
-"�ⓥ�쒎쓼�앮Æ凉뤶툔汝�役뗥댆燁삣뒯�꾣뻼�у쓼�귛쓼鵝욜뵪 'color.diff.{old,new}Moved' 窯쒑돯�� 'color.diff.{old,new}"
-"MovedAlternative' 窯쒑돯�귟퓳訝ㅷ쭕窯쒑돯阿뗩뿴�꾢룜�뽬〃鹽뷸�役뗥댆雅녷뼭�꾢쓼��"
+msgstr "�ⓥ�쒎쓼�앮Æ凉뤶툔汝�役뗥댆燁삣뒯�꾣뻼�у쓼�귛쓼鵝욜뵪 'color.diff.{old,new}Moved' 窯쒑돯�� 'color.diff.{old,new}MovedAlternative' 窯쒑돯�귟퓳訝ㅷ쭕窯쒑돯阿뗩뿴�꾢룜�뽬〃鹽뷸�役뗥댆雅녷뼭�꾢쓼��"
#. type: Labeled list
#: en/diff-options.txt:306
@@ -4298,9 +4292,7 @@ msgstr "dimmed-zebra"
#: en/diff-options.txt:311
#, priority:280
msgid "Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated synonym."
-msgstr ""
-"映삡세雅� 'zebra' "
-"與▼폀竊뚥퐜野�=鵝욜㎉�①쉪餓ｇ쟻訝�툖�녔낏�꾦깿�녶룜�쀣�귞쎑�삡륵訝ゅ뙷�쀧쉪渦밭븣瀛욤˙溫ㅴ맏��뇥誤곻펽�뜸퐰�꾦깿�녷삸�졾뀽榮㎬쫨�꾠��`dimmed_zebra` ���訝よ˙佯잌펱�꾢릪阿됭칾��"
+msgstr "映삡세雅� 'zebra' 與▼폀竊뚥퐜野�=鵝욜㎉�①쉪餓ｇ쟻訝�툖�녔낏�꾦깿�녶룜�쀣�귞쎑�삡륵訝ゅ뙷�쀧쉪渦밭븣瀛욤˙溫ㅴ맏��뇥誤곻펽�뜸퐰�꾦깿�녷삸�졾뀽榮㎬쫨�꾠��`dimmed_zebra` ���訝よ˙佯잌펱�꾢릪阿됭칾��"
#. type: Labeled list
#: en/diff-options.txt:313
@@ -4414,9 +4406,7 @@ msgstr "--word-diff[=<與▼폀>]"
#: en/diff-options.txt:354
#, priority:280
msgid "Show a word diff, using the <mode> to delimit changed words. By default, words are delimited by whitespace; see `--word-diff-regex` below. The <mode> defaults to 'plain', and must be one of:"
-msgstr ""
-"�양ㅊ瑥띸쉪藥�펰竊뚨뵪 <與▼폀> �ε늽�붷럴�닸뵻�꾥칾�귡퍡溫ㅶ깄�듕툔竊뚦뜒瑥띷삸餓η㈉�쇔늽�뷂폑瑥룟뢿�� `--word-diff-regex`��<與▼폀> 容섋�訝� "
-"`plain`竊뚦뭉訝붷퓚窈삥삸餓δ툔�뜸릎阿뗤�竊�"
+msgstr "�양ㅊ瑥띸쉪藥�펰竊뚨뵪 <與▼폀> �ε늽�붷럴�닸뵻�꾥칾�귡퍡溫ㅶ깄�듕툔竊뚦뜒瑥띷삸餓η㈉�쇔늽�뷂폑瑥룟뢿�� `--word-diff-regex`��<與▼폀> 容섋�訝� `plain`竊뚦뭉訝붷퓚窈삥삸餓δ툔�뜸릎阿뗤�竊�"
#. type: Plain text
#: en/diff-options.txt:358
@@ -4440,9 +4430,7 @@ msgstr "porcelain"
#: en/diff-options.txt:369
#, fuzzy, priority:280
msgid "Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a `+`/`-`/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde `~` on a line of its own."
-msgstr ""
-"鵝욜뵪訝�燁띸돶餘딁쉪�곩읃雅롨죱�꾣졏凉륅펽堊쏂꽊�т슴�ⓦ�귝렌��/�좈솮/�ゆ쎍�밭쉪瓦먫죱�경뜮餓ι�싧만�꾤퍨訝��꾢량凉귝졏凉뤺풏�븝펽烏뚨쉪凉�鸚답빳 `+`/`-`/` ` "
-"耶쀧Е凉�冶뗰펽訝��닷댆烏뚨쉪瀯볟갼�귟풏�δ릎�꾣뼭烏뚨뵪�뺠죱訝딁쉪 `~`烏①ㅊ��"
+msgstr "鵝욜뵪訝�燁띸돶餘딁쉪�곩읃雅롨죱�꾣졏凉륅펽堊쏂꽊�т슴�ⓦ�귝렌��/�좈솮/�ゆ쎍�밭쉪瓦먫죱�경뜮餓ι�싧만�꾤퍨訝��꾢량凉귝졏凉뤺풏�븝펽烏뚨쉪凉�鸚답빳 `+`/`-`/` ` 耶쀧Е凉�冶뗰펽訝��닷댆烏뚨쉪瀯볟갼�귟풏�δ릎�꾣뼭烏뚨뵪�뺠죱訝딁쉪 `~`烏①ㅊ��"
#. type: Labeled list
#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:172
@@ -6385,8 +6373,8 @@ msgstr "�좈솮�꾢냵若�"
msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)."
msgstr "�좈솮�꾢냵若밥빳��-�앭�鸚당쉪烏뚩〃鹽뷩�귝궓��빳�싪퓝弱녳��-�앲쉬�㏘맏�� �앾펷令뷸졏竊됪씎�꿩�弱녶끀�좈솮��"
-# 瑥묋�낉폏�ュ갼訝ㅴ릉耶쀨뒄��꺗熬ュ닠�륅펽倻귝옖玲삭캂訝뷰릎�뉑젃�밥폏�븀렟�듾릉黎됧춻
#. type: Labeled list
+# 瑥묋�낉폏�ュ갼訝ㅴ릉耶쀨뒄��꺗熬ュ닠�륅펽倻귝옖玲삭캂訝뷰릎�뉑젃�밥폏�븀렟�듾릉黎됧춻
#: en/git-add.txt:379
#, no-wrap, priority:300
msgid "modified content"
@@ -6581,7 +6569,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6611,7 +6599,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6859,7 +6847,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7192,7 +7180,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9963,7 +9951,7 @@ msgstr "--git-format"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13743,7 +13731,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr "�앭쭓�뽫��뤸��뷸뻼餓띰펽餓δ씩藥δ퐳��퐬餓끺퍗耶섇궓佯볠졊��퐬訝�쉪�뉏뻑凉�冶뗣�귛룾餓δ엶�밭��뤹��뷸뻼餓뜸빳�방뜮��誤곫돥掠뺝램鵝쒐쎅壤뺛��"
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr "--filter=<瓦뉑빱�ⓨ츣阿�>"
@@ -13752,11 +13740,7 @@ msgstr "--filter=<瓦뉑빱�ⓨ츣阿�>"
#: en/git-clone.txt:175
#, fuzzy, priority:300
msgid "Use the partial clone feature and request that the server sends a subset of reachable objects according to a given object filter. When using `--filter`, the supplied `<filter-spec>` is used for the partial clone filter. For example, `--filter=blob:none` will filter out all blobs (file contents) until needed by Git. Also, `--filter=blob:limit=<size>` will filter out all blobs of size at least `<size>`. For more details on filter specifications, see the `--filter` option in linkgit:git-rev-list[1]."
-msgstr ""
-"鵝욜뵪�ⓨ늽�뗩쉮�잒꺗竊뚩쫨黎귝쐨�▼솳�방뜮瀯쇿츣�꾢�穩↑퓝譯ㅵ솳�묌�곦�訝ゅ룾�계씨�꾢�穩←쉪耶먬썓�귛퐪鵝욜뵪 `--filter` �됮」�띰펽�먧풘�� `<瓦뉑빱�ⓨ츣阿�>` "
-"弱녻˙�ⓧ틢�ⓨ늽�뗩쉮�귚풃倻귨펽`--filter=blob:none` 弱녻퓝譯ㅶ럦���됬쉪�경뜮野배괌竊덃뻼餓뜹냵若뱄펹竊뚨쎍�� Git "
-"��誤곭쎑佯붺쉪�경뜮�귛룱鸚뽳펽`--filter=blob:limit=<鸚㎩컦>` 弱녻퓝譯ㅶ럦���됪뻼餓뜹ㄷ弱뤺눛弱묇맏 `<鸚㎩컦>` "
-"�꾣빊���穩▲�귛뀽雅롨퓝譯ㅵ솳若싦퉱�꾣쎍鸚싩퍏�귨펽瑥룟뢿�� linkgit:git-rev-list[1] 訝�쉪 `--filter` �됮」��"
+msgstr "鵝욜뵪�ⓨ늽�뗩쉮�잒꺗竊뚩쫨黎귝쐨�▼솳�방뜮瀯쇿츣�꾢�穩↑퓝譯ㅵ솳�묌�곦�訝ゅ룾�계씨�꾢�穩←쉪耶먬썓�귛퐪鵝욜뵪 `--filter` �됮」�띰펽�먧풘�� `<瓦뉑빱�ⓨ츣阿�>` 弱녻˙�ⓧ틢�ⓨ늽�뗩쉮�귚풃倻귨펽`--filter=blob:none` 弱녻퓝譯ㅶ럦���됬쉪�경뜮野배괌竊덃뻼餓뜹냵若뱄펹竊뚨쎍�� Git ��誤곭쎑佯붺쉪�경뜮�귛룱鸚뽳펽`--filter=blob:limit=<鸚㎩컦>` 弱녻퓝譯ㅶ럦���됪뻼餓뜹ㄷ弱뤺눛弱묇맏 `<鸚㎩컦>` �꾣빊���穩▲�귛뀽雅롨퓝譯ㅵ솳若싦퉱�꾣쎍鸚싩퍏�귨펽瑥룟뢿�� linkgit:git-rev-list[1] 訝�쉪 `--filter` �됮」��"
#. type: Labeled list
#: en/git-clone.txt:176 en/git-push.txt:161
@@ -19028,7 +19012,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19676,13 +19660,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27144,7 +27128,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, fuzzy, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr "倻귝옖亦→쐣 `-z` �됮」竊뚦를 \"訝띶만鰲�\" 耶쀧Е�꾥러孃꾢릫鴉싪˙�졽툓凉뺝뤇竊뚧�倻귡뀓營�룜�� \"core.quotePath\" ��鰲ｉ뇢�꾦궍�뤄펷�귟쭅 linkgit:git-config[1]竊됥�� 鵝욜뵪 `-z` �됮」竊뚧뻼餓뜹릫弱녻˙�먨춻渦볟눣竊뚦뭉餓� NUL 耶쀨뒄瀯볠씇��"
#. type: Labeled list
@@ -27160,7 +27144,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29223,7 +29207,7 @@ msgstr "git-init - �쎾뻠訝�訝ょ㈉�껯it餓볟틩�뽭뇥�겼닜冶뗥뙑藥꿩쐣餓볟틩"
#| "\t [--shared[=<permissions>]] [directory]\n"
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
"'git init' [-q | --quiet] [--bare] [--template=<與→씮��퐬>]\n"
@@ -35655,7 +35639,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35877,7 +35861,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35889,13 +35873,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35907,7 +35891,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35919,7 +35903,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -41408,7 +41392,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41431,7 +41415,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41449,7 +41433,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41557,13 +41541,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41581,7 +41565,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41689,7 +41673,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41701,7 +41685,7 @@ msgstr "update"
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46603,7 +46587,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46615,7 +46599,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49432,24 +49416,19 @@ msgstr ""
#: en/git-svn.txt:18
#, priority:100
msgid "'git svn' is a simple conduit for changesets between Subversion and Git. It provides a bidirectional flow of changes between a Subversion and a Git repository."
-msgstr ""
-"'git svn' ���訝� Subversion �� Git 阿뗩뿴�섉쎍�녺쉪嶸��뺡�싮걪�� 若껆뵪雅� Subversion �� Git 餓볟틩阿뗩뿴�섉쎍�꾢룎�묉탛�ⓦ��"
+msgstr "'git svn' ���訝� Subversion �� Git 阿뗩뿴�섉쎍�녺쉪嶸��뺡�싮걪�� 若껆뵪雅� Subversion �� Git 餓볟틩阿뗩뿴�섉쎍�꾢룎�묉탛�ⓦ��"
#. type: Plain text
#: en/git-svn.txt:23
#, priority:100
msgid "'git svn' can track a standard Subversion repository, following the common \"trunk/branches/tags\" layout, with the --stdlayout option. It can also follow branches and tags in any layout with the -T/-t/-b options (see options to 'init' below, and also the 'clone' command)."
-msgstr ""
-"'git svn' ��빳瓮잒릉�뉐뇛 Subversion 餓볟틩竊뚪겣孃ゅ만鰲곭쉪�쒍말亮�/�녷뵱/�뉓��앭툋掠�竊뚥슴�� --stdlayout �됮」�� 若껇퓲��빳鵝욜뵪 "
-"-T/-t/-b �됮」�ⓧ뻣鵝뺝툋掠�訝�퇎甕ゅ늽��뭽�뉓�竊덅��귡쁾訝뗩씊�� 'init' �됮」餓ε룋 'clone' �썰빱竊됥��"
+msgstr "'git svn' ��빳瓮잒릉�뉐뇛 Subversion 餓볟틩竊뚪겣孃ゅ만鰲곭쉪�쒍말亮�/�녷뵱/�뉓��앭툋掠�竊뚥슴�� --stdlayout �됮」�� 若껇퓲��빳鵝욜뵪 -T/-t/-b �됮」�ⓧ뻣鵝뺝툋掠�訝�퇎甕ゅ늽��뭽�뉓�竊덅��귡쁾訝뗩씊�� 'init' �됮」餓ε룋 'clone' �썰빱竊됥��"
#. type: Plain text
#: en/git-svn.txt:27
#, priority:100
msgid "Once tracking a Subversion repository (with any of the above methods), the Git repository can be updated from Subversion by the 'fetch' command and Subversion updated from Git by the 'dcommit' command."
-msgstr ""
-"瓮잒릉 Subversion 餓볟틩竊덁슴�ⓧ툓瓦겻뻣鵝뺞뼶力뺧펹�롳펽��빳�싪퓝 'fetch' �썰빱餓� Subversion �닸뼭 Git 餓볟틩竊뚦뭉�싪퓝 "
-"'dcommit' �썰빱餓� Git �닸뼭 Subversion 餓볟틩��"
+msgstr "瓮잒릉 Subversion 餓볟틩竊덁슴�ⓧ툓瓦겻뻣鵝뺞뼶力뺧펹�롳펽��빳�싪퓝 'fetch' �썰빱餓� Subversion �닸뼭 Git 餓볟틩竊뚦뭉�싪퓝 'dcommit' �썰빱餓� Git �닸뼭 Subversion 餓볟틩��"
#. type: Labeled list
#: en/git-svn.txt:31
@@ -49461,9 +49440,7 @@ msgstr "'init'"
#: en/git-svn.txt:39
#, priority:100
msgid "Initializes an empty Git repository with additional metadata directories for 'git svn'. The Subversion URL may be specified as a command-line argument, or as full URL arguments to -T/-t/-b. Optionally, the target directory to operate on can be specified as a second argument. Normally this command initializes the current directory."
-msgstr ""
-"訝� 'git svn' �앭쭓�뽨�訝ょ㈉�� Git 餓볟틩竊뚦뭉曆삣뒥�껅빊��쎅壤뺛�� Subversion �� URL ��빳鵝쒍맏�썰빱烏뚦뢿�곤펽阿잌룾餓δ퐳訝� -T/-t/"
-"-b �꾢츑�� URL �귝빊�� �뽬�낉펽��빳�뉐츣誤곫뱧鵝쒐쉪��젃��퐬鵝쒍맏寧т틠�귝빊�� �싧만�끻넻訝뗨퓳訝ゅ뫝餓ㅴ폏�ⓨ퐪�띸쎅壤뺠퓵烏뚦닜冶뗥뙑��"
+msgstr "訝� 'git svn' �앭쭓�뽨�訝ょ㈉�� Git 餓볟틩竊뚦뭉曆삣뒥�껅빊��쎅壤뺛�� Subversion �� URL ��빳鵝쒍맏�썰빱烏뚦뢿�곤펽阿잌룾餓δ퐳訝� -T/-t/-b �꾢츑�� URL �귝빊�� �뽬�낉펽��빳�뉐츣誤곫뱧鵝쒐쉪��젃��퐬鵝쒍맏寧т틠�귝빊�� �싧만�끻넻訝뗨퓳訝ゅ뫝餓ㅴ폏�ⓨ퐪�띸쎅壤뺠퓵烏뚦닜冶뗥뙑��"
#. type: Labeled list
#: en/git-svn.txt:40
@@ -49511,11 +49488,7 @@ msgstr "--stdlayout"
#: en/git-svn.txt:58
#, priority:100
msgid "These are optional command-line options for init. Each of these flags can point to a relative repository path (--tags=project/tags) or a full url (--tags=https://foo.org/project/tags). You can specify more than one --tags and/or --branches options, in case your Subversion repository places tags or branches under multiple paths. The option --stdlayout is a shorthand way of setting trunk,tags,branches as the relative paths, which is the Subversion default. If any of the other options are given as well, they take precedence."
-msgstr ""
-"瓦쇾틳��뵪雅� init �꾢룾�됧뫝餓ㅸ죱�됮」�� 驪뤶릉�뉐퓱�썲룾餓ζ뙁�묊쎑野밭쉪�덃쑍佯볢러孃� (-tags=project/tags) �뽩츑�당쉪 url "
-"(-tags=https://foo.org/project/tags)�� 鵝졾룾餓ζ뙁若싧쩀訝� --tags ��/�� --branches �됮」竊뚥빳�꿜퐷�� "
-"Subversion 餓볟틩弱녷젃溫경닑�녷뵱�얍쑉鸚싦릉瓮�푶訝뗣�� �됮」 --stdlayout ��컛 訝삣묾�곫젃溫겹�곩늽���營�맏�멨�瓮�푶�꾡�燁띶엮�룡뼶凉륅펽瓦숁삸 "
-"Subversion �꾦퍡溫ㅸ�營��귛쫩�쒍슴�ⓧ틙�뜸퍟�꾦�됮」竊뚦츆餓у컛熬ヤ폍�덅�껇솑��"
+msgstr "瓦쇾틳��뵪雅� init �꾢룾�됧뫝餓ㅸ죱�됮」�� 驪뤶릉�뉐퓱�썲룾餓ζ뙁�묊쎑野밭쉪�덃쑍佯볢러孃� (-tags=project/tags) �뽩츑�당쉪 url (-tags=https://foo.org/project/tags)�� 鵝졾룾餓ζ뙁若싧쩀訝� --tags ��/�� --branches �됮」竊뚥빳�꿜퐷�� Subversion 餓볟틩弱녷젃溫경닑�녷뵱�얍쑉鸚싦릉瓮�푶訝뗣�� �됮」 --stdlayout ��컛 訝삣묾�곫젃溫겹�곩늽���營�맏�멨�瓮�푶�꾡�燁띶엮�룡뼶凉륅펽瓦숁삸 Subversion �꾦퍡溫ㅸ�營��귛쫩�쒍슴�ⓧ틙�뜸퍟�꾦�됮」竊뚦츆餓у컛熬ヤ폍�덅�껇솑��"
#. type: Labeled list
#: en/git-svn.txt:58
@@ -49527,9 +49500,7 @@ msgstr "--no-metadata"
#: en/git-svn.txt:62
#, priority:100
msgid "Set the 'noMetadata' option in the [svn-remote] config. This option is not recommended, please read the 'svn.noMetadata' section of this manpage before using this option."
-msgstr ""
-"溫양쉰 [svn-remote] �띸쉰�� 'noMetadata' �됮」�� 訝띶뻠溫�슴�②��됮」竊뚩��ⓧ슴�②��됮」�띺쁾瑥삥쑍�뗥냼訝� "
-"'svn.noMetadata' �ⓨ늽��"
+msgstr "溫양쉰 [svn-remote] �띸쉰�� 'noMetadata' �됮」�� 訝띶뻠溫�슴�②��됮」竊뚩��ⓧ슴�②��됮」�띺쁾瑥삥쑍�뗥냼訝� 'svn.noMetadata' �ⓨ늽��"
#. type: Labeled list
#: en/git-svn.txt:62
@@ -49589,10 +49560,7 @@ msgstr "--username=<user>"
#: en/git-svn.txt:75
#, priority:100
msgid "For transports that SVN handles authentication for (http, https, and plain svn), specify the username. For other transports (e.g. `svn+ssh://`), you must include the username in the URL, e.g. `svn+ssh://foo@svn.bar.com/project`"
-msgstr ""
-"野밥틢�� SVN 鸚꾤릤溫ㅸ칮�꾡폖渦볡굳�뗰펷http�갿ttps�뚨변svn竊됵펽瑥룡뙁若싩뵪�룟릫�� "
-"野밥틢�뜸퍟�꾡폖渦볡굳��(堊뗥쫩`svn+ssh:///`)竊뚥퐷恙낂』�쮃RL訝�똿�ョ뵪�룟릫竊뚥풃倻귨폏`svn+ssh://foo@svn.bar.com/"
-"project`"
+msgstr "野밥틢�� SVN 鸚꾤릤溫ㅸ칮�꾡폖渦볡굳�뗰펷http�갿ttps�뚨변svn竊됵펽瑥룡뙁若싩뵪�룟릫�� 野밥틢�뜸퍟�꾡폖渦볡굳��(堊뗥쫩`svn+ssh:///`)竊뚥퐷恙낂』�쮃RL訝�똿�ョ뵪�룟릫竊뚥풃倻귨폏`svn+ssh://foo@svn.bar.com/project`"
#. type: Plain text
#: en/git-svn.txt:90
@@ -50053,7 +50021,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -53118,8 +53086,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61306,7 +61274,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61558,7 +61526,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -62054,31 +62022,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -62090,43 +62064,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -62134,91 +62108,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62227,439 +62201,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62670,19 +62644,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62694,85 +62668,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index 443da30..7dad2fd 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Git Documentation\n"
"Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-05-16 17:29+0200\n"
+"POT-Creation-Date: 2020-06-02 21:43+0200\n"
"PO-Revision-Date: 2020-03-14 12:37+0000\n"
"Last-Translator: adam chen <adam.cws@gmail.com>\n"
"Language-Team: French\n"
@@ -89,7 +89,7 @@ msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1158
+#: en/blame-options.txt:25 en/fetch-options.txt:147 en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151 en/rev-list-options.txt:1161
#, ignore-same, no-wrap, priority:260
msgid "-t"
msgstr "-t"
@@ -315,143 +315,155 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-bugreport[1]"
+msgstr "linkgit:git-bugreport[1]"
+
+#. type: Plain text
+#: en/cmds-ancillaryinterrogators.txt:9
+#, priority:100
+msgid "Collect information for user to file a bug report."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-ancillaryinterrogators.txt:10
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:9
+#: en/cmds-ancillaryinterrogators.txt:12
#, priority:100
msgid "Count unpacked number of objects and their disk consumption."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:10
+#: en/cmds-ancillaryinterrogators.txt:13
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:12
+#: en/cmds-ancillaryinterrogators.txt:15
#, priority:100
msgid "Show changes using common diff tools."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:13
+#: en/cmds-ancillaryinterrogators.txt:16
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20
+#: en/cmds-ancillaryinterrogators.txt:18 en/git-fsck.txt:20
#, priority:100
msgid "Verifies the connectivity and validity of the objects in the database."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:16
+#: en/cmds-ancillaryinterrogators.txt:19
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:18
+#: en/cmds-ancillaryinterrogators.txt:21
#, priority:100
msgid "Display help information about Git."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:19
+#: en/cmds-ancillaryinterrogators.txt:22
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:21
+#: en/cmds-ancillaryinterrogators.txt:24
#, priority:100
msgid "Instantly browse your working repository in gitweb."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:22
+#: en/cmds-ancillaryinterrogators.txt:25
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:24
+#: en/cmds-ancillaryinterrogators.txt:27
#, priority:100
msgid "Show three-way merge without touching index."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:25
+#: en/cmds-ancillaryinterrogators.txt:28
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:27
+#: en/cmds-ancillaryinterrogators.txt:30
#, priority:100
msgid "Reuse recorded resolution of conflicted merges."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:28
+#: en/cmds-ancillaryinterrogators.txt:31
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:30
+#: en/cmds-ancillaryinterrogators.txt:33
#, priority:100
msgid "Show branches and their commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:31
+#: en/cmds-ancillaryinterrogators.txt:34
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:33
+#: en/cmds-ancillaryinterrogators.txt:36
#, priority:100
msgid "Check the GPG signature of commits."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:34
+#: en/cmds-ancillaryinterrogators.txt:37
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:36
+#: en/cmds-ancillaryinterrogators.txt:39
#, priority:100
msgid "Check the GPG signature of tags."
msgstr ""
#. type: Labeled list
-#: en/cmds-ancillaryinterrogators.txt:37
+#: en/cmds-ancillaryinterrogators.txt:40
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:39
+#: en/cmds-ancillaryinterrogators.txt:42
#, priority:100
msgid "Show logs with difference each commit introduces."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
+#: en/cmds-ancillaryinterrogators.txt:43 en/git-instaweb.txt:91
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:42
+#: en/cmds-ancillaryinterrogators.txt:45
#, priority:100
msgid "Git web interface (web frontend to Git repositories)."
msgstr ""
@@ -1119,84 +1131,96 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
#, ignore-same, no-wrap, priority:100
+msgid "linkgit:git-sparse-checkout[1]"
+msgstr "linkgit:git-sparse-checkout[1]"
+
+#. type: Plain text
+#: en/cmds-mainporcelain.txt:105
+#, priority:100
+msgid "Initialize and modify the sparse-checkout."
+msgstr ""
+
+#. type: Labeled list
+#: en/cmds-mainporcelain.txt:106
+#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:105
+#: en/cmds-mainporcelain.txt:108
#, priority:100
msgid "Stash the changes in a dirty working directory away."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:106
+#: en/cmds-mainporcelain.txt:109
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:108
+#: en/cmds-mainporcelain.txt:111
#, priority:100
msgid "Show the working tree status."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:109
+#: en/cmds-mainporcelain.txt:112
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:111
+#: en/cmds-mainporcelain.txt:114
#, priority:100
msgid "Initialize, update or inspect submodules."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:112
+#: en/cmds-mainporcelain.txt:115
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-switch[1]"
msgstr "linkgit:git-switch[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:114
+#: en/cmds-mainporcelain.txt:117
#, fuzzy, priority:100
#| msgid "--detect-branches"
msgid "Switch branches."
msgstr "--detect-branches"
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:115
+#: en/cmds-mainporcelain.txt:118
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:117
+#: en/cmds-mainporcelain.txt:120
#, priority:100
msgid "Create, list, delete or verify a tag object signed with GPG."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:118
+#: en/cmds-mainporcelain.txt:121
#, ignore-same, no-wrap, priority:100
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:120
+#: en/cmds-mainporcelain.txt:123
#, priority:100
msgid "Manage multiple working trees."
msgstr ""
#. type: Labeled list
-#: en/cmds-mainporcelain.txt:121 en/git-gui.txt:104
+#: en/cmds-mainporcelain.txt:124 en/git-gui.txt:104
#, ignore-same, no-wrap, priority:100
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
#. type: Plain text
-#: en/cmds-mainporcelain.txt:123
+#: en/cmds-mainporcelain.txt:126
#, priority:100
msgid "The Git repository browser."
msgstr ""
@@ -2785,11 +2809,11 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
#, 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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`"
+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. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
msgstr ""
#. type: Plain text
-#: en/date-formats.txt:29
+#: en/date-formats.txt:28
#, 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 ""
@@ -6493,7 +6517,7 @@ msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) wi
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1127
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
#, ignore-same, no-wrap, priority:260
msgid "-c"
msgstr "-c"
@@ -6523,7 +6547,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1147
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:239 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:346 en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:118 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:1150
#, ignore-same, no-wrap, priority:260
msgid "-m"
msgstr "-m"
@@ -6771,7 +6795,7 @@ msgid "--continue"
msgstr "--continue"
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1155
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:495 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38 en/rev-list-options.txt:1158
#, ignore-same, no-wrap, priority:280
msgid "-r"
msgstr "-r"
@@ -7104,7 +7128,7 @@ msgid "When a pure mode change is encountered (which has no index information),
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:105 en/rev-list-options.txt:812
+#: en/git-apply.txt:105 en/rev-list-options.txt:815
#, ignore-same, no-wrap, priority:260
msgid "--reverse"
msgstr "--reverse"
@@ -9876,7 +9900,7 @@ msgstr "--git-format"
#. type: Plain text
#: en/git-bugreport.txt:50
#, priority:100
-msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a link:strftime[3] format string; the current local time will be used."
+msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
msgstr ""
#. type: Title =
@@ -13628,7 +13652,7 @@ msgid "Initialize the sparse-checkout file so the working directory starts with
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:867
+#: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
#, no-wrap, priority:300
msgid "--filter=<filter-spec>"
msgstr ""
@@ -18898,7 +18922,7 @@ msgid "The default is to diff against our branch (-2) and the cleanly resolved p
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1134
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:1137
#, ignore-same, no-wrap, priority:260
msgid "--cc"
msgstr "--cc"
@@ -19546,13 +19570,13 @@ msgid "This flag changes the way a merge commit patch is displayed, in a similar
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1140
+#: en/git-diff-tree.txt:108 en/rev-list-options.txt:1143
#, ignore-same, no-wrap, priority:260
msgid "--combined-all-paths"
msgstr "--combined-all-paths"
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1146
+#: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
#, priority:260
msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents. It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
msgstr ""
@@ -27014,7 +27038,7 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:213
#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see git-config(1))."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
@@ -27030,7 +27054,7 @@ msgid "Print only the matched (non-empty) parts of a matching line, with each su
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:220 en/rev-list-options.txt:1107
+#: en/git-grep.txt:220 en/rev-list-options.txt:1110
#, ignore-same, no-wrap, priority:260
msgid "--count"
msgstr "--count"
@@ -29093,7 +29117,7 @@ msgstr "git-init -�드뻠訝��뗧㈉�껯it�됧벴�뽪삸�띷뼭�앭쭓�뽩럴耶섇쑉��
#| "\t [--shared[=<permissions>]] [directory]\n"
msgid ""
"'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
-"\t [--separate-git-dir <git dir>] [--object-format=<format]\n"
+"\t [--separate-git-dir <git dir>] [--object-format=<format>]\n"
"\t [--shared[=<permissions>]] [directory]\n"
msgstr ""
"'git init' [-q | --quiet] [--bare] [--template=<與→씮��똾>]\n"
@@ -35518,7 +35542,7 @@ msgid "Read the revision arguments from the standard input, instead of individua
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:72 en/rev-list-options.txt:853
+#: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
#, ignore-same, no-wrap, priority:260
msgid "--unpacked"
msgstr "--unpacked"
@@ -35740,7 +35764,7 @@ msgid "Requires `--stdout`. Omits certain objects (usually blobs) from the resu
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:265 en/rev-list-options.txt:914
+#: en/git-pack-objects.txt:265 en/rev-list-options.txt:917
#, ignore-same, no-wrap, priority:260
msgid "--no-filter"
msgstr "--no-filter"
@@ -35752,13 +35776,13 @@ msgid "Turns off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:268 en/rev-list-options.txt:921
+#: en/git-pack-objects.txt:268 en/rev-list-options.txt:924
#, no-wrap, priority:260
msgid "--missing=<missing-action>"
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:271 en/rev-list-options.txt:924
+#: en/git-pack-objects.txt:271 en/rev-list-options.txt:927
#, priority:260
msgid "A debug option to help with future \"partial clone\" development. This option specifies how missing objects are handled."
msgstr ""
@@ -35770,7 +35794,7 @@ msgid "The form '--missing=error' requests that pack-objects stop with an error
msgstr ""
#. type: Plain text
-#: en/git-pack-objects.txt:278 en/rev-list-options.txt:931
+#: en/git-pack-objects.txt:278 en/rev-list-options.txt:934
#, priority:260
msgid "The form '--missing=allow-any' will allow object traversal to continue if a missing object is encountered. Missing objects will silently be omitted from the results."
msgstr ""
@@ -35782,7 +35806,7 @@ msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only al
msgstr ""
#. type: Labeled list
-#: en/git-pack-objects.txt:283 en/rev-list-options.txt:939
+#: en/git-pack-objects.txt:283 en/rev-list-options.txt:942
#, ignore-same, no-wrap, priority:260
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -41272,7 +41296,7 @@ msgstr ""
#, ignore-ellipsis, no-wrap, priority:220
msgid ""
"'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
"'git remote rename' <old> <new>\n"
"'git remote remove' <name>\n"
"'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41295,7 +41319,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
#, priority:220
-msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and `subcommand`."
+msgid "Be a little more verbose and show remote url after name. NOTE: This must be placed between `remote` and subcommand."
msgstr ""
#. type: Plain text
@@ -41313,7 +41337,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:52
#, priority:220
-msgid "Adds a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Add a remote named <name> for the repository at <url>. The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
msgstr ""
#. type: Plain text
@@ -41421,13 +41445,13 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:116
#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
#: en/git-remote.txt:121
#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
msgstr ""
#. type: Labeled list
@@ -41445,7 +41469,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:131
#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
msgstr ""
#. type: Plain text
@@ -41553,7 +41577,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:186
#, priority:220
-msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
msgstr ""
#. type: Labeled list
@@ -41565,7 +41589,7 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:195
#, 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])."
+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 ""
#. type: Plain text
@@ -46465,7 +46489,7 @@ msgid "With this option, the command includes the current branch to the list of
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:56 en/rev-list-options.txt:788
+#: en/git-show-branch.txt:56 en/rev-list-options.txt:791
#, ignore-same, no-wrap, priority:260
msgid "--topo-order"
msgstr "--topo-order"
@@ -46477,7 +46501,7 @@ msgid "By default, the branches and their commits are shown in reverse chronolog
msgstr ""
#. type: Labeled list
-#: en/git-show-branch.txt:62 en/rev-list-options.txt:780
+#: en/git-show-branch.txt:62 en/rev-list-options.txt:783
#, ignore-same, no-wrap, priority:260
msgid "--date-order"
msgstr "--date-order"
@@ -49900,7 +49924,7 @@ msgid "git config --get-all svn-remote.<name>.commiturl"
msgstr ""
#. type: Labeled list
-#: en/git-svn.txt:346 en/rev-list-options.txt:1045
+#: en/git-svn.txt:346 en/rev-list-options.txt:1048
#, ignore-same, no-wrap, priority:260
msgid "--parents"
msgstr "--parents"
@@ -52965,8 +52989,8 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:496
#, ignore-same, no-wrap, priority:100
-msgid "`GIT_DEFAULT_HASH_ALGORITHM`"
-msgstr "`GIT_DEFAULT_HASH_ALGORITHM`"
+msgid "`GIT_DEFAULT_HASH`"
+msgstr "`GIT_DEFAULT_HASH`"
#. type: Plain text
#: en/git.txt:501
@@ -61169,7 +61193,7 @@ msgid "Upon seeing an invalid object name in the input, pretend as if the bad in
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:206 en/rev-list-options.txt:721
+#: en/rev-list-options.txt:206 en/rev-list-options.txt:724
#, ignore-same, no-wrap, priority:260
msgid "--bisect"
msgstr "--bisect"
@@ -61421,7 +61445,7 @@ msgid "Simplifies the history to the simplest history explaining the final state
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:345
+#: en/rev-list-options.txt:345 en/rev-list-options.txt:675
#, ignore-same, no-wrap, priority:260
msgid "--show-pulls"
msgstr "--show-pulls"
@@ -61917,31 +61941,37 @@ msgid "The second issue is one of auditing. When many contributors are working o
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:681
+#: en/rev-list-options.txt:679
#, priority:260
-msgid "The `--show-pulls` option helps with both of these issues by adding more merge commits to the history results. If a merge is not TREESAME to its first parent but is TREESAME to a later parent, then that merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
msgstr ""
-#. type: delimited block -
+#. type: Plain text
#: en/rev-list-options.txt:684
+#, priority:260
+msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
+msgstr ""
+
+#. type: delimited block -
+#: en/rev-list-options.txt:687
#, no-wrap, priority:260
msgid "\tI---X---R---N\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:690
+#: en/rev-list-options.txt:693
#, priority:260
msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:693
+#: en/rev-list-options.txt:696
#, priority:260
msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:701
+#: en/rev-list-options.txt:704
#, no-wrap, priority:260
msgid ""
"\t .-A---M--. N\n"
@@ -61953,43 +61983,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:707
+#: en/rev-list-options.txt:710
#, priority:260
msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:715
+#: en/rev-list-options.txt:718
#, priority:260
msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags. Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line. All other commits are marked as TREESAME (subject to be simplified away)."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:719
+#: en/rev-list-options.txt:722
#, no-wrap, priority:260
msgid "Bisection Helpers"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:728
+#: en/rev-list-options.txt:731
#, priority:260
msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:731
+#: en/rev-list-options.txt:734
#, no-wrap, priority:260
msgid "\t$ git rev-list --bisect foo ^bar ^baz\n"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:734
+#: en/rev-list-options.txt:737
#, priority:260
msgid "outputs 'midpoint', the output of the two commands"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:738
+#: en/rev-list-options.txt:741
#, no-wrap, priority:260
msgid ""
"\t$ git rev-list foo ^midpoint\n"
@@ -61997,91 +62027,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:744
+#: en/rev-list-options.txt:747
#, priority:260
msgid "would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:745
+#: en/rev-list-options.txt:748
#, ignore-same, no-wrap, priority:260
msgid "--bisect-vars"
msgstr "--bisect-vars"
#. type: Plain text
-#: en/rev-list-options.txt:756
+#: en/rev-list-options.txt:759
#, priority:260
msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:757
+#: en/rev-list-options.txt:760
#, ignore-same, no-wrap, priority:260
msgid "--bisect-all"
msgstr "--bisect-all"
#. type: Plain text
-#: en/rev-list-options.txt:763
+#: en/rev-list-options.txt:766
#, priority:260
msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:767
+#: en/rev-list-options.txt:770
#, priority:260
msgid "This is useful because it makes it easy to choose a good commit to test when you want to avoid to test some of them for some reason (they may not compile for example)."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:771
+#: en/rev-list-options.txt:774
#, priority:260
msgid "This option can be used along with `--bisect-vars`, in this case, after all the sorted commit objects, there will be the same text as if `--bisect-vars` had been used alone."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:776
+#: en/rev-list-options.txt:779
#, no-wrap, priority:260
msgid "Commit Ordering"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:779
+#: en/rev-list-options.txt:782
#, priority:260
msgid "By default, the commits are shown in reverse chronological order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:783
+#: en/rev-list-options.txt:786
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the commit timestamp order."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:784
+#: en/rev-list-options.txt:787
#, ignore-same, no-wrap, priority:260
msgid "--author-date-order"
msgstr "--author-date-order"
#. type: Plain text
-#: en/rev-list-options.txt:787
+#: en/rev-list-options.txt:790
#, priority:260
msgid "Show no parents before all of its children are shown, but otherwise show commits in the author timestamp order."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:792
+#: en/rev-list-options.txt:795
#, priority:260
msgid "Show no parents before all of its children are shown, and avoid showing commits on multiple lines of history intermixed."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:794
+#: en/rev-list-options.txt:797
#, priority:260
msgid "For example, in a commit history like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:800
+#: en/rev-list-options.txt:803
#, no-wrap, priority:260
msgid ""
" ---1----2----4----7\n"
@@ -62090,439 +62120,439 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:806
+#: en/rev-list-options.txt:809
#, priority:260
msgid "where the numbers denote the order of commit timestamps, `git rev-list` and friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 4 3 2 1."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:811
+#: en/rev-list-options.txt:814
#, priority:260
msgid "With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); some older commits are shown before newer ones in order to avoid showing the commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:816
+#: en/rev-list-options.txt:819
#, priority:260
msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:820
+#: en/rev-list-options.txt:823
#, no-wrap, priority:260
msgid "Object Traversal"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:823
+#: en/rev-list-options.txt:826
#, priority:260
msgid "These options are mostly targeted for packing of Git repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:825
+#: en/rev-list-options.txt:828
#, ignore-same, no-wrap, priority:260
msgid "--objects"
msgstr "--objects"
#. type: Plain text
-#: en/rev-list-options.txt:830
+#: en/rev-list-options.txt:833
#, priority:260
msgid "Print the object IDs of any object referenced by the listed commits. `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:831
+#: en/rev-list-options.txt:834
#, ignore-same, no-wrap, priority:260
msgid "--in-commit-order"
msgstr "--in-commit-order"
#. type: Plain text
-#: en/rev-list-options.txt:835
+#: en/rev-list-options.txt:838
#, priority:260
msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:836
+#: en/rev-list-options.txt:839
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge"
msgstr "--objects-edge"
#. type: Plain text
-#: en/rev-list-options.txt:842
+#: en/rev-list-options.txt:845
#, priority:260
msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character. This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:843
+#: en/rev-list-options.txt:846
#, ignore-same, no-wrap, priority:260
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
-#: en/rev-list-options.txt:847
+#: en/rev-list-options.txt:850
#, priority:260
msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time. This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:848
+#: en/rev-list-options.txt:851
#, ignore-same, no-wrap, priority:260
msgid "--indexed-objects"
msgstr "--indexed-objects"
#. type: Plain text
-#: en/rev-list-options.txt:852
+#: en/rev-list-options.txt:855
#, priority:260
msgid "Pretend as if all trees and blobs used by the index are listed on the command line. Note that you probably want to use `--objects`, too."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:856
+#: en/rev-list-options.txt:859
#, priority:260
msgid "Only useful with `--objects`; print the object IDs that are not in packs."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:857
+#: en/rev-list-options.txt:860
#, ignore-same, no-wrap, priority:260
msgid "--object-names"
msgstr "--object-names"
#. type: Plain text
-#: en/rev-list-options.txt:860
+#: en/rev-list-options.txt:863
#, priority:260
msgid "Only useful with `--objects`; print the names of the object IDs that are found. This is the default behavior."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:861
+#: en/rev-list-options.txt:864
#, ignore-same, no-wrap, priority:260
msgid "--no-object-names"
msgstr "--no-object-names"
#. type: Plain text
-#: en/rev-list-options.txt:866
+#: en/rev-list-options.txt:869
#, priority:260
msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:871
+#: en/rev-list-options.txt:874
#, priority:260
msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects. The '<filter-spec>' may be one of the following:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:873
+#: en/rev-list-options.txt:876
#, priority:260
msgid "The form '--filter=blob:none' omits all blobs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:878
+#: en/rev-list-options.txt:881
#, priority:260
msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units. n may be zero. The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:883
+#: en/rev-list-options.txt:886
#, priority:260
msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:893
+#: en/rev-list-options.txt:896
#, priority:260
msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:897
+#: en/rev-list-options.txt:900
#, priority:260
msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:900
+#: en/rev-list-options.txt:903
#, priority:260
msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:909
+#: en/rev-list-options.txt:912
#, ignore-ellipsis, priority:260
msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded). Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+'`+ as well as all characters with ASCII code <= `0x20`, which includes space and newline."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:913
+#: en/rev-list-options.txt:916
#, priority:260
msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:916
+#: en/rev-list-options.txt:919
#, priority:260
msgid "Turn off any previous `--filter=` argument."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:917
+#: en/rev-list-options.txt:920
#, ignore-same, no-wrap, priority:260
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
#. type: Plain text
-#: en/rev-list-options.txt:920
+#: en/rev-list-options.txt:923
#, priority:260
msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter. Object IDs are prefixed with a ``~'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:927
+#: en/rev-list-options.txt:930
#, priority:260
msgid "The form '--missing=error' requests that rev-list stop with an error if a missing object is encountered. This is the default action."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:935
+#: en/rev-list-options.txt:938
#, priority:260
msgid "The form '--missing=allow-promisor' is like 'allow-any', but will only allow object traversal to continue for EXPECTED promisor missing objects. Unexpected missing objects will raise an error."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:938
+#: en/rev-list-options.txt:941
#, priority:260
msgid "The form '--missing=print' is like 'allow-any', but will also print a list of the missing objects. Object IDs are prefixed with a ``?'' character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:945
+#: en/rev-list-options.txt:948
#, priority:260
msgid "(For internal use only.) Prefilter object traversal at promisor boundary. This is used with partial clone. This is stronger than `--missing=allow-promisor` because it limits the traversal, rather than just silencing errors about missing objects."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:947
+#: en/rev-list-options.txt:950
#, no-wrap, priority:260
msgid "--no-walk[=(sorted|unsorted)]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:955
+#: en/rev-list-options.txt:958
#, priority:260
msgid "Only show the given commits, but do not traverse their ancestors. This has no effect if a range is specified. If the argument `unsorted` is given, the commits are shown in the order they were given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. Cannot be combined with `--graph`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:956
+#: en/rev-list-options.txt:959
#, ignore-same, no-wrap, priority:260
msgid "--do-walk"
msgstr "--do-walk"
#. type: Plain text
-#: en/rev-list-options.txt:958
+#: en/rev-list-options.txt:961
#, priority:260
msgid "Overrides a previous `--no-walk`."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:962
+#: en/rev-list-options.txt:965
#, no-wrap, priority:260
msgid "Commit Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:968
+#: en/rev-list-options.txt:971
#, priority:260
msgid "Using these options, linkgit:git-rev-list[1] will act similar to the more specialized family of commit log tools: linkgit:git-log[1], linkgit:git-show[1], and linkgit:git-whatchanged[1]"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:972
+#: en/rev-list-options.txt:975
#, ignore-same, no-wrap, priority:260
msgid "--relative-date"
msgstr "--relative-date"
#. type: Plain text
-#: en/rev-list-options.txt:974
+#: en/rev-list-options.txt:977
#, priority:260
msgid "Synonym for `--date=relative`."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:975
+#: en/rev-list-options.txt:978
#, no-wrap, priority:260
msgid "--date=<format>"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:982
+#: en/rev-list-options.txt:985
#, priority:260
msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:987
+#: en/rev-list-options.txt:990
#, priority:260
msgid "`--date=relative` shows dates relative to the current time, e.g. ``2 hours ago''. The `-local` option has no effect for `--date=relative`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:989
+#: en/rev-list-options.txt:992
#, priority:260
msgid "`--date=local` is an alias for `--date=default-local`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:992
+#: en/rev-list-options.txt:995
#, priority:260
msgid "`--date=iso` (or `--date=iso8601`) shows timestamps in a ISO 8601-like format. The differences to the strict ISO 8601 format are:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:994
+#: en/rev-list-options.txt:997
#, priority:260
msgid "a space instead of the `T` date/time delimiter"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:995
+#: en/rev-list-options.txt:998
#, priority:260
msgid "a space between time and time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:996
+#: en/rev-list-options.txt:999
#, priority:260
msgid "no colon between hours and minutes of the time zone"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:999
+#: en/rev-list-options.txt:1002
#, priority:260
msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1002
+#: en/rev-list-options.txt:1005
#, priority:260
msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1004
+#: en/rev-list-options.txt:1007
#, priority:260
msgid "`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1013
+#: en/rev-list-options.txt:1016
#, priority:260
msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`). Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1020
+#: en/rev-list-options.txt:1023
#, priority:260
msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1024
+#: en/rev-list-options.txt:1027
#, priority:260
msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970). As with `--raw`, this is always in UTC and therefore `-local` has no effect."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1031
+#: en/rev-list-options.txt:1034
#, ignore-ellipsis, priority:260
msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally. Use `--date=format:%c` to show the date in your system locale's preferred format. See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1034
+#: en/rev-list-options.txt:1037
#, priority:260
msgid "`--date=default` is the default format, and is similar to `--date=rfc2822`, with a few exceptions:"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1036
+#: en/rev-list-options.txt:1039
#, priority:260
msgid "there is no comma after the day-of-week"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1038
+#: en/rev-list-options.txt:1041
#, priority:260
msgid "the time zone is omitted when the local time zone is used"
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1040
+#: en/rev-list-options.txt:1043
#, ignore-same, no-wrap, priority:260
msgid "--header"
msgstr "--header"
#. type: Plain text
-#: en/rev-list-options.txt:1043
+#: en/rev-list-options.txt:1046
#, priority:260
msgid "Print the contents of the commit in raw-format; each record is separated with a NUL character."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1048
+#: en/rev-list-options.txt:1051
#, ignore-ellipsis, priority:260
msgid "Print also the parents of the commit (in the form \"commit parent...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1049
+#: en/rev-list-options.txt:1052
#, ignore-same, no-wrap, priority:260
msgid "--children"
msgstr "--children"
#. type: Plain text
-#: en/rev-list-options.txt:1052
+#: en/rev-list-options.txt:1055
#, ignore-ellipsis, priority:260
msgid "Print also the children of the commit (in the form \"commit child...\"). Also enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1054
+#: en/rev-list-options.txt:1057
#, ignore-same, no-wrap, priority:260
msgid "--timestamp"
msgstr "--timestamp"
#. type: Plain text
-#: en/rev-list-options.txt:1056
+#: en/rev-list-options.txt:1059
#, priority:260
msgid "Print the raw commit timestamp."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1058
+#: en/rev-list-options.txt:1061
#, ignore-same, no-wrap, priority:260
msgid "--left-right"
msgstr "--left-right"
#. type: Plain text
-#: en/rev-list-options.txt:1063
+#: en/rev-list-options.txt:1066
#, priority:260
msgid "Mark which side of a symmetric difference a commit is reachable from. Commits from the left side are prefixed with `<` and those from the right with `>`. If combined with `--boundary`, those commits are prefixed with `-`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1065
+#: en/rev-list-options.txt:1068
#, priority:260
msgid "For example, if you have this topology:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1072
+#: en/rev-list-options.txt:1075
#, no-wrap, priority:260
msgid ""
"\t y---b---b branch B\n"
@@ -62533,19 +62563,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1075
+#: en/rev-list-options.txt:1078
#, priority:260
msgid "you would get an output like this:"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1078
+#: en/rev-list-options.txt:1081
#, ignore-ellipsis, no-wrap, priority:260
msgid "\t$ git rev-list --left-right --boundary --pretty=oneline A...B\n"
msgstr ""
#. type: delimited block -
-#: en/rev-list-options.txt:1085
+#: en/rev-list-options.txt:1088
#, ignore-ellipsis, no-wrap, priority:260
msgid ""
"\t>bbbbbbb... 3rd on b\n"
@@ -62557,85 +62587,85 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1087
+#: en/rev-list-options.txt:1090
#, ignore-same, no-wrap, priority:260
msgid "--graph"
msgstr "--graph"
#. type: Plain text
-#: en/rev-list-options.txt:1093
+#: en/rev-list-options.txt:1096
#, priority:260
msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. Cannot be combined with `--no-walk`."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1095
+#: en/rev-list-options.txt:1098
#, priority:260
msgid "This enables parent rewriting, see 'History Simplification' above."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1098
+#: en/rev-list-options.txt:1101
#, priority:260
msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
msgstr ""
#. type: Labeled list
-#: en/rev-list-options.txt:1099
+#: en/rev-list-options.txt:1102
#, no-wrap, priority:260
msgid "--show-linear-break[=<barrier>]"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1105
+#: en/rev-list-options.txt:1108
#, priority:260
msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1115
+#: en/rev-list-options.txt:1118
#, priority:260
msgid "Print a number stating how many commits would have been listed, and suppress all other output. When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
-#: en/rev-list-options.txt:1121
+#: en/rev-list-options.txt:1124
#, no-wrap, priority:260
msgid "Diff Formatting"
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1126
+#: en/rev-list-options.txt:1129
#, 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 ""
#. type: Plain text
-#: en/rev-list-options.txt:1133
+#: en/rev-list-options.txt:1136
#, priority:260
msgid "With this option, diff output for a merge commit shows the differences from each of the parents to the merge result simultaneously instead of showing pairwise diff between a parent and the result one at a time. Furthermore, it lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1139
+#: en/rev-list-options.txt:1142
#, priority:260
msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1154
+#: en/rev-list-options.txt:1157
#, priority:260
msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1157
+#: en/rev-list-options.txt:1160
#, priority:260
msgid "Show recursive diffs."
msgstr ""
#. type: Plain text
-#: en/rev-list-options.txt:1160
+#: en/rev-list-options.txt:1163
#, priority:260
msgid "Show the tree objects in the diff output. This implies `-r`."
msgstr ""
--
GitLab