diff --git a/Makefile b/Makefile
index 8fd9f12f119eef44c1577876be063dd53e1d6fba..e076a08b41137c0cb727cbacd1f2e9f244e19393 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 019325934ab77f5c5dd842d88f349cf9cae6c20f..41324dffa3ee1a5be64af8aaa535e8813c04c392 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 72108b229f63e413dd94a3ce21869801d960d70d..6731d495ee77aa5e31884b16d8cba3fa85e9eeea 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 7e7eaba643a3ce26843ce4b8bed5d310c406fd70..f1097fac69a6bbbe3c42b13a5a89dc185db526d5 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 7fe9aef34ea86ae0a5e1d273eb0f5a4c5a3e9066..9edad66a63145b848bb72f5cd05343e8cc98687a 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 8d990e92fd9c03a05f099908584c22068a868904..31c81c4c0263ec33db2e7837c2ab70bb626a67d8 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 a7f9bc99eaf18d08fcbcc163da49c50d4c1e44c5..6077ff01a4fce65a8f12c2ede83dce562bf0e1c3 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 adc6adfd380beb88cfc9e95ad9be39d874b4890e..f9467cc6a4c791ac3b445f5b0172144f7a1bac15 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 9659abbf8e08e19076b6ac18e0c9ea75489fd68d..32b6e79c31e09ed1ade299b3daacf7249594f6a8 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 9d6769e95ab1d356e6c8b07671ac11446a2acc96..12890841c45cb38b1cae0f1149635b9f7cc385a0 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 04ad7dd36ebd311cbb7acb33a94dcc631f393f0a..b01b2b677303aeb2575a594c5af781e8391fae51 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 a06e0063d69a8bae765044552256abe2bc191bf5..9c20b63b61c055b9d32027af3f7c37fc2c431c37 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 „Index“ 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 „Index“ 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 „true“ "
-"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 „true“ 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 ‚master‘ "
-"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 ‚master‘ 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 „non-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 „non-bare“ Repository ist dies der Branch, der ausgecheckt wird. `--branch` kann auch Tags übernehmen und HEAD im resultierenden Repository von diesem Commit abtrennen."
#. type: Labeled list
#: en/git-clone.txt: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 „flachen“ 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 „flachen“ 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 „Interaktiver "
-"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 „Interaktiver 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 „unü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 „non-fast-"
-"forward“ Push erzwingen können."
+msgstr "Standardmäßig ist das Konfigurationsflag `receive.denyNonFastForwards` in gemeinsam genutzten Repositorys aktiviert, sodass Sie keinen „non-fast-forward“ Push erzwingen können."
#. type: Plain text
#: en/git-init.txt: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 „false“ 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 „false“ 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 „git://example.org/path/to/repo.git“ wird für Pushes in "
-"„ssh://example.org/path/to/repo.git“ umgeschrieben, aber Pulls verwenden "
-"weiterhin die Original-URL."
+msgstr "eine URL wie „git://example.org/path/to/repo.git“ wird für Pushes in „ssh://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 1e0e3d7841fd500f2a9cce1e31c43244d121f028..100f07801a2896f2a0802a1483bf9d1f9704d9cc 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 b9658d5c7be3a84e5ae7ca672f3c380526b189c0..3ff9d5948b0d10c89ac6332d739258cffbbad2cd 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 7b570a8621dc4ff7be6f49b5d4fe403bbc34654f..d92272470b8427868401ef54ff01e59efb658025 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'ếtat. "
-"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'ếtat. 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 c219ccb81ec45dc916e99b946c8a00cf1ca68491..88a8a8eda02d50443e9afc87fa75faeebb537365 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 1ee102724a77cd6b8ed31d74eb180bb8739e7790..862908faebeb2bea67215aa5eeeaeb9ce7bf45da 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 fc12bbdeb26abfbbcbf0d39dd737bfb619053d81..420e478897a24024400ab6b4df6d4d079a33ee06 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 8b060dc2ec5f6c2b29bde662695d439dc8d61335..69edddd958701abf7409b44823d08481adc798ba 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 3e22da1a3480f240fc3825376094e62731a44bd7..232014ed0fa87836a56c09a122b78d637f50cef5 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 26e1289495021cd9f677c5c7e0f19b9150ae6066..9d50b54eaae970b726aa1624bc3732afa97019d9 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 9b4db511607312307bc99e93581c2a6b57248a7f..45700fe70972d694b5ee713c08817fd2b3dccb74 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 cc430112706cf958d7c5ee58695e82becd3edaa5..acfc63d7b6576cf9aacba56b8377551727e9c137 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 274123e0270fa4955383d120f8bc6bfc25d834ec..94b0588cce98b225435c43678671b7e7a4e25cb1 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 4946c721e12850bff628554d55ff05cd15be4505..3de4918a203df2cb311e5f5c0958e945898ddcd7 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 185855bb110ae43ae1d9a02d7cf890762eff65aa..f5fb9599707a8ebae2dc00c256ac4c79d48ceab6 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 1495e75db8a7457aca2d8943a1666b35d2b07093..9461f31adc623f175d2b5a02e988b7c9444a0a34 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 f91e5340c600d838a9ad91027e0eca4816ddacd1..f5f8bfb7afb257cbace2aaa5a0eadc2f1eba0e05 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 396e5b99c449f851fe149111a7491e4db588b9cb..1e5ab2abf5c233c413b81c9731bee6481cf6af31 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 - 创建一个空的Git仓库或é‡æ–°åˆå§‹åŒ–已有仓库"
#| "\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ã€https和纯svn），请指定用户å。 "
-"å¯¹äºŽå…¶ä»–çš„ä¼ è¾“ç±»åž‹(例如`svn+ssh:///`)ï¼Œä½ å¿…é¡»åœ¨URLä¸åŒ…å«ç”¨æˆ·å，例如：`svn+ssh://foo@svn.bar.com/"
-"project`"
+msgstr "对于由 SVN 处ç†è®¤è¯çš„ä¼ è¾“ç±»åž‹ï¼ˆhttpã€https和纯svn），请指定用户å。 å¯¹äºŽå…¶ä»–çš„ä¼ è¾“ç±»åž‹(例如`svn+ssh:///`)ï¼Œä½ å¿…é¡»åœ¨URLä¸åŒ…å«ç”¨æˆ·å，例如：`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 443da305d2ee531b04bfe70f39160919dea132d7..7dad2fde7f6a5a3371c222a5478d942fa84bece8 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 -創建一個空的Git倉庫或是é‡æ–°åˆå§‹åŒ–å·²å˜åœ¨çš„
#| "\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 ""